X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fstacking.c;h=eac4025cfb9b089b24cddc574fa28729a84add78;hb=6e42b65bda1706887f3b2a7f9d79ba20f7611a06;hp=4702baa3e017dafe1f54064d77ef8a03b5299ca1;hpb=d4b20aef313238e65d176822d44ee259b72e4f95;p=chaz%2Fopenbox

diff --git a/openbox/stacking.c b/openbox/stacking.c
index 4702baa3..eac4025c 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,12 +26,16 @@ 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_SETA32(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);
@@ -48,34 +53,40 @@ static GList *find_lowest_transient(Client *c)
     return NULL;
 }
 
-static void raise_recursive(Client *client)
+static void raise_recursive(ObWindow *window)
 {
     Window wins[2];  /* only ever restack 2 windows. */
-    GList *it;
+    GList *it, *low;
     GSList *sit;
 
     g_assert(stacking_list != NULL); /* this would be bad */
 
-    /* remove the client before looking so we can't run into ourselves and our
+    /* 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, client);
+    stacking_list = g_list_remove(stacking_list, window);
 
     /* raise transients first */
-    for (sit = client->transients; sit; sit = sit->next)
-        raise_recursive(sit->data);
+    if (WINDOW_IS_CLIENT(window)) {
+        Client *client = WINDOW_AS_CLIENT(window);
+        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* */
+       'window' will be inserted *before* */
 
-    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;
+    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;
     }
 
     /*
@@ -85,101 +96,173 @@ static void raise_recursive(Client *client)
     if (it == stacking_list)
 	wins[0] = focus_backup;
     else if (it != NULL)
-	wins[0] = ((Client*)it->prev->data)->frame->window;
+	wins[0] = window_top(it->prev->data);
     else
-	wins[0] = ((Client*)g_list_last(stacking_list)->data)->frame->window;
-    wins[1] = client->frame->window;
+	wins[0] = window_top(g_list_last(stacking_list)->data);
+    wins[1] = window_top(window);
 
-    stacking_list = g_list_insert_before(stacking_list, it, client);
+    stacking_list = g_list_insert_before(stacking_list, it, window);
 
     XRestackWindows(ob_display, wins, 2);
 }
 
-void stacking_raise(Client *client)
+void stacking_raise(ObWindow *window)
 {
     g_assert(stacking_list != NULL); /* this would be bad */
 
-    /* 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;
-
-            /* 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;
-
-                if (c != client && c->transient_for != TRAN_GROUP) {
-                    client = it->data;
-                    break;
+    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;
+
+                /* 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;
+
+                    if (c != client && c->transient_for != TRAN_GROUP)
+                        stacking_raise(it->data);
                 }
+                if (it == NULL) return;
             }
-            if (it == NULL) break;
         }
     }
 
-    raise_recursive(client);
+    raise_recursive(window);
 
     stacking_set_list();
 }
 
-static void lower_recursive(Client *client, Client *above)
+static void lower_recursive(ObWindow *window, ObWindow *above)
 {
     Window wins[2];  /* only ever restack 2 windows. */
     GList *it;
     GSList *sit;
 
     /* find 'it' where 'it' is the position in the stacking_list where the
-       'client' will be placed *after* */
+       'window' will be placed *after* */
 
     for (it = g_list_last(stacking_list); it != stacking_list; it = it->prev)
-        if (client->layer <= ((Client*)it->data)->layer && it->data != above)
+        if (window_layer(window) <= window_layer(it->data) &&
+            it->data != above)
             break;
 
-    if (it->data != client) { /* not already the bottom */
-        wins[0] = ((Client*)it->data)->frame->window;
-        wins[1] = client->frame->window;
+    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, client);
-        stacking_list = g_list_insert_before(stacking_list, it->next, client);
+        stacking_list = g_list_remove(stacking_list, window);
+        stacking_list = g_list_insert_before(stacking_list, it->next, window);
         XRestackWindows(ob_display, wins, 2);
     }
 
-    for (sit = client->transients; sit; sit = sit->next)
-        lower_recursive(sit->data, client);
+    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);
+    }
 }
 
-void stacking_lower(Client *client)
+void stacking_lower(ObWindow *window)
 {
     g_assert(stacking_list != NULL); /* this would be bad */
 
-    /* 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;
-
-            /* 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;
-
-                if (c != client && c->transient_for != TRAN_GROUP) {
-                    client = it->data;
-                    break;
+    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;
+
+                /* 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;
+
+                    if (c != client && c->transient_for != TRAN_GROUP)
+                        stacking_lower(it->data);
                 }
+                if (it == NULL) return;
             }
-            if (it == NULL) break;
         }
+        window = CLIENT_AS_WINDOW(client);
     }
 
-    lower_recursive(client, NULL);
+    lower_recursive(window, NULL);
 
     stacking_set_list();
 }
 
+void stacking_add(ObWindow *win)
+{
+    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. */
+
+    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;
+
+                /* 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 = stacking_list; !parent && it; it = it->next) {
+                    for (sit = client->group->members; !parent && sit;
+                         sit = sit->next) {
+                        Client *c = sit->data;
+                        if (sit->data == it->data &&
+                            c->transient_for != TRAN_GROUP)
+                            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, 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);
+    }
+}