X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=messages.c;h=2675a3cd1186e15ccac543b704f6af099b1ce5a2;hb=d5d8805ad21cac67044b68b2747003e60e5695f6;hp=feff8f66a9988026a77988ddeac5bb5e7ebcab2c;hpb=6b2d8152ca1271159e60506e79d951869a7724b8;p=bspwm.git

diff --git a/messages.c b/messages.c
index feff8f6..2675a3c 100644
--- a/messages.c
+++ b/messages.c
@@ -9,6 +9,7 @@
 #include "ewmh.h"
 #include "helpers.h"
 #include "window.h"
+#include "events.h"
 #include "tree.h"
 #include "rules.h"
 
@@ -22,94 +23,113 @@ void process_message(char *msg, char *rsp)
     if (strcmp(cmd, "get") == 0) {
         char *name = strtok(NULL, TOK_SEP);
         get_setting(name, rsp);
-        return;
     } else if (strcmp(cmd, "set") == 0) {
         char *name = strtok(NULL, TOK_SEP);
         char *value = strtok(NULL, TOK_SEP);
         set_setting(name, value, rsp);
-        return;
     } else if (strcmp(cmd, "list") == 0) {
         char *name = strtok(NULL, TOK_SEP);
         if (name != NULL) {
             desktop_location_t loc;
             if (locate_desktop(name, &loc))
-                dump_tree(loc.desktop, loc.desktop->root, rsp, 0);
+                list(loc.desktop, loc.desktop->root, rsp, 0);
         } else {
-            dump_tree(mon->desk, mon->desk->root, rsp, 0);
+            list(mon->desk, mon->desk->root, rsp, 0);
         }
-        return;
     } else if (strcmp(cmd, "list_monitors") == 0) {
         char *arg = strtok(NULL, TOK_SEP);
         list_option_t opt;
         if (parse_list_option(arg, &opt))
             list_monitors(opt, rsp);
-        return;
     } else if (strcmp(cmd, "list_desktops") == 0) {
         char *arg = strtok(NULL, TOK_SEP);
         list_option_t opt;
         if (parse_list_option(arg, &opt))
             list_desktops(mon, opt, 0, rsp);
-        return;
     } else if (strcmp(cmd, "list_windows") == 0) {
         list_windows(rsp);
-        return;
+    } else if (strcmp(cmd, "list_history") == 0) {
+        list_history(rsp);
     } else if (strcmp(cmd, "list_rules") == 0) {
         list_rules(rsp);
-        return;
     } else if (strcmp(cmd, "close") == 0) {
         window_close(mon->desk->focus);
-        return;
     } else if (strcmp(cmd, "kill") == 0) {
         window_kill(mon->desk, mon->desk->focus);
     } else if (strcmp(cmd, "rotate") == 0) {
         char *deg = strtok(NULL, TOK_SEP);
         if (deg != NULL) {
             rotate_t r;
-            if (parse_rotate(deg, &r)) {
+            if (parse_rotate(deg, &r))
                 rotate_tree(mon->desk->root, r);
-            }
         }
+        arrange(mon, mon->desk);
+    } else if (strcmp(cmd, "flip") == 0) {
+        char *flp = strtok(NULL, TOK_SEP);
+        if (flp != NULL) {
+            flip_t f;
+            if (parse_flip(flp, &f))
+                flip_tree(mon->desk->root, f);
+        }
+        arrange(mon, mon->desk);
+    } else if (strcmp(cmd, "balance") == 0) {
+        balance_tree(mon->desk->root);
+        arrange(mon, mon->desk);
+    } else if (strcmp(cmd, "grab_pointer") == 0) {
+        char *pac = strtok(NULL, TOK_SEP);
+        if (pac != NULL) {
+            pointer_action_t a;
+            if (parse_pointer_action(pac, &a))
+                grab_pointer(a);
+        }
+    } else if (strcmp(cmd, "track_pointer") == 0) {
+        char *arg1 = strtok(NULL, TOK_SEP);
+        char *arg2 = strtok(NULL, TOK_SEP);
+        if (arg1 == NULL || arg2 == NULL)
+            return;
+        int root_x, root_y;
+        if (sscanf(arg1, "%i", &root_x) == 1 && sscanf(arg2, "%i", &root_y) == 1)
+            track_pointer(root_x, root_y);
+    } else if (strcmp(cmd, "ungrab_pointer") == 0) {
+        ungrab_pointer();
     } else if (strcmp(cmd, "layout") == 0) {
         char *lyt = strtok(NULL, TOK_SEP);
         if (lyt != NULL) {
-            layout_t y;
-            if (parse_layout(lyt, &y)) {
+            layout_t l;
+            if (parse_layout(lyt, &l)) {
                 char *name = strtok(NULL, TOK_SEP);
                 if (name == NULL) {
-                    mon->desk->layout = y;
+                    change_layout(mon, mon->desk, l);
                 } else {
                     desktop_location_t loc;
                     do {
                         if (locate_desktop(name, &loc))
-                            loc.desktop->layout = y;
+                            change_layout(loc.monitor, loc.desktop, l);
                     } while ((name = strtok(NULL, TOK_SEP)) != NULL);
                 }
             }
         }
-        put_status();
     } else if (strcmp(cmd, "cycle_layout") == 0) {
         if (mon->desk->layout == LAYOUT_MONOCLE)
-            mon->desk->layout = LAYOUT_TILED;
+            change_layout(mon, mon->desk, LAYOUT_TILED);
         else
-            mon->desk->layout = LAYOUT_MONOCLE;
-        put_status();
+            change_layout(mon, mon->desk, LAYOUT_MONOCLE);
     } else if (strcmp(cmd, "shift") == 0) {
         char *dir = strtok(NULL, TOK_SEP);
         if (dir != NULL) {
             direction_t d;
-            if (parse_direction(dir, &d)) {
-                swap_nodes(mon->desk->focus, find_neighbor(mon->desk->focus, d));
-            }
+            if (parse_direction(dir, &d))
+                swap_nodes(mon->desk->focus, focus_by_distance ? nearest_neighbor(mon->desk, mon->desk->focus, d) : find_neighbor(mon->desk->focus, d));
         }
+        arrange(mon, mon->desk);
     } else if (strcmp(cmd, "toggle_fullscreen") == 0) {
-        if (mon->desk->focus != NULL)
-            toggle_fullscreen(mon, mon->desk->focus->client);
+        toggle_fullscreen(mon->desk, mon->desk->focus);
+        arrange(mon, mon->desk);
     } else if (strcmp(cmd, "toggle_floating") == 0) {
-        split_mode = MODE_AUTOMATIC;
-        toggle_floating(mon->desk->focus);
+        toggle_floating(mon->desk, mon->desk->focus);
+        arrange(mon, mon->desk);
     } else if (strcmp(cmd, "toggle_locked") == 0) {
-        if (mon->desk->focus != NULL)
-            toggle_locked(mon->desk->focus->client);
+        toggle_locked(mon, mon->desk, mon->desk->focus);
     } else if (strcmp(cmd, "toggle_visibility") == 0) {
         toggle_visibility();
     } else if (strcmp(cmd, "pad") == 0) {
@@ -130,15 +150,14 @@ void process_message(char *msg, char *rsp)
                 }
             }
         }
