Skip to content
Snippets Groups Projects
Commit fd95bf93 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Change --xinerama <0|1> swich to --no-xinerama toggle, the switch makes no sense

parent 2981f325
No related branches found
No related tags found
No related merge requests found
...@@ -314,8 +314,8 @@ Use CTRL+Button B to blur the current image in any mode (default=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 .B -9, --no-blur-ctrl-mask
Don't require CTRL+Button for blurring in any mode -- just use the button (default=off). Don't require CTRL+Button for blurring in any mode -- just use the button (default=off).
.TP 5 .TP 5
.B --xinerama .B --no-xinerama
Enable/disable Xinerama support. Has no effect unless you have an Xinerama compiled in. Disable Xinerama support. Only makes sense when you have Xinerama support compiled in.
.TP 5 .TP 5
.B --screen-clip .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. Enable/disable window clipping based on screen size. WARNING: With this disabled, windows could become very large, making them unmanageable in certain window managers.
......
...@@ -351,6 +351,7 @@ feh_parse_option_array(int argc, char **argv) ...@@ -351,6 +351,7 @@ feh_parse_option_array(int argc, char **argv)
{"scale-down", 0, 0, '.'}, /* okay */ {"scale-down", 0, 0, '.'}, /* okay */
{"no-rotate-ctrl-mask", 0, 0, '7'}, {"no-rotate-ctrl-mask", 0, 0, '7'},
{"no-blur-ctrl-mask", 0, 0, '9'}, {"no-blur-ctrl-mask", 0, 0, '9'},
{"no-xinerama", 0, 0, 206},
{"no-jump-on-resort",0,0,220}, {"no-jump-on-resort",0,0,220},
{"hide-pointer",0,0,221}, {"hide-pointer",0,0,221},
/* options with values */ /* options with values */
...@@ -393,7 +394,6 @@ feh_parse_option_array(int argc, char **argv) ...@@ -393,7 +394,6 @@ feh_parse_option_array(int argc, char **argv)
{"bg-seamless", 1, 0, 203}, {"bg-seamless", 1, 0, 203},
{"menu-style", 1, 0, 204}, {"menu-style", 1, 0, 204},
{"zoom", 1, 0, 205}, {"zoom", 1, 0, 205},
{"xinerama", 1, 0, 206},
{"screen-clip", 1, 0, 207}, {"screen-clip", 1, 0, 207},
{"menu-border", 1, 0, 208}, {"menu-border", 1, 0, 208},
{"caption-path", 1, 0, 209}, {"caption-path", 1, 0, 209},
...@@ -681,7 +681,7 @@ feh_parse_option_array(int argc, char **argv) ...@@ -681,7 +681,7 @@ feh_parse_option_array(int argc, char **argv)
opt.default_zoom = atoi(optarg); opt.default_zoom = atoi(optarg);
break; break;
case 206: case 206:
opt.xinerama = atoi(optarg); opt.xinerama = 0;
break; break;
case 207: case 207:
opt.screen_clip = atoi(optarg); opt.screen_clip = atoi(optarg);
...@@ -1016,8 +1016,8 @@ show_usage(void) ...@@ -1016,8 +1016,8 @@ show_usage(void)
" any mode (default=1).\n" " any mode (default=1).\n"
" -9, --no-blur-ctrl-mask Don't require CTRL+Button for blurring in\n" " -9, --no-blur-ctrl-mask Don't require CTRL+Button for blurring in\n"
" any mode -- just use the button (default=off).\n" " any mode -- just use the button (default=off).\n"
" --xinerama [0|1] Enable/disable Xinerama support. Has no effect\n" " --no-xinerama Disable Xinerama support. Only useful if\n"
" unless you have an Xinerama compiled in.\n" " you have Xinerama compiled in.\n"
" --screen-clip [0|1] Enable/disable window clipping based on screen\n" " --screen-clip [0|1] Enable/disable window clipping based on screen\n"
" size. WARNING: with this option disabled,\n" " size. WARNING: with this option disabled,\n"
" image windows could become very large, making\n" " image windows could become very large, making\n"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment