aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBert <ber.t@gmx.com>2011-01-30 22:23:36 +0100
committerBert <ber.t@gmx.com>2011-01-30 22:23:36 +0100
commitf0e9ec733ad73147be1db2a11486d1ac803c044f (patch)
tree4b0d761fae42cd1e5cb3e4d8e327fd8b5148f48c
parent3d8efb21d51b5e9582fdff1a7c138f85f508e927 (diff)
Replaced option -W with -q, seems more natural
-rw-r--r--README.md2
-rw-r--r--options.c12
-rw-r--r--options.h2
-rw-r--r--sxiv.113
-rw-r--r--sxiv.h2
5 files changed, 15 insertions, 16 deletions
diff --git a/README.md b/README.md
index 78a236a..9f2c33e 100644
--- a/README.md
+++ b/README.md
@@ -35,9 +35,9 @@ sxiv supports the following command-line options:
-g GEOMETRY set window position and size
(see section GEOMETRY SPECIFICATIONS of X(7))
-p pixelize, i.e. turn off image anti-aliasing
+ -q be quiet, disable warnings
-s scale all images to fit into window
-v print version information and exit
- -W enable printing of warnings
-Z same as `-z 100'
-z ZOOM scale all images to current zoom level, use ZOOM at startup
diff --git a/options.c b/options.c
index 3a76120..a3f4143 100644
--- a/options.c
+++ b/options.c
@@ -29,7 +29,7 @@ options_t _options;
const options_t *options = (const options_t*) &_options;
void print_usage() {
- printf("usage: sxiv [-dfhpsvWZ] [-g GEOMETRY] [-z ZOOM] FILES...\n");
+ printf("usage: sxiv [-dfhpqsvZ] [-g GEOMETRY] [-z ZOOM] FILES...\n");
}
void print_version() {
@@ -48,9 +48,9 @@ void parse_options(int argc, char **argv) {
_options.fullscreen = 0;
_options.geometry = NULL;
- _options.warn = 0;
+ _options.quiet = 0;
- while ((opt = getopt(argc, argv, "dfg:hpsvWZz:")) != -1) {
+ while ((opt = getopt(argc, argv, "dfg:hpqsvZz:")) != -1) {
switch (opt) {
case '?':
print_usage();
@@ -70,15 +70,15 @@ void parse_options(int argc, char **argv) {
case 'p':
_options.aa = 0;
break;
+ case 'q':
+ _options.quiet = 1;
+ break;
case 's':
_options.scalemode = SCALE_FIT;
break;
case 'v':
print_version();
exit(0);
- case 'W':
- _options.warn = 1;
- break;
case 'Z':
_options.scalemode = SCALE_ZOOM;
_options.zoom = 1.0;
diff --git a/options.h b/options.h
index 71a1b21..7de4f0f 100644
--- a/options.h
+++ b/options.h
@@ -32,7 +32,7 @@ typedef struct options_s {
unsigned char fullscreen;
char *geometry;
- unsigned char warn;
+ unsigned char quiet;
} options_t;
extern const options_t *options;
diff --git a/sxiv.1 b/sxiv.1
index 25a26a9..47fd271 100644
--- a/sxiv.1
+++ b/sxiv.1
@@ -3,10 +3,9 @@
sxiv \- Simple (or small or suckless) X Image Viewer
.SH SYNOPSIS
.B sxiv
-.RB [ \-dfhpsvWZ ]
-.RB [ \-w
-.IB WIDTH x HEIGHT
-]
+.RB [ \-dfhpqsvZ ]
+.RB [ \-g
+.IR GEOMETRY ]
.RB [ \-z
.IR ZOOM ]
.IR FILE ...
@@ -35,15 +34,15 @@ Print brief usage information to standard output and exit.
.B \-p
Pixelize images, i.e. turn off anti-aliasing.
.TP
+.B \-q
+Be quiet, disable warnings to standard error stream.
+.TP
.B \-s
Scale all images to fit into window.
.TP
.B \-v
Print version information to standard output and exit.
.TP
-.B \-W
-Enable printing of warnings to standard error stream.
-.TP
.B \-Z
The same as `-z 100'.
.TP
diff --git a/sxiv.h b/sxiv.h
index 15db96e..b859a38 100644
--- a/sxiv.h
+++ b/sxiv.h
@@ -28,7 +28,7 @@
#define WARN(...) \
do { \
- if (options->warn) { \
+ if (!options->quiet) { \
fprintf(stderr, "sxiv: %s:%d: warning: ", __FILE__, __LINE__); \
fprintf(stderr, __VA_ARGS__); \
fprintf(stderr, "\n"); \