Merge remote-tracking branch 'origin/released'

Conflicts:
	pixman/pixman/pixman-mmx.c
	xorg-server/Xext/shm.c
	xorg-server/Xext/syncsrv.h
	xorg-server/Xext/xvmain.c
	xorg-server/Xi/exevents.c
	xorg-server/Xi/opendev.c
	xorg-server/composite/compalloc.c
	xorg-server/composite/compoverlay.c
	xorg-server/dix/colormap.c
	xorg-server/dix/devices.c
	xorg-server/dix/dispatch.c
	xorg-server/dix/dixfonts.c
	xorg-server/dix/eventconvert.c
	xorg-server/dix/events.c
	xorg-server/dix/gc.c
	xorg-server/dix/getevents.c
	xorg-server/dix/main.c
	xorg-server/dix/privates.c
	xorg-server/dix/registry.c
	xorg-server/dix/resource.c
	xorg-server/exa/exa_accel.c
	xorg-server/exa/exa_migration_classic.c
	xorg-server/exa/exa_unaccel.c
	xorg-server/fb/fb.h
	xorg-server/fb/fbcopy.c
	xorg-server/fb/fbpixmap.c
	xorg-server/glx/dispatch.h
	xorg-server/glx/glapi.h
	xorg-server/glx/glapi_gentable.c
	xorg-server/glx/glapitable.h
	xorg-server/glx/glprocs.h
	xorg-server/glx/glxcmds.c
	xorg-server/glx/glxcmdsswap.c
	xorg-server/glx/glxdricommon.c
	xorg-server/glx/glxdriswrast.c
	xorg-server/glx/glxext.c
	xorg-server/glx/indirect_dispatch.c
	xorg-server/glx/indirect_dispatch.h
	xorg-server/glx/indirect_dispatch_swap.c
	xorg-server/glx/indirect_size.h
	xorg-server/glx/indirect_size_get.h
	xorg-server/glx/indirect_table.c
	xorg-server/glx/indirect_util.c
	xorg-server/glx/rensize.c
	xorg-server/glx/single2swap.c
	xorg-server/glx/singlepix.c
	xorg-server/glx/singlepixswap.c
	xorg-server/glx/singlesize.c
	xorg-server/hw/dmx/dmxinit.c
	xorg-server/hw/kdrive/ephyr/ephyr.c
	xorg-server/hw/kdrive/ephyr/hostx.c
	xorg-server/hw/kdrive/ephyr/hostx.h
	xorg-server/hw/kdrive/src/kinput.c
	xorg-server/hw/xfree86/common/compiler.h
	xorg-server/hw/xwin/InitInput.c
	xorg-server/hw/xwin/InitOutput.c
	xorg-server/hw/xwin/ddraw.h
	xorg-server/hw/xwin/glx/glwrap.c
	xorg-server/hw/xwin/glx/indirect.c
	xorg-server/hw/xwin/glx/wgl_ext_api.h
	xorg-server/hw/xwin/glx/winpriv.c
	xorg-server/hw/xwin/win.h
	xorg-server/hw/xwin/winallpriv.c
	xorg-server/hw/xwin/winauth.c
	xorg-server/hw/xwin/winclipboard.h
	xorg-server/hw/xwin/winclipboardinit.c
	xorg-server/hw/xwin/winclipboardthread.c
	xorg-server/hw/xwin/winclipboardunicode.c
	xorg-server/hw/xwin/winclipboardwndproc.c
	xorg-server/hw/xwin/winclipboardwrappers.c
	xorg-server/hw/xwin/winclipboardxevents.c
	xorg-server/hw/xwin/wincmap.c
	xorg-server/hw/xwin/winconfig.c
	xorg-server/hw/xwin/wincreatewnd.c
	xorg-server/hw/xwin/wincursor.c
	xorg-server/hw/xwin/windialogs.c
	xorg-server/hw/xwin/winengine.c
	xorg-server/hw/xwin/winerror.c
	xorg-server/hw/xwin/wingc.c
	xorg-server/hw/xwin/wingetsp.c
	xorg-server/hw/xwin/winkeybd.c
	xorg-server/hw/xwin/winkeybd.h
	xorg-server/hw/xwin/winlayouts.h
	xorg-server/hw/xwin/winmisc.c
	xorg-server/hw/xwin/winmonitors.c
	xorg-server/hw/xwin/winmouse.c
	xorg-server/hw/xwin/winmsg.c
	xorg-server/hw/xwin/winmsg.h
	xorg-server/hw/xwin/winmultiwindowclass.c
	xorg-server/hw/xwin/winmultiwindowicons.c
	xorg-server/hw/xwin/winmultiwindowshape.c
	xorg-server/hw/xwin/winmultiwindowwindow.c
	xorg-server/hw/xwin/winmultiwindowwm.c
	xorg-server/hw/xwin/winmultiwindowwndproc.c
	xorg-server/hw/xwin/winnativegdi.c
	xorg-server/hw/xwin/winpfbdd.c
	xorg-server/hw/xwin/winpixmap.c
	xorg-server/hw/xwin/winpolyline.c
	xorg-server/hw/xwin/winprefs.c
	xorg-server/hw/xwin/winprocarg.c
	xorg-server/hw/xwin/winregistry.c
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/hw/xwin/winsetsp.c
	xorg-server/hw/xwin/winshaddd.c
	xorg-server/hw/xwin/winshadddnl.c
	xorg-server/hw/xwin/winshadgdi.c
	xorg-server/hw/xwin/wintrayicon.c
	xorg-server/hw/xwin/winwin32rootless.c
	xorg-server/hw/xwin/winwin32rootlesswindow.c
	xorg-server/hw/xwin/winwin32rootlesswndproc.c
	xorg-server/hw/xwin/winwindow.c
	xorg-server/hw/xwin/winwindow.h
	xorg-server/hw/xwin/winwindowswm.c
	xorg-server/hw/xwin/winwndproc.c
	xorg-server/include/callback.h
	xorg-server/include/dixstruct.h
	xorg-server/include/misc.h
	xorg-server/include/os.h
	xorg-server/include/scrnintstr.h
	xorg-server/mi/micmap.c
	xorg-server/mi/miinitext.c
	xorg-server/mi/mioverlay.c
	xorg-server/mi/misprite.c
	xorg-server/mi/mivaltree.c
	xorg-server/mi/miwindow.c
	xorg-server/miext/damage/damage.c
	xorg-server/miext/rootless/rootlessGC.c
	xorg-server/miext/rootless/rootlessWindow.c
	xorg-server/os/WaitFor.c
	xorg-server/os/access.c
	xorg-server/os/connection.c
	xorg-server/os/io.c
	xorg-server/os/log.c
	xorg-server/os/osinit.c
	xorg-server/os/utils.c
	xorg-server/os/xdmcp.c
	xorg-server/os/xprintf.c
	xorg-server/os/xstrans.c
	xorg-server/render/mipict.c
	xorg-server/xkb/xkbActions.c
	xorg-server/xkb/xkbInit.c
	xorg-server/xkeyboard-config/compat/default.in

