#include "client.h"
#include "group.h"
#include "frame.h"
+#include "window.h"
#include <glib.h>
GList *stacking_list = NULL;
windows = g_new(Window, size);
win_it = windows;
for (it = g_list_last(stacking_list); it != NULL;
- it = it->prev, ++win_it)
- *win_it = ((Client*)it->data)->window;
+ it = it->prev)
+ if (WINDOW_IS_CLIENT(it->data)) {
+ *win_it = WINDOW_AS_CLIENT(it->data)->window;
+ ++win_it;
+ }
} else
- windows = NULL;
+ windows = win_it = NULL;
- PROP_SET32A(ob_root, net_client_list_stacking, window, windows, size);
+ PROP_SETA32(ob_root, net_client_list_stacking, window,
+ (guint32*)windows, win_it - windows);
if (windows)
g_free(windows);
}
-static GList *find_lowest_transient(Client *c)
+static void do_restack(GList *wins, GList *before)
{
- GList *it;
- GSList *sit;
+ GList *it, *next;
+ Window *win;
+ int i;
+
+ /* 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));
+ }
+
- 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 */
- if (((Client*)it->data)->layer == c->layer) /* same layer? */
- return it;
- return NULL;
+ win = g_new(Window, g_list_length(wins) + 1);
+
+ if (before == stacking_list)
+ win[0] = focus_backup;
+ else if (!before)
+ win[0] = window_top(g_list_last(stacking_list)->data);
+ else
+ win[0] = window_top(g_list_previous(before)->data);
+
+ for (i = 1, it = wins; it; ++i, it = g_list_next(it)) {
+ win[i] = window_top(it->data);
+ stacking_list = g_list_insert_before(stacking_list, before, it->data);
+ }
+
+ XRestackWindows(ob_display, win, i);
+ g_free(win);
}
-void stacking_raise(Client *client)
+static void raise(GList *wins)
{
- Window wins[2]; /* only ever restack 2 windows. */
GList *it;
- GSList *sit;
+ GList *layer[NUM_STACKLAYER] = {NULL};
+ int i;
- g_assert(stacking_list != NULL); /* this would be bad */
+ for (it = wins; it; it = g_list_next(it)) {
+ StackLayer l;
- /* if we have a transients raise them */
- for (sit = client->transients; sit; sit = sit->next)
- stacking_raise(sit->data);
-
- /* remove the client before looking so we can't run into ourselves */
- stacking_list = g_list_remove(stacking_list, client);
-
- /* find 'it' where it is the positiion in the stacking order where
- 'client' will be inserted *after* */
+ l = window_layer(it->data);
+ layer[l] = g_list_append(layer[l], it->data);
+ }
- it = find_lowest_transient(client);
- if (it) {
- it = it->next;
- } else {
- /* the stacking list is from highest to lowest */
- for (it = stacking_list; it; it = it->next) {
- if (client->layer >= ((Client*)it->data)->layer)
- break;
+ it = stacking_list;
+ for (i = NUM_STACKLAYER - 1; i >= 0; --i) {
+ if (layer[i]) {
+ for (; it; it = g_list_next(it)) {
+ /* look for the top of the layer */
+ if (window_layer(it->data) <= (StackLayer) i)
+ break;
+ }
+ do_restack(layer[i], it);
+ g_list_free(layer[i]);
}
}
+}
- /*
- if our new position is the top, we want to stack under the focus_backup.
- otherwise, we want to stack under the previous window in the stack.
- */
- if (it == stacking_list)
- wins[0] = focus_backup;
- else if (it != NULL)
- wins[0] = ((Client*)it->prev->data)->frame->window;
- else
- wins[0] = ((Client*)g_list_last(stacking_list)->data)->frame->window;
- wins[1] = client->frame->window;
+static void lower(GList *wins)
+{
+ GList *it;
+ GList *layer[NUM_STACKLAYER] = {NULL};
+ int i;
- stacking_list = g_list_insert_before(stacking_list, it, client);
+ for (it = wins; it; it = g_list_next(it)) {
+ StackLayer l;
- XRestackWindows(ob_display, wins, 2);
+ l = window_layer(it->data);
+ layer[l] = g_list_append(layer[l], it->data);
+ }
- stacking_set_list();
+ it = stacking_list;
+ for (i = NUM_STACKLAYER - 1; i >= 0; --i) {
+ if (layer[i]) {
+ for (; it; it = g_list_next(it)) {
+ /* look for the top of the next layer down */
+ if (window_layer(it->data) < (StackLayer) i)
+ break;
+ }
+ do_restack(layer[i], it);
+ g_list_free(layer[i]);
+ }
+ }
}
-static void lower_recursive(Client *client, Client *above)
+static GList* pick_windows(ObWindow *win)
{
- Window wins[2]; /* only ever restack 2 windows. */
- GList *it;
+ GList *ret = NULL;
+ GList *it, *next;
GSList *sit;
+ Client *c;
+ int i, n;
- it = g_list_last(stacking_list);
-
- /* find 'it' where 'it' is the position in the stacking_list where the
- 'client' will be placed *after* */
+ if (!WINDOW_IS_CLIENT(win)) {
+ ret = g_list_append(ret, win);
+ stacking_list = g_list_remove(stacking_list, win);
+ return ret;
+ }
+ c = WINDOW_AS_CLIENT(win);
- while (it != stacking_list) {
- Client *c = it->data;
- if (client->layer <= c->layer && c != above)
- break;
- it = it->prev;
+ /* add transient children in their stacking order */
+ i = 0;
+ n = g_slist_length(c->transients);
+ for (it = stacking_list; i < n && it; it = next) {
+ next = g_list_next(it);
+ if ((sit = g_slist_find(c->transients, it->data))) {
+ ++i;
+ ret = g_list_concat(ret, pick_windows(sit->data));
+ }
}
- if (it->data != client) { /* not already the bottom */
- wins[0] = ((Client*)it->data)->frame->window;
- wins[1] = client->frame->window;
+ /* add itself */
+ if (g_list_find(stacking_list, win)) {
+ ret = g_list_append(ret, win);
+ stacking_list = g_list_remove(stacking_list, win);
+ }
- stacking_list = g_list_remove(stacking_list, client);
- stacking_list = g_list_insert_before(stacking_list,
- it->next, client);
- XRestackWindows(ob_display, wins, 2);
+ /* add group members in their stacking order */
+ if (c->group) {
+ for (it = stacking_list; it; it = next) {
+ next = g_list_next(it);
+ if ((sit = g_slist_find(c->group->members, it->data))) {
+ ret = g_list_append(ret, sit->data);
+ stacking_list = g_list_remove(stacking_list, sit->data);
+ }
+ }
}
- for (sit = client->transients; sit; sit = sit->next)
- lower_recursive(sit->data, client);
+ if (c->transient_for && c->transient_for != TRAN_GROUP)
+ /* dont add it twice */
+ if (g_list_find(stacking_list, c->transient_for))
+ ret = g_list_concat(ret, pick_windows
+ (CLIENT_AS_WINDOW(c->transient_for)));
+
+ return ret;
+}
+
+void stacking_raise(ObWindow *window)
+{
+ GList *wins;
+
+ wins = pick_windows(window);
+ raise(wins);
+}
+
+void stacking_lower(ObWindow *window)
+{
+ GList *wins;
+
+ wins = pick_windows(window);
+ lower(wins);
+}
+
+void stacking_add(ObWindow *win)
+{
+ StackLayer l;
+ GList *wins, *it;
+
+ l = window_layer(win);
+ wins = g_list_append(NULL, win); /* list of 1 element */
+
+ for (it = stacking_list; it; it = g_list_next(it))
+ if (window_layer(it->data) <= l)
+ break;
+ do_restack(wins, it);
+ g_list_free(wins);
- if (!above) /* only need to do this once */
- stacking_set_list();
+ stacking_raise(win);
}
-void stacking_lower(Client *client)
+void stacking_add_nonintrusive(ObWindow *win)
{
- g_assert(stacking_list != NULL); /* this would be bad */
+ Client *client;
+ Client *parent = NULL;
+ GList *it_before = NULL;
+
+ if (!WINDOW_IS_CLIENT(win)) {
+ stacking_add(win); /* no special rules for others */
+ return;
+ }
+
+ client = WINDOW_AS_CLIENT(win);
- /* move up the transient chain as far as possible first */
- while (client->transient_for) {
+ /* insert above its highest parent */
+ if (client->transient_for) {
if (client->transient_for != TRAN_GROUP) {
- client = client->transient_for;
+ parent = client->transient_for;
} else {
- GSList *it;
+ GSList *sit;
+ GList *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 (client->group)
+ for (it = stacking_list; !parent && it; it = it->next) {
+ if ((sit = g_slist_find(client->group->members, it->data)))
+ for (sit = client->group->members; !parent && sit;
+ sit = sit->next) {
+ Client *c = sit->data;
+ /* checking transient_for prevents infinate loops! */
+ if (sit->data == it->data && !c->transient_for)
+ parent = it->data;
}
}
- if (it == NULL) break;
}
}
- lower_recursive(client, NULL);
+ if (!(it_before = g_list_find(stacking_list, parent))) {
+ /* no parent to put above, try find the focused client to go
+ under */
+ if (focus_client && focus_client->layer == client->layer) {
+ if ((it_before = g_list_find(stacking_list, focus_client)))
+ it_before = it_before->next;
+ }
+ }
+ if (!it_before) {
+ /* out of ideas, just add it normally... */
+ stacking_add(win);
+ } else {
+ GList *wins = g_list_append(NULL, win);
+ do_restack(wins, it_before);
+ g_list_free(wins);
+ }
}
-
projects / chaz / openbox / blobdiff