-        return;
     } else if (strcmp(cmd, "ratio") == 0) {
-        char *value = strtok(NULL, TOK_SEP);
-        if (value != NULL && mon->desk->focus != NULL)
-            sscanf(value, "%lf", &mon->desk->focus->split_ratio);
+        char *value;
+        if (mon->desk->focus != NULL && (value = strtok(NULL, TOK_SEP)) != NULL &&
+                sscanf(value, "%lf", &mon->desk->focus->split_ratio) == 1)
+            window_draw_border(mon->desk->focus, true, true);
     } else if (strcmp(cmd, "cancel") == 0) {
         split_mode = MODE_AUTOMATIC;
         window_draw_border(mon->desk->focus, true, true);
-        return;
     } else if (strcmp(cmd, "presel") == 0) {
         if (mon->desk->focus == NULL || !is_tiled(mon->desk->focus->client) || mon->desk->layout != LAYOUT_TILED)
             return;
@@ -154,7 +173,6 @@ void process_message(char *msg, char *rsp)
                 window_draw_border(mon->desk->focus, true, true);
             }
         }
-        return;
     } else if (strcmp(cmd, "push") == 0 || strcmp(cmd, "pull") == 0) {
         char *dir = strtok(NULL, TOK_SEP);
         if (dir != NULL) {
@@ -162,6 +180,35 @@ void process_message(char *msg, char *rsp)
             direction_t d;
             if (parse_fence_move(cmd, &m) && parse_direction(dir, &d)) {
                 move_fence(mon->desk->focus, d, m);
+                arrange(mon, mon->desk);
+            }
+        }
+    } else if (strcmp(cmd, "fence_ratio") == 0) {
+        char *dir = strtok(NULL, TOK_SEP);
+        if (dir != NULL) {
+            direction_t d;
+            node_t *n;
+            if (parse_direction(dir, &d) && (n = find_fence(mon->desk->focus, d)) != NULL) {
+                char *value = strtok(NULL, TOK_SEP);
+                if (sscanf(value, "%lf", &n->split_ratio) == 1)
+                    arrange(mon, mon->desk);
+            }
+        }
+    } else if (strcmp(cmd, "drop_to_monitor") == 0) {
+        char *dir = strtok(NULL, TOK_SEP);
+        if (dir != NULL) {
+            cycle_dir_t d;
+            if (parse_cycle_direction(dir, &d)) {
+                monitor_t *m;
+                if (d == CYCLE_NEXT)
+                    m = ((mon->next == NULL ? mon_head : mon->next));
+                else
+                    m = ((mon->prev == NULL ? mon_tail : mon->prev));
+                transfer_node(mon, mon->desk, m, m->desk, mon->desk->focus);
+                char *opt = strtok(NULL, TOK_SEP);
+                send_option_t o;
+                if (parse_send_option(opt, &o) && o == SEND_OPTION_FOLLOW)
+                    focus_node(m, m->desk, m->desk->focus);
             }
         }
     } else if (strcmp(cmd, "send_to_monitor") == 0) {
@@ -170,11 +217,27 @@ void process_message(char *msg, char *rsp)
             monitor_t *m = find_monitor(name);
             if (m != NULL && m != mon) {
                 transfer_node(mon, mon->desk, m, m->desk, mon->desk->focus);
-                arrange(m, m->desk);
-                char *arg = strtok(NULL, TOK_SEP);
-                send_option_t opt;
-                if (parse_send_option(arg, &opt) && opt == SEND_OPTION_FOLLOW)
-                    select_monitor(m);
+                char *opt = strtok(NULL, TOK_SEP);
+                send_option_t o;
+                if (parse_send_option(opt, &o) && o == SEND_OPTION_FOLLOW)
+                    focus_node(m, m->desk, m->desk->focus);
+            }
+        }
+    } else if (strcmp(cmd, "drop_to") == 0) {
+        char *dir = strtok(NULL, TOK_SEP);
+        if (dir != NULL) {
+            cycle_dir_t c;
+            if (parse_cycle_direction(dir, &c)) {
+                desktop_t *d;
+                if (c == CYCLE_NEXT)
+                    d = ((mon->desk->next == NULL ? mon->desk_head : mon->desk->next));
+                else
+                    d = ((mon->desk->prev == NULL ? mon->desk_tail : mon->desk->prev));
+                transfer_node(mon, mon->desk, mon, d, mon->desk->focus);
+                char *opt = strtok(NULL, TOK_SEP);
+                send_option_t o;
+                if (parse_send_option(opt, &o) && o == SEND_OPTION_FOLLOW)
+                    focus_node(mon, d, d->focus);
             }
         }
     } else if (strcmp(cmd, "send_to") == 0) {
@@ -183,14 +246,10 @@ void process_message(char *msg, char *rsp)
             desktop_location_t loc;
             if (locate_desktop(name, &loc)) {
                 transfer_node(mon, mon->desk, loc.monitor, loc.desktop, mon->desk->focus);
-                if (mon != loc.monitor && loc.monitor->desk == loc.desktop)
-                    arrange(loc.monitor, loc.desktop);
-                char *arg = strtok(NULL, TOK_SEP);
-                send_option_t opt;
-                if (parse_send_option(arg, &opt) && opt == SEND_OPTION_FOLLOW) {
-                    select_monitor(loc.monitor);
-                    select_desktop(loc.desktop);
-                }
+                char *opt = strtok(NULL, TOK_SEP);
+                send_option_t o;
+                if (parse_send_option(opt, &o) && o == SEND_OPTION_FOLLOW)
+                    focus_node(loc.monitor, loc.desktop, loc.desktop->focus);
             }
         }
     } else if (strcmp(cmd, "rename_monitor") == 0) {
@@ -222,16 +281,21 @@ void process_message(char *msg, char *rsp)
         char *name = strtok(NULL, TOK_SEP);
         if (name != NULL) {
             monitor_t *m = find_monitor(name);
-            if (m != NULL)
-                select_monitor(m);
+            if (m != NULL) {
+                if (auto_alternate && m == mon && last_mon != NULL)
+                    m = last_mon;
+                focus_node(m, m->desk, m->desk->focus);
+            }
         }
     } else if (strcmp(cmd, "use") == 0) {
         char *name = strtok(NULL, TOK_SEP);
         if (name != NULL) {
             desktop_location_t loc;
             if (locate_desktop(name, &loc)) {
-                select_monitor(loc.monitor);
-                select_desktop(loc.desktop);
+                if (auto_alternate && loc.desktop == mon->desk && mon->last_desk != NULL)
+                    focus_node(mon, mon->last_desk, mon->last_desk->focus);
+                else
+                    focus_node(loc.monitor, loc.desktop, loc.desktop->focus);
             }
         }
     } else if (strcmp(cmd, "cycle_monitor") == 0) {
@@ -265,7 +329,6 @@ void process_message(char *msg, char *rsp)
                     cycle_leaf(mon, mon->desk, mon->desk->focus, d, k);
             }
         }
