don't use XPutBackEvent and mess up timestamp order in the event queue

[chaz/openbox] / openbox / window.c

diff --git a/openbox/window.c b/openbox/window.c
index 28b08571375be05152be7a4ac8d308962611b5ed..c8cb348c7cdc36950b46bed21c9675bb7907ad1b 100644 (file)
--- a/openbox/window.c
+++ b/openbox/window.c
@@ -23,6 +23,7 @@
 #include "client.h"
 #include "frame.h"
 #include "openbox.h"
+#include "prompt.h"
 #include "debug.h"
 #include "grab.h"
 
@@ -57,6 +58,8 @@ Window window_top(ObWindow *self)
         return WINDOW_AS_CLIENT(self)->frame->window;
     case OB_WINDOW_CLASS_INTERNAL:
         return WINDOW_AS_INTERNAL(self)->window;
+    case OB_WINDOW_CLASS_PROMPT:
+        return WINDOW_AS_PROMPT(self)->super.window;
     }
     g_assert_not_reached();
     return None;
@@ -72,6 +75,10 @@ ObStackingLayer window_layer(ObWindow *self)
     case OB_WINDOW_CLASS_MENUFRAME:
     case OB_WINDOW_CLASS_INTERNAL:
         return OB_STACKING_LAYER_INTERNAL;
+    case OB_WINDOW_CLASS_PROMPT:
+        /* not used directly for stacking, prompts are managed as clients */
+        g_assert_not_reached();
+        break;
     }
     g_assert_not_reached();
     return None;
@@ -139,6 +146,13 @@ void window_manage_all(void)
     if (children) XFree(children);
 }
 
+static Bool check_unmap(Display *d, XEvent *e, XPointer arg)
+{
+    const Window win = *(Window*)arg;
+    return ((e->type == DestroyNotify && e->xdestroywindow.window == win) ||
+            (e->type == UnmapNotify && e->xunmap.window == win));
+}
+
 void window_manage(Window win)
 {
     XEvent e;
@@ -151,11 +165,8 @@ void window_manage(Window win)
 
     /* check if it has already been unmapped by the time we started
        mapping. the grab does a sync so we don't have to here */
-    if (XCheckTypedWindowEvent(obt_display, win, DestroyNotify, &e) ||
-        XCheckTypedWindowEvent(obt_display, win, UnmapNotify, &e))
-    {
-        XPutBackEvent(obt_display, &e);
-        ob_debug("Trying to manage unmapped window. Aborting that.\n");
+    if (XCheckIfEvent(obt_display, &e, check_unmap, (XPointer)&win)) {
+        ob_debug("Trying to manage unmapped window. Aborting that.");
         no_manage = TRUE;
     }
 
@@ -180,7 +191,7 @@ void window_manage(Window win)
 
     if (!no_manage) {
         if (attrib.override_redirect) {
-            ob_debug("not managing override redirect window 0x%x\n", win);
+            ob_debug("not managing override redirect window 0x%x", win);
             grab_server(FALSE);
         }
         else if (is_dockapp) {
@@ -189,11 +200,11 @@ void window_manage(Window win)
             dock_manage(icon_win, win);
         }
         else
-            client_manage(win);
+            client_manage(win, NULL);
     }
     else {
         grab_server(FALSE);
-        ob_debug("FAILED to manage window 0x%x\n", win);
+        ob_debug("FAILED to manage window 0x%x", win);
     }
 }