From bf7a4cd0ebd465a0597e9eec0142fad222b396de Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Thu, 29 Mar 2018 17:20:03 -0400
Subject: Add bar configuration commands

---
 sway/commands/bar.c                         |  57 ++++++++++++
 sway/commands/bar/activate_button.c         |   9 ++
 sway/commands/bar/binding_mode_indicator.c  |  27 ++++++
 sway/commands/bar/bindsym.c                 |  11 +++
 sway/commands/bar/colors.c                  | 129 ++++++++++++++++++++++++++++
 sway/commands/bar/context_button.c          |   9 ++
 sway/commands/bar/font.c                    |  26 ++++++
 sway/commands/bar/height.c                  |  21 +++++
 sway/commands/bar/hidden_state.c            |  78 +++++++++++++++++
 sway/commands/bar/icon_theme.c              |   9 ++
 sway/commands/bar/id.c                      |  33 +++++++
 sway/commands/bar/mode.c                    |  78 +++++++++++++++++
 sway/commands/bar/modifier.c                |  35 ++++++++
 sway/commands/bar/output.c                  |  50 +++++++++++
 sway/commands/bar/pango_markup.c            |  27 ++++++
 sway/commands/bar/position.c                |  29 +++++++
 sway/commands/bar/secondary_button.c        |   9 ++
 sway/commands/bar/separator_symbol.c        |  21 +++++
 sway/commands/bar/status_command.c          |  21 +++++
 sway/commands/bar/strip_workspace_numbers.c |  27 ++++++
 sway/commands/bar/swaybar_command.c         |  21 +++++
 sway/commands/bar/tray_output.c             |   9 ++
 sway/commands/bar/tray_padding.c            |  10 +++
 sway/commands/bar/workspace_buttons.c       |  27 ++++++
 sway/commands/bar/wrap_scroll.c             |  27 ++++++
 25 files changed, 800 insertions(+)
 create mode 100644 sway/commands/bar.c
 create mode 100644 sway/commands/bar/activate_button.c
 create mode 100644 sway/commands/bar/binding_mode_indicator.c
 create mode 100644 sway/commands/bar/bindsym.c
 create mode 100644 sway/commands/bar/colors.c
 create mode 100644 sway/commands/bar/context_button.c
 create mode 100644 sway/commands/bar/font.c
 create mode 100644 sway/commands/bar/height.c
 create mode 100644 sway/commands/bar/hidden_state.c
 create mode 100644 sway/commands/bar/icon_theme.c
 create mode 100644 sway/commands/bar/id.c
 create mode 100644 sway/commands/bar/mode.c
 create mode 100644 sway/commands/bar/modifier.c
 create mode 100644 sway/commands/bar/output.c
 create mode 100644 sway/commands/bar/pango_markup.c
 create mode 100644 sway/commands/bar/position.c
 create mode 100644 sway/commands/bar/secondary_button.c
 create mode 100644 sway/commands/bar/separator_symbol.c
 create mode 100644 sway/commands/bar/status_command.c
 create mode 100644 sway/commands/bar/strip_workspace_numbers.c
 create mode 100644 sway/commands/bar/swaybar_command.c
 create mode 100644 sway/commands/bar/tray_output.c
 create mode 100644 sway/commands/bar/tray_padding.c
 create mode 100644 sway/commands/bar/workspace_buttons.c
 create mode 100644 sway/commands/bar/wrap_scroll.c

(limited to 'sway/commands')

