encounter/SDL
1
0
Fork 0
mirror of https://github.com/encounter/SDL.git synced 2025-06-05 14:13:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed interactions between mouse capture and grab on X11

Browse Source 
Fixes https://github.com/libsdl-org/SDL/issues/6072
This commit is contained in:
Sam Lantinga 2022-08-17 14:25:30 -07:00
parent 7da74eb5be
commit 8acb4e45b3
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -358,16 +358,20 @@ static int
X11_CaptureMouse(SDL_Window *window) X11_CaptureMouse(SDL_Window *window)
{ {
Display *display = GetDisplay(); Display *display = GetDisplay();
SDL_Window *mouse_focus = SDL_GetMouseFocus();
if (window) { if (window) {
SDL_WindowData *data = (SDL_WindowData *) window->driverdata; SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
const unsigned int mask = ButtonPressMask | ButtonReleaseMask | PointerMotionMask | FocusChangeMask; const unsigned int mask = ButtonPressMask | ButtonReleaseMask | PointerMotionMask | FocusChangeMask;
Window confined = (data->mouse_grabbed ? data->xwindow : None);
const int rc = X11_XGrabPointer(display, data->xwindow, False, const int rc = X11_XGrabPointer(display, data->xwindow, False,
mask, GrabModeAsync, GrabModeAsync, mask, GrabModeAsync, GrabModeAsync,
None, None, CurrentTime); confined, None, CurrentTime);
if (rc != GrabSuccess) { if (rc != GrabSuccess) {
return SDL_SetError("X server refused mouse capture"); return SDL_SetError("X server refused mouse capture");
} }
} else if (mouse_focus) {
SDL_UpdateWindowGrab(mouse_focus);
} else { } else {
X11_XUngrabPointer(display, CurrentTime); X11_XUngrabPointer(display, CurrentTime);
} }

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

@ -1600,6 +1600,7 @@ X11_SetWindowMouseGrab(_THIS, SDL_Window * window, SDL_bool grabbed)
if (data == NULL) { if (data == NULL) {
return; return;
} }
data->mouse_grabbed = SDL_FALSE;
display = data->videodata->display; display = data->videodata->display;
@ -1622,6 +1623,7 @@ X11_SetWindowMouseGrab(_THIS, SDL_Window * window, SDL_bool grabbed)
result = X11_XGrabPointer(display, data->xwindow, True, mask, GrabModeAsync, result = X11_XGrabPointer(display, data->xwindow, True, mask, GrabModeAsync,
GrabModeAsync, data->xwindow, None, CurrentTime); GrabModeAsync, data->xwindow, None, CurrentTime);
if (result == GrabSuccess) { if (result == GrabSuccess) {
data->mouse_grabbed = SDL_TRUE;
break; break;
} }
SDL_Delay(50); SDL_Delay(50);

1
src/video/x11/SDL_x11window.h
View File

@ -59,6 +59,7 @@ typedef struct
int border_right; int border_right;
int border_top; int border_top;
int border_bottom; int border_bottom;
SDL_bool mouse_grabbed;
Uint32 last_focus_event_time; Uint32 last_focus_event_time;
PendingFocusEnum pending_focus; PendingFocusEnum pending_focus;
Uint32 pending_focus_time; Uint32 pending_focus_time;