summaryrefslogtreecommitdiff
path: root/sway/ipc-json.c
diff options
context:
space:
mode:
authorD.B <[email protected]>2016-11-02 18:48:43 +0100
committerD.B <[email protected]>2016-11-02 18:58:33 +0100
commitad4d21d60b36ba39e2090fa052a29bf7ea8a3395 (patch)
tree84cb01165960555dbc64cd8aa57137b43ff65655 /sway/ipc-json.c
parent39ee0ec552c05c7ab5031982a1104a0bae1910d3 (diff)
add bar colours for focused_(workspace|statusline|separator)
If these aren't defined in config, color settings without 'focused_' prefix are used as a fallback.
Diffstat (limited to 'sway/ipc-json.c')
-rw-r--r--sway/ipc-json.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/sway/ipc-json.c b/sway/ipc-json.c
index 458dc7c2..c21d28af 100644
--- a/sway/ipc-json.c
+++ b/sway/ipc-json.c
@@ -312,6 +312,24 @@ json_object *ipc_json_describe_bar_config(struct bar_config *bar) {
json_object_object_add(colors, "statusline", json_object_new_string(bar->colors.statusline));
json_object_object_add(colors, "separator", json_object_new_string(bar->colors.separator));
+ if (bar->colors.has_focused_background) {
+ json_object_object_add(colors, "focused_background", json_object_new_string(bar->colors.focused_background));
+ } else {
+ json_object_object_add(colors, "focused_background", json_object_new_string(bar->colors.background));
+ }
+
+ if (bar->colors.has_focused_statusline) {
+ json_object_object_add(colors, "focused_statusline", json_object_new_string(bar->colors.focused_statusline));
+ } else {
+ json_object_object_add(colors, "focused_statusline", json_object_new_string(bar->colors.statusline));
+ }
+
+ if (bar->colors.has_focused_separator) {
+ json_object_object_add(colors, "focused_separator", json_object_new_string(bar->colors.focused_separator));
+ } else {
+ json_object_object_add(colors, "focused_separator", json_object_new_string(bar->colors.separator));
+ }
+
json_object_object_add(colors, "focused_workspace_border", json_object_new_string(bar->colors.focused_workspace_border));
json_object_object_add(colors, "focused_workspace_bg", json_object_new_string(bar->colors.focused_workspace_bg));
json_object_object_add(colors, "focused_workspace_text", json_object_new_string(bar->colors.focused_workspace_text));