]> git.lizzy.rs Git - bspwm.git/blobdiff - tree.c
Implement private windows
[bspwm.git] / tree.c
diff --git a/tree.c b/tree.c
index 9cd4e077d53338c232ea8d7b03b628bfae8cc356..1a3ee5c239cbcc8740d5b236730f8b9f80e1a720 100644 (file)
--- a/tree.c
+++ b/tree.c
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
+/* * 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 <float.h>
+#include <limits.h>
 #include <math.h>
-#include <xcb/xcb.h>
-#include <xcb/xcb_event.h>
-#include "settings.h"
-#include "helpers.h"
-#include "window.h"
-#include "types.h"
 #include "bspwm.h"
+#include "desktop.h"
 #include "ewmh.h"
+#include "history.h"
+#include "monitor.h"
+#include "query.h"
+#include "settings.h"
+#include "stack.h"
+#include "tag.h"
+#include "window.h"
 #include "tree.h"
 
+void arrange(monitor_t *m, desktop_t *d)
+{
+    if (d->root == NULL)
+        return;
+
+    PRINTF("arrange %s %s\n", m->name, d->name);
+
+    xcb_rectangle_t rect = m->rectangle;
+    int wg = (gapless_monocle && d->layout == LAYOUT_MONOCLE ? 0 : d->window_gap);
+    rect.x += m->left_padding + wg;
+    rect.y += m->top_padding + wg;
+    rect.width -= m->left_padding + m->right_padding + wg;
+    rect.height -= m->top_padding + m->bottom_padding + wg;
+    apply_layout(m, d, d->root, rect, rect);
+}
+
+void apply_layout(monitor_t *m, desktop_t *d, node_t *n, xcb_rectangle_t rect, xcb_rectangle_t root_rect)
+{
+    if (n == NULL)
+        return;
+
+    n->rectangle = rect;
+
+    if (is_leaf(n)) {
+
+        if ((borderless_monocle && is_tiled(n->client) && d->layout == LAYOUT_MONOCLE)
+                || n->client->fullscreen
+                || n->client->frame)
+            n->client->border_width = 0;
+        else
+            n->client->border_width = d->border_width;
+
+        xcb_rectangle_t r;
+        if (!n->client->fullscreen) {
+            if (!n->client->floating) {
+                /* tiled clients */
+                if (d->layout == LAYOUT_TILED)
+                    r = rect;
+                else if (d->layout == LAYOUT_MONOCLE)
+                    r = root_rect;
+                else
+                    return;
+                int wg = (gapless_monocle && d->layout == LAYOUT_MONOCLE ? 0 : d->window_gap);
+                int bleed = wg + 2 * n->client->border_width;
+                r.width = (bleed < r.width ? r.width - bleed : 1);
+                r.height = (bleed < r.height ? r.height - bleed : 1);
+                n->client->tiled_rectangle = r;
+            } else {
+                /* floating clients */
+                r = n->client->floating_rectangle;
+            }
+        } else {
+            /* fullscreen clients */
+            r = m->rectangle;
+        }
+
+        window_move_resize(n->client->window, r.x, r.y, r.width, r.height);
+        window_border_width(n->client->window, n->client->border_width);
+        window_draw_border(n, d->focus == n, m == mon);
+
+    } else {
+        xcb_rectangle_t first_rect;
+        xcb_rectangle_t second_rect;
+
+        if (n->first_child->vacant || n->second_child->vacant) {
+            first_rect = second_rect = rect;
+        } else {
+            unsigned int fence;
+            if (n->split_type == TYPE_VERTICAL) {
+                fence = rect.width * n->split_ratio;
+                first_rect = (xcb_rectangle_t) {rect.x, rect.y, fence, rect.height};
+                second_rect = (xcb_rectangle_t) {rect.x + fence, rect.y, rect.width - fence, rect.height};
+            } else if (n->split_type == TYPE_HORIZONTAL) {
+                fence = rect.height * n->split_ratio;
+                first_rect = (xcb_rectangle_t) {rect.x, rect.y, rect.width, fence};
+                second_rect = (xcb_rectangle_t) {rect.x, rect.y + fence, rect.width, rect.height - fence};
+            }
+        }
+
+        apply_layout(m, d, n->first_child, first_rect, root_rect);
+        apply_layout(m, d, n->second_child, second_rect, root_rect);
+    }
+}
+
+void insert_node(monitor_t *m, desktop_t *d, node_t *n, node_t *f)
+{
+    if (d == NULL || n == NULL)
+        return;
+
+    PRINTF("insert node %X\n", n->client->window);
+
+    /* n: new leaf node */
+    /* c: new container node */
+    /* f: focus or insertion anchor */
+    /* p: parent of focus */
+    /* g: grand parent of focus */
+
+    if (f == NULL)
+        f = d->root;
+
+    if (f == NULL) {
+        d->root = n;
+    } else {
+        node_t *c = make_node();
+        node_t *p = f->parent;
+        if (p != NULL && f->split_mode == MODE_AUTOMATIC
+                && (p->first_child->vacant || p->second_child->vacant)) {
+            f = p;
+            p = f->parent;
+        }
+        if (((f->client != NULL && f->client->private) || (p != NULL && p->privacy_level > 0))
+                    && f->split_mode == MODE_AUTOMATIC) {
+            node_t *closest = NULL;
+            node_t *public = NULL;
+            closest_public(d, f, &closest, &public);
+            if (public != NULL) {
+                f = public;
+                p = f->parent;
+            } else {
+                if (closest != NULL) {
+                    f = closest;
+                    p = f->parent;
+                }
+                f->split_mode = MODE_MANUAL;
+                xcb_rectangle_t rect = f->client->tiled_rectangle;
+                f->split_dir = (rect.width >= rect.height ? DIR_LEFT : DIR_UP);
+                if (f->client->private) {
+                    get_opposite(f->split_dir, &f->split_dir);
+                    update_privacy_level(f, false);
+                }
+            }
+        }
+        n->parent = c;
+        c->birth_rotation = f->birth_rotation;
+        switch (f->split_mode) {
+            case MODE_AUTOMATIC:
+                if (p == NULL) {
+                    c->first_child = n;
+                    c->second_child = f;
+                    if (m->rectangle.width > m->rectangle.height)
+                        c->split_type = TYPE_VERTICAL;
+                    else
+                        c->split_type = TYPE_HORIZONTAL;
+                    f->parent = c;
+                    d->root = c;
+                } else {
+                    node_t *g = p->parent;
+                    c->parent = g;
+                    if (g != NULL) {
+                        if (is_first_child(p))
+                            g->first_child = c;
+                        else
+                            g->second_child = c;
+                    } else {
+                        d->root = c;
+                    }
+                    c->split_type = p->split_type;
+                    c->split_ratio = p->split_ratio;
+                    p->parent = c;
+                    int rot;
+                    if (is_first_child(f)) {
+                        c->first_child = n;
+                        c->second_child = p;
+                        rot = 90;
+                    } else {
+                        c->first_child = p;
+                        c->second_child = n;
+                        rot = 270;
+                    }
+                    if (!is_floating(n->client))
+                        rotate_tree(p, rot);
+                    n->birth_rotation = rot;
+                }
+                break;
+            case MODE_MANUAL:
+                if (p != NULL) {
+                    if (is_first_child(f))
+                        p->first_child = c;
+                    else
+                        p->second_child = c;
+                }
+                c->split_ratio = f->split_ratio;
+                c->parent = p;
+                f->parent = c;
+                f->birth_rotation = 0;
+                switch (f->split_dir) {
+                    case DIR_LEFT:
+                        c->split_type = TYPE_VERTICAL;
+                        c->first_child = n;
+                        c->second_child = f;
+                        break;
+                    case DIR_RIGHT:
+                        c->split_type = TYPE_VERTICAL;
+                        c->first_child = f;
+                        c->second_child = n;
+                        break;
+                    case DIR_UP:
+                        c->split_type = TYPE_HORIZONTAL;
+                        c->first_child = n;
+                        c->second_child = f;
+                        break;
+                    case DIR_DOWN:
+                        c->split_type = TYPE_HORIZONTAL;
+                        c->first_child = f;
+                        c->second_child = n;
+                        break;
+                }
+                if (d->root == f)
+                    d->root = c;
+                f->split_mode = MODE_AUTOMATIC;
+                break;
+        }
+        if (f->vacant)
+            update_vacant_state(p);
+        if (f->client != NULL && f->client->private)
+            update_privacy_level(f, true);
+    }
+    if (n->client->private)
+        update_privacy_level(n, true);
+    if (d->focus == NULL && is_visible(d, n))
+        d->focus = n;
+    if (n->client->sticky)
+        m->num_sticky++;
+    put_status();
+}
+
+void pseudo_focus(desktop_t *d, node_t *n)
+{
+    d->focus = n;
+    if (n != NULL)
+        stack(n);
+}
+
+void focus_node(monitor_t *m, desktop_t *d, node_t *n)
+{
+    if (mon->desk != d || n == NULL)
+        clear_input_focus();
+
+    if (m->num_sticky > 0 && d != m->desk) {
+        node_t *a = first_extrema(m->desk->root);
+        sticky_still = false;
+        while (a != NULL) {
+            node_t *b = next_leaf(a, m->desk->root);
+            if (a->client->sticky)
+                transfer_node(m, m->desk, a, m, d, d->focus);
+            a = b;
+        }
+        sticky_still = true;
+        if (n == NULL && d->focus != NULL && is_visible(d, d->focus))
+            n = d->focus;
+    }
+
+    if (n != NULL && d->focus != NULL && n != d->focus && d->focus->client->fullscreen) {
+        set_fullscreen(d->focus, false);
+        arrange(m, d);
+    }
+
+    if (mon != m) {
+        for (desktop_t *cd = mon->desk_head; cd != NULL; cd = cd->next)
+            window_draw_border(cd->focus, true, false);
+        for (desktop_t *cd = m->desk_head; cd != NULL; cd = cd->next)
+            if (cd != d)
+                window_draw_border(cd->focus, true, true);
+        if (d->focus == n)
+            window_draw_border(n, true, true);
+    }
+
+    if (d->focus != n) {
+        window_draw_border(d->focus, false, true);
+        window_draw_border(n, true, true);
+    }
+
+    focus_desktop(m, d);
+    pseudo_focus(d, n);
+
+    if (n == NULL) {
+        history_add(m, d, NULL);
+        ewmh_update_active_window();
+        return;
+    }
+
+    PRINTF("focus node %X\n", n->client->window);
+
+    n->client->urgent = false;
+
+    if (!is_visible(d, n))
+        tag_node(m, d, n, d, n->client->tags_field | d->tags_field);
+    history_add(m, d, n);
+    set_input_focus(n);
+
+    if (focus_follows_pointer) {
+        xcb_window_t win = XCB_NONE;
+        query_pointer(&win, NULL);
+        if (win != n->client->window)
+            enable_motion_recorder();
+        else
+            disable_motion_recorder();
+    }
+
+    ewmh_update_active_window();
+}
+
+void update_current(void)
+{
+    focus_node(mon, mon->desk, mon->desk->focus);
+}
+
+node_t *make_node(void)
+{
+    node_t *n = malloc(sizeof(node_t));
+    n->parent = n->first_child = n->second_child = NULL;
+    n->split_ratio = split_ratio;
+    n->split_mode = MODE_AUTOMATIC;
+    n->split_type = TYPE_VERTICAL;
+    n->birth_rotation = 0;
+    n->privacy_level = 0;
+    n->client = NULL;
+    n->vacant = false;
+    return n;
+}
+
+client_t *make_client(xcb_window_t win)
+{
+    client_t *c = malloc(sizeof(client_t));
+    snprintf(c->class_name, sizeof(c->class_name), "%s", MISSING_VALUE);
+    c->border_width = BORDER_WIDTH;
+    c->window = win;
+    c->floating = c->transient = c->fullscreen = c->locked = c->sticky = c->urgent = false;
+    c->frame = c->private = c->icccm_focus = false;
+    xcb_icccm_get_wm_protocols_reply_t protocols;
+    if (xcb_icccm_get_wm_protocols_reply(dpy, xcb_icccm_get_wm_protocols(dpy, win, ewmh->WM_PROTOCOLS), &protocols, NULL) == 1) {
+        if (has_proto(WM_TAKE_FOCUS, &protocols))
+            c->icccm_focus = true;
+        xcb_icccm_get_wm_protocols_reply_wipe(&protocols);
+    }
+    c->num_states = 0;
+    xcb_ewmh_get_atoms_reply_t wm_state;
+    if (xcb_ewmh_get_wm_state_reply(ewmh, xcb_ewmh_get_wm_state(ewmh, win), &wm_state, NULL) == 1) {
+        for (unsigned int i = 0; i < wm_state.atoms_len && i < MAX_STATE; i++)
+            ewmh_wm_state_add(c, wm_state.atoms[i]);
+        xcb_ewmh_get_atoms_reply_wipe(&wm_state);
+    }
+    return c;
+}
+
+bool is_visible(desktop_t *d, node_t *n)
+{
+    return (d->tags_field & n->client->tags_field) != 0;
+}
+
 bool is_leaf(node_t *n)
 {
     return (n != NULL && n->first_child == NULL && n->second_child == NULL);
@@ -22,7 +396,7 @@ bool is_tiled(client_t *c)
 {
     if (c == NULL)
         return false;
-    return (!c->floating && !c->transient && !c->fullscreen);
+    return (!c->floating && !c->fullscreen);
 }
 
 bool is_floating(client_t *c)
@@ -42,8 +416,83 @@ bool is_second_child(node_t *n)
     return (n != NULL && n->parent != NULL && n->parent->second_child == n);
 }
 
