dont change desktop when its out of range

[chaz/openbox] / openbox / event.c

diff --git a/openbox/event.c b/openbox/event.c
index 1844e3f61bdcbe338dd5ac30cdb29ea73c0a686d..69b63ff1334887c766dac083e0eab748d7824bd4 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -253,7 +253,7 @@ void event_process(XEvent *e)
        break;
     }
 
-    client = g_hash_table_lookup(client_map, (gpointer)window);
+    client = g_hash_table_lookup(client_map, &window);
 
     /* deal with it in the kernel */
     if (client)
@@ -275,8 +275,6 @@ void event_process(XEvent *e)
        xwc.sibling = e->xconfigurerequest.above;
        xwc.stack_mode = e->xconfigurerequest.detail;
        
-       g_message("Proxying configure event for 0x%lx", window);
-       
        /* we are not to be held responsible if someone sends us an
           invalid request! */
        xerror_set_ignore(TRUE);
@@ -323,6 +321,7 @@ static void event_handle_client(Client *client, XEvent *e)
 {
     XEvent ce;
     Atom msgtype;
+        int i=0;
      
     switch (e->type) {
     case FocusIn:
@@ -330,10 +329,10 @@ static void event_handle_client(Client *client, XEvent *e)
         client_set_focused(client, e->type == FocusIn);
        break;
     case ConfigureRequest:
-       g_message("ConfigureRequest for window %lx", client->window);
        /* compress these */
        while (XCheckTypedWindowEvent(ob_display, client->window,
                                      ConfigureRequest, &ce)) {
+            ++i;
            /* XXX if this causes bad things.. we can compress config req's
               with the same mask. */
            e->xconfigurerequest.value_mask |=
@@ -352,6 +351,7 @@ static void event_handle_client(Client *client, XEvent *e)
            if (ce.xconfigurerequest.value_mask & CWStackMode)
                e->xconfigurerequest.detail = ce.xconfigurerequest.detail;
        }
+        if (i) g_message("Compressed %d Configures", i);
 
        /* if we are iconic (or shaded (fvwm does this)) ignore the event */
        if (client->iconic || client->shaded) return;
@@ -438,6 +438,8 @@ static void event_handle_client(Client *client, XEvent *e)
        client_unmanage(client);
        break;
     case MapRequest:
+        if (!client->iconic) break; /* this normally doesn't happen, but if it
+                                       does, we don't want it! */
         if (screen_showing_desktop)
             screen_show_desktop(FALSE);
         client_iconify(client, FALSE, TRUE);
@@ -483,7 +485,9 @@ static void event_handle_client(Client *client, XEvent *e)
                }
                e->xclient = ce.xclient;
            }
-           client_set_desktop(client, e->xclient.data.l[0]);
+            if (e->xclient.data.l[0] >= 0 &&
+                e->xclient.data.l[0] < screen_num_desktops)
+                client_set_desktop(client, e->xclient.data.l[0]);
        } else if (msgtype == prop_atoms.net_wm_state) {
            /* can't compress these */
            g_message("net_wm_state %s %ld %ld for 0x%lx",