swaybar: implement tray config

3 files changed, 17 insertions, 3 deletions

diff --git a/include/sway/commands.h b/include/sway/commands.h
index 7bee2538..0e2d7931 100644
--- a/include/sway/commands.h
+++ b/include/sway/commands.h
@@ -182,11 +182,9 @@ sway_cmd cmd_workspace;
 sway_cmd cmd_ws_auto_back_and_forth;
 sway_cmd cmd_workspace_layout;
 
-sway_cmd bar_cmd_activate_button;
 sway_cmd bar_cmd_binding_mode_indicator;
 sway_cmd bar_cmd_bindsym;
 sway_cmd bar_cmd_colors;
-sway_cmd bar_cmd_context_button;
 sway_cmd bar_cmd_font;
 sway_cmd bar_cmd_gaps;
 sway_cmd bar_cmd_mode;
@@ -197,13 +195,13 @@ sway_cmd bar_cmd_hidden_state;
 sway_cmd bar_cmd_icon_theme;
 sway_cmd bar_cmd_id;
 sway_cmd bar_cmd_position;
-sway_cmd bar_cmd_secondary_button;
 sway_cmd bar_cmd_separator_symbol;
 sway_cmd bar_cmd_status_command;
 sway_cmd bar_cmd_pango_markup;
 sway_cmd bar_cmd_strip_workspace_numbers;
 sway_cmd bar_cmd_strip_workspace_name;
 sway_cmd bar_cmd_swaybar_command;
+sway_cmd bar_cmd_tray_bindsym;
 sway_cmd bar_cmd_tray_output;
 sway_cmd bar_cmd_tray_padding;
 sway_cmd bar_cmd_wrap_scroll;
diff --git a/include/sway/config.h b/include/sway/config.h
index 86473e17..f604b054 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -6,6 +6,7 @@
 #include <time.h>
 #include <wlr/types/wlr_box.h>
 #include <xkbcommon/xkbcommon.h>
+#include "../include/config.h"
 #include "list.h"
 #include "swaynag.h"
 #include "tree/container.h"
@@ -253,6 +254,13 @@ struct bar_config {
                 char *binding_mode_bg;
                 char *binding_mode_text;
         } colors;
+
+#if HAVE_TRAY
+        char *icon_theme;
+        const char *tray_bindings[10]; // mouse buttons 0-9
+        list_t *tray_outputs; // char *
+        int tray_padding;
+#endif
 };
 
 struct bar_binding {
diff --git a/include/swaybar/config.h b/include/swaybar/config.h
index fd7c6ec4..def70d5b 100644
--- a/include/swaybar/config.h
+++ b/include/swaybar/config.h
@@ -3,6 +3,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <wayland-client.h>
+#include "../include/config.h"
 #include "list.h"
 #include "util.h"
 
@@ -64,6 +65,13 @@ struct swaybar_config {
                 struct box_colors urgent_workspace;
                 struct box_colors binding_mode;
         } colors;
+
+#if HAVE_TRAY
+        char *icon_theme;
+        char *tray_bindings[10]; // mouse buttons 0-9
+        list_t *tray_outputs; // char *
+        int tray_padding;
+#endif
 };
 
 struct swaybar_config *init_config(void);