X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient.c;h=7f59d99d2657cf3b16ec95a2d2e4e33422930d4a;hb=58ebc8f73cea0fc74d01cb0336dbb41d88cd5938;hp=055558e2b03868f3c4d214a2b6b5e1bf6942329c;hpb=16e7aac633ceb328bc34845f749d3d224062d61a;p=chaz%2Fopenbox

diff --git a/openbox/client.c b/openbox/client.c
index 055558e2..7f59d99d 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -1300,27 +1300,64 @@ static Client *search_focus_tree(Client *node, Client *skip)
     return NULL;
 }
 
+static void calc_recursive(Client *self, StackLayer l, gboolean raised)
+{
+    StackLayer old;
+    GSList *it;
+
+    old = self->layer;
+    self->layer = l;
+
+    for (it = self->transients; it; it = it->next)
+        calc_recursive(it->data, l, raised ? raised : l != old);
+
+    if (!raised && l != old)
+	if (self->frame)
+	    stacking_raise(self);
+}
+
 void client_calc_layer(Client *self)
 {
     StackLayer l;
+    gboolean f;
+
+    /* transients take on the layer of their parents */
+    if (self->transient_for) {
+        if (self->transient_for != TRAN_GROUP) {
+            self = self->transient_for;
+        } else {
+            GSList *it;
+
+            for (it = self->group->members; it; it = it->next)
+                if (it->data != self &&
+                    ((Client*)it->data)->transient_for != TRAN_GROUP) {
+                    self = self->transient_for;
+                    break;
+                }
+        }
+    }
+
+    /* is us or one of our transients focused? */
+    if (client_focused(self))
+        f = TRUE;
+    else if (search_focus_tree(self, self))
+        f = TRUE;
+    else
+        f = FALSE;
 
     if (self->iconic) l = Layer_Icon;
     /* fullscreen windows are only in the fullscreen layer while focused */
-    else if (self->fullscreen && focus_client == self) l = Layer_Fullscreen;
+    else if (self->fullscreen && f) l = Layer_Fullscreen;
     else if (self->type == Type_Desktop) l = Layer_Desktop;
     else if (self->type == Type_Dock) {
-	if (!self->below) l = Layer_Top;
-	else l = Layer_Normal;
+        if (!self->below) l = Layer_Top;
+        else l = Layer_Normal;
     }
     else if (self->above) l = Layer_Above;
     else if (self->below) l = Layer_Below;
     else l = Layer_Normal;
-     
-    if (l != self->layer) {
-	self->layer = l;
-	if (self->frame)
-	    stacking_raise(self);
-    }
+
+    calc_recursive(self, l, FALSE);
 }
 
 gboolean client_should_show(Client *self)
@@ -1547,7 +1584,8 @@ void client_fullscreen(Client *self, gboolean fs, gboolean savearea)
 	self->fullscreen == fs) return;         /* already done */
 
     self->fullscreen = fs;
-    client_change_state(self); /* change the state hints on the client */
+    client_change_state(self); /* change the state hints on the client,
+                                  and adjust out layer/stacking */
 
     if (fs) {
 	if (savearea) {
@@ -1589,15 +1627,14 @@ void client_fullscreen(Client *self, gboolean fs, gboolean savearea)
 
     client_configure(self, Corner_TopLeft, x, y, w, h, TRUE, TRUE);
 
-    /* raise (back) into our stacking layer */
-    stacking_raise(self);
-
     /* try focus us when we go into fullscreen mode */
     client_focus(self);
 }
 
 void client_iconify(Client *self, gboolean iconic, gboolean curdesk)
 {
+    GSList *it;
+
     /* move up the transient chain as far as possible first if deiconifying */
     if (!iconic)
         while (self->transient_for) {
@@ -1615,8 +1652,7 @@ void client_iconify(Client *self, gboolean iconic, gboolean curdesk)
                     Client *c = it->data;
 
                     if (c != self && c->transient_for->iconic != iconic &&
-                        (c->transient_for != TRAN_GROUP ||
-                         c->group != self->group)) {
+                        c->transient_for != TRAN_GROUP) {
                         self = it->data;
                         break;
                     }
@@ -1652,12 +1688,8 @@ void client_iconify(Client *self, gboolean iconic, gboolean curdesk)
                     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);
-    }
+    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)
@@ -2102,7 +2134,7 @@ gboolean client_focus(Client *self)
 void client_unfocus(Client *self)
 {
     g_assert(focus_client == self);
-#ifndef DEBUG_FOCUS
+#ifdef DEBUG_FOCUS
     g_message("client_unfocus");
 #endif
     focus_fallback(Fallback_Unfocusing);