summaryrefslogtreecommitdiffstats
path: root/include/sway
diff options
context:
space:
mode:
authorLibravatar Calvin Lee <cyrus296@gmail.com>2017-06-07 16:45:28 -0700
committerLibravatar Calvin Lee <cyrus296@gmail.com>2017-06-07 17:49:16 -0700
commit843ad38b3c427adb0bf319e9613d9813c8d9246c (patch)
treee02a5b06e2b6923371fd53724791c147c18a1fa4 /include/sway
parentMerge pull request #1232 from johalun/master-freebsd (diff)
downloadsway-843ad38b3c427adb0bf319e9613d9813c8d9246c.tar.gz
sway-843ad38b3c427adb0bf319e9613d9813c8d9246c.tar.zst
sway-843ad38b3c427adb0bf319e9613d9813c8d9246c.zip
Implement Tray Icons
This commit implements the StatusNotifierItem protocol, and enables swaybar to show tray icons. It also uses `xembedsniproxy` in order to communicate with xembed applications. The tray is completely optional, and can be disabled on compile time with the `enable-tray` option. Or on runtime with the bar config option `tray_output none`. Overview of changes: In swaybar very little is changed outside the tray subfolder except that all events are now polled in `event_loop.c`, this creates no functional difference. Six bar configuration options were added, these are detailed in sway-bar(5) The tray subfolder is where all protocol implementation takes place and is organised as follows: tray/sni_watcher.c: This file contains the StatusNotifierWatcher. It keeps track of items and hosts and reports when they come or go. tray/tray.c This file contains the StatusNotifierHost. It keeps track of sway's version of the items and represents the tray itself. tray/sni.c This file contains the StatusNotifierItem struct and all communication with individual items. tray/icon.c This file implements the icon theme protocol. It allows for finding icons by name, rather than by pixmap. tray/dbus.c This file allows for asynchronous DBus communication. See #986 #343
Diffstat (limited to 'include/sway')
-rw-r--r--include/sway/commands.h4
-rw-r--r--include/sway/config.h12
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;
157sway_cmd cmd_ws_auto_back_and_forth; 157sway_cmd cmd_ws_auto_back_and_forth;
158sway_cmd cmd_workspace_layout; 158sway_cmd cmd_workspace_layout;
159 159
160sway_cmd bar_cmd_activate_button;
160sway_cmd bar_cmd_binding_mode_indicator; 161sway_cmd bar_cmd_binding_mode_indicator;
161sway_cmd bar_cmd_bindsym; 162sway_cmd bar_cmd_bindsym;
162sway_cmd bar_cmd_colors; 163sway_cmd bar_cmd_colors;
164sway_cmd bar_cmd_context_button;
163sway_cmd bar_cmd_font; 165sway_cmd bar_cmd_font;
164sway_cmd bar_cmd_mode; 166sway_cmd bar_cmd_mode;
165sway_cmd bar_cmd_modifier; 167sway_cmd bar_cmd_modifier;
166sway_cmd bar_cmd_output; 168sway_cmd bar_cmd_output;
167sway_cmd bar_cmd_height; 169sway_cmd bar_cmd_height;
168sway_cmd bar_cmd_hidden_state; 170sway_cmd bar_cmd_hidden_state;
171sway_cmd bar_cmd_icon_theme;
169sway_cmd bar_cmd_id; 172sway_cmd bar_cmd_id;
170sway_cmd bar_cmd_position; 173sway_cmd bar_cmd_position;
174sway_cmd bar_cmd_secondary_button;
171sway_cmd bar_cmd_separator_symbol; 175sway_cmd bar_cmd_separator_symbol;
172sway_cmd bar_cmd_status_command; 176sway_cmd bar_cmd_status_command;
173sway_cmd bar_cmd_pango_markup; 177sway_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 {
133 char *swaybar_command; 133 char *swaybar_command;
134 char *font; 134 char *font;
135 int height; // -1 not defined 135 int height; // -1 not defined
136 int tray_padding; 136
137#ifdef ENABLE_TRAY
138 // Tray
139 char *tray_output;
140 char *icon_theme;
141 uint32_t tray_padding;
142 uint32_t activate_button;
143 uint32_t context_button;
144 uint32_t secondary_button;
145#endif
146
137 bool workspace_buttons; 147 bool workspace_buttons;
138 bool wrap_scroll; 148 bool wrap_scroll;
139 char *separator_symbol; 149 char *separator_symbol;