X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fstacking.c;h=3fa21ded17bb81b0fd51a4132fb91cc38186c7b6;hb=7120face258ee4bd71fb19ded271665acde6465c;hp=b7e0fd9085f43e859bc857dbc450bed05eb8b3de;hpb=eb5f930ae7d9bf94cbc8a24381f0efa2b376ef3c;p=chaz%2Fopenbox diff --git a/openbox/stacking.c b/openbox/stacking.c index b7e0fd90..3fa21ded 100644 --- a/openbox/stacking.c +++ b/openbox/stacking.c @@ -1,185 +1,360 @@ #include "openbox.h" #include "prop.h" +#include "screen.h" #include "focus.h" #include "client.h" #include "group.h" #include "frame.h" -#include +#include "window.h" 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, ++win_it) - *win_it = ((Client*)it->data)->window; - } else - windows = NULL; - - PROP_SET32A(ob_root, net_client_list_stacking, window, windows, size); - - if (windows) - g_free(windows); + 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(RootWindow(ob_display, ob_screen), + net_client_list_stacking, window, (guint32*)windows, i); + + 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; + +#ifdef DEBUG + /* 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)); + } + if (before) + g_assert(window_layer(it->data) >= window_layer(before->data)); +#endif + + win = g_new(Window, g_list_length(wins) + 1); + + if (before == stacking_list) + win[0] = screen_support_win; + else if (!before) + win[0] = window_top(g_list_last(stacking_list)->data); + else + win[0] = window_top(g_list_previous(before)->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); + } + +#ifdef DEBUG + /* 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)); + } +#endif - 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; + XRestackWindows(ob_display, win, i); + g_free(win); + + stacking_set_list(); } -static void raise_recursive(Client *client) +static void do_raise(GList *wins) { - Window wins[2]; /* only ever restack 2 windows. */ GList *it; - GSList *sit; + GList *layer[OB_NUM_STACKING_LAYERS] = {NULL}; + int i; - g_assert(stacking_list != NULL); /* this would be bad */ + for (it = wins; it; it = g_list_next(it)) { + ObStackingLayer l; - /* 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); + l = window_layer(it->data); + layer[l] = g_list_append(layer[l], it->data); + } - /* raise transients first */ - for (sit = client->transients; sit; sit = sit->next) - raise_recursive(sit->data); + it = stacking_list; + for (i = OB_NUM_STACKING_LAYERS - 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) <= (ObStackingLayer) i) + break; + } + do_restack(layer[i], it); + g_list_free(layer[i]); + } + } +} - /* find 'it' where it is the positiion in the stacking order where - 'client' will be inserted *before* */ +static void do_lower(GList *wins) +{ + GList *it; + GList *layer[OB_NUM_STACKING_LAYERS] = {NULL}; + int i; - 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; + for (it = wins; it; it = g_list_next(it)) { + ObStackingLayer l; + + l = window_layer(it->data); + layer[l] = g_list_append(layer[l], it->data); + } + + it = stacking_list; + for (i = OB_NUM_STACKING_LAYERS - 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) < (ObStackingLayer) 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; +static GList *pick_windows(ObClient *top, ObClient *selected, gboolean raise) +{ + GList *ret = NULL; + GList *it, *next, *prev; + GSList *sit; + int i, n; + GList *modals = NULL; + GList *trans = NULL; + GList *modal_sel = NULL; /* the selected guys if modal */ + GList *trans_sel = NULL; /* the selected guys if not */ + + /* remove first so we can't run into ourself */ + if ((it = g_list_find(stacking_list, top))) + stacking_list = g_list_delete_link(stacking_list, it); else - wins[0] = ((Client*)g_list_last(stacking_list)->data)->frame->window; - wins[1] = client->frame->window; + return NULL; + + 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))) { + ObClient *c = sit->data; + gboolean sel_child; + + ++i; + + if (c == selected) + sel_child = TRUE; + else + sel_child = client_search_transient(c, selected) != NULL; + + if (!c->modal) { + if (!sel_child) { + trans = g_list_concat(trans, + pick_windows(c, selected, raise)); + } else { + trans_sel = g_list_concat(trans_sel, + pick_windows(c, selected, + raise)); + } + } else { + if (!sel_child) { + modals = g_list_concat(modals, + pick_windows(c, selected, raise)); + } else { + modal_sel = g_list_concat(modal_sel, + 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; + } + } - stacking_list = g_list_insert_before(stacking_list, it, client); + ret = g_list_concat((raise ? modal_sel : modals), + (raise ? modals : modal_sel)); - XRestackWindows(ob_display, wins, 2); -} + ret = g_list_concat(ret, (raise ? trans_sel : trans)); + ret = g_list_concat(ret, (raise ? trans : trans_sel)); -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; + /* add itself */ + ret = g_list_append(ret, top); - /* 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; + return ret; +} - if (c != client && c->transient_for != TRAN_GROUP) { - client = it->data; - break; - } +static GList *pick_group_windows(ObClient *top, ObClient *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; } - if (it == NULL) break; } } + return ret; +} - raise_recursive(client); +void stacking_raise(ObWindow *window) +{ + GList *wins; + + if (WINDOW_IS_CLIENT(window)) { + ObClient *c; + ObClient *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); +} - stacking_set_list(); +void stacking_lower(ObWindow *window) +{ + GList *wins; + + if (WINDOW_IS_CLIENT(window)) { + ObClient *c; + ObClient *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); + } + do_lower(wins); + g_list_free(wins); } -static void lower_recursive(Client *client, Client *above) +void stacking_below(ObWindow *window, ObWindow *below) { - Window wins[2]; /* only ever restack 2 windows. */ - GList *it; - GSList *sit; + GList *wins, *before; - /* find 'it' where 'it' is the position in the stacking_list where the - 'client' will be placed *after* */ + if (window_layer(window) != window_layer(below)) + return; - for (it = g_list_last(stacking_list); it != stacking_list; it = it->prev) - if (client->layer <= ((Client*)it->data)->layer && it->data != above) - break; + wins = g_list_append(NULL, window); + stacking_list = g_list_remove(stacking_list, window); + before = g_list_next(g_list_find(stacking_list, below)); + do_restack(wins, before); + g_list_free(wins); +} - if (it->data != client) { /* not already the bottom */ - wins[0] = ((Client*)it->data)->frame->window; - wins[1] = client->frame->window; +void stacking_add(ObWindow *win) +{ + ObStackingLayer l; + GList *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); - } + g_assert(screen_support_win != None); /* make sure I dont break this in the + future */ + + l = window_layer(win); + wins = g_list_append(NULL, win); /* list of 1 element */ - for (sit = client->transients; sit; sit = sit->next) - lower_recursive(sit->data, client); + stacking_list = g_list_append(stacking_list, win); + stacking_raise(win); } -void stacking_lower(Client *client) +void stacking_add_nonintrusive(ObWindow *win) { - g_assert(stacking_list != NULL); /* this would be bad */ + ObClient *client; + ObClient *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 != OB_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) { + ObClient *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); + } } -