X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fstacking.c;h=4702baa3e017dafe1f54064d77ef8a03b5299ca1;hb=d4b20aef313238e65d176822d44ee259b72e4f95;hp=72b7c03ba51856cf9b123326b38f429ffc1692aa;hpb=69abb86cb0876a26d5d34da9d9c1de7d968cafc2;p=chaz%2Fopenbox diff --git a/openbox/stacking.c b/openbox/stacking.c index 72b7c03b..4702baa3 100644 --- a/openbox/stacking.c +++ b/openbox/stacking.c @@ -2,6 +2,7 @@ #include "prop.h" #include "focus.h" #include "client.h" +#include "group.h" #include "frame.h" #include @@ -29,34 +30,52 @@ void stacking_set_list() } else windows = NULL; - PROP_SET32A(ob_root, net_client_list_stacking, window, windows, size); + PROP_SETA32(ob_root, net_client_list_stacking, window, windows, size); if (windows) g_free(windows); } -void stacking_raise(Client *client) +static GList *find_lowest_transient(Client *c) +{ + 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; +} + +static void raise_recursive(Client *client) { Window wins[2]; /* only ever restack 2 windows. */ GList *it; - Client *m; + GSList *sit; g_assert(stacking_list != NULL); /* this would be bad */ - m = client_find_modal_child(client); - /* if we have a modal child, raise it instead, we'll go along tho later */ - if (m) stacking_raise(m); - - /* remove the client before looking so we can't run into ourselves */ + /* 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); - - /* the stacking list is from highest to lowest */ - it = stacking_list; - while (it != NULL) { - Client *c = it->data; - if (client->layer >= c->layer && m != c) - break; - it = it->next; + + /* 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* */ + + 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; + } } /* @@ -74,49 +93,93 @@ void stacking_raise(Client *client) stacking_list = g_list_insert_before(stacking_list, it, client); XRestackWindows(ob_display, wins, 2); +} + +void stacking_raise(Client *client) +{ + 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 (it == NULL) break; + } + } + + raise_recursive(client); stacking_set_list(); } -void stacking_lower(Client *client) +static void lower_recursive(Client *client, Client *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* */ + + for (it = g_list_last(stacking_list); it != stacking_list; it = it->prev) + if (client->layer <= ((Client*)it->data)->layer && it->data != above) + break; + + if (it->data != client) { /* not already the bottom */ + wins[0] = ((Client*)it->data)->frame->window; + wins[1] = client->frame->window; + + stacking_list = g_list_remove(stacking_list, client); + stacking_list = g_list_insert_before(stacking_list, it->next, client); + XRestackWindows(ob_display, wins, 2); + } + for (sit = client->transients; sit; sit = sit->next) + lower_recursive(sit->data, client); +} + +void stacking_lower(Client *client) +{ g_assert(stacking_list != NULL); /* this would be bad */ - it = g_list_last(stacking_list); - - if (client->modal && client->transient_for) { - /* don't let a modal window lower below its transient_for */ - it = g_list_find(stacking_list, client->transient_for); - g_assert(it != NULL); - - wins[0] = (it == stacking_list ? focus_backup : - ((Client*)it->prev->data)->frame->window); - wins[1] = client->frame->window; - if (wins[0] == wins[1]) return; /* already right above the window */ - - stacking_list = g_list_remove(stacking_list, client); - stacking_list = g_list_insert_before(stacking_list, it, client); - } else { - while (it != stacking_list) { - Client *c = it->data; - if (client->layer <= c->layer) - break; - it = it->prev; - } - if (it->data == client) return; /* already the bottom, return */ - - wins[0] = ((Client*)it->data)->frame->window; - wins[1] = client->frame->window; - - stacking_list = g_list_remove(stacking_list, client); - stacking_list = g_list_insert_before(stacking_list, - it->next, client); + /* 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 (it == NULL) break; + } } - XRestackWindows(ob_display, wins, 2); + lower_recursive(client, NULL); + stacking_set_list(); }