-void change_split_ratio(node_t *n, value_change_t chg) {
-    n->split_ratio = pow(n->split_ratio, (chg == CHANGE_INCREASE ? INC_EXP : DEC_EXP));
+void change_split_ratio(node_t *n, value_change_t chg)
+{
+    n->split_ratio = pow(n->split_ratio,
+            (chg == CHANGE_INCREASE ? (1 / growth_factor) : growth_factor));
+}
+
+void reset_mode(coordinates_t *loc)
+{
+    if (loc->node != NULL) {
+        loc->node->split_mode = MODE_AUTOMATIC;
+        window_draw_border(loc->node, loc->desktop->focus == loc->node, mon == loc->monitor);
+    } else if (loc->desktop != NULL) {
+        for (node_t *a = first_extrema(loc->desktop->root); a != NULL; a = next_leaf(a, loc->desktop->root)) {
+            a->split_mode = MODE_AUTOMATIC;
+            window_draw_border(a, loc->desktop->focus == a, mon == loc->monitor);
+        }
+    }
+}
+
+node_t *brother_tree(node_t *n)
+{
+    if (n == NULL || n->parent == NULL)
+        return NULL;
+    if (is_first_child(n))
+        return n->parent->second_child;
+    else
+        return n->parent->first_child;
+}
+
+node_t *closest_visible(desktop_t *d, node_t *n)
+{
+    if (n == NULL)
+        return NULL;
+    node_t *prev = prev_leaf(n, d->root);
+    node_t *next = next_leaf(n, d->root);
+    while (prev != NULL || next != NULL) {
+        if (prev != NULL) {
+            if (is_visible(d, prev))
+                return prev;
+            else
+                prev = prev_leaf(prev, d->root);
+        }
+        if (next != NULL) {
+            if (is_visible(d, next))
+                return next;
+            else
+                next = next_leaf(next, d->root);
+        }
+    }
+    return NULL;
+}
+
+void closest_public(desktop_t *d, node_t *n, node_t **closest, node_t **public)
+{
+    if (n == NULL)
+        return;
+    node_t *prev = prev_leaf(n, d->root);
+    node_t *next = next_leaf(n, d->root);
+    while (prev != NULL || next != NULL) {
+#define TESTLOOP(n) \
+        if (n != NULL) { \
+            if (is_visible(d, n) && is_tiled(n->client)) { \
+                if (n->privacy_level == 0) { \
+                    if (n->parent == NULL || n->parent->privacy_level == 0) { \
+                        *public = n; \
+                        return; \
+                    } else if (*closest == NULL) { \
+                        *closest = n; \
+                    } \
+                } \
+            } \
+            n = n##_leaf(n, d->root); \
+        }
+        TESTLOOP(prev)
+        TESTLOOP(next)
+#undef TESTLOOP
+    }
 }
 
 node_t *first_extrema(node_t *n)
@@ -66,30 +515,81 @@ node_t *second_extrema(node_t *n)
         return second_extrema(n->second_child);
 }
 
