xserver update 19/10/2010

1 files changed, 180 insertions, 187 deletions

diff --git a/xorg-server/hw/xwin/winvalargs.c b/xorg-server/hw/xwin/winvalargs.c
index 6f8d1c994..f97bce610 100644
--- a/xorg-server/hw/xwin/winvalargs.c
+++ b/xorg-server/hw/xwin/winvalargs.c
@@ -1,187 +1,180 @@
-/*
- *Copyright (C) 2003-2004 Harold L Hunt II All Rights Reserved.
- *
- *Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- *"Software"), to deal in the Software without restriction, including
- *without limitation the rights to use, copy, modify, merge, publish,
- *distribute, sublicense, and/or sell copies of the Software, and to
- *permit persons to whom the Software is furnished to do so, subject to
- *the following conditions:
- *
- *The above copyright notice and this permission notice shall be
- *included in all copies or substantial portions of the Software.
- *
- *THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *NONINFRINGEMENT. IN NO EVENT SHALL HAROLD L HUNT II BE LIABLE FOR
- *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *Except as contained in this notice, the name of Harold L Hunt II
- *shall not be used in advertising or otherwise to promote the sale, use
- *or other dealings in this Software without prior written authorization
- *from Harold L Hunt II.
- *
- * Authors:	Harold L Hunt II
- */
-
-#ifdef HAVE_XWIN_CONFIG_H
-#include <xwin-config.h>
-#endif
-#include "win.h"
-#include "winmsg.h"
-
-
-/*
- * References to external symbols
- */
-
-extern int			g_iNumScreens;
-extern winScreenInfo *		g_ScreenInfo;
-extern Bool			g_fXdmcpEnabled;
-
-
-/*
- * Verify all screens have been explicitly specified
- */
-static BOOL
-isEveryScreenExplicit(void)
-{
-  int i;
-
-  for (i = 0; i < g_iNumScreens; i++)
-    if (!g_ScreenInfo[i].fExplicitScreen)
-      return FALSE;
-
-  return TRUE;
-}
-
-/*
- * winValidateArgs - Look for invalid argument combinations
- */
-
-Bool
-winValidateArgs (void)
-{
-  int		i;
-  int		iMaxConsecutiveScreen = 0;
-  BOOL		fHasNormalScreen0 = FALSE;
-  BOOL		fImplicitScreenFound = FALSE;
-
-  /*
-   * Check for a malformed set of -screen parameters.
-   * Examples of malformed parameters:
-   *	XWin -screen 1
-   *	XWin -screen 0 -screen 2
-   *	XWin -screen 1 -screen 2
-   */
-  if (!isEveryScreenExplicit())
-    {
-      ErrorF ("winValidateArgs - Malformed set of screen parameter(s).  "
-	      "Screens must be specified consecutively starting with "
-	      "screen 0.  That is, you cannot have only a screen 1, nor "
-	      "could you have screen 0 and screen 2.  You instead must "
-	      "have screen 0, or screen 0 and screen 1, respectively.  "
-	      "You can specify as many screens as you want.\n");
-      return FALSE;
-    }
-
-  /* Loop through all screens */
-  for (i = 0; i < g_iNumScreens; ++i)
-    {
-      /*
-       * Check for any combination of
-       * -multiwindow, -mwextwm, and -rootless.
-       */
-      {
-	int		iCount = 0;
-
-	/* Count conflicting options */
-#ifdef XWIN_MULTIWINDOW
-	if (g_ScreenInfo[i].fMultiWindow)
-	  ++iCount;
-#endif
-#ifdef XWIN_MULTIWINDOWEXTWM
-	if (g_ScreenInfo[i].fMWExtWM)
-	  ++iCount;
-#endif
-	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)
-	  {
-	    ErrorF ("winValidateArgs - Only one of -multiwindow, -mwextwm, "
-		    "and -rootless can be specific at a time.\n");
-	    return FALSE;
-	  }
-      }
-
-      /* Check for -multiwindow or -mwextwm and Xdmcp */
-      /* allow xdmcp if screen 0 is normal. */
-      if (g_fXdmcpEnabled && !fHasNormalScreen0
-	  && (FALSE
-#ifdef XWIN_MULTIWINDOW
-	      || g_ScreenInfo[i].fMultiWindow
-#endif
-#ifdef XWIN_MULTIWINDOWEXTWM
-	      || g_ScreenInfo[i].fMWExtWM
-#endif
-	      )
-	  )
-	{
-	  ErrorF ("winValidateArgs - Xdmcp (-query, -broadcast, or -indirect) "
-		  "is invalid with -multiwindow or -mwextwm.\n");
-	  return FALSE;
-	}
-
-      /* Check for -multiwindow, -mwextwm, or -rootless and fullscreen */
-      if (g_ScreenInfo[i].fFullScreen
-	  && (FALSE
-#ifdef XWIN_MULTIWINDOW
-	      || g_ScreenInfo[i].fMultiWindow
-#endif
-#ifdef XWIN_MULTIWINDOWEXTWM
-	      || g_ScreenInfo[i].fMWExtWM
-#endif
-	      || g_ScreenInfo[i].fRootless)
-	  )
-	{
-	  ErrorF ("winValidateArgs - -fullscreen is invalid with "
-		  "-multiwindow, -mwextwm, or -rootless.\n");
-	  return FALSE;
-	}
-      
-      /* Check for !fullscreen and any fullscreen-only parameters */
-      if (!g_ScreenInfo[i].fFullScreen
-	  && (g_ScreenInfo[i].dwRefreshRate != WIN_DEFAULT_BPP
-	      || g_ScreenInfo[i].dwBPP != WIN_DEFAULT_REFRESH))
-	{
-	  ErrorF ("winValidateArgs - -refresh and -depth are only valid "
-		  "with -fullscreen.\n");
-	  return FALSE;
-	}
-
-      /* Check for fullscreen and any non-fullscreen parameters */
-      if (g_ScreenInfo[i].fFullScreen
-	  && (g_ScreenInfo[i].fScrollbars
-	      || !g_ScreenInfo[i].fDecoration
-	      || g_ScreenInfo[i].fLessPointer))
-	{
-	  ErrorF ("winValidateArgs - -fullscreen is invalid with "
-		  "-scrollbars, -nodecoration, or -lesspointer.\n");
-	  return FALSE;
-	}
-    }
-
-  winDebug ("winValidateArgs - Returning.\n");
-
-  return TRUE;
-}
+/*

+ *Copyright (C) 2003-2004 Harold L Hunt II All Rights Reserved.

+ *

+ *Permission is hereby granted, free of charge, to any person obtaining

+ * a copy of this software and associated documentation files (the

+ *"Software"), to deal in the Software without restriction, including

+ *without limitation the rights to use, copy, modify, merge, publish,

+ *distribute, sublicense, and/or sell copies of the Software, and to

+ *permit persons to whom the Software is furnished to do so, subject to

+ *the following conditions:

+ *

+ *The above copyright notice and this permission notice shall be

+ *included in all copies or substantial portions of the Software.

+ *

+ *THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+ *EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+ *MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

+ *NONINFRINGEMENT. IN NO EVENT SHALL HAROLD L HUNT II BE LIABLE FOR

+ *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF

+ *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

+ *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+ *

+ *Except as contained in this notice, the name of Harold L Hunt II

+ *shall not be used in advertising or otherwise to promote the sale, use

+ *or other dealings in this Software without prior written authorization

+ *from Harold L Hunt II.

+ *

+ * Authors:	Harold L Hunt II

+ */

