handle multiple maprequests graciously

[chaz/openbox] / openbox / event.c

diff --git a/openbox/event.c b/openbox/event.c
index b5f24eb84731d053e0fc2dafdcba35228c9752ae..6548d83e993b4c983f5ee4e26667ccb0ce6e08c2 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -15,6 +15,9 @@
 #include <X11/Xlib.h>
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
+#ifdef HAVE_SYS_SELECT_H
+#  include <sys/select.h>
+#endif
 
 static void event_process(XEvent *e);
 static void event_handle_root(XEvent *e);
@@ -119,6 +122,9 @@ void event_process(XEvent *e)
 
     /* pick a window */
     switch (e->type) {
+    case MapRequest:
+       window = e->xmap.window;
+       break;
     case UnmapNotify:
        window = e->xunmap.window;
        break;
@@ -245,12 +251,15 @@ void event_process(XEvent *e)
     }
 
     client = g_hash_table_lookup(client_map, (gpointer)window);
+    g_message("EVENT: 0x%lx -> 0x%lx", window, client);
 
     /* deal with it in the kernel */
-    if (client) {
+    if (client)
        event_handle_client(client, e);
-    } else if (window == ob_root)
+    else if (window == ob_root)
        event_handle_root(e);
+    else if (e->type == MapRequest)
+       client_manage(window);
     else if (e->type == ConfigureRequest) {
        /* unhandled configure requests must be used to configure the
           window directly */
@@ -283,10 +292,6 @@ static void event_handle_root(XEvent *e)
     Atom msgtype;
      
     switch(e->type) {
-    case MapRequest:
-       g_message("MapRequest on root");
-       client_manage(e->xmap.window);
-       break;
     case ClientMessage:
        if (e->xclient.format != 32) break;
 
@@ -319,22 +324,10 @@ static void event_handle_client(Client *client, XEvent *e)
      
     switch (e->type) {
     case FocusIn:
-        if (focus_client != client)
-            focus_set_client(client);
-
-       /* focus state can affect the stacking layer */
-       client_calc_layer(client);
-
-       engine_frame_adjust_focus(client->frame);
+        client_set_focused(client, TRUE);
        break;
     case FocusOut:
-       if (focus_client == client)
-           focus_set_client(NULL);
-
-       /* focus state can affect the stacking layer */
-       client_calc_layer(client);
-
-       engine_frame_adjust_focus(client->frame);
+        client_set_focused(client, FALSE);
        break;
     case ConfigureRequest:
        g_message("ConfigureRequest for window %lx", client->window);
@@ -445,9 +438,6 @@ static void event_handle_client(Client *client, XEvent *e)
        client_unmanage(client);
        break;
     case MapRequest:
-       /* we shouldn't be able to get this unless we're iconic */
-       g_assert(client->iconic);
-
         if (screen_showing_desktop)
             screen_show_desktop(FALSE);
         client_iconify(client, FALSE, TRUE);