diff options
| -rw-r--r-- | doc/imv.1 | 3 | ||||
| -rw-r--r-- | src/main.c | 12 |
2 files changed, 8 insertions, 7 deletions
@@ -45,7 +45,8 @@ Set the background color. Either 'checks' or a hex color value. Defaults to '#00 .TP .BI "-e " FONT:SIZE Set the font used by the overlay. FONT can be any valid system font, such as -FreeSans, FreeMono, etc. Defaults to FreeMono:24. +FreeSans, FreeMono, etc. Defaults to "Monospace:24", which is default monospace font, as configured in +.BR fonts.conf (5). .TP .BI "-t " SECONDS Set the slideshow delay in seconds. Setting this to zero disables slideshow @@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. struct { int fullscreen; - int stdin; + int sin; int recursive; int actual; int nearest_neighbour; @@ -46,7 +46,7 @@ struct { char *overlay_str; const char *start_at; const char *font; -} g_options = {0,0,0,0,0,1,0,0,0,0,0,0,NULL,NULL,"FreeMono:24"}; +} g_options = {0,0,0,0,0,1,0,0,0,0,0,0,NULL,NULL,"Monospace:24"}; void print_usage(const char* name) { @@ -67,7 +67,7 @@ void print_usage(const char* name) "Options:\n" " -n <NUM|PATH>: Start at picture number NUM, or with the path PATH.\n" " -b BG: Set the background. Either 'checks' or a hex color value.\n" - " -e FONT:SIZE: Set the font used for the overlay. Defaults to FreeMono:24\n" + " -e FONT:SIZE: Set the font used for the overlay. Defaults to Monospace:24\n" " -t SECONDS: Enable slideshow mode and set delay between images" "\n" "Mouse:\n" @@ -120,7 +120,7 @@ void parse_args(int argc, char** argv) switch(o) { case 'f': g_options.fullscreen = 1; break; case 'i': - g_options.stdin = 1; + g_options.sin = 1; fprintf(stderr, "Warning: '-i' is deprecated. Just use '-' instead.\n"); break; case 'r': g_options.recursive = 1; break; @@ -174,7 +174,7 @@ int main(int argc, char** argv) for(int i = optind; i < argc; ++i) { /* special case: '-' is actually an option */ if(!strcmp("-",argv[i])) { - g_options.stdin = 1; + g_options.sin = 1; continue; } /* add the given path to the list to load */ @@ -182,7 +182,7 @@ int main(int argc, char** argv) } /* if the user asked us to load paths from stdin, now is the time */ - if(g_options.stdin) { + if(g_options.sin) { char buf[512]; while(fgets(buf, sizeof(buf), stdin)) { size_t len = strlen(buf); |