X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fstacking.c;h=3fa21ded17bb81b0fd51a4132fb91cc38186c7b6;hb=7120face258ee4bd71fb19ded271665acde6465c;hp=9309ee048c36414019b968b1fd7333f2a3da1a56;hpb=38d3cad2493694e5441c64d92a40eadfe8b5327e;p=chaz%2Fopenbox diff --git a/openbox/stacking.c b/openbox/stacking.c index 9309ee04..3fa21ded 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); } @@ -42,18 +42,21 @@ static void do_restack(GList *wins, GList *before) 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] = focus_backup; + win[0] = screen_support_win; else if (!before) win[0] = window_top(g_list_last(stacking_list)->data); else @@ -66,12 +69,14 @@ static void do_restack(GList *wins, GList *before) stacking_list = g_list_insert_before(stacking_list, before, it->data); } - /* XXX some debug checking of the stacking list's order */ +#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 XRestackWindows(ob_display, win, i); g_free(win); @@ -82,22 +87,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 +114,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,7 +138,7 @@ static void do_lower(GList *wins) } } -static GList *pick_windows(Client *top, Client *selected, gboolean raise) +static GList *pick_windows(ObClient *top, ObClient *selected, gboolean raise) { GList *ret = NULL; GList *it, *next, *prev; @@ -141,11 +146,14 @@ static GList *pick_windows(Client *top, Client *selected, gboolean raise) 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 */ + 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 */ - stacking_list = g_list_remove(stacking_list, top); + if ((it = g_list_find(stacking_list, top))) + stacking_list = g_list_delete_link(stacking_list, it); + else + return NULL; i = 0; n = g_slist_length(top->transients); @@ -154,27 +162,33 @@ static GList *pick_windows(Client *top, Client *selected, gboolean raise) next = g_list_next(it); if ((sit = g_slist_find(top->transients, it->data))) { - Client *c = sit->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 (c != selected) { + if (!sel_child) { trans = g_list_concat(trans, - pick_windows(c, selected, raise)); + 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); + trans_sel = g_list_concat(trans_sel, + pick_windows(c, selected, + raise)); } } else { - if (c != selected) { + if (!sel_child) { 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); + modal_sel = g_list_concat(modal_sel, + pick_windows(c, selected, + raise)); } } /* if we dont have a prev then start back at the beginning, @@ -183,11 +197,11 @@ static GList *pick_windows(Client *top, Client *selected, gboolean raise) } } - ret = g_list_concat((raise ? modal_sel_it : modals), - (raise ? modals : modal_sel_it)); + ret = g_list_concat((raise ? modal_sel : modals), + (raise ? modals : modal_sel)); - ret = g_list_concat(ret, (raise ? trans_sel_it : trans)); - ret = g_list_concat(ret, (raise ? trans : trans_sel_it)); + ret = g_list_concat(ret, (raise ? trans_sel : trans)); + ret = g_list_concat(ret, (raise ? trans : trans_sel)); /* add itself */ @@ -196,10 +210,11 @@ static GList *pick_windows(Client *top, Client *selected, gboolean raise) return ret; } -static GList *pick_group_windows(Client *top, Client *selected, gboolean raise) +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; @@ -208,12 +223,16 @@ static GList *pick_group_windows(Client *top, Client *selected, gboolean raise) 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)); - 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; } } } @@ -225,12 +244,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, TRUE); - wins = g_list_concat(wins, pick_group_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); @@ -244,12 +263,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, FALSE); - wins = g_list_concat(pick_group_windows(c, selected, FALSE), wins); + /*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); @@ -258,12 +277,26 @@ void stacking_lower(ObWindow *window) g_list_free(wins); } +void stacking_below(ObWindow *window, ObWindow *below) +{ + GList *wins, *before; + + if (window_layer(window) != window_layer(below)) + return; + + 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); +} + 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); @@ -275,8 +308,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)) { @@ -288,7 +321,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; @@ -299,7 +332,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;