xserver xkeyboard-config mesa git update 28 Apr 2011

2 files changed, 662 insertions, 665 deletions

diff --git a/xorg-server/hw/xfree86/dri/dri.c b/xorg-server/hw/xfree86/dri/dri.c
index bb5482a0b..1726960ae 100644
--- a/xorg-server/hw/xfree86/dri/dri.c
+++ b/xorg-server/hw/xfree86/dri/dri.c
@@ -63,8 +63,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "dri.h"
 #include "sarea.h"
 #include "dristruct.h"
-#include "xf86.h"
-#include "xf86drm.h"
 #include "mi.h"
 #include "mipointer.h"
 #include "xf86_OSproc.h"
diff --git a/xorg-server/hw/xfree86/dri/xf86dri.c b/xorg-server/hw/xfree86/dri/xf86dri.c
index cd1085b36..e02644a30 100644
--- a/xorg-server/hw/xfree86/dri/xf86dri.c
+++ b/xorg-server/hw/xfree86/dri/xf86dri.c
@@ -1,663 +1,662 @@
-/**************************************************************************

-

-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.

-Copyright 2000 VA Linux Systems, 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, sub license, 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 (including the

-next paragraph) 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 NON-INFRINGEMENT.

-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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.

-

-**************************************************************************/

-

-/*

- * Authors:

- *   Kevin E. Martin <martin@valinux.com>

- *   Jens Owen <jens@tungstengraphics.com>

- *   Rickard E. (Rik) Faith <faith@valinux.com>

- *

- */

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include <string.h>

-

-#include "xf86.h"

-

-#include <X11/X.h>

-#include <X11/Xproto.h>

-#include "misc.h"

-#include "dixstruct.h"

-#include "extnsionst.h"

-#include "colormapst.h"

-#include "cursorstr.h"

-#include "scrnintstr.h"

-#include "servermd.h"

-#define _XF86DRI_SERVER_

-#include <X11/dri/xf86driproto.h>

-#include "swaprep.h"

-#include "xf86str.h"

-#include "dri.h"

-#include "sarea.h"

-#include "dristruct.h"

-#include "xf86.h"

-#include "xf86drm.h"

-#include "protocol-versions.h"

-

-static int DRIErrorBase;

-

-

-

-static void XF86DRIResetProc(ExtensionEntry* extEntry);

-

-static unsigned char DRIReqCode = 0;

-

-extern void XFree86DRIExtensionInit(void);

-

-/*ARGSUSED*/

-static void

-XF86DRIResetProc (

-    ExtensionEntry* extEntry

-)

-{

-    DRIReset();

-}

-

-static int

-ProcXF86DRIQueryVersion(

-    register ClientPtr client

-)

-{

-    xXF86DRIQueryVersionReply rep;

-    register int n;

-

-    REQUEST_SIZE_MATCH(xXF86DRIQueryVersionReq);

-    rep.type = X_Reply;

-    rep.length = 0;

-    rep.sequenceNumber = client->sequence;

-    rep.majorVersion = SERVER_XF86DRI_MAJOR_VERSION;

-    rep.minorVersion = SERVER_XF86DRI_MINOR_VERSION;

-    rep.patchVersion = SERVER_XF86DRI_PATCH_VERSION;

-    if (client->swapped) {

-    	swaps(&rep.sequenceNumber, n);

-    	swapl(&rep.length, n);

-	swaps(&rep.majorVersion, n);

-	swaps(&rep.minorVersion, n);

-	swapl(&rep.patchVersion, n);

-    }

-    WriteToClient(client, sizeof(xXF86DRIQueryVersionReply), (char *)&rep);

-    return Success;

-}

-

-static int

-ProcXF86DRIQueryDirectRenderingCapable(

-    register ClientPtr client

-)

-{

-    xXF86DRIQueryDirectRenderingCapableReply	rep;

-    Bool isCapable;

-    register int n;

-

-    REQUEST(xXF86DRIQueryDirectRenderingCapableReq);

-    REQUEST_SIZE_MATCH(xXF86DRIQueryDirectRenderingCapableReq);

-    if (stuff->screen >= screenInfo.numScreens) {

-	client->errorValue = stuff->screen;

-	return BadValue;

-    }

-

-    rep.type = X_Reply;

-    rep.length = 0;

-    rep.sequenceNumber = client->sequence;

-

-    if (!DRIQueryDirectRenderingCapable( screenInfo.screens[stuff->screen], 

-					 &isCapable)) {

-	return BadValue;

-    }

-    rep.isCapable = isCapable;

-

-    if (!LocalClient(client) || client->swapped)

-	rep.isCapable = 0;

-

-    if (client->swapped) {

-    	swaps(&rep.sequenceNumber, n);

-    	swapl(&rep.length, n);

-    }

-

-    WriteToClient(client, 

-	sizeof(xXF86DRIQueryDirectRenderingCapableReply), (char *)&rep);

-    return Success;

-}

-

-static int

-ProcXF86DRIOpenConnection(

-    register ClientPtr client

-)

