assert that add_new is not making a duplicate entry

[chaz/openbox] / openbox / event.c

diff --git a/openbox/event.c b/openbox/event.c
index 8554ce93a169a0376033b0fc8f65d146c1227fee..71dca5f7da3dc702b0c3507b840c1ac1c42320c3 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -364,7 +364,12 @@ static void event_done(gpointer data)
 
             /* is focus anywhere valid? */
             XGetInputFocus(ob_display, &w, &r);
-            if (!w || w == RootWindow(ob_display, ob_screen))
+
+#ifdef DEBUG_FOCUS
+            ob_debug("Focus was found on 0x%x revert %d\n", w, r);
+#endif
+
+            if (!w || w == PointerRoot)
                 focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS);
         }
         last = focus_client;
@@ -841,7 +846,10 @@ static void event_handle_client(ObClient *client, XEvent *e)
     case MapRequest:
         ob_debug("MapRequest for 0x%lx\n", client->window);
         if (!client->iconic) break; /* this normally doesn't happen, but if it
-                                       does, we don't want it! */
+                                       does, we don't want it!
+                                       it can happen now when the window is on
+                                       another desktop, but we still don't
+                                       want it! */
         client_activate(client, FALSE);
         break;
     case ClientMessage: