mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-04-03 19:07:45 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

cmd_client_*: refactor duplicated code

Browse source 
This is the second in a series of commits to refactor the color handling
in sway. This removes the duplicated color parsing code in
sway/commands/client.c. Additionally, this combines the parsing of
colors to float arrays with that in sway/config.c and introduces a
color_to_rgba function in commom/util.c.

As an added bonus, this also makes it so non of the colors in a border
color class will be changed unless all of the colors specified are
valid. This ensures that an invalid command does not get partially
applied.
This commit is contained in:
Brian Ashworth 2019-12-27 23:56:11 -05:00 • committed by Simon Ser
parent 97f9f0b699
commit 66dc33296c
4 changed files with 57 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

7
common/util.c
View file

@ -31,6 +31,13 @@ bool parse_color(const char *color, uint32_t *result) {
return true;
}
void color_to_rgba(float dest[static 4], uint32_t color) {
dest[0] = ((color >> 24) & 0xff) / 255.0;
dest[1] = ((color >> 16) & 0xff) / 255.0;
dest[2] = ((color >> 8) & 0xff) / 255.0;
dest[3] = (color & 0xff) / 255.0;
}
bool parse_boolean(const char *boolean, bool current) {
if (strcasecmp(boolean, "1") == 0
|| strcasecmp(boolean, "yes") == 0