aboutsummaryrefslogtreecommitdiffstats
path: root/include/swaybar
diff options
context:
space:
mode:
authorLibravatar Brian Ashworth <bosrsf04@gmail.com>2019-12-27 23:33:55 -0500
committerLibravatar Simon Ser <contact@emersion.fr>2019-12-28 10:07:25 +0100
commit97f9f0b699316ba60009b395948a712ec0b671d2 (patch)
treeb5916b36f4161c1c4d670295254d0f3fd9e793df /include/swaybar
parentlayer-shell: refocus if keyboard interactive lost (diff)
downloadsway-97f9f0b699316ba60009b395948a712ec0b671d2.tar.gz
sway-97f9f0b699316ba60009b395948a712ec0b671d2.tar.zst
sway-97f9f0b699316ba60009b395948a712ec0b671d2.zip
parse_color: return success + drop fallback color
This is the first in a series of commits to refactor the color handling in sway. This changes parse_color to return whether it was success and no longer uses 0xFFFFFFFF as the fallback color. This also verifies that the string actually contains a valid hexadecimal number along with the length checks. In the process of altering the calls to parse_color, I also took the opportunity to heavily refactor swaybar's ipc_parse_colors function. This allowed for several lines of duplicated code to be removed.
Diffstat (limited to 'include/swaybar')
-rw-r--r--include/swaybar/i3bar.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/swaybar/i3bar.h b/include/swaybar/i3bar.h
index 5b6001ce..0b3bee21 100644
--- a/include/swaybar/i3bar.h
+++ b/include/swaybar/i3bar.h
@@ -9,7 +9,8 @@ struct i3bar_block {
9 int ref_count; 9 int ref_count;
10 char *full_text, *short_text, *align, *min_width_str; 10 char *full_text, *short_text, *align, *min_width_str;
11 bool urgent; 11 bool urgent;
12 uint32_t *color; 12 uint32_t color;
13 bool color_set;
13 int min_width; 14 int min_width;
14 char *name, *instance; 15 char *name, *instance;
15 bool separator; 16 bool separator;