X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=messages.c;h=c1442c8600f8c8998737ec08f9b6f53588908514;hb=2d860de977ba61c5e049ccf5d74eb51fd35fb093;hp=a9b99a557ed8a7957c5df7c78bccd8159d8269b0;hpb=23ecdad3d9beb0051a12e6c4fa18c2671356ca7e;p=bspwm.git

diff --git a/messages.c b/messages.c
index a9b99a5..c1442c8 100644
--- a/messages.c
+++ b/messages.c
@@ -7,208 +7,439 @@
 #include "types.h"
 #include "bspwm.h"
 #include "ewmh.h"
-#include "misc.h"
+#include "helpers.h"
 #include "window.h"
+#include "events.h"
 #include "tree.h"
+#include "rules.h"
 
 void process_message(char *msg, char *rsp)
 {
-    char *cmd = strtok(msg, TOKEN_SEP);
+    char *cmd = strtok(msg, TOK_SEP);
 
     if (cmd == NULL)
         return;
 
     if (strcmp(cmd, "get") == 0) {
-        char *name = strtok(NULL, TOKEN_SEP);
+        char *name = strtok(NULL, TOK_SEP);
         get_setting(name, rsp);
         return;
     } else if (strcmp(cmd, "set") == 0) {
-        char *name = strtok(NULL, TOKEN_SEP);
-        char *value = strtok(NULL, TOKEN_SEP);
+        char *name = strtok(NULL, TOK_SEP);
+        char *value = strtok(NULL, TOK_SEP);
         set_setting(name, value, rsp);
         return;
-    } else if (strcmp(cmd, "dump") == 0) {
-        dump_tree(desk, desk->root, rsp, 0);
-        return;
     } else if (strcmp(cmd, "list") == 0) {
-        list_desktops(rsp);
+        char *name = strtok(NULL, TOK_SEP);
+        if (name != NULL) {
+            desktop_location_t loc;
+            if (locate_desktop(name, &loc))
+                list(loc.desktop, loc.desktop->root, rsp, 0);
+        } else {
+            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, "windows") == 0) {
+    } 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_rules") == 0) {
+        list_rules(rsp);
+        return;
     } else if (strcmp(cmd, "close") == 0) {
-        window_close(desk->focus);
+        window_close(mon->desk->focus);
+        return;
     } else if (strcmp(cmd, "kill") == 0) {
-        window_kill(desk, desk->focus);
-    } else if (strcmp(cmd, "magnetise") == 0) {
-        char *cor = strtok(NULL, TOKEN_SEP);
-        if (cor != NULL) {
-            corner_t c;
-            if (parse_corner(cor, &c)) {
-                magnetise_tree(desk->root, c);
-            }
-        }
+        window_kill(mon->desk, mon->desk->focus);
     } else if (strcmp(cmd, "rotate") == 0) {
-        char *deg = strtok(NULL, TOKEN_SEP);
+        char *deg = strtok(NULL, TOK_SEP);
         if (deg != NULL) {
             rotate_t r;
-            if (parse_rotate(deg, &r)) {
-                rotate_tree(desk->root, r);
-            }
+            if (parse_rotate(deg, &r))
+                rotate_tree(mon->desk->root, r);
+        }
+    } 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);
+        }
+    } 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);
+        if (arg1 == NULL)
+            return;
+        char *arg2 = strtok(NULL, TOK_SEP);
+        if (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);
+        return;
+    } else if (strcmp(cmd, "ungrab_pointer") == 0) {
+        ungrab_pointer();
     } else if (strcmp(cmd, "layout") == 0) {
-        char *lyt = strtok(NULL, TOKEN_SEP);
+        char *lyt = strtok(NULL, TOK_SEP);
         if (lyt != NULL) {
-            layout_t l;
-            if (parse_layout(lyt, &l)) {
-                desk->layout = l;
+            layout_t y;
+            if (parse_layout(lyt, &y)) {
+                char *name = strtok(NULL, TOK_SEP);
+                if (name == NULL) {
+                    mon->desk->layout = y;
+                } else {
+                    desktop_location_t loc;
+                    do {
+                        if (locate_desktop(name, &loc))
+                            loc.desktop->layout = y;
+                    } 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;
+        else
+            mon->desk->layout = LAYOUT_MONOCLE;
+        put_status();
     } else if (strcmp(cmd, "shift") == 0) {
-        char *dir = strtok(NULL, TOKEN_SEP);
+        char *dir = strtok(NULL, TOK_SEP);
         if (dir != NULL) {
             direction_t d;
             if (parse_direction(dir, &d)) {
-                swap_nodes(desk->focus, find_neighbor(desk->focus, d));
+                swap_nodes(mon->desk->focus, find_neighbor(mon->desk->focus, d));
             }
         }
     } else if (strcmp(cmd, "toggle_fullscreen") == 0) {
-        if (desk->focus != NULL)
-            toggle_fullscreen(desk->focus->client);
-        return;
+        if (mon->desk->focus != NULL)
+            toggle_fullscreen(mon, mon->desk->focus->client);
     } else if (strcmp(cmd, "toggle_floating") == 0) {
         split_mode = MODE_AUTOMATIC;
-        toggle_floating(desk->focus);
+        toggle_floating(mon->desk->focus);
     } else if (strcmp(cmd, "toggle_locked") == 0) {
-        if (desk->focus != NULL)
-            toggle_locked(desk->focus->client);
+        if (mon->desk->focus != NULL)
+            toggle_locked(mon->desk->focus->client);
+    } else if (strcmp(cmd, "toggle_visibility") == 0) {
+        toggle_visibility();
+    } else if (strcmp(cmd, "pad") == 0) {
+        char *name = strtok(NULL, TOK_SEP);
+        if (name != NULL) {
+            monitor_t *m = find_monitor(name);
+            if (m != NULL) {
+                char args[BUFSIZ] = {0}, *s;
+                while ((s = strtok(NULL, TOK_SEP)) != NULL) {
+                    strncat(args, s, REMLEN(args));
+                    strncat(args, TOK_SEP, REMLEN(args));
+                }
+                if (strlen(args) > 0) {
+                    sscanf(args, "%i %i %i %i", &m->top_padding, &m->right_padding, &m->bottom_padding, &m->left_padding);
+                    arrange(m, m->desk);
+                } else {
+                    snprintf(rsp, BUFSIZ, "%i %i %i %i\n", m->top_padding, m->right_padding, m->bottom_padding, m->left_padding);
+                }
+            }
+        }
+        return;
     } else if (strcmp(cmd, "ratio") == 0) {
-        char *value = strtok(NULL, TOKEN_SEP);
-        if (value != NULL && desk->focus != NULL)
-            sscanf(value, "%lf", &desk->focus->split_ratio);
+        char *value = strtok(NULL, TOK_SEP);
+        if (value != NULL && mon->desk->focus != NULL)
+            sscanf(value, "%lf", &mon->desk->focus->split_ratio);
     } else if (strcmp(cmd, "cancel") == 0) {
         split_mode = MODE_AUTOMATIC;
-        window_draw_border(desk->focus, true);
+        window_draw_border(mon->desk->focus, true, true);
         return;
     } else if (strcmp(cmd, "presel") == 0) {
-        if (desk->focus == NULL || !is_tiled(desk->focus->client) || desk->layout != LAYOUT_TILED)
+        if (mon->desk->focus == NULL || !is_tiled(mon->desk->focus->client) || mon->desk->layout != LAYOUT_TILED)
             return;
-        char *dir = strtok(NULL, TOKEN_SEP);
+        char *dir = strtok(NULL, TOK_SEP);
         if (dir != NULL) {
             direction_t d;
             if (parse_direction(dir, &d)) {
                 split_mode = MODE_MANUAL;
                 split_dir = d;
-                window_draw_border(desk->focus, true);
+                char *rat = strtok(NULL, TOK_SEP);
+                if (rat != NULL)
+                    sscanf(rat, "%lf", &mon->desk->focus->split_ratio);
+                window_draw_border(mon->desk->focus, true, true);
             }
         }
         return;
     } else if (strcmp(cmd, "push") == 0 || strcmp(cmd, "pull") == 0) {
-        char *dir = strtok(NULL, TOKEN_SEP);
+        char *dir = strtok(NULL, TOK_SEP);
         if (dir != NULL) {
             fence_move_t m;
             direction_t d;
             if (parse_fence_move(cmd, &m) && parse_direction(dir, &d)) {
-                move_fence(desk->focus, d, m);
+                move_fence(mon->desk->focus, d, m);
+            }
+        }
+    } 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);
+                arrange(m, m->desk);
+                char *opt = strtok(NULL, TOK_SEP);
+                send_option_t o;
+                if (parse_send_option(opt, &o) && o == SEND_OPTION_FOLLOW)
+                    select_monitor(m);
+            }
+        }
+    } else if (strcmp(cmd, "send_to_monitor") == 0) {
+        char *name = strtok(NULL, TOK_SEP);
+        if (name != NULL) {
+            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 *opt = strtok(NULL, TOK_SEP);
+                send_option_t o;
+                if (parse_send_option(opt, &o) && o == SEND_OPTION_FOLLOW)
+                    select_monitor(m);
+            }
+        } 
+    } 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)
+                    select_desktop(d);
             }
         }
     } else if (strcmp(cmd, "send_to") == 0) {
-        char *name = strtok(NULL, TOKEN_SEP);
+        char *name = strtok(NULL, TOK_SEP);
         if (name != NULL) {
-            desktop_t *d = find_desktop(name);
-            transfer_node(desk, d, desk->focus);
+            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 *opt = strtok(NULL, TOK_SEP);
+                send_option_t o;
+                if (parse_send_option(opt, &o) && o == SEND_OPTION_FOLLOW) {
+                    select_monitor(loc.monitor);
+                    select_desktop(loc.desktop);
+                }
+            }
+        }
+    } else if (strcmp(cmd, "rename_monitor") == 0) {
+        char *cur_name = strtok(NULL, TOK_SEP);
+        if (cur_name != NULL) {
+            monitor_t *m = find_monitor(cur_name);
+            if (m != NULL) {
+                char *new_name = strtok(NULL, TOK_SEP);
+                if (new_name != NULL) {
+                    strncpy(m->name, new_name, sizeof(m->name));
+                    put_status();
+                }
+            }
         }
     } else if (strcmp(cmd, "rename") == 0) {
-        char *cur_name = strtok(NULL, TOKEN_SEP);
+        char *cur_name = strtok(NULL, TOK_SEP);
         if (cur_name != NULL) {
-            desktop_t *d = find_desktop(cur_name);
-            if (d != NULL) {
-                char *new_name = strtok(NULL, TOKEN_SEP);
+            desktop_location_t loc;
+            if (locate_desktop(cur_name, &loc)) {
+                char *new_name = strtok(NULL, TOK_SEP);
                 if (new_name != NULL) {
-                    strncpy(d->name, new_name, sizeof(d->name));
+                    strncpy(loc.desktop->name, new_name, sizeof(loc.desktop->name));
                     ewmh_update_desktop_names();
+                    put_status();
                 }
             }
         }
+    } else if (strcmp(cmd, "use_monitor") == 0) {
+        char *name = strtok(NULL, TOK_SEP);
+        if (name != NULL) {
+            monitor_t *m = find_monitor(name);
+            if (m != NULL)
+                select_monitor(m);
+        }
     } else if (strcmp(cmd, "use") == 0) {
-        char *name = strtok(NULL, TOKEN_SEP);
+        char *name = strtok(NULL, TOK_SEP);
         if (name != NULL) {
-            desktop_t *d = find_desktop(name);
-            select_desktop(d);
+            desktop_location_t loc;
+            if (locate_desktop(name, &loc)) {
+                if (loc.desktop == mon->desk) {
+                    select_desktop(mon->last_desk);
+                } else {
+                    select_monitor(loc.monitor);
+                    select_desktop(loc.desktop);
+                }
+            }
+        }
+    } else if (strcmp(cmd, "cycle_monitor") == 0) {
+        char *dir = strtok(NULL, TOK_SEP);
+        if (dir != NULL) {
+            cycle_dir_t d;
+            if (parse_cycle_direction(dir, &d))
+                cycle_monitor(d);
         }
     } else if (strcmp(cmd, "cycle_desktop") == 0) {
-        char *dir = strtok(NULL, TOKEN_SEP);
+        char *dir = strtok(NULL, TOK_SEP);
         if (dir != NULL) {
             cycle_dir_t d;
             if (parse_cycle_direction(dir, &d)) {
-                cycle_desktop(d);
+                skip_desktop_t k;
+                char *skip = strtok(NULL, TOK_SEP);
+                if (parse_skip_desktop(skip, &k))
+                    cycle_desktop(mon, mon->desk, d, k);
             }
         }
     } else if (strcmp(cmd, "cycle") == 0) {
-        if (desk->focus != NULL && desk->focus->client->fullscreen)
+        if (mon->desk->focus != NULL && mon->desk->focus->client->fullscreen)
             return;
-        char *dir = strtok(NULL, TOKEN_SEP);
+        char *dir = strtok(NULL, TOK_SEP);
         if (dir != NULL) {
             cycle_dir_t d;
             if (parse_cycle_direction(dir, &d)) {
                 skip_client_t k;
-                char *skip = strtok(NULL, TOKEN_SEP);
+                char *skip = strtok(NULL, TOK_SEP);
+                if (parse_skip_client(skip, &k))
+                    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;
+        char *arg = strtok(NULL, TOK_SEP);
+        if (arg != NULL) {
+            nearest_arg_t a;
+            if (parse_nearest_argument(arg, &a)) {
+                skip_client_t k;
+                char *skip = strtok(NULL, TOK_SEP);
                 if (parse_skip_client(skip, &k))
-                    cycle_leaf(desk, desk->focus, d, k);
+                    nearest_leaf(mon, mon->desk, mon->desk->focus, a, k);
             }
         }
         return;
+    } else if (strcmp(cmd, "circulate") == 0) {
+        if (mon->desk->layout == LAYOUT_MONOCLE
+                || (mon->desk->focus != NULL && !is_tiled(mon->desk->focus->client)))
+            return;
+        char *dir = strtok(NULL, TOK_SEP);
+        if (dir != NULL) {
+            circulate_dir_t d;
+            if (parse_circulate_direction(dir, &d))
+                circulate_leaves(mon, mon->desk, d);
+        }
     } else if (strcmp(cmd, "rule") == 0) {
-        char *name = strtok(NULL, TOKEN_SEP);
+        char *name = strtok(NULL, TOK_SEP);
         if (name != NULL) {
             rule_t *rule = make_rule();
             strncpy(rule->cause.name, name, sizeof(rule->cause.name));
-            char *arg = strtok(NULL, TOKEN_SEP);
+            char *arg = strtok(NULL, TOK_SEP);
             while (arg != NULL) {
-                if (strcmp(arg, "floating") == 0)
+                if (strcmp(arg, "floating") == 0) {
                     rule->effect.floating = true;
-                arg = strtok(NULL, TOKEN_SEP);
+                } else {
+                    desktop_location_t loc;
+                    if (locate_desktop(arg, &loc)) {
+                        rule->effect.monitor = loc.monitor;
+                        rule->effect.desktop = loc.desktop;
+                    }
+                }
+                arg = strtok(NULL, TOK_SEP);
             }
-            rule->next = rule_head;
-            rule_head = rule;
+            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);
+        return;
+    } else if (strcmp(cmd, "swap") == 0) {
+        swap_nodes(mon->desk->focus, mon->desk->last_focus);
     } else if (strcmp(cmd, "alternate") == 0) {
-        select_desktop(last_desk);
-    } else if (strcmp(cmd, "add") == 0) {
-        char *name = strtok(NULL, TOKEN_SEP);
+        focus_node(mon, mon->desk, mon->desk->last_focus, true);
+        return;
+    } else if (strcmp(cmd, "alternate_desktop") == 0) {
+        select_desktop(mon->last_desk);
+    } else if (strcmp(cmd, "alternate_monitor") == 0) {
+        select_monitor(last_mon);
+    } else if (strcmp(cmd, "add_in") == 0) {
+        char *name = strtok(NULL, TOK_SEP);
         if (name != NULL) {
-            add_desktop(name);
+            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);
         }
         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;
     } else if (strcmp(cmd, "focus") == 0) {
-        if (desk->focus != NULL && desk->focus->client->fullscreen)
+        if (mon->desk->focus != NULL && mon->desk->focus->client->fullscreen)
             return;
-        char *dir = strtok(NULL, TOKEN_SEP);
+        char *dir = strtok(NULL, TOK_SEP);
         if (dir != NULL) {
             direction_t d;
             if (parse_direction(dir, &d)) {
-                node_t *n = find_neighbor(desk->focus, d);
-                focus_node(desk, n, true);
+                node_t *n = find_neighbor(mon->desk->focus, d);
+                focus_node(mon, mon->desk, n, true);
             }
         }
-        return;
-    } else if (strcmp(cmd, "reload") == 0) {
-        load_settings();
-        run_autostart();
+        if (mon->desk->layout == LAYOUT_TILED)
+            return;
+    } 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") == 0) {
+        char *arg = strtok(NULL, TOK_SEP);
+        restore(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\n", cmd);
+        snprintf(rsp, BUFSIZ, "unknown command: %s", cmd);
         return;
     }
 
-    apply_layout(desk, desk->root, root_rect);
+    arrange(mon, mon->desk);
 }
 
 void set_setting(char *name, char *value, char *rsp)
@@ -216,45 +447,35 @@ 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, "fence_grip") == 0) {
+        sscanf(value, "%u", &fence_grip);
     } else if (strcmp(name, "window_gap") == 0) {
         sscanf(value, "%i", &window_gap);
-        update_root_dimensions();
     } else if (strcmp(name, "left_padding") == 0) {
-        sscanf(value, "%i", &left_padding);
-        update_root_dimensions();
+        sscanf(value, "%i", &mon->left_padding);
     } else if (strcmp(name, "right_padding") == 0) {
-        sscanf(value, "%i", &right_padding);
-        update_root_dimensions();
+        sscanf(value, "%i", &mon->right_padding);
     } else if (strcmp(name, "top_padding") == 0) {
-        sscanf(value, "%i", &top_padding);
-        update_root_dimensions();
+        sscanf(value, "%i", &mon->top_padding);
     } else if (strcmp(name, "bottom_padding") == 0) {
-        sscanf(value, "%i", &bottom_padding);
-        update_root_dimensions();
+        sscanf(value, "%i", &mon->bottom_padding);
+    } else if (strcmp(name, "focused_border_color") == 0) {
+        strncpy(focused_border_color, value, sizeof(focused_border_color));
+        focused_border_color_pxl = get_color(focused_border_color);
     } else if (strcmp(name, "active_border_color") == 0) {
         strncpy(active_border_color, value, sizeof(active_border_color));
         active_border_color_pxl = get_color(active_border_color);
     } 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);