+

+#ifdef HAVE_XWIN_CONFIG_H

+#include <xwin-config.h>

+#endif

+#include "win.h"

+#include "winmsg.h"

+

+

+

+

+/*

+ * Verify all screens have been explicitly specified

+ */

+static BOOL

+isEveryScreenExplicit(void)

+{

+  int i;

+

+  for (i = 0; i < g_iNumScreens; i++)

+    if (!g_ScreenInfo[i].fExplicitScreen)

+      return FALSE;

+

+  return TRUE;

+}

+

+/*

+ * winValidateArgs - Look for invalid argument combinations

+ */

+

+Bool

+winValidateArgs (void)

+{

+  int		i;

+  int		iMaxConsecutiveScreen = 0;

+  BOOL		fHasNormalScreen0 = FALSE;

+  BOOL		fImplicitScreenFound = FALSE;

+

+  /*

+   * Check for a malformed set of -screen parameters.

+   * Examples of malformed parameters:

+   *	XWin -screen 1

+   *	XWin -screen 0 -screen 2

+   *	XWin -screen 1 -screen 2

+   */

+  if (!isEveryScreenExplicit())

+    {

+      ErrorF ("winValidateArgs - Malformed set of screen parameter(s).  "

+	      "Screens must be specified consecutively starting with "

+	      "screen 0.  That is, you cannot have only a screen 1, nor "

+	      "could you have screen 0 and screen 2.  You instead must "

+	      "have screen 0, or screen 0 and screen 1, respectively.  "

+	      "You can specify as many screens as you want.\n");

+      return FALSE;

+    }

+

+  /* Loop through all screens */

+  for (i = 0; i < g_iNumScreens; ++i)

+    {

+      /*

+       * Check for any combination of

+       * -multiwindow, -mwextwm, and -rootless.

+       */

+      {

+	int		iCount = 0;

+

+	/* Count conflicting options */

+#ifdef XWIN_MULTIWINDOW

+	if (g_ScreenInfo[i].fMultiWindow)

+	  ++iCount;

+#endif

+#ifdef XWIN_MULTIWINDOWEXTWM

+	if (g_ScreenInfo[i].fMWExtWM)

+	  ++iCount;

+#endif

+	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)

+	  {

+	    ErrorF ("winValidateArgs - Only one of -multiwindow, -mwextwm, "

+		    "and -rootless can be specific at a time.\n");

+	    return FALSE;

+	  }

+      }

+

+      /* Check for -multiwindow or -mwextwm and Xdmcp */

+      /* allow xdmcp if screen 0 is normal. */

+      if (g_fXdmcpEnabled && !fHasNormalScreen0

+	  && (FALSE

+#ifdef XWIN_MULTIWINDOW

+	      || g_ScreenInfo[i].fMultiWindow

+#endif

+#ifdef XWIN_MULTIWINDOWEXTWM

+	      || g_ScreenInfo[i].fMWExtWM

+#endif

+	      )

+	  )

+	{

+	  ErrorF ("winValidateArgs - Xdmcp (-query, -broadcast, or -indirect) "

+		  "is invalid with -multiwindow or -mwextwm.\n");

+	  return FALSE;

+	}

+

+      /* Check for -multiwindow, -mwextwm, or -rootless and fullscreen */

+      if (g_ScreenInfo[i].fFullScreen

+	  && (FALSE

+#ifdef XWIN_MULTIWINDOW

+	      || g_ScreenInfo[i].fMultiWindow

+#endif

+#ifdef XWIN_MULTIWINDOWEXTWM

+	      || g_ScreenInfo[i].fMWExtWM

+#endif

+	      || g_ScreenInfo[i].fRootless)

+	  )

+	{

+	  ErrorF ("winValidateArgs - -fullscreen is invalid with "

+		  "-multiwindow, -mwextwm, or -rootless.\n");

+	  return FALSE;

+	}

+      

+      /* Check for !fullscreen and any fullscreen-only parameters */

+      if (!g_ScreenInfo[i].fFullScreen

+	  && (g_ScreenInfo[i].dwRefreshRate != WIN_DEFAULT_BPP

+	      || g_ScreenInfo[i].dwBPP != WIN_DEFAULT_REFRESH))

+	{

+	  ErrorF ("winValidateArgs - -refresh and -depth are only valid "

+		  "with -fullscreen.\n");

+	  return FALSE;

+	}

+

+      /* Check for fullscreen and any non-fullscreen parameters */

+      if (g_ScreenInfo[i].fFullScreen

+	  && (g_ScreenInfo[i].fScrollbars

+	      || !g_ScreenInfo[i].fDecoration

+	      || g_ScreenInfo[i].fLessPointer))

+	{

+	  ErrorF ("winValidateArgs - -fullscreen is invalid with "

+		  "-scrollbars, -nodecoration, or -lesspointer.\n");

+	  return FALSE;

+	}

+    }

+

+  winDebug ("winValidateArgs - Returning.\n");

+

+  return TRUE;

+}