-{

-    xXF86DRIOpenConnectionReply rep;

-    drm_handle_t			hSAREA;

-    char*			busIdString;

-

-    REQUEST(xXF86DRIOpenConnectionReq);

-    REQUEST_SIZE_MATCH(xXF86DRIOpenConnectionReq);

-    if (stuff->screen >= screenInfo.numScreens) {

-	client->errorValue = stuff->screen;

-	return BadValue;

-    }

-

-    if (!DRIOpenConnection( screenInfo.screens[stuff->screen], 

-			    &hSAREA,

-			    &busIdString)) {

-	return BadValue;

-    }

-

-    rep.type = X_Reply;

-    rep.sequenceNumber = client->sequence;

-    rep.busIdStringLength = 0;

-    if (busIdString)

-	rep.busIdStringLength = strlen(busIdString);

-    rep.length = bytes_to_int32(SIZEOF(xXF86DRIOpenConnectionReply) - SIZEOF(xGenericReply) +

-                  pad_to_int32(rep.busIdStringLength));

-

-    rep.hSAREALow  = (CARD32)(hSAREA & 0xffffffff);

-#if defined(LONG64) && !defined(__linux__)

-    rep.hSAREAHigh = (CARD32)(hSAREA >> 32);

-#else

-    rep.hSAREAHigh = 0;

-#endif

-

-    WriteToClient(client, sizeof(xXF86DRIOpenConnectionReply), (char *)&rep);

-    if (rep.busIdStringLength)

-	WriteToClient(client, rep.busIdStringLength, busIdString);

-    return Success;

-}

-

-static int

-ProcXF86DRIAuthConnection(

-    register ClientPtr client

-)

-{

-    xXF86DRIAuthConnectionReply rep;

-    

-    REQUEST(xXF86DRIAuthConnectionReq);

-    REQUEST_SIZE_MATCH(xXF86DRIAuthConnectionReq);

-    if (stuff->screen >= screenInfo.numScreens) {

-	client->errorValue = stuff->screen;

-	return BadValue;

-    }

-

-    rep.type = X_Reply;

-    rep.length = 0;

-    rep.sequenceNumber = client->sequence;

-    rep.authenticated = 1;

-

-    if (!DRIAuthConnection( screenInfo.screens[stuff->screen], stuff->magic)) {

-        ErrorF("Failed to authenticate %lu\n", (unsigned long)stuff->magic);

-	rep.authenticated = 0;

-    }

-    WriteToClient(client, sizeof(xXF86DRIAuthConnectionReply), (char *)&rep);

-    return Success;

-}

-

-static int

-ProcXF86DRICloseConnection(

-    register ClientPtr client

-)

-{

-    REQUEST(xXF86DRICloseConnectionReq);

-    REQUEST_SIZE_MATCH(xXF86DRICloseConnectionReq);

-    if (stuff->screen >= screenInfo.numScreens) {

-	client->errorValue = stuff->screen;

-	return BadValue;

-    }

-

-    DRICloseConnection( screenInfo.screens[stuff->screen]);

-

-    return Success;

-}

-

-static int

-ProcXF86DRIGetClientDriverName(

-    register ClientPtr client

-)

-{

-    xXF86DRIGetClientDriverNameReply	rep;

-    char* clientDriverName;

-

-    REQUEST(xXF86DRIGetClientDriverNameReq);

-    REQUEST_SIZE_MATCH(xXF86DRIGetClientDriverNameReq);

-    if (stuff->screen >= screenInfo.numScreens) {

-	client->errorValue = stuff->screen;

-	return BadValue;

-    }

-

-    DRIGetClientDriverName( screenInfo.screens[stuff->screen],

-			    (int *)&rep.ddxDriverMajorVersion,

-			    (int *)&rep.ddxDriverMinorVersion,

-			    (int *)&rep.ddxDriverPatchVersion,

-			    &clientDriverName);

-

-    rep.type = X_Reply;

-    rep.sequenceNumber = client->sequence;

-    rep.clientDriverNameLength = 0;

-    if (clientDriverName)

-	rep.clientDriverNameLength = strlen(clientDriverName);

-    rep.length = bytes_to_int32(SIZEOF(xXF86DRIGetClientDriverNameReply) -

-			SIZEOF(xGenericReply) +

-			pad_to_int32(rep.clientDriverNameLength));

-

-    WriteToClient(client, 

-	sizeof(xXF86DRIGetClientDriverNameReply), (char *)&rep);

-    if (rep.clientDriverNameLength)

-	WriteToClient(client, 

-                      rep.clientDriverNameLength, 

-                      clientDriverName);

-    return Success;

-}

-

-static int

-ProcXF86DRICreateContext(

-    register ClientPtr client

-)

-{

-    xXF86DRICreateContextReply	rep;

-    ScreenPtr pScreen;

-

-    REQUEST(xXF86DRICreateContextReq);

-    REQUEST_SIZE_MATCH(xXF86DRICreateContextReq);

-    if (stuff->screen >= screenInfo.numScreens) {

-	client->errorValue = stuff->screen;

-	return BadValue;

-    }

-

-    rep.type = X_Reply;

-    rep.length = 0;

-    rep.sequenceNumber = client->sequence;

-

-    pScreen = screenInfo.screens[stuff->screen];

-

-    if (!DRICreateContext( pScreen,

-			   NULL,

-			   stuff->context,

-			   (drm_context_t *)&rep.hHWContext)) {

-	return BadValue;

-    }

-

-    WriteToClient(client, sizeof(xXF86DRICreateContextReply), (char *)&rep);

-    return Success;

-}

-

-static int

-ProcXF86DRIDestroyContext(

-    register ClientPtr client

-)

-{

-    REQUEST(xXF86DRIDestroyContextReq);

-    REQUEST_SIZE_MATCH(xXF86DRIDestroyContextReq);

-    if (stuff->screen >= screenInfo.numScreens) {

-	client->errorValue = stuff->screen;

-	return BadValue;

-    }

-

-    if (!DRIDestroyContext( screenInfo.screens[stuff->screen],

-			    stuff->context)) {

-	return BadValue;

-    }

-

-    return Success;

-}

