restart norway

[chaz/openbox] / openbox / stacking.c

diff --git a/openbox/stacking.c b/openbox/stacking.c
index 481c14bdb3731b9bf910afe67cd785ba510802ee..075f13868b5e303cf10e231a1eacc6572eaf7ce6 100644 (file)
--- a/openbox/stacking.c
+++ b/openbox/stacking.c
@@ -483,7 +483,10 @@ static gboolean stacking_occluded(ObClient *client, ObClient *sibling)
          it = (found ? g_list_previous(it) :g_list_next(it)))
         if (WINDOW_IS_CLIENT(it->data)) {
             ObClient *c = it->data;
-            if (found) {
+            if (found && !c->iconic &&
+                (c->desktop == DESKTOP_ALL || client->desktop == DESKTOP_ALL ||
+                 c->desktop == client->desktop))
+            {
                 if (RECT_INTERSECTS_RECT(c->frame->area, client->frame->area))
                 {
                     if (sibling != NULL) {
@@ -522,7 +525,10 @@ static gboolean stacking_occludes(ObClient *client, ObClient *sibling)
     for (it = stacking_list; it; it = g_list_next(it))
         if (WINDOW_IS_CLIENT(it->data)) {
             ObClient *c = it->data;
-            if (found) {
+            if (found && !c->iconic &&
+                (c->desktop == DESKTOP_ALL || client->desktop == DESKTOP_ALL ||
+                 c->desktop == client->desktop))
+            {
                 if (RECT_INTERSECTS_RECT(c->frame->area, client->frame->area))
                 {
                     if (sibling != NULL) {
@@ -548,12 +554,25 @@ static gboolean stacking_occludes(ObClient *client, ObClient *sibling)
 gboolean stacking_restack_request(ObClient *client, ObClient *sibling,
                                   gint detail, gboolean activate)
 {
+    gboolean ret = FALSE;
+
+    if (sibling && ((client->desktop != sibling->desktop &&
+                     client->desktop != DESKTOP_ALL &&
+                     sibling->desktop != DESKTOP_ALL) ||
+                    sibling->iconic))
+    {
+        ob_debug("Setting restack sibling to NULL, they are not on the same "
+                 "desktop or it is iconified\n");
+        sibling = NULL;
+    }
+
     switch (detail) {
     case Below:
         ob_debug("Restack request Below for client %s sibling %s\n",
                  client->title, sibling ? sibling->title : "(all)");
         /* just lower it */
         stacking_lower(CLIENT_AS_WINDOW(client));
+        ret = TRUE;
         break;
     case BottomIf:
         ob_debug("Restack request BottomIf for client %s sibling "
@@ -561,10 +580,10 @@ gboolean stacking_restack_request(ObClient *client, ObClient *sibling,
                  client->title, sibling ? sibling->title : "(all)");
         /* if this client occludes sibling (or anything if NULL), then
            lower it to the bottom */
-        if (stacking_occludes(client, sibling))
+        if (stacking_occludes(client, sibling)) {
             stacking_lower(CLIENT_AS_WINDOW(client));
-        else
-            return FALSE;
+            ret = TRUE;
+        }
         break;
     case Above:
         ob_debug("Restack request Above for client %s sibling %s\n",
@@ -575,6 +594,7 @@ gboolean stacking_restack_request(ObClient *client, ObClient *sibling,
             client_activate(client, FALSE, TRUE);
         else
             stacking_raise(CLIENT_AS_WINDOW(client));
+        ret = TRUE;
         break;
     case TopIf:
         ob_debug("Restack request TopIf for client %s sibling %s\n",
@@ -586,8 +606,8 @@ gboolean stacking_restack_request(ObClient *client, ObClient *sibling,
                 client_activate(client, FALSE, TRUE);
             else
                 stacking_raise(CLIENT_AS_WINDOW(client));
-        } else
-            return FALSE;
+            ret = TRUE;
+        }
         break;
     case Opposite:
         ob_debug("Restack request Opposite for client %s sibling "
@@ -600,10 +620,13 @@ gboolean stacking_restack_request(ObClient *client, ObClient *sibling,
                 client_activate(client, FALSE, TRUE);
             else
                 stacking_raise(CLIENT_AS_WINDOW(client));
+            ret = TRUE;
         }
-        else if (stacking_occludes(client, sibling))
+        else if (stacking_occludes(client, sibling)) {
             stacking_lower(CLIENT_AS_WINDOW(client));
+            ret = TRUE;
+        }
         break;
     }
-    return TRUE;
+    return ret;
 }