X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fstacking.c;h=5b9b37b2958134e1a4d7dace6c466cc3206c1346;hb=35418ca0fcd3fd28ef579f4435b8bad3b7c87f04;hp=643b3118b6edc00caffd5178c003bd21df252fb4;hpb=1cacfa85d0e74386d071de0d910ab93e69ae40d3;p=chaz%2Fopenbox

diff --git a/openbox/stacking.c b/openbox/stacking.c
index 643b3118..5b9b37b2 100644
--- a/openbox/stacking.c
+++ b/openbox/stacking.c
@@ -1,11 +1,11 @@
 #include "openbox.h"
 #include "prop.h"
+#include "screen.h"
 #include "focus.h"
 #include "client.h"
 #include "group.h"
 #include "frame.h"
 #include "window.h"
-#include <glib.h>
 
 GList  *stacking_list = NULL;
 
@@ -18,7 +18,7 @@ void stacking_set_list()
     /* on shutdown, don't update the properties, so that we can read it back
        in on startup and re-stack the windows as they were before we shut down
     */
-    if (ob_state == State_Exiting) return;
+    if (ob_state == OB_STATE_EXITING) return;
 
     /* create an array of the window ids (from bottom to top,
        reverse order!) */
@@ -30,8 +30,8 @@ void stacking_set_list()
         }
     }
 
-    PROP_SETA32(ob_root, net_client_list_stacking, window,
-                (guint32*)windows, i);
+    PROP_SETA32(RootWindow(ob_display, ob_screen),
+                net_client_list_stacking, window, (guint32*)windows, i);
 
     g_free(windows);
 }
@@ -53,7 +53,7 @@ static void do_restack(GList *wins, GList *before)
     win = g_new(Window, g_list_length(wins) + 1);
 
     if (before == stacking_list)
-        win[0] = focus_backup;
+        win[0] = screen_support_win;
     else if (!before)
         win[0] = window_top(g_list_last(stacking_list)->data);
     else
@@ -79,25 +79,25 @@ static void do_restack(GList *wins, GList *before)
     stacking_set_list();
 }
 