diff --git a/sway/commands/bar.c b/sway/commands/bar.c
new file mode 100644
index 00000000..548106b3
--- /dev/null
+++ b/sway/commands/bar.c
@@ -0,0 +1,57 @@
+#include <string.h>
+#include <strings.h>
+#include <wlr/util/log.h>
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "util.h"
+
+struct cmd_results *cmd_bar(int argc, char **argv) {
+	struct cmd_results *error = NULL;
+	if ((error = checkarg(argc, "bar", EXPECTED_AT_LEAST, 1))) {
+		return error;
+	}
+
+	if (config->reading && strcmp("{", argv[0]) != 0) {
+		return cmd_results_new(CMD_INVALID, "bar",
+				"Expected '{' at start of bar config definition.");
+	}
+
+	if (!config->reading) {
+		if (argc > 1) {
+			if (strcasecmp("mode", argv[0]) == 0) {
+				return bar_cmd_mode(argc-1, argv + 1);
+			}
+
+			if (strcasecmp("hidden_state", argv[0]) == 0) {
+				return bar_cmd_hidden_state(argc-1, argv + 1);
+			}
+		}
+		return cmd_results_new(CMD_FAILURE, "bar", "Can only be used in config file.");
+	}
+
+	// Create new bar with default values
+	struct bar_config *bar = default_bar_config();
+	if (!bar) {
+		return cmd_results_new(CMD_FAILURE, "bar", "Unable to allocate bar state");
+	}
+
+	// set bar id
+	int i;
+	for (i = 0; i < config->bars->length; ++i) {
+		if (bar == config->bars->items[i]) {
+			const int len = 5 + numlen(i); // "bar-" + i + \0
+			bar->id = malloc(len * sizeof(char));
+			if (bar->id) {
+				snprintf(bar->id, len, "bar-%d", i);
+			} else {
+				return cmd_results_new(CMD_FAILURE, "bar", "Unable to allocate bar ID");
+			}
+			break;
+		}
+	}
+
+	// Set current bar
+	config->current_bar = bar;
+	wlr_log(L_DEBUG, "Configuring bar %s", bar->id);
+	return cmd_results_new(CMD_BLOCK_BAR, NULL, NULL);
+}
diff --git a/sway/commands/bar/activate_button.c b/sway/commands/bar/activate_button.c
new file mode 100644
index 00000000..0665d2a6
--- /dev/null
+++ b/sway/commands/bar/activate_button.c
@@ -0,0 +1,9 @@
+#include <stdlib.h>
+#include "sway/commands.h"
+#include "log.h"
+
+struct cmd_results *bar_cmd_activate_button(int argc, char **argv) {
+	const char *cmd_name = "activate_button";
+	// TODO TRAY
+	return cmd_results_new(CMD_INVALID, cmd_name, "TODO TRAY");
+}
diff --git a/sway/commands/bar/binding_mode_indicator.c b/sway/commands/bar/binding_mode_indicator.c
new file mode 100644
index 00000000..e11e1033
--- /dev/null
+++ b/sway/commands/bar/binding_mode_indicator.c
@@ -0,0 +1,27 @@
+#include <string.h>
+#include <strings.h>
+#include "sway/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;
+		wlr_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;
+		wlr_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..ac09a03f
--- /dev/null
+++ b/sway/commands/bar/bindsym.c
@@ -0,0 +1,11 @@
+#include <stdlib.h>
+#include <string.h>
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "list.h"
+#include "log.h"
+#include "stringop.h"
+
+struct cmd_results *bar_cmd_bindsym(int argc, char **argv) {
+	return cmd_results_new(CMD_FAILURE, "bindsym", "TODO"); // TODO
+}
diff --git a/sway/commands/bar/colors.c b/sway/commands/bar/colors.c
new file mode 100644
index 00000000..8b3b0aac
--- /dev/null
+++ b/sway/commands/bar/colors.c
@@ -0,0 +1,129 @@
+#include <string.h>
+#include "sway/commands.h"
+
+static struct cmd_results *parse_single_color(char **color, const char *cmd_name, int argc, char **argv) {
+	struct cmd_results *error = NULL;
+	if ((error = checkarg(argc, cmd_name, EXPECTED_EQUAL_TO, 1))) {
+		return error;
+	}
+
+	if (!*color) {
+		*color = malloc(10);
+		if (!*color) {
+			return cmd_results_new(CMD_FAILURE, cmd_name, "Unable to allocate color");
+		}
+	}
+
+	error = add_color(cmd_name, *color, argv[0]);
+	if (error) {
+		return error;
+	}
+
+	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
+
+static struct cmd_results *parse_three_colors(char ***colors, const char *cmd_name, int argc, char **argv) {
+	struct cmd_results *error = NULL;
+	if (argc != 3) {
+		return cmd_results_new(CMD_INVALID, cmd_name, "Requires exactly three color values");
+	}
+
+	int i;
+	for (i = 0; i < 3; i++) {
+		if (!*colors[i]) {
+			*(colors[i]) = malloc(10);
+			if (!*(colors[i])) {
+				return cmd_results_new(CMD_FAILURE, cmd_name, "Unable to allocate color");
+			}
+		}
+		error = add_color(cmd_name, *(colors[i]), argv[i]);
+		if (error) {
+			return error;
+		}
+	}
+
+	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
+
+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) {
+	char **colors[3] = {
+		&(config->current_bar->colors.active_workspace_border),
+		&(config->current_bar->colors.active_workspace_bg),
+		&(config->current_bar->colors.active_workspace_text)
+	};
+	return parse_three_colors(colors, "active_workspace", argc, argv);
+}
+
+struct cmd_results *bar_colors_cmd_background(int argc, char **argv) {
+	return parse_single_color(&(config->current_bar->colors.background), "background", argc, argv);
+}
+
+struct cmd_results *bar_colors_cmd_focused_background(int argc, char **argv) {
+	return parse_single_color(&(config->current_bar->colors.focused_background), "focused_background", argc, argv);
+}
+
+struct cmd_results *bar_colors_cmd_binding_mode(int argc, char **argv) {
+	char **colors[3] = {
+		&(config->current_bar->colors.binding_mode_border),
+		&(config->current_bar->colors.binding_mode_bg),
+		&(config->current_bar->colors.binding_mode_text)
+	};
+	return parse_three_colors(colors, "binding_mode", argc, argv);
+}
+
+struct cmd_results *bar_colors_cmd_focused_workspace(int argc, char **argv) {
+	char **colors[3] = {
+		&(config->current_bar->colors.focused_workspace_border),
+		&(config->current_bar->colors.focused_workspace_bg),
+		&(config->current_bar->colors.focused_workspace_text)
+	};
+	return parse_three_colors(colors, "focused_workspace", argc, argv);
+}
+
+struct cmd_results *bar_colors_cmd_inactive_workspace(int argc, char **argv) {
+	char **colors[3] = {
+		&(config->current_bar->colors.inactive_workspace_border),
+		&(config->current_bar->colors.inactive_workspace_bg),
+		&(config->current_bar->colors.inactive_workspace_text)
+	};
+	return parse_three_colors(colors, "inactive_workspace", argc, argv);
+}
+
+struct cmd_results *bar_colors_cmd_separator(int argc, char **argv) {
+	return parse_single_color(&(config->current_bar->colors.separator), "separator", argc, argv);
+}
+
+struct cmd_results *bar_colors_cmd_focused_separator(int argc, char **argv) {
+	return parse_single_color(&(config->current_bar->colors.focused_separator), "focused_separator", argc, argv);
+}
+
+struct cmd_results *bar_colors_cmd_statusline(int argc, char **argv) {
+	return parse_single_color(&(config->current_bar->colors.statusline), "statusline", argc, argv);
+}
+
+struct cmd_results *bar_colors_cmd_focused_statusline(int argc, char **argv) {
+	return parse_single_color(&(config->current_bar->colors.focused_separator), "focused_separator", argc, argv);
+}
+
+struct cmd_results *bar_colors_cmd_urgent_workspace(int argc, char **argv) {
+	char **colors[3] = {
+		&(config->current_bar->colors.urgent_workspace_border),
+		&(config->current_bar->colors.urgent_workspace_bg),
+		&(config->current_bar->colors.urgent_workspace_text)
+	};
+	return parse_three_colors(colors, "urgent_workspace", argc, argv);
+}
diff --git a/sway/commands/bar/context_button.c b/sway/commands/bar/context_button.c
new file mode 100644
index 00000000..e6d17f10
--- /dev/null
+++ b/sway/commands/bar/context_button.c
@@ -0,0 +1,9 @@
+#include <stdlib.h>
+#include "sway/commands.h"
+#include "log.h"
+
+struct cmd_results *bar_cmd_context_button(int argc, char **argv) {
+	const char *cmd_name = "context_button";
+	// TODO TRAY
+	return cmd_results_new(CMD_INVALID, cmd_name, "TODO TRAY");
+}
diff --git a/sway/commands/bar/font.c b/sway/commands/bar/font.c
new file mode 100644
index 00000000..6d7c533a
--- /dev/null
+++ b/sway/commands/bar/font.c
@@ -0,0 +1,26 @@
+#include <string.h>
+#include "sway/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;
+	}
+
+	wlr_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..ae0c7834
--- /dev/null
+++ b/sway/commands/bar/height.c
@@ -0,0 +1,21 @@
+#include <stdlib.h>
+#include <string.h>
+#include "sway/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;
+	wlr_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..245d0858
--- /dev/null
+++ b/sway/commands/bar/hidden_state.c
@@ -0,0 +1,78 @@
+#define _XOPEN_SOURCE 500
+#include <string.h>
+#include <strings.h>
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "sway/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);
+		}
+		wlr_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];
+	}
+
+	struct bar_config *bar;
+	for (int 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;
+		}
+	}
+	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/commands/bar/icon_theme.c b/sway/commands/bar/icon_theme.c
new file mode 100644
index 00000000..c6090b81
--- /dev/null
+++ b/sway/commands/bar/icon_theme.c
@@ -0,0 +1,9 @@
+#define _XOPEN_SOURCE 500
+#include <string.h>
+#include "sway/commands.h"
+
+struct cmd_results *bar_cmd_icon_theme(int argc, char **argv) {
+	const char *cmd_name = "tray_output";
+	// TODO TRAY
+	return cmd_results_new(CMD_INVALID, cmd_name, "TODO TRAY");
+}
diff --git a/sway/commands/bar/id.c b/sway/commands/bar/id.c
new file mode 100644
index 00000000..d9e7f8df
--- /dev/null
+++ b/sway/commands/bar/id.c
@@ -0,0 +1,33 @@
+#define _XOPEN_SOURCE 500
+#include <string.h>
+#include "sway/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);
+		}
+	}
+
+	wlr_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..7d346956
--- /dev/null
+++ b/sway/commands/bar/mode.c
@@ -0,0 +1,78 @@
+#define _XOPEN_SOURCE 500
+#include <string.h>
+#include <strings.h>
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "sway/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);
+		}
+		wlr_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..9a1f8b01
--- /dev/null
+++ b/sway/commands/bar/modifier.c
@@ -0,0 +1,35 @@
+#include <string.h>
+#include "sway/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;
+	wlr_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..034d9ca4
--- /dev/null
+++ b/sway/commands/bar/output.c
@@ -0,0 +1,50 @@
+#define _XOPEN_SOURCE 500
+#include <string.h>
+#include "sway/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));
+		wlr_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..34b85e98
--- /dev/null
+++ b/sway/commands/bar/pango_markup.c
@@ -0,0 +1,27 @@
+#include <string.h>
+#include <strings.h>
+#include "sway/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;
+		wlr_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;
+		wlr_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..efa8c0bc
--- /dev/null
+++ b/sway/commands/bar/position.c
@@ -0,0 +1,29 @@
+#define _POSIX_C_SOURCE 200809L
+#include <string.h>
+#include <strings.h>
+#include "sway/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.");
+	}
+
+	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",
+					argv[0], config->current_bar->id);
+			config->current_bar->position = strdup(argv[0]);
+			return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+		}
+	}
+
+	error = cmd_results_new(CMD_INVALID, "position", "Invalid value %s", argv[0]);
+	return error;
+}
diff --git a/sway/commands/bar/secondary_button.c b/sway/commands/bar/secondary_button.c
new file mode 100644
index 00000000..46d53e3f
--- /dev/null
+++ b/sway/commands/bar/secondary_button.c
@@ -0,0 +1,9 @@
+#include <stdlib.h>
+#include "sway/commands.h"
+#include "log.h"
+
+struct cmd_results *bar_cmd_secondary_button(int argc, char **argv) {
+	const char *cmd_name = "secondary_button";
+	// TODO TRAY
+	return cmd_results_new(CMD_INVALID, cmd_name, "TODO TRAY");
+}
diff --git a/sway/commands/bar/separator_symbol.c b/sway/commands/bar/separator_symbol.c
new file mode 100644
index 00000000..7dc0956b
--- /dev/null
+++ b/sway/commands/bar/separator_symbol.c
@@ -0,0 +1,21 @@
+#define _XOPEN_SOURCE 500
+#include <string.h>
+#include "sway/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]);
+	wlr_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..05377fcc
--- /dev/null
+++ b/sway/commands/bar/status_command.c
@@ -0,0 +1,21 @@
+#include <string.h>
+#include "sway/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);
+	wlr_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..0558db8f
--- /dev/null
+++ b/sway/commands/bar/strip_workspace_numbers.c
@@ -0,0 +1,27 @@
+#include <string.h>
+#include <strings.h>
+#include "sway/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;
+		wlr_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;
+		wlr_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..63d4f29a
--- /dev/null
+++ b/sway/commands/bar/swaybar_command.c
@@ -0,0 +1,21 @@
+#include <string.h>
+#include "sway/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);
+	wlr_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..2d822146
--- /dev/null
+++ b/sway/commands/bar/tray_output.c
@@ -0,0 +1,9 @@
+#define _XOPEN_SOURCE 500
+#include <string.h>
+#include "sway/commands.h"
+
+struct cmd_results *bar_cmd_tray_output(int argc, char **argv) {
+	const char *cmd_name = "tray_output";
+	// TODO TRAY
+	return cmd_results_new(CMD_INVALID, cmd_name, "TODO TRAY");
+}
diff --git a/sway/commands/bar/tray_padding.c b/sway/commands/bar/tray_padding.c
new file mode 100644
index 00000000..95b8ad3b
--- /dev/null
+++ b/sway/commands/bar/tray_padding.c
@@ -0,0 +1,10 @@
+#include <stdlib.h>
+#include <strings.h>
+#include "sway/commands.h"
+#include "log.h"
+
+struct cmd_results *bar_cmd_tray_padding(int argc, char **argv) {
+	const char *cmd_name = "tray_padding";
+	// TODO TRAY
+	return cmd_results_new(CMD_INVALID, cmd_name, "TODO TRAY");
+}
diff --git a/sway/commands/bar/workspace_buttons.c b/sway/commands/bar/workspace_buttons.c
new file mode 100644
index 00000000..1a617eb8
--- /dev/null
+++ b/sway/commands/bar/workspace_buttons.c
@@ -0,0 +1,27 @@
+#include <string.h>
+#include <strings.h>
+#include "sway/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;
+		wlr_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;
+		wlr_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..c89dff5f
--- /dev/null
+++ b/sway/commands/bar/wrap_scroll.c
@@ -0,0 +1,27 @@
+#include <string.h>
+#include <strings.h>
+#include "sway/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;
+		wlr_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;
+		wlr_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);
+}
-- 
cgit v1.2.3


