diff options
Diffstat (limited to 'include/sway')
-rw-r--r-- | include/sway/commands.h | 4 | ||||
-rw-r--r-- | include/sway/config.h | 8 |
2 files changed, 9 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; | |||
182 | sway_cmd cmd_ws_auto_back_and_forth; | 182 | sway_cmd cmd_ws_auto_back_and_forth; |
183 | sway_cmd cmd_workspace_layout; | 183 | sway_cmd cmd_workspace_layout; |
184 | 184 | ||
185 | sway_cmd bar_cmd_activate_button; | ||
186 | sway_cmd bar_cmd_binding_mode_indicator; | 185 | sway_cmd bar_cmd_binding_mode_indicator; |
187 | sway_cmd bar_cmd_bindsym; | 186 | sway_cmd bar_cmd_bindsym; |
188 | sway_cmd bar_cmd_colors; | 187 | sway_cmd bar_cmd_colors; |
189 | sway_cmd bar_cmd_context_button; | ||
190 | sway_cmd bar_cmd_font; | 188 | sway_cmd bar_cmd_font; |
191 | sway_cmd bar_cmd_gaps; | 189 | sway_cmd bar_cmd_gaps; |
192 | sway_cmd bar_cmd_mode; | 190 | sway_cmd bar_cmd_mode; |
@@ -197,13 +195,13 @@ sway_cmd bar_cmd_hidden_state; | |||
197 | sway_cmd bar_cmd_icon_theme; | 195 | sway_cmd bar_cmd_icon_theme; |
198 | sway_cmd bar_cmd_id; | 196 | sway_cmd bar_cmd_id; |
199 | sway_cmd bar_cmd_position; | 197 | sway_cmd bar_cmd_position; |
200 | sway_cmd bar_cmd_secondary_button; | ||
201 | sway_cmd bar_cmd_separator_symbol; | 198 | sway_cmd bar_cmd_separator_symbol; |
202 | sway_cmd bar_cmd_status_command; | 199 | sway_cmd bar_cmd_status_command; |
203 | sway_cmd bar_cmd_pango_markup; | 200 | sway_cmd bar_cmd_pango_markup; |
204 | sway_cmd bar_cmd_strip_workspace_numbers; | 201 | sway_cmd bar_cmd_strip_workspace_numbers; |
205 | sway_cmd bar_cmd_strip_workspace_name; | 202 | sway_cmd bar_cmd_strip_workspace_name; |
206 | sway_cmd bar_cmd_swaybar_command; | 203 | sway_cmd bar_cmd_swaybar_command; |
204 | sway_cmd bar_cmd_tray_bindsym; | ||
207 | sway_cmd bar_cmd_tray_output; | 205 | sway_cmd bar_cmd_tray_output; |
208 | sway_cmd bar_cmd_tray_padding; | 206 | sway_cmd bar_cmd_tray_padding; |
209 | sway_cmd bar_cmd_wrap_scroll; | 207 | 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 @@ | |||
6 | #include <time.h> | 6 | #include <time.h> |
7 | #include <wlr/types/wlr_box.h> | 7 | #include <wlr/types/wlr_box.h> |
8 | #include <xkbcommon/xkbcommon.h> | 8 | #include <xkbcommon/xkbcommon.h> |
9 | #include "../include/config.h" | ||
9 | #include "list.h" | 10 | #include "list.h" |
10 | #include "swaynag.h" | 11 | #include "swaynag.h" |
11 | #include "tree/container.h" | 12 | #include "tree/container.h" |
@@ -253,6 +254,13 @@ struct bar_config { | |||
253 | char *binding_mode_bg; | 254 | char *binding_mode_bg; |
254 | char *binding_mode_text; | 255 | char *binding_mode_text; |
255 | } colors; | 256 | } colors; |
257 | |||
258 | #if HAVE_TRAY | ||
259 | char *icon_theme; | ||
260 | const char *tray_bindings[10]; // mouse buttons 0-9 | ||
261 | list_t *tray_outputs; // char * | ||
262 | int tray_padding; | ||
263 | #endif | ||
256 | }; | 264 | }; |
257 | 265 | ||
258 | struct bar_binding { | 266 | struct bar_binding { |