-

-static int

-ProcXF86DRICreateDrawable(

-    ClientPtr client

-)

-{

-    xXF86DRICreateDrawableReply	rep;

-    DrawablePtr pDrawable;

-    int rc;

-

-    REQUEST(xXF86DRICreateDrawableReq);

-    REQUEST_SIZE_MATCH(xXF86DRICreateDrawableReq);

-    if (stuff->screen >= screenInfo.numScreens) {

-	client->errorValue = stuff->screen;

-	return BadValue;

-    }

-

-    rep.type = X_Reply;

-    rep.length = 0;

-    rep.sequenceNumber = client->sequence;

-

-    rc = dixLookupDrawable(&pDrawable, stuff->drawable, client, 0,

-			   DixReadAccess);

-    if (rc != Success)

-	return rc;

-

-    if (!DRICreateDrawable(screenInfo.screens[stuff->screen], client,

-			   pDrawable, (drm_drawable_t *)&rep.hHWDrawable)) {

-	return BadValue;

-    }

-

-    WriteToClient(client, sizeof(xXF86DRICreateDrawableReply), (char *)&rep);

-    return Success;

-}

-

-static int

-ProcXF86DRIDestroyDrawable(

-    register ClientPtr client

-)

-{

-    REQUEST(xXF86DRIDestroyDrawableReq);

-    DrawablePtr pDrawable;

-    int rc;

-    REQUEST_SIZE_MATCH(xXF86DRIDestroyDrawableReq);

-

-    if (stuff->screen >= screenInfo.numScreens) {

-	client->errorValue = stuff->screen;

-	return BadValue;

-    }

-

-    rc = dixLookupDrawable(&pDrawable, stuff->drawable, client, 0,

-			   DixReadAccess);

-    if (rc != Success)

-	return rc;

-

-    if (!DRIDestroyDrawable(screenInfo.screens[stuff->screen], client,

-			    pDrawable)) {

-	return BadValue;

-    }

-

-    return Success;

-}

-

-static int

-ProcXF86DRIGetDrawableInfo(

-    register ClientPtr client

-)

-{

-    xXF86DRIGetDrawableInfoReply	rep;

-    DrawablePtr pDrawable;

-    int X, Y, W, H;

-    drm_clip_rect_t * pClipRects, *pClippedRects;

-    drm_clip_rect_t * pBackClipRects;

-    int backX, backY, rc;

-

-    REQUEST(xXF86DRIGetDrawableInfoReq);

-    REQUEST_SIZE_MATCH(xXF86DRIGetDrawableInfoReq);

-    if (stuff->screen >= screenInfo.numScreens) {

-	client->errorValue = stuff->screen;

-	return BadValue;

-    }

-

-    rep.type = X_Reply;

-    rep.length = 0;

-    rep.sequenceNumber = client->sequence;

-

-    rc = dixLookupDrawable(&pDrawable, stuff->drawable, client, 0,

-			   DixReadAccess);

-    if (rc != Success)

-	return rc;

-

-    if (!DRIGetDrawableInfo( screenInfo.screens[stuff->screen],

-			     pDrawable,

-			     (unsigned int*)&rep.drawableTableIndex,

-			     (unsigned int*)&rep.drawableTableStamp,

-			     (int*)&X,

-			     (int*)&Y,

-			     (int*)&W,

-			     (int*)&H,

-			     (int*)&rep.numClipRects,

-			     &pClipRects,

-			     &backX, 

-			     &backY,

-			     (int*)&rep.numBackClipRects,

-			     &pBackClipRects)) {

-	return BadValue;

-    }

-

-    rep.drawableX = X;

-    rep.drawableY = Y;

-    rep.drawableWidth = W;

-    rep.drawableHeight = H;

-    rep.length = (SIZEOF(xXF86DRIGetDrawableInfoReply) - 

-		  SIZEOF(xGenericReply));

-

-    rep.backX = backX;

-    rep.backY = backY;

-        

-    if (rep.numBackClipRects) 

-       rep.length += sizeof(drm_clip_rect_t) * rep.numBackClipRects;    

-

-    pClippedRects = pClipRects;

-

-    if (rep.numClipRects) {

-       /* Clip cliprects to screen dimensions (redirected windows) */

-       pClippedRects = malloc(rep.numClipRects * sizeof(drm_clip_rect_t));

-

-       if (pClippedRects) {

-	    ScreenPtr pScreen = screenInfo.screens[stuff->screen];

-	    int i, j;

-

-	    for (i = 0, j = 0; i < rep.numClipRects; i++) {

-		pClippedRects[j].x1 = max(pClipRects[i].x1, 0);

-		pClippedRects[j].y1 = max(pClipRects[i].y1, 0);

-		pClippedRects[j].x2 = min(pClipRects[i].x2, pScreen->width);

-		pClippedRects[j].y2 = min(pClipRects[i].y2, pScreen->height);

-

-		if (pClippedRects[j].x1 < pClippedRects[j].x2 &&

-		    pClippedRects[j].y1 < pClippedRects[j].y2) {

-		    j++;

-		}

-	    }

-

-	    rep.numClipRects = j;

-       } else {

-	    rep.numClipRects = 0;

-       }

-

-       rep.length += sizeof(drm_clip_rect_t) * rep.numClipRects;

-    }

-    

-    rep.length = bytes_to_int32(rep.length);

-

-    WriteToClient(client, sizeof(xXF86DRIGetDrawableInfoReply), (char *)&rep);

-

-    if (rep.numClipRects) {

-	WriteToClient(client,  

-		      sizeof(drm_clip_rect_t) * rep.numClipRects,

-		      (char *)pClippedRects);

-	free(pClippedRects);

-    }

-

-    if (rep.numBackClipRects) {

-       WriteToClient(client, 

-		     sizeof(drm_clip_rect_t) * rep.numBackClipRects,

-		     (char *)pBackClipRects);

-    }

-

-    return Success;

-}

