mirror
/
SDL
mirror of https://github.com/libsdl-org/SDL.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

x11: Ungrab before attempting a confinement grab with XInput2 enabled 

If XInput2 is enabled, it will grab the pointer on button presses, which results in XGrabPointer returning AlreadyGrabbed. Clear any existing grabs before attempting the confinement grab to avoid a timeout scenario.
This commit is contained in:
Frank Praznik 2024-06-13 12:39:20 -04:00
parent 4919359a6f
commit 4eb08a6154
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/video/x11/SDL_x11window.c
View File

@ -1855,6 +1855,14 @@ int X11_SetWindowMouseGrab(SDL_VideoDevice *_this, SDL_Window *window, SDL_bool
return 0;
}
/* If XInput2 is enabled, it will grab the pointer on button presses,
* which results in XGrabPointer returning AlreadyGrabbed. Clear any
* existing grabs before attempting the confinement grab.
*/
if (data->xinput2_mouse_enabled) {
X11_XUngrabPointer(display, CurrentTime);
}
/* Try to grab the mouse */
if (!data->videodata->broken_pointer_grab) {
const unsigned int mask = ButtonPressMask | ButtonReleaseMask | PointerMotionMask | FocusChangeMask;