only do restack checks on windows that are visible

[chaz/openbox] / openbox / stacking.c

diff --git a/openbox/stacking.c b/openbox/stacking.c
index 66aeebcf4c17f9346b2eae2694e004681abbbfac..942a462056160ad5e0d83013e235bf9d084f25da 100644 (file)
--- a/openbox/stacking.c
+++ b/openbox/stacking.c
@@ -426,16 +426,21 @@ void stacking_add_nonintrusive(ObWindow *win)
         }
     }
     if (!it_below) {
-        if (client_search_transient(client, focus_client)) {
-            /* it's focused so put it at the top */
-            stacking_list = g_list_append(stacking_list, win);
-            stacking_raise(win);
-        } else {
-            /* there is no window to put this directly above, so put it at the
-               bottom */
-            stacking_list = g_list_prepend(stacking_list, win);
-            stacking_lower(win);
-        }
+        /* There is no window to put this directly above, so put it at the
+           top, so you know it is there.
+
+           It used to do this only if the window was focused and lower
+           it otherwise.
+
+           We also put it at the top not the bottom to fix a bug with
+           fullscreen windows. When focusLast is off and followsMouse is
+           on, when you switch desktops, the fullscreen window loses
+           focus and goes into its lower layer. If this puts it at the
+           bottom then when you come back to the desktop, the window is
+           at the bottom and won't get focus back.
+        */
+        stacking_list = g_list_append(stacking_list, win);
+        stacking_raise(win);
     } else {
         /* make sure it's not in the wrong layer though ! */
         for (; it_below; it_below = g_list_next(it_below))
@@ -478,7 +483,7 @@ 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->frame->visible) {
                 if (RECT_INTERSECTS_RECT(c->frame->area, client->frame->area))
                 {
                     if (sibling != NULL) {
@@ -501,7 +506,7 @@ static gboolean stacking_occluded(ObClient *client, ObClient *sibling)
     return occluded;
 }
 
-/*! Returns TRUE if client is occludes the sibling. If sibling is NULL it tries
+/*! Returns TRUE if client occludes the sibling. If sibling is NULL it tries
   against all other clients.
 */
 static gboolean stacking_occludes(ObClient *client, ObClient *sibling)
@@ -517,7 +522,7 @@ 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->frame->visible) {
                 if (RECT_INTERSECTS_RECT(c->frame->area, client->frame->area))
                 {
                     if (sibling != NULL) {
@@ -562,7 +567,7 @@ void stacking_restack_request(ObClient *client, ObClient *sibling,
     case Above:
         ob_debug("Restack request Above for client %s sibling %s\n",
                  client->title, sibling ? sibling->title : "(all)");
-        if (activate && !client->iconic)
+        if (activate && !client->iconic && client_normal(client))
             /* use user=TRUE because it is impossible to get a timestamp
                for this */
             client_activate(client, FALSE, TRUE);
@@ -573,7 +578,7 @@ void stacking_restack_request(ObClient *client, ObClient *sibling,
         ob_debug("Restack request TopIf for client %s sibling %s\n",
                  client->title, sibling ? sibling->title : "(all)");
         if (stacking_occluded(client, sibling)) {
-            if (activate && !client->iconic)
+            if (activate && !client->iconic && client_normal(client))
                 /* use user=TRUE because it is impossible to get a timestamp
                    for this */
                 client_activate(client, FALSE, TRUE);
@@ -586,7 +591,7 @@ void stacking_restack_request(ObClient *client, ObClient *sibling,
                  "%s\n",
                  client->title, sibling ? sibling->title : "(all)");
         if (stacking_occluded(client, sibling)) {
-            if (activate && !client->iconic)
+            if (activate && !client->iconic && client_normal(client))
                 /* use user=TRUE because it is impossible to get a timestamp
                    for this */
                 client_activate(client, FALSE, TRUE);