-        return;
     } else if (strcmp(cmd, "nearest") == 0) {
         if (mon->desk->focus != NULL && mon->desk->focus->client->fullscreen)
             return;
@@ -279,7 +342,10 @@ void process_message(char *msg, char *rsp)
                     nearest_leaf(mon, mon->desk, mon->desk->focus, a, k);
             }
         }
-        return;
+    } else if (strcmp(cmd, "biggest") == 0) {
+        node_t *n = find_biggest(mon->desk);
+        if (n != NULL)
+            snprintf(rsp, BUFSIZ, "0x%X", n->client->window);
     } else if (strcmp(cmd, "circulate") == 0) {
         if (mon->desk->layout == LAYOUT_MONOCLE
                 || (mon->desk->focus != NULL && !is_tiled(mon->desk->focus->client)))
@@ -290,6 +356,7 @@ void process_message(char *msg, char *rsp)
             if (parse_circulate_direction(dir, &d))
                 circulate_leaves(mon, mon->desk, d);
         }
+        arrange(mon, mon->desk);
     } else if (strcmp(cmd, "rule") == 0) {
         char *name = strtok(NULL, TOK_SEP);
         if (name != NULL) {
@@ -299,6 +366,8 @@ void process_message(char *msg, char *rsp)
             while (arg != NULL) {
                 if (strcmp(arg, "floating") == 0) {
                     rule->effect.floating = true;
+                } else if (strcmp(arg, "follow") == 0) {
+                    rule->effect.follow = true;
                 } else {
                     desktop_location_t loc;
                     if (locate_desktop(arg, &loc)) {
@@ -310,58 +379,110 @@ void process_message(char *msg, char *rsp)
             }
             add_rule(rule);
         }
-        return;
+    } else if (strcmp(cmd, "remove_rule") == 0) {
+        char *arg;
+        unsigned int uid;
+        while ((arg = strtok(NULL, TOK_SEP)) != NULL)
+            if (sscanf(arg, "%X", &uid) > 0)
+                remove_rule_by_uid(uid);
+    } else if (strcmp(cmd, "swap") == 0) {
+        char *opt = strtok(NULL, TOK_SEP);
+        swap_option_t o;
+        if (!parse_swap_option(opt, &o))
+            return;
+        node_t *last_focus = history_get(mon->desk->history, 1);
+        swap_nodes(mon->desk->focus, last_focus);
+        arrange(mon, mon->desk);
+        if (o == SWAP_OPTION_SWAP_FOCUS)
+            focus_node(mon, mon->desk, last_focus);
     } else if (strcmp(cmd, "alternate") == 0) {
-        focus_node(mon, mon->desk, mon->desk->last_focus, true);
-        return;
+        focus_node(mon, mon->desk, history_get(mon->desk->history, 1));
     } else if (strcmp(cmd, "alternate_desktop") == 0) {
-        select_desktop(mon->last_desk);
+        if (mon->last_desk != NULL)
+            focus_node(mon, mon->last_desk, mon->last_desk->focus);
     } else if (strcmp(cmd, "alternate_monitor") == 0) {
-        select_monitor(last_mon);
+        if (last_mon != NULL)
+            focus_node(last_mon, last_mon->desk, last_mon->desk->focus);
     } else if (strcmp(cmd, "add_in") == 0) {
         char *name = strtok(NULL, TOK_SEP);
         if (name != NULL) {
             monitor_t *m = find_monitor(name);
             if (m != NULL)
                 for (name = strtok(NULL, TOK_SEP); name != NULL; name = strtok(NULL, TOK_SEP))
-                    add_desktop(m, name);
+                    add_desktop(m, make_desktop(name));
         }
-        return;
     } else if (strcmp(cmd, "add") == 0) {
         for (char *name = strtok(NULL, TOK_SEP); name != NULL; name = strtok(NULL, TOK_SEP))
-            add_desktop(mon, name);
-        return;
+            add_desktop(mon, make_desktop(name));
+    } else if (strcmp(cmd, "remove_desktop") == 0) {
+        for (char *name = strtok(NULL, TOK_SEP); name != NULL; name = strtok(NULL, TOK_SEP)) {
+            desktop_location_t loc;
+            if (locate_desktop(name, &loc)) {
+                if (loc.desktop->root == NULL && loc.monitor->desk_head != loc.monitor->desk_tail) {
+                    remove_desktop(loc.monitor, loc.desktop);
+                    desktop_show(loc.monitor->desk);
+                }
+            }
+        }
+        update_current();
+    } else if (strcmp(cmd, "send_desktop_to") == 0) {
+        if (mon->desk_head == mon->desk_tail)
+            return;
+        char *name = strtok(NULL, TOK_SEP);
+        if (name != NULL) {
+            monitor_t *m = find_monitor(name);
+            if (m != NULL && m != mon) {
+                char *opt = strtok(NULL, TOK_SEP);
+                send_option_t o;
+                if (!parse_send_option(opt, &o))
+                    return;
+                desktop_t *d = mon->desk;
+                transfer_desktop(mon, m, d);
+                if (o == SEND_OPTION_FOLLOW)
+                    focus_node(m, d, d->focus);
+                else if (o == SEND_OPTION_DONT_FOLLOW)
+                    update_current();
+            }
+        }
     } else if (strcmp(cmd, "focus") == 0) {
-        if (mon->desk->focus != NULL && mon->desk->focus->client->fullscreen)
+        node_t *f = mon->desk->focus;
+        if (f == NULL || f->client->fullscreen)
             return;
         char *dir = strtok(NULL, TOK_SEP);
         if (dir != NULL) {
             direction_t d;
             if (parse_direction(dir, &d)) {
-                node_t *n = find_neighbor(mon->desk->focus, d);
-                focus_node(mon, mon->desk, n, true);
+                node_t *n = NULL;
+                if (history_aware_focus)
+                    n = nearest_from_history(mon->desk->history, f, d);
+                if (n == NULL) {
+                    if (focus_by_distance) {
+                        n = nearest_neighbor(mon->desk, f, d);
+                    } else {
+                        n = find_neighbor(f, d);
+                    }
+                }
+                focus_node(mon, mon->desk, n);
             }
         }
-        if (mon->desk->layout == LAYOUT_TILED)
-            return;
+    } else if (strcmp(cmd, "put_status") == 0) {
+        put_status();
     } else if (strcmp(cmd, "adopt_orphans") == 0) {
         adopt_orphans();
-    } else if (strcmp(cmd, "reload_autostart") == 0) {
-        run_autostart();
-    } else if (strcmp(cmd, "reload_settings") == 0) {
-        load_settings();
+    } else if (strcmp(cmd, "restore_layout") == 0) {
+        char *arg = strtok(NULL, TOK_SEP);
+        restore_layout(arg);
+    } else if (strcmp(cmd, "restore_history") == 0) {
+        char *arg = strtok(NULL, TOK_SEP);
+        restore_history(arg);
     } else if (strcmp(cmd, "quit") == 0) {
         char *arg = strtok(NULL, TOK_SEP);
         if (arg != NULL)
             sscanf(arg, "%i", &exit_status);
         quit();
-        return;
     } else {
         snprintf(rsp, BUFSIZ, "unknown command: %s", cmd);
-        return;
     }
-
-    arrange(mon, mon->desk);
 }
 
 void set_setting(char *name, char *value, char *rsp)
@@ -369,17 +490,12 @@ void set_setting(char *name, char *value, char *rsp)
     if (name == NULL || value == NULL)
         return;
 
-    if (strcmp(name, "inner_border_width") == 0) {
-        sscanf(value, "%u", &inner_border_width);
-        border_width = inner_border_width + main_border_width + outer_border_width;
-    } else if (strcmp(name, "main_border_width") == 0) {
-        sscanf(value, "%u", &main_border_width);
-        border_width = inner_border_width + main_border_width + outer_border_width;
-    } else if (strcmp(name, "outer_border_width") == 0) {
-        sscanf(value, "%u", &outer_border_width);
-        border_width = inner_border_width + main_border_width + outer_border_width;
+    if (strcmp(name, "border_width") == 0) {
+        sscanf(value, "%u", &border_width);
     } else if (strcmp(name, "window_gap") == 0) {
         sscanf(value, "%i", &window_gap);
+    } else if (strcmp(name, "split_ratio") == 0) {
+        sscanf(value, "%lf", &split_ratio);
     } else if (strcmp(name, "left_padding") == 0) {
         sscanf(value, "%i", &mon->left_padding);
     } else if (strcmp(name, "right_padding") == 0) {
@@ -397,12 +513,6 @@ void set_setting(char *name, char *value, char *rsp)
     } else if (strcmp(name, "normal_border_color") == 0) {
         strncpy(normal_border_color, value, sizeof(normal_border_color));
         normal_border_color_pxl = get_color(normal_border_color);
-    } else if (strcmp(name, "inner_border_color") == 0) {
-        strncpy(inner_border_color, value, sizeof(inner_border_color));
-        inner_border_color_pxl = get_color(inner_border_color);
-    } else if (strcmp(name, "outer_border_color") == 0) {
-        strncpy(outer_border_color, value, sizeof(outer_border_color));
-        outer_border_color_pxl = get_color(outer_border_color);
     } else if (strcmp(name, "presel_border_color") == 0) {
         strncpy(presel_border_color, value, sizeof(presel_border_color));
         presel_border_color_pxl = get_color(presel_border_color);
@@ -426,48 +536,63 @@ void set_setting(char *name, char *value, char *rsp)
         bool b;
         if (parse_bool(value, &b))
             gapless_monocle = b;
-    } else if (strcmp(name, "focus_follows_mouse") == 0) {
+    } else if (strcmp(name, "focus_follows_pointer") == 0) {
+        bool b;
+        if (parse_bool(value, &b) && b != focus_follows_pointer) {
+            uint32_t values[] = {(focus_follows_pointer ? CLIENT_EVENT_MASK : CLIENT_EVENT_MASK_FFP)};
+            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, d->root))
+                        xcb_change_window_attributes(dpy, n->client->window, XCB_CW_EVENT_MASK, values);
+            if (focus_follows_pointer)
+                disable_motion_recorder();
+            else
+                enable_motion_recorder();
+            focus_follows_pointer = b;
+        }
+        return;
+    } else if (strcmp(name, "pointer_follows_monitor") == 0) {
         bool b;
         if (parse_bool(value, &b))
-            focus_follows_mouse = b;
+            pointer_follows_monitor = b;
+        return;
     } else if (strcmp(name, "adaptative_raise") == 0) {
         bool b;
         if (parse_bool(value, &b))
             adaptative_raise = b;
-    } else if (strcmp(name, "wm_name") == 0) {
-        strncpy(wm_name, value, sizeof(wm_name));
-        ewmh_update_wm_name();
         return;
-    } else if (strcmp(name, "button_modifier") == 0) {
-        unsigned int m;
-        if (parse_modifier_mask(value, &m)) {
-            ungrab_buttons();
-            button_modifier = m;
-            grab_buttons();
-        }
+    } else if (strcmp(name, "apply_shadow_property") == 0) {
+        bool b;
+        if (parse_bool(value, &b))
+            apply_shadow_property = b;
         return;
-    } else if (strcmp(name, "numlock_modifier") == 0) {
-        unsigned int m;
-        if (parse_modifier_mask(value, &m)) {
-            ungrab_buttons();
-            numlock_modifier = m;
-            grab_buttons();
-        }
+    } else if (strcmp(name, "auto_alternate") == 0) {
+        bool b;
+        if (parse_bool(value, &b))
+            auto_alternate = b;
         return;
-    } else if (strcmp(name, "capslock_modifier") == 0) {
-        unsigned int m;
-        if (parse_modifier_mask(value, &m)) {
-            ungrab_buttons();
-            capslock_modifier = m;
-            grab_buttons();
-        }
+    } else if (strcmp(name, "focus_by_distance") == 0) {
+        bool b;
+        if (parse_bool(value, &b))
+            focus_by_distance = b;
+        return;
+    } else if (strcmp(name, "history_aware_focus") == 0) {
+        bool b;
+        if (parse_bool(value, &b))
+            history_aware_focus = b;
+        return;
+    } else if (strcmp(name, "wm_name") == 0) {
+        strncpy(wm_name, value, sizeof(wm_name));
+        ewmh_update_wm_name();
         return;
     } else {
         snprintf(rsp, BUFSIZ, "unknown setting: %s", name);
         return;
     }
 
