[svn-upgrade] Integrating new upstream version, ion3 (20070203)

[ion3.git] / pwm / pwm.c

diff --git a/pwm/pwm.c b/pwm/pwm.c
index 773aace74b43bbdf74cb77a33972e18c175bf9e8..bbb042f792dfb9fcbf294cb33b03e77ae713e6d8 100644 (file)
--- a/pwm/pwm.c
+++ b/pwm/pwm.c
@@ -1,7 +1,7 @@
 /*
  * ion/pwm/pwm.c
  *
- * Copyright (c) Tuomo Valkonen 1999-2006. 
+ * Copyright (c) Tuomo Valkonen 1999-2007. 
  *
  * Ion is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License as published by
@@ -48,16 +48,8 @@ static OptParserOpt pwm_opts[]={
      DUMMY_TR("Add directory to search path")},
 
     {OPT_ID('o'), "oneroot",  0, NULL,
-     DUMMY_TR("Manage default root window/non-Xinerama screen only")},
-
-#if defined(CF_XINERAMA) || defined(CF_SUN_XINERAMA)
-    {OPT_ID('x'), "xinerama", OPT_ARG, "1|0",
-     DUMMY_TR("Use Xinerama screen information (default: 0/no)")},
-#else
-    {OPT_ID('x'), "xinerama", OPT_ARG, "?",
-     DUMMY_TR("Ignored: not compiled with Xinerama support")},
-#endif
-    
+     DUMMY_TR("Manage default screen only")},
+
     {OPT_ID('s'), "session",  OPT_ARG, "session_name", 
      DUMMY_TR("Name of session (affects savefiles)")},
     
@@ -97,7 +89,7 @@ int main(int argc, char*argv[])
     const char *cfgfile="cfg_pwm";
     const char *display=NULL;
     char *cmd=NULL;
-    int stflags=IONCORE_STARTUP_NOXINERAMA;
+    int stflags=0;
     int opt;
     ErrorLog el;
     FILE *ef=NULL;
@@ -139,17 +131,6 @@ int main(int argc, char*argv[])
         case OPT_ID('o'):
             stflags|=IONCORE_STARTUP_ONEROOT;
             break;
-        case OPT_ID('x'):
-            {
-                const char *p=optparser_get_arg();
-                if(strcmp(p, "1")==0)
-                    stflags&=~IONCORE_STARTUP_NOXINERAMA;
-                else if(strcmp(p, "0")==0)
-                    stflags|=IONCORE_STARTUP_NOXINERAMA;
-                else
-                    warn(TR("Invalid parameter to -xinerama."));
-            }
-            break;
         case OPT_ID('s'):
             extl_set_sessiondir(optparser_get_arg());
             break;