X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fstacking.c;h=26726c7b4aa2c3ab138a51546b3cf36373ab19fc;hb=e84fb1b052584b83947715d8ae4ec5d8afd201e7;hp=db1606b58417726022d4231c5cfe1f2222d3e767;hpb=d33f44cd86c1474a2c84376509691869aca7bd9f;p=chaz%2Fopenbox diff --git a/openbox/stacking.c b/openbox/stacking.c index db1606b5..26726c7b 100644 --- a/openbox/stacking.c +++ b/openbox/stacking.c @@ -2,7 +2,7 @@ stacking.c for the Openbox window manager Copyright (c) 2006 Mikael Magnusson - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana 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 @@ -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; @@ -176,19 +176,22 @@ static void restack_windows(ObClient *selected, gboolean raise, gboolean group) this window, or it won't move */ top = client_search_all_top_parents(selected); - /* go thru stacking list backwards so we can use g_slist_prepend */ - for (it = g_list_last(stacking_list); it && top; - it = g_list_previous(it)) - if ((top_it = g_slist_find(top, it->data))) { - top_reorder = g_slist_prepend(top_reorder, top_it->data); - top = g_slist_delete_link(top, top_it); - } - g_assert(top == NULL); + /* that is, if it has any parents */ + if (!(top->data == selected && top->next == NULL)) { + /* go thru stacking list backwards so we can use g_slist_prepend */ + for (it = g_list_last(stacking_list); it && top; + it = g_list_previous(it)) + if ((top_it = g_slist_find(top, it->data))) { + top_reorder = g_slist_prepend(top_reorder, top_it->data); + top = g_slist_delete_link(top, top_it); + } + g_assert(top == NULL); - /* 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); - return; + /* 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); + return; + } } /* remove first so we can't run into ourself */ @@ -197,7 +200,9 @@ static void restack_windows(ObClient *selected, gboolean raise, gboolean group) stacking_list = g_list_delete_link(stacking_list, it); /* go from the bottom of the stacking list up */ - for (it = g_list_last(stacking_list); it; it = g_list_previous(it)) { + for (it = g_list_last(stacking_list); it; it = next) { + next = g_list_previous(it); + if (WINDOW_IS_CLIENT(it->data)) { ObClient *ch = it->data; @@ -242,8 +247,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 +313,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 +328,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,13 +363,47 @@ void stacking_add(ObWindow *win) future */ stacking_list = g_list_append(stacking_list, win); - stacking_raise(win, FALSE); + stacking_raise(win); +} + +static GList *find_highest_relative(ObClient *client) +{ + GList *ret = NULL; + + if (client->transient_for) { + GList *it; + GSList *top; + + /* get all top level relatives of this client */ + top = client_search_all_top_parents(client); + + /* go from the top of the stacking order down */ + for (it = stacking_list; !ret && it; it = g_list_next(it)) { + if (WINDOW_IS_CLIENT(it->data)) { + ObClient *c = it->data; + /* only look at windows in the same layer */ + if (c->layer == client->layer) { + GSList *sit; + + /* go through each top level parent and see it this window + is related to them */ + for (sit = top; !ret && sit; sit = g_slist_next(sit)) { + ObClient *topc = sit->data; + + /* are they related ? */ + if (topc == c || client_search_transient(topc, c)) + ret = it; + } + } + } + } + } + return ret; } void stacking_add_nonintrusive(ObWindow *win) { ObClient *client; - ObClient *parent = NULL; GList *it_below = NULL; if (!WINDOW_IS_CLIENT(win)) { @@ -372,40 +413,22 @@ void stacking_add_nonintrusive(ObWindow *win) client = WINDOW_AS_CLIENT(win); - /* insert above its highest parent */ - if (client->transient_for) { - if (client->transient_for != OB_TRAN_GROUP) { - parent = client->transient_for; - } else { - GSList *sit; - GList *it; - - if (client->group) - 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 = g_slist_next(sit)) - { - ObClient *c = sit->data; - /* checking transient_for prevents infinate loops! */ - if (sit->data == it->data && !c->transient_for) - parent = it->data; - } - } - } - } + /* insert above its highest parent (or its highest child !) */ + it_below = find_highest_relative(client); - if (!(it_below = g_list_find(stacking_list, parent))) { - /* no parent to put above, try find the focused client to go - under */ + if (!it_below) { + /* nothing to put it directly above, so try find the focused client to + put it underneath it */ if (focus_client && focus_client->layer == client->layer) { if ((it_below = g_list_find(stacking_list, focus_client))) it_below = it_below->next; } } if (!it_below) { - /* out of ideas, just add it normally... */ - stacking_add(win); + /* there is no window to put this directly above, so put it at the + bottom */ + stacking_list = g_list_prepend(stacking_list, win); + stacking_lower(win); } else { /* make sure it's not in the wrong layer though ! */ for (; it_below; it_below = g_list_next(it_below))