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

parse_color: return success + drop fallback color

Browse source 
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.
This commit is contained in:
Brian Ashworth 2019-12-27 23:33:55 -05:00 • committed by Simon Ser
parent 088b374b1a
commit 97f9f0b699
7 changed files with 76 additions and 142 deletions
Download patch file Download diff file Expand all files Collapse all files

19
common/util.c
View file

@ -1,4 +1,5 @@
#define _POSIX_C_SOURCE 200809L
#include <ctype.h>
#include <float.h>
#include <fcntl.h>
#include <math.h>
@ -13,21 +14,21 @@ int wrap(int i, int max) {
return ((i % max) + max) % max;
}
uint32_t parse_color(const char *color) {
bool parse_color(const char *color, uint32_t *result) {
if (color[0] == '#') {
++color;
}
int len = strlen(color);
if (len != 6 && len != 8) {
sway_log(SWAY_DEBUG, "Invalid color %s, defaulting to color 0xFFFFFFFF", color);
return 0xFFFFFFFF;
if ((len != 6 && len != 8) || !isxdigit(color[0]) || !isxdigit(color[1])) {
return false;
}
uint32_t res = (uint32_t)strtoul(color, NULL, 16);
if (strlen(color) == 6) {
res = (res << 8) | 0xFF;
char *ptr;
uint32_t parsed = strtoul(color, &ptr, 16);
if (*ptr != '\0') {
return false;
}
return res;
*result = len == 6 ? ((parsed << 8) | 0xFF) : parsed;
return true;
}
bool parse_boolean(const char *boolean, bool current) {