+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+ stacking.c for the Openbox window manager
+ Copyright (c) 2003 Ben Jansens
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ See the COPYING file for a copy of the GNU General Public License.
+*/
+
#include "openbox.h"
#include "prop.h"
#include "screen.h"
/* create an array of the window ids (from bottom to top,
reverse order!) */
if (stacking_list) {
- windows = g_new(Window, g_list_length(stacking_list));
+ windows = g_new(Window, g_list_length(stacking_list));
for (it = g_list_last(stacking_list); it; it = g_list_previous(it)) {
if (WINDOW_IS_CLIENT(it->data))
windows[i++] = WINDOW_AS_CLIENT(it->data)->window;
{
GList *it, *next;
Window *win;
- int i;
+ gint i;
+#ifdef DEBUG
/* pls only restack stuff in the same layer at a time */
for (it = wins; it; it = next) {
next = g_list_next(it);
if (!next) break;
g_assert (window_layer(it->data) == window_layer(next->data));
}
-
+ if (before)
+ g_assert(window_layer(it->data) >= window_layer(before->data));
+#endif
win = g_new(Window, g_list_length(wins) + 1);
stacking_list = g_list_insert_before(stacking_list, before, it->data);
}
- /* XXX some debug checking of the stacking list's order */
+#ifdef DEBUG
+ /* some debug checking of the stacking list's order */
for (it = stacking_list; ; it = next) {
next = g_list_next(it);
if (!next) break;
g_assert(window_layer(it->data) >= window_layer(next->data));
}
+#endif
XRestackWindows(ob_display, win, i);
g_free(win);
{
GList *it;
GList *layer[OB_NUM_STACKING_LAYERS] = {NULL};
- int i;
+ gint i;
for (it = wins; it; it = g_list_next(it)) {
ObStackingLayer l;
{
GList *it;
GList *layer[OB_NUM_STACKING_LAYERS] = {NULL};
- int i;
+ gint i;
for (it = wins; it; it = g_list_next(it)) {
ObStackingLayer l;
GList *ret = NULL;
GList *it, *next, *prev;
GSList *sit;
- int i, n;
+ gint i, n;
GList *modals = NULL;
GList *trans = NULL;
- GList *modal_sel_it = NULL; /* the selected guy if modal */
- GList *trans_sel_it = NULL; /* the selected guy if not */
+ GList *modal_sel = NULL; /* the selected guys if modal */
+ GList *trans_sel = NULL; /* the selected guys if not */
/* remove first so we can't run into ourself */
- stacking_list = g_list_remove(stacking_list, top);
+ if ((it = g_list_find(stacking_list, top)))
+ stacking_list = g_list_delete_link(stacking_list, it);
+ else
+ return NULL;
i = 0;
n = g_slist_length(top->transients);
if ((sit = g_slist_find(top->transients, it->data))) {
ObClient *c = sit->data;
+ gboolean sel_child;
++i;
+ if (c == selected)
+ sel_child = TRUE;
+ else
+ sel_child = client_search_transient(c, selected) != NULL;
+
if (!c->modal) {
- if (c != selected) {
+ if (!sel_child) {
trans = g_list_concat(trans,
- pick_windows(c, selected, raise));
+ pick_windows(c, selected, raise));
} else {
- g_assert(modal_sel_it == NULL);
- g_assert(trans_sel_it == NULL);
- trans_sel_it = pick_windows(c, selected, raise);
+ trans_sel = g_list_concat(trans_sel,
+ pick_windows(c, selected,
+ raise));
}
} else {
- if (c != selected) {
+ if (!sel_child) {
modals = g_list_concat(modals,
pick_windows(c, selected, raise));
} else {
- g_assert(modal_sel_it == NULL);
- g_assert(trans_sel_it == NULL);
- modal_sel_it = pick_windows(c, selected, raise);
+ modal_sel = g_list_concat(modal_sel,
+ pick_windows(c, selected,
+ raise));
}
}
/* if we dont have a prev then start back at the beginning,
}
}
- ret = g_list_concat((raise ? modal_sel_it : modals),
- (raise ? modals : modal_sel_it));
+ ret = g_list_concat((raise ? modal_sel : modals),
+ (raise ? modals : modal_sel));
- ret = g_list_concat(ret, (raise ? trans_sel_it : trans));
- ret = g_list_concat(ret, (raise ? trans : trans_sel_it));
+ ret = g_list_concat(ret, (raise ? trans_sel : trans));
+ ret = g_list_concat(ret, (raise ? trans : trans_sel));
/* add itself */
return ret;
}
-static GList *pick_group_windows(ObClient *top, ObClient *selected, gboolean raise)
+static GList *pick_group_windows(ObClient *top, ObClient *selected,
+ gboolean raise, gboolean normal)
{
GList *ret = NULL;
GList *it, *next, *prev;
GSList *sit;
- int i, n;
+ gint i, n;
/* add group members in their stacking order */
if (top->group) {
next = g_list_next(it);
if ((sit = g_slist_find(top->group->members, it->data))) {
+ ObClient *c;
+ ObClientType t;
+
++i;
- ret = g_list_concat(ret,
- pick_windows(sit->data, selected, raise));
- /* if we dont have a prev then start back at the beginning,
- otherwise skip back to the prev's next */
- next = prev ? g_list_next(prev) : stacking_list;
+ c = it->data;
+ t = c->type;
+
+ if ((c->desktop == selected->desktop ||
+ c->desktop == DESKTOP_ALL) &&
+ (t == OB_CLIENT_TYPE_TOOLBAR ||
+ t == OB_CLIENT_TYPE_MENU ||
+ t == OB_CLIENT_TYPE_UTILITY ||
+ (normal && t == OB_CLIENT_TYPE_NORMAL)))
+ {
+ ret = g_list_concat(ret,
+ pick_windows(sit->data,
+ selected, raise));
+ /* if we dont have a prev then start back at the beginning,
+ otherwise skip back to the prev's next */
+ next = prev ? g_list_next(prev) : stacking_list;
+ }
}
}
}
return ret;
}
-void stacking_raise(ObWindow *window)
+void stacking_raise(ObWindow *window, gboolean group)
{
GList *wins;
selected = WINDOW_AS_CLIENT(window);
c = client_search_top_transient(selected);
wins = pick_windows(c, selected, TRUE);
- wins = g_list_concat(wins, pick_group_windows(c, selected, TRUE));
+ wins = g_list_concat(wins, pick_group_windows(c, selected, TRUE, group));
} else {
wins = g_list_append(NULL, window);
stacking_list = g_list_remove(stacking_list, window);
g_list_free(wins);
}
-void stacking_lower(ObWindow *window)
+void stacking_lower(ObWindow *window, gboolean group)
{
GList *wins;
selected = WINDOW_AS_CLIENT(window);
c = client_search_top_transient(selected);
wins = pick_windows(c, selected, FALSE);
- wins = g_list_concat(pick_group_windows(c, selected, FALSE), wins);
+ wins = g_list_concat(pick_group_windows(c, selected, FALSE, group), wins);
} else {
wins = g_list_append(NULL, window);
stacking_list = g_list_remove(stacking_list, window);
g_list_free(wins);
}
+void stacking_below(ObWindow *window, ObWindow *below)
+{
+ GList *wins, *before;
+
+ if (window_layer(window) != window_layer(below))
+ return;
+
+ wins = g_list_append(NULL, window);
+ stacking_list = g_list_remove(stacking_list, window);
+ before = g_list_next(g_list_find(stacking_list, below));
+ do_restack(wins, before);
+ g_list_free(wins);
+}
+
void stacking_add(ObWindow *win)
{
ObStackingLayer l;
GList *wins;
g_assert(screen_support_win != None); /* make sure I dont break this in the
- future */
+ future */
l = window_layer(win);
wins = g_list_append(NULL, win); /* list of 1 element */
stacking_list = g_list_append(stacking_list, win);
- stacking_raise(win);
+ stacking_raise(win, FALSE);
}
void stacking_add_nonintrusive(ObWindow *win)
GList *it;
if (client->group)
- for (it = stacking_list; !parent && it; it = it->next) {
+ for (it = stacking_list; !parent && it; it = g_list_next(it)) {
if ((sit = g_slist_find(client->group->members, it->data)))
for (sit = client->group->members; !parent && sit;
- sit = sit->next) {
+ sit = g_slist_next(sit))
+ {
ObClient *c = sit->data;
/* checking transient_for prevents infinate loops! */
if (sit->data == it->data && !c->transient_for)
projects / chaz / openbox / blobdiff