X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fstacking.c;h=fe3d26d35e4e63f0e5c9403fecb34bbbe5395d41;hb=51fdd13fd1a445d5fa3c2d7aab356e7caaf2f902;hp=e323b569fd670e0d0098b0fe6813e59426847abe;hpb=47529e777f5d0ac222b6ed06c9644c3909bd6479;p=chaz%2Fopenbox diff --git a/openbox/stacking.c b/openbox/stacking.c index e323b569..fe3d26d3 100644 --- a/openbox/stacking.c +++ b/openbox/stacking.c @@ -169,61 +169,38 @@ static void restack_windows(ObClient *selected, gboolean raise) GList *modals = NULL; GList *trans = NULL; - if (!raise && selected->transient_for) { - GSList *top, *top_it; - GSList *top_reorder = NULL; - - /* if it's a transient lowering, lower its parents so that we can lower - this window, or it won't move */ - top = client_search_all_top_parents_layer(selected); - - /* 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); - return; - } - } - /* remove first so we can't run into ourself */ it = g_list_find(stacking_list, selected); g_assert(it); 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 = next) { - next = g_list_previous(it); + /* go from the bottom of the stacking list up. don't move any other windows + when lowering, we call this for each window independently */ + if (raise) { + 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; + if (WINDOW_IS_CLIENT(it->data)) { + ObClient *ch = it->data; - /* only move windows in the same stacking layer */ - if (ch->layer == selected->layer && - client_search_transient(selected, ch)) - { - if (client_is_direct_child(selected, ch)) { - if (ch->modal) - modals = g_list_prepend(modals, ch); - else - trans = g_list_prepend(trans, ch); - } - else { - if (ch->modal) - group_modals = g_list_prepend(group_modals, ch); - else - group_trans = g_list_prepend(group_trans, ch); + /* only move windows in the same stacking layer */ + if (ch->layer == selected->layer && + client_search_transient(selected, ch)) + { + if (client_is_direct_child(selected, ch)) { + if (ch->modal) + modals = g_list_prepend(modals, ch); + else + trans = g_list_prepend(trans, ch); + } + else { + if (ch->modal) + group_modals = g_list_prepend(group_modals, ch); + else + group_trans = g_list_prepend(group_trans, ch); + } + stacking_list = g_list_delete_link(stacking_list, it); } - stacking_list = g_list_delete_link(stacking_list, it); } } } @@ -233,7 +210,7 @@ static void restack_windows(ObClient *selected, gboolean raise) wins = g_list_append(wins, selected); /* if selected window is transient for group then raise it above others */ - if (selected->transient_for == OB_TRAN_GROUP) { + if (selected->transient_for_group) { /* if it's modal, raise it above those also */ if (selected->modal) { wins = g_list_concat(wins, group_modals); @@ -312,6 +289,27 @@ static void restack_windows(ObClient *selected, gboolean raise) do_restack(wins, below); g_list_free(wins); + + /* lower our parents after us, so they go below us */ + if (!raise && selected->parents) { + GSList *parents_copy, *sit; + GSList *reorder = NULL; + + parents_copy = g_slist_copy(selected->parents); + + /* go thru stacking list backwards so we can use g_slist_prepend */ + for (it = g_list_last(stacking_list); it && parents_copy; + it = g_list_previous(it)) + if ((sit = g_slist_find(parents_copy, it->data))) { + reorder = g_slist_prepend(reorder, sit->data); + parents_copy = g_slist_delete_link(parents_copy, sit); + } + g_assert(parents_copy == NULL); + + /* call restack for each of these to lower them */ + for (sit = reorder; sit; sit = g_slist_next(sit)) + restack_windows(sit->data, raise); + } } void stacking_raise(ObWindow *window) @@ -371,7 +369,7 @@ static GList *find_highest_relative(ObClient *client) { GList *ret = NULL; - if (client->transient_for) { + if (client->parents) { GList *it; GSList *top; @@ -382,8 +380,14 @@ static GList *find_highest_relative(ObClient *client) 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) { + /* only look at windows in the same layer and that are + visible */ + if (c->layer == client->layer && + !c->iconic && + (c->desktop == client->desktop || + c->desktop == DESKTOP_ALL || + client->desktop == DESKTOP_ALL)) + { GSList *sit; /* go through each top level parent and see it this window @@ -405,7 +409,8 @@ static GList *find_highest_relative(ObClient *client) void stacking_add_nonintrusive(ObWindow *win) { ObClient *client; - GList *it_below = NULL; + GList *it_below = NULL; /* this client will be below us */ + GList *it_above; if (!WINDOW_IS_CLIENT(win)) { stacking_add(win); /* no special rules for others */ @@ -417,53 +422,55 @@ void stacking_add_nonintrusive(ObWindow *win) /* insert above its highest parent (or its highest child !) */ it_below = find_highest_relative(client); - if (!it_below && client != focus_client) { - /* 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) { - /* There is no window to put this directly above, so put it at the - top, so you know it is there. - - It used to do this only if the window was focused and lower - it otherwise. - - We also put it at the top not the bottom to fix a bug with - fullscreen windows. When focusLast is off and followsMouse is - on, when you switch desktops, the fullscreen window loses - focus and goes into its lower layer. If this puts it at the - bottom then when you come back to the desktop, the window is - at the bottom and won't get focus back. - */ - stacking_list = g_list_append(stacking_list, win); - stacking_raise(win); - } else { - /* make sure it's not in the wrong layer though ! */ - for (; it_below; it_below = g_list_next(it_below)) + /* nothing to put it directly above, so try find the focused client + to put it underneath it */ + if (focus_client && client != focus_client && + focus_client->layer == client->layer) { - /* stop when the window is not in a higher layer than the window - it is going above (it_below) */ - if (client->layer >= window_layer(it_below->data)) - break; + it_below = g_list_find(stacking_list, focus_client); + /* this can give NULL, but it means the focused window is on the + bottom of the stacking order, so go to the bottom in that case, + below it */ + it_below = g_list_next(it_below); } - for (; it_below != stacking_list; - it_below = g_list_previous(it_below)) - { - /* stop when the window is not in a lower layer than the - window it is going under (it_above) */ - GList *it_above = g_list_previous(it_below); - if (client->layer <= window_layer(it_above->data)) - break; + else { + /* There is no window to put this directly above, so put it at the + top, so you know it is there. + + It used to do this only if the window was focused and lower + it otherwise. + + We also put it at the top not the bottom to fix a bug with + fullscreen windows. When focusLast is off and followsMouse is + on, when you switch desktops, the fullscreen window loses + focus and goes into its lower layer. If this puts it at the + bottom then when you come back to the desktop, the window is + at the bottom and won't get focus back. + */ + it_below = stacking_list; } + } - GList *wins = g_list_append(NULL, win); - do_restack(wins, it_below); - g_list_free(wins); + /* make sure it's not in the wrong layer though ! */ + for (; it_below; it_below = g_list_next(it_below)) { + /* stop when the window is not in a higher layer than the window + it is going above (it_below) */ + if (client->layer >= window_layer(it_below->data)) + break; } + for (; it_below != stacking_list; it_below = it_above) { + /* stop when the window is not in a lower layer than the + window it is going under (it_above) */ + it_above = it_below ? + g_list_previous(it_below) : g_list_last(stacking_list); + if (client->layer <= window_layer(it_above->data)) + break; + } + + GList *wins = g_list_append(NULL, win); + do_restack(wins, it_below); + g_list_free(wins); } /*! Returns TRUE if client is occluded by the sibling. If sibling is NULL it @@ -483,7 +490,10 @@ static gboolean stacking_occluded(ObClient *client, ObClient *sibling) it = (found ? g_list_previous(it) :g_list_next(it))) if (WINDOW_IS_CLIENT(it->data)) { ObClient *c = it->data; - if (found) { + if (found && !c->iconic && + (c->desktop == DESKTOP_ALL || client->desktop == DESKTOP_ALL || + c->desktop == client->desktop)) + { if (RECT_INTERSECTS_RECT(c->frame->area, client->frame->area)) { if (sibling != NULL) { @@ -522,7 +532,10 @@ static gboolean stacking_occludes(ObClient *client, ObClient *sibling) for (it = stacking_list; it; it = g_list_next(it)) if (WINDOW_IS_CLIENT(it->data)) { ObClient *c = it->data; - if (found) { + if (found && !c->iconic && + (c->desktop == DESKTOP_ALL || client->desktop == DESKTOP_ALL || + c->desktop == client->desktop)) + { if (RECT_INTERSECTS_RECT(c->frame->area, client->frame->area)) { if (sibling != NULL) { @@ -545,15 +558,28 @@ static gboolean stacking_occludes(ObClient *client, ObClient *sibling) return occludes; } -void stacking_restack_request(ObClient *client, ObClient *sibling, - gint detail, gboolean activate) +gboolean stacking_restack_request(ObClient *client, ObClient *sibling, + gint detail, gboolean activate) { + gboolean ret = FALSE; + + if (sibling && ((client->desktop != sibling->desktop && + client->desktop != DESKTOP_ALL && + sibling->desktop != DESKTOP_ALL) || + sibling->iconic)) + { + ob_debug("Setting restack sibling to NULL, they are not on the same " + "desktop or it is iconified\n"); + sibling = NULL; + } + switch (detail) { case Below: ob_debug("Restack request Below for client %s sibling %s\n", client->title, sibling ? sibling->title : "(all)"); /* just lower it */ stacking_lower(CLIENT_AS_WINDOW(client)); + ret = TRUE; break; case BottomIf: ob_debug("Restack request BottomIf for client %s sibling " @@ -561,8 +587,10 @@ void stacking_restack_request(ObClient *client, ObClient *sibling, client->title, sibling ? sibling->title : "(all)"); /* if this client occludes sibling (or anything if NULL), then lower it to the bottom */ - if (stacking_occludes(client, sibling)) + if (stacking_occludes(client, sibling)) { stacking_lower(CLIENT_AS_WINDOW(client)); + ret = TRUE; + } break; case Above: ob_debug("Restack request Above for client %s sibling %s\n", @@ -573,6 +601,7 @@ void stacking_restack_request(ObClient *client, ObClient *sibling, client_activate(client, FALSE, TRUE); else stacking_raise(CLIENT_AS_WINDOW(client)); + ret = TRUE; break; case TopIf: ob_debug("Restack request TopIf for client %s sibling %s\n", @@ -584,6 +613,7 @@ void stacking_restack_request(ObClient *client, ObClient *sibling, client_activate(client, FALSE, TRUE); else stacking_raise(CLIENT_AS_WINDOW(client)); + ret = TRUE; } break; case Opposite: @@ -597,9 +627,13 @@ void stacking_restack_request(ObClient *client, ObClient *sibling, client_activate(client, FALSE, TRUE); else stacking_raise(CLIENT_AS_WINDOW(client)); + ret = TRUE; } - else if (stacking_occludes(client, sibling)) + else if (stacking_occludes(client, sibling)) { stacking_lower(CLIENT_AS_WINDOW(client)); + ret = TRUE; + } break; } + return ret; }