+    } else if (strcmp(name, "focused_locked_border_color") == 0) {
+        strncpy(focused_locked_border_color, value, sizeof(focused_locked_border_color));
+        focused_locked_border_color_pxl = get_color(focused_locked_border_color);
     } else if (strcmp(name, "active_locked_border_color") == 0) {
         strncpy(active_locked_border_color, value, sizeof(active_locked_border_color));
         active_locked_border_color_pxl = get_color(active_locked_border_color);
@@ -268,16 +489,41 @@ void set_setting(char *name, char *value, char *rsp)
         bool b;
         if (parse_bool(value, &b))
             borderless_monocle = b;
+    } else if (strcmp(name, "gapless_monocle") == 0) {
+        bool b;
+        if (parse_bool(value, &b))
+            gapless_monocle = b;
+    } else if (strcmp(name, "focus_follows_pointer") == 0) {
+        bool b;
+        if (parse_bool(value, &b)) {
+            if (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))
+                            xcb_change_window_attributes(dpy, n->client->window, XCB_CW_EVENT_MASK, values);
+
+            }
+            focus_follows_pointer = b;
+        }
+    } else if (strcmp(name, "adaptative_raise") == 0) {
+        bool b;
+        if (parse_bool(value, &b))
+            adaptative_raise = b;
+    } else if (strcmp(name, "apply_shadow_property") == 0) {
+        bool b;
+        if (parse_bool(value, &b))
+            apply_shadow_property = b;
     } 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\n", name);