1 files changed, 158 insertions, 152 deletions

diff --git a/xorg-server/hw/dmx/glxProxy/glxvisuals.c b/xorg-server/hw/dmx/glxProxy/glxvisuals.c
index ae5e86772..3fca04f0d 100644
--- a/xorg-server/hw/dmx/glxProxy/glxvisuals.c
+++ b/xorg-server/hw/dmx/glxProxy/glxvisuals.c
@@ -1,152 +1,158 @@
-/*

- * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)

- * Copyright (C) 1991-2000 Silicon Graphics, Inc. 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 including the dates of first publication and

- * either this permission notice or a reference to

- * http://oss.sgi.com/projects/FreeB/

- * 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

- * SILICON GRAPHICS, INC. 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 Silicon Graphics, Inc.

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

- * other dealings in this Software without prior written authorization from

- * Silicon Graphics, Inc.

- */

-

-#ifdef HAVE_DMX_CONFIG_H

-#include <dmx-config.h>

-#endif

-

-#include "glxserver.h"

-#include "glxvisuals.h"

-

-int glxVisualsMatch( __GLXvisualConfig *v1, __GLXvisualConfig *v2 )

-{

-      if ( (v1->class == v2->class) &&

-           (v1->rgba == v2->rgba) &&

-	   (v1->redSize == v2->redSize) &&

-	   (v1->greenSize == v2->greenSize) &&

-	   (v1->blueSize == v2->blueSize) &&

-	   (v1->alphaSize == v2->alphaSize) &&

-	   (v1->redMask == v2->redMask) &&

-	   (v1->greenMask == v2->greenMask) &&

-	   (v1->blueMask == v2->blueMask) &&

-	   (v1->alphaMask == v2->alphaMask) &&

-	   (v1->accumRedSize == v2->accumRedSize) &&

-	   (v1->accumGreenSize == v2->accumGreenSize) &&

-	   (v1->accumBlueSize == v2->accumBlueSize) &&

-	   (v1->accumAlphaSize == v2->accumAlphaSize) &&

-	   (v1->doubleBuffer == v2->doubleBuffer) &&

-	   (v1->stereo == v2->stereo) &&

-	   (v1->bufferSize == v2->bufferSize) &&

-	   (v1->depthSize == v2->depthSize) &&

-	   (v1->stencilSize == v2->stencilSize) &&

-	   (v1->auxBuffers == v2->auxBuffers) &&

-	   (v1->level == v2->level) &&

-	   (v1->visualRating == v2->visualRating) &&

-	   (v1->transparentPixel == v2->transparentPixel) &&

-	   (v1->transparentRed == v2->transparentRed) &&

-	   (v1->transparentGreen == v2->transparentGreen) &&

-	   (v1->transparentBlue == v2->transparentBlue) &&

-	   (v1->transparentAlpha == v2->transparentAlpha) &&

-	   (v1->transparentIndex == v2->transparentIndex) &&

-	   (v1->multiSampleSize == v2->multiSampleSize) &&

-	   (v1->nMultiSampleBuffers == v2->nMultiSampleBuffers) &&

-	   (v1->visualSelectGroup == v2->visualSelectGroup)         ) {

-

-	      return 1;

-

-      }

-

-      return 0;

-

-}