-    arrange(mon, mon->desk);
+    for (monitor_t *m = mon_head; m != NULL; m = m->next)
+        for (desktop_t *d = m->desk_head; d != NULL; d = d->next)
+            arrange(m, d);
 }
 
 void get_setting(char *name, char* rsp)
@@ -475,16 +600,12 @@ void get_setting(char *name, char* rsp)
     if (name == NULL)
         return;
 
-    if (strcmp(name, "inner_border_width") == 0)
-        snprintf(rsp, BUFSIZ, "%u", inner_border_width);
-    else if (strcmp(name, "main_border_width") == 0)
-        snprintf(rsp, BUFSIZ, "%u", main_border_width);
-    else if (strcmp(name, "outer_border_width") == 0)
-        snprintf(rsp, BUFSIZ, "%u", outer_border_width);
-    else if (strcmp(name, "border_width") == 0)
+    if (strcmp(name, "border_width") == 0)
         snprintf(rsp, BUFSIZ, "%u", border_width);
     else if (strcmp(name, "window_gap") == 0)
         snprintf(rsp, BUFSIZ, "%i", window_gap);
+    else if (strcmp(name, "split_ratio") == 0)
+        snprintf(rsp, BUFSIZ, "%lf", split_ratio);
     else if (strcmp(name, "left_padding") == 0)
         snprintf(rsp, BUFSIZ, "%i", mon->left_padding);
     else if (strcmp(name, "right_padding") == 0)
