change bar colors from char[10] to *char

This commit removes has_* booleans from bar color struct. It also
generalizes of functions in commands/bar/colors.c.

1 files changed, 21 insertions, 29 deletions

diff --git a/include/sway/config.h b/include/sway/config.h
index 9b3cc60c..8d077ee7 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -145,35 +145,27 @@ struct bar_config {
 	bool verbose;
 	pid_t pid;
 	struct {
-		char background[10];
-		char statusline[10];
-		char separator[10];
-		char focused_background[10];
-		char focused_statusline[10];
-		char focused_separator[10];
-		char focused_workspace_border[10];
-		char focused_workspace_bg[10];
-		char focused_workspace_text[10];
-		char active_workspace_border[10];
-		char active_workspace_bg[10];
-		char active_workspace_text[10];
-		char inactive_workspace_border[10];
-		char inactive_workspace_bg[10];
-		char inactive_workspace_text[10];
-		char urgent_workspace_border[10];
-		char urgent_workspace_bg[10];
-		char urgent_workspace_text[10];
-		char binding_mode_border[10];
-		char binding_mode_bg[10];
-		char binding_mode_text[10];
-
-		bool has_focused_background;
-		bool has_focused_statusline;
-		bool has_focused_separator;
-
-		bool has_binding_mode_border;
-		bool has_binding_mode_bg;
-		bool has_binding_mode_text;
+		char *background;
+		char *statusline;
+		char *separator;
+		char *focused_background;
+		char *focused_statusline;
+		char *focused_separator;
+		char *focused_workspace_border;
+		char *focused_workspace_bg;
+		char *focused_workspace_text;
+		char *active_workspace_border;
+		char *active_workspace_bg;
+		char *active_workspace_text;
+		char *inactive_workspace_border;
+		char *inactive_workspace_bg;
+		char *inactive_workspace_text;
+		char *urgent_workspace_border;
+		char *urgent_workspace_bg;
+		char *urgent_workspace_text;
+		char *binding_mode_border;
+		char *binding_mode_bg;
+		char *binding_mode_text;
 	} colors;
 };