+        snprintf(rsp, BUFSIZ, "unknown setting: %s", name);
         return;
     }
 
-    apply_layout(desk, desk->root, root_rect);
+    arrange(mon, mon->desk);
 }
 
 void get_setting(char *name, char* rsp)
@@ -285,49 +531,52 @@ void get_setting(char *name, char* rsp)
     if (name == NULL)
         return;
 
-    if (strcmp(name, "inner_border_width") == 0)
-        sprintf(rsp, "%u\n", inner_border_width);
-    else if (strcmp(name, "main_border_width") == 0)
-        sprintf(rsp, "%u\n", main_border_width);
-    else if (strcmp(name, "outer_border_width") == 0)
-        sprintf(rsp, "%u\n", outer_border_width);
-    else if (strcmp(name, "border_width") == 0)
-        sprintf(rsp, "%u\n", border_width);
+    if (strcmp(name, "border_width") == 0)
+        snprintf(rsp, BUFSIZ, "%u", border_width);
+    else if (strcmp(name, "fence_grip") == 0)
+        snprintf(rsp, BUFSIZ, "%u", fence_grip);
     else if (strcmp(name, "window_gap") == 0)
-        sprintf(rsp, "%i\n", window_gap);
+        snprintf(rsp, BUFSIZ, "%i", window_gap);
     else if (strcmp(name, "left_padding") == 0)