@@ -499,10 +620,6 @@ void get_setting(char *name, char* rsp)
         snprintf(rsp, BUFSIZ, "%s (%06X)", active_border_color, active_border_color_pxl);
     else if (strcmp(name, "normal_border_color") == 0)
         snprintf(rsp, BUFSIZ, "%s (%06X)", normal_border_color, normal_border_color_pxl);
-    else if (strcmp(name, "inner_border_color") == 0)
-        snprintf(rsp, BUFSIZ, "%s (%06X)", inner_border_color, inner_border_color_pxl);
-    else if (strcmp(name, "outer_border_color") == 0)
-        snprintf(rsp, BUFSIZ, "%s (%06X)", outer_border_color, outer_border_color_pxl);
     else if (strcmp(name, "presel_border_color") == 0)
         snprintf(rsp, BUFSIZ, "%s (%06X)", presel_border_color, presel_border_color_pxl);
     else if (strcmp(name, "focused_locked_border_color") == 0)
@@ -517,18 +634,22 @@ void get_setting(char *name, char* rsp)
         snprintf(rsp, BUFSIZ, "%s", BOOLSTR(borderless_monocle));
     else if (strcmp(name, "gapless_monocle") == 0)
         snprintf(rsp, BUFSIZ, "%s", BOOLSTR(gapless_monocle));
