X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fstacking.c;h=c715eae04d9ec40f0815a1a1389a190c14098ecf;hb=174de91c343dfbdfe866e566393bf4790ae22596;hp=863263d21c781380ef238be3ad0509627fa25164;hpb=364dfe10ab3cb225dae100f81fe2684ce9f309c6;p=chaz%2Fopenbox diff --git a/openbox/stacking.c b/openbox/stacking.c index 863263d2..c715eae0 100644 --- a/openbox/stacking.c +++ b/openbox/stacking.c @@ -1,3 +1,21 @@ +/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- + + stacking.c for the Openbox window manager + Copyright (c) 2003 Ben Jansens + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + See the COPYING file for a copy of the GNU General Public License. +*/ + #include "openbox.h" #include "prop.h" #include "screen.h" @@ -40,15 +58,18 @@ static void do_restack(GList *wins, GList *before) { GList *it, *next; Window *win; - int i; + gint 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); @@ -66,12 +87,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); @@ -83,7 +106,7 @@ static void do_raise(GList *wins) { GList *it; GList *layer[OB_NUM_STACKING_LAYERS] = {NULL}; - int i; + gint i; for (it = wins; it; it = g_list_next(it)) { ObStackingLayer l; @@ -110,7 +133,7 @@ static void do_lower(GList *wins) { GList *it; GList *layer[OB_NUM_STACKING_LAYERS] = {NULL}; - int i; + gint i; for (it = wins; it; it = g_list_next(it)) { ObStackingLayer l; @@ -138,7 +161,7 @@ static GList *pick_windows(ObClient *top, ObClient *selected, gboolean raise) GList *ret = NULL; GList *it, *next, *prev; GSList *sit; - int i, n; + gint i, n; GList *modals = NULL; GList *trans = NULL; GList *modal_sel = NULL; /* the selected guys if modal */ @@ -205,12 +228,13 @@ 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; GSList *sit; - int i, n; + gint i, n; /* add group members in their stacking order */ if (top->group) { @@ -221,12 +245,26 @@ static GList *pick_group_windows(ObClient *top, ObClient *selected, gboolean rai next = g_list_next(it); if ((sit = g_slist_find(top->group->members, it->data))) { + ObClient *c; + ObClientType t; + ++i; - 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; + c = it->data; + t = c->type; + + if ((c->desktop == selected->desktop || + c->desktop == DESKTOP_ALL) && + (t == OB_CLIENT_TYPE_TOOLBAR || + t == OB_CLIENT_TYPE_MENU || + t == OB_CLIENT_TYPE_UTILITY)) + { + 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; + } } } } @@ -243,7 +281,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); @@ -262,7 +300,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); @@ -271,6 +309,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; @@ -308,10 +360,11 @@ void stacking_add_nonintrusive(ObWindow *win) GList *it; if (client->group) - for (it = stacking_list; !parent && it; it = it->next) { + for (it = stacking_list; !parent && it; it = g_list_next(it)) { if ((sit = g_slist_find(client->group->members, it->data))) for (sit = client->group->members; !parent && sit; - sit = sit->next) { + sit = g_slist_next(sit)) + { ObClient *c = sit->data; /* checking transient_for prevents infinate loops! */ if (sit->data == it->data && !c->transient_for)