Merge branch 'master' into pid-workspaces

author: Drew DeVault <sir@cmpwn.com> 2018-07-23 20:27:56 -0400
committer: Drew DeVault <sir@cmpwn.com> 2018-07-23 20:31:11 -0400
commit: f4b882475eee7a81c206c7825616cc4656b2f60b (patch)
tree: 38e6ebf81b235424f105dcbcbb194e5e9eac70c0 /sway/commands
parent: Implement pid->workspace tracking (diff)
parent: Merge pull request #2342 from RyanDwyer/update-cursor (diff)
download: sway-f4b882475eee7a81c206c7825616cc4656b2f60b.tar.gz
sway-f4b882475eee7a81c206c7825616cc4656b2f60b.tar.zst
sway-f4b882475eee7a81c206c7825616cc4656b2f60b.zip
72 files changed, 982 insertions, 235 deletions
diff --git a/sway/commands/assign.c b/sway/commands/assign.c
index 9d15e166..0bc0929a 100644
--- a/sway/commands/assign.c
+++ b/sway/commands/assign.c
@@ -27,6 +27,7 @@ struct cmd_results *cmd_assign(int argc, char **argv) {
        if (strncmp(*argv, "→", strlen("→")) == 0) {
                if (argc < 3) {
+                        free(criteria);
                        return cmd_results_new(CMD_INVALID, "assign", "Missing workspace");
                }
                ++argv;
@@ -44,7 +45,7 @@ struct cmd_results *cmd_assign(int argc, char **argv) {
        criteria->target = join_args(argv, target_len);
        list_add(config->criteria, criteria);
-        wlr_log(L_DEBUG, "assign: '%s' -> '%s' added", criteria->raw,
+        wlr_log(WLR_DEBUG, "assign: '%s' -> '%s' added", criteria->raw,
                        criteria->target);
        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
diff --git a/sway/commands/bar.c b/sway/commands/bar.c
index d84ce808..f6a70c17 100644
--- a/sway/commands/bar.c
+++ b/sway/commands/bar.c
@@ -63,13 +63,13 @@ struct cmd_results *cmd_bar(int argc, char **argv) {
                        for (int i = 0; i < config->bars->length; ++i) {
                                struct bar_config *item = config->bars->items[i];
                                if (strcmp(item->id, argv[0]) == 0) {
-                                        wlr_log(L_DEBUG, "Selecting bar: %s", argv[0]);
+                                        wlr_log(WLR_DEBUG, "Selecting bar: %s", argv[0]);
                                        bar = item;
                                        break;
                                }
                        }
                        if (!bar) {
-                                wlr_log(L_DEBUG, "Creating bar: %s", argv[0]);
+                                wlr_log(WLR_DEBUG, "Creating bar: %s", argv[0]);
                                bar = default_bar_config();
                                if (!bar) {
                                        return cmd_results_new(CMD_FAILURE, "bar",
@@ -108,7 +108,7 @@ struct cmd_results *cmd_bar(int argc, char **argv) {
                // Set current bar
                config->current_bar = bar;
-                wlr_log(L_DEBUG, "Creating bar %s", bar->id);
+                wlr_log(WLR_DEBUG, "Creating bar %s", bar->id);
        }
        return config_subcommand(argv, argc, bar_handlers, sizeof(bar_handlers));
diff --git a/sway/commands/bar/binding_mode_indicator.c b/sway/commands/bar/binding_mode_indicator.c
index 3ba5f33f..0c48bee9 100644
--- a/sway/commands/bar/binding_mode_indicator.c
+++ b/sway/commands/bar/binding_mode_indicator.c
@@ -15,11 +15,11 @@ struct cmd_results *bar_cmd_binding_mode_indicator(int argc, char **argv) {
        }
        if (strcasecmp("yes", argv[0]) == 0) {
                config->current_bar->binding_mode_indicator = true;
-                wlr_log(L_DEBUG, "Enabling binding mode indicator on bar: %s",
+                wlr_log(WLR_DEBUG, "Enabling binding mode indicator on bar: %s",
                                config->current_bar->id);
        } else if (strcasecmp("no", argv[0]) == 0) {
                config->current_bar->binding_mode_indicator = false;
-                wlr_log(L_DEBUG, "Disabling binding mode indicator on bar: %s",
+                wlr_log(WLR_DEBUG, "Disabling binding mode indicator on bar: %s",
                                config->current_bar->id);
        }
        return cmd_results_new(CMD_INVALID, "binding_mode_indicator",
diff --git a/sway/commands/bar/font.c b/sway/commands/bar/font.c
index 80b7a593..2aa4e895 100644
--- a/sway/commands/bar/font.c
+++ b/sway/commands/bar/font.c
@@ -14,8 +14,8 @@ struct cmd_results *bar_cmd_font(int argc, char **argv) {
        }
        char *font = join_args(argv, argc);
        free(config->current_bar->font);
-        config->current_bar->font = strdup(font);
+        config->current_bar->font = font;
-        wlr_log(L_DEBUG, "Settings font '%s' for bar: %s",
+        wlr_log(WLR_DEBUG, "Settings font '%s' for bar: %s",
                        config->current_bar->font, config->current_bar->id);
        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
diff --git a/sway/commands/bar/height.c b/sway/commands/bar/height.c
index 3160caed..18258526 100644
--- a/sway/commands/bar/height.c
+++ b/sway/commands/bar/height.c
@@ -14,7 +14,7 @@ struct cmd_results *bar_cmd_height(int argc, char **argv) {
                                "Invalid height value: %s", argv[0]);
        }
        config->current_bar->height = height;
-        wlr_log(L_DEBUG, "Setting bar height to %d on bar: %s",
+        wlr_log(WLR_DEBUG, "Setting bar height to %d on bar: %s",
                        height, config->current_bar->id);
        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
diff --git a/sway/commands/bar/hidden_state.c b/sway/commands/bar/hidden_state.c
index 6641f184..502ce2c4 100644
--- a/sway/commands/bar/hidden_state.c
+++ b/sway/commands/bar/hidden_state.c
@@ -27,7 +27,7 @@ static struct cmd_results *bar_set_hidden_state(struct bar_config *bar,
                if (!config->reading) {
                        ipc_event_barconfig_update(bar);
                }
-                wlr_log(L_DEBUG, "Setting hidden_state: '%s' for bar: %s",
+                wlr_log(WLR_DEBUG, "Setting hidden_state: '%s' for bar: %s",
                                bar->hidden_state, bar->id);
        }
        // free old mode
diff --git a/sway/commands/bar/id.c b/sway/commands/bar/id.c
index 6ce86fef..65fa69fd 100644
--- a/sway/commands/bar/id.c
+++ b/sway/commands/bar/id.c
@@ -24,7 +24,7 @@ struct cmd_results *bar_cmd_id(int argc, char **argv) {
                }
        }
-        wlr_log(L_DEBUG, "Renaming bar: '%s' to '%s'", oldname, name);
+        wlr_log(WLR_DEBUG, "Renaming bar: '%s' to '%s'", oldname, name);
        // free old bar id
        free(config->current_bar->id);
diff --git a/sway/commands/bar/mode.c b/sway/commands/bar/mode.c
index 34bb0a4f..28e2d77b 100644
--- a/sway/commands/bar/mode.c
+++ b/sway/commands/bar/mode.c
@@ -28,7 +28,7 @@ static struct cmd_results *bar_set_mode(struct bar_config *bar, const char *mode
                if (!config->reading) {
                        ipc_event_barconfig_update(bar);
                }
-                wlr_log(L_DEBUG, "Setting mode: '%s' for bar: %s", bar->mode, bar->id);
+                wlr_log(WLR_DEBUG, "Setting mode: '%s' for bar: %s", bar->mode, bar->id);
        }
        // free old mode
diff --git a/sway/commands/bar/modifier.c b/sway/commands/bar/modifier.c
index 7ba4b125..09025fff 100644
--- a/sway/commands/bar/modifier.c
+++ b/sway/commands/bar/modifier.c
@@ -22,14 +22,15 @@ struct cmd_results *bar_cmd_modifier(int argc, char **argv) {
                        mod |= tmp_mod;
                        continue;
                } else {
+                        error = cmd_results_new(CMD_INVALID, "modifier",
+                                "Unknown modifier '%s'", split->items[i]);
                        free_flat_list(split);
-                        return cmd_results_new(CMD_INVALID, "modifier",
+                        return error;
-                                        "Unknown modifier '%s'", split->items[i]);
                }
        }
        free_flat_list(split);
        config->current_bar->modifier = mod;
-        wlr_log(L_DEBUG,
+        wlr_log(WLR_DEBUG,
                        "Show/Hide the bar when pressing '%s' in hide mode.", argv[0]);
        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
diff --git a/sway/commands/bar/output.c b/sway/commands/bar/output.c
index f7ca0aa4..72754e05 100644
--- a/sway/commands/bar/output.c
+++ b/sway/commands/bar/output.c
@@ -42,7 +42,7 @@ struct cmd_results *bar_cmd_output(int argc, char **argv) {
        if (add_output) {
                list_add(outputs, strdup(output));
-                wlr_log(L_DEBUG, "Adding bar: '%s' to output '%s'",
+                wlr_log(WLR_DEBUG, "Adding bar: '%s' to output '%s'",
                                config->current_bar->id, output);
        }
        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
diff --git a/sway/commands/bar/pango_markup.c b/sway/commands/bar/pango_markup.c
index 480af724..857571fb 100644
--- a/sway/commands/bar/pango_markup.c
+++ b/sway/commands/bar/pango_markup.c
@@ -13,11 +13,11 @@ struct cmd_results *bar_cmd_pango_markup(int argc, char **argv) {
        }
        if (strcasecmp("enabled", argv[0]) == 0) {
                config->current_bar->pango_markup = true;
-                wlr_log(L_DEBUG, "Enabling pango markup for bar: %s",
+                wlr_log(WLR_DEBUG, "Enabling pango markup for bar: %s",
                                config->current_bar->id);
        } else if (strcasecmp("disabled", argv[0]) == 0) {
                config->current_bar->pango_markup = false;
-                wlr_log(L_DEBUG, "Disabling pango markup for bar: %s",
+                wlr_log(WLR_DEBUG, "Disabling pango markup for bar: %s",
                                config->current_bar->id);
        } else {
                error = cmd_results_new(CMD_INVALID, "pango_markup",
diff --git a/sway/commands/bar/position.c b/sway/commands/bar/position.c
index 9c580483..44bb4ae3 100644
--- a/sway/commands/bar/position.c
+++ b/sway/commands/bar/position.c
@@ -15,8 +15,9 @@ struct cmd_results *bar_cmd_position(int argc, char **argv) {
        char *valid[] = { "top", "bottom", "left", "right" };
        for (size_t i = 0; i < sizeof(valid) / sizeof(valid[0]); ++i) {
                if (strcasecmp(valid[i], argv[0]) == 0) {
-                        wlr_log(L_DEBUG, "Setting bar position '%s' for bar: %s",
+                        wlr_log(WLR_DEBUG, "Setting bar position '%s' for bar: %s",
                                        argv[0], config->current_bar->id);
+                        free(config->current_bar->position);
                        config->current_bar->position = strdup(argv[0]);
                        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
                }
diff --git a/sway/commands/bar/separator_symbol.c b/sway/commands/bar/separator_symbol.c
index 1e08df6d..392ab730 100644
--- a/sway/commands/bar/separator_symbol.c
+++ b/sway/commands/bar/separator_symbol.c
@@ -14,7 +14,7 @@ struct cmd_results *bar_cmd_separator_symbol(int argc, char **argv) {
        }
        free(config->current_bar->separator_symbol);
        config->current_bar->separator_symbol = strdup(argv[0]);
-        wlr_log(L_DEBUG, "Settings separator_symbol '%s' for bar: %s",
+        wlr_log(WLR_DEBUG, "Settings separator_symbol '%s' for bar: %s",
                        config->current_bar->separator_symbol, config->current_bar->id);
        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
diff --git a/sway/commands/bar/status_command.c b/sway/commands/bar/status_command.c
index 5e199cde..6f6f81a3 100644
--- a/sway/commands/bar/status_command.c
+++ b/sway/commands/bar/status_command.c
@@ -14,7 +14,7 @@ struct cmd_results *bar_cmd_status_command(int argc, char **argv) {
        }
        free(config->current_bar->status_command);
        config->current_bar->status_command = join_args(argv, argc);
-        wlr_log(L_DEBUG, "Feeding bar with status command: %s",
+        wlr_log(WLR_DEBUG, "Feeding bar with status command: %s",
                        config->current_bar->status_command);
        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
diff --git a/sway/commands/bar/strip_workspace_numbers.c b/sway/commands/bar/strip_workspace_numbers.c
index 4f24a356..4e47d047 100644
--- a/sway/commands/bar/strip_workspace_numbers.c
+++ b/sway/commands/bar/strip_workspace_numbers.c
@@ -15,11 +15,11 @@ struct cmd_results *bar_cmd_strip_workspace_numbers(int argc, char **argv) {
        }
        if (strcasecmp("yes", argv[0]) == 0) {
                config->current_bar->strip_workspace_numbers = true;
-                wlr_log(L_DEBUG, "Stripping workspace numbers on bar: %s",
+                wlr_log(WLR_DEBUG, "Stripping workspace numbers on bar: %s",
                                config->current_bar->id);
        } else if (strcasecmp("no", argv[0]) == 0) {
                config->current_bar->strip_workspace_numbers = false;
-                wlr_log(L_DEBUG, "Enabling workspace numbers on bar: %s",
+                wlr_log(WLR_DEBUG, "Enabling workspace numbers on bar: %s",
                                config->current_bar->id);
        } else {
                return cmd_results_new(CMD_INVALID,
diff --git a/sway/commands/bar/swaybar_command.c b/sway/commands/bar/swaybar_command.c
index 520cdd11..04e78e77 100644
--- a/sway/commands/bar/swaybar_command.c
+++ b/sway/commands/bar/swaybar_command.c
@@ -14,7 +14,7 @@ struct cmd_results *bar_cmd_swaybar_command(int argc, char **argv) {
        }
        free(config->current_bar->swaybar_command);
        config->current_bar->swaybar_command = join_args(argv, argc);
-        wlr_log(L_DEBUG, "Using custom swaybar command: %s",
+        wlr_log(WLR_DEBUG, "Using custom swaybar command: %s",
                        config->current_bar->swaybar_command);
        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
diff --git a/sway/commands/bar/workspace_buttons.c b/sway/commands/bar/workspace_buttons.c
index 6edc3a0d..a4079b2a 100644
--- a/sway/commands/bar/workspace_buttons.c
+++ b/sway/commands/bar/workspace_buttons.c
@@ -14,11 +14,11 @@ struct cmd_results *bar_cmd_workspace_buttons(int argc, char **argv) {
        }
        if (strcasecmp("yes", argv[0]) == 0) {
                config->current_bar->workspace_buttons = true;
-                wlr_log(L_DEBUG, "Enabling workspace buttons on bar: %s",
+                wlr_log(WLR_DEBUG, "Enabling workspace buttons on bar: %s",
                                config->current_bar->id);
        } else if (strcasecmp("no", argv[0]) == 0) {
                config->current_bar->workspace_buttons = false;
-                wlr_log(L_DEBUG, "Disabling workspace buttons on bar: %s",
+                wlr_log(WLR_DEBUG, "Disabling workspace buttons on bar: %s",
                                config->current_bar->id);
        } else {
                return cmd_results_new(CMD_INVALID, "workspace_buttons",
diff --git a/sway/commands/bar/wrap_scroll.c b/sway/commands/bar/wrap_scroll.c
index 7386f82c..701de00a 100644
--- a/sway/commands/bar/wrap_scroll.c
+++ b/sway/commands/bar/wrap_scroll.c
@@ -13,11 +13,11 @@ struct cmd_results *bar_cmd_wrap_scroll(int argc, char **argv) {
        }
        if (strcasecmp("yes", argv[0]) == 0) {
                config->current_bar->wrap_scroll = true;
-                wlr_log(L_DEBUG, "Enabling wrap scroll on bar: %s",
+                wlr_log(WLR_DEBUG, "Enabling wrap scroll on bar: %s",
                                config->current_bar->id);
        } else if (strcasecmp("no", argv[0]) == 0) {
                config->current_bar->wrap_scroll = false;
-                wlr_log(L_DEBUG, "Disabling wrap scroll on bar: %s",
+                wlr_log(WLR_DEBUG, "Disabling wrap scroll on bar: %s",
                                config->current_bar->id);
        } else {
                return cmd_results_new(CMD_INVALID,
diff --git a/sway/commands/bind.c b/sway/commands/bind.c
index 821f9cd1..83e9e432 100644
--- a/sway/commands/bind.c
+++ b/sway/commands/bind.c
@@ -184,7 +184,7 @@ static struct cmd_results *cmd_bindsym_or_bindcode(int argc, char **argv,
        for (int i = 0; i < mode_bindings->length; ++i) {
                struct sway_binding *config_binding = mode_bindings->items[i];
                if (binding_key_compare(binding, config_binding)) {
-                        wlr_log(L_DEBUG, "overwriting old binding with command '%s'",
+                        wlr_log(WLR_DEBUG, "overwriting old binding with command '%s'",
                                config_binding->command);
                        free_sway_binding(config_binding);
                        mode_bindings->items[i] = binding;
@@ -196,7 +196,7 @@ static struct cmd_results *cmd_bindsym_or_bindcode(int argc, char **argv,
                list_add(mode_bindings, binding);
        }
-        wlr_log(L_DEBUG, "%s - Bound %s to command %s",
+        wlr_log(WLR_DEBUG, "%s - Bound %s to command %s",
                bindtype, argv[0], binding->command);
        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
diff --git a/sway/commands/border.c b/sway/commands/border.c
index 6db85395..9c19e20a 100644
--- a/sway/commands/border.c
+++ b/sway/commands/border.c
@@ -42,7 +42,7 @@ struct cmd_results *cmd_border(int argc, char **argv) {
                container_set_geometry_from_floating_view(view->swayc);
        }
-        arrange_and_commit(view->swayc);
+        arrange_windows(view->swayc);
        struct sway_seat *seat = input_manager_current_seat(input_manager);
        if (seat->cursor) {
diff --git a/sway/commands/default_floating_border.c b/sway/commands/default_floating_border.c
new file mode 100644
index 00000000..1bfc24af
--- /dev/null
+++ b/sway/commands/default_floating_border.c
@@ -0,0 +1,29 @@
+#include "log.h"
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "sway/tree/container.h"
+struct cmd_results *cmd_default_floating_border(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "default_floating_border",
+                                        EXPECTED_AT_LEAST, 1))) {
+                return error;
+        }
+        if (strcmp(argv[0], "none") == 0) {
+                config->floating_border = B_NONE;
+        } else if (strcmp(argv[0], "normal") == 0) {
+                config->floating_border = B_NORMAL;
+        } else if (strcmp(argv[0], "pixel") == 0) {
+                config->floating_border = B_PIXEL;
+        } else {
+                return cmd_results_new(CMD_INVALID, "default_floating_border",
+                                "Expected 'default_floating_border <none|normal|pixel>' "
+                                "or 'default_floating_border <normal|pixel> <px>'");
+        }
+        if (argc == 2) {
+                config->floating_border_thickness = atoi(argv[1]);
+        }
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/commands/exec.c b/sway/commands/exec.c
index 363d5bef..7fc54123 100644
--- a/sway/commands/exec.c
+++ b/sway/commands/exec.c
@@ -8,7 +8,7 @@ struct cmd_results *cmd_exec(int argc, char **argv) {
        if (!config->active) return cmd_results_new(CMD_DEFER, "exec", NULL);
        if (config->reloading) {
                char *args = join_args(argv, argc);
-                wlr_log(L_DEBUG, "Ignoring 'exec %s' due to reload", args);
+                wlr_log(WLR_DEBUG, "Ignoring 'exec %s' due to reload", args);
                free(args);
                return cmd_results_new(CMD_SUCCESS, NULL, NULL);
        }
diff --git a/sway/commands/exec_always.c b/sway/commands/exec_always.c
index abd52e59..9bf2b320 100644
--- a/sway/commands/exec_always.c
+++ b/sway/commands/exec_always.c
@@ -20,7 +20,7 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) {
        char *tmp = NULL;
        if (strcmp((char*)*argv, "--no-startup-id") == 0) {
-                wlr_log(L_INFO, "exec switch '--no-startup-id' not supported, ignored.");
+                wlr_log(WLR_INFO, "exec switch '--no-startup-id' not supported, ignored.");
                if ((error = checkarg(argc - 1, "exec_always", EXPECTED_MORE_THAN, 0))) {
                        return error;
                }
@@ -35,50 +35,49 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) {
        strncpy(cmd, tmp, sizeof(cmd) - 1);
        cmd[sizeof(cmd) - 1] = 0;
        free(tmp);
-        wlr_log(L_DEBUG, "Executing %s", cmd);
+        wlr_log(WLR_DEBUG, "Executing %s", cmd);
        int fd[2];
        if (pipe(fd) != 0) {
-                wlr_log(L_ERROR, "Unable to create pipe for fork");
+                wlr_log(WLR_ERROR, "Unable to create pipe for fork");
        }
-        pid_t pid;
+        pid_t pid, child;
-        pid_t *child = malloc(sizeof(pid_t)); // malloc'd so that Linux can avoid copying the process space
-        if (!child) {
-                return cmd_results_new(CMD_FAILURE, "exec_always", "Unable to allocate child pid");
-        }
        // Fork process
        if ((pid = fork()) == 0) {
                // Fork child process again
                setsid();
-                if ((*child = fork()) == 0) {
+                close(fd[0]);
+                if ((child = fork()) == 0) {
+                        close(fd[1]);
                        execl("/bin/sh", "/bin/sh", "-c", cmd, (void *)NULL);
-                        // Not reached
+                        _exit(0);
                }
-                close(fd[0]);
                ssize_t s = 0;
                while ((size_t)s < sizeof(pid_t)) {
-                        s += write(fd[1], ((uint8_t *)child) + s, sizeof(pid_t) - s);
+                        s += write(fd[1], ((uint8_t *)&child) + s, sizeof(pid_t) - s);
                }
                close(fd[1]);
                _exit(0); // Close child process
        } else if (pid < 0) {
-                free(child);
+                close(fd[0]);
+                close(fd[1]);
                return cmd_results_new(CMD_FAILURE, "exec_always", "fork() failed");
        }
        close(fd[1]); // close write
        ssize_t s = 0;
        while ((size_t)s < sizeof(pid_t)) {
-                s += read(fd[0], ((uint8_t *)child) + s, sizeof(pid_t) - s);
+                s += read(fd[0], ((uint8_t *)&child) + s, sizeof(pid_t) - s);
        }
        close(fd[0]);
        // cleanup child process
        waitpid(pid, NULL, 0);
-        if (*child > 0) {
+        if (child > 0) {
-                wlr_log(L_DEBUG, "Child process created with pid %d", *child);
+                wlr_log(WLR_DEBUG, "Child process created with pid %d", child);
-                workspace_record_pid(*child);
+                workspace_record_pid(child);
        } else {
-                free(child);
+                return cmd_results_new(CMD_FAILURE, "exec_always",
+                        "Second fork() failed");
        }
        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
diff --git a/sway/commands/floating.c b/sway/commands/floating.c
index e6003521..6ab56c3b 100644
--- a/sway/commands/floating.c
+++ b/sway/commands/floating.c
@@ -37,7 +37,7 @@ struct cmd_results *cmd_floating(int argc, char **argv) {
        container_set_floating(container, wants_floating);
        struct sway_container *workspace = container_parent(container, C_WORKSPACE);
-        arrange_and_commit(workspace);
+        arrange_windows(workspace);
        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
diff --git a/sway/commands/floating_minmax_size.c b/sway/commands/floating_minmax_size.c
new file mode 100644
index 00000000..0af78908
--- /dev/null
+++ b/sway/commands/floating_minmax_size.c
@@ -0,0 +1,53 @@
+#include <errno.h>
+#include <math.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
+#include <wlr/util/log.h>
+#include "sway/commands.h"
+#include "log.h"
+static const char* min_usage =
+        "Expected 'floating_minimum_size <width> x <height>'";
+static const char* max_usage =
+        "Expected 'floating_maximum_size <width> x <height>'";
+static struct cmd_results *handle_command(int argc, char **argv, char *cmd_name,
+                const char *usage, int *config_width, int *config_height) {
+        struct cmd_results *error;
+        if ((error = checkarg(argc, cmd_name, EXPECTED_EQUAL_TO, 3))) {
+                return error;
+        }
+        char *err;
+        int width = (int)strtol(argv[0], &err, 10);
+        if (*err) {
+                return cmd_results_new(CMD_INVALID, cmd_name, usage);
+        }
+        if (strcmp(argv[1], "x") != 0) {
+                return cmd_results_new(CMD_INVALID, cmd_name, usage);
+        }
+        int height = (int)strtol(argv[2], &err, 10);
+        if (*err) {
+                return cmd_results_new(CMD_INVALID, cmd_name, usage);
+        }
+        *config_width = width;
+        *config_height = height;
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
+struct cmd_results *cmd_floating_minimum_size(int argc, char **argv) {
+        return handle_command(argc, argv, "floating_minimum_size", min_usage,
+                        &config->floating_minimum_width, &config->floating_minimum_height);
+}
+struct cmd_results *cmd_floating_maximum_size(int argc, char **argv) {
+        return handle_command(argc, argv, "floating_maximum_size", max_usage,
+                        &config->floating_maximum_width, &config->floating_maximum_height);
+}
diff --git a/sway/commands/floating_modifier.c b/sway/commands/floating_modifier.c
new file mode 100644
index 00000000..9432c9f1
--- /dev/null
+++ b/sway/commands/floating_modifier.c
@@ -0,0 +1,20 @@
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "util.h"
+struct cmd_results *cmd_floating_modifier(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "floating_modifier", EXPECTED_EQUAL_TO, 1))) {
+                return error;
+        }
+        uint32_t mod = get_modifier_mask_by_name(argv[0]);
+        if (!mod) {
+                return cmd_results_new(CMD_INVALID, "floating_modifier",
+                                "Invalid modifier");
+        }
+        config->floating_mod = mod;
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/commands/focus.c b/sway/commands/focus.c
index 74d9d535..9cd8bfae 100644
--- a/sway/commands/focus.c
+++ b/sway/commands/focus.c
@@ -1,10 +1,14 @@
 #include <strings.h>
 #include <wlr/util/log.h>
 #include "log.h"
+#include "sway/commands.h"
 #include "sway/input/input-manager.h"
 #include "sway/input/seat.h"
+#include "sway/output.h"
+#include "sway/tree/arrange.h"
 #include "sway/tree/view.h"
-#include "sway/commands.h"
+#include "sway/tree/workspace.h"
+#include "stringop.h"
 static bool parse_movement_direction(const char *name,
                enum movement_direction *out) {
@@ -27,7 +31,55 @@ static bool parse_movement_direction(const char *name,
        return true;
 }
+static struct cmd_results *focus_mode(struct sway_container *con,
+                struct sway_seat *seat, bool floating) {
+        struct sway_container *ws = con->type == C_WORKSPACE ?
+                con : container_parent(con, C_WORKSPACE);
+        struct sway_container *new_focus = ws;
+        if (floating) {
+                new_focus = ws->sway_workspace->floating;
+                if (new_focus->children->length == 0) {
+                        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+                }
+        }
+        seat_set_focus(seat, seat_get_active_child(seat, new_focus));
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
+static struct cmd_results *focus_output(struct sway_container *con,
+                struct sway_seat *seat, int argc, char **argv) {
+        if (!argc) {
+                return cmd_results_new(CMD_INVALID, "focus",
+                        "Expected 'focus output <direction|name>'");
+        }
+        char *identifier = join_args(argv, argc);
+        struct sway_container *output = output_by_name(identifier);
+        if (!output) {
+                enum movement_direction direction;
+                if (!parse_movement_direction(identifier, &direction) ||
+                                direction == MOVE_PARENT || direction == MOVE_CHILD) {
+                        free(identifier);
+                        return cmd_results_new(CMD_INVALID, "focus",
+                                "There is no output with that name");
+                }
+                struct sway_container *focus = seat_get_focus(seat);
+                focus = container_parent(focus, C_OUTPUT);
+                output = container_get_in_direction(focus, seat, direction);
+        }
+        free(identifier);
+        if (output) {
+                seat_set_focus(seat, seat_get_focus_inactive(seat, output));
+        }
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
 struct cmd_results *cmd_focus(int argc, char **argv) {
+        if (config->reading || !config->active) {
+                return cmd_results_new(CMD_DEFER, NULL, NULL);
+        }
        struct sway_container *con = config->handler_context.current_container;
        struct sway_seat *seat = config->handler_context.seat;
        if (con->type < C_WORKSPACE) {
@@ -40,11 +92,24 @@ struct cmd_results *cmd_focus(int argc, char **argv) {
                return cmd_results_new(CMD_SUCCESS, NULL, NULL);
        }
-        // TODO mode_toggle
+        if (strcmp(argv[0], "floating") == 0) {
+                return focus_mode(con, seat, true);
+        } else if (strcmp(argv[0], "tiling") == 0) {
+                return focus_mode(con, seat, false);
+        } else if (strcmp(argv[0], "mode_toggle") == 0) {
+                return focus_mode(con, seat, !container_is_floating(con));
+        }
+        if (strcmp(argv[0], "output") == 0) {
+                argc--; argv++;
+                return focus_output(con, seat, argc, argv);
+        }
        enum movement_direction direction = 0;
        if (!parse_movement_direction(argv[0], &direction)) {
                return cmd_results_new(CMD_INVALID, "focus",
-                                "Expected 'focus <direction|parent|child|mode_toggle>' or 'focus output <direction|name>'");
+                        "Expected 'focus <direction|parent|child|mode_toggle|floating|tiling>' "
+                        "or 'focus output <direction|name>'");
        }
        struct sway_container *next_focus = container_get_in_direction(
diff --git a/sway/commands/for_window.c b/sway/commands/for_window.c
index 8c425a1d..ac4d6563 100644
--- a/sway/commands/for_window.c
+++ b/sway/commands/for_window.c
@@ -24,7 +24,7 @@ struct cmd_results *cmd_for_window(int argc, char **argv) {
        criteria->cmdlist = join_args(argv + 1, argc - 1);
        list_add(config->criteria, criteria);
-        wlr_log(L_DEBUG, "for_window: '%s' -> '%s' added", criteria->raw, criteria->cmdlist);
+        wlr_log(WLR_DEBUG, "for_window: '%s' -> '%s' added", criteria->raw, criteria->cmdlist);
        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
diff --git a/sway/commands/force_display_urgency_hint.c b/sway/commands/force_display_urgency_hint.c
new file mode 100644
index 00000000..5e5e2d55
--- /dev/null
+++ b/sway/commands/force_display_urgency_hint.c
@@ -0,0 +1,23 @@
+#include "sway/commands.h"
+#include "sway/config.h"
+struct cmd_results *cmd_force_display_urgency_hint(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "force_display_urgency_hint",
+                                        EXPECTED_AT_LEAST, 1))) {
+                return error;
+        }
+        char *err;
+        int timeout = (int)strtol(argv[0], &err, 10);
+        if (*err) {
+                if (strcmp(err, "ms") != 0) {
+                        return cmd_results_new(CMD_INVALID, "force_display_urgency_hint",
+                                        "Expected 'force_display_urgency_hint <timeout> ms'");
+                }
+        }
+        config->urgent_timeout = timeout > 0 ? timeout : 0;
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/commands/fullscreen.c b/sway/commands/fullscreen.c
index 1a4d8b41..0b5beaa2 100644
--- a/sway/commands/fullscreen.c
+++ b/sway/commands/fullscreen.c
@@ -34,7 +34,7 @@ struct cmd_results *cmd_fullscreen(int argc, char **argv) {
        view_set_fullscreen(view, wants_fullscreen);
        struct sway_container *workspace = container_parent(container, C_WORKSPACE);
-        arrange_and_commit(workspace->parent);
+        arrange_windows(workspace->parent);
        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
diff --git a/sway/commands/gaps.c b/sway/commands/gaps.c
index 801fb179..3906eb70 100644
--- a/sway/commands/gaps.c
+++ b/sway/commands/gaps.c
@@ -43,7 +43,7 @@ struct cmd_results *cmd_gaps(int argc, char **argv) {
                        return cmd_results_new(CMD_INVALID, "gaps",
                                "gaps edge_gaps on|off|toggle");
                }
-                arrange_and_commit(&root_container);
+                arrange_windows(&root_container);
        } else {
                int amount_idx = 0; // the current index in argv
                enum gaps_op op = GAPS_OP_SET;
@@ -124,7 +124,7 @@ struct cmd_results *cmd_gaps(int argc, char **argv) {
                if (amount_idx == 0) { // gaps <amount>
                        config->gaps_inner = val;
                        config->gaps_outer = val;
-                        arrange_and_commit(&root_container);
+                        arrange_windows(&root_container);
                        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
                }
                // Other variants. The middle-length variant (gaps inner|outer <amount>)
@@ -155,7 +155,7 @@ struct cmd_results *cmd_gaps(int argc, char **argv) {
                        } else {
                                config->gaps_outer = total;
                        }
-                        arrange_and_commit(&root_container);
+                        arrange_windows(&root_container);
                } else {
                        struct sway_container *c =
                                config->handler_context.current_container;
@@ -169,7 +169,7 @@ struct cmd_results *cmd_gaps(int argc, char **argv) {
                                c->gaps_outer = total;
                        }
-                        arrange_and_commit(c->parent ? c->parent : &root_container);
+                        arrange_windows(c->parent ? c->parent : &root_container);
                }
        }
diff --git a/sway/commands/input.c b/sway/commands/input.c
index 678c57c4..5b203ea0 100644
--- a/sway/commands/input.c
+++ b/sway/commands/input.c
@@ -20,8 +20,10 @@ static struct cmd_handler input_handlers[] = {
        { "pointer_accel", input_cmd_pointer_accel },
        { "repeat_delay", input_cmd_repeat_delay },
        { "repeat_rate", input_cmd_repeat_rate },
+        { "scroll_button", input_cmd_scroll_button },
        { "scroll_method", input_cmd_scroll_method },
        { "tap", input_cmd_tap },
+        { "tap_button_map", input_cmd_tap_button_map },
        { "xkb_layout", input_cmd_xkb_layout },
        { "xkb_model", input_cmd_xkb_model },
        { "xkb_options", input_cmd_xkb_options },
@@ -35,7 +37,7 @@ struct cmd_results *cmd_input(int argc, char **argv) {
                return error;
        }
-        wlr_log(L_DEBUG, "entering input block: %s", argv[0]);
+        wlr_log(WLR_DEBUG, "entering input block: %s", argv[0]);
        config->handler_context.input_config = new_input_config(argv[0]);
        if (!config->handler_context.input_config) {
diff --git a/sway/commands/input/accel_profile.c b/sway/commands/input/accel_profile.c
index 37d6e133..a4108ec3 100644
--- a/sway/commands/input/accel_profile.c
+++ b/sway/commands/input/accel_profile.c
@@ -23,6 +23,7 @@ struct cmd_results *input_cmd_accel_profile(int argc, char **argv) {
        } else if (strcasecmp(argv[0], "flat") == 0) {
                new_config->accel_profile = LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT;
        } else {
+                free_input_config(new_config);
                return cmd_results_new(CMD_INVALID, "accel_profile",
                                "Expected 'accel_profile <adaptive|flat>'");
        }
diff --git a/sway/commands/input/click_method.c b/sway/commands/input/click_method.c
index 8f1f0aa7..5d0d8cc2 100644
--- a/sway/commands/input/click_method.c
+++ b/sway/commands/input/click_method.c
@@ -26,6 +26,7 @@ struct cmd_results *input_cmd_click_method(int argc, char **argv) {
        } else if (strcasecmp(argv[0], "clickfinger") == 0) {
                new_config->click_method = LIBINPUT_CONFIG_CLICK_METHOD_CLICKFINGER;
        } else {
+                free_input_config(new_config);
                return cmd_results_new(CMD_INVALID, "click_method",
                        "Expected 'click_method <none|button_areas|clickfinger'");
        }
diff --git a/sway/commands/input/drag_lock.c b/sway/commands/input/drag_lock.c
index 8273a7d4..9e32816f 100644
--- a/sway/commands/input/drag_lock.c
+++ b/sway/commands/input/drag_lock.c
@@ -23,6 +23,7 @@ struct cmd_results *input_cmd_drag_lock(int argc, char **argv) {
        } else if (strcasecmp(argv[0], "disabled") == 0) {
                new_config->drag_lock = LIBINPUT_CONFIG_DRAG_LOCK_DISABLED;
        } else {
+                free_input_config(new_config);
                return cmd_results_new(CMD_INVALID, "drag_lock",
                        "Expected 'drag_lock <enabled|disabled>'");
        }
diff --git a/sway/commands/input/dwt.c b/sway/commands/input/dwt.c
index 995a2f47..73937507 100644
--- a/sway/commands/input/dwt.c
+++ b/sway/commands/input/dwt.c
@@ -22,6 +22,7 @@ struct cmd_results *input_cmd_dwt(int argc, char **argv) {
        } else if (strcasecmp(argv[0], "disabled") == 0) {
                new_config->dwt = LIBINPUT_CONFIG_DWT_DISABLED;
        } else {
+                free_input_config(new_config);
                return cmd_results_new(CMD_INVALID, "dwt",
                        "Expected 'dwt <enabled|disabled>'");
        }
diff --git a/sway/commands/input/events.c b/sway/commands/input/events.c
index 2217f5ce..abfe3b12 100644
--- a/sway/commands/input/events.c
+++ b/sway/commands/input/events.c
@@ -16,7 +16,7 @@ struct cmd_results *input_cmd_events(int argc, char **argv) {
                return cmd_results_new(CMD_FAILURE, "events",
                        "No input device defined.");
        }
-        wlr_log(L_DEBUG, "events for device: %s",
+        wlr_log(WLR_DEBUG, "events for device: %s",
                current_input_config->identifier);
        struct input_config *new_config =
                new_input_config(current_input_config->identifier);
@@ -29,6 +29,7 @@ struct cmd_results *input_cmd_events(int argc, char **argv) {
                new_config->send_events =
                        LIBINPUT_CONFIG_SEND_EVENTS_DISABLED_ON_EXTERNAL_MOUSE;
        } else {
+                free_input_config(new_config);
                return cmd_results_new(CMD_INVALID, "events",
                        "Expected 'events <enabled|disabled|disabled_on_external_mouse>'");
        }
diff --git a/sway/commands/input/left_handed.c b/sway/commands/input/left_handed.c
index 94b8e03e..769ce98c 100644
--- a/sway/commands/input/left_handed.c
+++ b/sway/commands/input/left_handed.c
@@ -23,6 +23,7 @@ struct cmd_results *input_cmd_left_handed(int argc, char **argv) {
        } else if (strcasecmp(argv[0], "disabled") == 0) {
                new_config->left_handed = 0;
        } else {
+                free_input_config(new_config);
                return cmd_results_new(CMD_INVALID, "left_handed",
                        "Expected 'left_handed <enabled|disabled>'");
        }
diff --git a/sway/commands/input/map_from_region.c b/sway/commands/input/map_from_region.c
index 80bb856d..40f04214 100644
--- a/sway/commands/input/map_from_region.c
+++ b/sway/commands/input/map_from_region.c
@@ -54,20 +54,28 @@ struct cmd_results *input_cmd_map_from_region(int argc, char **argv) {
        bool mm1, mm2;
        if (!parse_coords(argv[0], &new_config->mapped_from_region->x1,
                        &new_config->mapped_from_region->y1, &mm1)) {
+                free(new_config->mapped_from_region);
+                free_input_config(new_config);
                return cmd_results_new(CMD_FAILURE, "map_from_region",
                        "Invalid top-left coordinates");
        }
        if (!parse_coords(argv[1], &new_config->mapped_from_region->x2,
                        &new_config->mapped_from_region->y2, &mm2)) {
+                free(new_config->mapped_from_region);
+                free_input_config(new_config);
                return cmd_results_new(CMD_FAILURE, "map_from_region",
                        "Invalid bottom-right coordinates");
        }
        if (new_config->mapped_from_region->x1 > new_config->mapped_from_region->x2 ||
                        new_config->mapped_from_region->y1 > new_config->mapped_from_region->y2) {
+                free(new_config->mapped_from_region);
+                free_input_config(new_config);
                return cmd_results_new(CMD_FAILURE, "map_from_region",
                        "Invalid rectangle");
        }
        if (mm1 != mm2) {
+                free(new_config->mapped_from_region);
+                free_input_config(new_config);
                return cmd_results_new(CMD_FAILURE, "map_from_region",
                        "Both coordinates must be in the same unit");
        }
diff --git a/sway/commands/input/middle_emulation.c b/sway/commands/input/middle_emulation.c
index a551fd51..7ca01629 100644
--- a/sway/commands/input/middle_emulation.c
+++ b/sway/commands/input/middle_emulation.c
@@ -24,6 +24,7 @@ struct cmd_results *input_cmd_middle_emulation(int argc, char **argv) {
                new_config->middle_emulation =
                        LIBINPUT_CONFIG_MIDDLE_EMULATION_DISABLED;
        } else {
+                free_input_config(new_config);
                return cmd_results_new(CMD_INVALID, "middle_emulation",
                        "Expected 'middle_emulation <enabled|disabled>'");
        }
diff --git a/sway/commands/input/natural_scroll.c b/sway/commands/input/natural_scroll.c
index c4e19b78..55236790 100644
--- a/sway/commands/input/natural_scroll.c
+++ b/sway/commands/input/natural_scroll.c
@@ -23,6 +23,7 @@ struct cmd_results *input_cmd_natural_scroll(int argc, char **argv) {
        } else if (strcasecmp(argv[0], "disabled") == 0) {
                new_config->natural_scroll = 0;
        } else {
+                free_input_config(new_config);
                return cmd_results_new(CMD_INVALID, "natural_scroll",
                        "Expected 'natural_scroll <enabled|disabled>'");
        }
diff --git a/sway/commands/input/pointer_accel.c b/sway/commands/input/pointer_accel.c
index 171063aa..8bbd0724 100644
--- a/sway/commands/input/pointer_accel.c
+++ b/sway/commands/input/pointer_accel.c
@@ -20,6 +20,7 @@ struct cmd_results *input_cmd_pointer_accel(int argc, char **argv) {
        float pointer_accel = atof(argv[0]);
        if (pointer_accel < -1 || pointer_accel > 1) {
+                free_input_config(new_config);
                return cmd_results_new(CMD_INVALID, "pointer_accel",
                        "Input out of range [-1, 1]");
        }
diff --git a/sway/commands/input/repeat_delay.c b/sway/commands/input/repeat_delay.c
index ce265841..c9ddbf0e 100644
--- a/sway/commands/input/repeat_delay.c
+++ b/sway/commands/input/repeat_delay.c
@@ -20,6 +20,7 @@ struct cmd_results *input_cmd_repeat_delay(int argc, char **argv) {
        int repeat_delay = atoi(argv[0]);
        if (repeat_delay < 0) {
+                free_input_config(new_config);
                return cmd_results_new(CMD_INVALID, "repeat_delay",
                        "Repeat delay cannot be negative");
        }
diff --git a/sway/commands/input/repeat_rate.c b/sway/commands/input/repeat_rate.c
index f2ea2e69..56878176 100644
--- a/sway/commands/input/repeat_rate.c
+++ b/sway/commands/input/repeat_rate.c
@@ -20,6 +20,7 @@ struct cmd_results *input_cmd_repeat_rate(int argc, char **argv) {
        int repeat_rate = atoi(argv[0]);
        if (repeat_rate < 0) {
+                free_input_config(new_config);
                return cmd_results_new(CMD_INVALID, "repeat_rate",
                        "Repeat rate cannot be negative");
        }
diff --git a/sway/commands/input/scroll_button.c b/sway/commands/input/scroll_button.c
new file mode 100644
index 00000000..350fcca2
--- /dev/null
+++ b/sway/commands/input/scroll_button.c
@@ -0,0 +1,44 @@
+#include <string.h>
+#include <strings.h>
+#include <errno.h>
+#include "sway/config.h"
+#include "sway/commands.h"
+#include "sway/input/input-manager.h"
+struct cmd_results *input_cmd_scroll_button(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "scroll_button", EXPECTED_AT_LEAST, 1))) {
+                return error;
+        }
+        struct input_config *current_input_config =
+                config->handler_context.input_config;
+        if (!current_input_config) {
+                return cmd_results_new(CMD_FAILURE, "scroll_button",
+                        "No input device defined.");
+        }
+        struct input_config *new_config =
+                new_input_config(current_input_config->identifier);
+        errno = 0;
+        char *endptr;
+        int scroll_button = strtol(*argv, &endptr, 10);
+        if (endptr == *argv && scroll_button == 0) {
+                free_input_config(new_config);
+                return cmd_results_new(CMD_INVALID, "scroll_button",
+                                "Scroll button identifier must be an integer.");
+        }
+        if (errno == ERANGE) {
+                free_input_config(new_config);
+                return cmd_results_new(CMD_INVALID, "scroll_button",
+                                "Scroll button identifier out of range.");
+        }
+        if (scroll_button < 0) {
+                free_input_config(new_config);
+                return cmd_results_new(CMD_INVALID, "scroll_button",
+                                "Scroll button identifier cannot be negative.");
+        }
+        new_config->scroll_button = scroll_button;
+        apply_input_config(new_config);
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/commands/input/scroll_method.c b/sway/commands/input/scroll_method.c
index 0a1c57ac..4c6ac6b6 100644
--- a/sway/commands/input/scroll_method.c
+++ b/sway/commands/input/scroll_method.c
@@ -27,6 +27,7 @@ struct cmd_results *input_cmd_scroll_method(int argc, char **argv) {
        } else if (strcasecmp(argv[0], "on_button_down") == 0) {
                new_config->scroll_method = LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN;
        } else {
+                free_input_config(new_config);
                return cmd_results_new(CMD_INVALID, "scroll_method",
                        "Expected 'scroll_method <none|two_finger|edge|on_button_down>'");
        }
diff --git a/sway/commands/input/tap.c b/sway/commands/input/tap.c
index e7f03058..a8d1a10c 100644
--- a/sway/commands/input/tap.c
+++ b/sway/commands/input/tap.c
@@ -23,11 +23,12 @@ struct cmd_results *input_cmd_tap(int argc, char **argv) {
        } else if (strcasecmp(argv[0], "disabled") == 0) {
                new_config->tap = LIBINPUT_CONFIG_TAP_DISABLED;
        } else {
+                free_input_config(new_config);
                return cmd_results_new(CMD_INVALID, "tap",
                        "Expected 'tap <enabled|disabled>'");
        }
-        wlr_log(L_DEBUG, "apply-tap for device: %s",
+        wlr_log(WLR_DEBUG, "apply-tap for device: %s",
                current_input_config->identifier);
        apply_input_config(new_config);
        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
diff --git a/sway/commands/input/tap_button_map.c b/sway/commands/input/tap_button_map.c
new file mode 100644
index 00000000..bdbba472
--- /dev/null
+++ b/sway/commands/input/tap_button_map.c
@@ -0,0 +1,33 @@
+#include <string.h>
+#include <strings.h>
+#include "sway/config.h"
+#include "sway/commands.h"
+#include "sway/input/input-manager.h"
+struct cmd_results *input_cmd_tap_button_map(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "tap_button_map", EXPECTED_AT_LEAST, 1))) {
+                return error;
+        }
+        struct input_config *current_input_config =
+                config->handler_context.input_config;
+        if (!current_input_config) {
+                return cmd_results_new(CMD_FAILURE, "tap_button_map",
+                                "No input device defined.");
+        }
+        struct input_config *new_config =
+                new_input_config(current_input_config->identifier);
+        if (strcasecmp(argv[0], "lrm") == 0) {
+                new_config->tap_button_map = LIBINPUT_CONFIG_TAP_MAP_LRM;
+        } else if (strcasecmp(argv[0], "lmr") == 0) {
+                new_config->tap_button_map = LIBINPUT_CONFIG_TAP_MAP_LMR;
+        } else {
+                free_input_config(new_config);
+                return cmd_results_new(CMD_INVALID, "tap_button_map",
+                        "Expected 'tap_button_map <lrm|lmr>'");
+        }
+        apply_input_config(new_config);
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/commands/input/xkb_layout.c b/sway/commands/input/xkb_layout.c
index 867e65d3..9fa5a344 100644
--- a/sway/commands/input/xkb_layout.c
+++ b/sway/commands/input/xkb_layout.c
@@ -19,7 +19,7 @@ struct cmd_results *input_cmd_xkb_layout(int argc, char **argv) {
        new_config->xkb_layout = strdup(argv[0]);
-        wlr_log(L_DEBUG, "apply-xkb_layout for device: %s layout: %s",
+        wlr_log(WLR_DEBUG, "apply-xkb_layout for device: %s layout: %s",
                current_input_config->identifier, new_config->xkb_layout);
        apply_input_config(new_config);
        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
diff --git a/sway/commands/input/xkb_model.c b/sway/commands/input/xkb_model.c
index e8c8e04e..0d082625 100644
--- a/sway/commands/input/xkb_model.c
+++ b/sway/commands/input/xkb_model.c
@@ -19,7 +19,7 @@ struct cmd_results *input_cmd_xkb_model(int argc, char **argv) {
        new_config->xkb_model = strdup(argv[0]);
-        wlr_log(L_DEBUG, "apply-xkb_model for device: %s model: %s",
+        wlr_log(WLR_DEBUG, "apply-xkb_model for device: %s model: %s",
                current_input_config->identifier, new_config->xkb_model);
        apply_input_config(new_config);
        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
diff --git a/sway/commands/input/xkb_options.c b/sway/commands/input/xkb_options.c
index e9ddd6e3..3059d941 100644
--- a/sway/commands/input/xkb_options.c
+++ b/sway/commands/input/xkb_options.c
@@ -19,7 +19,7 @@ struct cmd_results *input_cmd_xkb_options(int argc, char **argv) {
        new_config->xkb_options = strdup(argv[0]);
-        wlr_log(L_DEBUG, "apply-xkb_options for device: %s options: %s",
+        wlr_log(WLR_DEBUG, "apply-xkb_options for device: %s options: %s",
                current_input_config->identifier, new_config->xkb_options);
        apply_input_config(new_config);
        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
diff --git a/sway/commands/input/xkb_rules.c b/sway/commands/input/xkb_rules.c
index 926d0ac1..560f088e 100644
--- a/sway/commands/input/xkb_rules.c
+++ b/sway/commands/input/xkb_rules.c
@@ -19,7 +19,7 @@ struct cmd_results *input_cmd_xkb_rules(int argc, char **argv) {
        new_config->xkb_rules = strdup(argv[0]);
-        wlr_log(L_DEBUG, "apply-xkb_rules for device: %s rules: %s",
+        wlr_log(WLR_DEBUG, "apply-xkb_rules for device: %s rules: %s",
                current_input_config->identifier, new_config->xkb_rules);
        apply_input_config(new_config);
        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
diff --git a/sway/commands/input/xkb_variant.c b/sway/commands/input/xkb_variant.c
index 0e3ffd41..0aa03440 100644
--- a/sway/commands/input/xkb_variant.c
+++ b/sway/commands/input/xkb_variant.c
@@ -19,7 +19,7 @@ struct cmd_results *input_cmd_xkb_variant(int argc, char **argv) {
        new_config->xkb_variant = strdup(argv[0]);
-        wlr_log(L_DEBUG, "apply-xkb_variant for device: %s variant: %s",
+        wlr_log(WLR_DEBUG, "apply-xkb_variant for device: %s variant: %s",
                current_input_config->identifier, new_config->xkb_variant);
        apply_input_config(new_config);
        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
diff --git a/sway/commands/layout.c b/sway/commands/layout.c
index 9945fa5c..c446f1f9 100644
--- a/sway/commands/layout.c
+++ b/sway/commands/layout.c
@@ -49,7 +49,7 @@ struct cmd_results *cmd_layout(int argc, char **argv) {
        }
        container_notify_subtree_changed(parent);
-        arrange_and_commit(parent);
+        arrange_windows(parent);
        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
diff --git a/sway/commands/mode.c b/sway/commands/mode.c
index 00331ccc..b460fcb5 100644
--- a/sway/commands/mode.c
+++ b/sway/commands/mode.c
@@ -26,7 +26,17 @@ struct cmd_results *cmd_mode(int argc, char **argv) {
                                "mode", "Can only be used in config file.");
        }
-        const char *mode_name = argv[0];
+        bool pango = strcmp(*argv, "--pango_markup") == 0;
+        if (pango) {
+                argc--; argv++;
+                if (argc == 0) {
+                        return cmd_results_new(CMD_FAILURE, "mode",
+                                        "Mode name is missing");
+                }
+        }
+        char *mode_name = *argv;
+        strip_quotes(mode_name);
        struct sway_mode *mode = NULL;
        // Find mode
        for (int i = 0; i < config->modes->length; ++i) {
@@ -46,6 +56,7 @@ struct cmd_results *cmd_mode(int argc, char **argv) {
                mode->name = strdup(mode_name);
                mode->keysym_bindings = create_list();
                mode->keycode_bindings = create_list();
+                mode->pango = pango;
                list_add(config->modes, mode);
        }
        if (!mode) {
@@ -54,13 +65,15 @@ struct cmd_results *cmd_mode(int argc, char **argv) {
                return error;
        }
        if ((config->reading && argc > 1) || (!config->reading && argc == 1)) {
-                wlr_log(L_DEBUG, "Switching to mode `%s'",mode->name);
+                wlr_log(WLR_DEBUG, "Switching to mode `%s' (pango=%d)",
+                                mode->name, mode->pango);
        }
        // Set current mode
        config->current_mode = mode;
        if (argc == 1) {
                // trigger IPC mode event
-                ipc_event_mode(config->current_mode->name);
+                ipc_event_mode(config->current_mode->name,
+                                config->current_mode->pango);
                return cmd_results_new(CMD_SUCCESS, NULL, NULL);
        }
diff --git a/sway/commands/move.c b/sway/commands/move.c
index a4fae388..1940043d 100644
--- a/sway/commands/move.c
+++ b/sway/commands/move.c
@@ -1,13 +1,15 @@
 #define _XOPEN_SOURCE 500
 #include <string.h>
 #include <strings.h>
+#include <wlr/types/wlr_cursor.h>
 #include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/util/log.h>
 #include "sway/commands.h"
-#include "sway/desktop/transaction.h"
+#include "sway/input/cursor.h"
 #include "sway/input/seat.h"
 #include "sway/output.h"
+#include "sway/scratchpad.h"
 #include "sway/tree/arrange.h"
 #include "sway/tree/container.h"
 #include "sway/tree/layout.h"
@@ -103,10 +105,8 @@ static struct cmd_results *cmd_move_container(struct sway_container *current,
                // TODO: Ideally we would arrange the surviving parent after reaping,
                // but container_reap_empty does not return it, so we arrange the
                // workspace instead.
-                struct sway_transaction *txn = transaction_create();
+                arrange_windows(old_ws);
-                arrange_windows(old_ws, txn);
+                arrange_windows(destination->parent);
-                arrange_windows(destination->parent, txn);
-                transaction_commit(txn);
                return cmd_results_new(CMD_SUCCESS, NULL, NULL);
        } else if (strcasecmp(argv[1], "to") == 0
@@ -142,10 +142,8 @@ static struct cmd_results *cmd_move_container(struct sway_container *current,
                // TODO: Ideally we would arrange the surviving parent after reaping,
                // but container_reap_empty does not return it, so we arrange the
                // workspace instead.
-                struct sway_transaction *txn = transaction_create();
+                arrange_windows(old_ws);
-                arrange_windows(old_ws, txn);
+                arrange_windows(focus->parent);
-                arrange_windows(focus->parent, txn);
-                transaction_commit(txn);
                return cmd_results_new(CMD_SUCCESS, NULL, NULL);
        }
@@ -175,20 +173,56 @@ static struct cmd_results *cmd_move_workspace(struct sway_container *current,
        }
        container_move_to(current, destination);
-        struct sway_transaction *txn = transaction_create();
+        arrange_windows(source);
-        arrange_windows(source, txn);
+        arrange_windows(destination);
-        arrange_windows(destination, txn);
-        transaction_commit(txn);
        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
 static struct cmd_results *move_in_direction(struct sway_container *container,
-                enum movement_direction direction, int move_amt) {
+                enum movement_direction direction, int argc, char **argv) {
+        int move_amt = 10;
+        if (argc > 1) {
+                char *inv;
+                move_amt = (int)strtol(argv[1], &inv, 10);
+                if (*inv != '\0' && strcasecmp(inv, "px") != 0) {
+                        return cmd_results_new(CMD_FAILURE, "move",
+                                        "Invalid distance specified");
+                }
+        }
        if (container->type == C_WORKSPACE) {
                return cmd_results_new(CMD_FAILURE, "move",
                                "Cannot move workspaces in a direction");
        }
+        if (container_is_floating(container)) {
+                if (container->type == C_VIEW && container->sway_view->is_fullscreen) {
+                        return cmd_results_new(CMD_FAILURE, "move",
+                                        "Cannot move fullscreen floating container");
+                }
+                double lx = container->x;
+                double ly = container->y;
+                switch (direction) {
+                case MOVE_LEFT:
+                        lx -= move_amt;
+                        break;
+                case MOVE_RIGHT:
+                        lx += move_amt;
+                        break;
+                case MOVE_UP:
+                        ly -= move_amt;
+                        break;
+                case MOVE_DOWN:
+                        ly += move_amt;
+                        break;
+                case MOVE_PARENT:
+                case MOVE_CHILD:
+                        return cmd_results_new(CMD_FAILURE, "move",
+                                        "Cannot move floating container to parent or child");
+                }
+                container_floating_move_to(container, lx, ly);
+                return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+        }
        // For simplicity, we'll arrange the entire workspace. The reason for this
        // is moving the container might reap the old parent, and container_move
        // does not return a surviving parent.
@@ -198,54 +232,112 @@ static struct cmd_results *move_in_direction(struct sway_container *container,
        container_move(container, direction, move_amt);
        struct sway_container *new_ws = container_parent(container, C_WORKSPACE);
-        struct sway_transaction *txn = transaction_create();
+        arrange_windows(old_ws);
-        arrange_windows(old_ws, txn);
        if (new_ws != old_ws) {
-                arrange_windows(new_ws, txn);
+                arrange_windows(new_ws);
        }
-        transaction_commit(txn);
        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
+static const char* expected_position_syntax =
+        "Expected 'move [absolute] position <x> <y>' or "
+        "'move [absolute] position mouse'";
+static struct cmd_results *move_to_position(struct sway_container *container,
+                int argc, char **argv) {
+        if (!container_is_floating(container)) {
+                return cmd_results_new(CMD_FAILURE, "move",
+                                "Only floating containers "
+                                "can be moved to an absolute position");
+        }
+        if (!argc) {
+                return cmd_results_new(CMD_FAILURE, "move", expected_position_syntax);
+        }
+        if (strcmp(argv[0], "absolute") == 0) {
+                --argc;
+                ++argv;
+        }
+        if (!argc) {
+                return cmd_results_new(CMD_FAILURE, "move", expected_position_syntax);
+        }
+        if (strcmp(argv[0], "position") == 0) {
+                --argc;
+                ++argv;
+        }
+        if (!argc) {
+                return cmd_results_new(CMD_FAILURE, "move", expected_position_syntax);
+        }
+        if (strcmp(argv[0], "mouse") == 0) {
+                struct sway_seat *seat = config->handler_context.seat;
+                if (!seat->cursor) {
+                        return cmd_results_new(CMD_FAILURE, "move", "No cursor device");
+                }
+                double lx = seat->cursor->cursor->x - container->width / 2;
+                double ly = seat->cursor->cursor->y - container->height / 2;
+                container_floating_move_to(container, lx, ly);
+                return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+        }
+        if (argc != 2) {
+                return cmd_results_new(CMD_FAILURE, "move", expected_position_syntax);
+        }
+        double lx, ly;
+        char *inv;
+        lx = (double)strtol(argv[0], &inv, 10);
+        if (*inv != '\0' && strcasecmp(inv, "px") != 0) {
+                return cmd_results_new(CMD_FAILURE, "move",
+                                "Invalid position specified");
+        }
+        ly = (double)strtol(argv[1], &inv, 10);
+        if (*inv != '\0' && strcasecmp(inv, "px") != 0) {
+                return cmd_results_new(CMD_FAILURE, "move",
+                                "Invalid position specified");
+        }
+        container_floating_move_to(container, lx, ly);
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
+static struct cmd_results *move_to_scratchpad(struct sway_container *con) {
+        if (con->type != C_CONTAINER && con->type != C_VIEW) {
+                return cmd_results_new(CMD_INVALID, "move",
+                                "Only views and containers can be moved to the scratchpad");
+        }
+        if (con->scratchpad) {
+                return cmd_results_new(CMD_INVALID, "move",
+                                "Container is already in the scratchpad");
+        }
+        scratchpad_add_container(con);
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
 struct cmd_results *cmd_move(int argc, char **argv) {
        struct cmd_results *error = NULL;
-        int move_amt = 10;
        if ((error = checkarg(argc, "move", EXPECTED_AT_LEAST, 1))) {
                return error;
        }
        struct sway_container *current = config->handler_context.current_container;
-        if (argc == 2 || (argc == 3 && strcasecmp(argv[2], "px") == 0)) {
-                char *inv;
-                move_amt = (int)strtol(argv[1], &inv, 10);
-                if (*inv != '\0' && strcasecmp(inv, "px") != 0) {
-                        return cmd_results_new(CMD_FAILURE, "move",
-                                        "Invalid distance specified");
-                }
-        }
        if (strcasecmp(argv[0], "left") == 0) {
-                return move_in_direction(current, MOVE_LEFT, move_amt);
+                return move_in_direction(current, MOVE_LEFT, argc, argv);
        } else if (strcasecmp(argv[0], "right") == 0) {
-                return move_in_direction(current, MOVE_RIGHT, move_amt);
+                return move_in_direction(current, MOVE_RIGHT, argc, argv);
        } else if (strcasecmp(argv[0], "up") == 0) {
-                return move_in_direction(current, MOVE_UP, move_amt);
+                return move_in_direction(current, MOVE_UP, argc, argv);
        } else if (strcasecmp(argv[0], "down") == 0) {
-                return move_in_direction(current, MOVE_DOWN, move_amt);
+                return move_in_direction(current, MOVE_DOWN, argc, argv);
        } else if (strcasecmp(argv[0], "container") == 0
                        || strcasecmp(argv[0], "window") == 0) {
                return cmd_move_container(current, argc, argv);
        } else if (strcasecmp(argv[0], "workspace") == 0) {
                return cmd_move_workspace(current, argc, argv);
        } else if (strcasecmp(argv[0], "scratchpad") == 0
-                        || (strcasecmp(argv[0], "to") == 0
+                        || (strcasecmp(argv[0], "to") == 0 && argc == 2
                                && strcasecmp(argv[1], "scratchpad") == 0)) {
-                // TODO: scratchpad
+                return move_to_scratchpad(current);
-                return cmd_results_new(CMD_FAILURE, "move", "Unimplemented");
        } else if (strcasecmp(argv[0], "position") == 0) {
-                // TODO: floating
+                return move_to_position(current, argc, argv);
-                return cmd_results_new(CMD_FAILURE, "move", "Unimplemented");
+        } else if (strcasecmp(argv[0], "absolute") == 0) {
+                return move_to_position(current, argc, argv);
        } else {
                return cmd_results_new(CMD_INVALID, "move", expected_syntax);
        }
diff --git a/sway/commands/no_focus.c b/sway/commands/no_focus.c
new file mode 100644
index 00000000..61a8de7e
--- /dev/null
+++ b/sway/commands/no_focus.c
@@ -0,0 +1,26 @@
+#define _XOPEN_SOURCE 500
+#include <string.h>
+#include "sway/commands.h"
+#include "sway/criteria.h"
+#include "list.h"
+#include "log.h"
+struct cmd_results *cmd_no_focus(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "no_focus", EXPECTED_AT_LEAST, 1))) {
+                return error;
+        }
+        char *err_str = NULL;
+        struct criteria *criteria = criteria_parse(argv[0], &err_str);
+        if (!criteria) {
+                error = cmd_results_new(CMD_INVALID, "no_focus", err_str);
+                free(err_str);
+                return error;
+        }
+        criteria->type = CT_NO_FOCUS;
+        list_add(config->criteria, criteria);
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/commands/output.c b/sway/commands/output.c
index f955bf90..ef1b7a69 100644
--- a/sway/commands/output.c
+++ b/sway/commands/output.c
@@ -29,7 +29,7 @@ struct cmd_results *cmd_output(int argc, char **argv) {
        struct output_config *output = new_output_config(argv[0]);
        if (!output) {
-                wlr_log(L_ERROR, "Failed to allocate output config");
+                wlr_log(WLR_ERROR, "Failed to allocate output config");
                return NULL;
        }
        argc--; argv++;
@@ -60,53 +60,13 @@ struct cmd_results *cmd_output(int argc, char **argv) {
        config->handler_context.leftovers.argc = 0;
        config->handler_context.leftovers.argv = NULL;
-        int i = list_seq_find(config->output_configs, output_name_cmp, output->name);
+        output = store_output_config(output);
-        if (i >= 0) {
-                // Merge existing config
-                struct output_config *current = config->output_configs->items[i];
-                merge_output_config(current, output);
-                free_output_config(output);
-                output = current;
-        } else {
-                list_add(config->output_configs, output);
-        }
-        wlr_log(L_DEBUG, "Config stored for output %s (enabled: %d) (%dx%d@%fHz "
-                "position %d,%d scale %f transform %d) (bg %s %s) (dpms %d)",
-                output->name, output->enabled, output->width, output->height,
-                output->refresh_rate, output->x, output->y, output->scale,
-                output->transform, output->background, output->background_option, output->dpms_state);
-        // Try to find the output container and apply configuration now. If
-        // this is during startup then there will be no container and config
-        // will be applied during normal "new output" event from wlroots.
-        char identifier[128];
-        bool all = strcmp(output->name, "*") == 0;
-        struct sway_output *sway_output;
-        wl_list_for_each(sway_output, &root_container.sway_root->outputs, link) {
-                output_get_identifier(identifier, sizeof(identifier), sway_output);
-                wlr_log(L_DEBUG, "Checking identifier %s", identifier);
-                if (all || strcmp(sway_output->wlr_output->name, output->name) == 0
-                                || strcmp(identifier, output->name) == 0) {
-                        if (!sway_output->swayc) {
-                                if (!output->enabled) {
-                                        if (!all) {
-                                                break;
-                                        }
-                                        continue;
-                                }
-                                output_enable(sway_output);
+        // If reloading, the output configs will be applied after reading the
-                        }
+        // entire config and before the deferred commands so that an auto generated
+        // workspace name is not given to re-enabled outputs.
-                        apply_output_config(output, sway_output->swayc);
+        if (!config->reloading) {
+                apply_output_config_to_outputs(output);
-                        if (!all) {
-                                // Stop looking if the output config isn't applicable to all
-                                // outputs
-                                break;
-                        }
-                }
        }
        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
diff --git a/sway/commands/output/background.c b/sway/commands/output/background.c
index 55cbdff0..4ed56c2a 100644
--- a/sway/commands/output/background.c
+++ b/sway/commands/output/background.c
@@ -72,7 +72,7 @@ struct cmd_results *output_cmd_background(int argc, char **argv) {
                src = strdup(p.we_wordv[0]);
                wordfree(&p);
                if (!src) {
-                        wlr_log(L_ERROR, "Failed to duplicate string");
+                        wlr_log(WLR_ERROR, "Failed to duplicate string");
                        return cmd_results_new(CMD_FAILURE, "output",
                                "Unable to allocate resource");
                }
@@ -80,9 +80,10 @@ struct cmd_results *output_cmd_background(int argc, char **argv) {
                if (config->reading && *src != '/') {
                        // src file is inside configuration dir
-                        char *conf = strdup(config->current_config);
+                        char *conf = strdup(config->current_config_path);
-                        if(!conf) {
+                        if (!conf) {
-                                wlr_log(L_ERROR, "Failed to duplicate string");
+                                wlr_log(WLR_ERROR, "Failed to duplicate string");
+                                free(src);
                                return cmd_results_new(CMD_FAILURE, "output",
                                                "Unable to allocate resources");
                        }
@@ -93,7 +94,7 @@ struct cmd_results *output_cmd_background(int argc, char **argv) {
                        if (!src) {
                                free(rel_path);
                                free(conf);
-                                wlr_log(L_ERROR, "Unable to allocate memory");
+                                wlr_log(WLR_ERROR, "Unable to allocate memory");
                                return cmd_results_new(CMD_FAILURE, "output",
                                                "Unable to allocate resources");
                        }
diff --git a/sway/commands/output/mode.c b/sway/commands/output/mode.c
index daec6d44..ef56ae9e 100644
--- a/sway/commands/output/mode.c
+++ b/sway/commands/output/mode.c
@@ -36,11 +36,11 @@ struct cmd_results *output_cmd_mode(int argc, char **argv) {
                }
        } else {
                // Format is 1234 4321
+                argc--; argv++;
                if (!argc) {
                        return cmd_results_new(CMD_INVALID, "output",
                                "Missing mode argument (height).");
                }
-                argc--; argv++;
                output->height = strtol(*argv, &end, 10);
                if (*end) {
                        return cmd_results_new(CMD_INVALID, "output",
diff --git a/sway/commands/output/position.c b/sway/commands/output/position.c
index c2aeb281..449767b1 100644
--- a/sway/commands/output/position.c
+++ b/sway/commands/output/position.c
@@ -27,11 +27,11 @@ struct cmd_results *output_cmd_position(int argc, char **argv) {
                }
        } else {
                // Format is 1234 4321 (legacy)
+                argc--; argv++;
                if (!argc) {
                        return cmd_results_new(CMD_INVALID, "output",
                                "Missing position argument (y).");
                }
-                argc--; argv++;
                config->handler_context.output_config->y = strtol(*argv, &end, 10);
                if (*end) {
                        return cmd_results_new(CMD_INVALID, "output",
diff --git a/sway/commands/reload.c b/sway/commands/reload.c
index 9fc213c4..cea6a94b 100644
--- a/sway/commands/reload.c
+++ b/sway/commands/reload.c
@@ -7,11 +7,11 @@ struct cmd_results *cmd_reload(int argc, char **argv) {
        if ((error = checkarg(argc, "reload", EXPECTED_EQUAL_TO, 0))) {
                return error;
        }
-        if (!load_main_config(config->current_config, true)) {
+        if (!load_main_config(config->current_config_path, true)) {
                return cmd_results_new(CMD_FAILURE, "reload", "Error(s) reloading config.");
        }
        load_swaybars();
-        arrange_and_commit(&root_container);
+        arrange_windows(&root_container);
        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
diff --git a/sway/commands/rename.c b/sway/commands/rename.c
index 104a3392..a380ff9c 100644
--- a/sway/commands/rename.c
+++ b/sway/commands/rename.c
@@ -68,7 +68,7 @@ struct cmd_results *cmd_rename(int argc, char **argv) {
                                "Workspace already exists");
        }
-        wlr_log(L_DEBUG, "renaming workspace '%s' to '%s'", workspace->name, new_name);
+        wlr_log(WLR_DEBUG, "renaming workspace '%s' to '%s'", workspace->name, new_name);
        free(workspace->name);
        workspace->name = new_name;
diff --git a/sway/commands/resize.c b/sway/commands/resize.c
index 6357343e..e657864c 100644
--- a/sway/commands/resize.c
+++ b/sway/commands/resize.c
@@ -1,4 +1,5 @@
 #include <errno.h>
+#include <limits.h>
 #include <math.h>
 #include <stdbool.h>
 #include <stdlib.h>
@@ -7,6 +8,7 @@
 #include <wlr/util/log.h>
 #include "sway/commands.h"
 #include "sway/tree/arrange.h"
+#include "sway/tree/view.h"
 #include "log.h"
 static const int MIN_SANE_W = 100, MIN_SANE_H = 60;
@@ -21,9 +23,18 @@ enum resize_unit {
 enum resize_axis {
        RESIZE_AXIS_HORIZONTAL,
        RESIZE_AXIS_VERTICAL,
+        RESIZE_AXIS_UP,
+        RESIZE_AXIS_DOWN,
+        RESIZE_AXIS_LEFT,
+        RESIZE_AXIS_RIGHT,
        RESIZE_AXIS_INVALID,
 };
+struct resize_amount {
+        int amount;
+        enum resize_unit unit;
+};
 static enum resize_unit parse_resize_unit(const char *unit) {
        if (strcasecmp(unit, "px") == 0) {
                return RESIZE_UNIT_PX;
@@ -37,6 +48,69 @@ static enum resize_unit parse_resize_unit(const char *unit) {
        return RESIZE_UNIT_INVALID;
 }
+// Parse arguments such as "10", "10px" or "10 px".
+// Returns the number of arguments consumed.
+static int parse_resize_amount(int argc, char **argv,
+                struct resize_amount *amount) {
+        char *err;
+        amount->amount = (int)strtol(argv[0], &err, 10);
+        if (*err) {
+                // e.g. 10px
+                amount->unit = parse_resize_unit(err);
+                return 1;
+        }
+        if (argc == 1) {
+                amount->unit = RESIZE_UNIT_DEFAULT;
+                return 1;
+        }
+        // Try the second argument
+        amount->unit = parse_resize_unit(argv[1]);
+        if (amount->unit == RESIZE_UNIT_INVALID) {
+                amount->unit = RESIZE_UNIT_DEFAULT;
+                return 1;
+        }
+        return 2;
+}
+static void calculate_constraints(int *min_width, int *max_width,
+                int *min_height, int *max_height) {
+        struct sway_container *con = config->handler_context.current_container;
+        if (config->floating_minimum_width == -1) { // no minimum
+                *min_width = 0;
+        } else if (config->floating_minimum_width == 0) { // automatic
+                *min_width = 75;
+        } else {
+                *min_width = config->floating_minimum_width;
+        }
+        if (config->floating_minimum_height == -1) { // no minimum
+                *min_height = 0;
+        } else if (config->floating_minimum_height == 0) { // automatic
+                *min_height = 50;
+        } else {
+                *min_height = config->floating_minimum_height;
+        }
+        if (config->floating_maximum_width == -1) { // no maximum
+                *max_width = INT_MAX;
+        } else if (config->floating_maximum_width == 0) { // automatic
+                struct sway_container *ws = container_parent(con, C_WORKSPACE);
+                *max_width = ws->width;
+        } else {
+                *max_width = config->floating_maximum_width;
+        }
+        if (config->floating_maximum_height == -1) { // no maximum
+                *max_height = INT_MAX;
+        } else if (config->floating_maximum_height == 0) { // automatic
+                struct sway_container *ws = container_parent(con, C_WORKSPACE);
+                *max_height = ws->height;
+        } else {
+                *max_height = config->floating_maximum_height;
+        }
+}
 static enum resize_axis parse_resize_axis(const char *axis) {
        if (strcasecmp(axis, "width") == 0 || strcasecmp(axis, "horizontal") == 0) {
                return RESIZE_AXIS_HORIZONTAL;
@@ -44,6 +118,18 @@ static enum resize_axis parse_resize_axis(const char *axis) {
        if (strcasecmp(axis, "height") == 0 || strcasecmp(axis, "vertical") == 0) {
                return RESIZE_AXIS_VERTICAL;
        }
+        if (strcasecmp(axis, "up") == 0) {
+                return RESIZE_AXIS_UP;
+        }
+        if (strcasecmp(axis, "down") == 0) {
+                return RESIZE_AXIS_DOWN;
+        }
+        if (strcasecmp(axis, "left") == 0) {
+                return RESIZE_AXIS_LEFT;
+        }
+        if (strcasecmp(axis, "right") == 0) {
+                return RESIZE_AXIS_RIGHT;
+        }
        return RESIZE_AXIS_INVALID;
 }
@@ -95,7 +181,7 @@ static void resize_tiled(int amount, enum resize_axis axis) {
                return;
        }
-        wlr_log(L_DEBUG,
+        wlr_log(WLR_DEBUG,
                        "Found the proper parent: %p. It has %d l conts, and %d r conts",
                        parent->parent, minor_weight, major_weight);
@@ -182,105 +268,315 @@ static void resize_tiled(int amount, enum resize_axis axis) {
                }
        }
-        arrange_and_commit(parent->parent);
+        arrange_windows(parent->parent);
 }
-static void resize(int amount, enum resize_axis axis, enum resize_unit unit) {
+/**
-        struct sway_container *current = config->handler_context.current_container;
+ * Implement `resize <grow|shrink>` for a floating container.
-        if (unit == RESIZE_UNIT_DEFAULT) {
+ */
-                // Default for tiling; TODO floating should be px
+static struct cmd_results *resize_adjust_floating(enum resize_axis axis,
-                unit = RESIZE_UNIT_PPT;
+                struct resize_amount *amount) {
+        struct sway_container *con = config->handler_context.current_container;
+        int grow_width = 0, grow_height = 0;
+        switch (axis) {
+        case RESIZE_AXIS_HORIZONTAL:
+        case RESIZE_AXIS_LEFT:
+        case RESIZE_AXIS_RIGHT:
+                grow_width = amount->amount;
+                break;
+        case RESIZE_AXIS_VERTICAL:
+        case RESIZE_AXIS_UP:
+        case RESIZE_AXIS_DOWN:
+                grow_height = amount->amount;
+                break;
+        case RESIZE_AXIS_INVALID:
+                return cmd_results_new(CMD_INVALID, "resize", "Invalid axis/direction");
+        }
+        // Make sure we're not adjusting beyond floating min/max size
+        int min_width, max_width, min_height, max_height;
+        calculate_constraints(&min_width, &max_width, &min_height, &max_height);
+        if (con->width + grow_width < min_width) {
+                grow_width = min_width - con->width;
+        } else if (con->width + grow_width > max_width) {
+                grow_width = max_width - con->width;
        }
+        if (con->height + grow_height < min_height) {
+                grow_height = min_height - con->height;
+        } else if (con->height + grow_height > max_height) {
+                grow_height = max_height - con->height;
+        }
+        int grow_x = 0, grow_y = 0;
+        switch (axis) {
+        case RESIZE_AXIS_HORIZONTAL:
+                grow_x = -grow_width / 2;
+                break;
+        case RESIZE_AXIS_VERTICAL:
+                grow_y = -grow_height / 2;
+                break;
+        case RESIZE_AXIS_UP:
+                grow_y = -grow_height;
+                break;
+        case RESIZE_AXIS_LEFT:
+                grow_x = -grow_width;
+                break;
+        case RESIZE_AXIS_DOWN:
+        case RESIZE_AXIS_RIGHT:
+                break;
+        case RESIZE_AXIS_INVALID:
+                return cmd_results_new(CMD_INVALID, "resize", "Invalid axis/direction");
+        }
+        con->x += grow_x;
+        con->y += grow_y;
+        con->width += grow_width;
+        con->height += grow_height;
+        if (con->type == C_VIEW) {
+                struct sway_view *view = con->sway_view;
+                view->x += grow_x;
+                view->y += grow_y;
+                view->width += grow_width;
+                view->height += grow_height;
+        }
+        arrange_windows(con);
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
-        if (unit == RESIZE_UNIT_PPT) {
+/**
-                float pct = amount / 100.0f;
+ * Implement `resize <grow|shrink>` for a tiled container.
+ */
+static struct cmd_results *resize_adjust_tiled(enum resize_axis axis,
+                struct resize_amount *amount) {
+        struct sway_container *current = config->handler_context.current_container;
+        if (amount->unit == RESIZE_UNIT_DEFAULT) {
+                amount->unit = RESIZE_UNIT_PPT;
+        }
+        if (amount->unit == RESIZE_UNIT_PPT) {
+                float pct = amount->amount / 100.0f;
+                // TODO: Make left/right/up/down resize in that direction?
                switch (axis) {
+                case RESIZE_AXIS_LEFT:
+                case RESIZE_AXIS_RIGHT:
                case RESIZE_AXIS_HORIZONTAL:
-                        amount = (float)current->width * pct;
+                        amount->amount = (float)current->width * pct;
                        break;
+                case RESIZE_AXIS_UP:
+                case RESIZE_AXIS_DOWN:
                case RESIZE_AXIS_VERTICAL:
-                        amount = (float)current->height * pct;
+                        amount->amount = (float)current->height * pct;
                        break;
-                default:
+                case RESIZE_AXIS_INVALID:
-                        sway_assert(0, "invalid resize axis");
+                        return cmd_results_new(CMD_INVALID, "resize",
-                        return;
+                                        "Invalid resize axis/direction");
                }
        }
-        return resize_tiled(amount, axis);
+        resize_tiled(amount->amount, axis);
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
-struct cmd_results *cmd_resize(int argc, char **argv) {
+/**
-        struct sway_container *current = config->handler_context.current_container;
+ * Implement `resize set` for a tiled container.
-        if (!current) {
+ */
-                return cmd_results_new(CMD_INVALID, "resize", "Cannot resize nothing");
+static struct cmd_results *resize_set_tiled(struct sway_container *con,
-        }
+                struct resize_amount *width, struct resize_amount *height) {
-        if (current->type != C_VIEW && current->type != C_CONTAINER) {
+        return cmd_results_new(CMD_INVALID, "resize",
-                return cmd_results_new(CMD_INVALID, "resize",
+                        "'resize set' is not implemented for tiled views");
-                                "Can only resize views/containers");
+}
+/**
+ * Implement `resize set` for a floating container.
+ */
+static struct cmd_results *resize_set_floating(struct sway_container *con,
+                struct resize_amount *width, struct resize_amount *height) {
+        int min_width, max_width, min_height, max_height;
+        calculate_constraints(&min_width, &max_width, &min_height, &max_height);
+        width->amount = fmax(min_width, fmin(width->amount, max_width));
+        height->amount = fmax(min_height, fmin(height->amount, max_height));
+        int grow_width = width->amount - con->width;
+        int grow_height = height->amount - con->height;
+        con->x -= grow_width / 2;
+        con->y -= grow_height / 2;
+        con->width = width->amount;
+        con->height = height->amount;
+        if (con->type == C_VIEW) {
+                struct sway_view *view = con->sway_view;
+                view->x -= grow_width / 2;
+                view->y -= grow_height / 2;
+                view->width += grow_width;
+                view->height += grow_height;
        }
+        arrange_windows(con);
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
+/**
+ * resize set <args>
+ *
+ * args: <width> [px|ppt] <height> [px|ppt]
+ */
+static struct cmd_results *cmd_resize_set(int argc, char **argv) {
        struct cmd_results *error;
        if ((error = checkarg(argc, "resize", EXPECTED_AT_LEAST, 2))) {
                return error;
        }
+        const char *usage = "Expected 'resize set <width> <height>'";
-        if (strcasecmp(argv[0], "set") == 0) {
-                // TODO
+        // Width
-                //return cmd_resize_set(argc - 1, &argv[1]);
+        struct resize_amount width;
-                return cmd_results_new(CMD_INVALID, "resize", "resize set unimplemented");
+        int num_consumed_args = parse_resize_amount(argc, argv, &width);
+        argc -= num_consumed_args;
+        argv += num_consumed_args;
+        if (width.unit == RESIZE_UNIT_INVALID) {
+                return cmd_results_new(CMD_INVALID, "resize", usage);
+        }
+        if (!argc) {
+                return cmd_results_new(CMD_INVALID, "resize", usage);
        }
-        // TODO: resize grow|shrink left|right|up|down
+        // Height
+        struct resize_amount height;
+        num_consumed_args = parse_resize_amount(argc, argv, &height);
+        argc -= num_consumed_args;
+        argv += num_consumed_args;
+        if (height.unit == RESIZE_UNIT_INVALID) {
+                return cmd_results_new(CMD_INVALID, "resize", usage);
+        }
-        const char *usage = "Expected 'resize <shrink|grow> "
+        // If 0, don't resize that dimension
-                "<width|height> [<amount>] [px|ppt]'";
+        struct sway_container *con = config->handler_context.current_container;
+        if (width.amount <= 0) {
+                width.amount = con->width;
+        }
+        if (height.amount <= 0) {
+                height.amount = con->height;
+        }
-        int multiplier = 0;
+        if (container_is_floating(con)) {
-        if (strcasecmp(*argv, "grow") == 0) {
+                return resize_set_floating(con, &width, &height);
-                multiplier = 1;
-        } else if (strcasecmp(*argv, "shrink") == 0) {
-                multiplier = -1;
-        } else {
-                return cmd_results_new(CMD_INVALID, "resize", usage);
        }
-        --argc; ++argv;
+        return resize_set_tiled(con, &width, &height);
+}
+/**
+ * resize <grow|shrink> <args>
+ *
+ * args: <direction>
+ * args: <direction> <amount> <unit>
+ * args: <direction> <amount> <unit> or <amount> <other_unit>
+ */
+static struct cmd_results *cmd_resize_adjust(int argc, char **argv,
+                int multiplier) {
+        const char *usage = "Expected 'resize grow|shrink <direction> "
+                "[<amount> px|ppt [or <amount> px|ppt]]'";
        enum resize_axis axis = parse_resize_axis(*argv);
        if (axis == RESIZE_AXIS_INVALID) {
                return cmd_results_new(CMD_INVALID, "resize", usage);
        }
        --argc; ++argv;
-        int amount = 10; // Default amount
+        // First amount
-        enum resize_unit unit = RESIZE_UNIT_DEFAULT;
+        struct resize_amount first_amount;
        if (argc) {
-                char *err;
+                int num_consumed_args = parse_resize_amount(argc, argv, &first_amount);
-                amount = (int)strtol(*argv, &err, 10);
+                argc -= num_consumed_args;
-                if (*err) {
+                argv += num_consumed_args;
-                        // e.g. `resize grow width 10px`
+                if (first_amount.unit == RESIZE_UNIT_INVALID) {
-                        unit = parse_resize_unit(err);
+                        return cmd_results_new(CMD_INVALID, "resize", usage);
-                        if (unit == RESIZE_UNIT_INVALID) {
-                                return cmd_results_new(CMD_INVALID, "resize", usage);
-                        }
                }
-                --argc; ++argv;
+        } else {
+                first_amount.amount = 10;
+                first_amount.unit = RESIZE_UNIT_DEFAULT;
        }
+        // "or"
        if (argc) {
-                unit = parse_resize_unit(*argv);
+                if (strcmp(*argv, "or") != 0) {
-                if (unit == RESIZE_UNIT_INVALID) {
                        return cmd_results_new(CMD_INVALID, "resize", usage);
                }
                --argc; ++argv;
        }
+        // Second amount
+        struct resize_amount second_amount;
        if (argc) {
-                // Provied too many args, the bastard
+                int num_consumed_args = parse_resize_amount(argc, argv, &second_amount);
-                return cmd_results_new(CMD_INVALID, "resize", usage);
+                argc -= num_consumed_args;
+                argv += num_consumed_args;
+                if (second_amount.unit == RESIZE_UNIT_INVALID) {
+                        return cmd_results_new(CMD_INVALID, "resize", usage);
+                }
+        } else {
+                second_amount.unit = RESIZE_UNIT_INVALID;
        }
-        resize(amount * multiplier, axis, unit);
+        first_amount.amount *= multiplier;
-        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+        second_amount.amount *= multiplier;
+        struct sway_container *con = config->handler_context.current_container;
+        if (container_is_floating(con)) {
+                // Floating containers can only resize in px. Choose an amount which
+                // uses px, with fallback to an amount that specified no unit.
+                if (first_amount.unit == RESIZE_UNIT_PX) {
+                        return resize_adjust_floating(axis, &first_amount);
+                } else if (second_amount.unit == RESIZE_UNIT_PX) {
+                        return resize_adjust_floating(axis, &second_amount);
+                } else if (first_amount.unit == RESIZE_UNIT_DEFAULT) {
+                        return resize_adjust_floating(axis, &first_amount);
+                } else if (second_amount.unit == RESIZE_UNIT_DEFAULT) {
+                        return resize_adjust_floating(axis, &second_amount);
+                } else {
+                        return cmd_results_new(CMD_INVALID, "resize",
+                                        "Floating containers cannot use ppt measurements");
+                }
+        }
+        // For tiling, prefer ppt -> default -> px
+        if (first_amount.unit == RESIZE_UNIT_PPT) {
+                return resize_adjust_tiled(axis, &first_amount);
+        } else if (second_amount.unit == RESIZE_UNIT_PPT) {
+                return resize_adjust_tiled(axis, &second_amount);
+        } else if (first_amount.unit == RESIZE_UNIT_DEFAULT) {
+                return resize_adjust_tiled(axis, &first_amount);
+        } else if (second_amount.unit == RESIZE_UNIT_DEFAULT) {
+                return resize_adjust_tiled(axis, &second_amount);
+        } else {
+                return resize_adjust_tiled(axis, &first_amount);
+        }
+}
+struct cmd_results *cmd_resize(int argc, char **argv) {
+        struct sway_container *current = config->handler_context.current_container;
+        if (!current) {
+                return cmd_results_new(CMD_INVALID, "resize", "Cannot resize nothing");
+        }
+        if (current->type != C_VIEW && current->type != C_CONTAINER) {
+                return cmd_results_new(CMD_INVALID, "resize",
+                                "Can only resize views/containers");
+        }
+        struct cmd_results *error;
+        if ((error = checkarg(argc, "resize", EXPECTED_AT_LEAST, 2))) {
+                return error;
+        }
+        if (strcasecmp(argv[0], "set") == 0) {
+                return cmd_resize_set(argc - 1, &argv[1]);
+        }
+        if (strcasecmp(argv[0], "grow") == 0) {
+                return cmd_resize_adjust(argc - 1, &argv[1], 1);
+        }
+        if (strcasecmp(argv[0], "shrink") == 0) {
+                return cmd_resize_adjust(argc - 1, &argv[1], -1);
+        }
+        const char *usage = "Expected 'resize <shrink|grow> "
+                "<width|height|up|down|left|right> [<amount>] [px|ppt]'";
+        return cmd_results_new(CMD_INVALID, "resize", usage);
 }
diff --git a/sway/commands/scratchpad.c b/sway/commands/scratchpad.c
new file mode 100644
index 00000000..ccc07c87
--- /dev/null
+++ b/sway/commands/scratchpad.c
@@ -0,0 +1,36 @@
+#include "log.h"
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "sway/scratchpad.h"
+#include "sway/tree/container.h"
+struct cmd_results *cmd_scratchpad(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "scratchpad", EXPECTED_EQUAL_TO, 1))) {
+                return error;
+        }
+        if (strcmp(argv[0], "show") != 0) {
+                return cmd_results_new(CMD_INVALID, "scratchpad",
+                                "Expected 'scratchpad show'");
+        }
+        if (!root_container.sway_root->scratchpad->length) {
+                return cmd_results_new(CMD_INVALID, "scratchpad",
+                                "Scratchpad is empty");
+        }
+        if (config->handler_context.using_criteria) {
+                // If using criteria, this command is executed for every container which
+                // matches the criteria. If this container isn't in the scratchpad,
+                // we'll just silently return a success.
+                struct sway_container *con = config->handler_context.current_container;
+                wlr_log(WLR_INFO, "cmd_scratchpad(%s)", con->name);
+                if (!con->scratchpad) {
+                        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+                }
+                scratchpad_toggle_container(con);
+        } else {
+                scratchpad_toggle_auto();
+        }
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/commands/set.c b/sway/commands/set.c
index 84e9b792..ea388d3b 100644
--- a/sway/commands/set.c
+++ b/sway/commands/set.c
@@ -32,7 +32,7 @@ struct cmd_results *cmd_set(int argc, char **argv) {
        }
        if (argv[0][0] != '$') {
-                wlr_log(L_INFO, "Warning: variable '%s' doesn't start with $", argv[0]);
+                wlr_log(WLR_INFO, "Warning: variable '%s' doesn't start with $", argv[0]);
                size_t size = snprintf(NULL, 0, "$%s", argv[0]);
                tmp = malloc(size + 1);
diff --git a/sway/commands/smart_gaps.c b/sway/commands/smart_gaps.c
index f687e78e..7d27e571 100644
--- a/sway/commands/smart_gaps.c
+++ b/sway/commands/smart_gaps.c
@@ -23,7 +23,7 @@ struct cmd_results *cmd_smart_gaps(int argc, char **argv) {
                        "Expected 'smart_gaps <on|off>' ");
        }
-        arrange_and_commit(&root_container);
+        arrange_windows(&root_container);
        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
diff --git a/sway/commands/split.c b/sway/commands/split.c
index c40f4d9f..313799da 100644
--- a/sway/commands/split.c
+++ b/sway/commands/split.c
@@ -16,7 +16,7 @@ static struct cmd_results *do_split(int layout) {
        }
        struct sway_container *parent = container_split(con, layout);
        container_create_notify(parent);
-        arrange_and_commit(parent->parent);
+        arrange_windows(parent->parent);
        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
diff --git a/sway/commands/swap.c b/sway/commands/swap.c
index e052058f..2fc88308 100644
--- a/sway/commands/swap.c
+++ b/sway/commands/swap.c
@@ -1,7 +1,6 @@
 #include <strings.h>
 #include <wlr/util/log.h>
 #include "sway/commands.h"
-#include "sway/desktop/transaction.h"
 #include "sway/tree/arrange.h"
 #include "sway/tree/layout.h"
 #include "sway/tree/view.h"
@@ -79,14 +78,10 @@ struct cmd_results *cmd_swap(int argc, char **argv) {
        container_swap(current, other);
-        struct sway_transaction *txn = transaction_create();
+        arrange_windows(current->parent);
-        arrange_windows(current->parent, txn);
        if (other->parent != current->parent) {
-                arrange_windows(other->parent, txn);
+                arrange_windows(other->parent);
        }
-        transaction_commit(txn);
        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
diff --git a/sway/commands/swaybg_command.c b/sway/commands/swaybg_command.c
index 770d4821..36f7fdcd 100644
--- a/sway/commands/swaybg_command.c
+++ b/sway/commands/swaybg_command.c
@@ -13,7 +13,7 @@ struct cmd_results *cmd_swaybg_command(int argc, char **argv) {
                free(config->swaybg_command);
        }
        config->swaybg_command = join_args(argv, argc);
-        wlr_log(L_DEBUG, "Using custom swaybg command: %s",
+        wlr_log(WLR_DEBUG, "Using custom swaybg command: %s",
                        config->swaybg_command);
        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
diff --git a/sway/commands/urgent.c b/sway/commands/urgent.c
new file mode 100644
index 00000000..d199858a
--- /dev/null
+++ b/sway/commands/urgent.c
@@ -0,0 +1,36 @@
+#include "log.h"
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "sway/tree/arrange.h"
+#include "sway/tree/container.h"
+#include "sway/tree/view.h"
+#include "sway/tree/layout.h"
+struct cmd_results *cmd_urgent(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "urgent", EXPECTED_EQUAL_TO, 1))) {
+                return error;
+        }
+        struct sway_container *container =
+                config->handler_context.current_container;
+        if (container->type != C_VIEW) {
+                return cmd_results_new(CMD_INVALID, "urgent",
+                                "Only views can be urgent");
+        }
+        struct sway_view *view = container->sway_view;
+        if (strcmp(argv[0], "enable") == 0) {
+                view_set_urgent(view, true);
+        } else if (strcmp(argv[0], "disable") == 0) {
+                view_set_urgent(view, false);
+        } else if (strcmp(argv[0], "allow") == 0) {
+                view->allow_request_urgent = true;
+        } else if (strcmp(argv[0], "deny") == 0) {
+                view->allow_request_urgent = false;
+        } else {
+                return cmd_results_new(CMD_INVALID, "urgent",
+                                "Expected 'urgent <enable|disable|allow|deny>'");
+        }
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/commands/workspace.c b/sway/commands/workspace.c
index d15be571..e8b37182 100644
--- a/sway/commands/workspace.c
+++ b/sway/commands/workspace.c
@@ -51,7 +51,7 @@ struct cmd_results *cmd_workspace(int argc, char **argv) {
                        free(old); // workspaces can only be assigned to a single output
                        list_del(config->workspace_outputs, i);
                }
-                wlr_log(L_DEBUG, "Assigning workspace %s to output %s", wso->workspace, wso->output);
+                wlr_log(WLR_DEBUG, "Assigning workspace %s to output %s", wso->workspace, wso->output);
                list_add(config->workspace_outputs, wso);
        } else {
                if (config->reading || !config->active) {
author	Drew DeVault <sir@cmpwn.com>	2018-07-23 20:27:56 -0400
committer	Drew DeVault <sir@cmpwn.com>	2018-07-23 20:31:11 -0400
commit	f4b882475eee7a81c206c7825616cc4656b2f60b (patch)
tree	38e6ebf81b235424f105dcbcbb194e5e9eac70c0 /sway/commands
parent	Implement pid->workspace tracking (diff)
parent	Merge pull request #2342 from RyanDwyer/update-cursor (diff)
download	sway-f4b882475eee7a81c206c7825616cc4656b2f60b.tar.gz sway-f4b882475eee7a81c206c7825616cc4656b2f60b.tar.zst sway-f4b882475eee7a81c206c7825616cc4656b2f60b.zip