X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fstacking.c;h=3fa21ded17bb81b0fd51a4132fb91cc38186c7b6;hb=5d4cbbc67444c3955f705b3aeddf29be1c731866;hp=c9dcb0b738a75dced08456ea6e368ab8e31dfed8;hpb=d1d84711a2684c47c688cc7d015741bd484151fb;p=chaz%2Fopenbox diff --git a/openbox/stacking.c b/openbox/stacking.c index c9dcb0b7..3fa21ded 100644 --- a/openbox/stacking.c +++ b/openbox/stacking.c @@ -6,7 +6,6 @@ #include "group.h" #include "frame.h" #include "window.h" -#include GList *stacking_list = NULL; @@ -19,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 == OB_STATE_EXITING) return; + if (ob_state() == OB_STATE_EXITING) return; /* create an array of the window ids (from bottom to top, reverse order!) */ @@ -31,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); } @@ -43,13 +42,16 @@ 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); @@ -67,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); @@ -142,11 +146,14 @@ static GList *pick_windows(ObClient *top, ObClient *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); @@ -156,26 +163,32 @@ static GList *pick_windows(ObClient *top, ObClient *selected, gboolean raise) 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 (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, @@ -184,11 +197,11 @@ static GList *pick_windows(ObClient *top, ObClient *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 */ @@ -197,7 +210,8 @@ static GList *pick_windows(ObClient *top, ObClient *selected, gboolean raise) return ret; } -static GList *pick_group_windows(ObClient *top, ObClient *selected, gboolean raise) +static GList *pick_group_windows(ObClient *top, ObClient *selected, + gboolean raise) { GList *ret = NULL; GList *it, *next, *prev; @@ -235,7 +249,7 @@ void stacking_raise(ObWindow *window) 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); @@ -254,7 +268,7 @@ void stacking_lower(ObWindow *window) 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); @@ -263,6 +277,20 @@ 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) { ObStackingLayer l;