X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fstacking.c;h=d9aee95260b85fe082780371124412d9eaa6f573;hb=854b2ae68498133f3119ec614b725025af3fd66b;hp=cb8eaf31a996fd72c29dce49d01dd275be80d908;hpb=310ea89e0ebb53e27550440960305ffc446ae8ce;p=chaz%2Fopenbox

diff --git a/openbox/stacking.c b/openbox/stacking.c
index cb8eaf31..d9aee952 100644
--- a/openbox/stacking.c
+++ b/openbox/stacking.c
@@ -176,19 +176,22 @@ static void restack_windows(ObClient *selected, gboolean raise)
            this window, or it won't move */
         top = client_search_all_top_parents(selected);
 
-        /* go thru stacking list backwards so we can use g_slist_prepend */
-        for (it = g_list_last(stacking_list); it && top;
-             it = g_list_previous(it))
-            if ((top_it = g_slist_find(top, it->data))) {
-                top_reorder = g_slist_prepend(top_reorder, top_it->data);
-                top = g_slist_delete_link(top, top_it);
-            }
-        g_assert(top == NULL);
+        /* that is, if it has any parents */
+        if (!(top->data == selected && top->next == NULL)) {
+            /* go thru stacking list backwards so we can use g_slist_prepend */
+            for (it = g_list_last(stacking_list); it && top;
+                 it = g_list_previous(it))
+                if ((top_it = g_slist_find(top, it->data))) {
+                    top_reorder = g_slist_prepend(top_reorder, top_it->data);
+                    top = g_slist_delete_link(top, top_it);
+                }
+            g_assert(top == NULL);
 
-        /* call restack for each of these to lower them */
-        for (top_it = top_reorder; top_it; top_it = g_slist_next(top_it))
-            restack_windows(top_it->data, raise);
-        return;
+            /* call restack for each of these to lower them */
+            for (top_it = top_reorder; top_it; top_it = g_slist_next(top_it))
+                restack_windows(top_it->data, raise);
+            return;
+        }
     }
 
     /* remove first so we can't run into ourself */
@@ -387,15 +390,16 @@ void stacking_add_nonintrusive(ObWindow *win)
             if (client->group)
                 for (it = stacking_list; !parent && it; it = g_list_next(it)) {
                     if ((sit = g_slist_find(client->group->members, it->data)))
-                for (sit = client->group->members; !parent && sit;
-                     sit = g_slist_next(sit))
-                {
-                    ObClient *c = sit->data;
-                    /* checking transient_for prevents infinate loops! */
-                    if (sit->data == it->data && !c->transient_for)
-                        parent = it->data;
+                        for (sit = client->group->members; !parent && sit;
+                             sit = g_slist_next(sit))
+                        {
+                            ObClient *c = sit->data;
+                            /* checking transient_for prevents infinate loops!
+                             */
+                            if (sit->data == it->data && !c->transient_for)
+                                parent = it->data;
+                        }
                 }
-            }
         }
     }
 
@@ -408,8 +412,10 @@ void stacking_add_nonintrusive(ObWindow *win)
         }
     }
     if (!it_below) {
-        /* out of ideas, just add it normally... */
-        stacking_add(win);
+        /* 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);
     } else {
         /* make sure it's not in the wrong layer though ! */
         for (; it_below; it_below = g_list_next(it_below))