X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fstacking.c;h=220399d45be824334f9b9e3b78ea5d19a54a0498;hb=794ce0e083c1eaf04a1f499bb99226894c3ee406;hp=b7e0fd9085f43e859bc857dbc450bed05eb8b3de;hpb=eb5f930ae7d9bf94cbc8a24381f0efa2b376ef3c;p=chaz%2Fopenbox

diff --git a/openbox/stacking.c b/openbox/stacking.c
index b7e0fd90..220399d4 100644
--- a/openbox/stacking.c
+++ b/openbox/stacking.c
@@ -4,6 +4,7 @@
 #include "client.h"
 #include "group.h"
 #include "frame.h"
+#include "window.h"
 #include <glib.h>
 
 GList  *stacking_list = NULL;
@@ -25,161 +26,241 @@ void stacking_set_list()
 	windows = g_new(Window, size);
 	win_it = windows;
 	for (it = g_list_last(stacking_list); it != NULL;
-             it = it->prev, ++win_it)
-	    *win_it = ((Client*)it->data)->window;
+             it = it->prev)
+            if (WINDOW_IS_CLIENT(it->data)) {
+                *win_it = WINDOW_AS_CLIENT(it->data)->window;
+                ++win_it;
+            }
     } else
-	windows = NULL;
+	windows = win_it = NULL;
 
-    PROP_SET32A(ob_root, net_client_list_stacking, window, windows, size);
+    PROP_SETA32(ob_root, net_client_list_stacking, window,
+                (guint32*)windows, win_it - windows);
 
     if (windows)
 	g_free(windows);
 }
 
-static GList *find_lowest_transient(Client *c)
+static void do_restack(GList *wins, GList *before)
 {
-    GList *it;
-    GSList *sit;
+    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));
+    }
+
+
+    win = g_new(Window, g_list_length(wins) + 1);
+
+    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);
 
-    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;
+    for (i = 1, it = wins; it; ++i, it = g_list_next(it)) {
+        win[i] = window_top(it->data);
+        stacking_list = g_list_insert_before(stacking_list, before, it->data);
+    }
+
+    XRestackWindows(ob_display, win, i);
+    g_free(win);
 }
 
-static void raise_recursive(Client *client)
+static void raise(GList *wins)
 {
-    Window wins[2];  /* only ever restack 2 windows. */
     GList *it;
-    GSList *sit;
-
-    g_assert(stacking_list != NULL); /* this would be bad */
+    GList *layer[NUM_STACKLAYER] = {NULL};
+    int i;
 
-    /* remove the client before looking so we can't run into ourselves and our
-       transients can't either. */
-    stacking_list = g_list_remove(stacking_list, client);
+    for (it = wins; it; it = g_list_next(it)) {
+        StackLayer l;
 
-    /* raise transients first */
-    for (sit = client->transients; sit; sit = sit->next)
-        raise_recursive(sit->data);
-
-    /* find 'it' where it is the positiion in the stacking order where
-       'client' will be inserted *before* */
+        l = window_layer(it->data);
+        layer[l] = g_list_append(layer[l], it->data);
+    }
 
-    it = find_lowest_transient(client);
-    if (it)
-        it = it->next;
-    else {
-        /* the stacking list is from highest to lowest */
-        for (it = stacking_list; it; it = it->next) {
-            if (client->layer >= ((Client*)it->data)->layer)
-                break;
+    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]);
         }
     }
+}
 
-    /*
-      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] = ((Client*)it->prev->data)->frame->window;
-    else
-	wins[0] = ((Client*)g_list_last(stacking_list)->data)->frame->window;
-    wins[1] = client->frame->window;
+static void lower(GList *wins)
+{
+    GList *it;
+    GList *layer[NUM_STACKLAYER] = {NULL};
+    int i;
+
+    for (it = wins; it; it = g_list_next(it)) {
+        StackLayer l;
 
-    stacking_list = g_list_insert_before(stacking_list, it, client);
+        l = window_layer(it->data);
+        layer[l] = g_list_append(layer[l], it->data);
+    }
 
-    XRestackWindows(ob_display, wins, 2);
+    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]);
+        }
+    }
 }
 
-void stacking_raise(Client *client)
+static GList* pick_windows(ObWindow *win)
 {
-    g_assert(stacking_list != NULL); /* this would be bad */
+    GList *ret = NULL;
+    GList *it, *next;
+    GSList *sit;
+    Client *c;
+    int i, n;
 