-node_t *next_leaf(node_t *n)
+node_t *next_leaf(node_t *n, node_t *r)
 {
     if (n == NULL)
         return NULL;
     node_t *p = n;
-    while (is_second_child(p))
+    while (is_second_child(p) && p != r)
         p = p->parent;
-    if (p->parent == NULL)
+    if (p == r)
         return NULL;
     return first_extrema(p->parent->second_child);
 }
 
-node_t *prev_leaf(node_t *n)
+node_t *prev_leaf(node_t *n, node_t *r)
 {
     if (n == NULL)
         return NULL;
     node_t *p = n;
-    while (is_first_child(p))
+    while (is_first_child(p) && p != r)
         p = p->parent;
-    if (p->parent == NULL)
+    if (p == r)
         return NULL;
     return second_extrema(p->parent->first_child);
 }
 
+node_t *next_visible_leaf(desktop_t *d, node_t *n, node_t *r)
+{
+    node_t *next = next_leaf(n, r);
+    if (next == NULL || is_visible(d, next))
+        return next;
+    else
+        return next_visible_leaf(d, next, r);
+}
+
+node_t *prev_visible_leaf(desktop_t *d, node_t *n, node_t *r)
+{
+    node_t *prev = prev_leaf(n, r);
+    if (prev == NULL || is_visible(d, prev))
+        return prev;
+    else
+        return prev_visible_leaf(d, prev, r);
+}
+
+/* bool is_adjacent(node_t *a, node_t *r) */
+/* { */
+/*     node_t *f = r->parent; */
+/*     node_t *p = a; */
+/*     bool first_child = is_first_child(r); */
+/*     while (p != r) { */
+/*         if (p->parent->split_type == f->split_type && is_first_child(p) == first_child) */
+/*             return false; */
+/*         p = p->parent; */
+/*     } */
+/*     return true; */
+/* } */
+
+/* Returns true if *b* is adjacent to *a* in the direction *dir* */
+bool is_adjacent(node_t *a, node_t *b, direction_t dir)
+{
+    switch (dir) {
+        case DIR_RIGHT:
+            return (a->rectangle.x + a->rectangle.width) == b->rectangle.x;
+            break;
+        case DIR_DOWN:
+            return (a->rectangle.y + a->rectangle.height) == b->rectangle.y;
+            break;
+        case DIR_LEFT:
+            return (b->rectangle.x + b->rectangle.width) == a->rectangle.x;
+            break;
+        case DIR_UP:
+            return (b->rectangle.y + b->rectangle.height) == a->rectangle.y;
+            break;
+    }
+    return false;
+}
+
 node_t *find_fence(node_t *n, direction_t dir)
 {
     node_t *p;
@@ -111,19 +611,119 @@ node_t *find_fence(node_t *n, direction_t dir)
     return NULL;
 }
 
-node_t *find_neighbor(node_t *n, direction_t dir)
+
+node_t *nearest_neighbor(monitor_t *m, desktop_t *d, node_t *n, direction_t dir, client_select_t sel)
 {
-    node_t *fence = find_fence(n, dir);
+    if (n == NULL || n->client->fullscreen
+            || (d->layout == LAYOUT_MONOCLE && is_tiled(n->client)))
+        return NULL;
+
+    node_t *nearest = NULL;
+    if (history_aware_focus)
+        nearest = nearest_from_history(m, d, n, dir, sel);
+    if (nearest == NULL)
+        nearest = nearest_from_distance(m, d, n, dir, sel);
+    return nearest;
+}
 
-    if (fence == NULL)
+node_t *nearest_from_history(monitor_t *m, desktop_t *d, node_t *n, direction_t dir, client_select_t sel)
+{
+    if (n == NULL || !is_tiled(n->client))
         return NULL;
 
+    node_t *target = find_fence(n, dir);
+    if (target == NULL)
+        return NULL;
     if (dir == DIR_UP || dir == DIR_LEFT)
-        return second_extrema(fence->first_child);
+        target = target->first_child;
     else if (dir == DIR_DOWN || dir == DIR_RIGHT)
-        return first_extrema(fence->second_child);
+        target = target->second_child;
+
+    node_t *nearest = NULL;
+    int min_rank = INT_MAX;
+    coordinates_t ref = {m, d, n};
+
+    for (node_t *a = first_extrema(target); a != NULL; a = next_leaf(a, target)) {
+        if (a->vacant || !is_adjacent(n, a, dir) || a == n)
+            continue;
+        coordinates_t loc = {m, d, a};
+        if (!node_matches(&loc, &ref, sel))
+            continue;
+
+        int rank = history_rank(d, a);
+        if (rank >= 0 && rank < min_rank) {
+            nearest = a;
+            min_rank = rank;
+        }
+    }
 
-    return NULL;
+    return nearest;
+}
+
+node_t *nearest_from_distance(monitor_t *m, desktop_t *d, node_t *n, direction_t dir, client_select_t sel)
+{
+    if (n == NULL)
+        return NULL;
+
+    node_t *target = NULL;
+
+    if (is_tiled(n->client)) {
+        target = find_fence(n, dir);
+        if (target == NULL)
+            return NULL;
+        if (dir == DIR_UP || dir == DIR_LEFT)
+            target = target->first_child;
+        else if (dir == DIR_DOWN || dir == DIR_RIGHT)
+            target = target->second_child;
+    } else {
+        target = d->root;
+    }
+
+    node_t *nearest = NULL;
+    direction_t dir2;
+    xcb_point_t pt;
+    xcb_point_t pt2;
+    get_side_handle(n->client, dir, &pt);
+    get_opposite(dir, &dir2);
+    double ds = DBL_MAX;
+    coordinates_t ref = {m, d, n};
+
+    for (node_t *a = first_extrema(target); a != NULL; a = next_leaf(a, target)) {
+        coordinates_t loc = {m, d, a};
+        if (a == n ||
+                !is_visible(d, a) ||
+                !node_matches(&loc, &ref, sel) ||
+                is_tiled(a->client) != is_tiled(n->client) ||
+                (is_tiled(a->client) && !is_adjacent(n, a, dir)))
+            continue;
+
+        get_side_handle(a->client, dir2, &pt2);
+        double ds2 = distance(pt, pt2);
+        if (ds2 < ds) {
+            ds = ds2;
+            nearest = a;
+        }
+    }
+
+    return nearest;
+}
+
+void get_opposite(direction_t src, direction_t *dst)
+{
+    switch (src) {
+        case DIR_RIGHT:
+            *dst = DIR_LEFT;
+            break;
+        case DIR_DOWN:
+            *dst = DIR_UP;
+            break;
+        case DIR_LEFT:
+            *dst = DIR_RIGHT;
+            break;
+        case DIR_UP:
+            *dst = DIR_DOWN;
+            break;
+    }
 }
 
 int tiled_area(node_t *n)
