X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fstacking.c;h=c3d485f5427b96c1a3dab9b40d44cdc446d8dd11;hb=276b2be581c6cb138b439537761ff2ca42201805;hp=e205d4b05b952032ef0dc65f4a7a6c801164fc19;hpb=993fc6226d06f25513756251283e70054082ee8a;p=chaz%2Fopenbox

diff --git a/openbox/stacking.c b/openbox/stacking.c
index e205d4b0..c3d485f5 100644
--- a/openbox/stacking.c
+++ b/openbox/stacking.c
@@ -11,251 +11,321 @@ GList  *stacking_list = NULL;
 
 void stacking_set_list()
 {
-    Window *windows, *win_it;
+    Window *windows = NULL;
     GList *it;
-    guint size = g_list_length(stacking_list);
+    guint i = 0;
 
     /* 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!) */
-    if (size > 0) {
-	windows = g_new(Window, size);
-	win_it = windows;
-	for (it = g_list_last(stacking_list); it != NULL;
-             it = it->prev)
-            if (WINDOW_IS_CLIENT(it->data)) {
-                *win_it = WINDOW_AS_CLIENT(it->data)->window;
-                ++win_it;
-            }
-    } else
-	windows = win_it = NULL;
+    if (stacking_list) {
+	windows = g_new(Window, g_list_length(stacking_list));
+        for (it = g_list_last(stacking_list); it; it = g_list_previous(it)) {
+            if (WINDOW_IS_CLIENT(it->data))
+                windows[i++] = WINDOW_AS_CLIENT(it->data)->window;
+        }
+    }
 
     PROP_SETA32(ob_root, net_client_list_stacking, window,
-                (guint32*)windows, win_it - windows);
+                (guint32*)windows, i);
 
-    if (windows)
-	g_free(windows);
+    g_free(windows);
 }
 
-static GList *find_lowest_transient(Client *c)
+static void do_restack(GList *wins, GList *before)
 {
-    GList *it;
-    GSList *sit;
-
-    for (it = g_list_last(stacking_list); it; it = it->prev)
-        for (sit = c->transients; sit; sit = sit->next)
-            if (it->data == sit->data) /* found a transient */
-                return it;
-    return NULL;
-}
+    GList *it, *next;
+    Window *win;
+    int i;
+
+    /* pls only restack stuff in the same layer at a time */
+    for (it = wins; it; it = next) {
+        next = g_list_next(it);
+        if (!next) break;
+        g_assert (window_layer(it->data) == window_layer(next->data));
+    }
 
