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

x11events: ignore UnmapNotify events from XReparentWindow 

UnmapNotify event does not mean that window has been iconified. It
just reports that window changed state from mapped to unmapped.

XReparentWindow can unmap and remap window if it was mapped. This
causes unnecessary events - HIDDEN, MINIMIZED, RESTORED and SHOW.

These events are problematic with Metacity 3.36+ which started to
remove window decorations from fullscreen windows.

- SDL makes decorated window fullscreen
- Metacity removes decorations
- SDL gets UnmapNotify and exits from fullscreen
- Metacity re-adds decorations

As SDL will also get MapNotify event it will try to restore
window state causing above steps to repeat.

https://bugzilla.libsdl.org/show_bug.cgi?id=5314
Alberts Muktup?vels 2020-10-19 17:26:33 -07:00
parent e37a9385e2
commit 73010da4dc
1 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/video/x11/SDL_x11events.c
View File

@ -642,6 +642,29 @@ X11_HandleClipboardEvent(_THIS, const XEvent *xevent)
}
}
static Bool
isMapNotify(Display *display, XEvent *ev, XPointer arg)
{
XUnmapEvent *unmap;
unmap = (XUnmapEvent*) arg;
return ev->type == MapNotify &&
ev->xmap.window == unmap->window &&
ev->xmap.serial == unmap->serial;
}
static Bool
isReparentNotify(Display *display, XEvent *ev, XPointer arg)
{
XUnmapEvent *unmap;
unmap = (XUnmapEvent*) arg;
return ev->type == ReparentNotify &&
ev->xreparent.window == unmap->window &&
ev->xreparent.serial == unmap->serial;
}
static void
X11_DispatchEvent(_THIS)
@ -948,10 +971,17 @@ X11_DispatchEvent(_THIS)
/* Have we been iconified? */
case UnmapNotify:{
XEvent ev;
#ifdef DEBUG_XEVENTS
printf("window %p: UnmapNotify!\n", data);
#endif
X11_DispatchUnmapNotify(data);
if (X11_XCheckIfEvent(display, &ev, &isReparentNotify, (XPointer)&xevent.xunmap)) {
X11_XCheckIfEvent(display, &ev, &isMapNotify, (XPointer)&xevent.xunmap);
} else {
X11_DispatchUnmapNotify(data);
}
}
break;