]> Dogcows Code - chaz/openbox/blobdiff - openbox/client.c
move the focus_order lists into the kernel
[chaz/openbox] / openbox / client.c
index c8d33e833faa911e3cc9c04f8cb8aed4ed7e96ee..dfc7034838dd9ec4b485522c0d804a28a7b55f0a 100644 (file)
@@ -5,6 +5,7 @@
 #include "frame.h"
 #include "engine.h"
 #include "event.h"
+#include "grab.h"
 #include "focus.h"
 #include "stacking.h"
 #include "dispatch.h"
@@ -120,9 +121,8 @@ void client_manage(Window window)
     XWindowAttributes attrib;
     XSetWindowAttributes attrib_set;
 /*    XWMHints *wmhint; */
-     
-    XGrabServer(ob_display);
-    XSync(ob_display, FALSE);
+
+    grab_server(TRUE);
 
     /* 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 */
@@ -130,16 +130,14 @@ void client_manage(Window window)
        XCheckTypedWindowEvent(ob_display, window, UnmapNotify, &e)) {
        XPutBackEvent(ob_display, &e);
     
-       XUngrabServer(ob_display);
-       XFlush(ob_display);
+        grab_server(FALSE);
        return; /* don't manage it */
     }
 
     /* make sure it isn't an override-redirect window */
     if (!XGetWindowAttributes(ob_display, window, &attrib) ||
        attrib.override_redirect) {
-       XUngrabServer(ob_display);
-       XFlush(ob_display);
+        grab_server(FALSE);
        return; /* don't manage it */
     }
   
@@ -148,8 +146,7 @@ void client_manage(Window window)
        if ((wmhint->flags & StateHint) &&
            wmhint->initial_state == WithdrawnState) {
            /\* XXX: make dock apps work! *\/
-           XUngrabServer(ob_display);
-           XFlush(ob_display);
+            grab_server(FALSE);
            XFree(wmhint);
            return;
        }
@@ -184,8 +181,7 @@ void client_manage(Window window)
 
     client_apply_startup_state(client);
 
-    XUngrabServer(ob_display);
-    XFlush(ob_display);
+    grab_server(FALSE);
      
     client_list = g_slist_append(client_list, client);
     stacking_list = g_list_append(stacking_list, client);
@@ -218,6 +214,7 @@ void client_unmanage_all()
 
 void client_unmanage(Client *client)
 {
+    guint i;
     int j;
     GSList *it;
 
@@ -246,6 +243,15 @@ void client_unmanage(Client *client)
     stacking_list = g_list_remove(stacking_list, client);
     g_hash_table_remove(client_map, (gpointer)client->window);
 
+    /* update the focus lists */
+    if (client->desktop == DESKTOP_ALL) {
+        for (i = 0; i < screen_num_desktops; ++i)
+            focus_order[i] = g_list_remove(focus_order[i], client);
+    } else {
+        i = client->desktop;
+        focus_order[i] = g_list_remove(focus_order[i], client);
+    }
+
     /* once the client is out of the list, update the struts to remove it's
        influence */
     screen_update_struts();
@@ -261,7 +267,7 @@ void client_unmanage(Client *client)
        client_calc_layer(it->data);
     }
 
-    /* unfocus the client (calls the focus callbacks) (we're out of the
+    /* unfocus the client (dispatchs the focus event) (we're out of the
      transient lists already, so being modal doesn't matter) */
     if (client->focused)
        client_unfocus(client);
@@ -1626,7 +1632,7 @@ void client_close(Client *self)
 
 void client_set_desktop(Client *self, guint target)
 {
-    guint old;
+    guint old, i;
 
     if (target == self->desktop) return;
   
@@ -1643,6 +1649,20 @@ void client_set_desktop(Client *self, guint target)
     client_showhide(self);
     screen_update_struts();
 
+    /* update the focus lists */
+    if (old == DESKTOP_ALL) {
+        for (i = 0; i < screen_num_desktops; ++i)
+            focus_order[i] = g_list_remove(focus_order[i], self);
+    } else {
+        focus_order[old] = g_list_remove(focus_order[old], self);
+    }
+    if (target == DESKTOP_ALL) {
+        for (i = 0; i < screen_num_desktops; ++i)
+            focus_order[i] = g_list_prepend(focus_order[i], self);
+    } else {
+        focus_order[target] = g_list_prepend(focus_order[target], self);
+    }
+
     dispatch_client(Event_Client_Desktop, self, target, old);
 }
 
This page took 0.024095 seconds and 4 git commands to generate.