@@ -134,21 +734,24 @@ int tiled_area(node_t *n)
     return rect.width * rect.height;
 }
 
-node_t *find_by_area(desktop_t *d, swap_arg_t a)
+node_t *find_biggest(monitor_t *m, desktop_t *d, node_t *n, client_select_t sel)
 {
     if (d == NULL)
         return NULL;
 
     node_t *r = NULL;
     int r_area = tiled_area(r);
+    coordinates_t ref = {m, d, n};
 
-    for (node_t *f = first_extrema(d->root); f != NULL; f = next_leaf(f)) {
+    for (node_t *f = first_extrema(d->root); f != NULL; f = next_leaf(f, d->root)) {
+        coordinates_t loc = {m, d, f};
+        if (!is_visible(d, f) || !is_tiled(f->client) || !node_matches(&loc, &ref, sel))
+            continue;
         int f_area = tiled_area(f);
         if (r == NULL) {
             r = f;
             r_area = f_area;
-        } else if ((a == SWAP_BIGGEST && f_area > r_area)
-                || (a == SWAP_SMALLEST && f_area < r_area)) {
+        } else if (f_area > r_area) {
             r = f;
             r_area = f_area;
         }
@@ -159,43 +762,58 @@ node_t *find_by_area(desktop_t *d, swap_arg_t a)
 
 void move_fence(node_t *n, direction_t dir, fence_move_t mov)
 {
-    node_t *fence = find_fence(n, dir);
-
-    if (fence == NULL)
+    if (n == NULL)
         return;
 
     if ((mov == MOVE_PUSH && (dir == DIR_RIGHT || dir == DIR_DOWN))
             || (mov == MOVE_PULL && (dir == DIR_LEFT || dir == DIR_UP)))
-        change_split_ratio(fence, CHANGE_INCREASE);
+        change_split_ratio(n, CHANGE_INCREASE);
     else
-        change_split_ratio(fence, CHANGE_DECREASE);
+        change_split_ratio(n, CHANGE_DECREASE);
 }
 
-void rotate_tree(node_t *n, rotate_t rot)
+void rotate_tree(node_t *n, int deg)
 {
-    if (n == NULL || is_leaf(n))
+    if (n == NULL || is_leaf(n) || deg == 0)
         return;
 
     node_t *tmp;
 
-    if ((rot == ROTATE_CLOCKWISE && n->split_type == TYPE_HORIZONTAL)
-            || (rot == ROTATE_COUNTER_CLOCKWISE && n->split_type == TYPE_VERTICAL)
-            || rot == ROTATE_FULL_CYCLE) {
+    if ((deg == 90 && n->split_type == TYPE_HORIZONTAL)
+            || (deg == 270 && n->split_type == TYPE_VERTICAL)
+            || deg == 180) {
         tmp = n->first_child;
         n->first_child = n->second_child;
         n->second_child = tmp;
         n->split_ratio = 1.0 - n->split_ratio;
     }
 
-    if (rot != ROTATE_FULL_CYCLE) {
+    if (deg != 180) {
         if (n->split_type == TYPE_HORIZONTAL)
             n->split_type = TYPE_VERTICAL;
         else if (n->split_type == TYPE_VERTICAL)
             n->split_type = TYPE_HORIZONTAL;
     }
 
-    rotate_tree(n->first_child, rot);
-    rotate_tree(n->second_child, rot);
+    rotate_tree(n->first_child, deg);
+    rotate_tree(n->second_child, deg);
+}
+
+void rotate_brother(node_t *n)
+{
+    rotate_tree(brother_tree(n), n->birth_rotation);
+}
+
+void unrotate_tree(node_t *n, int rot)
+{
+    if (rot == 0)
+        return;
+    rotate_tree(n, 360 - rot);
+}
+
+void unrotate_brother(node_t *n)
+{
+    unrotate_tree(brother_tree(n), n->birth_rotation);
 }
 
 void flip_tree(node_t *n, flip_t flp)
@@ -217,15 +835,6 @@ void flip_tree(node_t *n, flip_t flp)
     flip_tree(n->second_child, flp);
 }
 
-void list_history(desktop_t *d, char *rsp)
-{
-    char line[MAXLEN];
-    for (node_list_t *a = d->history->head; a != NULL; a = a->next) {
-        snprintf(line, sizeof(line), "%s %X\n", a->node->client->class_name, a->node->client->window);
-        strncat(rsp, line, REMLEN(rsp));
-    }
-}
-
 int balance_tree(node_t *n)
 {
     if (n == NULL || n->vacant) {
@@ -242,240 +851,7 @@ int balance_tree(node_t *n)
     }
 }
 
-void arrange(monitor_t *m, desktop_t *d)
-{
-    PRINTF("arrange %s%s%s\n", (num_monitors > 1 ? m->name : ""), (num_monitors > 1 ? " " : ""), d->name);
-
-    xcb_rectangle_t rect = m->rectangle;
-    int wg = (gapless_monocle && d->layout == LAYOUT_MONOCLE ? 0 : window_gap);
-    rect.x += m->left_padding + wg;
-    rect.y += m->top_padding + wg;
-    rect.width -= m->left_padding + m->right_padding + wg;
-    rect.height -= m->top_padding + m->bottom_padding + wg;
-    apply_layout(m, d, d->root, rect, rect);
-}
-
-void apply_layout(monitor_t *m, desktop_t *d, node_t *n, xcb_rectangle_t rect, xcb_rectangle_t root_rect)
-{
-    if (n == NULL)
-        return;
-
-    n->rectangle = rect;
-
-    if (is_leaf(n)) {
-        if (n->client->fullscreen)
-            return;
-
-        if (is_floating(n->client) && n->client->border_width != border_width) {
-            int ds = 2 * (border_width - n->client->border_width);
-            n->client->floating_rectangle.width += ds;
-            n->client->floating_rectangle.height += ds;
-        }
-
-        if (borderless_monocle && is_tiled(n->client) && d->layout == LAYOUT_MONOCLE)
-            n->client->border_width = 0;
-        else
-            n->client->border_width = border_width;
-
-        xcb_rectangle_t r;
-        if (is_tiled(n->client)) {
-            if (d->layout == LAYOUT_TILED)
-                r = rect;
-            else if (d->layout == LAYOUT_MONOCLE)
-                r = root_rect;
-            int wg = (gapless_monocle && d->layout == LAYOUT_MONOCLE ? 0 : window_gap);
-            int bleed = wg + 2 * n->client->border_width;
-            r.width = (bleed < r.width ? r.width - bleed : 1);
-            r.height = (bleed < r.height ? r.height - bleed : 1);
-            n->client->tiled_rectangle = r;
-        } else {
-            r = n->client->floating_rectangle;
-        }
-
-        window_move_resize(n->client->window, r.x, r.y, r.width, r.height);
-        window_border_width(n->client->window, n->client->border_width);
-        window_draw_border(n, n == d->focus, m == mon);
-
-    } else {
-        xcb_rectangle_t first_rect;
-        xcb_rectangle_t second_rect;
-
-        if (n->first_child->vacant || n->second_child->vacant) {
-            first_rect = second_rect = rect;
-        } else {
-            unsigned int fence;
-            if (n->split_type == TYPE_VERTICAL) {
-                fence = rect.width * n->split_ratio;
-                first_rect = (xcb_rectangle_t) {rect.x, rect.y, fence, rect.height};
-                second_rect = (xcb_rectangle_t) {rect.x + fence, rect.y, rect.width - fence, rect.height};
-
-            } else if (n->split_type == TYPE_HORIZONTAL) {
-                fence = rect.height * n->split_ratio;
-                first_rect = (xcb_rectangle_t) {rect.x, rect.y, rect.width, fence};
-                second_rect = (xcb_rectangle_t) {rect.x, rect.y + fence, rect.width, rect.height - fence};
-            }
-        }
-
-        apply_layout(m, d, n->first_child, first_rect, root_rect);
-        apply_layout(m, d, n->second_child, second_rect, root_rect);
-    }
-}
-
-void insert_node(monitor_t *m, desktop_t *d, node_t *n)
-{
-    if (d == NULL || n == NULL)
-        return;
-
-    PRINTF("insert node %X\n", n->client->window);
-
-    node_t *focus = d->focus;
-
-    if (focus == NULL) {
-        d->root = n;
-    } else {
-        node_t *dad = make_node();
-        node_t *fopar = focus->parent;
-        n->parent = dad;
-        n->client->born_as = split_mode;
-        switch (split_mode) {
-            case MODE_AUTOMATIC:
-                if (fopar == NULL) {
-                    dad->first_child = n;
-                    dad->second_child = focus;
-                    if (m->rectangle.width > m->rectangle.height)
-                        dad->split_type = TYPE_VERTICAL;
-                    else
-                        dad->split_type = TYPE_HORIZONTAL;
-                    focus->parent = dad;
-                    d->root = dad;
-                } else {
-                    node_t *grandpa = fopar->parent;
-                    dad->parent = grandpa;
-                    if (grandpa != NULL) {
-                        if (is_first_child(fopar))
-                            grandpa->first_child = dad;
-                        else
-                            grandpa->second_child = dad;
-                    } else {
-                        d->root = dad;
-                    }
-                    dad->split_type = fopar->split_type;
-                    dad->split_ratio = fopar->split_ratio;
-                    fopar->parent = dad;
-                    if (is_first_child(focus)) {
-                        dad->first_child = n;
-                        dad->second_child = fopar;
-                        rotate_tree(fopar, ROTATE_CLOCKWISE);
-                    } else {
-                        dad->first_child = fopar;
-                        dad->second_child = n;
-                        rotate_tree(fopar, ROTATE_COUNTER_CLOCKWISE);
-                    }
-                }
-                break;
-            case MODE_MANUAL:
-                if (fopar != NULL) {
-                    if (is_first_child(focus))
-                        fopar->first_child = dad;
-                    else
-                        fopar->second_child = dad;
-                }
-                dad->split_ratio = focus->split_ratio;
-                dad->parent = fopar;
-                focus->parent = dad;
-                switch (split_dir) {
-                    case DIR_LEFT:
-                        dad->split_type = TYPE_VERTICAL;
-                        dad->first_child = n;
-                        dad->second_child = focus;
-                        break;
-                    case DIR_RIGHT:
-                        dad->split_type = TYPE_VERTICAL;
-                        dad->first_child = focus;
-                        dad->second_child = n;
-                        break;
-                    case DIR_UP:
-                        dad->split_type = TYPE_HORIZONTAL;
-                        dad->first_child = n;
-                        dad->second_child = focus;
-                        break;
-                    case DIR_DOWN:
-                        dad->split_type = TYPE_HORIZONTAL;
-                        dad->first_child = focus;
-                        dad->second_child = n;
-                        break;
-                }
-                if (d->root == focus)
-                    d->root = dad;
-                split_mode = MODE_AUTOMATIC;
-                break;
-        }
-        if (focus->vacant)
-            update_vacant_state(fopar);
-    }
-    put_status();
-}
-
-void focus_node(monitor_t *m, desktop_t *d, node_t *n, bool is_mapped)
-{
-    if (n == NULL)
-        return;
-
-    PRINTF("focus node %X\n", n->client->window);
-
-    split_mode = MODE_AUTOMATIC;
-    n->client->urgent = false;
-
-    if (is_mapped) {
-        if (mon != m) {
-            for (desktop_t *cd = mon->desk_head; cd != NULL; cd = cd->next)
-                window_draw_border(cd->focus, true, false);
-            for (desktop_t *cd = m->desk_head; cd != NULL; cd = cd->next)
-                if (cd != d)
-                    window_draw_border(cd->focus, true, true);
-            if (d->focus == n)
-                window_draw_border(n, true, true);
-        }
-        if (d->focus != n) {
-            window_draw_border(d->focus, false, true);
-            window_draw_border(n, true, true);
-        }
-        xcb_set_input_focus(dpy, XCB_INPUT_FOCUS_POINTER_ROOT, n->client->window, XCB_CURRENT_TIME);
-    }
-
-    if (d->focus != n) {
-        d->focus = n;
-        history_add(d->history, n);
-    }
-
-    if (!is_tiled(n->client)) {
-        if (!adaptative_raise || !might_cover(d, n))
-            window_raise(n->client->window);
-    } else {
-        stack_tiled(d);
-    }
-
-    if (focus_follows_pointer) {
-        xcb_window_t win = XCB_NONE;
-        query_pointer(&win, NULL);
-        if (win != n->client->window)
-            enable_motion_recorder();
-        else
-            disable_motion_recorder();
-    }
-
-    ewmh_update_active_window();
-}
-
-void update_current(void)
-{
-    if (mon->desk->focus == NULL)
-        ewmh_update_active_window();
-    else
-        focus_node(mon, mon->desk, mon->desk->focus, true);
-}
-
-void unlink_node(desktop_t *d, node_t *n)
+void unlink_node(monitor_t *m, desktop_t *d, node_t *n)
 {
     if (d == NULL || n == NULL)
         return;
@@ -488,19 +864,30 @@ void unlink_node(desktop_t *d, node_t *n)
         d->root = NULL;
         d->focus = NULL;
     } else {
+        if (n == d->focus) {
+            d->focus = history_get_node(d, n);
+            if (d->focus == NULL)
+                d->focus = closest_visible(d, n);
+        }
+
+        if (n->client->private)
+            update_privacy_level(n, false);
+
         node_t *b;
         node_t *g = p->parent;
-        bool n_first_child = is_first_child(n);
-        if (n_first_child) {
+
+        if (is_first_child(n)) {
             b = p->second_child;
-            if (n->client->born_as == MODE_AUTOMATIC)
-                rotate_tree(b, ROTATE_COUNTER_CLOCKWISE);
+            if (!n->vacant)
+                unrotate_tree(b, n->birth_rotation);
         } else {
             b = p->first_child;
-            if (n->client->born_as == MODE_AUTOMATIC)
-                rotate_tree(b, ROTATE_CLOCKWISE);
+            if (!n->vacant)
+                unrotate_tree(b, n->birth_rotation);
         }
+
         b->parent = g;
+
         if (g != NULL) {
             if (is_first_child(p))
                 g->first_child = b;
@@ -510,40 +897,34 @@ void unlink_node(desktop_t *d, node_t *n)
             d->root = b;
         }
 
+        b->birth_rotation = p->birth_rotation;
         n->parent = NULL;
         free(p);
-
-        if (n == d->focus) {
-            node_t *last_focus = history_get(d->history, 1);
-            if (last_focus != NULL) {
-                d->focus = last_focus;
-            } else {
-                d->focus = (n_first_child ? first_extrema(b) : second_extrema(b));
-                history_add(d->history, d->focus);
-            }
-        }
-
         update_vacant_state(b->parent);
     }
-    history_remove(d->history, n);
+    if (n->client->sticky)
+        m->num_sticky--;
     put_status();
 }
 
-void remove_node(desktop_t *d, node_t *n)
+void remove_node(monitor_t *m, desktop_t *d, node_t *n)
 {
-    if (d == NULL || n == NULL)
+    if (n == NULL)
         return;
 
     PRINTF("remove node %X\n", n->client->window);
 
-    unlink_node(d, n);
+    bool focused = (n == mon->desk->focus);
+    unlink_node(m, d, n);
+    history_remove(d, n);
+    remove_stack_node(n);
     free(n->client);
     free(n);
 
     num_clients--;
     ewmh_update_client_list();
 
-    if (mon->desk == d)
+    if (focused)
         update_current();
 }
 
@@ -560,18 +941,21 @@ void destroy_tree(node_t *n)
     destroy_tree(second_tree);
 }
 
-void swap_nodes(node_t *n1, node_t *n2)
+bool swap_nodes(monitor_t *m1, desktop_t *d1, node_t *n1, monitor_t *m2, desktop_t *d2, node_t *n2)
 {
-    if (n1 == NULL || n2 == NULL || n1 == n2)
-        return;
+    if (n1 == NULL || n2 == NULL || n1 == n2 || (d1 != d2 && (n1->client->sticky || n2->client->sticky)))
+        return false;
 
-    PUTS("swap nodes");
+    PRINTF("swap nodes %X %X", n1->client->window, n2->client->window);
 
-    /* (n1 and n2 are leaves) */
     node_t *pn1 = n1->parent;
     node_t *pn2 = n2->parent;
     bool n1_first_child = is_first_child(n1);
     bool n2_first_child = is_first_child(n2);
+    int br1 = n1->birth_rotation;
+    int br2 = n2->birth_rotation;
+    int pl1 = n1->privacy_level;
+    int pl2 = n2->privacy_level;
 
     if (pn1 != NULL) {
         if (n1_first_child)
@@ -589,202 +973,153 @@ void swap_nodes(node_t *n1, node_t *n2)
 
     n1->parent = pn2;
     n2->parent = pn1;
+    n1->birth_rotation = br2;
+    n2->birth_rotation = br1;
+    n1->privacy_level = pl2;
+    n2->privacy_level = pl1;
 
     if (n1->vacant != n2->vacant) {
         update_vacant_state(n1->parent);
         update_vacant_state(n2->parent);
     }
 
-    /* If we ever need to generalize: */
-    /* if (d1 != d2) { */
-    /*     if (d1->root == n1) */
-    /*         d1->root = n2; */
-    /*     if (d1->focus == n1) */
-    /*         d1->focus = n2; */
-    /*     if (d1->last_focus == n1) */
-    /*         d1->last_focus = n2; */
-    /*     if (d2->root == n2) */
-    /*         d2->root = n1; */
-    /*     if (d2->focus == n2) */
-    /*         d2->focus = n1; */
-    /*     if (d2->last_focus == n2) */
-    /*         d2->last_focus = n1; */
-    /* } */
-}
-
-void transfer_node(monitor_t *ms, desktop_t *ds, monitor_t *md, desktop_t *dd, node_t *n)
-{
-    if (n == NULL || ds == NULL || dd == NULL || ms == NULL || md == NULL || (ms == md && dd == ds))
-        return;
-
-    PRINTF("transfer node %X\n", n->client->window);
-
-    unlink_node(ds, n);
-    insert_node(md, dd, n);
-    ewmh_set_wm_desktop(n, dd);
-
-    if (ds == ms->desk && dd != md->desk) {
-        if (n == ds->focus)
-            clear_input_focus();
-        window_hide(n->client->window);
+    if (n1->client->private != n2->client->private) {
+        n1->client->private = !n1->client->private;
+        n2->client->private = !n2->client->private;
     }
 
-    fit_monitor(md, n->client);
-
-    if (n->client->fullscreen)
-        window_move_resize(n->client->window, md->rectangle.x, md->rectangle.y, md->rectangle.width, md->rectangle.height);
-
-    if (ds != ms->desk && dd == md->desk) {
-        window_show(n->client->window);
-        focus_node(md, dd, n, true);
-    } else {
-        focus_node(md, dd, n, false);
-    }
+    if (d1 != d2) {
+        if (d1->root == n1)
+            d1->root = n2;
+        if (d1->focus == n1)
+            d1->focus = n2;
+        if (d2->root == n2)
+            d2->root = n1;
+        if (d2->focus == n2)
+            d2->focus = n1;
+
+        if (m1 != m2) {
+            fit_monitor(m1, n2->client);
+            fit_monitor(m2, n1->client);
+        }
 
-    if (ds == ms->desk || dd == md->desk)
-        update_current();
-}
+        ewmh_set_wm_desktop(n1, d2);
+        ewmh_set_wm_desktop(n2, d1);
+        history_swap_nodes(m1, d1, n1, m2, d2, n2);
 
-void select_monitor(monitor_t *m)
-{
-    if (m == NULL || mon == m)
-        return;
-
-    PRINTF("select monitor %s\n", m->name);
+        if (m1->desk != d1 && m2->desk == d2) {
+            window_show(n1->client->window);
+            window_hide(n2->client->window);
+        } else if (m1->desk == d1 && m2->desk != d2) {
+            window_hide(n1->client->window);
+            window_show(n2->client->window);
+        }
 
-    focus_node(m, m->desk, m->desk->focus, true);
+        tag_node(m1, d1, n2, d2, n2->client->tags_field);
+        tag_node(m2, d2, n1, d1, n1->client->tags_field);
 
-    last_mon = mon;
-    mon = m;
+        update_input_focus();
+    }
 
-    ewmh_update_current_desktop();
-    put_status();
+    return true;
 }
 
-void select_desktop(desktop_t *d)
+bool transfer_node(monitor_t *ms, desktop_t *ds, node_t *ns, monitor_t *md, desktop_t *dd, node_t *nd)
 {
-    if (d == NULL || d == mon->desk)
-        return;
+    if (ns == NULL || ns == nd || (sticky_still && ns->client->sticky))
+        return false;
 
-    PRINTF("select desktop %s\n", d->name);
+    PRINTF("transfer node %X\n", ns->client->window);
 
-    clear_input_focus();
+    bool focused = (ns == mon->desk->focus);
+    bool active = (ns == ds->focus);
 
-    if (visible) {
-        node_t *n = first_extrema(d->root);
+    if (focused)
+        clear_input_focus();
 
-        while (n != NULL) {
-            window_show(n->client->window);
-            n = next_leaf(n);
-        }
+    unlink_node(ms, ds, ns);
+    insert_node(md, dd, ns, nd);
 
-        n = first_extrema(mon->desk->root);
+    if (md != ms)
+        fit_monitor(md, ns->client);
 
-        while (n != NULL) {
-            window_hide(n->client->window);
-            n = next_leaf(n);
+    if (ds != dd) {
+        ewmh_set_wm_desktop(ns, dd);
+        if (!ns->client->sticky) {
+            if (ds == ms->desk && dd != md->desk)
+                window_hide(ns->client->window);
+            else if (ds != ms->desk && dd == md->desk)
+                window_show(ns->client->window);
         }
     }
 
-    mon->last_desk = mon->desk;
-    mon->desk = d;
+    history_transfer_node(md, dd, ns);
+    stack_under(ns);
 
-    update_current();
-    ewmh_update_current_desktop();
-    put_status();
-}
+    if (ds == dd) {
+        if (focused)
+            focus_node(md, dd, ns);
+        else if (active)
+            pseudo_focus(dd, ns);
+    } else {
+        if (focused)
+            update_current();
+        else if (ns == mon->desk->focus)
+            update_input_focus();
+    }
 
-void cycle_monitor(cycle_dir_t dir)
-{
-    if (dir == CYCLE_NEXT)
-        select_monitor((mon->next == NULL ? mon_head : mon->next));
-    else if (dir == CYCLE_PREV)
-        select_monitor((mon->prev == NULL ? mon_tail : mon->prev));
-}
+    tag_node(md, dd, ns, ds, ns->client->tags_field);
+    arrange(ms, ds);
+    if (ds != dd)
+        arrange(md, dd);
 
-void cycle_desktop(monitor_t *m, desktop_t *d, cycle_dir_t dir, skip_desktop_t skip)
-{
-    desktop_t *f = (dir == CYCLE_PREV ? d->prev : d->next);
-    if (f == NULL)
-        f = (dir == CYCLE_PREV ? m->desk_tail : m->desk_head);
-
-    while (f != d) {
-        if (skip == DESKTOP_SKIP_NONE
-                || (skip == DESKTOP_SKIP_FREE && f->root != NULL)
-                || (skip == DESKTOP_SKIP_OCCUPIED && f->root == NULL)) {
-            select_desktop(f);
-            return;
-        }
-        f = (dir == CYCLE_PREV ? f->prev : f->next);
-        if (f == NULL)
-            f = (dir == CYCLE_PREV ? m->desk_tail : m->desk_head);
-    }
+    return true;
 }
 
-void cycle_leaf(monitor_t *m, desktop_t *d, node_t *n, cycle_dir_t dir, skip_client_t skip)
+node_t *closest_node(monitor_t *m, desktop_t *d, node_t *n, cycle_dir_t dir, client_select_t sel)
 {
     if (n == NULL)
-        return;
-
-    PUTS("cycle leaf");
+        return NULL;
 
-    node_t *f = (dir == CYCLE_PREV ? prev_leaf(n) : next_leaf(n));
+    node_t *f = (dir == CYCLE_PREV ? prev_leaf(n, d->root) : next_leaf(n, d->root));
     if (f == NULL)
         f = (dir == CYCLE_PREV ? second_extrema(d->root) : first_extrema(d->root));
 
+    coordinates_t ref = {m, d, n};
     while (f != n) {
-        bool tiled = is_tiled(f->client);
-        if (skip == CLIENT_SKIP_NONE || (skip == CLIENT_SKIP_TILED && !tiled) || (skip == CLIENT_SKIP_FLOATING && tiled)
-                || (skip == CLIENT_SKIP_CLASS_DIFFER && strcmp(f->client->class_name, n->client->class_name) == 0)
-                || (skip == CLIENT_SKIP_CLASS_EQUAL && strcmp(f->client->class_name, n->client->class_name) != 0)) {
-            focus_node(m, d, f, true);
-            return;
-        }
-        f = (dir == CYCLE_PREV ? prev_leaf(f) : next_leaf(f));
+        coordinates_t loc = {m, d, f};
+        if (node_matches(&loc, &ref, sel))
+            return f;
+        f = (dir == CYCLE_PREV ? prev_leaf(f, d->root) : next_leaf(f, d->root));
         if (f == NULL)
             f = (dir == CYCLE_PREV ? second_extrema(d->root) : first_extrema(d->root));
     }
+    return NULL;
 }
 
-void nearest_leaf(monitor_t *m, desktop_t *d, node_t *n, nearest_arg_t dir, skip_client_t skip)
+void circulate_leaves(monitor_t *m, desktop_t *d, circulate_dir_t dir)
 {
-    if (n == NULL)
-        return;
-
-    PUTS("nearest leaf");
-
-    node_t *x = NULL;
-
-    for (node_t *f = first_extrema(d->root); f != NULL; f = next_leaf(f))
-        if (skip == CLIENT_SKIP_NONE || (skip == CLIENT_SKIP_TILED && !is_tiled(f->client)) || (skip == CLIENT_SKIP_FLOATING && is_tiled(f->client))
-                || (skip == CLIENT_SKIP_CLASS_DIFFER && strcmp(f->client->class_name, n->client->class_name) == 0)
-                || (skip == CLIENT_SKIP_CLASS_EQUAL && strcmp(f->client->class_name, n->client->class_name) != 0))
-            if ((dir == NEAREST_OLDER
-                        && (f->client->uid < n->client->uid)
-                        && (x == NULL || f->client->uid > x->client->uid))
-                    || (dir == NEAREST_NEWER
-                        && (f->client->uid > n->client->uid)
-                        && (x == NULL || f->client->uid < x->client->uid)))
-                x = f;
-
-    focus_node(m, d, x, true);
-}
-
-void circulate_leaves(monitor_t *m, desktop_t *d, circulate_dir_t dir) {
-    if (d == NULL || d->root == NULL || is_leaf(d->root))
+    if (d == NULL || d->root == NULL || d->focus == NULL || is_leaf(d->root))
         return;
-    node_t *par = d->focus->parent;
+    node_t *p = d->focus->parent;
     bool focus_first_child = is_first_child(d->focus);
+    node_t *head, *tail;
+    for (head = first_extrema(d->root); head != NULL && !is_visible(d, head); head = next_leaf(head, d->root))
+        ;
+    for (tail = second_extrema(d->root); tail != NULL && !is_visible(d, tail); tail = prev_leaf(tail, d->root))
+        ;
+    if (head == tail)
+        return;
     if (dir == CIRCULATE_FORWARD)
-        for (node_t *s = second_extrema(d->root), *f = prev_leaf(s); f != NULL; s = prev_leaf(f), f = prev_leaf(s))
-            swap_nodes(f, s);
+        for (node_t *s = tail, *f = prev_visible_leaf(d, s, d->root); f != NULL; s = prev_visible_leaf(d, f, d->root), f = prev_visible_leaf(d, s, d->root))
+            swap_nodes(m, d, f, m, d, s);
     else
-        for (node_t *f = first_extrema(d->root), *s = next_leaf(f); s != NULL; f = next_leaf(s), s = next_leaf(f))
-            swap_nodes(f, s);
+        for (node_t *f = head, *s = next_visible_leaf(d, f, d->root); s != NULL; f = next_visible_leaf(d, s, d->root), s = next_visible_leaf(d, f, d->root))
+            swap_nodes(m, d, f, m, d, s);
     if (focus_first_child)
-        focus_node(m, d, par->first_child, true);
+        focus_node(m, d, p->first_child);
     else
-        focus_node(m, d, par->second_child, true);
+        focus_node(m, d, p->second_child);
 }
 
 void update_vacant_state(node_t *n)
@@ -803,230 +1138,9 @@ void update_vacant_state(node_t *n)
     }
 }
 
-void fit_monitor(monitor_t *m, client_t *c)
-{
-    xcb_rectangle_t crect = c->floating_rectangle;
-    xcb_rectangle_t mrect = m->rectangle;
-    while (crect.x < mrect.x)
-        crect.x += mrect.width;
-    while (crect.x > (mrect.x + mrect.width - 1))
-        crect.x -= mrect.width;
-    while (crect.y < mrect.y)
-        crect.y += mrect.height;
-    while (crect.y > (mrect.y + mrect.height - 1))
-        crect.y -= mrect.height;
-    c->floating_rectangle = crect;
-}
-
-void put_status(void)
-{
-    if (status_fifo == NULL)
-        return;
-    if (status_prefix != NULL)
-        fprintf(status_fifo, "%s", status_prefix);
-    bool urgent = false;
-    for (monitor_t *m = mon_head; m != NULL; m = m->next) {
-        fprintf(status_fifo, "%c%s:", (mon == m ? 'M' : 'm'), m->name);
-        for (desktop_t *d = m->desk_head; d != NULL; d = d->next, urgent = false) {
-            for (node_t *n = first_extrema(d->root); n != NULL && !urgent; n = next_leaf(n))
-                urgent |= n->client->urgent;
-            fprintf(status_fifo, "%c%s:", m->desk == d ? (urgent ? 'U' : 'D') : (d->root == NULL ? 'E' : (urgent ? 'u' : 'd')), d->name);
-        }
-    }
-    fprintf(status_fifo, "L%s\n", (mon->desk->layout == LAYOUT_TILED ? "tiled" : "monocle"));
-    fflush(status_fifo);
-}
-
-void list_monitors(list_option_t opt, char *rsp)
-{
-    char line[MAXLEN];
-    for (monitor_t *m = mon_head; m != NULL; m = m->next) {
-        snprintf(line, sizeof(line), "%s %ux%u%+i%+i", m->name, m->rectangle.width, m->rectangle.height, m->rectangle.x, m->rectangle.y);
-        strncat(rsp, line, REMLEN(rsp));
-        if (m == mon)
-            strncat(rsp, " #\n", REMLEN(rsp));
-        else if (m == last_mon)
-            strncat(rsp, " ~\n", REMLEN(rsp));
-        else
-            strncat(rsp, "\n", REMLEN(rsp));
-        if (opt == LIST_OPTION_VERBOSE)
-            list_desktops(m, opt, 1, rsp);
-    }
-}
-
-void list_desktops(monitor_t *m, list_option_t opt, unsigned int depth, char *rsp)
+void update_privacy_level(node_t *n, bool value)
 {
-    char line[MAXLEN];
-    for (desktop_t *d = m->desk_head; d != NULL; d = d->next) {
-        for (unsigned int i = 0; i < depth; i++)
-            strncat(rsp, "  ", REMLEN(rsp));
-        snprintf(line, sizeof(line), "%s %c", d->name, (d->layout == LAYOUT_TILED ? 'T' : 'M'));
-        strncat(rsp, line, REMLEN(rsp));
-        if (d == m->desk)
-            strncat(rsp, " @\n", REMLEN(rsp));
-        else if (d == m->last_desk)
-            strncat(rsp, " ~\n", REMLEN(rsp));
-        else
-            strncat(rsp, "\n", REMLEN(rsp));
-        if (opt == LIST_OPTION_VERBOSE)
-            list(d, d->root, rsp, depth + 1);
-    }
-}
-
-void list(desktop_t *d, node_t *n, char *rsp, unsigned int depth)
-{
-    if (n == NULL)
-        return;
-
-    char line[MAXLEN];
-
-    for (unsigned int i = 0; i < depth; i++)
-        strncat(rsp, "  ", REMLEN(rsp));
-
-    if (is_leaf(n)) {
-        client_t *c = n->client;
-        snprintf(line, sizeof(line), "%c %s %X %u %u %ux%u%+i%+i %c%c%c%c%c", (c->born_as == MODE_AUTOMATIC ? 'a' : 'm'), c->class_name, c->window, c->uid, c->border_width, c->floating_rectangle.width, c->floating_rectangle.height, c->floating_rectangle.x, c->floating_rectangle.y, (c->floating ? 'f' : '-'), (c->transient ? 't' : '-'), (c->fullscreen ? 'F' : '-'), (c->urgent ? 'u' : '-'), (c->locked ? 'l' : '-'));
-    } else {
-        snprintf(line, sizeof(line), "%c %.2f", (n->split_type == TYPE_HORIZONTAL ? 'H' : 'V'), n->split_ratio);
-    }
-
-    strncat(rsp, line, REMLEN(rsp));
-
-    if (n == d->focus)
-        strncat(rsp, " *\n", REMLEN(rsp));
-    else
-        strncat(rsp, "\n", REMLEN(rsp));
-
-    list(d, n->first_child, rsp, depth + 1);
-    list(d, n->second_child, rsp, depth + 1);
-}
-
-void restore(char *file_path)
-{
-    if (file_path == NULL)
-        return;
-
-    FILE *snapshot = fopen(file_path, "r");
-    if (snapshot == NULL) {
-        warn("restore: can't open file\n");
-        return;
-    }
-
-    char line[MAXLEN];
-    monitor_t *m = NULL;
-    desktop_t *d = NULL;
-    node_t *n = NULL;
-    num_clients = 0;
-    unsigned int level, last_level = 0, max_uid = 0;
-    bool aborted = false;
-
-    while (!aborted && fgets(line, sizeof(line), snapshot) != NULL) {
-        unsigned int len = strlen(line);
-        level = 0;
-        while (level < strlen(line) && isspace(line[level]))
-            level++;
-        if (level == 0) {
-            if (m == NULL)
-                m = mon_head;
-            else
-                m = m->next;
-            if (len >= 2)
-                switch (line[len - 2]) {
-                    case '#':
-                        mon = m;
-                        break;
-                    case '~':
-                        last_mon = m;
-                        break;
-                }
-        } else if (level == 2) {
-            if (d == NULL)
-                d = m->desk_head;
-            else
-                d = d->next;
-            int i = len - 1;
-            while (i > 0 && !isupper(line[i]))
-                i--;
-            if (line[i] == 'M')
-                d->layout = LAYOUT_MONOCLE;
-            else if (line[i] == 'T')
-                d->layout = LAYOUT_TILED;
-            if (len >= 2)
-                switch (line[len - 2]) {
-                    case '@':
-                        m->desk = d;
-                        break;
-                    case '~':
-                        m->last_desk = d;
-                        break;
-                }
-        } else {
-            node_t *birth = make_node();
-            if (level == 4) {
-                empty_desktop(d);
-                d->root = birth;
-            } else {
-                if (level > last_level) {
-                    n->first_child = birth;
-                } else {
-                    do {
-                        n = n->parent;
-                    } while (n != NULL && n->second_child != NULL);
-                    if (n == NULL) {
-                        warn("restore: file is malformed\n");
-                        aborted = true;
-                    }
-                    n->second_child = birth;
-                }
-                birth->parent = n;
-            }
-            n = birth;
-
-            if (isupper(line[level])) {
-                char st;
-                sscanf(line + level, "%c %lf", &st, &n->split_ratio);
-                if (st == 'H')
-                    n->split_type = TYPE_HORIZONTAL;
-                else if (st == 'V')
-                    n->split_type = TYPE_VERTICAL;
-            } else {
-                client_t *c = make_client(XCB_NONE);
-                num_clients++;
-                char ba, floating, transient, fullscreen, urgent, locked;
-                sscanf(line + level, "%c %s %X %u %u %hux%hu%hi%hi %c%c%c%c%c", &ba, c->class_name, &c->window, &c->uid, &c->border_width, &c->floating_rectangle.width, &c->floating_rectangle.height, &c->floating_rectangle.x, &c->floating_rectangle.y, &floating, &transient, &fullscreen, &urgent, &locked);
-                if (ba == 'a')
-                    c->born_as = MODE_AUTOMATIC;
-                else if (ba == 'm')
-                    c->born_as = MODE_MANUAL;
-                c->floating = (floating == '-' ? false : true);
-                c->transient = (transient == '-' ? false : true);
-                c->fullscreen = (fullscreen == '-' ? false : true);
-                c->urgent = (urgent == '-' ? false : true);
-                c->locked = (locked == '-' ? false : true);
-                if (c->uid > max_uid)
-                    max_uid = c->uid;
-                n->client = c;
-                if (len >= 2 && line[len - 2] == '*')
-                    d->focus = n;
-            }
-        }
-        last_level = level;
-    }
-
-    fclose(snapshot);
-
-    if (!aborted) {
-        client_uid = max_uid + 1;
-        for (monitor_t *m = mon_head; m != NULL; m = m->next)
-            for (desktop_t *d = m->desk_head; d != NULL; d = d->next)
-                for (node_t *n = first_extrema(d->root); n != NULL; n = next_leaf(n)) {
-                    uint32_t values[] = {(focus_follows_pointer ? CLIENT_EVENT_MASK_FFP : CLIENT_EVENT_MASK)};
-                    xcb_change_window_attributes(dpy, n->client->window, XCB_CW_EVENT_MASK, values);
-                    if (n->client->floating) {
-                        n->vacant = true;
-                        update_vacant_state(n->parent);
-                    }
-                }
-        ewmh_update_current_desktop();
-    }
+    int v = (value ? 1 : -1);
+    for (node_t *p = n; p != NULL; p = p->parent)
+        p->privacy_level += v;
 }