swaybar: implement tray config

sway/commands/bar.c

@@ -8,11 +8,9 @@
 
 // Must be in alphabetical order for bsearch
 static struct cmd_handler bar_handlers[] = {
-	{ "activate_button", bar_cmd_activate_button },
 	{ "binding_mode_indicator", bar_cmd_binding_mode_indicator },
 	{ "bindsym", bar_cmd_bindsym },
 	{ "colors", bar_cmd_colors },
-	{ "context_button", bar_cmd_context_button },
 	{ "font", bar_cmd_font },
 	{ "gaps", bar_cmd_gaps },
 	{ "height", bar_cmd_height },
@@ -23,11 +21,11 @@ static struct cmd_handler bar_handlers[] = {
 	{ "output", bar_cmd_output },
 	{ "pango_markup", bar_cmd_pango_markup },
 	{ "position", bar_cmd_position },
-	{ "secondary_button", bar_cmd_secondary_button },
 	{ "separator_symbol", bar_cmd_separator_symbol },
 	{ "status_command", bar_cmd_status_command },
 	{ "strip_workspace_name", bar_cmd_strip_workspace_name },
 	{ "strip_workspace_numbers", bar_cmd_strip_workspace_numbers },
+	{ "tray_bindsym", bar_cmd_tray_bindsym },
 	{ "tray_output", bar_cmd_tray_output },
 	{ "tray_padding", bar_cmd_tray_padding },
 	{ "workspace_buttons", bar_cmd_workspace_buttons },

sway/commands/bar/activate_button.c

@@ -1,8 +0,0 @@
-#include <stdlib.h>
-#include "sway/commands.h"
-#include "log.h"
-
-struct cmd_results *bar_cmd_activate_button(int argc, char **argv) {
-	// TODO TRAY
-	return cmd_results_new(CMD_INVALID, "activate_button", "TODO TRAY");
-}

sway/commands/bar/context_button.c

@@ -1,8 +0,0 @@
-#include <stdlib.h>
-#include "sway/commands.h"
-#include "log.h"
-
-struct cmd_results *bar_cmd_context_button(int argc, char **argv) {
-	// TODO TRAY
-	return cmd_results_new(CMD_INVALID, "context_button", "TODO TRAY");
-}

sway/commands/bar/icon_theme.c

@@ -1,7 +1,28 @@
+#define _POSIX_C_SOURCE 200809L
 #include <string.h>
+#include "config.h"
 #include "sway/commands.h"
+#include "sway/config.h"
+#include "log.h"
 
 struct cmd_results *bar_cmd_icon_theme(int argc, char **argv) {
-	// TODO TRAY
-	return cmd_results_new(CMD_INVALID, "icon_theme", "TODO TRAY");
+#if HAVE_TRAY
+	struct cmd_results *error = NULL;
+	if ((error = checkarg(argc, "icon_theme", EXPECTED_EQUAL_TO, 1))) {
+		return error;
+	}
+
+	if (!config->current_bar) {
+		return cmd_results_new(CMD_FAILURE, "tray_padding", "No bar defined.");
+	}
+
+	wlr_log(WLR_DEBUG, "[Bar %s] Setting icon theme to %s",
+			config->current_bar->id, argv[0]);
+	free(config->current_bar->icon_theme);
+	config->current_bar->icon_theme = strdup(argv[0]);
+	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+#else
+	return cmd_results_new(CMD_INVALID, "icon_theme",
+			"Sway has been compiled without tray support");
+#endif
 }

sway/commands/bar/secondary_button.c

@@ -1,8 +0,0 @@
-#include <stdlib.h>
-#include "sway/commands.h"
-#include "log.h"
-
-struct cmd_results *bar_cmd_secondary_button(int argc, char **argv) {
-	// TODO TRAY
-	return cmd_results_new(CMD_INVALID, "secondary_button", "TODO TRAY");
-}

sway/commands/bar/tray_bindsym.c

@@ -0,0 +1,55 @@
+#include <strings.h>
+#include "config.h"
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "log.h"
+
+struct cmd_results *bar_cmd_tray_bindsym(int argc, char **argv) {
+#if HAVE_TRAY
+	struct cmd_results *error = NULL;
+	if ((error = checkarg(argc, "tray_bindsym", EXPECTED_EQUAL_TO, 2))) {
+		return error;
+	}
+
+	if (!config->current_bar) {
+		return cmd_results_new(CMD_FAILURE, "tray_bindsym", "No bar defined.");
+	}
+
+	int button = 0;
+	if (strncasecmp(argv[0], "button", strlen("button")) == 0 &&
+			strlen(argv[0]) == strlen("button0")) {
+		button = argv[0][strlen("button")] - '0';
+	}
+	if (button < 1 || button > 9) {
+		return cmd_results_new(CMD_FAILURE, "tray_bindsym",
+				"[Bar %s] Only buttons 1 to 9 are supported",
+				config->current_bar->id);
+	}
+
+	static const char *commands[] = {
+		"ContextMenu",
+		"Activate",
+		"SecondaryActivate",
+		"ScrollDown",
+		"ScrollLeft",
+		"ScrollRight",
+		"ScrollUp",
+		"nop"
+	};
+
+	for (size_t i = 0; i < sizeof(commands) / sizeof(commands[0]); ++i) {
+		if (strcasecmp(argv[1], commands[i]) == 0) {
+			wlr_log(WLR_DEBUG, "[Bar %s] Binding button %d to %s",
+					config->current_bar->id, button, commands[i]);
+			config->current_bar->tray_bindings[button] = commands[i];
+			return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+		}
+	}
+
+	return cmd_results_new(CMD_INVALID, "tray_bindsym",
+			"[Bar %s] Invalid command %s", config->current_bar->id, argv[1]);
+#else
+	return cmd_results_new(CMD_INVALID, "tray_bindsym",
+			"Sway has been compiled without tray support");
+#endif
+}

sway/commands/bar/tray_output.c

@@ -1,7 +1,42 @@
+#define _POSIX_C_SOURCE 200809L
 #include <string.h>
+#include "config.h"
 #include "sway/commands.h"
+#include "sway/config.h"
+#include "list.h"
+#include "log.h"
 
 struct cmd_results *bar_cmd_tray_output(int argc, char **argv) {
-	// TODO TRAY
-	return cmd_results_new(CMD_INVALID, "tray_output", "TODO TRAY");
+#if HAVE_TRAY
+	struct cmd_results *error = NULL;
+	if ((error = checkarg(argc, "tray_output", EXPECTED_EQUAL_TO, 1))) {
+		return error;
+	}
+
+	if (!config->current_bar) {
+		return cmd_results_new(CMD_FAILURE, "tray_output", "No bar defined.");
+	}
+
+	list_t *outputs = config->current_bar->tray_outputs;
+	if (!outputs) {
+		config->current_bar->tray_outputs = outputs = create_list();
+	}
+
+	if (strcmp(argv[0], "none") == 0) {
+		wlr_log(WLR_DEBUG, "Hiding tray on bar: %s", config->current_bar->id);
+		for (int i = 0; i < outputs->length; ++i) {
+			free(outputs->items[i]);
+		}
+		outputs->length = 0;
+	} else {
+		wlr_log(WLR_DEBUG, "Showing tray on output '%s' for bar: %s", argv[0],
+				config->current_bar->id);
+		list_add(outputs, strdup(argv[0]));
+	}
+
+	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+#else
+	return cmd_results_new(CMD_INVALID, "tray_output",
+			"Sway has been compiled without tray support");
+#endif
 }

sway/commands/bar/tray_padding.c

@@ -1,9 +1,42 @@
 #include <stdlib.h>
 #include <strings.h>
+#include "config.h"
 #include "sway/commands.h"
+#include "sway/config.h"
 #include "log.h"
 
 struct cmd_results *bar_cmd_tray_padding(int argc, char **argv) {
-	// TODO TRAY
-	return cmd_results_new(CMD_INVALID, "tray_padding", "TODO TRAY");
+#if HAVE_TRAY
+	struct cmd_results *error = NULL;
+	if ((error = checkarg(argc, "tray_padding", EXPECTED_AT_LEAST, 1))) {
+		return error;
+	}
+	if ((error = checkarg(argc, "tray_padding", EXPECTED_AT_MOST, 2))) {
+		return error;
+	}
+
+	if (!config->current_bar) {
+		return cmd_results_new(CMD_FAILURE, "tray_padding", "No bar defined.");
+	}
+	struct bar_config *bar = config->current_bar;
+
+	char *end;
+	int padding = strtol(argv[0], &end, 10);
+	if (padding < 0 || (*end != '\0' && strcasecmp(end, "px") != 0)) {
+		return cmd_results_new(CMD_INVALID, "tray_padding",
+				"[Bar %s] Invalid tray padding value: %s", bar->id, argv[0]);
+	}
+
+	if (argc == 2 && strcasecmp(argv[1], "px") != 0) {
+		return cmd_results_new(CMD_INVALID, "tray_padding",
+				"Expected 'tray_padding <px> [px]'");
+	}
+
+	wlr_log(WLR_DEBUG, "[Bar %s] Setting tray padding to %d", bar->id, padding);
+	config->current_bar->tray_padding = padding;
+	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+#else
+	return cmd_results_new(CMD_INVALID, "tray_padding",
+			"Sway has been compiled without tray support");
+#endif
 }