*/
#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;
+GList *stacking_list_tail = 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;
}
}
- 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);
}
#ifdef DEBUG
GList *next;
+
+ g_assert(wins);
/* pls only restack stuff in the same layer at a time */
for (it = wins; it; it = next) {
next = g_list_next(it);
}
#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;
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 */
do_raise(wins);
g_list_free(wins);
}
+ stacking_list_tail = g_list_last(stacking_list);
}
void stacking_lower(ObWindow *window)
do_lower(wins);
g_list_free(wins);
}
+ stacking_list_tail = g_list_last(stacking_list);
}
void stacking_below(ObWindow *window, ObWindow *below)
before = g_list_next(g_list_find(stacking_list, below));
do_restack(wins, before);
g_list_free(wins);
+ stacking_list_tail = g_list_last(stacking_list);
}
void stacking_add(ObWindow *win)
{
g_assert(screen_support_win != None); /* make sure I dont break this in the
future */
+ /* don't add windows that are being unmanaged ! */
+ if (WINDOW_IS_CLIENT(win)) g_assert(WINDOW_AS_CLIENT(win)->managed);
stacking_list = g_list_append(stacking_list, win);
+
stacking_raise(win);
+ /* stacking_list_tail set by stacking_raise() */
}
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 */
client = WINDOW_AS_CLIENT(win);
+ /* don't add windows that are being unmanaged ! */
+ g_assert(client->managed);
+
/* insert above its highest parent (or its highest child !) */
it_below = find_highest_relative(client);
break;
}
- GList *wins = g_list_append(NULL, win);
+ wins = g_list_append(NULL, win);
do_restack(wins, it_below);
g_list_free(wins);
+ stacking_list_tail = g_list_last(stacking_list);
}
/*! Returns TRUE if client is occluded by the sibling. If sibling is NULL it
{
GList *it;
gboolean occluded = FALSE;
- gboolean found = FALSE;
/* no need for any looping in this case */
if (sibling && client->layer != sibling->layer)
return occluded;
- for (it = stacking_list; it;
- it = (found ? g_list_previous(it) :g_list_next(it)))
+ for (it = g_list_previous(g_list_find(stacking_list, client)); it;
+ it = g_list_previous(it))
if (WINDOW_IS_CLIENT(it->data)) {
ObClient *c = it->data;
- if (found && !c->iconic &&
+ if (!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))
{
break; /* we past its layer */
}
}
- else if (c == client)
- found = TRUE;
}
return occluded;
}
{
GList *it;
gboolean occludes = FALSE;
- gboolean found = FALSE;
/* no need for any looping in this case */
if (sibling && client->layer != sibling->layer)
return occludes;
- for (it = stacking_list; it; it = g_list_next(it))
+ for (it = g_list_next(g_list_find(stacking_list, client));
+ it; it = g_list_next(it))
if (WINDOW_IS_CLIENT(it->data)) {
ObClient *c = it->data;
- if (found && !c->iconic &&
+ if (!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))
{
break; /* we past its layer */
}
}
- else if (c == client)
- found = TRUE;
}
return occludes;
}
gboolean stacking_restack_request(ObClient *client, ObClient *sibling,
- gint detail, gboolean activate)
+ gint detail)
{
gboolean ret = FALSE;
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 */
}
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)) {