-    /* move up the transient chain as far as possible first */
-    while (client->transient_for) {
-        if (client->transient_for != TRAN_GROUP) {
-            client = client->transient_for;
-        } else {
-            GSList *it;
+    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);
+
+    /* add transient children in their stacking order */
+    i = 0;
+    n = g_slist_length(c->transients);
+    for (it = stacking_list; i < n && it; it = next) {
+        next = g_list_next(it);
+        if ((sit = g_slist_find(c->transients, it->data))) {
+            ++i;
+            ret = g_list_concat(ret, pick_windows(sit->data));
+        }
+    }
 
-            /* the check for TRAN_GROUP is to prevent an infinate loop with
-               2 transients of the same group at the head of the group's
-               members list */
-            for (it = client->group->members; it; it = it->next) {
-                Client *c = it->data;
+    /* add itself */
+    if (g_list_find(stacking_list, win)) {
+        ret = g_list_append(ret, win);
+        stacking_list = g_list_remove(stacking_list, win);
+    }
 
-                if (c != client && c->transient_for != TRAN_GROUP) {
-                    client = it->data;
-                    break;
-                }
+    /* add group members in their stacking order */
+    if (c->group) {
+        for (it = stacking_list; it; it = next) {
+            next = g_list_next(it);
+            if ((sit = g_slist_find(c->group->members, it->data))) {
+                ret = g_list_append(ret, sit->data);
+                stacking_list = g_list_remove(stacking_list, sit->data);
             }
-            if (it == NULL) break;
         }
     }
 
-    raise_recursive(client);
+    if (c->transient_for && c->transient_for != TRAN_GROUP)
+        /* dont add it twice */
+        if (g_list_find(stacking_list, c->transient_for))
+            ret = g_list_concat(ret, pick_windows
+                                (CLIENT_AS_WINDOW(c->transient_for)));
 
-    stacking_set_list();
+    return ret;
 }
 
-static void lower_recursive(Client *client, Client *above)
+void stacking_raise(ObWindow *window)
 {
-    Window wins[2];  /* only ever restack 2 windows. */
-    GList *it;
-    GSList *sit;
+    GList *wins;
 
-    /* find 'it' where 'it' is the position in the stacking_list where the
-       'client' will be placed *after* */
+    wins = pick_windows(window);
+    raise(wins);
+}
 
-    for (it = g_list_last(stacking_list); it != stacking_list; it = it->prev)
-        if (client->layer <= ((Client*)it->data)->layer && it->data != above)
-            break;
+void stacking_lower(ObWindow *window)
+{
+    GList *wins;
 
-    if (it->data != client) { /* not already the bottom */
-        wins[0] = ((Client*)it->data)->frame->window;
-        wins[1] = client->frame->window;
+    wins = pick_windows(window);
+    lower(wins);
+}
 
-        stacking_list = g_list_remove(stacking_list, client);
-        stacking_list = g_list_insert_before(stacking_list, it->next, client);
-        XRestackWindows(ob_display, wins, 2);
-    }
+void stacking_add(ObWindow *win)
+{
+    StackLayer l;
+    GList *wins, *it;
 
-    for (sit = client->transients; sit; sit = sit->next)
-        lower_recursive(sit->data, client);
+    l = window_layer(win);
+    wins = g_list_append(NULL, win); /* list of 1 element */
+
+    for (it = stacking_list; it; it = g_list_next(it))
+        if (window_layer(it->data) <= l)
+            break;
+    do_restack(wins, it);
+    g_list_free(wins);
+
+    stacking_raise(win);
 }
 
-void stacking_lower(Client *client)
+void stacking_add_nonintrusive(ObWindow *win)
 {
-    g_assert(stacking_list != NULL); /* this would be bad */
+    Client *client;
+    Client *parent = NULL;
+    GList *it_before = NULL;
 
-    /* move up the transient chain as far as possible first */
-    while (client->transient_for) {
-        if (client->transient_for != TRAN_GROUP) {
-            client = client->transient_for;
-        } else {
-            GSList *it;
+    if (!WINDOW_IS_CLIENT(win)) {
+        stacking_add(win); /* no special rules for others */
+        return;
+    }
 
-            /* the check for TRAN_GROUP is to prevent an infinate loop with
-               2 transients of the same group at the head of the group's
-               members list */
-            for (it = client->group->members; it; it = it->next) {
-                Client *c = it->data;
+    client = WINDOW_AS_CLIENT(win);
 
-                if (c != client && c->transient_for != TRAN_GROUP) {
-                    client = it->data;
-                    break;
+    /* 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) {
+                    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 == NULL) break;
         }
     }
 
-    lower_recursive(client, NULL);
-
-    stacking_set_list();
+    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;
+        }
+    }
+    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);
+    }
 }
-