-        sprintf(rsp, "%i\n", left_padding);
+        snprintf(rsp, BUFSIZ, "%i", mon->left_padding);
     else if (strcmp(name, "right_padding") == 0)
-        sprintf(rsp, "%i\n", right_padding);
+        snprintf(rsp, BUFSIZ, "%i", mon->right_padding);
     else if (strcmp(name, "top_padding") == 0)
-        sprintf(rsp, "%i\n", top_padding);
+        snprintf(rsp, BUFSIZ, "%i", mon->top_padding);
     else if (strcmp(name, "bottom_padding") == 0)
-        sprintf(rsp, "%i\n", bottom_padding);
+        snprintf(rsp, BUFSIZ, "%i", mon->bottom_padding);
+    else if (strcmp(name, "focused_border_color") == 0)
+        snprintf(rsp, BUFSIZ, "%s (%06X)", focused_border_color, focused_border_color_pxl);
     else if (strcmp(name, "active_border_color") == 0)
-        sprintf(rsp, "%s (%06X)\n", active_border_color, active_border_color_pxl);
+        snprintf(rsp, BUFSIZ, "%s (%06X)", active_border_color, active_border_color_pxl);
     else if (strcmp(name, "normal_border_color") == 0)
-        sprintf(rsp, "%s (%06X)\n", normal_border_color, normal_border_color_pxl);
-    else if (strcmp(name, "inner_border_color") == 0)
-        sprintf(rsp, "%s (%06X)\n", inner_border_color, inner_border_color_pxl);
-    else if (strcmp(name, "outer_border_color") == 0)
-        sprintf(rsp, "%s (%06X)\n", outer_border_color, outer_border_color_pxl);
+        snprintf(rsp, BUFSIZ, "%s (%06X)", normal_border_color, normal_border_color_pxl);
     else if (strcmp(name, "presel_border_color") == 0)
