aboutsummaryrefslogtreecommitdiffstats
path: root/swaybar/render.c
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 /swaybar/render.c
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 'swaybar/render.c')
-rw-r--r--swaybar/render.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/swaybar/render.c b/swaybar/render.c
index 0d6bb354..06efb53c 100644
--- a/swaybar/render.c
+++ b/swaybar/render.c
@@ -265,7 +265,7 @@ static uint32_t render_status_block(cairo_t *cairo,
265 } 265 }
266 double text_y = height / 2.0 - text_height / 2.0; 266 double text_y = height / 2.0 - text_height / 2.0;
267 cairo_move_to(cairo, offset, (int)floor(text_y)); 267 cairo_move_to(cairo, offset, (int)floor(text_y));
268 uint32_t color = block->color ? *block->color : config->colors.statusline; 268 uint32_t color = block->color_set ? block->color : config->colors.statusline;
269 color = block->urgent ? config->colors.urgent_workspace.text : color; 269 color = block->urgent ? config->colors.urgent_workspace.text : color;
270 cairo_set_source_u32(cairo, color); 270 cairo_set_source_u32(cairo, color);
271 pango_printf(cairo, config->font, output->scale, 271 pango_printf(cairo, config->font, output->scale,