From 5c9cdbcdd2a07e2ced7b60d629a3e20bd7c8bf68 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Thu, 29 Mar 2018 17:49:44 -0400
Subject: Add swaybg_command

---
 include/sway/commands.h        |  1 +
 include/sway/config.h          |  1 +
 sway/commands.c                |  1 +
 sway/commands/swaybg_command.c | 20 ++++++++++++++++++++
 sway/config/output.c           | 25 +++++++++++++------------
 sway/meson.build               |  1 +
 sway/sway.5.txt                |  3 +++
 7 files changed, 40 insertions(+), 12 deletions(-)
 create mode 100644 sway/commands/swaybg_command.c

(limited to 'sway/commands')

diff --git a/include/sway/commands.h b/include/sway/commands.h
index dda286a2..1291d5fb 100644
--- a/include/sway/commands.h
+++ b/include/sway/commands.h
@@ -141,6 +141,7 @@ sway_cmd cmd_splith;
 sway_cmd cmd_splitt;
 sway_cmd cmd_splitv;
 sway_cmd cmd_sticky;
+sway_cmd cmd_swaybg_command;
 sway_cmd cmd_unmark;
 sway_cmd cmd_workspace;
 sway_cmd cmd_ws_auto_back_and_forth;
diff --git a/include/sway/config.h b/include/sway/config.h
index dbcfc91e..4a7fee0f 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -282,6 +282,7 @@ struct sway_config {
 	list_t *active_bar_modifiers;
 	struct sway_mode *current_mode;
 	struct bar_config *current_bar;
+	char *swaybg_command;
 	uint32_t floating_mod;
 	uint32_t dragging_key;
 	uint32_t resizing_key;
diff --git a/sway/commands.c b/sway/commands.c
index 8d8b643b..38e2f764 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -149,6 +149,7 @@ static struct cmd_handler bar_colors_handlers[] = {
 /* Config-time only commands. Keep alphabetized */
 static struct cmd_handler config_handlers[] = {
 	{ "set", cmd_set },
+	{ "swaybg_command", cmd_swaybg_command },
 };
 
 /* Runtime-only commands. Keep alphabetized */
diff --git a/sway/commands/swaybg_command.c b/sway/commands/swaybg_command.c
new file mode 100644
index 00000000..770d4821
--- /dev/null
+++ b/sway/commands/swaybg_command.c
@@ -0,0 +1,20 @@
+#include <string.h>
+#include "sway/commands.h"
+#include "log.h"
+#include "stringop.h"
+
+struct cmd_results *cmd_swaybg_command(int argc, char **argv) {
+	struct cmd_results *error = NULL;
+	if ((error = checkarg(argc, "swaybg_command", EXPECTED_AT_LEAST, 1))) {
+		return error;
+	}
+
+	if (config->swaybg_command) {
+		free(config->swaybg_command);
+	}
+	config->swaybg_command = join_args(argv, argc);
+	wlr_log(L_DEBUG, "Using custom swaybg command: %s",
+			config->swaybg_command);
+
+	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/config/output.c b/sway/config/output.c
index 24b4a18e..c3ec61b7 100644
--- a/sway/config/output.c
+++ b/sway/config/output.c
@@ -180,19 +180,20 @@ void apply_output_config(struct output_config *oc, swayc_t *output) {
 		wlr_log(L_DEBUG, "Setting background for output %d to %s",
 				output_i, oc->background);
 
-		size_t bufsize = 12;
-		char output_id[bufsize];
-		snprintf(output_id, bufsize, "%d", output_i);
-		output_id[bufsize-1] = 0;
-
-		char *const cmd[] = {
-			"swaybg",
-			output_id,
-			oc->background,
-			oc->background_option,
-			NULL,
-		};
+		size_t len = snprintf(NULL, 0, "%s %d %s %s",
+				config->swaybg_command ? config->swaybg_command : "swaybg",
+				output_i, oc->background, oc->background_option);
+		char *command = malloc(len + 1);
+		if (!command) {
+			wlr_log(L_DEBUG, "Unable to allocate swaybg command");
+			return;
+		}
+		snprintf(command, len + 1, "%s %d %s %s",
+				config->swaybg_command ? config->swaybg_command : "swaybg",
+				output_i, oc->background, oc->background_option);
+		wlr_log(L_DEBUG, "-> %s", command);
 
+		char *const cmd[] = { "sh", "-c", command, NULL };
 		output->sway_output->bg_pid = fork();
 		if (output->sway_output->bg_pid == 0) {
 			execvp(cmd[0], cmd);
diff --git a/sway/meson.build b/sway/meson.build
index ac65d05e..54c03061 100644
--- a/sway/meson.build
+++ b/sway/meson.build
@@ -20,6 +20,7 @@ sway_sources = files(
 	'commands/seat/attach.c',
 	'commands/seat/fallback.c',
 	'commands/set.c',
+	'commands/swaybg_command.c',
 	'commands/bar/activate_button.c',
 	'commands/bar/binding_mode_indicator.c',
 	'commands/bar/bindsym.c',
diff --git a/sway/sway.5.txt b/sway/sway.5.txt
index 6c9bce7a..900e499a 100644
--- a/sway/sway.5.txt
+++ b/sway/sway.5.txt
@@ -43,6 +43,9 @@ The following commands may only be used in the configuration file.
 	Sets variable $name to _value_. You can use the new variable in the arguments
 	of future commands.
 
+**swaybg_command** <command>::
+	Executes custom bg command, default is _swaybg_.
+
 The following commands cannot be used directly in the configuration file.
 They are expected to be used with **bindsym** or at runtime through **swaymsg**(1).
 
-- 
cgit v1.2.3


From 8b5b72c576b59c875fc10f8ae88d9643c9797c39 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Thu, 29 Mar 2018 18:09:42 -0400
Subject: Restart swaybar on config reload

---
 sway/commands/reload.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'sway/commands')

diff --git a/sway/commands/reload.c b/sway/commands/reload.c
index d54d40db..a06a9aa0 100644
--- a/sway/commands/reload.c
+++ b/sway/commands/reload.c
@@ -11,8 +11,7 @@ struct cmd_results *cmd_reload(int argc, char **argv) {
 		return cmd_results_new(CMD_FAILURE, "reload", "Error(s) reloading config.");
 	}
 
-	/* load_swaybars(); -- for when it's implemented */
-
+	load_swaybars();
 	arrange_windows(&root_container, -1, -1);
 	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
-- 
cgit v1.2.3


From 849c3515abff7033dbd4723fd7328cb07af74222 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Thu, 29 Mar 2018 21:54:08 -0400
Subject: Use statically allocated text buffer

---
 common/pango.c      | 6 ++----
 sway/commands/bar.c | 6 +++---
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'sway/commands')

diff --git a/common/pango.c b/common/pango.c
index 212d96cf..2ae7883c 100644
--- a/common/pango.c
+++ b/common/pango.c
@@ -32,7 +32,7 @@ PangoLayout *get_pango_layout(cairo_t *cairo, const char *font,
 
 void get_text_size(cairo_t *cairo, const char *font, int *width, int *height,
 		int32_t scale, bool markup, const char *fmt, ...) {
-	char *buf = malloc(2048);
+	static char buf[2048];
 
 	va_list args;
 	va_start(args, fmt);
@@ -45,12 +45,11 @@ void get_text_size(cairo_t *cairo, const char *font, int *width, int *height,
 	pango_cairo_update_layout(cairo, layout);
 	pango_layout_get_pixel_size(layout, width, height);
 	g_object_unref(layout);
-	free(buf);
 }
 
 void pango_printf(cairo_t *cairo, const char *font,
 		int32_t scale, bool markup, const char *fmt, ...) {
-	char *buf = malloc(2048);
+	static char buf[2048];
 
 	va_list args;
 	va_start(args, fmt);
@@ -63,5 +62,4 @@ void pango_printf(cairo_t *cairo, const char *font,
 	pango_cairo_update_layout(cairo, layout);
 	pango_cairo_show_layout(cairo, layout);
 	g_object_unref(layout);
-	free(buf);
 }
diff --git a/sway/commands/bar.c b/sway/commands/bar.c
index 548106b3..ff111163 100644
--- a/sway/commands/bar.c
+++ b/sway/commands/bar.c
@@ -36,15 +36,15 @@ struct cmd_results *cmd_bar(int argc, char **argv) {
 	}
 
 	// set bar id
-	int i;
-	for (i = 0; i < config->bars->length; ++i) {
+	for (int i = 0; i < config->bars->length; ++i) {
 		if (bar == config->bars->items[i]) {
 			const int len = 5 + numlen(i); // "bar-" + i + \0
 			bar->id = malloc(len * sizeof(char));
 			if (bar->id) {
 				snprintf(bar->id, len, "bar-%d", i);
 			} else {
-				return cmd_results_new(CMD_FAILURE, "bar", "Unable to allocate bar ID");
+				return cmd_results_new(CMD_FAILURE,
+						"bar", "Unable to allocate bar ID");
 			}
 			break;
 		}
-- 
cgit v1.2.3


From 741424c4e7811c12d8cca28466f89bd61eaf3a75 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Thu, 29 Mar 2018 22:05:16 -0400
Subject: Clean up imported bar commands

---
 sway/commands/bar/activate_button.c         |  3 +-
 sway/commands/bar/binding_mode_indicator.c  | 20 +++++------
 sway/commands/bar/colors.c                  | 51 +++++++++++++----------------
 sway/commands/bar/context_button.c          |  3 +-
 sway/commands/bar/font.c                    | 13 +++-----
 sway/commands/bar/height.c                  |  5 ++-
 sway/commands/bar/hidden_state.c            |  5 ---
 sway/commands/bar/icon_theme.c              |  3 +-
 sway/commands/bar/id.c                      |  5 +--
 sway/commands/bar/mode.c                    | 10 ++----
 sway/commands/bar/modifier.c                |  8 ++---
 sway/commands/bar/output.c                  | 15 ++++-----
 sway/commands/bar/pango_markup.c            | 11 ++++---
 sway/commands/bar/position.c                |  7 ++--
 sway/commands/bar/secondary_button.c        |  3 +-
 sway/commands/bar/separator_symbol.c        |  9 +++--
 sway/commands/bar/status_command.c          |  9 +++--
 sway/commands/bar/strip_workspace_numbers.c | 18 +++++-----
 sway/commands/bar/swaybar_command.c         |  9 +++--
 sway/commands/bar/tray_output.c             |  3 +-
 sway/commands/bar/tray_padding.c            |  3 +-
 sway/commands/bar/workspace_buttons.c       | 15 +++++----
 sway/commands/bar/wrap_scroll.c             | 12 +++----
 23 files changed, 104 insertions(+), 136 deletions(-)

(limited to 'sway/commands')

diff --git a/sway/commands/bar/activate_button.c b/sway/commands/bar/activate_button.c
index 0665d2a6..7310e7ec 100644
--- a/sway/commands/bar/activate_button.c
+++ b/sway/commands/bar/activate_button.c
@@ -3,7 +3,6 @@
 #include "log.h"
 
 struct cmd_results *bar_cmd_activate_button(int argc, char **argv) {
-	const char *cmd_name = "activate_button";
 	// TODO TRAY
-	return cmd_results_new(CMD_INVALID, cmd_name, "TODO TRAY");
+	return cmd_results_new(CMD_INVALID, "activate_button", "TODO TRAY");
 }
diff --git a/sway/commands/bar/binding_mode_indicator.c b/sway/commands/bar/binding_mode_indicator.c
index e11e1033..3ba5f33f 100644
--- a/sway/commands/bar/binding_mode_indicator.c
+++ b/sway/commands/bar/binding_mode_indicator.c
@@ -5,23 +5,23 @@
 
 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))) {
+	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.");
+		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;
-		wlr_log(L_DEBUG, "Enabling binding mode indicator on bar: %s", config->current_bar->id);
+		wlr_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;
-		wlr_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;
+		wlr_log(L_DEBUG, "Disabling binding mode indicator on bar: %s",
+				config->current_bar->id);
 	}
-	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+	return cmd_results_new(CMD_INVALID, "binding_mode_indicator",
+			"Invalid value %s", argv[0]);
 }
diff --git a/sway/commands/bar/colors.c b/sway/commands/bar/colors.c
index 8b3b0aac..17ba9b7c 100644
--- a/sway/commands/bar/colors.c
+++ b/sway/commands/bar/colors.c
@@ -1,47 +1,38 @@
 #include <string.h>
 #include "sway/commands.h"
 
-static struct cmd_results *parse_single_color(char **color, const char *cmd_name, int argc, char **argv) {
+static struct cmd_results *parse_single_color(char **color,
+		const char *cmd_name, int argc, char **argv) {
 	struct cmd_results *error = NULL;
 	if ((error = checkarg(argc, cmd_name, EXPECTED_EQUAL_TO, 1))) {
 		return error;
 	}
-
-	if (!*color) {
-		*color = malloc(10);
-		if (!*color) {
-			return cmd_results_new(CMD_FAILURE, cmd_name, "Unable to allocate color");
-		}
+	if (!*color && !(*color = malloc(10))) {
+		return NULL;
 	}
-
 	error = add_color(cmd_name, *color, argv[0]);
 	if (error) {
 		return error;
 	}
-
 	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
 
-static struct cmd_results *parse_three_colors(char ***colors, const char *cmd_name, int argc, char **argv) {
+static struct cmd_results *parse_three_colors(char ***colors,
+		const char *cmd_name, int argc, char **argv) {
 	struct cmd_results *error = NULL;
 	if (argc != 3) {
-		return cmd_results_new(CMD_INVALID, cmd_name, "Requires exactly three color values");
+		return cmd_results_new(CMD_INVALID,
+				cmd_name, "Requires exactly three color values");
 	}
-
-	int i;
-	for (i = 0; i < 3; i++) {
-		if (!*colors[i]) {
-			*(colors[i]) = malloc(10);
-			if (!*(colors[i])) {
-				return cmd_results_new(CMD_FAILURE, cmd_name, "Unable to allocate color");
-			}
+	for (size_t i = 0; i < 3; i++) {
+		if (!*colors[i] && !(*(colors[i]) = malloc(10))) {
+			return NULL;
 		}
 		error = add_color(cmd_name, *(colors[i]), argv[i]);
 		if (error) {
 			return error;
 		}
 	}
-
 	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
 
@@ -50,12 +41,10 @@ struct cmd_results *bar_cmd_colors(int argc, char **argv) {
 	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);
 }
 
@@ -69,11 +58,13 @@ struct cmd_results *bar_colors_cmd_active_workspace(int argc, char **argv) {
 }
 
 struct cmd_results *bar_colors_cmd_background(int argc, char **argv) {
-	return parse_single_color(&(config->current_bar->colors.background), "background", argc, argv);
+	return parse_single_color(&(config->current_bar->colors.background),
+			"background", argc, argv);
 }
 
 struct cmd_results *bar_colors_cmd_focused_background(int argc, char **argv) {
-	return parse_single_color(&(config->current_bar->colors.focused_background), "focused_background", argc, argv);
+	return parse_single_color(&(config->current_bar->colors.focused_background),
+			"focused_background", argc, argv);
 }
 
 struct cmd_results *bar_colors_cmd_binding_mode(int argc, char **argv) {
@@ -104,19 +95,23 @@ struct cmd_results *bar_colors_cmd_inactive_workspace(int argc, char **argv) {
 }
 
 struct cmd_results *bar_colors_cmd_separator(int argc, char **argv) {
-	return parse_single_color(&(config->current_bar->colors.separator), "separator", argc, argv);
+	return parse_single_color(&(config->current_bar->colors.separator),
+			"separator", argc, argv);
 }
 
 struct cmd_results *bar_colors_cmd_focused_separator(int argc, char **argv) {
-	return parse_single_color(&(config->current_bar->colors.focused_separator), "focused_separator", argc, argv);
+	return parse_single_color(&(config->current_bar->colors.focused_separator),
+			"focused_separator", argc, argv);
 }
 
 struct cmd_results *bar_colors_cmd_statusline(int argc, char **argv) {
-	return parse_single_color(&(config->current_bar->colors.statusline), "statusline", argc, argv);
+	return parse_single_color(&(config->current_bar->colors.statusline),
+			"statusline", argc, argv);
 }
 
 struct cmd_results *bar_colors_cmd_focused_statusline(int argc, char **argv) {
-	return parse_single_color(&(config->current_bar->colors.focused_separator), "focused_separator", argc, argv);
+	return parse_single_color(&(config->current_bar->colors.focused_separator),
+			"focused_separator", argc, argv);
 }
 
 struct cmd_results *bar_colors_cmd_urgent_workspace(int argc, char **argv) {
diff --git a/sway/commands/bar/context_button.c b/sway/commands/bar/context_button.c
index e6d17f10..3b76885a 100644
--- a/sway/commands/bar/context_button.c
+++ b/sway/commands/bar/context_button.c
@@ -3,7 +3,6 @@
 #include "log.h"
 
 struct cmd_results *bar_cmd_context_button(int argc, char **argv) {
-	const char *cmd_name = "context_button";
 	// TODO TRAY
-	return cmd_results_new(CMD_INVALID, cmd_name, "TODO TRAY");
+	return cmd_results_new(CMD_INVALID, "context_button", "TODO TRAY");
 }
diff --git a/sway/commands/bar/font.c b/sway/commands/bar/font.c
index 6d7c533a..80b7a593 100644
--- a/sway/commands/bar/font.c
+++ b/sway/commands/bar/font.c
@@ -1,3 +1,4 @@
+#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include "sway/commands.h"
 #include "log.h"
@@ -8,19 +9,13 @@ struct cmd_results *bar_cmd_font(int argc, char **argv) {
 	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;
-	}
-
-	wlr_log(L_DEBUG, "Settings font '%s' for bar: %s", config->current_bar->font, config->current_bar->id);
+	config->current_bar->font = strdup(font);
+	wlr_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
index ae0c7834..3160caed 100644
--- a/sway/commands/bar/height.c
+++ b/sway/commands/bar/height.c
@@ -8,14 +8,13 @@ struct cmd_results *bar_cmd_height(int argc, char **argv) {
 	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;
-	wlr_log(L_DEBUG, "Setting bar height to %d on bar: %s", height, config->current_bar->id);
+	wlr_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
index 245d0858..6641f184 100644
--- a/sway/commands/bar/hidden_state.c
+++ b/sway/commands/bar/hidden_state.c
@@ -23,7 +23,6 @@ static struct cmd_results *bar_set_hidden_state(struct bar_config *bar,
 		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);
@@ -31,7 +30,6 @@ static struct cmd_results *bar_set_hidden_state(struct bar_config *bar,
 		wlr_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);
@@ -45,14 +43,12 @@ struct cmd_results *bar_cmd_hidden_state(int argc, char **argv) {
 	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);
 	}
@@ -61,7 +57,6 @@ struct cmd_results *bar_cmd_hidden_state(int argc, char **argv) {
 	if (argc == 2) {
 		id = argv[1];
 	}
-
 	struct bar_config *bar;
 	for (int i = 0; i < config->bars->length; ++i) {
 		bar = config->bars->items[i];
diff --git a/sway/commands/bar/icon_theme.c b/sway/commands/bar/icon_theme.c
index c6090b81..44cd3076 100644
--- a/sway/commands/bar/icon_theme.c
+++ b/sway/commands/bar/icon_theme.c
@@ -3,7 +3,6 @@
 #include "sway/commands.h"
 
 struct cmd_results *bar_cmd_icon_theme(int argc, char **argv) {
-	const char *cmd_name = "tray_output";
 	// TODO TRAY
-	return cmd_results_new(CMD_INVALID, cmd_name, "TODO TRAY");
+	return cmd_results_new(CMD_INVALID, "icon_theme", "TODO TRAY");
 }
diff --git a/sway/commands/bar/id.c b/sway/commands/bar/id.c
index d9e7f8df..c1e56f03 100644
--- a/sway/commands/bar/id.c
+++ b/sway/commands/bar/id.c
@@ -11,10 +11,8 @@ struct cmd_results *bar_cmd_id(int argc, char **argv) {
 
 	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) {
+	for (int 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",
@@ -27,7 +25,6 @@ struct cmd_results *bar_cmd_id(int argc, char **argv) {
 
 	// 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
index 7d346956..34bb0a4f 100644
--- a/sway/commands/bar/mode.c
+++ b/sway/commands/bar/mode.c
@@ -44,13 +44,12 @@ struct cmd_results *bar_cmd_mode(int argc, char **argv) {
 	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]);
+		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);
 	}
@@ -60,19 +59,16 @@ struct cmd_results *bar_cmd_mode(int argc, char **argv) {
 		id = argv[1];
 	}
 
-	int i;
 	struct bar_config *bar;
-	for (i = 0; i < config->bars->length; ++i) {
+	for (int 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
index 9a1f8b01..7ba4b125 100644
--- a/sway/commands/bar/modifier.c
+++ b/sway/commands/bar/modifier.c
@@ -15,7 +15,6 @@ struct cmd_results *bar_cmd_modifier(int argc, char **argv) {
 	}
 
 	uint32_t mod = 0;
-
 	list_t *split = split_string(argv[0], "+");
 	for (int i = 0; i < split->length; ++i) {
 		uint32_t tmp_mod;
@@ -24,12 +23,13 @@ struct cmd_results *bar_cmd_modifier(int argc, char **argv) {
 			continue;
 		} else {
 			free_flat_list(split);
-			return cmd_results_new(CMD_INVALID, "modifier", "Unknown modifier '%s'", split->items[i]);
+			return cmd_results_new(CMD_INVALID, "modifier",
+					"Unknown modifier '%s'", split->items[i]);
 		}
 	}
 	free_flat_list(split);
-
 	config->current_bar->modifier = mod;
-	wlr_log(L_DEBUG, "Show/Hide the bar when pressing '%s' in hide mode.", argv[0]);
+	wlr_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
index 034d9ca4..f7ca0aa4 100644
--- a/sway/commands/bar/output.c
+++ b/sway/commands/bar/output.c
@@ -1,4 +1,5 @@
 #define _XOPEN_SOURCE 500
+#include <stdbool.h>
 #include <string.h>
 #include "sway/commands.h"
 #include "list.h"
@@ -9,7 +10,6 @@ struct cmd_results *bar_cmd_output(int argc, char **argv) {
 	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.");
 	}
@@ -21,21 +21,20 @@ struct cmd_results *bar_cmd_output(int argc, char **argv) {
 		config->current_bar->outputs = outputs;
 	}
 
-	int i;
-	int add_output = 1;
+	bool add_output = true;
 	if (strcmp("*", output) == 0) {
 		// remove all previous defined outputs and replace with '*'
-		for (i = 0; i < outputs->length; ++i) {
+		for (int 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) {
+		for (int i = 0; i < outputs->length; ++i) {
 			const char *find = outputs->items[i];
 			if (strcmp("*", find) == 0 || strcmp(output, find) == 0) {
-				add_output = 0;
+				add_output = false;
 				break;
 			}
 		}
@@ -43,8 +42,8 @@ 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'", config->current_bar->id, output);
+		wlr_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
index 34b85e98..480af724 100644
--- a/sway/commands/bar/pango_markup.c
+++ b/sway/commands/bar/pango_markup.c
@@ -8,19 +8,20 @@ struct cmd_results *bar_cmd_pango_markup(int argc, char **argv) {
 	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;
-		wlr_log(L_DEBUG, "Enabling pango markup for bar: %s", config->current_bar->id);
+		wlr_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;
-		wlr_log(L_DEBUG, "Disabling pango markup for bar: %s", config->current_bar->id);
+		wlr_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]);
+		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
index efa8c0bc..9c580483 100644
--- a/sway/commands/bar/position.c
+++ b/sway/commands/bar/position.c
@@ -9,11 +9,9 @@ struct cmd_results *bar_cmd_position(int argc, char **argv) {
 	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.");
 	}
-
 	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) {
@@ -23,7 +21,6 @@ struct cmd_results *bar_cmd_position(int argc, char **argv) {
 			return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 		}
 	}
-
-	error = cmd_results_new(CMD_INVALID, "position", "Invalid value %s", argv[0]);
-	return error;
+	return cmd_results_new(CMD_INVALID,
+			"position", "Invalid value %s", argv[0]);
 }
diff --git a/sway/commands/bar/secondary_button.c b/sway/commands/bar/secondary_button.c
index 46d53e3f..449124cb 100644
--- a/sway/commands/bar/secondary_button.c
+++ b/sway/commands/bar/secondary_button.c
@@ -3,7 +3,6 @@
 #include "log.h"
 
 struct cmd_results *bar_cmd_secondary_button(int argc, char **argv) {
-	const char *cmd_name = "secondary_button";
 	// TODO TRAY
-	return cmd_results_new(CMD_INVALID, cmd_name, "TODO TRAY");
+	return cmd_results_new(CMD_INVALID, "secondary_button", "TODO TRAY");
 }
diff --git a/sway/commands/bar/separator_symbol.c b/sway/commands/bar/separator_symbol.c
index 7dc0956b..1e08df6d 100644
--- a/sway/commands/bar/separator_symbol.c
+++ b/sway/commands/bar/separator_symbol.c
@@ -8,14 +8,13 @@ struct cmd_results *bar_cmd_separator_symbol(int argc, char **argv) {
 	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.");
+		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]);
-	wlr_log(L_DEBUG, "Settings separator_symbol '%s' for bar: %s", config->current_bar->separator_symbol, config->current_bar->id);
-
+	wlr_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
index 05377fcc..5e199cde 100644
--- a/sway/commands/bar/status_command.c
+++ b/sway/commands/bar/status_command.c
@@ -8,14 +8,13 @@ struct cmd_results *bar_cmd_status_command(int argc, char **argv) {
 	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.");
+		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);
-	wlr_log(L_DEBUG, "Feeding bar with status command: %s", config->current_bar->status_command);
-
+	wlr_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
index 0558db8f..4f24a356 100644
--- a/sway/commands/bar/strip_workspace_numbers.c
+++ b/sway/commands/bar/strip_workspace_numbers.c
@@ -5,23 +5,25 @@
 
 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))) {
+	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.");
+		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;
-		wlr_log(L_DEBUG, "Stripping workspace numbers on bar: %s", config->current_bar->id);
+		wlr_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;
-		wlr_log(L_DEBUG, "Enabling workspace numbers on bar: %s", config->current_bar->id);
+		wlr_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_INVALID,
+				"strip_workspace_numbers", "Invalid value %s", argv[0]);
 	}
 	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
diff --git a/sway/commands/bar/swaybar_command.c b/sway/commands/bar/swaybar_command.c
index 63d4f29a..520cdd11 100644
--- a/sway/commands/bar/swaybar_command.c
+++ b/sway/commands/bar/swaybar_command.c
@@ -8,14 +8,13 @@ struct cmd_results *bar_cmd_swaybar_command(int argc, char **argv) {
 	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.");
+		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);
-	wlr_log(L_DEBUG, "Using custom swaybar command: %s", config->current_bar->swaybar_command);
-
+	wlr_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
index 2d822146..6ab16731 100644
--- a/sway/commands/bar/tray_output.c
+++ b/sway/commands/bar/tray_output.c
@@ -3,7 +3,6 @@
 #include "sway/commands.h"
 
 struct cmd_results *bar_cmd_tray_output(int argc, char **argv) {
-	const char *cmd_name = "tray_output";
 	// TODO TRAY
-	return cmd_results_new(CMD_INVALID, cmd_name, "TODO TRAY");
+	return cmd_results_new(CMD_INVALID, "tray_output", "TODO TRAY");
 }
diff --git a/sway/commands/bar/tray_padding.c b/sway/commands/bar/tray_padding.c
index 95b8ad3b..91c56f19 100644
--- a/sway/commands/bar/tray_padding.c
+++ b/sway/commands/bar/tray_padding.c
@@ -4,7 +4,6 @@
 #include "log.h"
 
 struct cmd_results *bar_cmd_tray_padding(int argc, char **argv) {
-	const char *cmd_name = "tray_padding";
 	// TODO TRAY
-	return cmd_results_new(CMD_INVALID, cmd_name, "TODO TRAY");
+	return cmd_results_new(CMD_INVALID, "tray_padding", "TODO TRAY");
 }
diff --git a/sway/commands/bar/workspace_buttons.c b/sway/commands/bar/workspace_buttons.c
index 1a617eb8..6edc3a0d 100644
--- a/sway/commands/bar/workspace_buttons.c
+++ b/sway/commands/bar/workspace_buttons.c
@@ -8,20 +8,21 @@ struct cmd_results *bar_cmd_workspace_buttons(int argc, char **argv) {
 	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.");
+		return cmd_results_new(CMD_FAILURE,
+				"workspace_buttons", "No bar defined.");
 	}
-
 	if (strcasecmp("yes", argv[0]) == 0) {
 		config->current_bar->workspace_buttons = true;
-		wlr_log(L_DEBUG, "Enabling workspace buttons on bar: %s", config->current_bar->id);
+		wlr_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;
-		wlr_log(L_DEBUG, "Disabling workspace buttons on bar: %s", config->current_bar->id);
+		wlr_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_INVALID, "workspace_buttons",
+				"Invalid value %s", argv[0]);
 	}
 	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
diff --git a/sway/commands/bar/wrap_scroll.c b/sway/commands/bar/wrap_scroll.c
index c89dff5f..7386f82c 100644
--- a/sway/commands/bar/wrap_scroll.c
+++ b/sway/commands/bar/wrap_scroll.c
@@ -8,20 +8,20 @@ struct cmd_results *bar_cmd_wrap_scroll(int argc, char **argv) {
 	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;
-		wlr_log(L_DEBUG, "Enabling wrap scroll on bar: %s", config->current_bar->id);
+		wlr_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;
-		wlr_log(L_DEBUG, "Disabling wrap scroll on bar: %s", config->current_bar->id);
+		wlr_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_INVALID,
+				"wrap_scroll", "Invalid value %s", argv[0]);
 	}
 	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
-- 
cgit v1.2.3


From 8efee109ad2ab4861f25e54e9f6d1ceb06203791 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Thu, 29 Mar 2018 22:10:33 -0400
Subject: Implement modes

---
 include/sway/ipc-server.h |  1 +
 sway/commands.c           |  1 +
 sway/commands/mode.c      | 59 +++++++++++++++++++++++++++++++++++++++++++++++
 sway/ipc-server.c         | 14 +++++++++--
 sway/meson.build          |  1 +
 5 files changed, 74 insertions(+), 2 deletions(-)
 create mode 100644 sway/commands/mode.c

(limited to 'sway/commands')

diff --git a/include/sway/ipc-server.h b/include/sway/ipc-server.h
index 1f6fffff..b4db75c3 100644
--- a/include/sway/ipc-server.h
+++ b/include/sway/ipc-server.h
@@ -13,5 +13,6 @@ struct sockaddr_un *ipc_user_sockaddr(void);
 void ipc_event_workspace(swayc_t *old, swayc_t *new, const char *change);
 void ipc_event_window(swayc_t *window, const char *change);
 void ipc_event_barconfig_update(struct bar_config *bar);
+void ipc_event_mode(const char *mode);
 
 #endif
diff --git a/sway/commands.c b/sway/commands.c
index 38e2f764..bcc777ed 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -100,6 +100,7 @@ static struct cmd_handler handlers[] = {
 	{ "exec_always", cmd_exec_always },
 	{ "include", cmd_include },
 	{ "input", cmd_input },
+	{ "mode", cmd_mode },
 	{ "output", cmd_output },
 	{ "seat", cmd_seat },
 	{ "workspace", cmd_workspace },
diff --git a/sway/commands/mode.c b/sway/commands/mode.c
new file mode 100644
index 00000000..c30a8bac
--- /dev/null
+++ b/sway/commands/mode.c
@@ -0,0 +1,59 @@
+#define _XOPEN_SOURCE 500
+#include <stdbool.h>
+#include <string.h>
+#include <strings.h>
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "sway/ipc-server.h"
+#include "list.h"
+#include "log.h"
+
+struct cmd_results *cmd_mode(int argc, char **argv) {
+	struct cmd_results *error = NULL;
+	if ((error = checkarg(argc, "mode", EXPECTED_AT_LEAST, 1))) {
+		return error;
+	}
+
+	const char *mode_name = argv[0];
+	bool new_mode = (argc == 2 && strcmp(argv[1], "{") == 0);
+	if (new_mode && !config->reading) {
+		return cmd_results_new(CMD_FAILURE,
+				"mode", "Can only be used in config file.");
+	}
+	struct sway_mode *mode = NULL;
+	// Find mode
+	for (int i = 0; i < config->modes->length; ++i) {
+		struct sway_mode *test = config->modes->items[i];
+		if (strcasecmp(test->name, mode_name) == 0) {
+			mode = test;
+			break;
+		}
+	}
+	// Create mode if it doesn't exist
+	if (!mode && new_mode) {
+		mode = calloc(1, sizeof(struct sway_mode));
+		if (!mode) {
+			return cmd_results_new(CMD_FAILURE,
+					"mode", "Unable to allocate mode");
+		}
+		mode->name = strdup(mode_name);
+		mode->keysym_bindings = create_list();
+		mode->keycode_bindings = create_list();
+		list_add(config->modes, mode);
+	}
+	if (!mode) {
+		error = cmd_results_new(CMD_INVALID,
+				"mode", "Unknown mode `%s'", mode_name);
+		return error;
+	}
+	if ((config->reading && new_mode) || (!config->reading && !new_mode)) {
+		wlr_log(L_DEBUG, "Switching to mode `%s'",mode->name);
+	}
+	// Set current mode
+	config->current_mode = mode;
+	if (!new_mode) {
+		// trigger IPC mode event
+		ipc_event_mode(config->current_mode->name);
+	}
+	return cmd_results_new(new_mode ? CMD_BLOCK_MODE : CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/ipc-server.c b/sway/ipc-server.c
index 8250b3a0..c3b589a6 100644
--- a/sway/ipc-server.c
+++ b/sway/ipc-server.c
@@ -290,7 +290,7 @@ void ipc_event_window(swayc_t *window, const char *change) {
 
 	const char *json_string = json_object_to_json_string(obj);
 	ipc_send_event(json_string, IPC_EVENT_WINDOW);
-	json_object_put(obj); // free
+	json_object_put(obj);
 }
 
 void ipc_event_barconfig_update(struct bar_config *bar) {
@@ -299,7 +299,17 @@ void ipc_event_barconfig_update(struct bar_config *bar) {
 
 	const char *json_string = json_object_to_json_string(json);
 	ipc_send_event(json_string, IPC_EVENT_BARCONFIG_UPDATE);
-	json_object_put(json); // free
+	json_object_put(json);
+}
+
+void ipc_event_mode(const char *mode) {
+	wlr_log(L_DEBUG, "Sending mode::%s event", mode);
+	json_object *obj = json_object_new_object();
+	json_object_object_add(obj, "change", json_object_new_string(mode));
+
+	const char *json_string = json_object_to_json_string(obj);
+	ipc_send_event(json_string, IPC_EVENT_MODE);
+	json_object_put(obj);
 }
 
 int ipc_client_handle_writable(int client_fd, uint32_t mask, void *data) {
diff --git a/sway/meson.build b/sway/meson.build
index 54c03061..1e7ee7ae 100644
--- a/sway/meson.build
+++ b/sway/meson.build
@@ -16,6 +16,7 @@ sway_sources = files(
 	'commands/include.c',
 	'commands/input.c',
 	'commands/layout.c',
+	'commands/mode.c',
 	'commands/seat.c',
 	'commands/seat/attach.c',
 	'commands/seat/fallback.c',
-- 
cgit v1.2.3