From e9ec78c5e0c7030433b89519a1a000f3a70d0787 Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@derf.homelinux.org>
Date: Sat, 6 Feb 2010 13:17:11 +0100
Subject: Re-Add --xinerama, but warn that it's deprecated

---
 src/options.c | 9 +++++++--
 1 file 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;
       }
-- 
cgit v1.2.3