We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Updates the cursor position (if needed) on window creation or reconfiguration

cursor_update_v5.diff (text/plain), 4.74 KB, created by Manuel Alfayate Corchete on 2021-02-04 00:17:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Manuel Alfayate Corchete

Created: 2021-02-04 00:17:11 UTC

Size: 4.74 KB

patch

obsolete

>diff -rupN SDL/src/video/kmsdrm/SDL_kmsdrmmouse.c SDL2/src/video/kmsdrm/SDL_kmsdrmmouse.c
>--- SDL/src/video/kmsdrm/SDL_kmsdrmmouse.c	2021-01-31 04:03:23.062013688 +0100
>+++ SDL2/src/video/kmsdrm/SDL_kmsdrmmouse.c	2021-02-04 01:11:14.298683955 +0100
>@@ -341,6 +341,35 @@ cleanup:
>     return ret;
> }
> 
>+/* Update the cursor graphic position to the mouse position,
>+   making sure it's inside the window limits. */
>+void
>+KMSDRM_UpdateCursorPosition(SDL_Window *window)
>+{
>+    SDL_Mouse *mouse = SDL_GetMouse();
>+    SDL_DisplayData *dispdata = (SDL_DisplayData *) SDL_GetDisplayForWindow(window)->driverdata;
>+
>+    int x, y, ytop;
>+
>+    if (!mouse || !mouse->cur_cursor || !mouse->cursor_shown) {
>+        return;
>+    }
>+
>+    ytop = dispdata->mode.vdisplay - window->h;
>+
>+    x = mouse->x;
>+    y = mouse->y;
>+
>+    if (x > window->w) {
>+	x = window->w;
>+    }
>+
>+    if (dispdata->cursor_bo) {
>+        int drm_fd = KMSDRM_gbm_device_get_fd(KMSDRM_gbm_bo_get_device(dispdata->cursor_bo));
>+        KMSDRM_drmModeMoveCursor(drm_fd, dispdata->crtc->crtc_id, x, ytop + y);
>+    }
>+}
>+
> /* When we create a window, we have to test if we have to show the cursor,
>    and explicily do so if necessary.
>    This is because when we destroy a window, we take the cursor away from the
>@@ -349,8 +378,7 @@ cleanup:
> void
> KMSDRM_InitCursor()
> {
>-    SDL_Mouse *mouse = NULL;
>-    mouse = SDL_GetMouse();
>+    SDL_Mouse *mouse = SDL_GetMouse();
> 
>     if (!mouse || !mouse->cur_cursor || !mouse->cursor_shown) {
>         return;
>@@ -418,11 +446,11 @@ KMSDRM_ShowCursor(SDL_Cursor * cursor)
>     return ret;
> }
> 
>-/* Warp the mouse to (x,y) */
>+/* Warp the mouse to (x,y) relative to the window, which in our case
>+   always starts at global 0,0, so simply calling WarpMouseGlobal is ok. */
> static void
> KMSDRM_WarpMouse(SDL_Window * window, int x, int y)
> {
>-    /* Only one global/fullscreen window is supported */
>     KMSDRM_WarpMouseGlobal(x, y);
> }
> 
>@@ -442,14 +470,14 @@ KMSDRM_WarpMouseGlobal(int x, int y)
> 
>         /* And now update the cursor graphic position on screen. */
>         if (dispdata->cursor_bo) {
>-	    int drm_fd, screen_y;
>+
>+	    int drm_fd = KMSDRM_gbm_device_get_fd(KMSDRM_gbm_bo_get_device(dispdata->cursor_bo));
>             int ret = 0;
> 
>             /* Correct the Y coordinate, because DRM mouse coordinates start on screen top. */
>-            screen_y = dispdata->mode.vdisplay - window->h + mouse->y;
>+            y = dispdata->mode.vdisplay - window->h + mouse->y;
> 
>-	    drm_fd = KMSDRM_gbm_device_get_fd(KMSDRM_gbm_bo_get_device(dispdata->cursor_bo));
>-	    ret = KMSDRM_drmModeMoveCursor(drm_fd, dispdata->crtc->crtc_id, x, screen_y);
>+	    ret = KMSDRM_drmModeMoveCursor(drm_fd, dispdata->crtc->crtc_id, x, y);
> 
> 	    if (ret) {
> 		SDL_SetError("drmModeMoveCursor() failed.");
>diff -rupN SDL/src/video/kmsdrm/SDL_kmsdrmmouse.h SDL2/src/video/kmsdrm/SDL_kmsdrmmouse.h
>--- SDL/src/video/kmsdrm/SDL_kmsdrmmouse.h	2021-01-31 04:03:23.062013688 +0100
>+++ SDL2/src/video/kmsdrm/SDL_kmsdrmmouse.h	2021-02-04 01:11:14.298683955 +0100
>@@ -49,6 +49,7 @@ extern void KMSDRM_QuitMouse(_THIS);
> extern void KMSDRM_CreateCursorBO(SDL_VideoDisplay *display);
> extern void KMSDRM_DestroyCursorBO(_THIS, SDL_VideoDisplay *display);
> extern void KMSDRM_InitCursor();
>+extern void KMSDRM_UpdateCursorPosition(SDL_Window *window);
> 
> #endif /* SDL_KMSDRM_mouse_h_ */
> 
>diff -rupN SDL/src/video/kmsdrm/SDL_kmsdrmvideo.c SDL2/src/video/kmsdrm/SDL_kmsdrmvideo.c
>--- SDL/src/video/kmsdrm/SDL_kmsdrmvideo.c	2021-01-31 04:03:23.066013767 +0100
>+++ SDL2/src/video/kmsdrm/SDL_kmsdrmvideo.c	2021-02-04 01:11:14.298683955 +0100
>@@ -1228,14 +1228,9 @@ KMSDRM_CreateWindow(_THIS, SDL_Window *
>     SDL_SetMouseFocus(window);
>     SDL_SetKeyboardFocus(window);
> 
>-    /***********************************************************/
>-    /* Tell SDL that the mouse has entered the window using an */
>-    /* artificial event: we have no windowing system to tell   */
>-    /* SDL that it has happened. This makes SDL set the        */
>-    /* SDL_WINDOW_MOUSE_FOCUS on this window, thus fixing      */
>-    /* Scummvm sticky-on-sides software cursor.                */
>-    /***********************************************************/
>-    SDL_SendWindowEvent(window, SDL_WINDOWEVENT_ENTER, 0, 0);
>+    /* Update the cursor graphic position to the mouse position,
>+       making sure it's inside the window limits. */
>+    KMSDRM_UpdateCursorPosition(window);
> 
> cleanup:
> 
>@@ -1302,6 +1297,10 @@ KMSDRM_ReconfigureWindow( _THIS, SDL_Win
>        as pending so it's done on SwapWindow.  */
>     KMSDRM_CreateSurfaces(_this, window);
>     dispdata->modeset_pending = SDL_TRUE;
>+
>+    /* Update the cursor graphic position to the mouse position,
>+       making sure it's inside the window limits. */
>+    KMSDRM_UpdateCursorPosition(window);
> }
> 
> int

Actions: View | Diff

Attachments on bug 5519: 4738 | 4753 | 4754 | 4755 | 4758

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.