-

-static int

-ProcXF86DRIGetDeviceInfo(

-    register ClientPtr client

-)

-{

-    xXF86DRIGetDeviceInfoReply	rep;

-    drm_handle_t hFrameBuffer;

-    void *pDevPrivate;

-

-    REQUEST(xXF86DRIGetDeviceInfoReq);

-    REQUEST_SIZE_MATCH(xXF86DRIGetDeviceInfoReq);

-    if (stuff->screen >= screenInfo.numScreens) {

-	client->errorValue = stuff->screen;

-	return BadValue;

-    }

-

-    rep.type = X_Reply;

-    rep.length = 0;

-    rep.sequenceNumber = client->sequence;

-

-    if (!DRIGetDeviceInfo( screenInfo.screens[stuff->screen],

-			   &hFrameBuffer,

-			   (int*)&rep.framebufferOrigin,

-			   (int*)&rep.framebufferSize,

-			   (int*)&rep.framebufferStride,

-			   (int*)&rep.devPrivateSize,

-			   &pDevPrivate)) {

-	return BadValue;

-    }

-

-    rep.hFrameBufferLow  = (CARD32)(hFrameBuffer & 0xffffffff);

-#if defined(LONG64) && !defined(__linux__)

-    rep.hFrameBufferHigh = (CARD32)(hFrameBuffer >> 32);

-#else

-    rep.hFrameBufferHigh = 0;

-#endif

-

-    rep.length = 0;

-    if (rep.devPrivateSize) {

-	rep.length = bytes_to_int32(SIZEOF(xXF86DRIGetDeviceInfoReply) -

-		      SIZEOF(xGenericReply) +

-		      pad_to_int32(rep.devPrivateSize));

-    }

-

-    WriteToClient(client, sizeof(xXF86DRIGetDeviceInfoReply), (char *)&rep);

-    if (rep.length) {

-	WriteToClient(client, rep.devPrivateSize, (char *)pDevPrivate);

-    }

-    return Success;

-}

-

-static int

-ProcXF86DRIDispatch (

-    register ClientPtr	client

-)

-{

-    REQUEST(xReq);

-

-    switch (stuff->data)

-    {

-    case X_XF86DRIQueryVersion:

-	return ProcXF86DRIQueryVersion(client);

-    case X_XF86DRIQueryDirectRenderingCapable:

-	return ProcXF86DRIQueryDirectRenderingCapable(client);

-    }

-

-    if (!LocalClient(client))

-	return DRIErrorBase + XF86DRIClientNotLocal;

-

-    switch (stuff->data)

-    {

-    case X_XF86DRIOpenConnection:

-	return ProcXF86DRIOpenConnection(client);

-    case X_XF86DRICloseConnection:

-	return ProcXF86DRICloseConnection(client);

-    case X_XF86DRIGetClientDriverName:

-	return ProcXF86DRIGetClientDriverName(client);

-    case X_XF86DRICreateContext:

-	return ProcXF86DRICreateContext(client);

-    case X_XF86DRIDestroyContext:

-	return ProcXF86DRIDestroyContext(client);

-    case X_XF86DRICreateDrawable:

-	return ProcXF86DRICreateDrawable(client);

-    case X_XF86DRIDestroyDrawable:

-	return ProcXF86DRIDestroyDrawable(client);

-    case X_XF86DRIGetDrawableInfo:

-	return ProcXF86DRIGetDrawableInfo(client);

-    case X_XF86DRIGetDeviceInfo:

-	return ProcXF86DRIGetDeviceInfo(client);

-    case X_XF86DRIAuthConnection:

-	return ProcXF86DRIAuthConnection(client);

-    /* {Open,Close}FullScreen are deprecated now */

-    default:

-	return BadRequest;

-    }

-}

-

-static int

-SProcXF86DRIQueryVersion(

-    register ClientPtr	client

-)

-{

-    register int n;

-    REQUEST(xXF86DRIQueryVersionReq);

-    swaps(&stuff->length, n);

-    return ProcXF86DRIQueryVersion(client);

-}

-

-static int

-SProcXF86DRIQueryDirectRenderingCapable(

-    register ClientPtr client

-)

-{

-    register int n;

-    REQUEST(xXF86DRIQueryDirectRenderingCapableReq);

-    swaps(&stuff->length, n);

-    swapl(&stuff->screen, n);

-    return ProcXF86DRIQueryDirectRenderingCapable(client);

-}

-

-static int

-SProcXF86DRIDispatch (

-    register ClientPtr	client

-)

-{

-    REQUEST(xReq);

-

-    /*

-     * Only local clients are allowed DRI access, but remote clients still need

-     * these requests to find out cleanly.

-     */

-    switch (stuff->data)

-    {

-    case X_XF86DRIQueryVersion:

-	return SProcXF86DRIQueryVersion(client);

-    case X_XF86DRIQueryDirectRenderingCapable:

-	return SProcXF86DRIQueryDirectRenderingCapable(client);

-    default:

-	return DRIErrorBase + XF86DRIClientNotLocal;

-    }

-}

