dont check to make sure the window is on screen here

[chaz/openbox] / openbox / client.c

diff --git a/openbox/client.c b/openbox/client.c
index 1b1fedad7b944e63270abdc3203026aec7a5149c..393f5e0165493ea91a8610cc44b0e697a5ea30ba 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -9,6 +9,7 @@
 #include "focus.h"
 #include "stacking.h"
 #include "dispatch.h"
+#include "group.h"
 
 #include <glib.h>
 #include <X11/Xutil.h>
@@ -285,17 +286,31 @@ void client_unmanage(Client *client)
        influence */
     screen_update_struts();
 
-    /* tell our parent that we're gone */
-    if (client->transient_for != NULL)
+    /* tell our parent(s) that we're gone */
+    if (client->transient_for == TRAN_GROUP) { /* transient of group */
+        GSList *it;
+
+        for (it = client->group->members; it; it = it->next)
+            if (it->data != client)
+                ((Client*)it->data)->transients =
+                    g_slist_remove(((Client*)it->data)->transients, client);
+    } else if (client->transient_for) {        /* transient of window */
        client->transient_for->transients =
            g_slist_remove(client->transient_for->transients, client);
+    }
 
     /* tell our transients that we're gone */
     for (it = client->transients; it != NULL; it = it->next) {
-       ((Client*)it->data)->transient_for = NULL;
-       client_calc_layer(it->data);
+        if (((Client*)it->data)->transient_for != TRAN_GROUP) {
+            ((Client*)it->data)->transient_for = NULL;
+            client_calc_layer(it->data);
+        }
     }
 
+    /* remove from its group */
+    if (client->group)
+        group_remove(client->group, client);
+
     /* dispatch the unmapped event */
     dispatch_client(Event_Client_Unmapped, client, 0, 0);
     g_assert(client != NULL);
@@ -420,7 +435,7 @@ static void client_get_all(Client *self)
     self->urgent = FALSE;
     self->positioned = FALSE;
     self->disabled_decorations = 0;
-    self->group = None;
+    self->group = NULL;
     self->nicons = 0;
 
     client_get_area(self);
@@ -555,15 +570,14 @@ void client_update_transient_for(Client *self)
        c = g_hash_table_lookup(client_map, &t);
        g_assert(c != self);/* if this happens then we need to check for it*/
 
-       if (!c /*XXX: && _group*/) {
+       if (!c && self->group) {
            /* not transient to a client, see if it is transient for a
               group */
-           if (/*t == _group->leader() || */
+           if (t == self->group->leader ||
                t == None ||
                t == ob_root) {
                /* window is a transient for its group! */
-               /* XXX: for now this is treated as non-transient.
-                  this needs to be fixed! */
+                c = TRAN_GROUP;
            }
        }
     } else
@@ -571,15 +585,33 @@ void client_update_transient_for(Client *self)
 
     /* if anything has changed... */
     if (c != self->transient_for) {
-       if (self->transient_for)
+       if (self->transient_for == TRAN_GROUP) { /* transient of group */
+            GSList *it;
+
+           /* remove from old parents */
+            for (it = self->group->members; it; it = it->next)
+                if (it->data != self)
+                    ((Client*)it->data)->transients =
+                        g_slist_remove(((Client*)it->data)->transients, self);
+        } else if (self->transient_for != NULL) { /* transient of window */
            /* remove from old parent */
            self->transient_for->transients =
                 g_slist_remove(self->transient_for->transients, self);
+        }
        self->transient_for = c;
-       if (self->transient_for)
+       if (self->transient_for == TRAN_GROUP) { /* transient of group */
+            GSList *it;
+
+           /* add to new parents */
+            for (it = self->group->members; it; it = it->next)
+                if (it->data != self)
+                    ((Client*)it->data)->transients =
+                        g_slist_append(((Client*)it->data)->transients, self);
+        } else if (self->transient_for != NULL) { /* transient of window */
            /* add to new parent */
            self->transient_for->transients =
                 g_slist_append(self->transient_for->transients, self);
+        }
     }
 }
 
@@ -939,14 +971,22 @@ void client_update_wmhints(Client *self)
        if (hints->flags & XUrgencyHint)
            ur = TRUE;
 
-       if (hints->flags & WindowGroupHint) {
-           if (hints->window_group != self->group) {
-               /* XXX: remove from the old group if there was one */
-               self->group = hints->window_group;
-               /* XXX: do stuff with the group */
-           }
-       } else /* no group! */
-           self->group = None;
+       if (!(hints->flags & WindowGroupHint))
+            hints->window_group = None; /* no group */
+        /* did the group state change? */
+        if (hints->window_group != (self->group ? self->group->leader : None)){
+            /* remove from the old group if there was one */
+            if (self->group != NULL)
+                group_remove(self->group, self);
+            if (hints->window_group != None)
+                self->group = group_add(hints->window_group, self);
+
+            /* because the self->transient flag wont change from this call,
+               we don't need to update the window's type and such, only its
+               transient_for, and the transients lists of other windows in the
+               group may be affected */
+            client_update_transient_for(self);
+        }
 
        if (hints->flags & IconPixmapHint) {
            client_update_kwm_icon(self);
@@ -1212,7 +1252,7 @@ void client_calc_layer(Client *self)
     /* are we fullscreen, or do we have a fullscreen transient parent? */
     c = self;
     fs = FALSE;
-    while (c) {
+    while (c && c != TRAN_GROUP) { /* XXX do smthng with the TRAN_GROUP case?*/
        if (c->fullscreen) {
            fs = TRUE;
            break;
@@ -1554,6 +1594,14 @@ void client_iconify(Client *self, gboolean iconic, gboolean curdesk)
 
     dispatch_client(iconic ? Event_Client_Unmapped : Event_Client_Mapped,
                     self, 0, 0);
+
+    /* iconify all transients */
+    if (self->transients) {
+        GSList *it;
+
+        for (it = self->transients; it != NULL; it = it->next)
+            if (it->data != self) client_iconify(it->data, iconic, curdesk);
+    }
 }
 
 void client_maximize(Client *self, gboolean max, int dir, gboolean savearea)
@@ -1984,7 +2032,9 @@ gboolean client_focus(Client *self)
        XSendEvent(ob_display, self->window, FALSE, NoEventMask, &ce);
     }
 
+#ifdef DEBUG_FOCUS
     g_message("focusing %lx", self->window);
+#endif
 
     /* Cause the FocusIn to come back to us. Important for desktop switches,
        since otherwise we'll have no FocusIn on the queue and send it off to