-static void raise_recursive(ObWindow *window)
-{
-    Window wins[2];  /* only ever restack 2 windows. */
-    GList *it, *low;
-    GSList *sit;
 
-    g_assert(stacking_list != NULL); /* this would be bad */
+    win = g_new(Window, g_list_length(wins) + 1);
 
-    /* remove the window before looking so we can't run into ourselves and our
-       transients can't either. */
-    stacking_list = g_list_remove(stacking_list, window);
+    if (before == stacking_list)
+        win[0] = focus_backup;
+    else if (!before)
+        win[0] = window_top(g_list_last(stacking_list)->data);
+    else
+        win[0] = window_top(g_list_previous(before)->data);
 
-    /* raise transients first */
-    if (WINDOW_IS_CLIENT(window)) {
-        Client *client = WINDOW_AS_CLIENT(window);
-        for (sit = client->transients; sit; sit = sit->next)
-            raise_recursive(sit->data);
+    for (i = 1, it = wins; it; ++i, it = g_list_next(it)) {
+        win[i] = window_top(it->data);
+        g_assert(win[i] != None); /* better not call stacking shit before
+                                     setting your top level window value */
+        stacking_list = g_list_insert_before(stacking_list, before, it->data);
     }
 
-    /* find 'it' where it is the positiion in the stacking order where
-       'window' will be inserted *before* */
-
-    if (WINDOW_IS_CLIENT(window))
-        low = find_lowest_transient(WINDOW_AS_CLIENT(window));
-    else
-        low = NULL;
-    /* the stacking list is from highest to lowest */
-    for (it = g_list_last(stacking_list); it; it = it->prev) {
-        if (it == low || window_layer(window) < window_layer(it->data)) {
-            it = it->next;
-            break;
-        }
-        if (it == stacking_list)
-            break;
+    /* XXX some debug checking of the stacking list's order */
+    for (it = stacking_list; ; it = next) {
+        next = g_list_next(it);
+        if (!next) break;
+        g_assert(window_layer(it->data) >= window_layer(next->data));
     }
 
-    /*
-      if our new position is the top, we want to stack under the focus_backup.
-      otherwise, we want to stack under the previous window in the stack.
-    */
-    if (it == stacking_list)
-	wins[0] = focus_backup;
-    else if (it != NULL)
-	wins[0] = window_top(it->prev->data);
-    else
-	wins[0] = window_top(g_list_last(stacking_list)->data);
-    wins[1] = window_top(window);
-
-    stacking_list = g_list_insert_before(stacking_list, it, window);
+    XRestackWindows(ob_display, win, i);
+    g_free(win);
 
-    XRestackWindows(ob_display, wins, 2);
+    stacking_set_list();
 }
 
-void stacking_raise(ObWindow *window)
+static void do_raise(GList *wins)
 {
-    g_assert(stacking_list != NULL); /* this would be bad */
+    GList *it;
+    GList *layer[NUM_STACKLAYER] = {NULL};
+    int i;
 
-    if (WINDOW_IS_CLIENT(window)) {
-        Client *client = WINDOW_AS_CLIENT(window);
-        /* move up the transient chain as far as possible first */
-        if (client->transient_for) {
-            if (client->transient_for != TRAN_GROUP) {
-                stacking_raise(CLIENT_AS_WINDOW(client->transient_for));
-                return;
-            } else {
-                GSList *it;
+    for (it = wins; it; it = g_list_next(it)) {
+        StackLayer l;
 
-                for (it = client->group->members; it; it = it->next) {
-                    Client *c = it->data;
+        l = window_layer(it->data);
+        layer[l] = g_list_append(layer[l], it->data);
+    }
 
-                    /* checking transient_for prevents infinate loops! */
-                    if (c != client && !c->transient_for)
-                        stacking_raise(it->data);
-                }
-                if (it == NULL) return;
+    it = stacking_list;
+    for (i = NUM_STACKLAYER - 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)
+                    break;
             }
+            do_restack(layer[i], it);
+            g_list_free(layer[i]);
         }
     }
+}
 
-    raise_recursive(window);
+static void do_lower(GList *wins)
+{
+    GList *it;
+    GList *layer[NUM_STACKLAYER] = {NULL};
+    int i;
 
-    stacking_set_list();
+    for (it = wins; it; it = g_list_next(it)) {
+        StackLayer 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) {
+        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)
+                    break;
+            }
+            do_restack(layer[i], it);
+            g_list_free(layer[i]);
+        }
+    }
 }
 
-static void lower_recursive(ObWindow *window, ObWindow *above)
+static GList *pick_windows(Client *top, Client *selected, gboolean raise)
 {
-    Window wins[2];  /* only ever restack 2 windows. */
-    GList *it;
+    GList *ret = NULL;
+    GList *it, *next, *prev;
     GSList *sit;
+    int i, n;
+    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, top);
+
+    i = 0;
+    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(top->transients, it->data))) {
+            Client *c = sit->data;
+
+            ++i;
+
+            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;
+        }
+    }
 
-    /* find 'it' where 'it' is the position in the stacking_list where the
-       'window' will be placed *after* */
+    ret = g_list_concat((raise ? modal_sel_it : modals),
+                        (raise ? modals : modal_sel_it));
 
-    for (it = g_list_last(stacking_list); it != stacking_list; it = it->prev)
-        if (window_layer(window) <= window_layer(it->data) &&
-            it->data != above)
-            break;
+    ret = g_list_concat(ret, (raise ? trans_sel_it : trans));
+    ret = g_list_concat(ret, (raise ? trans : trans_sel_it));
 
