aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--options.c14
-rw-r--r--sxiv.17
3 files changed, 12 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index 4455b9b..07fff5e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION := git-20161030
+VERSION := git-20161128
PREFIX := /usr/local
MANPREFIX := $(PREFIX)/share/man
diff --git a/options.c b/options.c
index b38c146..5220330 100644
--- a/options.c
+++ b/options.c
@@ -32,8 +32,9 @@ const options_t *options = (const options_t*) &_options;
void print_usage(void)
{
- printf("usage: sxiv [-abcfhioqrtvZ] [-A FRAMERATE] [-e WID] [-G GAMMA] [-g GEOMETRY] "
- "[-N NAME] [-n NUM] [-S DELAY] [-s MODE] [-z ZOOM] FILES...\n");
+ printf("usage: sxiv [-abcfhioqrtvZ] [-A FRAMERATE] [-e WID] [-G GAMMA] "
+ "[-g GEOMETRY] [-N NAME] [-n NUM] [-S DELAY] [-s MODE] [-z ZOOM] "
+ "FILES...\n");
}
void print_version(void)
@@ -72,20 +73,19 @@ void parse_options(int argc, char **argv)
_options.thumb_mode = false;
_options.clean_cache = false;
- while ((opt = getopt(argc, argv, "aA:bce:fG:g:hin:N:oqrS:s:tvZz:")) != -1) {
+ while ((opt = getopt(argc, argv, "A:abce:fG:g:hin:N:oqrS:s:tvZz:")) != -1) {
switch (opt) {
case '?':
print_usage();
exit(EXIT_FAILURE);
- case 'a':
- _options.animate = true;
- break;
case 'A':
- _options.animate = true;
n = strtol(optarg, &end, 0);
if (*end != '\0' || n <= 0)
error(EXIT_FAILURE, 0, "Invalid argument for option -A: %s", optarg);
_options.framerate = n;
+ /* fall through */
+ case 'a':
+ _options.animate = true;
break;
case 'b':
_options.hide_bar = true;
diff --git a/sxiv.1 b/sxiv.1
index 2037004..56841e8 100644
--- a/sxiv.1
+++ b/sxiv.1
@@ -35,12 +35,13 @@ Please note, that the fullscreen mode requires an EWMH/NetWM compliant window
manager.
.SH OPTIONS
.TP
+.BI "\-A " FRAMERATE
+Play animations with a constant frame rate set to
+.IR FRAMERATE .
+.TP
.B \-a
Play animations of multi-frame images.
.TP
-.BI "\-A " FRAMERATE
-Force frame rate on animated images to FRAMERATE
-.TP
.B \-b
Do not show info bar on bottom of window.
.TP