diff options
Diffstat (limited to 'swaybar/i3bar.c')
-rw-r--r-- | swaybar/i3bar.c | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/swaybar/i3bar.c b/swaybar/i3bar.c index 4bcd5843..6d00befb 100644 --- a/swaybar/i3bar.c +++ b/swaybar/i3bar.c | |||
@@ -28,6 +28,19 @@ void i3bar_block_unref(struct i3bar_block *block) { | |||
28 | } | 28 | } |
29 | } | 29 | } |
30 | 30 | ||
31 | static bool i3bar_parse_json_color(json_object *json, uint32_t *color) { | ||
32 | if (!json) { | ||
33 | return false; | ||
34 | } | ||
35 | |||
36 | const char *hexstring = json_object_get_string(json); | ||
37 | bool color_set = parse_color(hexstring, color); | ||
38 | if (!color_set) { | ||
39 | sway_log(SWAY_ERROR, "Ignoring invalid block hexadecimal color string: %s", hexstring); | ||
40 | } | ||
41 | return color_set; | ||
42 | } | ||
43 | |||
31 | static void i3bar_parse_json(struct status_line *status, | 44 | static void i3bar_parse_json(struct status_line *status, |
32 | struct json_object *json_array) { | 45 | struct json_object *json_array) { |
33 | struct i3bar_block *block, *tmp; | 46 | struct i3bar_block *block, *tmp; |
@@ -68,13 +81,7 @@ static void i3bar_parse_json(struct status_line *status, | |||
68 | strdup(json_object_get_string(full_text)) : NULL; | 81 | strdup(json_object_get_string(full_text)) : NULL; |
69 | block->short_text = short_text ? | 82 | block->short_text = short_text ? |
70 | strdup(json_object_get_string(short_text)) : NULL; | 83 | strdup(json_object_get_string(short_text)) : NULL; |
71 | if (color) { | 84 | block->color_set = i3bar_parse_json_color(color, &block->color); |
72 | const char *hexstring = json_object_get_string(color); | ||
73 | block->color_set = parse_color(hexstring, &block->color); | ||
74 | if (!block->color_set) { | ||
75 | sway_log(SWAY_ERROR, "Invalid block color: %s", hexstring); | ||
76 | } | ||
77 | } | ||
78 | if (min_width) { | 85 | if (min_width) { |
79 | json_type type = json_object_get_type(min_width); | 86 | json_type type = json_object_get_type(min_width); |
80 | if (type == json_type_int) { | 87 | if (type == json_type_int) { |
@@ -100,14 +107,8 @@ static void i3bar_parse_json(struct status_line *status, | |||
100 | block->separator_block_width = separator_block_width ? | 107 | block->separator_block_width = separator_block_width ? |
101 | json_object_get_int(separator_block_width) : 9; | 108 | json_object_get_int(separator_block_width) : 9; |
102 | // Airblader features | 109 | // Airblader features |
103 | const char *hex = background ? json_object_get_string(background) : NULL; | 110 | i3bar_parse_json_color(background, &block->background); |
104 | if (hex && !parse_color(hex, &block->background)) { | 111 | block->border_set = i3bar_parse_json_color(border, &block->border); |
105 | sway_log(SWAY_ERROR, "Ignoring invalid block background: %s", hex); | ||
106 | } | ||
107 | hex = border ? json_object_get_string(border) : NULL; | ||
108 | if (hex && !parse_color(hex, &block->border)) { | ||
109 | sway_log(SWAY_ERROR, "Ignoring invalid block border: %s", hex); | ||
110 | } | ||
111 | block->border_top = border_top ? json_object_get_int(border_top) : 1; | 112 | block->border_top = border_top ? json_object_get_int(border_top) : 1; |
112 | block->border_bottom = border_bottom ? | 113 | block->border_bottom = border_bottom ? |
113 | json_object_get_int(border_bottom) : 1; | 114 | json_object_get_int(border_bottom) : 1; |