diff options
author | Ian Fan <ianfan0@gmail.com> | 2018-12-09 15:10:41 +0000 |
---|---|---|
committer | Ian Fan <ianfan0@gmail.com> | 2018-12-31 20:40:18 +0000 |
commit | 6b03c68775c9c638def342c82b1fa3beffa52645 (patch) | |
tree | a3b18d948f8e2a51151f24aab47c552f28a17f70 /swaybar/ipc.c | |
parent | swaybar: add StatusNotifierItem to tray (diff) | |
download | sway-6b03c68775c9c638def342c82b1fa3beffa52645.tar.gz sway-6b03c68775c9c638def342c82b1fa3beffa52645.tar.zst sway-6b03c68775c9c638def342c82b1fa3beffa52645.zip |
swaybar: implement tray config
Diffstat (limited to 'swaybar/ipc.c')
-rw-r--r-- | swaybar/ipc.c | 34 |
1 files changed, 34 insertions, 0 deletions
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 @@ | |||
6 | #include <wlr/util/log.h> | 6 | #include <wlr/util/log.h> |
7 | #include "swaybar/config.h" | 7 | #include "swaybar/config.h" |
8 | #include "swaybar/ipc.h" | 8 | #include "swaybar/ipc.h" |
9 | #include "config.h" | ||
9 | #include "ipc-client.h" | 10 | #include "ipc-client.h" |
10 | #include "list.h" | 11 | #include "list.h" |
11 | 12 | ||
@@ -282,6 +283,39 @@ static bool ipc_parse_config( | |||
282 | ipc_parse_colors(config, colors); | 283 | ipc_parse_colors(config, colors); |
283 | } | 284 | } |
284 | 285 | ||
286 | #if HAVE_TRAY | ||
287 | json_object *tray_outputs, *tray_padding, *tray_bindings, *icon_theme; | ||
288 | |||
289 | if ((json_object_object_get_ex(bar_config, "tray_outputs", &tray_outputs))) { | ||
290 | config->tray_outputs = create_list(); | ||
291 | int length = json_object_array_length(tray_outputs); | ||
292 | for (int i = 0; i < length; ++i) { | ||
293 | json_object *o = json_object_array_get_idx(tray_outputs, i); | ||
294 | list_add(config->tray_outputs, strdup(json_object_get_string(o))); | ||
295 | } | ||
296 | } | ||
297 | |||
298 | if ((json_object_object_get_ex(bar_config, "tray_padding", &tray_padding))) { | ||
299 | config->tray_padding = json_object_get_int(tray_padding); | ||
300 | } | ||
301 | |||
302 | if ((json_object_object_get_ex(bar_config, "tray_bindings", &tray_bindings))) { | ||
303 | int length = json_object_array_length(tray_bindings); | ||
304 | for (int i = 0; i < length; ++i) { | ||
305 | json_object *bind = json_object_array_get_idx(tray_bindings, i); | ||
306 | json_object *button, *command; | ||
307 | json_object_object_get_ex(bind, "input_code", &button); | ||
308 | json_object_object_get_ex(bind, "command", &command); | ||
309 | config->tray_bindings[json_object_get_int(button)] = | ||
310 | strdup(json_object_get_string(command)); | ||
311 | } | ||
312 | } | ||
313 | |||
314 | if ((json_object_object_get_ex(bar_config, "icon_theme", &icon_theme))) { | ||
315 | config->icon_theme = strdup(json_object_get_string(icon_theme)); | ||
316 | } | ||
317 | #endif | ||
318 | |||
285 | json_object_put(bar_config); | 319 | json_object_put(bar_config); |
286 | return true; | 320 | return true; |
287 | } | 321 | } |