refactor commands.c

20 files changed, 784 insertions, 0 deletions

diff --git a/sway/commands/bar/binding_mode_indicator.c b/sway/commands/bar/binding_mode_indicator.c
new file mode 100644
index 00000000..be72cb9b
--- /dev/null
+++ b/sway/commands/bar/binding_mode_indicator.c
@@ -0,0 +1,26 @@
+#include <string.h>
+#include "commands.h"
+#include "log.h"
+
+struct cmd_results *bar_cmd_binding_mode_indicator(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "binding_mode_indicator", EXPECTED_EQUAL_TO, 1))) {
+                return error;
+        }
+
+        if (!config->current_bar) {
+                return cmd_results_new(CMD_FAILURE, "binding_mode_indicator", "No bar defined.");
+        }
+
+        if (strcasecmp("yes", argv[0]) == 0) {
+                config->current_bar->binding_mode_indicator = true;
+                sway_log(L_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;
+                sway_log(L_DEBUG, "Disabling binding mode indicator on bar: %s", config->current_bar->id);
+        } else {
+                error = cmd_results_new(CMD_INVALID, "binding_mode_indicator", "Invalid value %s", argv[0]);
+                return error;
+        }
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/commands/bar/bindsym.c b/sway/commands/bar/bindsym.c
new file mode 100644
index 00000000..4f50e708
--- /dev/null
+++ b/sway/commands/bar/bindsym.c
@@ -0,0 +1,45 @@
+#include <stdlib.h>
+#include <string.h>
+#include "commands.h"
+#include "config.h"
+#include "list.h"
+#include "log.h"
+#include "stringop.h"
+
+struct cmd_results *bar_cmd_bindsym(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "bindsym", EXPECTED_MORE_THAN, 1))) {
+                return error;
+        } else if (!config->reading) {
+                return cmd_results_new(CMD_FAILURE, "bindsym", "Can only be used in config file.");
+        }
+
+        if (!config->current_bar) {
+                return cmd_results_new(CMD_FAILURE, "bindsym", "No bar defined.");
+        }
+
+        if (strlen(argv[1]) != 7) {
+                return cmd_results_new(CMD_INVALID, "bindsym", "Invalid mouse binding %s", argv[1]);
+        }
+        uint32_t numbutton = (uint32_t)atoi(argv[1] + 6);
+        if (numbutton < 1 || numbutton > 5 || strncmp(argv[1], "button", 6) != 0) {
+                return cmd_results_new(CMD_INVALID, "bindsym", "Invalid mouse binding %s", argv[1]);
+        }
+        struct sway_mouse_binding *binding = malloc(sizeof(struct sway_mouse_binding));
+        binding->button = numbutton;
+        binding->command = join_args(argv + 1, argc - 1);
+
+        struct bar_config *bar = config->current_bar;
+        int i = list_seq_find(bar->bindings, sway_mouse_binding_cmp_buttons, binding);
+        if (i > -1) {
+                sway_log(L_DEBUG, "bindsym - '%s' for swaybar already exists, overwriting", argv[0]);
+                struct sway_mouse_binding *dup = bar->bindings->items[i];
+                free_sway_mouse_binding(dup);
+                list_del(bar->bindings, i);
+        }
+        list_add(bar->bindings, binding);
+        list_qsort(bar->bindings, sway_mouse_binding_cmp_qsort);
+
+        sway_log(L_DEBUG, "bindsym - Bound %s to command %s when clicking swaybar", argv[0], binding->command);
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/commands/bar/colors.c b/sway/commands/bar/colors.c
new file mode 100644
index 00000000..d33a323e
--- /dev/null
+++ b/sway/commands/bar/colors.c
@@ -0,0 +1,160 @@
+#include <string.h>
+#include "commands.h"
+
+struct cmd_results *bar_cmd_colors(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "colors", EXPECTED_EQUAL_TO, 1))) {
+                return error;
+        }
+
+        if (strcmp("{", argv[0]) != 0) {
+                return cmd_results_new(CMD_INVALID, "colors",
+                                "Expected '{' at the start of colors config definition.");
+        }
+
+        return cmd_results_new(CMD_BLOCK_BAR_COLORS, NULL, NULL);
+}
+
+struct cmd_results *bar_colors_cmd_active_workspace(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "active_workspace", EXPECTED_EQUAL_TO, 3))) {
+                return error;
+        }
+
+        if ((error = add_color("active_workspace_border", config->current_bar->colors.active_workspace_border, argv[0]))) {
+                return error;
+        }
+
+        if ((error = add_color("active_workspace_bg", config->current_bar->colors.active_workspace_bg, argv[1]))) {
+                return error;
+        }
+
+        if ((error = add_color("active_workspace_text", config->current_bar->colors.active_workspace_text, argv[2]))) {
+                return error;
+        }
+
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
+
+struct cmd_results *bar_colors_cmd_background(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "background", EXPECTED_EQUAL_TO, 1))) {
+                return error;
+        }
+
+        if ((error = add_color("background", config->current_bar->colors.background, argv[0]))) {
+                return error;
+        }
+
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
+
+struct cmd_results *bar_colors_cmd_binding_mode(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "binding_mode", EXPECTED_EQUAL_TO, 3))) {
+                return error;
+        }
+
+        if ((error = add_color("binding_mode_border", config->current_bar->colors.binding_mode_border, argv[0]))) {
+                return error;
+        }
+
+        if ((error = add_color("binding_mode_bg", config->current_bar->colors.binding_mode_bg, argv[1]))) {
+                return error;
+        }
+
+        if ((error = add_color("binding_mode_text", config->current_bar->colors.binding_mode_text, argv[2]))) {
+                return error;
+        }
+
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
+
+struct cmd_results *bar_colors_cmd_focused_workspace(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "focused_workspace", EXPECTED_EQUAL_TO, 3))) {
+                return error;
+        }
+
+        if ((error = add_color("focused_workspace_border", config->current_bar->colors.focused_workspace_border, argv[0]))) {
+                return error;
+        }
+
+        if ((error = add_color("focused_workspace_bg", config->current_bar->colors.focused_workspace_bg, argv[1]))) {
+                return error;
+        }
+
+        if ((error = add_color("focused_workspace_text", config->current_bar->colors.focused_workspace_text, argv[2]))) {
+                return error;
+        }
+
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
+
+struct cmd_results *bar_colors_cmd_inactive_workspace(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "inactive_workspace", EXPECTED_EQUAL_TO, 3))) {
+                return error;
+        }
+
+        if ((error = add_color("inactive_workspace_border", config->current_bar->colors.inactive_workspace_border, argv[0]))) {
+                return error;
+        }
+
+        if ((error = add_color("inactive_workspace_bg", config->current_bar->colors.inactive_workspace_bg, argv[1]))) {
+                return error;
+        }
+
+        if ((error = add_color("inactive_workspace_text", config->current_bar->colors.inactive_workspace_text, argv[2]))) {
+                return error;
+        }
+
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
+
+struct cmd_results *bar_colors_cmd_separator(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "separator", EXPECTED_EQUAL_TO, 1))) {
+                return error;
+        }
+
+        if ((error = add_color("separator", config->current_bar->colors.separator, argv[0]))) {
+                return error;
+        }
+
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
+
+struct cmd_results *bar_colors_cmd_statusline(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "statusline", EXPECTED_EQUAL_TO, 1))) {
+                return error;
+        }
+
+        if ((error = add_color("statusline", config->current_bar->colors.statusline, argv[0]))) {
+                return error;
+        }
+
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
+
+struct cmd_results *bar_colors_cmd_urgent_workspace(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "urgent_workspace", EXPECTED_EQUAL_TO, 3))) {
+                return error;
+        }
+
+        if ((error = add_color("urgent_workspace_border", config->current_bar->colors.urgent_workspace_border, argv[0]))) {
+                return error;
+        }
+
+        if ((error = add_color("urgent_workspace_bg", config->current_bar->colors.urgent_workspace_bg, argv[1]))) {
+                return error;
+        }
+
+        if ((error = add_color("urgent_workspace_text", config->current_bar->colors.urgent_workspace_text, argv[2]))) {
+                return error;
+        }
+
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/commands/bar/font.c b/sway/commands/bar/font.c
new file mode 100644
index 00000000..afc542d2
--- /dev/null
+++ b/sway/commands/bar/font.c
@@ -0,0 +1,26 @@
+#include <string.h>
+#include "commands.h"
+#include "log.h"
+#include "stringop.h"
+
+struct cmd_results *bar_cmd_font(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "font", EXPECTED_AT_LEAST, 1))) {
+                return error;
+        }
+
+        if (!config->current_bar) {
+                return cmd_results_new(CMD_FAILURE, "font", "No bar defined.");
+        }
+
+        char *font = join_args(argv, argc);
+        free(config->current_bar->font);
+        if (strlen(font) > 6 && strncmp("pango:", font, 6) == 0) {
+                config->current_bar->font = font;
+        } else {
+                config->current_bar->font = font;
+        }
+
+        sway_log(L_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
new file mode 100644
index 00000000..9ea0a81a
--- /dev/null
+++ b/sway/commands/bar/height.c
@@ -0,0 +1,21 @@
+#include <stdlib.h>
+#include <string.h>
+#include "commands.h"
+#include "log.h"
+
+struct cmd_results *bar_cmd_height(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "height", EXPECTED_EQUAL_TO, 1))) {
+                return error;
+        }
+
+        int height = atoi(argv[0]);
+        if (height < 0) {
+                return cmd_results_new(CMD_INVALID, "height",
+                                "Invalid height value: %s", argv[0]);
+        }
+
+        config->current_bar->height = height;
+        sway_log(L_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
new file mode 100644
index 00000000..22035c98
--- /dev/null
+++ b/sway/commands/bar/hidden_state.c
@@ -0,0 +1,77 @@
+#include <string.h>
+#include "commands.h"
+#include "config.h"
+#include "ipc-server.h"
+#include "log.h"
+
+static struct cmd_results *bar_set_hidden_state(struct bar_config *bar, const char *hidden_state) {
+        char *old_state = bar->hidden_state;
+        if (strcasecmp("toggle", hidden_state) == 0 && !config->reading) {
+                if (strcasecmp("hide", bar->hidden_state) == 0) {
+                        bar->hidden_state = strdup("show");
+                } else if (strcasecmp("show", bar->hidden_state) == 0) {
+                        bar->hidden_state = strdup("hide");
+                }
+        } else if (strcasecmp("hide", hidden_state) == 0) {
+                bar->hidden_state = strdup("hide");
+        } else if (strcasecmp("show", hidden_state) == 0) {
+                bar->hidden_state = strdup("show");
+        } else {
+                return cmd_results_new(CMD_INVALID, "hidden_state", "Invalid value %s", hidden_state);
+        }
+
+        if (strcmp(old_state, bar->hidden_state) != 0) {
+                if (!config->reading) {
+                        ipc_event_barconfig_update(bar);
+                }
+                sway_log(L_DEBUG, "Setting hidden_state: '%s' for bar: %s", bar->hidden_state, bar->id);
+        }
+
+        // free old mode
+        free(old_state);
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
+
+struct cmd_results *bar_cmd_hidden_state(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "hidden_state", EXPECTED_AT_LEAST, 1))) {
+                return error;
+        }
+        if ((error = checkarg(argc, "hidden_state", EXPECTED_LESS_THAN, 3))) {
+                return error;
+        }
+
+        if (config->reading && argc > 1) {
+                return cmd_results_new(CMD_INVALID, "hidden_state", "Unexpected value %s in config mode", argv[1]);
+        }
+
+        const char *state = argv[0];
+
+        if (config->reading) {
+                return bar_set_hidden_state(config->current_bar, state);
+        }
+
+        const char *id = NULL;
+        if (argc == 2) {
+                id = argv[1];
+        }
+
+        int i;
+        struct bar_config *bar;
+        for (i = 0; i < config->bars->length; ++i) {
+                bar = config->bars->items[i];
+                if (id && strcmp(id, bar->id) == 0) {
+                        return bar_set_hidden_state(bar, state);
+                }
+
+                error = bar_set_hidden_state(bar, state);
+                if (error) {
+                        return error;
+                }
+        }
+
+        // active bar modifiers might have changed.
+        update_active_bar_modifiers();
+
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/commands/bar/id.c b/sway/commands/bar/id.c
new file mode 100644
index 00000000..6ca9f6b6
--- /dev/null
+++ b/sway/commands/bar/id.c
@@ -0,0 +1,32 @@
+#include <string.h>
+#include "commands.h"
+#include "log.h"
+
+struct cmd_results *bar_cmd_id(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "id", EXPECTED_EQUAL_TO, 1))) {
+                return error;
+        }
+
+        const char *name = argv[0];
+        const char *oldname = config->current_bar->id;
+
+        // check if id is used by a previously defined bar
+        int i;
+        for (i = 0; i < config->bars->length; ++i) {
+                struct bar_config *find = config->bars->items[i];
+                if (strcmp(name, find->id) == 0 && config->current_bar != find) {
+                        return cmd_results_new(CMD_FAILURE, "id",
+                                        "Id '%s' already defined for another bar. Id unchanged (%s).",
+                                        name, oldname);
+                }
+        }
+
+        sway_log(L_DEBUG, "Renaming bar: '%s' to '%s'", oldname, name);
+
+        // free old bar id
+        free(config->current_bar->id);
+
+        config->current_bar->id = strdup(name);
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/commands/bar/mode.c b/sway/commands/bar/mode.c
new file mode 100644
index 00000000..321d5a29
--- /dev/null
+++ b/sway/commands/bar/mode.c
@@ -0,0 +1,79 @@
+#include <string.h>
+#include "commands.h"
+#include "config.h"
+#include "ipc-server.h"
+#include "log.h"
+
+static struct cmd_results *bar_set_mode(struct bar_config *bar, const char *mode) {
+        char *old_mode = bar->mode;
+        if (strcasecmp("toggle", mode) == 0 && !config->reading) {
+                if (strcasecmp("dock", bar->mode) == 0) {
+                        bar->mode = strdup("hide");
+                } else if (strcasecmp("hide", bar->mode) == 0) {
+                        bar->mode = strdup("dock");
+                }
+        } else if (strcasecmp("dock", mode) == 0) {
+                bar->mode = strdup("dock");
+        } else if (strcasecmp("hide", mode) == 0) {
+                bar->mode = strdup("hide");
+        } else if (strcasecmp("invisible", mode) == 0) {
+                bar->mode = strdup("invisible");
+        } else {
+                return cmd_results_new(CMD_INVALID, "mode", "Invalid value %s", mode);
+        }
+
+        if (strcmp(old_mode, bar->mode) != 0) {
+                if (!config->reading) {
+                        ipc_event_barconfig_update(bar);
+
+                        // active bar modifiers might have changed.
+                        update_active_bar_modifiers();
+                }
+                sway_log(L_DEBUG, "Setting mode: '%s' for bar: %s", bar->mode, bar->id);
+        }
+
+        // free old mode
+        free(old_mode);
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
+
+struct cmd_results *bar_cmd_mode(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "mode", EXPECTED_AT_LEAST, 1))) {
+                return error;
+        }
+        if ((error = checkarg(argc, "mode", EXPECTED_LESS_THAN, 3))) {
+                return error;
+        }
+
+        if (config->reading && argc > 1) {
+                return cmd_results_new(CMD_INVALID, "mode", "Unexpected value %s in config mode", argv[1]);
+        }
+
+        const char *mode = argv[0];
+
+        if (config->reading) {
+                return bar_set_mode(config->current_bar, mode);
+        }
+
+        const char *id = NULL;
+        if (argc == 2) {
+                id = argv[1];
+        }
+
+        int i;
+        struct bar_config *bar;
+        for (i = 0; i < config->bars->length; ++i) {
+                bar = config->bars->items[i];
+                if (id && strcmp(id, bar->id) == 0) {
+                        return bar_set_mode(bar, mode);
+                }
+
+                error = bar_set_mode(bar, mode);
+                if (error) {
+                        return error;
+                }
+        }
+
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/commands/bar/modifier.c b/sway/commands/bar/modifier.c
new file mode 100644
index 00000000..7d4501c7
--- /dev/null
+++ b/sway/commands/bar/modifier.c
@@ -0,0 +1,35 @@
+#include <string.h>
+#include "commands.h"
+#include "log.h"
+#include "stringop.h"
+#include "util.h"
+
+struct cmd_results *bar_cmd_modifier(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "modifier", EXPECTED_EQUAL_TO, 1))) {
+                return error;
+        }
+
+        if (!config->current_bar) {
+                return cmd_results_new(CMD_FAILURE, "modifier", "No bar defined.");
+        }
+
+        uint32_t mod = 0;
+
+        list_t *split = split_string(argv[0], "+");
+        for (int i = 0; i < split->length; ++i) {
+                uint32_t tmp_mod;
+                if ((tmp_mod = get_modifier_mask_by_name(split->items[i])) > 0) {
+                        mod |= tmp_mod;
+                        continue;
+                } else {
+                        free_flat_list(split);
+                        return cmd_results_new(CMD_INVALID, "modifier", "Unknown modifier '%s'", split->items[i]);
+                }
+        }
+        free_flat_list(split);
+
+        config->current_bar->modifier = mod;
+        sway_log(L_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
new file mode 100644
index 00000000..9a0d7a73
--- /dev/null
+++ b/sway/commands/bar/output.c
@@ -0,0 +1,49 @@
+#include <string.h>
+#include "commands.h"
+#include "list.h"
+#include "log.h"
+
+struct cmd_results *bar_cmd_output(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "output", EXPECTED_EQUAL_TO, 1))) {
+                return error;
+        }
+
+        if (!config->current_bar) {
+                return cmd_results_new(CMD_FAILURE, "output", "No bar defined.");
+        }
+
+        const char *output = argv[0];
+        list_t *outputs = config->current_bar->outputs;
+        if (!outputs) {
+                outputs = create_list();
+                config->current_bar->outputs = outputs;
+        }
+
+        int i;
+        int add_output = 1;
+        if (strcmp("*", output) == 0) {
+                // remove all previous defined outputs and replace with '*'
+                for (i = 0; i < outputs->length; ++i) {
+                        free(outputs->items[i]);
+                        list_del(outputs, i);
+                }
+        } else {
+                // only add output if not already defined with either the same
+                // name or as '*'
+                for (i = 0; i < outputs->length; ++i) {
+                        const char *find = outputs->items[i];
+                        if (strcmp("*", find) == 0 || strcmp(output, find) == 0) {
+                                add_output = 0;
+                                break;
+                        }
+                }
+        }
+
+        if (add_output) {
+                list_add(outputs, strdup(output));
+                sway_log(L_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
new file mode 100644
index 00000000..fcc38d13
--- /dev/null
+++ b/sway/commands/bar/pango_markup.c
@@ -0,0 +1,26 @@
+#include <string.h>
+#include "commands.h"
+#include "log.h"
+
+struct cmd_results *bar_cmd_pango_markup(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "pango_markup", EXPECTED_EQUAL_TO, 1))) {
+                return error;
+        }
+
+        if (!config->current_bar) {
+                return cmd_results_new(CMD_FAILURE, "pango_markup", "No bar defined.");
+        }
+
+        if (strcasecmp("enabled", argv[0]) == 0) {
+                config->current_bar->pango_markup = true;
+                sway_log(L_DEBUG, "Enabling pango markup for bar: %s", config->current_bar->id);
+        } else if (strcasecmp("disabled", argv[0]) == 0) {
+                config->current_bar->pango_markup = false;
+                sway_log(L_DEBUG, "Disabling pango markup for bar: %s", config->current_bar->id);
+        } else {
+                error = cmd_results_new(CMD_INVALID, "pango_markup", "Invalid value %s", argv[0]);
+                return error;
+        }
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/commands/bar/position.c b/sway/commands/bar/position.c
new file mode 100644
index 00000000..6f97062f
--- /dev/null
+++ b/sway/commands/bar/position.c
@@ -0,0 +1,32 @@
+#include <string.h>
+#include "commands.h"
+#include "log.h"
+
+struct cmd_results *bar_cmd_position(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "position", EXPECTED_EQUAL_TO, 1))) {
+                return error;
+        }
+
+        if (!config->current_bar) {
+                return cmd_results_new(CMD_FAILURE, "position", "No bar defined.");
+        }
+
+        if (strcasecmp("top", argv[0]) == 0) {
+                config->current_bar->position = DESKTOP_SHELL_PANEL_POSITION_TOP;
+        } else if (strcasecmp("bottom", argv[0]) == 0) {
+                config->current_bar->position = DESKTOP_SHELL_PANEL_POSITION_BOTTOM;
+        } else if (strcasecmp("left", argv[0]) == 0) {
+                sway_log(L_INFO, "Warning: swaybar currently only supports top and bottom positioning. YMMV");
+                config->current_bar->position = DESKTOP_SHELL_PANEL_POSITION_LEFT;
+        } else if (strcasecmp("right", argv[0]) == 0) {
+                sway_log(L_INFO, "Warning: swaybar currently only supports top and bottom positioning. YMMV");
+                config->current_bar->position = DESKTOP_SHELL_PANEL_POSITION_RIGHT;
+        } else {
+                error = cmd_results_new(CMD_INVALID, "position", "Invalid value %s", argv[0]);
+                return error;
+        }
+
+        sway_log(L_DEBUG, "Setting bar position '%s' for bar: %s", argv[0], config->current_bar->id);
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/commands/bar/separator_symbol.c b/sway/commands/bar/separator_symbol.c
new file mode 100644
index 00000000..16c455e7
--- /dev/null
+++ b/sway/commands/bar/separator_symbol.c
@@ -0,0 +1,20 @@
+#include <string.h>
+#include "commands.h"
+#include "log.h"
+
+struct cmd_results *bar_cmd_separator_symbol(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "separator_symbol", EXPECTED_EQUAL_TO, 1))) {
+                return error;
+        }
+
+        if (!config->current_bar) {
+                return cmd_results_new(CMD_FAILURE, "separator_symbol", "No bar defined.");
+        }
+
+        free(config->current_bar->separator_symbol);
+        config->current_bar->separator_symbol = strdup(argv[0]);
+        sway_log(L_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
new file mode 100644
index 00000000..ec91e9f7
--- /dev/null
+++ b/sway/commands/bar/status_command.c
@@ -0,0 +1,21 @@
+#include <string.h>
+#include "commands.h"
+#include "log.h"
+#include "stringop.h"
+
+struct cmd_results *bar_cmd_status_command(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "status_command", EXPECTED_AT_LEAST, 1))) {
+                return error;
+        }
+
+        if (!config->current_bar) {
+                return cmd_results_new(CMD_FAILURE, "status_command", "No bar defined.");
+        }
+
+        free(config->current_bar->status_command);
+        config->current_bar->status_command = join_args(argv, argc);
+        sway_log(L_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
new file mode 100644
index 00000000..7a709e4b
--- /dev/null
+++ b/sway/commands/bar/strip_workspace_numbers.c
@@ -0,0 +1,26 @@
+#include <string.h>
+#include "commands.h"
+#include "log.h"
+
+struct cmd_results *bar_cmd_strip_workspace_numbers(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "strip_workspace_numbers", EXPECTED_EQUAL_TO, 1))) {
+                return error;
+        }
+
+        if (!config->current_bar) {
+                return cmd_results_new(CMD_FAILURE, "strip_workspace_numbers", "No bar defined.");
+        }
+
+        if (strcasecmp("yes", argv[0]) == 0) {
+                config->current_bar->strip_workspace_numbers = true;
+                sway_log(L_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;
+                sway_log(L_DEBUG, "Enabling workspace numbers on bar: %s", config->current_bar->id);
+        } else {
+                error = cmd_results_new(CMD_INVALID, "strip_workspace_numbers", "Invalid value %s", argv[0]);
+                return error;
+        }
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/commands/bar/swaybar_command.c b/sway/commands/bar/swaybar_command.c
new file mode 100644
index 00000000..1f28184a
--- /dev/null
+++ b/sway/commands/bar/swaybar_command.c
@@ -0,0 +1,21 @@
+#include <string.h>
+#include "commands.h"
+#include "log.h"
+#include "stringop.h"
+
+struct cmd_results *bar_cmd_swaybar_command(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "swaybar_command", EXPECTED_AT_LEAST, 1))) {
+                return error;
+        }
+
+        if (!config->current_bar) {
+                return cmd_results_new(CMD_FAILURE, "swaybar_command", "No bar defined.");
+        }
+
+        free(config->current_bar->swaybar_command);
+        config->current_bar->swaybar_command = join_args(argv, argc);
+        sway_log(L_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/tray_output.c b/sway/commands/bar/tray_output.c
new file mode 100644
index 00000000..39b571d0
--- /dev/null
+++ b/sway/commands/bar/tray_output.c
@@ -0,0 +1,7 @@
+#include "commands.h"
+#include "log.h"
+
+struct cmd_results *bar_cmd_tray_output(int argc, char **argv) {
+        sway_log(L_ERROR, "Warning: tray_output is not supported on wayland");
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/commands/bar/tray_padding.c b/sway/commands/bar/tray_padding.c
new file mode 100644
index 00000000..978ce0b7
--- /dev/null
+++ b/sway/commands/bar/tray_padding.c
@@ -0,0 +1,29 @@
+#include <stdlib.h>
+#include <string.h>
+#include "commands.h"
+#include "log.h"
+
+struct cmd_results *bar_cmd_tray_padding(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "tray_padding", EXPECTED_AT_LEAST, 1))) {
+                return error;
+        }
+
+        if (!config->current_bar) {
+                return cmd_results_new(CMD_FAILURE, "tray_padding", "No bar defined.");
+        }
+
+        int padding = atoi(argv[0]);
+        if (padding < 0) {
+                return cmd_results_new(CMD_INVALID, "tray_padding",
+                                "Invalid padding value %s, minimum is 0", argv[0]);
+        }
+
+        if (argc > 1 && strcasecmp("px", argv[1]) != 0) {
+                return cmd_results_new(CMD_INVALID, "tray_padding",
+                                "Unknown unit %s", argv[1]);
+        }
+        config->current_bar->tray_padding = padding;
+        sway_log(L_DEBUG, "Enabling tray padding of %d px on bar: %s", padding, config->current_bar->id);
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/commands/bar/workspace_buttons.c b/sway/commands/bar/workspace_buttons.c
new file mode 100644
index 00000000..ce37fde9
--- /dev/null
+++ b/sway/commands/bar/workspace_buttons.c
@@ -0,0 +1,26 @@
+#include <string.h>
+#include "commands.h"
+#include "log.h"
+
+struct cmd_results *bar_cmd_workspace_buttons(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "workspace_buttons", EXPECTED_EQUAL_TO, 1))) {
+                return error;
+        }
+
+        if (!config->current_bar) {
+                return cmd_results_new(CMD_FAILURE, "workspace_buttons", "No bar defined.");
+        }
+
+        if (strcasecmp("yes", argv[0]) == 0) {
+                config->current_bar->workspace_buttons = true;
+                sway_log(L_DEBUG, "Enabling workspace buttons on bar: %s", config->current_bar->id);
+        } else if (strcasecmp("no", argv[0]) == 0) {
+                config->current_bar->workspace_buttons = false;
+                sway_log(L_DEBUG, "Disabling workspace buttons on bar: %s", config->current_bar->id);
+        } else {
+                error = cmd_results_new(CMD_INVALID, "workspace_buttons", "Invalid value %s", argv[0]);
+                return error;
+        }
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/commands/bar/wrap_scroll.c b/sway/commands/bar/wrap_scroll.c
new file mode 100644
index 00000000..0a5fbf93
--- /dev/null
+++ b/sway/commands/bar/wrap_scroll.c
@@ -0,0 +1,26 @@
+#include <string.h>
+#include "commands.h"
+#include "log.h"
+
+struct cmd_results *bar_cmd_wrap_scroll(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "wrap_scroll", EXPECTED_EQUAL_TO, 1))) {
+                return error;
+        }
+
+        if (!config->current_bar) {
+                return cmd_results_new(CMD_FAILURE, "wrap_scroll", "No bar defined.");
+        }
+
+        if (strcasecmp("yes", argv[0]) == 0) {
+                config->current_bar->wrap_scroll = true;
+                sway_log(L_DEBUG, "Enabling wrap scroll on bar: %s", config->current_bar->id);
+        } else if (strcasecmp("no", argv[0]) == 0) {
+                config->current_bar->wrap_scroll = false;
+                sway_log(L_DEBUG, "Disabling wrap scroll on bar: %s", config->current_bar->id);
+        } else {
+                error = cmd_results_new(CMD_INVALID, "wrap_scroll", "Invalid value %s", argv[0]);
+                return error;
+        }
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}