diff options
| author | Daniel Friesel <derf@derf.homelinux.org> | 2010-02-06 13:17:11 +0100 |
|---|---|---|
| committer | Daniel Friesel <derf@derf.homelinux.org> | 2010-02-06 13:17:40 +0100 |
| commit | e9ec78c5e0c7030433b89519a1a000f3a70d0787 (patch) | |
| tree | 15f2d4ac28cf15b625fff6c74eb94b501bd8653c /src/options.c | |
| parent | fd95bf93bc883d619ec5e093d0211731d0dcb50d (diff) | |
| download | feh-e9ec78c5e0c7030433b89519a1a000f3a70d0787.zip | |
Re-Add --xinerama, but warn that it's deprecated
Diffstat (limited to 'src/options.c')
| -rw-r--r-- | src/options.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/options.c b/src/options.c index f946bae..3dd3981 100644 --- a/src/options.c +++ b/src/options.c @@ -351,7 +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-xinerama", 0, 0, 225}, {"no-jump-on-resort",0,0,220}, {"hide-pointer",0,0,221}, /* options with values */ @@ -394,6 +394,7 @@ 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 +682,8 @@ feh_parse_option_array(int argc, char **argv) opt.default_zoom = atoi(optarg); break; case 206: - opt.xinerama = 0; + opt.xinerama = atoi(optarg); + weprintf("Option --xinerama is deprecated, use --no-xinerama (or nothing) instead"); break; case 207: opt.screen_clip = atoi(optarg); @@ -738,6 +740,9 @@ feh_parse_option_array(int argc, char **argv) case 224: opt.cycle_once = 1; break; + case 225: + opt.xinerama = 0; + break; default: break; } |