From 74152043f4da7182339f181317960aa6cd01cffa Mon Sep 17 00:00:00 2001
From: Mikkel Oscar Lyderik <mikkeloscar@gmail.com>
Date: Mon, 14 Dec 2015 02:39:24 +0100
Subject: Implement 'bar { }' block parsing

---
 sway/config.c | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

(limited to 'sway/config.c')

diff --git a/sway/config.c b/sway/config.c
index 6c22556f..d5b75adf 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -38,6 +38,14 @@ static void free_mode(struct sway_mode *mode) {
 	free(mode);
 }
 
+static void free_bar(struct bar_config *bar) {
+	free(bar->mode);
+	free(bar->hidden_state);
+	free(bar->status_command);
+	free(bar->font);
+	free(bar);
+}
+
 void free_output_config(struct output_config *oc) {
 	free(oc->name);
 	free(oc);
@@ -61,6 +69,11 @@ static void free_config(struct sway_config *config) {
 	}
 	list_free(config->modes);
 
+	for (i = 0; i < config->bars->length; ++i) {
+		free_bar(config->bars->items[i]);
+	}
+	list_free(config->bars);
+
 	free_flat_list(config->cmd_queue);
 
 	for (i = 0; i < config->workspace_outputs->length; ++i) {
@@ -88,6 +101,7 @@ static bool file_exists(const char *path) {
 static void config_defaults(struct sway_config *config) {
 	config->symbols = create_list();
 	config->modes = create_list();
+	config->bars = create_list();
 	config->workspace_outputs = create_list();
 	config->criteria = create_list();
 	config->output_configs = create_list();
@@ -248,11 +262,26 @@ bool read_config(FILE *file, bool is_active) {
 			}
 			break;
 
+		case CMD_BLOCK_BAR:
+			if (block == CMD_BLOCK_END) {
+				block = CMD_BLOCK_BAR;
+			} else {
+				sway_log(L_ERROR, "Invalid block '%s'", line);
+			}
+			break;
+
 		case CMD_BLOCK_END:
 			switch(block) {
 			case CMD_BLOCK_MODE:
 				sway_log(L_DEBUG, "End of mode block");
 				config->current_mode = config->modes->items[0];
+				block = CMD_BLOCK_END;
+				break;
+
+			case CMD_BLOCK_BAR:
+				sway_log(L_DEBUG, "End of bar block");
+				config->current_bar = NULL;
+				block = CMD_BLOCK_END;
 				break;
 
 			case CMD_BLOCK_END:
-- 
cgit v1.2.3


From 0a8ec2638338c856adeb3c411d9d01b50eb9ce1e Mon Sep 17 00:00:00 2001
From: Mikkel Oscar Lyderik <mikkeloscar@gmail.com>
Date: Mon, 14 Dec 2015 00:00:11 +0100
Subject: Implement bar option: tray_padding <px> [px]

---
 sway/commands.c | 28 +++++++++++++++++++++++++++-
 sway/config.c   |  1 +
 2 files changed, 28 insertions(+), 1 deletion(-)

(limited to 'sway/config.c')

diff --git a/sway/commands.c b/sway/commands.c
index cefad2ef..4e9d2796 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -63,6 +63,8 @@ static sway_cmd cmd_splitv;
 static sway_cmd cmd_sticky;
 static sway_cmd cmd_workspace;
 static sway_cmd cmd_ws_auto_back_and_forth;
+
+static sway_cmd bar_cmd_tray_padding;
 static sway_cmd bar_cmd_workspace_buttons;
 
 swayc_t *sp_view;
@@ -1519,6 +1521,30 @@ static struct cmd_handler handlers[] = {
 	{ "workspace_auto_back_and_forth", cmd_ws_auto_back_and_forth },
 };
 
+static 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;
+	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
+
 static 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))) {
@@ -1555,7 +1581,7 @@ static struct cmd_handler bar_handlers[] = {
 	{ "status_command", NULL },
 	{ "strip_workspace_numbers", NULL },
 	{ "tray_output", NULL },
-	{ "tray_padding", NULL },
+	{ "tray_padding", bar_cmd_tray_padding },
 	{ "workspace_buttons", bar_cmd_workspace_buttons },
 };
 
diff --git a/sway/config.c b/sway/config.c
index d5b75adf..bb7ecf9e 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -144,6 +144,7 @@ static void config_defaults(struct sway_config *config) {
 	config->bar.workspace_buttons = true;
 	config->bar.strip_workspace_numbers = false;
 	config->bar.binding_mode_indicator = true;
+	config->bar.tray_padding = 2;
 }
 
 static char *get_config_path(void) {
-- 
cgit v1.2.3