Re-implement bar borders (by Angelo Haller)

[i3/i3] / i3bar / src / config.c

diff --git a/i3bar/src/config.c b/i3bar/src/config.c
index 397162b6b387f7a7d5d6c7037f494e2efdd820f7..567d0002e3768299c65df4927ae516f921c0442f 100644 (file)
--- a/i3bar/src/config.c
+++ b/i3bar/src/config.c
@@ -161,14 +161,18 @@ static int config_string_cb(void *params_, const unsigned char *val, unsigned in
 
     COLOR(statusline, bar_fg);
     COLOR(background, bar_bg);
+    COLOR(focused_workspace_border, focus_ws_border);
+    COLOR(focused_workspace_background, focus_ws_bg);
     COLOR(focused_workspace_text, focus_ws_fg);
-    COLOR(focused_workspace_bg, focus_ws_bg);
+    COLOR(active_workspace_border, active_ws_border);
+    COLOR(active_workspace_background, active_ws_bg);
     COLOR(active_workspace_text, active_ws_fg);
-    COLOR(active_workspace_bg, active_ws_bg);
+    COLOR(inactive_workspace_border, inactive_ws_border);
+    COLOR(inactive_workspace_background, inactive_ws_bg);
     COLOR(inactive_workspace_text, inactive_ws_fg);
-    COLOR(inactive_workspace_bg, inactive_ws_bg);
+    COLOR(urgent_workspace_border, urgent_ws_border);
+    COLOR(urgent_workspace_background, urgent_ws_bg);
     COLOR(urgent_workspace_text, urgent_ws_fg);
-    COLOR(urgent_workspace_bg, urgent_ws_bg);
 
     printf("got unexpected string %.*s for cur_key = %s\n", len, val, cur_key);
 
@@ -258,12 +262,16 @@ void free_colors(struct xcb_color_strings_t *colors) {
     FREE_COLOR(bar_bg);
     FREE_COLOR(active_ws_fg);
     FREE_COLOR(active_ws_bg);
+    FREE_COLOR(active_ws_border);
     FREE_COLOR(inactive_ws_fg);
     FREE_COLOR(inactive_ws_bg);
+    FREE_COLOR(inactive_ws_border);
     FREE_COLOR(urgent_ws_fg);
     FREE_COLOR(urgent_ws_bg);
+    FREE_COLOR(urgent_ws_border);
     FREE_COLOR(focus_ws_fg);
     FREE_COLOR(focus_ws_bg);
+    FREE_COLOR(focus_ws_border);
 #undef FREE_COLOR
 }