X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fstacking.c;h=03a62dd4413bdc536b2ed0589f71e21fdc4252dc;hb=930d7a33ad5da28884d8824cccb18a9de0eb2db3;hp=fe3d26d35e4e63f0e5c9403fecb34bbbe5395d41;hpb=51fdd13fd1a445d5fa3c2d7aab356e7caaf2f902;p=chaz%2Fopenbox diff --git a/openbox/stacking.c b/openbox/stacking.c index fe3d26d3..03a62dd4 100644 --- a/openbox/stacking.c +++ b/openbox/stacking.c @@ -18,18 +18,23 @@ */ #include "openbox.h" -#include "prop.h" #include "screen.h" #include "focus.h" #include "client.h" #include "group.h" #include "frame.h" #include "window.h" +#include "event.h" #include "debug.h" +#include "obt/prop.h" GList *stacking_list = NULL; +/*! When true, stacking changes will not be reflected on the screen. This is + to freeze the on-screen stacking order while a window is being temporarily + raised during focus cycling */ +static gboolean pause_changes = FALSE; -void stacking_set_list() +void stacking_set_list(void) { Window *windows = NULL; GList *it; @@ -50,8 +55,8 @@ void stacking_set_list() } } - PROP_SETA32(RootWindow(ob_display, ob_screen), - net_client_list_stacking, window, (gulong*)windows, i); + OBT_PROP_SETA32(obt_root(ob_screen), NET_CLIENT_LIST_STACKING, WINDOW, + (gulong*)windows, i); g_free(windows); } @@ -99,12 +104,59 @@ static void do_restack(GList *wins, GList *before) } #endif - XRestackWindows(ob_display, win, i); + if (!pause_changes) + XRestackWindows(obt_display, win, i); g_free(win); stacking_set_list(); } +void stacking_temp_raise(ObWindow *window) +{ + Window win[2]; + GList *it; + gulong start; + + /* don't use this for internal windows..! it would lower them.. */ + g_assert(window_layer(window) < OB_STACKING_LAYER_INTERNAL); + + /* find the window to drop it underneath */ + win[0] = screen_support_win; + for (it = stacking_list; it; it = g_list_next(it)) { + ObWindow *w = it->data; + if (window_layer(w) >= OB_STACKING_LAYER_INTERNAL) + win[0] = window_top(w); + else + break; + } + + win[1] = window_top(window); + start = event_start_ignore_all_enters(); + XRestackWindows(obt_display, win, 2); + event_end_ignore_all_enters(start); + + pause_changes = TRUE; +} + +void stacking_restore(void) +{ + Window *win; + GList *it; + gint i; + gulong start; + + win = g_new(Window, g_list_length(stacking_list) + 1); + win[0] = screen_support_win; + for (i = 1, it = stacking_list; it; ++i, it = g_list_next(it)) + win[i] = window_top(it->data); + start = event_start_ignore_all_enters(); + XRestackWindows(obt_display, win, i); + event_end_ignore_all_enters(start); + g_free(win); + + pause_changes = FALSE; +} + static void do_raise(GList *wins) { GList *it; @@ -366,7 +418,7 @@ void stacking_add(ObWindow *win) } static GList *find_highest_relative(ObClient *client) -{ +{ GList *ret = NULL; if (client->parents) { @@ -383,7 +435,7 @@ static GList *find_highest_relative(ObClient *client) /* only look at windows in the same layer and that are visible */ if (c->layer == client->layer && - !c->iconic && + !c->iconic && (c->desktop == client->desktop || c->desktop == DESKTOP_ALL || client->desktop == DESKTOP_ALL)) @@ -411,6 +463,7 @@ void stacking_add_nonintrusive(ObWindow *win) ObClient *client; GList *it_below = NULL; /* this client will be below us */ GList *it_above; + GList *wins; if (!WINDOW_IS_CLIENT(win)) { stacking_add(win); /* no special rules for others */ @@ -468,7 +521,7 @@ void stacking_add_nonintrusive(ObWindow *win) break; } - GList *wins = g_list_append(NULL, win); + wins = g_list_append(NULL, win); do_restack(wins, it_below); g_list_free(wins); } @@ -492,7 +545,8 @@ static gboolean stacking_occluded(ObClient *client, ObClient *sibling) ObClient *c = it->data; if (found && !c->iconic && (c->desktop == DESKTOP_ALL || client->desktop == DESKTOP_ALL || - c->desktop == client->desktop)) + c->desktop == client->desktop) && + !client_search_transient(client, c)) { if (RECT_INTERSECTS_RECT(c->frame->area, client->frame->area)) { @@ -534,7 +588,8 @@ static gboolean stacking_occludes(ObClient *client, ObClient *sibling) ObClient *c = it->data; if (found && !c->iconic && (c->desktop == DESKTOP_ALL || client->desktop == DESKTOP_ALL || - c->desktop == client->desktop)) + c->desktop == client->desktop) && + !client_search_transient(c, client)) { if (RECT_INTERSECTS_RECT(c->frame->area, client->frame->area)) { @@ -559,7 +614,7 @@ static gboolean stacking_occludes(ObClient *client, ObClient *sibling) } gboolean stacking_restack_request(ObClient *client, ObClient *sibling, - gint detail, gboolean activate) + gint detail) { gboolean ret = FALSE; @@ -569,21 +624,20 @@ gboolean stacking_restack_request(ObClient *client, ObClient *sibling, sibling->iconic)) { ob_debug("Setting restack sibling to NULL, they are not on the same " - "desktop or it is iconified\n"); + "desktop or it is iconified"); sibling = NULL; } switch (detail) { case Below: - ob_debug("Restack request Below for client %s sibling %s\n", + ob_debug("Restack request Below for client %s sibling %s", 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 " - "%s\n", + ob_debug("Restack request BottomIf for client %s sibling %s", client->title, sibling ? sibling->title : "(all)"); /* if this client occludes sibling (or anything if NULL), then lower it to the bottom */ @@ -593,40 +647,24 @@ gboolean stacking_restack_request(ObClient *client, ObClient *sibling, } break; case Above: - ob_debug("Restack request Above for client %s sibling %s\n", + ob_debug("Restack request Above for client %s sibling %s", client->title, sibling ? sibling->title : "(all)"); - if (activate && !client->iconic && client_normal(client)) - /* use user=TRUE because it is impossible to get a timestamp - for this */ - client_activate(client, FALSE, TRUE); - else - stacking_raise(CLIENT_AS_WINDOW(client)); + stacking_raise(CLIENT_AS_WINDOW(client)); ret = TRUE; break; case TopIf: - ob_debug("Restack request TopIf for client %s sibling %s\n", + ob_debug("Restack request TopIf for client %s sibling %s", client->title, sibling ? sibling->title : "(all)"); if (stacking_occluded(client, sibling)) { - if (activate && !client->iconic && client_normal(client)) - /* use user=TRUE because it is impossible to get a timestamp - for this */ - client_activate(client, FALSE, TRUE); - else - stacking_raise(CLIENT_AS_WINDOW(client)); + stacking_raise(CLIENT_AS_WINDOW(client)); ret = TRUE; } break; case Opposite: - ob_debug("Restack request Opposite for client %s sibling " - "%s\n", + ob_debug("Restack request Opposite for client %s sibling %s", client->title, sibling ? sibling->title : "(all)"); if (stacking_occluded(client, sibling)) { - if (activate && !client->iconic && client_normal(client)) - /* use user=TRUE because it is impossible to get a timestamp - for this */ - client_activate(client, FALSE, TRUE); - else - stacking_raise(CLIENT_AS_WINDOW(client)); + stacking_raise(CLIENT_AS_WINDOW(client)); ret = TRUE; } else if (stacking_occludes(client, sibling)) {