-        sprintf(rsp, "%s (%06X)\n", presel_border_color, presel_border_color_pxl);
+        snprintf(rsp, BUFSIZ, "%s (%06X)", presel_border_color, presel_border_color_pxl);
+    else if (strcmp(name, "focused_locked_border_color") == 0)
+        snprintf(rsp, BUFSIZ, "%s (%06X)", focused_locked_border_color, focused_locked_border_color_pxl);
     else if (strcmp(name, "active_locked_border_color") == 0)
-        sprintf(rsp, "%s (%06X)\n", active_locked_border_color, active_locked_border_color_pxl);
+        snprintf(rsp, BUFSIZ, "%s (%06X)", active_locked_border_color, active_locked_border_color_pxl);
     else if (strcmp(name, "normal_locked_border_color") == 0)
-        sprintf(rsp, "%s (%06X)\n", normal_locked_border_color, normal_locked_border_color_pxl);
+        snprintf(rsp, BUFSIZ, "%s (%06X)", normal_locked_border_color, normal_locked_border_color_pxl);
     else if (strcmp(name, "urgent_border_color") == 0)
-        sprintf(rsp, "%s (%06X)\n", urgent_border_color, urgent_border_color_pxl);
+        snprintf(rsp, BUFSIZ, "%s (%06X)", urgent_border_color, urgent_border_color_pxl);
     else if (strcmp(name, "borderless_monocle") == 0)
