+/* * Copyright (c) 2012-2013 Bastien Dejean
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation and/or
+ * other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
#include <stdlib.h>
#include "bspwm.h"
#include "window.h"
#include "stack.h"
-stack_t *make_stack(node_t *n)
+stacking_list_t *make_stack(node_t *n)
{
- stack_t *s = malloc(sizeof(stack_t));
+ stacking_list_t *s = malloc(sizeof(stacking_list_t));
s->node = n;
s->prev = s->next = NULL;
return s;
}
-void stack_insert_after(stack_t *a, node_t *n)
+void stack_insert_after(stacking_list_t *a, node_t *n)
{
- stack_t *s = make_stack(n);
+ stacking_list_t *s = make_stack(n);
if (a == NULL) {
stack_head = stack_tail = s;
} else {
remove_stack_node(n);
- stack_t *b = a->next;
+ stacking_list_t *b = a->next;
if (b != NULL)
b->prev = s;
s->next = b;
}
}
-void stack_insert_before(stack_t *a, node_t *n)
+void stack_insert_before(stacking_list_t *a, node_t *n)
{
- stack_t *s = make_stack(n);
+ stacking_list_t *s = make_stack(n);
if (a == NULL) {
stack_head = stack_tail = s;
} else {
remove_stack_node(n);
- stack_t *b = a->prev;
+ stacking_list_t *b = a->prev;
if (b != NULL)
b->next = s;
s->prev = b;
}
}
-void remove_stack(stack_t *s)
+void remove_stack(stacking_list_t *s)
{
if (s == NULL)
return;
- stack_t *a = s->prev;
- stack_t *b = s->next;
+ stacking_list_t *a = s->prev;
+ stacking_list_t *b = s->next;
if (a != NULL)
a->next = b;
if (b != NULL)
void remove_stack_node(node_t *n)
{
- for (stack_t *s = stack_head; s != NULL; s = s->next)
+ for (stacking_list_t *s = stack_head; s != NULL; s = s->next)
if (s->node == n) {
remove_stack(s);
return;
}
}
-void stack(node_t *n)
+void stack(node_t *n, stack_flavor_t f)
{
PRINTF("stack %X\n", n->client->window);
if (stack_head == NULL) {
stack_insert_after(NULL, n);
} else if (n->client->fullscreen) {
- stack_insert_after(stack_tail, n);
- window_raise(n->client->window);
- } else {
- if (n->client->floating && !auto_raise)
- return;
- stack_t *latest_tiled = NULL;
- stack_t *oldest_floating = NULL;
- for (stack_t *s = stack_tail; s != NULL; s = s->prev) {
- if (s->node != n) {
- if (s->node->client->floating == n->client->floating) {
- stack_insert_after(s, n);
- window_above(n->client->window, s->node->client->window);
- return;
- } else if (latest_tiled == NULL && !s->node->client->floating) {
- latest_tiled = s;
- } else if (s->node->client->floating) {
- oldest_floating = s;
- }
- }
+ if (f == STACK_ABOVE) {
+ stack_insert_after(stack_tail, n);
+ window_raise(n->client->window);
}
- if (latest_tiled == NULL && oldest_floating == NULL)
- return;
- if (n->client->floating) {
- window_above(n->client->window, latest_tiled->node->client->window);
- stack_insert_after(latest_tiled, n);
- } else {
- window_below(n->client->window, oldest_floating->node->client->window);
- stack_insert_before(oldest_floating, n);
- }
- }
-}
-
-void stack_under(node_t *n)
-{
- PRINTF("stack under %X\n", n->client->window);
-
- if (stack_head == NULL) {
- stack_insert_after(NULL, n);
- } else if (n->client->fullscreen) {
- ;
} else {
- if (n->client->floating && !auto_raise)
+ if (f == STACK_ABOVE && n->client->floating && !auto_raise)
return;
- stack_t *latest_tiled = NULL;
- stack_t *oldest_floating = NULL;
- for (stack_t *s = stack_head; s != NULL; s = s->next) {
+ stacking_list_t *latest_tiled = NULL;
+ stacking_list_t *oldest_floating = NULL;
+ for (stacking_list_t *s = (f == STACK_ABOVE ? stack_tail : stack_head); s != NULL; s = (f == STACK_ABOVE ? s->prev : s->next)) {
if (s->node != n) {
if (s->node->client->floating == n->client->floating) {
- stack_insert_before(s, n);
- window_below(n->client->window, s->node->client->window);
+ if (f == STACK_ABOVE) {
+ stack_insert_after(s, n);
+ window_above(n->client->window, s->node->client->window);
+ } else {
+ stack_insert_before(s, n);
+ window_below(n->client->window, s->node->client->window);
+ }
return;
- } else if (!s->node->client->floating) {
+ } else if ((f != STACK_ABOVE || latest_tiled == NULL) && !s->node->client->floating) {
latest_tiled = s;
- } else if (oldest_floating == NULL && s->node->client->floating) {
+ } else if ((f == STACK_ABOVE || oldest_floating == NULL) && s->node->client->floating) {
oldest_floating = s;
}
}
if (latest_tiled == NULL && oldest_floating == NULL)
return;
if (n->client->floating) {
+ if (latest_tiled == NULL)
+ return;
window_above(n->client->window, latest_tiled->node->client->window);
stack_insert_after(latest_tiled, n);
} else {
+ if (oldest_floating == NULL)
+ return;
window_below(n->client->window, oldest_floating->node->client->window);
stack_insert_before(oldest_floating, n);
}
projects / bspwm.git / blobdiff