mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-10-20 08:41:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

x11: Properly check for XInput2 support before using it.

Browse Source 
This specifically fixes a crash in X11_WarpMouseInternal if XInput2 was
missing at runtime, but also cleans up a few other existing checks.

Fixes #8378.

(cherry picked from commit 82f54af617)
This commit is contained in:
Ryan C. Gordon
2023-10-11 00:50:53 -04:00
parent e417c6cffe
commit 2849ca404e
1 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/video/x11/SDL_x11mouse.c
View File

@@ -330,13 +330,16 @@ static void WarpMouseInternal(Window xwindow, const int x, const int y)
Display *display = videodata->display; Display *display = videodata->display;
#if SDL_VIDEO_DRIVER_X11_XINPUT2 #if SDL_VIDEO_DRIVER_X11_XINPUT2
int deviceid = 0; int deviceid = 0;
if (X11_Xinput2IsInitialized()) {
/* It seems XIWarpPointer() doesn't work correctly on multi-head setups: /* It seems XIWarpPointer() doesn't work correctly on multi-head setups:
* https://developer.blender.org/rB165caafb99c6846e53d11c4e966990aaffc06cea * https://developer.blender.org/rB165caafb99c6846e53d11c4e966990aaffc06cea
*/ */
if (ScreenCount(display) == 1) { if (ScreenCount(display) == 1) {
X11_XIGetClientPointer(display, None, &deviceid); X11_XIGetClientPointer(display, None, &deviceid);
} }
}
if (deviceid != 0) { if (deviceid != 0) {
SDL_assert(SDL_X11_HAVE_XINPUT2);
X11_XIWarpPointer(display, deviceid, None, xwindow, 0.0, 0.0, 0, 0, (double)x, (double)y); X11_XIWarpPointer(display, deviceid, None, xwindow, 0.0, 0.0, 0, 0, (double)x, (double)y);
} else } else
#endif #endif
@@ -369,14 +372,7 @@ static int X11_WarpMouseGlobal(int x, int y)
static int X11_SetRelativeMouseMode(SDL_bool enabled) static int X11_SetRelativeMouseMode(SDL_bool enabled)
{ {
#if SDL_VIDEO_DRIVER_X11_XINPUT2 return X11_Xinput2IsInitialized() ? 0 : SDL_Unsupported();
if (X11_Xinput2IsInitialized()) {
return 0;
}
#else
SDL_Unsupported();
#endif
return -1;
} }
static int X11_CaptureMouse(SDL_Window *window) static int X11_CaptureMouse(SDL_Window *window)
@@ -414,12 +410,9 @@ static Uint32 X11_GetGlobalMouseState(int *x, int *y)
/* !!! FIXME: should we XSync() here first? */ /* !!! FIXME: should we XSync() here first? */
#if !SDL_VIDEO_DRIVER_X11_XINPUT2 if (!X11_Xinput2IsInitialized()) {
videodata->global_mouse_changed = SDL_TRUE; videodata->global_mouse_changed = SDL_TRUE;
#else }
if (!SDL_X11_HAVE_XINPUT2)
videodata->global_mouse_changed = SDL_TRUE;
#endif
/* check if we have this cached since XInput last saw the mouse move. */ /* check if we have this cached since XInput last saw the mouse move. */
/* !!! FIXME: can we just calculate this from XInput's events? */ /* !!! FIXME: can we just calculate this from XInput's events? */