Merge pull request #1234 from 4e554c4c/tray

Implement Tray Icons

2 files changed, 15 insertions, 1 deletions

diff --git a/include/sway/commands.h b/include/sway/commands.h
index 078652e7..f67df10f 100644
--- a/include/sway/commands.h
+++ b/include/sway/commands.h
@@ -157,17 +157,21 @@ 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_mode;
 sway_cmd bar_cmd_modifier;
 sway_cmd bar_cmd_output;
 sway_cmd bar_cmd_height;
 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;
diff --git a/include/sway/config.h b/include/sway/config.h
index 35f8d5f7..999a471a 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -133,7 +133,17 @@ struct bar_config {
         char *swaybar_command;
         char *font;
         int height; // -1 not defined
-        int tray_padding;
+
+#ifdef ENABLE_TRAY
+        // Tray
+        char *tray_output;
+        char *icon_theme;
+        uint32_t tray_padding;
+        uint32_t activate_button;
+        uint32_t context_button;
+        uint32_t secondary_button;
+#endif
+
         bool workspace_buttons;
         bool wrap_scroll;
         char *separator_symbol;