Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
x11: Don't loop forever if the X server refuses a pointer grab.
  • Loading branch information
icculus committed Dec 27, 2016
1 parent 76f2ae3 commit 7c31636
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 7 deletions.
2 changes: 2 additions & 0 deletions src/video/x11/SDL_x11video.h
Expand Up @@ -124,6 +124,8 @@ typedef struct SDL_VideoData
SDL_Scancode key_layout[256];
SDL_bool selection_waiting;

SDL_bool broken_pointer_grab; /* true if XGrabPointer seems unreliable. */

Uint32 last_mode_change_deadline;

SDL_bool global_mouse_changed;
Expand Down
25 changes: 18 additions & 7 deletions src/video/x11/SDL_x11window.c
Expand Up @@ -41,6 +41,7 @@
#include "SDL_timer.h"
#include "SDL_syswm.h"
#include "SDL_assert.h"
#include "SDL_log.h"

#define _NET_WM_STATE_REMOVE 0l
#define _NET_WM_STATE_ADD 1l
Expand Down Expand Up @@ -1483,14 +1484,24 @@ X11_SetWindowGrab(_THIS, SDL_Window * window, SDL_bool grabbed)

if (oldstyle_fullscreen || grabbed) {
/* Try to grab the mouse */
for (;;) {
int result =
X11_XGrabPointer(display, data->xwindow, True, 0, GrabModeAsync,
GrabModeAsync, data->xwindow, None, CurrentTime);
if (result == GrabSuccess) {
break;
if (!data->videodata->broken_pointer_grab) {
int attempts;
int result;

/* Try for up to ~250ms to grab. If it still fails, stop trying. */
for (attempts = 0; attempts < 5; attempts++) {
result = X11_XGrabPointer(display, data->xwindow, True, 0, GrabModeAsync,
GrabModeAsync, data->xwindow, None, CurrentTime);
if (result == GrabSuccess) {
break;
}
SDL_Delay(50);
}

if (result != GrabSuccess) {
SDL_LogWarn(SDL_LOG_CATEGORY_VIDEO, "The X server refused to let us grab the mouse. You might experience input bugs.");
data->videodata->broken_pointer_grab = SDL_TRUE; /* don't try again. */
}
SDL_Delay(50);
}

/* Raise the window if we grab the mouse */
Expand Down

0 comments on commit 7c31636

Please sign in to comment.