-        sprintf(rsp, "%s\n", BOOLSTR(borderless_monocle));
+        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_pointer") == 0)
+        snprintf(rsp, BUFSIZ, "%s", BOOLSTR(focus_follows_pointer));
+    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, "wm_name") == 0)
-        sprintf(rsp, "%s\n", wm_name);
+        snprintf(rsp, BUFSIZ, "%s", wm_name);
     else
-        snprintf(rsp, BUFSIZ, "unknown setting: %s\n", name);
+        snprintf(rsp, BUFSIZ, "unknown setting: %s", name);
 }
 
-
 bool parse_bool(char *value, bool *b)
 {
     if (strcmp(value, "true") == 0) {
@@ -370,6 +619,18 @@ bool parse_direction(char *s, direction_t *d)
     return false;
 }
 
+bool parse_nearest_argument(char *s, nearest_arg_t *a)
+{
+    if (strcmp(s, "older") == 0) {
+        *a = NEAREST_OLDER;
+        return true;
+    } else if (strcmp(s, "newer") == 0) {
+        *a = NEAREST_NEWER;
+        return true;
+    }
+    return false;
+}
+
 bool parse_cycle_direction(char *s, cycle_dir_t *d)
 {
     if (strcmp(s, "prev") == 0) {
@@ -382,40 +643,73 @@ bool parse_cycle_direction(char *s, cycle_dir_t *d)
     return false;
 }
 
+bool parse_circulate_direction(char *s, circulate_dir_t *d)
+{
+    if (strcmp(s, "forward") == 0) {
+        *d = CIRCULATE_FORWARD;
+        return true;
+    } else if (strcmp(s, "backward") == 0) {
+        *d = CIRCULATE_BACKWARD;
+        return true;
+    }
+    return false;
+}
+
 bool parse_skip_client(char *s, skip_client_t *k)
 {
-    if (s == NULL || strcmp(s, "--skip-none") == 0) {
-        *k = SKIP_NONE;
+    if (s == NULL) {
+        *k = CLIENT_SKIP_NONE;
         return true;
     } else if (strcmp(s, "--skip-floating") == 0) {
-        *k = SKIP_FLOATING;
+        *k = CLIENT_SKIP_FLOATING;
         return true;
     } else if (strcmp(s, "--skip-tiled") == 0) {
-        *k = SKIP_TILED;
+        *k = CLIENT_SKIP_TILED;
         return true;
     } else if (strcmp(s, "--skip-class-equal") == 0) {
-        *k = SKIP_CLASS_EQUAL;
+        *k = CLIENT_SKIP_CLASS_EQUAL;
         return true;
     } else if (strcmp(s, "--skip-class-differ") == 0) {
-        *k = SKIP_CLASS_DIFFER;
+        *k = CLIENT_SKIP_CLASS_DIFFER;
         return true;
     }
     return false;
 }
 
-bool parse_corner(char *s, corner_t *c)
+bool parse_skip_desktop(char *s, skip_desktop_t *k)
 {
-    if (strcmp(s, "top_left") == 0) {
-        *c = TOP_LEFT;
+    if (s == NULL) {
+        *k = DESKTOP_SKIP_NONE;
         return true;
-    } else if (strcmp(s, "top_right") == 0) {
-        *c = TOP_RIGHT;
+    } else if (strcmp(s, "--skip-free") == 0) {
+        *k = DESKTOP_SKIP_FREE;
         return true;
-    } else if (strcmp(s, "bottom_left") == 0) {
-        *c = BOTTOM_LEFT;
+    } else if (strcmp(s, "--skip-occupied") == 0) {
+        *k = DESKTOP_SKIP_OCCUPIED;
         return true;
-    } else if (strcmp(s, "bottom_right") == 0) {
-        *c = BOTTOM_RIGHT;
+    }
+    return false;
+}
+
+bool parse_list_option(char *s, list_option_t *o)
+{
+    if (s == NULL || strcmp(s, "--verbose") == 0) {
+        *o = LIST_OPTION_VERBOSE;
+        return true;
+    } else if (strcmp(s, "--quiet") == 0) {
+        *o = LIST_OPTION_QUIET;
+        return true;
+    }
+    return false;
+}
+
+bool parse_send_option(char *s, send_option_t *o)
+{
+    if (s == NULL) {
+        *o = SEND_OPTION_DONT_FOLLOW;
+        return true;
+    } else if (strcmp(s, "--follow") == 0) {
+        *o = SEND_OPTION_FOLLOW;
         return true;
     }
     return false;
@@ -436,6 +730,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) {
@@ -448,3 +754,26 @@ bool parse_fence_move(char *s, fence_move_t *m)
     return false;
 }
 
+bool parse_pointer_action(char *s, pointer_action_t *a)
+{
+    if (strcmp(s, "move") == 0) {
+        *a = ACTION_MOVE;
+        return true;
+    } else if (strcmp(s, "resize_corner") == 0) {
+        *a = ACTION_RESIZE_CORNER;
+        return true;
+    } else if (strcmp(s, "resize_side") == 0) {
+        *a = ACTION_RESIZE_SIDE;
+        return true;
+    } else if (strcmp(s, "focus") == 0) {
+        *a = ACTION_FOCUS;
+        return true;
+    } else if (strcmp(s, "move_tiled") == 0) {
+        *a = ACTION_MOVE_TILED;
+        return true;
+    } else if (strcmp(s, "resize_tiled") == 0) {
+        *a = ACTION_RESIZE_TILED;
+        return true;
+    }
+    return false;
+}