Commit e3f5744db42fe66453fb780a8d2412846849f45b

Sam Lantinga 2022-10-25T12:14:00

Don't use XIWarpPointer() on multi-display configurations

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
diff --git a/src/video/x11/SDL_x11mouse.c b/src/video/x11/SDL_x11mouse.c
index 3bf762d..04c5b8c 100644
--- a/src/video/x11/SDL_x11mouse.c
+++ b/src/video/x11/SDL_x11mouse.c
@@ -317,7 +317,12 @@ WarpMouseInternal(Window xwindow, const int x, const int y)
     Display *display = videodata->display;
 #if SDL_VIDEO_DRIVER_X11_XINPUT2
     int deviceid = 0;
-    X11_XIGetClientPointer(display, None, &deviceid);
+    /* It seems XIWarpPointer() doesn't work correctly on multi-head setups:
+     * https://developer.blender.org/rB165caafb99c6846e53d11c4e966990aaffc06cea
+     */
+    if (SDL_GetNumVideoDisplays() == 1) {
+        X11_XIGetClientPointer(display, None, &deviceid);
+    }
     if (deviceid != 0) {
         X11_XIWarpPointer(display, deviceid, None, xwindow, 0.0, 0.0, 0, 0, (double)x, (double)y);
     } else