nagbalae/dunst
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Support arbitrary hex color formats (16/32bits per component)"

Browse Source 
This reverts commit 1e36a6b4ac569527981e06db429f3e6cd8ac99b8.
This commit is contained in:
Nikita Zlobin 2020-05-26 22:28:05 +05:00
parent d110ba93e6
commit 6413a4d6f8
1 changed files with 12 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/draw.c
View File

@ -10,7 +10,6 @@
#include <pango/pango-types.h> #include <pango/pango-types.h>
#include <stdlib.h> #include <stdlib.h>
#include <inttypes.h> #include <inttypes.h>
#include <errno.h>
#include "dunst.h" #include "dunst.h"
#include "icon.h" #include "icon.h"
@ -45,7 +44,7 @@ void draw_setup(void)
pango_fdesc = pango_font_description_from_string(settings.font); pango_fdesc = pango_font_description_from_string(settings.font);
} }
static struct color hex_to_color(uintmax_t hexValue, int dpc) static struct color hex_to_color(uint32_t hexValue, int dpc)
{ {
const int bpc = 4 * dpc; const int bpc = 4 * dpc;
const unsigned single_max = UINT_MAX_N(bpc); const unsigned single_max = UINT_MAX_N(bpc);
@ -61,38 +60,20 @@ static struct color hex_to_color(uintmax_t hexValue, int dpc)
static struct color string_to_color(const char *str) static struct color string_to_color(const char *str)
{ {
uintmax_t val;
unsigned clen;
{
int cn;
/* accept 3 or 4 equal components */ {
char *end; char *end;
val = strtoumax(str+1, &end, 16); uint32_t val = strtoul(str+1, &end, 16);
if (errno == ERANGE || (end[0] != '\0' && end[1] != '\0')) if (*end != '\0' && *(end+1) != '\0') {
goto err; LOG_W("Invalid color string: '%s'", str);
}
const int len = (end - (str+1)); switch (strlen(str+1)) {
if (len % 3 == 0) cn = 3; case 3: return hex_to_color((val << 4) | 0xF, 1);
else if (len % 4 == 0) cn = 4; case 6: return hex_to_color((val << 8) | 0xFF, 2);
else goto err; case 4: return hex_to_color(val, 1);
clen = len / cn; case 8: return hex_to_color(val, 2);
} }
/* component length must be 2^n */ {
unsigned mask = 1;
while(mask < clen) mask <<= 1;
if (mask != clen) goto err;
}
/* turn 3-component to opaque 4-components */ {
const unsigned csize = clen * 4;
if (cn == 3)
val = (val << csize) | UINT_MAX_N(csize);
}
}
return hex_to_color(val, clen);
/* return black on error */ /* return black on error */
err:
LOG_W("Invalid color string: '%s'", str); LOG_W("Invalid color string: '%s'", str);
return hex_to_color(0xF, 1); return hex_to_color(0xF, 1);
} }