diff options
| author | Daniel Friesel <derf@finalrewind.org> | 2012-02-01 16:23:33 +0100 |
|---|---|---|
| committer | Daniel Friesel <derf@finalrewind.org> | 2012-02-01 16:23:33 +0100 |
| commit | 1a2fc6b766aac2c20318810fd7da1eb7ffe01f36 (patch) | |
| tree | 149f0956455f48097b75e49ee1e7d41b60eb0bfb | |
| parent | 1ab71d9d630526fdd43e9c4260f8f9e2f41a5bc2 (diff) | |
No -Q for exif=1, long option and key binding are enough
| -rw-r--r-- | src/help.raw | 2 | ||||
| -rw-r--r-- | src/options.c | 22 |
2 files changed, 10 insertions, 14 deletions
diff --git a/src/help.raw b/src/help.raw index 818cea0..8e25b00 100644 --- a/src/help.raw +++ b/src/help.raw @@ -32,7 +32,7 @@ OPTIONS -x, --borderless Create borderless windows -d, --draw-filename Show the filename in the image window --draw-tinted Show overlay texts on semi-transparent background - -Q, --draw-exif Show some Exif information + --draw-exif Show some Exif information (if compiled with exif=1) -^, --title TITLE Set window title (see FORMAT SPECIFIERS) -D, --slideshow-delay NUM Set delay between automatically changing slides --cycle-once Exit after one loop through the slideshow diff --git a/src/options.c b/src/options.c index 5f94a64..f389e0e 100644 --- a/src/options.c +++ b/src/options.c @@ -301,11 +301,7 @@ static void feh_getopt_theme(int argc, char **argv) static void feh_parse_option_array(int argc, char **argv, int finalrun) { static char stropts[] = -#ifdef HAVE_LIBEXIF - "a:A:b:B:cC:dD:e:E:f:Fg:GhH:iIj:J:kK:lL:mM:nNo:O:pPQqrR:sS:tT:uUvVwW:xXy:YzZ" -#else - "a:A:b:B:cC:dD:e:E:f:Fg:GhH:iIj:J:kK:lL:mM:nNo:O:pPqrR:sS:tT:uUvVwW:xXy:YzZ" -#endif + "a:A:b:B:cC:dD:e:E:f:Fg:GhH:iIj:J:kK:lL:mM:nNo:O:pPqrR:sS:tT:uUvVwW:xXy:YzZ" ".@:^:~:):|:+:"; /* (*name, has_arg, *flag, val) See: struct option in getopts.h */ @@ -333,9 +329,6 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun) {"auto-zoom" , 0, 0, 'Z'}, {"ignore-aspect" , 0, 0, 'X'}, {"draw-filename" , 0, 0, 'd'}, -#ifdef HAVE_LIBEXIF - {"draw-exif" , 0, 0, 'Q'}, -#endif {"preload" , 0, 0, 'p'}, {"reverse" , 0, 0, 'n'}, {"thumbnails" , 0, 0, 't'}, @@ -347,6 +340,9 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun) {"cycle-once" , 0, 0, 224}, {"no-xinerama" , 0, 0, 225}, {"draw-tinted" , 0, 0, 229}, +#ifdef HAVE_LIBEXIF + {"draw-exif" , 0, 0, 223}, +#endif {"output" , 1, 0, 'o'}, {"output-only" , 1, 0, 'O'}, @@ -483,11 +479,6 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun) case 'd': opt.draw_filename = 1; break; -#ifdef HAVE_LIBEXIF - case 'Q': - opt.draw_exif = 1; - break; -#endif case 'F': opt.full_screen = 1; break; @@ -697,6 +688,11 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun) case 'P': opt.cache_thumbnails = 1; break; +#ifdef HAVE_LIBEXIF + case 223: + opt.draw_exif = 1; + break; +#endif case 224: opt.cycle_once = 1; break; |