-static void raise(GList *wins)
+static void do_raise(GList *wins)
 {
     GList *it;
-    GList *layer[NUM_STACKLAYER] = {NULL};
+    GList *layer[OB_NUM_STACKING_LAYERS] = {NULL};
     int i;
 
     for (it = wins; it; it = g_list_next(it)) {
-        StackLayer l;
+        ObStackingLayer l;
 
         l = window_layer(it->data);
         layer[l] = g_list_append(layer[l], it->data);
     }
 
     it = stacking_list;
-    for (i = NUM_STACKLAYER - 1; i >= 0; --i) {
+    for (i = OB_NUM_STACKING_LAYERS - 1; i >= 0; --i) {
         if (layer[i]) {
             for (; it; it = g_list_next(it)) {
                 /* look for the top of the layer */
-                if (window_layer(it->data) <= (StackLayer) i)
+                if (window_layer(it->data) <= (ObStackingLayer) i)
                     break;
             }
             do_restack(layer[i], it);
@@ -106,25 +106,25 @@ static void raise(GList *wins)
     }
 }
 
-static void lower(GList *wins)
+static void do_lower(GList *wins)
 {
     GList *it;
-    GList *layer[NUM_STACKLAYER] = {NULL};
+    GList *layer[OB_NUM_STACKING_LAYERS] = {NULL};
     int i;
 
     for (it = wins; it; it = g_list_next(it)) {
-        StackLayer l;
+        ObStackingLayer l;
 
         l = window_layer(it->data);
         layer[l] = g_list_append(layer[l], it->data);
     }
 
     it = stacking_list;
-    for (i = NUM_STACKLAYER - 1; i >= 0; --i) {
+    for (i = OB_NUM_STACKING_LAYERS - 1; i >= 0; --i) {
         if (layer[i]) {
             for (; it; it = g_list_next(it)) {
                 /* look for the top of the next layer down */
-                if (window_layer(it->data) < (StackLayer) i)
+                if (window_layer(it->data) < (ObStackingLayer) i)
                     break;
             }
             do_restack(layer[i], it);
@@ -133,111 +133,113 @@ static void lower(GList *wins)
     }
 }
 
-static GList *pick_windows(ObWindow *win)
+static GList *pick_windows(ObClient *top, ObClient *selected, gboolean raise)
 {
     GList *ret = NULL;
-    GList *it, *next;
+    GList *it, *next, *prev;
     GSList *sit;
-    Client *c;
     int i, n;
-
-    if (!WINDOW_IS_CLIENT(win)) {
-        ret = g_list_append(ret, win);
-        stacking_list = g_list_remove(stacking_list, win);
-        return ret;
-    }
-
-    c = WINDOW_AS_CLIENT(win);
+    GList *modals = NULL;
+    GList *trans = NULL;
+    GList *modal_sel_it = NULL; /* the selected guy if modal */
+    GList *trans_sel_it = NULL; /* the selected guy if not */
 
     /* remove first so we can't run into ourself */
-    stacking_list = g_list_remove(stacking_list, win);
+    stacking_list = g_list_remove(stacking_list, top);
 
-    /* add transient children in their stacking order */
     i = 0;
-    n = g_slist_length(c->transients);
+    n = g_slist_length(top->transients);
     for (it = stacking_list; i < n && it; it = next) {
+        prev = g_list_previous(it);
         next = g_list_next(it);
-        if ((sit = g_slist_find(c->transients, it->data))) {
+
+        if ((sit = g_slist_find(top->transients, it->data))) {
+            ObClient *c = sit->data;
+
             ++i;
-            ret = g_list_concat(ret, pick_windows(sit->data));
-            it = stacking_list;
+
+            if (!c->modal) {
+                if (c != selected) {
+                    trans = g_list_concat(trans,
+                                           pick_windows(c, selected, raise));
+                } else {
+                    g_assert(modal_sel_it == NULL);
+                    g_assert(trans_sel_it == NULL);
+                    trans_sel_it = pick_windows(c, selected, raise);
+                }
+            } else {
+                if (c != selected) {
+                    modals = g_list_concat(modals,
+                                           pick_windows(c, selected, raise));
+                } else {
+                    g_assert(modal_sel_it == NULL);
+                    g_assert(trans_sel_it == NULL);
+                    modal_sel_it = pick_windows(c, selected, raise);
+                }
+            }
+            /* if we dont have a prev then start back at the beginning,
+               otherwise skip back to the prev's next */
+            next = prev ? g_list_next(prev) : stacking_list;
         }
     }
 
+    ret = g_list_concat((raise ? modal_sel_it : modals),
+                        (raise ? modals : modal_sel_it));
+
+    ret = g_list_concat(ret, (raise ? trans_sel_it : trans));
+    ret = g_list_concat(ret, (raise ? trans : trans_sel_it));
+
+
     /* add itself */
-    ret = g_list_append(ret, win);
+    ret = g_list_append(ret, top);
 
     return ret;
 }
 
-static GList *pick_group_windows(ObWindow *win)
+static GList *pick_group_windows(ObClient *top, ObClient *selected, gboolean raise)
 {
     GList *ret = NULL;
-    GList *it, *next;
+    GList *it, *next, *prev;
     GSList *sit;
-    Client *c;
     int i, n;
 
-    if (!WINDOW_IS_CLIENT(win))
-        return NULL;
-
-    c = WINDOW_AS_CLIENT(win);
-
     /* add group members in their stacking order */
-    if (c->group) {
+    if (top->group) {
         i = 0;
-        n = g_slist_length(c->group->members) - 1;
+        n = g_slist_length(top->group->members) - 1;
         for (it = stacking_list; i < n && it; it = next) {
+            prev = g_list_previous(it);
             next = g_list_next(it);
-            if ((sit = g_slist_find(c->group->members, it->data))) {
+
+            if ((sit = g_slist_find(top->group->members, it->data))) {
                 ++i;
-                ret = g_list_concat(ret, pick_windows(sit->data)); 
-                it = stacking_list;
+                ret = g_list_concat(ret,
+                                    pick_windows(sit->data, selected, raise)); 
+                /* if we dont have a prev then start back at the beginning,
+                   otherwise skip back to the prev's next */
+                next = prev ? g_list_next(prev) : stacking_list;
             }
         }
     }
     return ret;
 }
 
-static ObWindow *top_transient(ObWindow *window)
-{
-    Client *client;
-
-    if (!WINDOW_IS_CLIENT(window))
-        return window;
-
-    client = WINDOW_AS_CLIENT(window);
-
-    /* move up the transient chain as far as possible */
-    if (client->transient_for) {
-        if (client->transient_for != TRAN_GROUP) {
-            return top_transient(CLIENT_AS_WINDOW(client->transient_for));
-        } else {
-            GSList *it;
-
-            for (it = client->group->members; it; it = it->next) {
-                Client *c = it->data;
-
-                /* checking transient_for prevents infinate loops! */
-                if (c != client && !c->transient_for)
-                    break;
-            }
-            if (it)
-                return it->data;
-        }
-    }
-
-    return window;
-}
-
 void stacking_raise(ObWindow *window)
 {
     GList *wins;
 
-    window = top_transient(window);
-    wins = pick_windows(window);
-    wins = g_list_concat(wins, pick_group_windows(window));
-    raise(wins);
+    if (WINDOW_IS_CLIENT(window)) {
+        ObClient *c;
+        ObClient *selected;
+        selected = WINDOW_AS_CLIENT(window);
+        c = client_search_top_transient(selected);
+        wins = pick_windows(c, selected, TRUE);
+        wins = g_list_concat(wins, pick_group_windows(c, selected, TRUE));
+    } else {
+        wins = g_list_append(NULL, window);
+        stacking_list = g_list_remove(stacking_list, window);
+    }
+    do_raise(wins);
     g_list_free(wins);
 }
 
@@ -245,19 +247,27 @@ void stacking_lower(ObWindow *window)
 {
     GList *wins;
 
-    window = top_transient(window);
-    wins = pick_windows(window);
-    wins = g_list_concat(pick_group_windows(window), wins);
-    lower(wins);
+    if (WINDOW_IS_CLIENT(window)) {
+        ObClient *c;
+        ObClient *selected;
+        selected = WINDOW_AS_CLIENT(window);
+        c = client_search_top_transient(selected);
+        wins = pick_windows(c, selected, FALSE);
+        wins = g_list_concat(pick_group_windows(c, selected, FALSE), wins);
+    } else {
+        wins = g_list_append(NULL, window);
+        stacking_list = g_list_remove(stacking_list, window);
+    }
+    do_lower(wins);
     g_list_free(wins);
 }
 
 void stacking_add(ObWindow *win)
 {
-    StackLayer l;
+    ObStackingLayer l;
     GList *wins;
 
-    g_assert(focus_backup != None); /* make sure I dont break this in the
+    g_assert(screen_support_win != None); /* make sure I dont break this in the
                                        future */
 
     l = window_layer(win);
@@ -269,8 +279,8 @@ void stacking_add(ObWindow *win)
 
 void stacking_add_nonintrusive(ObWindow *win)
 {
-    Client *client;
-    Client *parent = NULL;
+    ObClient *client;
+    ObClient *parent = NULL;
     GList *it_before = NULL;
 
     if (!WINDOW_IS_CLIENT(win)) {
@@ -282,7 +292,7 @@ void stacking_add_nonintrusive(ObWindow *win)
 
     /* insert above its highest parent */
     if (client->transient_for) {
-        if (client->transient_for != TRAN_GROUP) {
+        if (client->transient_for != OB_TRAN_GROUP) {
             parent = client->transient_for;
         } else {
             GSList *sit;
@@ -293,7 +303,7 @@ void stacking_add_nonintrusive(ObWindow *win)
                     if ((sit = g_slist_find(client->group->members, it->data)))
                 for (sit = client->group->members; !parent && sit;
                      sit = sit->next) {
-                    Client *c = sit->data;
+                    ObClient *c = sit->data;
                     /* checking transient_for prevents infinate loops! */
                     if (sit->data == it->data && !c->transient_for)
                         parent = it->data;