[xorg-commit-diffs] xc/programs/Xserver/hw/xwin winvalargs.c, 1.1.2.4, 1.1.2.5

[Alexander Gottwald]

Committed by: ago

Update of /cvs/xorg/xc/programs/Xserver/hw/xwin
In directory pdx:/tmp/cvs-serv31311

Modified Files:
      Tag: CYGWIN
	winvalargs.c 
Log Message:
allow screen combinations with
XWin -query host -screen 0 -screen 1 -multiwindow
This gives an xdmcp session and a second screen where i can display single 
windows


Index: winvalargs.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/Attic/winvalargs.c,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -d -r1.1.2.4 -r1.1.2.5
--- a/winvalargs.c	22 Apr 2004 20:19:53 -0000	1.1.2.4
+++ b/winvalargs.c	23 Apr 2004 11:41:43 -0000	1.1.2.5
@@ -58,6 +58,7 @@
 {
   int		i;
   int		iMaxConsecutiveScreen = 0;
+  BOOL		fHasNormalScreen0 = FALSE;
 
   /*
    * Check for a malformed set of -screen parameters.
@@ -108,6 +109,10 @@
 	if (g_ScreenInfo[i].fRootless)
 	  ++iCount;
 
+	/* Check if the first screen is without rootless and multiwindow */ 
+	if (iCount == 0 && i == 0)
+	  fHasNormalScreen0 = TRUE;  
+
 	/* Fail if two or more conflicting options */
 	if (iCount > 1)
 	  {
@@ -118,7 +123,8 @@
       }
 
       /* Check for -multiwindow or -mwextwm and Xdmcp */
-      if (g_fXdmcpEnabled
+      /* allow xdmcp if screen 0 is normal. */
+      if (g_fXdmcpEnabled && !fHasNormalScreen0
 	  && (FALSE
 #ifdef XWIN_MULTIWINDOW
 	      || g_ScreenInfo[i].fMultiWindow