diff options
| author | Drew DeVault <[email protected]> | 2017-06-14 18:53:40 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-06-14 18:53:40 -0400 |
| commit | 298f56353ef155f6a2ccc977c96b2ff5d971e65e (patch) | |
| tree | dcb3b74f1dde93bce8657b7509662ffd7db667d0 /sway/ipc-json.c | |
| parent | a5c07dde6aba87584ddb6c6a2769472a6003623a (diff) | |
| parent | eb6e38c86d2deb37cc6f378f8644c4a530fd7448 (diff) | |
Merge branch 'master' into server-decoration
Diffstat (limited to 'sway/ipc-json.c')
| -rw-r--r-- | sway/ipc-json.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/sway/ipc-json.c b/sway/ipc-json.c index 512144a4..31de53f0 100644 --- a/sway/ipc-json.c +++ b/sway/ipc-json.c @@ -327,7 +327,22 @@ json_object *ipc_json_describe_bar_config(struct bar_config *bar) { json_object *json = json_object_new_object(); json_object_object_add(json, "id", json_object_new_string(bar->id)); - json_object_object_add(json, "tray_output", NULL); +#ifdef ENABLE_TRAY + if (bar->tray_output) { + json_object_object_add(json, "tray_output", json_object_new_string(bar->tray_output)); + } else { + json_object_object_add(json, "tray_output", NULL); + } + if (bar->icon_theme) { + json_object_object_add(json, "icon_theme", json_object_new_string(bar->icon_theme)); + } else { + json_object_object_add(json, "icon_theme", NULL); + } + json_object_object_add(json, "tray_padding", json_object_new_int(bar->tray_padding)); + json_object_object_add(json, "activate_button", json_object_new_int(bar->activate_button)); + json_object_object_add(json, "context_button", json_object_new_int(bar->context_button)); + json_object_object_add(json, "secondary_button", json_object_new_int(bar->secondary_button)); +#endif json_object_object_add(json, "mode", json_object_new_string(bar->mode)); json_object_object_add(json, "hidden_state", json_object_new_string(bar->hidden_state)); json_object_object_add(json, "modifier", json_object_new_string(get_modifier_name_by_mask(bar->modifier))); |