Commit f001a00b081e864fd2e7eef1e6f7313b9db916e5
2015-05-29T15:21:47
X11: Force the window focus during ShowWindow if there's no window manager. Fixes Bugzilla #2997.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42
diff --git a/src/video/x11/SDL_x11window.c b/src/video/x11/SDL_x11window.c
index 8ce979d..245050e 100644
--- a/src/video/x11/SDL_x11window.c
+++ b/src/video/x11/SDL_x11window.c
@@ -884,6 +884,24 @@ X11_SetWindowBordered(_THIS, SDL_Window * window, SDL_bool bordered)
X11_XCheckIfEvent(display, &event, &isMapNotify, (XPointer)&data->xwindow);
}
+static SDL_bool
+X11_HasWindowManager(const SDL_WindowData *data)
+{
+ const SDL_DisplayData *displaydata =
+ (SDL_DisplayData *) SDL_GetDisplayForWindow(data->window)->driverdata;
+ Display *display = data->videodata->display;
+ const int screen = displaydata->screen;
+ char atomname[16];
+ Atom atom;
+
+ /* Compliments to Chromium for this technique.
+ Window Managers are supposed to own "WM_Sx" selections, where
+ "x" is the screen number (ICCCM 2.8). */
+ SDL_snprintf(atomname, sizeof (atomname), "WM_S%d", screen);
+ atom = X11_XInternAtom(display, atomname, True);
+ return ((atom != None) && (X11_XGetSelectionOwner(display, atom) != None));
+}
+
void
X11_ShowWindow(_THIS, SDL_Window * window)
{
@@ -899,6 +917,12 @@ X11_ShowWindow(_THIS, SDL_Window * window)
X11_XIfEvent(display, &event, &isMapNotify, (XPointer)&data->xwindow);
X11_XFlush(display);
}
+
+ if (!X11_HasWindowManager(data)) {
+ /* no WM means no FocusIn event, which confuses us. Force it. */
+ X11_XSetInputFocus(display, data->xwindow, RevertToNone, CurrentTime);
+ X11_XFlush(display);
+ }
}
void