aboutsummaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2019-09-21 18:01:55 +0000
committerDaniel Eklöf <daniel@ekloef.se>2019-09-21 18:01:55 +0000
commitf20b08db3d77ba43f63ce37a29da8b6f8263f46b (patch)
tree0c530d8d555798a792dfc725919990f9e8ae5b3a /main.c
parentdoc: describe font fallback handling (diff)
main: -f,--font now accepts a list of fonts
This makes -f,--font behave just like the configuration file option 'font'; the first font in the list is the primary font, and the remaining fonts are fallback fonts used when a glyph cannot be found in the primary font.
Diffstat (limited to 'main.c')
-rw-r--r--main.c23
1 files changed, 21 insertions, 2 deletions
diff --git a/main.c b/main.c
index 17fe9b21..877ec97b 100644
--- a/main.c
+++ b/main.c
@@ -1,6 +1,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
+#include <ctype.h>
#include <stdbool.h>
#include <unistd.h>
#include <assert.h>
@@ -397,7 +398,7 @@ print_usage(const char *prog_name)
printf("Usage: %s [OPTION]...\n", prog_name);
printf("\n");
printf("Options:\n");
- printf(" -f,--font=FONT font name and style in fontconfig format (monospace)\n"
+ printf(" -f,--font=FONT comma separated list of fonts in fontconfig format (monospace)\n"
" -t,--term=TERM value to set the environment variable TERM to (foot)\n"
" -g,--geometry=WIDTHxHEIGHT set initial width and height\n"
" -v,--version show the version number and quit\n");
@@ -437,7 +438,25 @@ main(int argc, char *const *argv)
case 'f':
tll_free_and_free(conf.fonts, free);
- tll_push_back(conf.fonts, strdup(optarg));
+ //tll_push_back(conf.fonts, strdup(optarg));
+ for (char *font = strtok(optarg, ","); font != NULL; font = strtok(NULL, ",")) {
+
+ /* Strip leading spaces */
+ while (*font != '\0' && isspace(*font))
+ font++;
+
+ /* Strip trailing spaces */
+ char *end = font + strlen(font);
+ assert(*end == '\0');
+ end--;
+ while (end > font && isspace(*end))
+ *(end--) = '\0';
+
+ if (strlen(font) == 0)
+ continue;
+
+ tll_push_back(conf.fonts, strdup(font));
+ }
break;
case 'g': {