pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed bug 2027 - Full-screen appears to be broken - hang in SDL_DestroyWindow()

Browse source 
Rainer Deyke

I'm running Linux Mint 15 with the Cinnamon window manager.  SDL_DestroyWindow consistently locks up for me when the window if fullscreen.
This commit is contained in:
Sam Lantinga 2013-08-11 19:56:43 -07:00
parent 286dc2e1dc
commit dd7da60a4f
1 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/video/x11/SDL_x11window.c
View file

@ -59,6 +59,21 @@ static Bool isConfigureNotify(Display *dpy, XEvent *ev, XPointer win)
return ev->type == ConfigureNotify && ev->xconfigure.window == *((Window*)win); return ev->type == ConfigureNotify && ev->xconfigure.window == *((Window*)win);
} }
/*
static Bool
XIfEventTimeout(Display *display, XEvent *event_return, Bool (*predicate)(), XPointer arg, int timeoutMS)
{
Uint32 start = SDL_GetTicks();
while (!XCheckIfEvent(display, event_return, predicate, arg)) {
if ((SDL_GetTicks() - start) >= timeoutMS) {
return False;
}
}
return True;
}
*/
static SDL_bool static SDL_bool
X11_IsWindowLegacyFullscreen(_THIS, SDL_Window * window) X11_IsWindowLegacyFullscreen(_THIS, SDL_Window * window)
{ {
@ -1150,6 +1165,9 @@ X11_BeginWindowFullscreenLegacy(_THIS, SDL_Window * window, SDL_VideoDisplay * _
XReparentWindow(display, data->xwindow, data->fswindow, XReparentWindow(display, data->xwindow, data->fswindow,
(rect.w - window->w) / 2, (rect.h - window->h) / 2); (rect.w - window->w) / 2, (rect.h - window->h) / 2);
/* Move the mouse to the upper left to make sure it's on-screen */
XWarpPointer(display, None, root, 0, 0, 0, 0, rect.x, rect.y);
/* Center mouse in the fullscreen window. */ /* Center mouse in the fullscreen window. */
rect.x += (rect.w / 2); rect.x += (rect.w / 2);
rect.y += (rect.h / 2); rect.y += (rect.h / 2);
@ -1190,8 +1208,9 @@ X11_EndWindowFullscreenLegacy(_THIS, SDL_Window * window, SDL_VideoDisplay * _di
XReparentWindow(display, data->xwindow, root, window->x, window->y); XReparentWindow(display, data->xwindow, root, window->x, window->y);
/* flush these events so they don't confuse normal event handling */ /* flush these events so they don't confuse normal event handling */
XIfEvent(display, &ev, &isUnmapNotify, (XPointer)&data->xwindow); XSync(display, False);
XIfEvent(display, &ev, &isMapNotify, (XPointer)&data->xwindow); XCheckIfEvent(display, &ev, &isMapNotify, (XPointer)&data->xwindow);
XCheckIfEvent(display, &ev, &isUnmapNotify, (XPointer)&data->xwindow);
SetWindowBordered(display, screen, data->xwindow, SetWindowBordered(display, screen, data->xwindow,
(window->flags & SDL_WINDOW_BORDERLESS) == 0); (window->flags & SDL_WINDOW_BORDERLESS) == 0);