#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 *it, *last, *below, *above, *next;
GList *wins = NULL;
+ GList *group_helpers = NULL;
GList *group_modals = NULL;
GList *group_trans = NULL;
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);
/* only move windows in the same stacking layer */
if (ch->layer == selected->layer &&
+ /* looking for windows that are transients, and so would
+ remain above the selected window */
client_search_transient(selected, ch))
{
if (client_is_direct_child(selected, ch)) {
else
trans = g_list_prepend(trans, ch);
}
+ else if (client_helper(ch)) {
+ if (selected->transient) {
+ /* helpers do not stay above transient windows */
+ continue;
+ }
+ group_helpers = g_list_prepend(group_helpers, ch);
+ }
else {
if (ch->modal)
group_modals = g_list_prepend(group_modals, ch);
}
}
- /* put transients of the selected window right above it */
+ /* put modals above other direct transients */
wins = g_list_concat(modals, trans);
+
+ /* put helpers below direct transients */
+ wins = g_list_concat(wins, group_helpers);
+
+ /* put the selected window right below these children */
wins = g_list_append(wins, selected);
/* if selected window is transient for group then raise it above others */
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);
}