#include "prop.h"
#include "focus.h"
#include "client.h"
+#include "group.h"
#include "frame.h"
#include <glib.h>
GList *stacking_list = NULL;
+static Window top_window = None;
+
+void stacking_startup()
+{
+ XSetWindowAttributes attrib;
+ attrib.override_redirect = TRUE;
+ top_window = XCreateWindow(ob_display, ob_root,
+ -100, -100, 1, 1, 0,
+ CopyFromParent, InputOutput, CopyFromParent,
+ CWOverrideRedirect, &attrib);
+ XMapWindow(ob_display, top_window);
+}
+
+void stacking_shutdown()
+{
+ XDestroyWindow(ob_display, top_window);
+}
+
void stacking_set_list()
{
Window *windows, *win_it;
} else
windows = NULL;
- PROP_SET32A(ob_root, net_client_list_stacking, window, windows, size);
+ PROP_SETA32(ob_root, net_client_list_stacking, window,
+ (guint32*)windows, size);
if (windows)
g_free(windows);
}
-void stacking_raise(Client *client)
+static GList *find_lowest_transient(Client *c)
{
- Window wins[2]; /* only ever restack 2 windows. */
GList *it;
- Client *m;
+ GSList *sit;
+
+ for (it = g_list_last(stacking_list); it; it = it->prev)
+ for (sit = c->transients; sit; sit = sit->next)
+ if (it->data == sit->data) /* found a transient */
+ return it;
+ return NULL;
+}
+
+static void raise_recursive(Client *client)
+{
+ Window wins[2]; /* only ever restack 2 windows. */
+ GList *it, *low;
+ GSList *sit;
g_assert(stacking_list != NULL); /* this would be bad */
- m = client_find_modal_child(client);
- /* if we have a modal child, raise it instead, we'll go along tho later */
- if (m) stacking_raise(m);
-
- /* remove the client before looking so we can't run into ourselves */
+ /* remove the client before looking so we can't run into ourselves and our
+ transients can't either. */
stacking_list = g_list_remove(stacking_list, client);
-
+
+ /* raise transients first */
+ for (sit = client->transients; sit; sit = sit->next)
+ raise_recursive(sit->data);
+
+ /* find 'it' where it is the positiion in the stacking order where
+ 'client' will be inserted *before* */
+
+ low = find_lowest_transient(client);
/* the stacking list is from highest to lowest */
- it = stacking_list;
- while (it != NULL) {
- Client *c = it->data;
- if (client->layer >= c->layer && m != c)
- break;
- it = it->next;
+ for (it = g_list_last(stacking_list); it; it = it->prev) {
+ if (it == low || client->layer < ((Client*)it->data)->layer) {
+ it = it->next;
+ break;
+ }
+ if (it == stacking_list)
+ break;
}
/*
stacking_list = g_list_insert_before(stacking_list, it, client);
XRestackWindows(ob_display, wins, 2);
+}
+
+void stacking_raise(Client *client)
+{
+ g_assert(stacking_list != NULL); /* this would be bad */
+
+ /* move up the transient chain as far as possible first */
+ while (client->transient_for) {
+ if (client->transient_for != TRAN_GROUP) {
+ client = client->transient_for;
+ } else {
+ GSList *it;
+
+ /* the check for TRAN_GROUP is to prevent an infinate loop with
+ 2 transients of the same group at the head of the group's
+ members list */
+ for (it = client->group->members; it; it = it->next) {
+ Client *c = it->data;
+
+ if (c != client && c->transient_for != TRAN_GROUP) {
+ client = it->data;
+ break;
+ }
+ }
+ if (it == NULL) break;
+ }
+ }
+
+ raise_recursive(client);
stacking_set_list();
}
-void stacking_lower(Client *client)
+static void lower_recursive(Client *client, Client *above)
{
Window wins[2]; /* only ever restack 2 windows. */
GList *it;
+ GSList *sit;
+
+ /* find 'it' where 'it' is the position in the stacking_list where the
+ 'client' will be placed *after* */
+
+ for (it = g_list_last(stacking_list); it != stacking_list; it = it->prev)
+ if (client->layer <= ((Client*)it->data)->layer && it->data != above)
+ break;
+
+ if (it->data != client) { /* not already the bottom */
+ wins[0] = ((Client*)it->data)->frame->window;
+ wins[1] = client->frame->window;
+
+ stacking_list = g_list_remove(stacking_list, client);
+ stacking_list = g_list_insert_before(stacking_list, it->next, client);
+ XRestackWindows(ob_display, wins, 2);
+ }
+
+ for (sit = client->transients; sit; sit = sit->next)
+ lower_recursive(sit->data, client);
+}
+void stacking_lower(Client *client)
+{
g_assert(stacking_list != NULL); /* this would be bad */
- it = g_list_last(stacking_list);
-
- if (client->modal && client->transient_for) {
- /* don't let a modal window lower below its transient_for */
- it = g_list_find(stacking_list, client->transient_for);
- g_assert(it != NULL);
-
- wins[0] = (it == stacking_list ? focus_backup :
- ((Client*)it->prev->data)->frame->window);
- wins[1] = client->frame->window;
- if (wins[0] == wins[1]) return; /* already right above the window */
-
- stacking_list = g_list_remove(stacking_list, client);
- stacking_list = g_list_insert_before(stacking_list, it, client);
- } else {
- while (it != stacking_list) {
- Client *c = it->data;
- if (client->layer <= c->layer)
- break;
- it = it->prev;
- }
- if (it->data == client) return; /* already the bottom, return */
-
- wins[0] = ((Client*)it->data)->frame->window;
- wins[1] = client->frame->window;
-
- stacking_list = g_list_remove(stacking_list, client);
- stacking_list = g_list_insert_before(stacking_list,
- it->next, client);
+ /* move up the transient chain as far as possible first */
+ while (client->transient_for) {
+ if (client->transient_for != TRAN_GROUP) {
+ client = client->transient_for;
+ } else {
+ GSList *it;
+
+ /* the check for TRAN_GROUP is to prevent an infinate loop with
+ 2 transients of the same group at the head of the group's
+ members list */
+ for (it = client->group->members; it; it = it->next) {
+ Client *c = it->data;
+
+ if (c != client && c->transient_for != TRAN_GROUP) {
+ client = it->data;
+ break;
+ }
+ }
+ if (it == NULL) break;
+ }
}
- XRestackWindows(ob_display, wins, 2);
+ lower_recursive(client, NULL);
+
stacking_set_list();
}
+void stacking_raise_internal(Window win)
+{
+ Window wins[2]; /* only ever restack 2 windows. */
+
+ wins[0] = top_window;
+ wins[1] = win;
+
+ XRestackWindows(ob_display, wins, 2);
+}
projects / chaz / openbox / blobdiff