-    if (it->data != window) { /* not already the bottom */
-        wins[0] = window_top(it->data);
-        wins[1] = window_top(window);
 
-        stacking_list = g_list_remove(stacking_list, window);
-        stacking_list = g_list_insert_before(stacking_list, it->next, window);
-        XRestackWindows(ob_display, wins, 2);
+    /* add itself */
+    ret = g_list_append(ret, top);
+
+    return ret;
+}
+
+static GList *pick_group_windows(Client *top, Client *selected, gboolean raise)
+{
+    GList *ret = NULL;
+    GList *it, *next, *prev;
+    GSList *sit;
+    int i, n;
+
+    /* add group members in their stacking order */
+    if (top->group) {
+        i = 0;
+        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(top->group->members, it->data))) {
+                ++i;
+                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;
+}
+
+void stacking_raise(ObWindow *window)
+{
+    GList *wins;
 
     if (WINDOW_IS_CLIENT(window)) {
-        Client *client = WINDOW_AS_CLIENT(window);
-        for (sit = client->transients; sit; sit = sit->next)
-            lower_recursive(CLIENT_AS_WINDOW(sit->data), window);
+        Client *c;
+        Client *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);
 }
 
 void stacking_lower(ObWindow *window)
 {
-    g_assert(stacking_list != NULL); /* this would be bad */
+    GList *wins;
 
     if (WINDOW_IS_CLIENT(window)) {
-        Client *client = WINDOW_AS_CLIENT(window);
-        /* move up the transient chain as far as possible first */
-        while (client->transient_for) {
-            if (client->transient_for != TRAN_GROUP) {
-                stacking_lower(CLIENT_AS_WINDOW(client->transient_for));
-                return;
-            } 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)
-                        stacking_lower(it->data);
-                }
-                if (it == NULL) return;
-            }
-        }
-        window = CLIENT_AS_WINDOW(client);
+        Client *c;
+        Client *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);
     }
-
-    lower_recursive(window, NULL);
-
-    stacking_set_list();
+    do_lower(wins);
+    g_list_free(wins);
 }
 
 void stacking_add(ObWindow *win)
 {
+    StackLayer l;
+    GList *wins;
+
+    g_assert(focus_backup != None); /* make sure I dont break this in the
+                                       future */
+
+    l = window_layer(win);
+    wins = g_list_append(NULL, win); /* list of 1 element */
+
     stacking_list = g_list_append(stacking_list, win);
     stacking_raise(win);
 }
 
 void stacking_add_nonintrusive(ObWindow *win)
 {
-    Window wins[2];  /* only ever restack 2 windows. */
+    Client *client;
+    Client *parent = NULL;
+    GList *it_before = NULL;
 
-    if (!WINDOW_IS_CLIENT(win))
+    if (!WINDOW_IS_CLIENT(win)) {
         stacking_add(win); /* no special rules for others */
-    else {
-        Client *client = WINDOW_AS_CLIENT(win);
-        Client *parent = NULL;
-        GList *it_before = NULL;
-
-        /* insert above its highest parent */
-        if (client->transient_for) {
-            if (client->transient_for != TRAN_GROUP) {
-                parent = client->transient_for;
-            } else {
-                GSList *sit;
-                GList *it;
+        return;
+    }
+
+    client = WINDOW_AS_CLIENT(win);
 
+    /* insert above its highest parent */
+    if (client->transient_for) {
+        if (client->transient_for != TRAN_GROUP) {
+            parent = client->transient_for;
+        } else {
+            GSList *sit;
+            GList *it;
+
+            if (client->group)
                 for (it = stacking_list; !parent && it; it = it->next) {
-                    for (sit = client->group->members; !parent && sit;
-                         sit = sit->next) {
-                        Client *c = sit->data;
-                        /* checking transient_for prevents infinate loops! */
-                        if (sit->data == it->data && !c->transient_for)
-                            parent = it->data;
-                    }
+                    if ((sit = g_slist_find(client->group->members, it->data)))
+                for (sit = client->group->members; !parent && sit;
+                     sit = sit->next) {
+                    Client *c = sit->data;
+                    /* checking transient_for prevents infinate loops! */
+                    if (sit->data == it->data && !c->transient_for)
+                        parent = it->data;
                 }
             }
         }
+    }
 
-        if (!(it_before = g_list_find(stacking_list, parent))) {
-            /* no parent to put above, try find the focused client to go
-               under */
+    if (!(it_before = g_list_find(stacking_list, parent))) {
+        /* no parent to put above, try find the focused client to go
+           under */
+        if (focus_client && focus_client->layer == client->layer) {
             if ((it_before = g_list_find(stacking_list, focus_client)))
                 it_before = it_before->next;
-            else {
-                /* out of ideas, just add it normally... */
-                stacking_add(win);
-                return;
-            }
         }
-        stacking_list = g_list_insert_before(stacking_list, it_before, win);
-
-        it_before = g_list_find(stacking_list, win)->prev;
-        if (!it_before)
-            wins[0] = focus_backup;
-        else
-            wins[0] = window_top(it_before->data);
-        wins[1] = window_top(win);
-
-        XRestackWindows(ob_display, wins, 2);
+    }
+    if (!it_before) {
+        /* out of ideas, just add it normally... */
+        stacking_add(win);
+    } else {
+        GList *wins = g_list_append(NULL, win);
+        do_restack(wins, it_before);
+        g_list_free(wins);
     }
 }