geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

X11: Force the window focus during ShowWindow if there's no window manager. 

Fixes Bugzilla #2997.
Ryan C. Gordon 2015-05-29 15:21:47 -04:00
parent c888183728
commit f001a00b08
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -884,6 +884,24 @@ X11_SetWindowBordered(_THIS, SDL_Window * window, SDL_bool bordered)
X11_XCheckIfEvent(display, &event, &isMapNotify, (XPointer)&data->xwindow); 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 void
X11_ShowWindow(_THIS, SDL_Window * window) 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_XIfEvent(display, &event, &isMapNotify, (XPointer)&data->xwindow);
X11_XFlush(display); 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 void