Commit 73010da4dc8dbbba7017d6cef425d75e9e002119
2020-10-19T17:26:33
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
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53
diff --git a/src/video/x11/SDL_x11events.c b/src/video/x11/SDL_x11events.c
index bdd9518..a4d8a9f 100644
--- a/src/video/x11/SDL_x11events.c
+++ b/src/video/x11/SDL_x11events.c
@@ -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;