fbt/lemonbar
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Strip all the unnecessary stuff when parsing the font list

Browse Source
This commit is contained in:
LemonBoy 2015-02-13 14:18:48 +01:00
parent 7f1f722965
commit 392f23ef36
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
bar.c
View File

@ -1,3 +1,4 @@
// vim:sw=4:ts=4:et:
#include <stdbool.h> #include <stdbool.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -513,7 +514,7 @@ font_load (const char *str)
cookie = xcb_open_font_checked(c, font, strlen(str), str); cookie = xcb_open_font_checked(c, font, strlen(str), str);
if (xcb_request_check (c, cookie)) { if (xcb_request_check (c, cookie)) {
fprintf(stderr, "Could not load font %s\n", str); fprintf(stderr, "Could not load font \"%s\"\n", str);
return NULL; return NULL;
} }
@ -926,7 +927,7 @@ parse_geometry_string (char *str, int *tmp)
void void
parse_font_list (char *str) parse_font_list (char *str)
{ {
char *tok; char *tok, *end;
if (!str) if (!str)
return; return;
@ -939,12 +940,25 @@ parse_font_list (char *str)
return; return;
} }
// Load the selected font // Strip the leading and trailing whitespaces
font_t *font = font_load(tok); while (isspace(*tok) || iscntrl(*tok))
if (font) tok++;
font_list[font_count++] = font;
end = tok + strlen(tok) - 1;
while (end > tok && isspace(*end) || iscntrl(*end))
end--;
*(end + 1) = '\0';
if (tok[0]) {
// Load the selected font
font_t *font = font_load(tok);
if (font)
font_list[font_count++] = font;
}
else else
fprintf(stderr, "Could not load font \"%s\"...skipping\n", tok); fprintf(stderr, "Empty font name, skipping...\n");
tok = strtok(NULL, ","); tok = strtok(NULL, ",");
} }