X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fstacking.c;h=2050219db83de16556bcfc21de36036b3802ad31;hb=9ca05545076ffc4c5165ce12de47173b044b57e0;hp=db1606b58417726022d4231c5cfe1f2222d3e767;hpb=d33f44cd86c1474a2c84376509691869aca7bd9f;p=chaz%2Fopenbox diff --git a/openbox/stacking.c b/openbox/stacking.c index db1606b5..2050219d 100644 --- a/openbox/stacking.c +++ b/openbox/stacking.c @@ -158,7 +158,7 @@ static void do_lower(GList *wins) } } -static void restack_windows(ObClient *selected, gboolean raise, gboolean group) +static void restack_windows(ObClient *selected, gboolean raise) { GList *it, *last, *below, *above, *next; GList *wins = NULL; @@ -187,7 +187,7 @@ static void restack_windows(ObClient *selected, gboolean raise, gboolean group) /* call restack for each of these to lower them */ for (top_it = top_reorder; top_it; top_it = g_slist_next(top_it)) - restack_windows(top_it->data, raise, group); + restack_windows(top_it->data, raise); return; } @@ -242,8 +242,10 @@ static void restack_windows(ObClient *selected, gboolean raise, gboolean group) last = NULL; for (it = g_list_last(stacking_list); it; it = g_list_previous(it)) { - if (window_layer(it->data) < selected->layer) + if (window_layer(it->data) < selected->layer) { + last = it; continue; + } /* if lowering, stop at the beginning of the layer */ if (!raise) break; @@ -306,12 +308,12 @@ static void restack_windows(ObClient *selected, gboolean raise, gboolean group) g_list_free(wins); } -void stacking_raise(ObWindow *window, gboolean group) +void stacking_raise(ObWindow *window) { if (WINDOW_IS_CLIENT(window)) { ObClient *selected; selected = WINDOW_AS_CLIENT(window); - restack_windows(selected, TRUE, group); + restack_windows(selected, TRUE); } else { GList *wins; wins = g_list_append(NULL, window); @@ -321,12 +323,12 @@ void stacking_raise(ObWindow *window, gboolean group) } } -void stacking_lower(ObWindow *window, gboolean group) +void stacking_lower(ObWindow *window) { if (WINDOW_IS_CLIENT(window)) { ObClient *selected; selected = WINDOW_AS_CLIENT(window); - restack_windows(selected, FALSE, group); + restack_windows(selected, FALSE); } else { GList *wins; wins = g_list_append(NULL, window); @@ -356,7 +358,7 @@ void stacking_add(ObWindow *win) future */ stacking_list = g_list_append(stacking_list, win); - stacking_raise(win, FALSE); + stacking_raise(win); } void stacking_add_nonintrusive(ObWindow *win)