-

-VisualID glxMatchGLXVisualInConfigList( __GLXvisualConfig *pGlxVisual, __GLXvisualConfig *configs, int nconfigs )

-{

-    int i;

-

-    for (i=0; i<nconfigs; i++) {

-

-       if (glxVisualsMatch( pGlxVisual, &configs[i] )) {

-

-	  return configs[i].vid;

-

-       }

-    }

-

-    return 0;

-}

-

-VisualID glxMatchVisualInConfigList( ScreenPtr pScreen, VisualPtr pVisual, __GLXvisualConfig *configs, int nconfigs )

-{

-    __GLXscreenInfo *pGlxScreen;

-    __GLXvisualConfig *pGlxVisual;

-    int i;

-

-    /* check that the glx extension has been initialized */

-    if ( !__glXActiveScreens ) 

-       return 0;

-

-    pGlxScreen = &__glXActiveScreens[pScreen->myNum];

-    pGlxVisual = pGlxScreen->pGlxVisual;

-

-    /* find the glx visual info for pVisual */

-    for (i = 0; i < pGlxScreen->numVisuals; i++, pGlxVisual++) {

-	if (pGlxVisual->vid == pVisual->vid) {

-	    break;

-	}

-    }

-    if (i == pGlxScreen->numVisuals) {

-	/*

-	 * the visual is not supported by glx

-	 */

-        return 0;

-    }

-

-    return( glxMatchGLXVisualInConfigList(pGlxVisual, configs, nconfigs) );

-}

-

-VisualPtr glxMatchVisual( ScreenPtr pScreen, VisualPtr pVisual, ScreenPtr pMatchScreen )

-{

-    __GLXscreenInfo *pGlxScreen2;

-    int j;

-    VisualID vid;

-

-    /* check that the glx extension has been initialized */

-    if ( !__glXActiveScreens ) 

-       return NULL;

-

-    pGlxScreen2 = &__glXActiveScreens[pMatchScreen->myNum];

-

-    vid = glxMatchVisualInConfigList( pScreen, pVisual,

-                                      pGlxScreen2->pGlxVisual,

-				      pGlxScreen2->numVisuals );

-    if (vid) {

-       /*

-    	* find the X visual of the matching glx visual

-	*/

-       for (j=0; j<pMatchScreen->numVisuals; j++) {

-	  if (vid == pMatchScreen->visuals[j].vid) {

-	     return &pMatchScreen->visuals[j];

-	  }

-       }

-    }

-

-    return 0;

-}

