Rename --screen-clip to --no-screen-clip, the default cannot be changed

4 files changed, 10 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 7b53044..bd247e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@ git HEAD
       thumbnail mode may be fullscreen, though. You can still use 'v' to
       toggle fullscreen, should you really need it.
     * --font now sets the global default font (for action/filename display etc.)
+    * Rename --screen-clip 0 to --no-screen-clip
 
 Thu Jun 10 12:12:04 CEST 2010
 
diff --git a/man/feh.1 b/man/feh.1
index 2b78657..3c50254 100644
--- a/man/feh.1
+++ b/man/feh.1
@@ -270,6 +270,11 @@ in slideshow mode, multiple windows will be opened; one per file.
 Don't jump to the first image after resorting the filelist.
 .It Cm -N , --no-menus
 Don't load or show any menus.
+.It Cm --no-screen-clip
+By default, window sizes are limited to the screen size.  With this option,
+windows will have the size of the image inside them.  Note that they may
+become very large this way, making them unmanageable in certain window
+managers.
 .It Cm --no-xinerama
 Disable Xinerama support.  Only makes sense when you have Xinerama support
 compiled in.
@@ -309,10 +314,6 @@ E.g. to sort in reverse width order, use
 .Cm -nSwidth .
 .It Cm -. , --scale-down
 When not in fullscreen: Scale images to screen size if they are too big.
-.It Cm --screen-clip Ar bool
-Disable/Enable screen clipping based on window size.  With this disabled,
-windows may become very large, making them unmanageable in certain window
-managers.
 .It Cm -D , --slideshow-delay Ar float
 For slideshow mode, wait
 .Ar float
diff --git a/src/options.c b/src/options.c
index e2e9c05..d017cad 100644
--- a/src/options.c
+++ b/src/options.c
@@ -373,7 +373,7 @@ static void feh_parse_option_array(int argc, char **argv)
 		{"bg-seamless", 1, 0, 203},
 		{"menu-style", 1, 0, 204},
 		{"zoom", 1, 0, 205},
-		{"screen-clip", 1, 0, 206},
+		{"no-screen-clip", 0, 0, 206},
 		{"menu-border", 1, 0, 207},
 		{"caption-path", 1, 0, 208},
 		{"action1", 1, 0, 209},
@@ -667,7 +667,7 @@ static void feh_parse_option_array(int argc, char **argv)
 			opt.default_zoom = atoi(optarg);
 			break;
 		case 206:
-			opt.screen_clip = atoi(optarg);
+			opt.screen_clip = 0;
 			break;
 		case 207:
 			opt.menu_border = atoi(optarg);
@@ -1028,7 +1028,7 @@ static void show_usage(void)
 "                           any mode -- just use the button (default=off).\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"
+"     --no-screen-clip      Disable window clipping based on screen\n"
 "                           size.  WARNING: with this option disabled,\n"
 "                           image windows could become very large, making\n"
 "                           them unmanageable in certain window managers.\n"
diff --git a/test/feh.i b/test/feh.i
index a5157da..fc14a79 100755
--- a/test/feh.i
+++ b/test/feh.i
@@ -318,7 +318,7 @@ ok(waitfor {
 	'Large window limited to screen size');
 feh_stop();
 
-$win = feh_start('--screen-clip 0', 'test/huge.png');
+$win = feh_start('--no-screen-clip', 'test/huge.png');
 ok(waitfor {
 		[(GetWindowPos($win))[2, 3]] ~~ [4000, 3000]
 	},