#include "group.h"
#include "frame.h"
#include "window.h"
+#include "event.h"
#include "debug.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;
}
#endif
- XRestackWindows(ob_display, win, i);
+ if (!pause_changes)
+ XRestackWindows(ob_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(ob_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(ob_display, win, i);
+ event_end_ignore_all_enters(start);
+ g_free(win);
+
+ pause_changes = FALSE;
+}
+
static void do_raise(GList *wins)
{
GList *it;
GList *modals = NULL;
GList *trans = NULL;
+ if (raise) {
+ ObClient *p;
+
+ /* if a window is modal for another single window, then raise it to the
+ top too, the same is done with the focus order */
+ while (selected->modal && (p = client_direct_parent(selected)))
+ selected = p;
+ }
+
/* remove first so we can't run into ourself */
it = g_list_find(stacking_list, selected);
g_assert(it);
}
static GList *find_highest_relative(ObClient *client)
-{
+{
GList *ret = NULL;
if (client->parents) {
/* 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))
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 */
break;
}
- GList *wins = g_list_append(NULL, win);
+ wins = g_list_append(NULL, win);
do_restack(wins, it_below);
g_list_free(wins);
}
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))
{
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))
{
}
gboolean stacking_restack_request(ObClient *client, ObClient *sibling,
- gint detail, gboolean activate)
+ gint detail)
{
gboolean ret = FALSE;
case Above:
ob_debug("Restack request Above for client %s sibling %s\n",
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",
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;
"%s\n",
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)) {