X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fstacking.c;h=c3d485f5427b96c1a3dab9b40d44cdc446d8dd11;hb=276b2be581c6cb138b439537761ff2ca42201805;hp=2fa4b2e6d9dc8c83d15c2641193da527ccf9c6fa;hpb=2fa7129ca3cdab0ccc7a575a70dad825d06d9521;p=chaz%2Fopenbox diff --git a/openbox/stacking.c b/openbox/stacking.c index 2fa4b2e6..c3d485f5 100644 --- a/openbox/stacking.c +++ b/openbox/stacking.c @@ -18,7 +18,7 @@ void stacking_set_list() /* 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!) */ @@ -61,6 +61,8 @@ static void do_restack(GList *wins, GList *before) 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); } @@ -77,7 +79,7 @@ static void do_restack(GList *wins, GList *before) stacking_set_list(); } -static void raise(GList *wins) +static void do_raise(GList *wins) { GList *it; GList *layer[NUM_STACKLAYER] = {NULL}; @@ -104,7 +106,7 @@ static void raise(GList *wins) } } -static void lower(GList *wins) +static void do_lower(GList *wins) { GList *it; GList *layer[NUM_STACKLAYER] = {NULL}; @@ -131,111 +133,113 @@ static void lower(GList *wins) } } -static GList *pick_windows(ObWindow *win) +static GList *pick_windows(Client *top, Client *selected, gboolean raise) { GList *ret = NULL; - GList *it, *next; + GList *it, *next, *prev; GSList *sit; - Client *c; int i, n; - - 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); + GList *modals = NULL; + GList *trans = NULL; + GList *modal_sel_it = NULL; /* the selected guy if modal */ + GList *trans_sel_it = NULL; /* the selected guy if not */ /* remove first so we can't run into ourself */ - stacking_list = g_list_remove(stacking_list, win); + stacking_list = g_list_remove(stacking_list, top); - /* add transient children in their stacking order */ i = 0; - n = g_slist_length(c->transients); + 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(c->transients, it->data))) { + + if ((sit = g_slist_find(top->transients, it->data))) { + Client *c = sit->data; + ++i; - ret = g_list_concat(ret, pick_windows(sit->data)); - it = stacking_list; + + if (!c->modal) { + if (c != selected) { + trans = g_list_concat(trans, + pick_windows(c, selected, raise)); + } else { + g_assert(modal_sel_it == NULL); + g_assert(trans_sel_it == NULL); + trans_sel_it = pick_windows(c, selected, raise); + } + } else { + if (c != selected) { + modals = g_list_concat(modals, + pick_windows(c, selected, raise)); + } else { + g_assert(modal_sel_it == NULL); + g_assert(trans_sel_it == NULL); + modal_sel_it = 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; } } + ret = g_list_concat((raise ? modal_sel_it : modals), + (raise ? modals : modal_sel_it)); + + ret = g_list_concat(ret, (raise ? trans_sel_it : trans)); + ret = g_list_concat(ret, (raise ? trans : trans_sel_it)); + + /* add itself */ - ret = g_list_append(ret, win); + ret = g_list_append(ret, top); return ret; } -static GList *pick_group_windows(ObWindow *win) +static GList *pick_group_windows(Client *top, Client *selected, gboolean raise) { GList *ret = NULL; - GList *it, *next; + GList *it, *next, *prev; GSList *sit; - Client *c; int i, n; - if (!WINDOW_IS_CLIENT(win)) - return NULL; - - c = WINDOW_AS_CLIENT(win); - /* add group members in their stacking order */ - if (c->group) { + if (top->group) { i = 0; - n = g_slist_length(c->group->members) - 1; + 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(c->group->members, it->data))) { + + if ((sit = g_slist_find(top->group->members, it->data))) { ++i; - ret = g_list_concat(ret, pick_windows(sit->data)); - it = stacking_list; + 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; } } } return ret; } -static ObWindow *top_transient(ObWindow *window) -{ - Client *client; - - if (!WINDOW_IS_CLIENT(window)) - return window; - - client = WINDOW_AS_CLIENT(window); - - /* move up the transient chain as far as possible */ - if (client->transient_for) { - if (client->transient_for != TRAN_GROUP) { - return top_transient(CLIENT_AS_WINDOW(client->transient_for)); - } else { - GSList *it; - - 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) - break; - } - if (it) - return it->data; - } - } - - return window; -} - void stacking_raise(ObWindow *window) { GList *wins; - window = top_transient(window); - wins = pick_windows(window); - wins = g_list_concat(wins, pick_group_windows(window)); - raise(wins); + if (WINDOW_IS_CLIENT(window)) { + Client *c; + Client *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); } @@ -243,17 +247,28 @@ void stacking_lower(ObWindow *window) { GList *wins; - window = top_transient(window); - wins = pick_windows(window); - wins = g_list_concat(pick_group_windows(window), wins); - lower(wins); + if (WINDOW_IS_CLIENT(window)) { + Client *c; + Client *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); } void stacking_add(ObWindow *win) { StackLayer l; - GList *wins, *it; + GList *wins; + + g_assert(focus_backup != None); /* make sure I dont break this in the + future */ l = window_layer(win); wins = g_list_append(NULL, win); /* list of 1 element */