From 6b03c68775c9c638def342c82b1fa3beffa52645 Mon Sep 17 00:00:00 2001
From: Ian Fan <ianfan0@gmail.com>
Date: Sun, 9 Dec 2018 15:10:41 +0000
Subject: swaybar: implement tray config

---
 swaybar/ipc.c | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

(limited to 'swaybar/ipc.c')

diff --git a/swaybar/ipc.c b/swaybar/ipc.c
index 2b930786..df0586bf 100644
--- a/swaybar/ipc.c
+++ b/swaybar/ipc.c
@@ -6,6 +6,7 @@
 #include <wlr/util/log.h>
 #include "swaybar/config.h"
 #include "swaybar/ipc.h"
+#include "config.h"
 #include "ipc-client.h"
 #include "list.h"
 
@@ -282,6 +283,39 @@ static bool ipc_parse_config(
 		ipc_parse_colors(config, colors);
 	}
 
+#if HAVE_TRAY
+	json_object *tray_outputs, *tray_padding, *tray_bindings, *icon_theme;
+
+	if ((json_object_object_get_ex(bar_config, "tray_outputs", &tray_outputs))) {
+		config->tray_outputs = create_list();
+		int length = json_object_array_length(tray_outputs);
+		for (int i = 0; i < length; ++i) {
+			json_object *o = json_object_array_get_idx(tray_outputs, i);
+			list_add(config->tray_outputs, strdup(json_object_get_string(o)));
+		}
+	}
+
+	if ((json_object_object_get_ex(bar_config, "tray_padding", &tray_padding))) {
+		config->tray_padding = json_object_get_int(tray_padding);
+	}
+
+	if ((json_object_object_get_ex(bar_config, "tray_bindings", &tray_bindings))) {
+		int length = json_object_array_length(tray_bindings);
+		for (int i = 0; i < length; ++i) {
+			json_object *bind = json_object_array_get_idx(tray_bindings, i);
+			json_object *button, *command;
+			json_object_object_get_ex(bind, "input_code", &button);
+			json_object_object_get_ex(bind, "command", &command);
+			config->tray_bindings[json_object_get_int(button)] =
+				strdup(json_object_get_string(command));
+		}
+	}
+
+	if ((json_object_object_get_ex(bar_config, "icon_theme", &icon_theme))) {
+		config->icon_theme = strdup(json_object_get_string(icon_theme));
+	}
+#endif
+
 	json_object_put(bar_config);
 	return true;
 }
-- 
cgit v1.2.3


From f33b5c5223a3eb8b63ff4361f43b82ad2104e84b Mon Sep 17 00:00:00 2001
From: Ian Fan <ianfan0@gmail.com>
Date: Tue, 11 Dec 2018 16:27:39 +0000
Subject: swaybar: do not create tray if hidden

---
 include/swaybar/config.h        | 1 +
 sway/commands/bar/tray_output.c | 2 +-
 swaybar/bar.c                   | 4 +++-
 swaybar/ipc.c                   | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'swaybar/ipc.c')

diff --git a/include/swaybar/config.h b/include/swaybar/config.h
index def70d5b..1f6577bd 100644
--- a/include/swaybar/config.h
+++ b/include/swaybar/config.h
@@ -69,6 +69,7 @@ struct swaybar_config {
 #if HAVE_TRAY
 	char *icon_theme;
 	char *tray_bindings[10]; // mouse buttons 0-9
+	bool tray_hidden;
 	list_t *tray_outputs; // char *
 	int tray_padding;
 #endif
diff --git a/sway/commands/bar/tray_output.c b/sway/commands/bar/tray_output.c
index 19ecc5c1..a1169c20 100644
--- a/sway/commands/bar/tray_output.c
+++ b/sway/commands/bar/tray_output.c
@@ -31,8 +31,8 @@ struct cmd_results *bar_cmd_tray_output(int argc, char **argv) {
 	} 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]));
 	}
+	list_add(outputs, strdup(argv[0]));
 
 	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 #else
diff --git a/swaybar/bar.c b/swaybar/bar.c
index 4fd9c488..7aed4dca 100644
--- a/swaybar/bar.c
+++ b/swaybar/bar.c
@@ -371,7 +371,9 @@ bool bar_setup(struct swaybar *bar, const char *socket_path) {
 	assert(pointer->cursor_surface);
 
 #if HAVE_TRAY
-	bar->tray = create_tray(bar);
+	if (!bar->config->tray_hidden) {
+		bar->tray = create_tray(bar);
+	}
 #endif
 
 	if (bar->config->workspace_buttons) {
diff --git a/swaybar/ipc.c b/swaybar/ipc.c
index df0586bf..8e7a542e 100644
--- a/swaybar/ipc.c
+++ b/swaybar/ipc.c
@@ -293,6 +293,7 @@ static bool ipc_parse_config(
 			json_object *o = json_object_array_get_idx(tray_outputs, i);
 			list_add(config->tray_outputs, strdup(json_object_get_string(o)));
 		}
+		config->tray_hidden = strcmp(config->tray_outputs->items[0], "none") == 0;
 	}
 
 	if ((json_object_object_get_ex(bar_config, "tray_padding", &tray_padding))) {
-- 
cgit v1.2.3