X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fstacking.c;h=696ce354f09d6fec6ba348ee4fc21273d90c13fb;hb=069e9607fa433190307bb8242294a109e88165de;hp=c251f17ba6f1f441ce2c735ee6c945397245da45;hpb=580795fe6a4b5d070f01065b309f1789cf0d0dbb;p=chaz%2Fopenbox diff --git a/openbox/stacking.c b/openbox/stacking.c index c251f17b..696ce354 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 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_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); @@ -44,38 +49,44 @@ static GList *find_lowest_transient(Client *c) 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 */ - if (((Client*)it->data)->layer == c->layer) /* same layer? */ - return it; + return it; return NULL; } -void stacking_raise(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 */ - /* if we have a transients raise them */ - for (sit = client->transients; sit; sit = sit->next) - stacking_raise(sit->data); + /* 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); + + /* 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); + } - /* remove the client before looking so we can't run into ourselves */ - stacking_list = g_list_remove(stacking_list, client); - /* find 'it' where it is the positiion in the stacking order where - 'client' will be inserted *after* */ - - 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; + '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; } /* @@ -85,79 +96,172 @@ void stacking_raise(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(ObWindow *window) +{ + g_assert(stacking_list != NULL); /* this would be bad */ + + 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; + gboolean raised = FALSE; + + 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_raise(it->data); + raised = TRUE; + } + } + if (raised) return; + } + } + } + + 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; - it = g_list_last(stacking_list); - /* find 'it' where 'it' is the position in the stacking_list where the - 'client' will be placed *after* */ + 'window' will be placed *after* */ - while (it != stacking_list) { - Client *c = it->data; - if (client->layer <= c->layer && c != above) + 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; - it = it->prev; - } - 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 (!above) /* only need to do this once */ - stacking_set_list(); + 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; + 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; + 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; + /* checking transient_for prevents infinate loops! */ + if (c != client && !c->transient_for) + 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; + + 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 (!(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 { + 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); + } + } +}