-    else if (strcmp(name, "focus_follows_mouse") == 0)
-        snprintf(rsp, BUFSIZ, "%s", BOOLSTR(focus_follows_mouse));
+    else if (strcmp(name, "focus_follows_pointer") == 0)
+        snprintf(rsp, BUFSIZ, "%s", BOOLSTR(focus_follows_pointer));
+    else if (strcmp(name, "pointer_follows_monitor") == 0)
+        snprintf(rsp, BUFSIZ, "%s", BOOLSTR(pointer_follows_monitor));
     else if (strcmp(name, "adaptative_raise") == 0)
         snprintf(rsp, BUFSIZ, "%s", BOOLSTR(adaptative_raise));
+    else if (strcmp(name, "apply_shadow_property") == 0)
+        snprintf(rsp, BUFSIZ, "%s", BOOLSTR(apply_shadow_property));
+    else if (strcmp(name, "auto_alternate") == 0)
+        snprintf(rsp, BUFSIZ, "%s", BOOLSTR(auto_alternate));
+    else if (strcmp(name, "focus_by_distance") == 0)
+        snprintf(rsp, BUFSIZ, "%s", BOOLSTR(focus_by_distance));
+    else if (strcmp(name, "history_aware_focus") == 0)
+        snprintf(rsp, BUFSIZ, "%s", BOOLSTR(history_aware_focus));
     else if (strcmp(name, "wm_name") == 0)
         snprintf(rsp, BUFSIZ, "%s", wm_name);
