nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2838 from acrisci/bug/colors-only-hex 

Ensure colors are in hex
This commit is contained in:
Ingo Bürk 2017-07-13 06:50:05 +02:00 committed by GitHub
parent bf1e4339e6 3a914396df
commit 0016ee8366
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
i3bar/src/child.c
View File

@ -112,13 +112,13 @@ __attribute__((format(printf, 1, 2))) static void set_statusline_error(const cha
struct status_block *err_block = scalloc(1, sizeof(struct status_block)); struct status_block *err_block = scalloc(1, sizeof(struct status_block));
err_block->full_text = i3string_from_utf8("Error: "); err_block->full_text = i3string_from_utf8("Error: ");
err_block->name = sstrdup("error"); err_block->name = sstrdup("error");
err_block->color = sstrdup("red"); err_block->color = sstrdup("#ff0000");
err_block->no_separator = true; err_block->no_separator = true;
struct status_block *message_block = scalloc(1, sizeof(struct status_block)); struct status_block *message_block = scalloc(1, sizeof(struct status_block));
message_block->full_text = i3string_from_utf8(message); message_block->full_text = i3string_from_utf8(message);
message_block->name = sstrdup("error_message"); message_block->name = sstrdup("error_message");
message_block->color = sstrdup("red"); message_block->color = sstrdup("#ff0000");
message_block->no_separator = true; message_block->no_separator = true;
TAILQ_INSERT_HEAD(&statusline_head, err_block, blocks); TAILQ_INSERT_HEAD(&statusline_head, err_block, blocks);

5
libi3/draw_util.c
View File

@ -84,6 +84,11 @@ void draw_util_surface_set_size(surface_t *surface, int width, int height) {
* *
*/ */
color_t draw_util_hex_to_color(const char *color) { color_t draw_util_hex_to_color(const char *color) {
if (strlen(color) < 6 || color[0] != '#') {
ELOG("Could not parse color: %s\n", color);
return draw_util_hex_to_color("#A9A9A9");
}
char alpha[2]; char alpha[2];
if (strlen(color) == strlen("#rrggbbaa")) { if (strlen(color) == strlen("#rrggbbaa")) {
alpha[0] = color[7]; alpha[0] = color[7];