X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fstacking.c;h=5b9b37b2958134e1a4d7dace6c466cc3206c1346;hb=35418ca0fcd3fd28ef579f4435b8bad3b7c87f04;hp=e4d503a80469fe6a0b5e40b554a206cc7cb629ad;hpb=f0b09e265a9b5c333ae27d57db6be79a3da6312f;p=chaz%2Fopenbox diff --git a/openbox/stacking.c b/openbox/stacking.c index e4d503a8..5b9b37b2 100644 --- a/openbox/stacking.c +++ b/openbox/stacking.c @@ -1,11 +1,11 @@ #include "openbox.h" #include "prop.h" +#include "screen.h" #include "focus.h" #include "client.h" #include "group.h" #include "frame.h" #include "window.h" -#include GList *stacking_list = NULL; @@ -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!) */ @@ -30,8 +30,8 @@ void stacking_set_list() } } - PROP_SETA32(ob_root, net_client_list_stacking, window, - (guint32*)windows, i); + PROP_SETA32(RootWindow(ob_display, ob_screen), + net_client_list_stacking, window, (guint32*)windows, i); g_free(windows); } @@ -53,7 +53,7 @@ static void do_restack(GList *wins, GList *before) win = g_new(Window, g_list_length(wins) + 1); if (before == stacking_list) - win[0] = focus_backup; + win[0] = screen_support_win; else if (!before) win[0] = window_top(g_list_last(stacking_list)->data); else @@ -82,22 +82,22 @@ static void do_restack(GList *wins, GList *before) static void do_raise(GList *wins) { GList *it; - GList *layer[NUM_STACKLAYER] = {NULL}; + GList *layer[OB_NUM_STACKING_LAYERS] = {NULL}; int i; for (it = wins; it; it = g_list_next(it)) { - StackLayer l; + ObStackingLayer l; l = window_layer(it->data); layer[l] = g_list_append(layer[l], it->data); } it = stacking_list; - for (i = NUM_STACKLAYER - 1; i >= 0; --i) { + 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) <= (StackLayer) i) + if (window_layer(it->data) <= (ObStackingLayer) i) break; } do_restack(layer[i], it); @@ -109,22 +109,22 @@ static void do_raise(GList *wins) static void do_lower(GList *wins) { GList *it; - GList *layer[NUM_STACKLAYER] = {NULL}; + GList *layer[OB_NUM_STACKING_LAYERS] = {NULL}; int i; for (it = wins; it; it = g_list_next(it)) { - StackLayer l; + ObStackingLayer l; l = window_layer(it->data); layer[l] = g_list_append(layer[l], it->data); } it = stacking_list; - for (i = NUM_STACKLAYER - 1; i >= 0; --i) { + 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) < (StackLayer) i) + if (window_layer(it->data) < (ObStackingLayer) i) break; } do_restack(layer[i], it); @@ -133,67 +133,73 @@ static void do_lower(GList *wins) } } -static GList *pick_windows(Client *top, Client *selected) +static GList *pick_windows(ObClient *top, ObClient *selected, gboolean raise) { GList *ret = NULL; - GList *it, *next; + GList *it, *next, *prev; GSList *sit; - gboolean sel_trans; int i, n; + 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, top); - /* is one of the transient windows the 'selected' one? */ - sel_trans = g_slist_find(top->transients, selected) != NULL; - - /* is the selected dude modal? if so then add it first */ - if (sel_trans && selected->modal) { - ret = g_list_concat(ret, pick_windows(selected, selected)); - sel_trans = FALSE; - } - - /* first add modal transient children in their stacking order */ 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 (((Client*)it->data)->modal) { - if ((sit = g_slist_find(top->transients, it->data))) { - ++i; - ret = g_list_concat(ret, pick_windows(sit->data, selected)); - it = stacking_list; - } - } - } - - /* if the selected dude is a transient but not modal, then add it after - the other modals */ - if (sel_trans) - ret = g_list_concat(ret, pick_windows(selected, selected)); - /* add transient children in their stacking order */ - i = 0; - n = g_slist_length(top->transients); - for (it = stacking_list; i < n && it; it = next) { - next = g_list_next(it); if ((sit = g_slist_find(top->transients, it->data))) { + ObClient *c = sit->data; + ++i; - ret = g_list_concat(ret, pick_windows(sit->data, selected)); - 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, top); return ret; } -static GList *pick_group_windows(Client *top, Client *selected) +static GList *pick_group_windows(ObClient *top, ObClient *selected, gboolean raise) { GList *ret = NULL; - GList *it, *next; + GList *it, *next, *prev; GSList *sit; int i, n; @@ -202,11 +208,16 @@ static GList *pick_group_windows(Client *top, Client *selected) 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)); - 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; } } } @@ -218,12 +229,12 @@ void stacking_raise(ObWindow *window) GList *wins; if (WINDOW_IS_CLIENT(window)) { - Client *c; - Client *selected; + ObClient *c; + ObClient *selected; selected = WINDOW_AS_CLIENT(window); c = client_search_top_transient(selected); - wins = pick_windows(c, selected); - wins = g_list_concat(wins, pick_group_windows(c, 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); @@ -237,12 +248,12 @@ void stacking_lower(ObWindow *window) GList *wins; if (WINDOW_IS_CLIENT(window)) { - Client *c; - Client *selected; + ObClient *c; + ObClient *selected; selected = WINDOW_AS_CLIENT(window); c = client_search_top_transient(selected); - wins = pick_windows(c, selected); - wins = g_list_concat(pick_group_windows(c, selected), wins); + 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); @@ -253,10 +264,10 @@ void stacking_lower(ObWindow *window) void stacking_add(ObWindow *win) { - StackLayer l; + ObStackingLayer l; GList *wins; - g_assert(focus_backup != None); /* make sure I dont break this in the + g_assert(screen_support_win != None); /* make sure I dont break this in the future */ l = window_layer(win); @@ -268,8 +279,8 @@ void stacking_add(ObWindow *win) void stacking_add_nonintrusive(ObWindow *win) { - Client *client; - Client *parent = NULL; + ObClient *client; + ObClient *parent = NULL; GList *it_before = NULL; if (!WINDOW_IS_CLIENT(win)) { @@ -281,7 +292,7 @@ void stacking_add_nonintrusive(ObWindow *win) /* insert above its highest parent */ if (client->transient_for) { - if (client->transient_for != TRAN_GROUP) { + if (client->transient_for != OB_TRAN_GROUP) { parent = client->transient_for; } else { GSList *sit; @@ -292,7 +303,7 @@ void stacking_add_nonintrusive(ObWindow *win) if ((sit = g_slist_find(client->group->members, it->data))) for (sit = client->group->members; !parent && sit; sit = sit->next) { - Client *c = sit->data; + ObClient *c = sit->data; /* checking transient_for prevents infinate loops! */ if (sit->data == it->data && !c->transient_for) parent = it->data;