From fd95bf93bc883d619ec5e093d0211731d0dcb50d Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@derf.homelinux.org>
Date: Sat, 6 Feb 2010 12:40:00 +0100
Subject: [PATCH] Change --xinerama <0|1> swich to --no-xinerama toggle, the
switch makes no sense
---
feh.1 | 4 ++--
src/options.c | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/feh.1 b/feh.1
index 8d8b845..5b92112 100644
--- a/feh.1
+++ b/feh.1
@@ -314,8 +314,8 @@ Use CTRL+Button B to blur the current image in any mode (default=1).
.B -9, --no-blur-ctrl-mask
Don't require CTRL+Button for blurring in any mode -- just use the button (default=off).
.TP 5
-.B --xinerama
-Enable/disable Xinerama support. Has no effect unless you have an Xinerama compiled in.
+.B --no-xinerama
+Disable Xinerama support. Only makes sense when you have Xinerama support compiled in.
.TP 5
.B --screen-clip
Enable/disable window clipping based on screen size. WARNING: With this disabled, windows could become very large, making them unmanageable in certain window managers.
diff --git a/src/options.c b/src/options.c
index 20f4ea6..f946bae 100644
--- a/src/options.c
+++ b/src/options.c
@@ -351,6 +351,7 @@ feh_parse_option_array(int argc, char **argv)
{"scale-down", 0, 0, '.'}, /* okay */
{"no-rotate-ctrl-mask", 0, 0, '7'},
{"no-blur-ctrl-mask", 0, 0, '9'},
+ {"no-xinerama", 0, 0, 206},
{"no-jump-on-resort",0,0,220},
{"hide-pointer",0,0,221},
/* options with values */
@@ -393,7 +394,6 @@ feh_parse_option_array(int argc, char **argv)
{"bg-seamless", 1, 0, 203},
{"menu-style", 1, 0, 204},
{"zoom", 1, 0, 205},
- {"xinerama", 1, 0, 206},
{"screen-clip", 1, 0, 207},
{"menu-border", 1, 0, 208},
{"caption-path", 1, 0, 209},
@@ -681,7 +681,7 @@ feh_parse_option_array(int argc, char **argv)
opt.default_zoom = atoi(optarg);
break;
case 206:
- opt.xinerama = atoi(optarg);
+ opt.xinerama = 0;
break;
case 207:
opt.screen_clip = atoi(optarg);
@@ -1016,8 +1016,8 @@ show_usage(void)
" any mode (default=1).\n"
" -9, --no-blur-ctrl-mask Don't require CTRL+Button for blurring in\n"
" any mode -- just use the button (default=off).\n"
-" --xinerama [0|1] Enable/disable Xinerama support. Has no effect\n"
-" unless you have an Xinerama compiled in.\n"
+" --no-xinerama Disable Xinerama support. Only useful if\n"
+" you have Xinerama compiled in.\n"
" --screen-clip [0|1] Enable/disable window clipping based on screen\n"
" size. WARNING: with this option disabled,\n"
" image windows could become very large, making\n"
--
GitLab