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

Only map/unmap if the window isn't already in the correct state.

Browse source
This commit is contained in:
Sam Lantinga 2012-09-28 00:57:47 -07:00
parent 978b87dccb
commit 6380cc6759
1 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -809,12 +809,14 @@ X11_ShowWindow(_THIS, SDL_Window * window)
Display *display = data->videodata->display;
XEvent event;
XMapRaised(display, data->xwindow);
/* Blocking wait for "MapNotify" event.
* We use XIfEvent because XWindowEvent takes a mask rather than a type,
* and XCheckTypedWindowEvent doesn't block */
XIfEvent(display, &event, &isMapNotify, (XPointer)&data->xwindow);
XFlush(display);
if (!X11_IsWindowMapped(_this, window)) {
XMapRaised(display, data->xwindow);
/* Blocking wait for "MapNotify" event.
* We use XIfEvent because XWindowEvent takes a mask rather than a type,
* and XCheckTypedWindowEvent doesn't block */
XIfEvent(display, &event, &isMapNotify, (XPointer)&data->xwindow);
XFlush(display);
}
}
void
@ -824,10 +826,12 @@ X11_HideWindow(_THIS, SDL_Window * window)
Display *display = data->videodata->display;
XEvent event;
XUnmapWindow(display, data->xwindow);
/* Blocking wait for "UnmapNotify" event */
XIfEvent(display, &event, &isUnmapNotify, (XPointer)&data->xwindow);
XFlush(display);
if (X11_IsWindowMapped(_this, window)) {
XUnmapWindow(display, data->xwindow);
/* Blocking wait for "UnmapNotify" event */
XIfEvent(display, &event, &isUnmapNotify, (XPointer)&data->xwindow);
XFlush(display);
}
}
void