+/*
+ * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
+ * Copyright (C) 1991-2000 Silicon Graphics, Inc. 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 including the dates of first publication and
+ * either this permission notice or a reference to
+ * http://oss.sgi.com/projects/FreeB/
+ * 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
+ * SILICON GRAPHICS, INC. 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 Silicon Graphics, Inc.
+ * shall not be used in advertising or otherwise to promote the sale, use or
+ * other dealings in this Software without prior written authorization from
+ * Silicon Graphics, Inc.
+ */
+
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
+#include "glxserver.h"
+#include "glxvisuals.h"
+
+int
+glxVisualsMatch(__GLXvisualConfig * v1, __GLXvisualConfig * v2)
+{
+    if ((v1->class == v2->class) &&
+        (v1->rgba == v2->rgba) &&
+        (v1->redSize == v2->redSize) &&
+        (v1->greenSize == v2->greenSize) &&
+        (v1->blueSize == v2->blueSize) &&
+        (v1->alphaSize == v2->alphaSize) &&
+        (v1->redMask == v2->redMask) &&
+        (v1->greenMask == v2->greenMask) &&
+        (v1->blueMask == v2->blueMask) &&
+        (v1->alphaMask == v2->alphaMask) &&
+        (v1->accumRedSize == v2->accumRedSize) &&
+        (v1->accumGreenSize == v2->accumGreenSize) &&
+        (v1->accumBlueSize == v2->accumBlueSize) &&
+        (v1->accumAlphaSize == v2->accumAlphaSize) &&
+        (v1->doubleBuffer == v2->doubleBuffer) &&
+        (v1->stereo == v2->stereo) &&
+        (v1->bufferSize == v2->bufferSize) &&
+        (v1->depthSize == v2->depthSize) &&
+        (v1->stencilSize == v2->stencilSize) &&
+        (v1->auxBuffers == v2->auxBuffers) &&
+        (v1->level == v2->level) &&
+        (v1->visualRating == v2->visualRating) &&
+        (v1->transparentPixel == v2->transparentPixel) &&
+        (v1->transparentRed == v2->transparentRed) &&
+        (v1->transparentGreen == v2->transparentGreen) &&
+        (v1->transparentBlue == v2->transparentBlue) &&
+        (v1->transparentAlpha == v2->transparentAlpha) &&
+        (v1->transparentIndex == v2->transparentIndex) &&
+        (v1->multiSampleSize == v2->multiSampleSize) &&
+        (v1->nMultiSampleBuffers == v2->nMultiSampleBuffers) &&
+        (v1->visualSelectGroup == v2->visualSelectGroup)) {
+
+        return 1;
+
+    }
+
+    return 0;
+
+}
+
+VisualID
+glxMatchGLXVisualInConfigList(__GLXvisualConfig * pGlxVisual,
+                              __GLXvisualConfig * configs, int nconfigs)
+{
+    int i;
+
+    for (i = 0; i < nconfigs; i++) {
+
+        if (glxVisualsMatch(pGlxVisual, &configs[i])) {
+
+            return configs[i].vid;
+
+        }
+    }
+
+    return 0;
+}
+
+VisualID
+glxMatchVisualInConfigList(ScreenPtr pScreen, VisualPtr pVisual,
+                           __GLXvisualConfig * configs, int nconfigs)
+{
+    __GLXscreenInfo *pGlxScreen;
+    __GLXvisualConfig *pGlxVisual;
+    int i;
+
+    /* check that the glx extension has been initialized */
+    if (!__glXActiveScreens)
+        return 0;
+
+    pGlxScreen = &__glXActiveScreens[pScreen->myNum];
+    pGlxVisual = pGlxScreen->pGlxVisual;
+
+    /* find the glx visual info for pVisual */
+    for (i = 0; i < pGlxScreen->numVisuals; i++, pGlxVisual++) {
+        if (pGlxVisual->vid == pVisual->vid) {
+            break;
+        }
+    }
+    if (i == pGlxScreen->numVisuals) {
+        /*
+         * the visual is not supported by glx
+         */
+        return 0;
+    }
+
+    return (glxMatchGLXVisualInConfigList(pGlxVisual, configs, nconfigs));
+}
+
+VisualPtr
+glxMatchVisual(ScreenPtr pScreen, VisualPtr pVisual, ScreenPtr pMatchScreen)
+{
+    __GLXscreenInfo *pGlxScreen2;
+    int j;
+    VisualID vid;
+
+    /* check that the glx extension has been initialized */
+    if (!__glXActiveScreens)
+        return NULL;
+
+    pGlxScreen2 = &__glXActiveScreens[pMatchScreen->myNum];
+
+    vid = glxMatchVisualInConfigList(pScreen, pVisual,
+                                     pGlxScreen2->pGlxVisual,
+                                     pGlxScreen2->numVisuals);
+    if (vid) {
+        /*
+         * find the X visual of the matching glx visual
+         */
+        for (j = 0; j < pMatchScreen->numVisuals; j++) {
+            if (vid == pMatchScreen->visuals[j].vid) {
+                return &pMatchScreen->visuals[j];
+            }
+        }
+    }
+
+    return 0;
+}