-

-void

-XFree86DRIExtensionInit(void)

-{

-    ExtensionEntry* extEntry;

-

-#ifdef XF86DRI_EVENTS

-    EventType = CreateNewResourceType(XF86DRIFreeEvents, "DRIEvent");

-#endif

-

-    if (

-	DRIExtensionInit() &&

-#ifdef XF86DRI_EVENTS

-        EventType && ScreenPrivateIndex != -1 &&

-#endif

-	(extEntry = AddExtension(XF86DRINAME,

-				 XF86DRINumberEvents,

-				 XF86DRINumberErrors,

-				 ProcXF86DRIDispatch,

-				 SProcXF86DRIDispatch,

-				 XF86DRIResetProc,

-				 StandardMinorOpcode))) {

-	DRIReqCode = (unsigned char)extEntry->base;

-	DRIErrorBase = extEntry->errorBase;

-    }

-}

+/**************************************************************************
+
+Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+Copyright 2000 VA Linux Systems, 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, sub license, 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 (including the
+next paragraph) 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 NON-INFRINGEMENT.
+IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Kevin E. Martin <martin@valinux.com>
+ *   Jens Owen <jens@tungstengraphics.com>
+ *   Rickard E. (Rik) Faith <faith@valinux.com>
+ *
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <string.h>
+
+#include "xf86.h"
+
+#include <X11/X.h>
+#include <X11/Xproto.h>
+#include "misc.h"
+#include "dixstruct.h"
+#include "extnsionst.h"
+#include "colormapst.h"
+#include "cursorstr.h"
+#include "scrnintstr.h"
+#include "servermd.h"
+#define _XF86DRI_SERVER_
+#include <X11/dri/xf86driproto.h>
+#include "swaprep.h"
+#include "xf86str.h"
+#include "dri.h"
+#include "sarea.h"
+#include "dristruct.h"
+#include "xf86drm.h"
+#include "protocol-versions.h"
+
+static int DRIErrorBase;
+
+
+
+static void XF86DRIResetProc(ExtensionEntry* extEntry);
+
+static unsigned char DRIReqCode = 0;
+
+extern void XFree86DRIExtensionInit(void);
+
+/*ARGSUSED*/
+static void
+XF86DRIResetProc (
+    ExtensionEntry* extEntry
+)
+{
+    DRIReset();
+}
+
+static int
+ProcXF86DRIQueryVersion(
+    register ClientPtr client
+)
+{
+    xXF86DRIQueryVersionReply rep;
+    register int n;
+
+    REQUEST_SIZE_MATCH(xXF86DRIQueryVersionReq);
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+    rep.majorVersion = SERVER_XF86DRI_MAJOR_VERSION;
+    rep.minorVersion = SERVER_XF86DRI_MINOR_VERSION;
+    rep.patchVersion = SERVER_XF86DRI_PATCH_VERSION;
+    if (client->swapped) {
+    	swaps(&rep.sequenceNumber, n);
+    	swapl(&rep.length, n);
+	swaps(&rep.majorVersion, n);
+	swaps(&rep.minorVersion, n);
+	swapl(&rep.patchVersion, n);
+    }
+    WriteToClient(client, sizeof(xXF86DRIQueryVersionReply), (char *)&rep);
+    return Success;
+}
+
+static int
+ProcXF86DRIQueryDirectRenderingCapable(
+    register ClientPtr client
+)
+{
+    xXF86DRIQueryDirectRenderingCapableReply	rep;
+    Bool isCapable;
+    register int n;
+
+    REQUEST(xXF86DRIQueryDirectRenderingCapableReq);
+    REQUEST_SIZE_MATCH(xXF86DRIQueryDirectRenderingCapableReq);
+    if (stuff->screen >= screenInfo.numScreens) {
+	client->errorValue = stuff->screen;
+	return BadValue;
+    }
+
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+
+    if (!DRIQueryDirectRenderingCapable( screenInfo.screens[stuff->screen], 
+					 &isCapable)) {
+	return BadValue;
+    }
+    rep.isCapable = isCapable;
+
+    if (!LocalClient(client) || client->swapped)
+	rep.isCapable = 0;
+
+    if (client->swapped) {
+    	swaps(&rep.sequenceNumber, n);
+    	swapl(&rep.length, n);
+    }
+
+    WriteToClient(client, 
+	sizeof(xXF86DRIQueryDirectRenderingCapableReply), (char *)&rep);
+    return Success;
+}
+
+static int
+ProcXF86DRIOpenConnection(
+    register ClientPtr client
+)
+{
+    xXF86DRIOpenConnectionReply rep;
+    drm_handle_t			hSAREA;
+    char*			busIdString;
+
+    REQUEST(xXF86DRIOpenConnectionReq);
+    REQUEST_SIZE_MATCH(xXF86DRIOpenConnectionReq);
+    if (stuff->screen >= screenInfo.numScreens) {
+	client->errorValue = stuff->screen;
+	return BadValue;
+    }
+
+    if (!DRIOpenConnection( screenInfo.screens[stuff->screen], 
+			    &hSAREA,
+			    &busIdString)) {
+	return BadValue;
+    }
+
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.busIdStringLength = 0;
+    if (busIdString)
+	rep.busIdStringLength = strlen(busIdString);
+    rep.length = bytes_to_int32(SIZEOF(xXF86DRIOpenConnectionReply) - SIZEOF(xGenericReply) +
+                  pad_to_int32(rep.busIdStringLength));
+
+    rep.hSAREALow  = (CARD32)(hSAREA & 0xffffffff);
+#if defined(LONG64) && !defined(__linux__)
+    rep.hSAREAHigh = (CARD32)(hSAREA >> 32);
+#else
+    rep.hSAREAHigh = 0;
+#endif
+
+    WriteToClient(client, sizeof(xXF86DRIOpenConnectionReply), (char *)&rep);
+    if (rep.busIdStringLength)
+	WriteToClient(client, rep.busIdStringLength, busIdString);
+    return Success;
+}
+
+static int
+ProcXF86DRIAuthConnection(
+    register ClientPtr client
+)
+{
+    xXF86DRIAuthConnectionReply rep;
+    
+    REQUEST(xXF86DRIAuthConnectionReq);
+    REQUEST_SIZE_MATCH(xXF86DRIAuthConnectionReq);
+    if (stuff->screen >= screenInfo.numScreens) {
+	client->errorValue = stuff->screen;
+	return BadValue;
+    }
+
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+    rep.authenticated = 1;
+
+    if (!DRIAuthConnection( screenInfo.screens[stuff->screen], stuff->magic)) {
+        ErrorF("Failed to authenticate %lu\n", (unsigned long)stuff->magic);
+	rep.authenticated = 0;
+    }
+    WriteToClient(client, sizeof(xXF86DRIAuthConnectionReply), (char *)&rep);
+    return Success;
+}
+
+static int
+ProcXF86DRICloseConnection(
+    register ClientPtr client
+)
+{
+    REQUEST(xXF86DRICloseConnectionReq);
+    REQUEST_SIZE_MATCH(xXF86DRICloseConnectionReq);
+    if (stuff->screen >= screenInfo.numScreens) {
+	client->errorValue = stuff->screen;
+	return BadValue;
+    }
+
+    DRICloseConnection( screenInfo.screens[stuff->screen]);
+
+    return Success;
+}
+
+static int
+ProcXF86DRIGetClientDriverName(
+    register ClientPtr client
+)
+{
+    xXF86DRIGetClientDriverNameReply	rep;
+    char* clientDriverName;
+
+    REQUEST(xXF86DRIGetClientDriverNameReq);
+    REQUEST_SIZE_MATCH(xXF86DRIGetClientDriverNameReq);
+    if (stuff->screen >= screenInfo.numScreens) {
+	client->errorValue = stuff->screen;
+	return BadValue;
+    }
+
+    DRIGetClientDriverName( screenInfo.screens[stuff->screen],
+			    (int *)&rep.ddxDriverMajorVersion,
+			    (int *)&rep.ddxDriverMinorVersion,
+			    (int *)&rep.ddxDriverPatchVersion,
+			    &clientDriverName);
+
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.clientDriverNameLength = 0;
+    if (clientDriverName)
+	rep.clientDriverNameLength = strlen(clientDriverName);
+    rep.length = bytes_to_int32(SIZEOF(xXF86DRIGetClientDriverNameReply) -
+			SIZEOF(xGenericReply) +
+			pad_to_int32(rep.clientDriverNameLength));
+
+    WriteToClient(client, 
+	sizeof(xXF86DRIGetClientDriverNameReply), (char *)&rep);
+    if (rep.clientDriverNameLength)
+	WriteToClient(client, 
+                      rep.clientDriverNameLength, 
+                      clientDriverName);
+    return Success;
+}
+
+static int
+ProcXF86DRICreateContext(
+    register ClientPtr client
+)
+{
+    xXF86DRICreateContextReply	rep;
+    ScreenPtr pScreen;
+
+    REQUEST(xXF86DRICreateContextReq);
+    REQUEST_SIZE_MATCH(xXF86DRICreateContextReq);
+    if (stuff->screen >= screenInfo.numScreens) {
+	client->errorValue = stuff->screen;
+	return BadValue;
+    }
+
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+
+    pScreen = screenInfo.screens[stuff->screen];
+
+    if (!DRICreateContext( pScreen,
+			   NULL,
+			   stuff->context,
+			   (drm_context_t *)&rep.hHWContext)) {
+	return BadValue;
+    }
+
+    WriteToClient(client, sizeof(xXF86DRICreateContextReply), (char *)&rep);
+    return Success;
+}
+
+static int
+ProcXF86DRIDestroyContext(
+    register ClientPtr client
+)
+{
+    REQUEST(xXF86DRIDestroyContextReq);
+    REQUEST_SIZE_MATCH(xXF86DRIDestroyContextReq);
+    if (stuff->screen >= screenInfo.numScreens) {
+	client->errorValue = stuff->screen;
+	return BadValue;
+    }
+
+    if (!DRIDestroyContext( screenInfo.screens[stuff->screen],
+			    stuff->context)) {
+	return BadValue;
+    }
+
+    return Success;
+}
+
+static int
+ProcXF86DRICreateDrawable(
+    ClientPtr client
+)
+{
+    xXF86DRICreateDrawableReply	rep;
+    DrawablePtr pDrawable;
+    int rc;
+
+    REQUEST(xXF86DRICreateDrawableReq);
+    REQUEST_SIZE_MATCH(xXF86DRICreateDrawableReq);
+    if (stuff->screen >= screenInfo.numScreens) {
+	client->errorValue = stuff->screen;
+	return BadValue;
+    }
+
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+
+    rc = dixLookupDrawable(&pDrawable, stuff->drawable, client, 0,
+			   DixReadAccess);
+    if (rc != Success)
+	return rc;
+
+    if (!DRICreateDrawable(screenInfo.screens[stuff->screen], client,
+			   pDrawable, (drm_drawable_t *)&rep.hHWDrawable)) {
+	return BadValue;
+    }
+
+    WriteToClient(client, sizeof(xXF86DRICreateDrawableReply), (char *)&rep);
+    return Success;
+}
+
+static int
+ProcXF86DRIDestroyDrawable(
+    register ClientPtr client
+)
+{
+    REQUEST(xXF86DRIDestroyDrawableReq);
+    DrawablePtr pDrawable;
+    int rc;
+    REQUEST_SIZE_MATCH(xXF86DRIDestroyDrawableReq);
+
+    if (stuff->screen >= screenInfo.numScreens) {
+	client->errorValue = stuff->screen;
+	return BadValue;
+    }
+
+    rc = dixLookupDrawable(&pDrawable, stuff->drawable, client, 0,
+			   DixReadAccess);
+    if (rc != Success)
+	return rc;
+
+    if (!DRIDestroyDrawable(screenInfo.screens[stuff->screen], client,
+			    pDrawable)) {
+	return BadValue;
+    }
+
+    return Success;
+}
+
+static int
+ProcXF86DRIGetDrawableInfo(
+    register ClientPtr client
+)
+{
+    xXF86DRIGetDrawableInfoReply	rep;
+    DrawablePtr pDrawable;
+    int X, Y, W, H;
+    drm_clip_rect_t * pClipRects, *pClippedRects;
+    drm_clip_rect_t * pBackClipRects;
+    int backX, backY, rc;
+
+    REQUEST(xXF86DRIGetDrawableInfoReq);
+    REQUEST_SIZE_MATCH(xXF86DRIGetDrawableInfoReq);
+    if (stuff->screen >= screenInfo.numScreens) {
+	client->errorValue = stuff->screen;
+	return BadValue;
+    }
+
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+
+    rc = dixLookupDrawable(&pDrawable, stuff->drawable, client, 0,
+			   DixReadAccess);
+    if (rc != Success)
+	return rc;
+
+    if (!DRIGetDrawableInfo( screenInfo.screens[stuff->screen],
+			     pDrawable,
+			     (unsigned int*)&rep.drawableTableIndex,
+			     (unsigned int*)&rep.drawableTableStamp,
+			     (int*)&X,
+			     (int*)&Y,
+			     (int*)&W,
+			     (int*)&H,
+			     (int*)&rep.numClipRects,
+			     &pClipRects,
+			     &backX, 
+			     &backY,
+			     (int*)&rep.numBackClipRects,
+			     &pBackClipRects)) {
+	return BadValue;
+    }
+
+    rep.drawableX = X;
+    rep.drawableY = Y;
+    rep.drawableWidth = W;
+    rep.drawableHeight = H;
+    rep.length = (SIZEOF(xXF86DRIGetDrawableInfoReply) - 
+		  SIZEOF(xGenericReply));
+
+    rep.backX = backX;
+    rep.backY = backY;
+        
+    if (rep.numBackClipRects) 
+       rep.length += sizeof(drm_clip_rect_t) * rep.numBackClipRects;    
+
+    pClippedRects = pClipRects;
+
+    if (rep.numClipRects) {
+       /* Clip cliprects to screen dimensions (redirected windows) */
+       pClippedRects = malloc(rep.numClipRects * sizeof(drm_clip_rect_t));
+
+       if (pClippedRects) {
+	    ScreenPtr pScreen = screenInfo.screens[stuff->screen];
+	    int i, j;
+
+	    for (i = 0, j = 0; i < rep.numClipRects; i++) {
+		pClippedRects[j].x1 = max(pClipRects[i].x1, 0);
+		pClippedRects[j].y1 = max(pClipRects[i].y1, 0);
+		pClippedRects[j].x2 = min(pClipRects[i].x2, pScreen->width);
+		pClippedRects[j].y2 = min(pClipRects[i].y2, pScreen->height);
+
+		if (pClippedRects[j].x1 < pClippedRects[j].x2 &&
+		    pClippedRects[j].y1 < pClippedRects[j].y2) {
+		    j++;
+		}
+	    }
+
+	    rep.numClipRects = j;
+       } else {
+	    rep.numClipRects = 0;
+       }
+
+       rep.length += sizeof(drm_clip_rect_t) * rep.numClipRects;
+    }
+    
+    rep.length = bytes_to_int32(rep.length);
+
+    WriteToClient(client, sizeof(xXF86DRIGetDrawableInfoReply), (char *)&rep);
+
+    if (rep.numClipRects) {
+	WriteToClient(client,  
+		      sizeof(drm_clip_rect_t) * rep.numClipRects,
+		      (char *)pClippedRects);
+	free(pClippedRects);
+    }
+
+    if (rep.numBackClipRects) {
+       WriteToClient(client, 
+		     sizeof(drm_clip_rect_t) * rep.numBackClipRects,
+		     (char *)pBackClipRects);
+    }
+
+    return Success;
+}
+
+static int
+ProcXF86DRIGetDeviceInfo(
+    register ClientPtr client
+)
+{
+    xXF86DRIGetDeviceInfoReply	rep;
+    drm_handle_t hFrameBuffer;
+    void *pDevPrivate;
+
+    REQUEST(xXF86DRIGetDeviceInfoReq);
+    REQUEST_SIZE_MATCH(xXF86DRIGetDeviceInfoReq);
+    if (stuff->screen >= screenInfo.numScreens) {
+	client->errorValue = stuff->screen;
+	return BadValue;
+    }
+
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+
+    if (!DRIGetDeviceInfo( screenInfo.screens[stuff->screen],
+			   &hFrameBuffer,
+			   (int*)&rep.framebufferOrigin,
+			   (int*)&rep.framebufferSize,
+			   (int*)&rep.framebufferStride,
+			   (int*)&rep.devPrivateSize,
+			   &pDevPrivate)) {
+	return BadValue;
+    }
+
+    rep.hFrameBufferLow  = (CARD32)(hFrameBuffer & 0xffffffff);
+#if defined(LONG64) && !defined(__linux__)
+    rep.hFrameBufferHigh = (CARD32)(hFrameBuffer >> 32);
+#else
+    rep.hFrameBufferHigh = 0;
+#endif
+
+    rep.length = 0;
+    if (rep.devPrivateSize) {
+	rep.length = bytes_to_int32(SIZEOF(xXF86DRIGetDeviceInfoReply) -
+		      SIZEOF(xGenericReply) +
+		      pad_to_int32(rep.devPrivateSize));
+    }
+
+    WriteToClient(client, sizeof(xXF86DRIGetDeviceInfoReply), (char *)&rep);
+    if (rep.length) {
+	WriteToClient(client, rep.devPrivateSize, (char *)pDevPrivate);
+    }
+    return Success;
+}
+
+static int
+ProcXF86DRIDispatch (
+    register ClientPtr	client
+)
+{
+    REQUEST(xReq);
+
+    switch (stuff->data)
+    {
+    case X_XF86DRIQueryVersion:
+	return ProcXF86DRIQueryVersion(client);
+    case X_XF86DRIQueryDirectRenderingCapable:
+	return ProcXF86DRIQueryDirectRenderingCapable(client);
+    }
+
+    if (!LocalClient(client))
+	return DRIErrorBase + XF86DRIClientNotLocal;
+
+    switch (stuff->data)
+    {
+    case X_XF86DRIOpenConnection:
+	return ProcXF86DRIOpenConnection(client);
+    case X_XF86DRICloseConnection:
+	return ProcXF86DRICloseConnection(client);
+    case X_XF86DRIGetClientDriverName:
+	return ProcXF86DRIGetClientDriverName(client);
+    case X_XF86DRICreateContext:
+	return ProcXF86DRICreateContext(client);
+    case X_XF86DRIDestroyContext:
+	return ProcXF86DRIDestroyContext(client);
+    case X_XF86DRICreateDrawable:
+	return ProcXF86DRICreateDrawable(client);
+    case X_XF86DRIDestroyDrawable:
+	return ProcXF86DRIDestroyDrawable(client);
+    case X_XF86DRIGetDrawableInfo:
+	return ProcXF86DRIGetDrawableInfo(client);
+    case X_XF86DRIGetDeviceInfo:
+	return ProcXF86DRIGetDeviceInfo(client);
+    case X_XF86DRIAuthConnection:
+	return ProcXF86DRIAuthConnection(client);
+    /* {Open,Close}FullScreen are deprecated now */
+    default:
+	return BadRequest;
+    }
+}
+
+static int
+SProcXF86DRIQueryVersion(
+    register ClientPtr	client
+)
+{
+    register int n;
+    REQUEST(xXF86DRIQueryVersionReq);
+    swaps(&stuff->length, n);
+    return ProcXF86DRIQueryVersion(client);
+}
+
+static int
+SProcXF86DRIQueryDirectRenderingCapable(
+    register ClientPtr client
+)
+{
+    register int n;
+    REQUEST(xXF86DRIQueryDirectRenderingCapableReq);
+    swaps(&stuff->length, n);
+    swapl(&stuff->screen, n);
+    return ProcXF86DRIQueryDirectRenderingCapable(client);
+}
+
+static int
+SProcXF86DRIDispatch (
+    register ClientPtr	client
+)
+{
+    REQUEST(xReq);
+
+    /*
+     * Only local clients are allowed DRI access, but remote clients still need
+     * these requests to find out cleanly.
+     */
+    switch (stuff->data)
+    {
+    case X_XF86DRIQueryVersion:
+	return SProcXF86DRIQueryVersion(client);
+    case X_XF86DRIQueryDirectRenderingCapable:
+	return SProcXF86DRIQueryDirectRenderingCapable(client);
+    default:
+	return DRIErrorBase + XF86DRIClientNotLocal;
+    }
+}
+
+void
+XFree86DRIExtensionInit(void)
+{
+    ExtensionEntry* extEntry;
+
+#ifdef XF86DRI_EVENTS
+    EventType = CreateNewResourceType(XF86DRIFreeEvents, "DRIEvent");
+#endif
+
+    if (
+	DRIExtensionInit() &&
+#ifdef XF86DRI_EVENTS
+        EventType && ScreenPrivateIndex != -1 &&
+#endif
+	(extEntry = AddExtension(XF86DRINAME,
+				 XF86DRINumberEvents,
+				 XF86DRINumberErrors,
+				 ProcXF86DRIDispatch,
+				 SProcXF86DRIDispatch,
+				 XF86DRIResetProc,
+				 StandardMinorOpcode))) {
+	DRIReqCode = (unsigned char)extEntry->base;
+	DRIErrorBase = extEntry->errorBase;
+    }
+}