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] Patch that fixes sticky cursor on programs were mouse coords are tracked but cursor area is smaller than total screen area

sticky_cusor_rpi_and_kmsdrm.diff (text/plain), 4.15 KB, created by Manuel Alfayate Corchete on 2017-11-25 21:58:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Manuel Alfayate Corchete

Created: 2017-11-25 21:58:03 UTC

Size: 4.15 KB

patch

obsolete

>diff -rupN SDL-ORIG/src/video/kmsdrm/SDL_kmsdrmmouse.c SDL-CURFIX/src/video/kmsdrm/SDL_kmsdrmmouse.c
>--- SDL-ORIG/src/video/kmsdrm/SDL_kmsdrmmouse.c	2017-11-25 22:31:51.485165010 +0100
>+++ SDL-CURFIX/src/video/kmsdrm/SDL_kmsdrmmouse.c	2017-11-25 22:37:41.629337316 +0100
>@@ -423,8 +423,13 @@ KMSDRM_WarpMouseGlobal(int x, int y)
>     SDL_Mouse *mouse = SDL_GetMouse();
> 
>     if (mouse != NULL && mouse->cur_cursor != NULL && mouse->cur_cursor->driverdata != NULL) {
>+        /* Update internal mouse position. */
>+        SDL_SendMouseMotion(mouse->focus, mouse->mouseID, 0, x, y);
>+
>+        /* And now update the cursor graphic position on screen. */
>         curdata = (KMSDRM_CursorData *) mouse->cur_cursor->driverdata;
>         if (curdata->bo != NULL) {
>+
>             if (curdata->crtc_id != 0) {
>                 int ret, drm_fd;
>                 drm_fd = KMSDRM_gbm_device_get_fd(KMSDRM_gbm_bo_get_device(curdata->bo));
>@@ -475,7 +480,20 @@ static void
> KMSDRM_MoveCursor(SDL_Cursor * cursor)
> {
>     SDL_Mouse *mouse = SDL_GetMouse();
>-    KMSDRM_WarpMouse(mouse->focus, mouse->x, mouse->y);
>+    KMSDRM_CursorData *curdata;
>+    int drm_fd, ret;
>+
>+    /* We must NOT call SDL_SendMouseMotion() here or we will enter recursivity!
>+       That's why we move the cursor graphic ONLY. */
>+    if (mouse != NULL && mouse->cur_cursor != NULL && mouse->cur_cursor->driverdata != NULL) {
>+        curdata = (KMSDRM_CursorData *) mouse->cur_cursor->driverdata;
>+	drm_fd = KMSDRM_gbm_device_get_fd(KMSDRM_gbm_bo_get_device(curdata->bo));
>+	ret = KMSDRM_drmModeMoveCursor(drm_fd, curdata->crtc_id, mouse->x, mouse->y);
>+
>+	if (ret) {
>+	    SDL_SetError("drmModeMoveCursor() failed.");
>+	}
>+    }
> }
> 
> #endif /* SDL_VIDEO_DRIVER_KMSDRM */
>diff -rupN SDL-ORIG/src/video/raspberry/SDL_rpimouse.c SDL-CURFIX/src/video/raspberry/SDL_rpimouse.c
>--- SDL-ORIG/src/video/raspberry/SDL_rpimouse.c	2017-11-25 22:31:51.485165010 +0100
>+++ SDL-CURFIX/src/video/raspberry/SDL_rpimouse.c	2017-11-25 22:37:16.009129568 +0100
>@@ -247,6 +247,65 @@ RPI_WarpMouseGlobal(int x, int y)
>         return 0;
>     }
> 
>+    /* Update internal mouse position. */
>+    SDL_SendMouseMotion(mouse->focus, mouse->mouseID, 0, x, y);
>+
>+    curdata = (RPI_CursorData *) mouse->cur_cursor->driverdata;
>+    if (curdata->element == DISPMANX_NO_HANDLE) {
>+        return 0;
>+    }
>+
>+    update = vc_dispmanx_update_start(10);
>+    if (!update) {
>+        return 0;
>+    }
>+
>+    src_rect.x = 0;
>+    src_rect.y = 0;
>+    src_rect.width  = curdata->w << 16;
>+    src_rect.height = curdata->h << 16;
>+    dst_rect.x = x;
>+    dst_rect.y = y;
>+    dst_rect.width  = curdata->w;
>+    dst_rect.height = curdata->h;
>+
>+    ret = vc_dispmanx_element_change_attributes(
>+        update,
>+        curdata->element,
>+        0,
>+        0,
>+        0,
>+        &dst_rect,
>+        &src_rect,
>+        DISPMANX_NO_HANDLE,
>+        DISPMANX_NO_ROTATE);
>+    if (ret != DISPMANX_SUCCESS) {
>+        return SDL_SetError("vc_dispmanx_element_change_attributes() failed");
>+    }
>+
>+    /* Submit asynchronously, otherwise the peformance suffers a lot */
>+    ret = vc_dispmanx_update_submit(update, 0, NULL);
>+    if (ret != DISPMANX_SUCCESS) {
>+        return SDL_SetError("vc_dispmanx_update_submit() failed");
>+    }
>+    return 0;
>+}
>+
>+/* Warp the mouse to (x,y) */
>+static int
>+RPI_WarpMouseGlobalGraphicOnly(int x, int y)
>+{
>+    RPI_CursorData *curdata;
>+    DISPMANX_UPDATE_HANDLE_T update;
>+    int ret;
>+    VC_RECT_T dst_rect;
>+    VC_RECT_T src_rect;
>+    SDL_Mouse *mouse = SDL_GetMouse();
>+    
>+    if (mouse == NULL || mouse->cur_cursor == NULL || mouse->cur_cursor->driverdata == NULL) {
>+        return 0;
>+    }
>+
>     curdata = (RPI_CursorData *) mouse->cur_cursor->driverdata;
>     if (curdata->element == DISPMANX_NO_HANDLE) {
>         return 0;
>@@ -317,7 +376,9 @@ static void
> RPI_MoveCursor(SDL_Cursor * cursor)
> {
>     SDL_Mouse *mouse = SDL_GetMouse();
>-    RPI_WarpMouse(mouse->focus, mouse->x, mouse->y);
>+    /* We must NOT call SDL_SendMouseMotion() on the next call or we will enter recursivity, 
>+     * so we create a version of WarpMouseGlobal without it. */
>+    RPI_WarpMouseGlobalGraphicOnly(mouse->x, mouse->y);
> }
> 
> #endif /* SDL_VIDEO_DRIVER_RPI */

Actions: View | Diff

Attachments on bug 3974: 3094 | 3101

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.