X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient.c;h=af1e3ba8b6d1a1b39611e3c1e66f49ae538c0d1b;hb=4ec67b0a708550c1d50b2a209a1d7d3d5e642a38;hp=c35c62db8cd993a177d0af391858aed49fa95c4b;hpb=dd6e27f2c3cf1754a6f02df059928186e9ddd868;p=chaz%2Fopenbox

diff --git a/openbox/client.c b/openbox/client.c
index c35c62db..af1e3ba8 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -130,7 +130,7 @@ void client_manage(Window window)
     if (XCheckTypedWindowEvent(ob_display, window, DestroyNotify, &e) ||
 	XCheckTypedWindowEvent(ob_display, window, UnmapNotify, &e)) {
 	XPutBackEvent(ob_display, &e);
-    
+
         grab_server(FALSE);
 	return; /* don't manage it */
     }
@@ -186,6 +186,7 @@ void client_manage(Window window)
      
     client_list = g_slist_append(client_list, client);
     stacking_list = g_list_append(stacking_list, client);
+    g_assert(!g_hash_table_lookup(client_map, (gpointer)client->window));
     g_hash_table_insert(client_map, (gpointer)window, client);
 
     /* update the focus lists */
@@ -228,6 +229,7 @@ void client_unmanage(Client *client)
     g_message("Unmanaging window: %lx", client->window);
 
     dispatch_client(Event_Client_Destroy, client, 0, 0);
+    g_assert(client != NULL);
 
     /* remove the window from our save set */
     XChangeSaveSet(ob_display, client->window, SetModeDelete);
@@ -239,6 +241,7 @@ void client_unmanage(Client *client)
 
     /* dispatch the unmapped event */
     dispatch_client(Event_Client_Unmapped, client, 0, 0);
+    g_assert(client != NULL);
 
     /* give the client its border back */
     client_toggle_border(client, TRUE);
@@ -546,11 +549,13 @@ void client_update_transient_for(Client *self)
     if (c != self->transient_for) {
 	if (self->transient_for)
 	    /* remove from old parent */
-	    g_slist_remove(self->transient_for->transients, self);
+	    self->transient_for->transients =
+                g_slist_remove(self->transient_for->transients, self);
 	self->transient_for = c;
 	if (self->transient_for)
 	    /* add to new parent */
-	    g_slist_append(self->transient_for->transients, self);
+	    self->transient_for->transients =
+                g_slist_append(self->transient_for->transients, self);
     }
 }
 
@@ -1164,7 +1169,7 @@ static Client *search_focus_tree(Client *node, Client *skip)
     GSList *it;
     Client *ret;
 
-    for (it = node->transients; it != NULL; it = g_slist_next(it)) {
+    for (it = node->transients; it != NULL; it = it->next) {
 	Client *c = it->data;
 	if (c == skip) continue; /* circular? */
 	if ((ret = search_focus_tree(c, skip))) return ret;
@@ -1652,6 +1657,11 @@ void client_close(Client *self)
     XSendEvent(ob_display, self->window, FALSE, NoEventMask, &ce);
 }
 
+void client_kill(Client *self)
+{
+    XKillClient(ob_display, self->window);
+}
+
 void client_set_desktop(Client *self, guint target)
 {
     guint old, i;
@@ -1675,14 +1685,12 @@ void client_set_desktop(Client *self, guint target)
     if (old == DESKTOP_ALL) {
         for (i = 0; i < screen_num_desktops; ++i)
             focus_order[i] = g_list_remove(focus_order[i], self);
+        focus_order[target] = g_list_prepend(focus_order[target], 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);
+        if (target == DESKTOP_ALL)
+            for (i = 0; i < screen_num_desktops; ++i)
+                focus_order[i] = g_list_prepend(focus_order[i], self);
     }
 
     dispatch_client(Event_Client_Desktop, self, target, old);