-    else if (strcmp(name, "button_modifier") == 0)
-        print_modifier_mask(rsp, button_modifier);
-    else if (strcmp(name, "numlock_modifier") == 0)
-        print_modifier_mask(rsp, numlock_modifier);
-    else if (strcmp(name, "capslock_modifier") == 0)
-        print_modifier_mask(rsp, capslock_modifier);
     else
         snprintf(rsp, BUFSIZ, "unknown setting: %s", name);
 }
@@ -649,7 +770,7 @@ bool parse_skip_desktop(char *s, skip_desktop_t *k)
 
 bool parse_list_option(char *s, list_option_t *o)
 {
-    if (s == NULL || strcmp(s, "--verbose") == 0) {
+    if (s == NULL) {
         *o = LIST_OPTION_VERBOSE;
         return true;
     } else if (strcmp(s, "--quiet") == 0) {
@@ -671,6 +792,18 @@ bool parse_send_option(char *s, send_option_t *o)
     return false;
 }
 
+bool parse_swap_option(char *s, swap_option_t *o)
+{
+    if (s == NULL) {
+        *o = SWAP_OPTION_SWAP_FOCUS;
+        return true;
+    } else if (strcmp(s, "--keep-focus") == 0) {
+        *o = SWAP_OPTION_KEEP_FOCUS;
+        return true;
+    }
+    return false;
+}
+
 bool parse_rotate(char *s, rotate_t *r)
 {
     if (strcmp(s, "clockwise") == 0) {
@@ -686,6 +819,18 @@ bool parse_rotate(char *s, rotate_t *r)
     return false;
 }
 
+bool parse_flip(char *s, flip_t *f)
+{
+    if (strcmp(s, "horizontal") == 0) {
+        *f = FLIP_HORIZONTAL;
+        return true;
+    } else if (strcmp(s, "vertical") == 0) {
+        *f = FLIP_VERTICAL;
+        return true;
+    }
+    return false;
+}
+
 bool parse_fence_move(char *s, fence_move_t *m)
 {
     if (strcmp(s, "push") == 0) {
@@ -698,62 +843,20 @@ bool parse_fence_move(char *s, fence_move_t *m)
     return false;
 }
 
-bool parse_modifier_mask(char *s, unsigned int *m)
+bool parse_pointer_action(char *s, pointer_action_t *a)
 {
-    if (strcmp(s, "shift") == 0) {
-        *m = XCB_MOD_MASK_SHIFT;
-        return true;
-    } else if (strcmp(s, "control") == 0) {
-        *m = XCB_MOD_MASK_CONTROL;
+    if (strcmp(s, "move") == 0) {
+        *a = ACTION_MOVE;
         return true;
-    } else if (strcmp(s, "lock") == 0) {
-        *m = XCB_MOD_MASK_LOCK;
+    } else if (strcmp(s, "resize_corner") == 0) {
+        *a = ACTION_RESIZE_CORNER;
         return true;
-    } else if (strcmp(s, "mod1") == 0) {
-        *m = XCB_MOD_MASK_1;
+    } else if (strcmp(s, "resize_side") == 0) {
+        *a = ACTION_RESIZE_SIDE;
         return true;
-    } else if (strcmp(s, "mod2") == 0) {
-        *m = XCB_MOD_MASK_2;
-        return true;
-    } else if (strcmp(s, "mod3") == 0) {
-        *m = XCB_MOD_MASK_3;
-        return true;
-    } else if (strcmp(s, "mod4") == 0) {
-        *m = XCB_MOD_MASK_4;
-        return true;
-    } else if (strcmp(s, "mod5") == 0) {
-        *m = XCB_MOD_MASK_5;
+    } else if (strcmp(s, "focus") == 0) {
+        *a = ACTION_FOCUS;
         return true;
     }
     return false;
 }
-
-void print_modifier_mask(char *s, unsigned int m)
-{
-    switch(m) {
-        case XCB_MOD_MASK_SHIFT:
-            snprintf(s, BUFSIZ, "shift");
-            break;
-        case XCB_MOD_MASK_CONTROL:
-            snprintf(s, BUFSIZ, "control");
-            break;
-        case XCB_MOD_MASK_LOCK:
-            snprintf(s, BUFSIZ, "lock");
-            break;
-        case XCB_MOD_MASK_1:
-            snprintf(s, BUFSIZ, "mod1");
-            break;
-        case XCB_MOD_MASK_2:
-            snprintf(s, BUFSIZ, "mod2");
-            break;
-        case XCB_MOD_MASK_3:
-            snprintf(s, BUFSIZ, "mod3");
-            break;
-        case XCB_MOD_MASK_4:
-            snprintf(s, BUFSIZ, "mod4");
-            break;
-        case XCB_MOD_MASK_5:
-            snprintf(s, BUFSIZ, "mod5");
-            break;
-    }
-}