summaryrefslogtreecommitdiffstats
path: root/sway/ipc-json.c
diff options
context:
space:
mode:
Diffstat (limited to 'sway/ipc-json.c')
-rw-r--r--sway/ipc-json.c20
1 files changed, 17 insertions, 3 deletions
diff --git a/sway/ipc-json.c b/sway/ipc-json.c
index eb77a654..458dc7c2 100644
--- a/sway/ipc-json.c
+++ b/sway/ipc-json.c
@@ -328,9 +328,23 @@ json_object *ipc_json_describe_bar_config(struct bar_config *bar) {
328 json_object_object_add(colors, "urgent_workspace_bg", json_object_new_string(bar->colors.urgent_workspace_bg)); 328 json_object_object_add(colors, "urgent_workspace_bg", json_object_new_string(bar->colors.urgent_workspace_bg));
329 json_object_object_add(colors, "urgent_workspace_text", json_object_new_string(bar->colors.urgent_workspace_text)); 329 json_object_object_add(colors, "urgent_workspace_text", json_object_new_string(bar->colors.urgent_workspace_text));
330 330
331 json_object_object_add(colors, "binding_mode_border", json_object_new_string(bar->colors.binding_mode_border)); 331 if (bar->colors.has_binding_mode_border) {
332 json_object_object_add(colors, "binding_mode_bg", json_object_new_string(bar->colors.binding_mode_bg)); 332 json_object_object_add(colors, "binding_mode_border", json_object_new_string(bar->colors.binding_mode_border));
333 json_object_object_add(colors, "binding_mode_text", json_object_new_string(bar->colors.binding_mode_text)); 333 } else {
334 json_object_object_add(colors, "binding_mode_border", json_object_new_string(bar->colors.urgent_workspace_border));
335 }
336
337 if (bar->colors.has_binding_mode_bg) {
338 json_object_object_add(colors, "binding_mode_bg", json_object_new_string(bar->colors.binding_mode_bg));
339 } else {
340 json_object_object_add(colors, "binding_mode_bg", json_object_new_string(bar->colors.urgent_workspace_bg));
341 }
342
343 if (bar->colors.has_binding_mode_text) {
344 json_object_object_add(colors, "binding_mode_text", json_object_new_string(bar->colors.binding_mode_text));
345 } else {
346 json_object_object_add(colors, "binding_mode_text", json_object_new_string(bar->colors.urgent_workspace_text));
347 }
334 348
335 json_object_object_add(json, "colors", colors); 349 json_object_object_add(json, "colors", colors);
336 350