commit 491136b77c94e18f97a710f134d48ff5b692f432
author Manuel Alfayate Corchete <redwindwanderer@gmail.com> Fri Feb 05 22:16:50 2021 +0100
committer Manuel Alfayate Corchete <redwindwanderer@gmail.com> Fri Feb 05 22:16:50 2021 +0100
tree 4be69237466594bc63255b26292b9a0ae50774c1
parent 03b83bacd1f6f815d9f2b7d1493f5ac40e153edc

[KMS/DRM] Merge patch for bug #5532: No need to correct cursor position now that all windows are fullscreen. Link: https://bugzilla.libsdl.org/show_bug.cgi?id=5519.

src/video/kmsdrm/SDL_kmsdrmmouse.c

diff --git a/src/video/kmsdrm/SDL_kmsdrmmouse.c b/src/video/kmsdrm/SDL_kmsdrmmouse.c
index f296478..6a0e09e 100644
--- a/src/video/kmsdrm/SDL_kmsdrmmouse.c
+++ b/src/video/kmsdrm/SDL_kmsdrmmouse.c
@@ -349,8 +349,7 @@
 void
 KMSDRM_InitCursor()
 {
-    SDL_Mouse *mouse = NULL;
-    mouse = SDL_GetMouse();
+    SDL_Mouse *mouse = SDL_GetMouse();
 
     if (!mouse || !mouse->cur_cursor || !mouse->cursor_shown) {
         return;
@@ -442,14 +441,11 @@
 
         /* And now update the cursor graphic position on screen. */
         if (dispdata->cursor_bo) {
-	    int drm_fd, screen_y;
+	    int drm_fd;
             int ret = 0;
 
-            /* Correct the Y coordinate, because DRM mouse coordinates start on screen top. */
-            screen_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.");
@@ -504,7 +500,7 @@
 KMSDRM_MoveCursor(SDL_Cursor * cursor)
 {
     SDL_Mouse *mouse = SDL_GetMouse();
-    int drm_fd, screen_y;
+    int drm_fd;
     int ret = 0;
 
     /* We must NOT call SDL_SendMouseMotion() here or we will enter recursivity!
@@ -521,10 +517,7 @@
 
         drm_fd = KMSDRM_gbm_device_get_fd(KMSDRM_gbm_bo_get_device(dispdata->cursor_bo));
 
-        /* Correct the Y coordinate, because DRM mouse coordinates start on screen top. */
-        screen_y = dispdata->mode.vdisplay - window->h + mouse->y;
-
-        ret = KMSDRM_drmModeMoveCursor(drm_fd, dispdata->crtc->crtc_id, mouse->x, screen_y);
+        ret = KMSDRM_drmModeMoveCursor(drm_fd, dispdata->crtc->crtc_id, mouse->x, mouse->y);
 
         if (ret) {
             SDL_SetError("drmModeMoveCursor() failed.");