Patch: -multiplemonitors is default, -nomultiplemnoitors added

[Øyvind Harboe]

Ref. earlier post, here is the patch.

http://sources.redhat.com/ml/cygwin-xfree/2004-01/msg00160.html

I compiled&tested; works on my rocket.


Øyvind

-------------- next part --------------
? multi-monitor.diff
Index: winprocarg.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/Attic/winprocarg.c,v
retrieving revision 1.1.2.3
diff -u -p -r1.1.2.3 winprocarg.c
--- winprocarg.c	10 Jan 2004 07:50:57 -0000	1.1.2.3
+++ winprocarg.c	14 Jan 2004 13:57:15 -0000
@@ -107,7 +107,7 @@ winInitializeDefaultScreens (void)
       g_ScreenInfo[i].fRootless = FALSE;
       g_ScreenInfo[i].fPseudoRootless = FALSE;
       g_ScreenInfo[i].fMultiWindow = FALSE;
-      g_ScreenInfo[i].fMultipleMonitors = FALSE;
+      g_ScreenInfo[i].fMultipleMonitors = TRUE;
       g_ScreenInfo[i].fLessPointer = FALSE;
       g_ScreenInfo[i].fScrollbars = FALSE;
       g_ScreenInfo[i].fNoTrayIcon = FALSE;
@@ -526,6 +526,34 @@ ddxProcessArgument (int argc, char *argv
     }
 
   /*
+   * Look for the '-nomultiplemonitors' argument
+   */
+  if (IS_OPTION ("-nomultiplemonitors")
+      || IS_OPTION ("-nomultimonitors"))
+    {
+      /* Is this parameter attached to a screen or is it global? */
+      if (-1 == g_iLastScreen)
+	{
+	  int			j;
+
+	  /* Parameter is for all screens */
+	  for (j = 0; j < MAXSCREENS; j++)
+	    {
+	      g_ScreenInfo[j].fMultipleMonitors = FALSE;
+	    }
+	}
+      else
+	{
+	  /* Parameter is for a single screen */
+	  g_ScreenInfo[g_iLastScreen].fMultipleMonitors = FALSE;
+	}
+
+      /* Indicate that we have processed this argument */
+      return 1;
+    }
+
+
+  /*
    * Look for the '-scrollbars' argument
    */
   if (IS_OPTION ("-scrollbars"))