encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix X11_RestoreWindow() and X11_RaiseWindow() to properly do window activation. 

X11_RestoreWindow() had a call ordering problem that prevented activation, and X11_RaiseWindow() wasn't attempting activation. Windows and OS X both activate in these cases.

CR: saml
This commit is contained in:
Sam Lantinga 2013-09-13 17:42:38 -07:00
parent 67c02a282a
commit 49d64d52d5
1 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -935,6 +935,34 @@ X11_HideWindow(_THIS, SDL_Window * window)
} }
} }
static void
SetWindowActive(_THIS, SDL_Window * window)
{
SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
SDL_DisplayData *displaydata =
(SDL_DisplayData *) SDL_GetDisplayForWindow(window)->driverdata;
Display *display = data->videodata->display;
Atom _NET_ACTIVE_WINDOW = data->videodata->_NET_ACTIVE_WINDOW;
if (X11_IsWindowMapped(_this, window)) {
XEvent e;
SDL_zero(e);
e.xany.type = ClientMessage;
e.xclient.message_type = _NET_ACTIVE_WINDOW;
e.xclient.format = 32;
e.xclient.window = data->xwindow;
e.xclient.data.l[0] = 1; /* source indication. 1 = application */
e.xclient.data.l[1] = CurrentTime;
e.xclient.data.l[2] = 0;
XSendEvent(display, RootWindow(display, displaydata->screen), 0,
SubstructureNotifyMask | SubstructureRedirectMask, &e);
XFlush(display);
}
}
void void
X11_RaiseWindow(_THIS, SDL_Window * window) X11_RaiseWindow(_THIS, SDL_Window * window)
{ {
@ -942,6 +970,7 @@ X11_RaiseWindow(_THIS, SDL_Window * window)
Display *display = data->videodata->display; Display *display = data->videodata->display;
XRaiseWindow(display, data->xwindow); XRaiseWindow(display, data->xwindow);
SetWindowActive(_this, window);
XFlush(display); XFlush(display);
} }
@ -1002,40 +1031,12 @@ X11_MinimizeWindow(_THIS, SDL_Window * window)
XFlush(display); XFlush(display);
} }
static void
SetWindowActive(_THIS, SDL_Window * window)
{
SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
SDL_DisplayData *displaydata =
(SDL_DisplayData *) SDL_GetDisplayForWindow(window)->driverdata;
Display *display = data->videodata->display;
Atom _NET_ACTIVE_WINDOW = data->videodata->_NET_ACTIVE_WINDOW;
if (X11_IsWindowMapped(_this, window)) {
XEvent e;
SDL_zero(e);
e.xany.type = ClientMessage;
e.xclient.message_type = _NET_ACTIVE_WINDOW;
e.xclient.format = 32;
e.xclient.window = data->xwindow;
e.xclient.data.l[0] = 1; /* source indication. 1 = application */
e.xclient.data.l[1] = CurrentTime;
e.xclient.data.l[2] = 0;
XSendEvent(display, RootWindow(display, displaydata->screen), 0,
SubstructureNotifyMask | SubstructureRedirectMask, &e);
XFlush(display);
}
}
void void
X11_RestoreWindow(_THIS, SDL_Window * window) X11_RestoreWindow(_THIS, SDL_Window * window)
{ {
SetWindowMaximized(_this, window, SDL_FALSE); SetWindowMaximized(_this, window, SDL_FALSE);
SetWindowActive(_this, window);
X11_ShowWindow(_this, window); X11_ShowWindow(_this, window);
SetWindowActive(_this, window);
} }
/* This asks the Window Manager to handle fullscreen for us. Most don't do it right, though. */ /* This asks the Window Manager to handle fullscreen for us. Most don't do it right, though. */