libxtrans libX11 libX11 libXext mesa xserver git update 22 sep 2011

3 files changed, 883 insertions, 896 deletions

diff --git a/xorg-server/hw/xquartz/applewm.c b/xorg-server/hw/xquartz/applewm.c
index 2f26e61d9..27fb125d3 100644
--- a/xorg-server/hw/xquartz/applewm.c
+++ b/xorg-server/hw/xquartz/applewm.c
@@ -147,7 +147,6 @@ ProcAppleWMQueryVersion(
 )
 {
     xAppleWMQueryVersionReply rep;
-    register int n;
 
     REQUEST_SIZE_MATCH(xAppleWMQueryVersionReq);
     rep.type = X_Reply;
@@ -157,8 +156,8 @@ ProcAppleWMQueryVersion(
     rep.minorVersion = SERVER_APPLEWM_MINOR_VERSION;
     rep.patchVersion = SERVER_APPLEWM_PATCH_VERSION;
     if (client->swapped) {
-        swaps(&rep.sequenceNumber, n);
-        swapl(&rep.length, n);
+        swaps(&rep.sequenceNumber);
+        swapl(&rep.length);
     }
     WriteToClient(client, sizeof(xAppleWMQueryVersionReply), (char *)&rep);
     return Success;
@@ -681,9 +680,8 @@ SProcAppleWMQueryVersion(
     register ClientPtr  client
 )
 {
-    register int n;
     REQUEST(xAppleWMQueryVersionReq);
-    swaps(&stuff->length, n);
+    swaps(&stuff->length);
     return ProcAppleWMQueryVersion(client);
 }
 
diff --git a/xorg-server/hw/xquartz/pseudoramiX.c b/xorg-server/hw/xquartz/pseudoramiX.c
index ded242d07..5a5b9c2e7 100644
--- a/xorg-server/hw/xquartz/pseudoramiX.c
+++ b/xorg-server/hw/xquartz/pseudoramiX.c
@@ -1,471 +1,462 @@
-/*

- * Minimal implementation of PanoramiX/Xinerama

- *

- * This is used in rootless mode where the underlying window server

- * already provides an abstracted view of multiple screens as one

- * large screen area.

- *

- * This code is largely based on panoramiX.c, which contains the

- * following copyright notice:

- */

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

-Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.

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

-

-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

-DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,

-BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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 Digital Equipment Corporation

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

-dealings in this Software without prior written authorization from Digital

-Equipment Corporation.

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

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include "darwin.h"

-#include "pseudoramiX.h"

-#include "extnsionst.h"

-#include "dixstruct.h"

-#include "window.h"

-#include <X11/extensions/panoramiXproto.h>

-#include "globals.h"

-

-Bool noPseudoramiXExtension = FALSE;

-

-extern int ProcPanoramiXQueryVersion (ClientPtr client);

-

-static void PseudoramiXResetProc(ExtensionEntry *extEntry);

-

-static int ProcPseudoramiXQueryVersion(ClientPtr client);

-static int ProcPseudoramiXGetState(ClientPtr client);

-static int ProcPseudoramiXGetScreenCount(ClientPtr client);

-static int ProcPseudoramiXGetScreenSize(ClientPtr client);

-static int ProcPseudoramiXIsActive(ClientPtr client);

-static int ProcPseudoramiXQueryScreens(ClientPtr client);

-static int ProcPseudoramiXDispatch(ClientPtr client);

-

-static int SProcPseudoramiXQueryVersion(ClientPtr client);

-static int SProcPseudoramiXGetState(ClientPtr client);

-static int SProcPseudoramiXGetScreenCount(ClientPtr client);

-static int SProcPseudoramiXGetScreenSize(ClientPtr client);

-static int SProcPseudoramiXIsActive(ClientPtr client);

-static int SProcPseudoramiXQueryScreens(ClientPtr client);

-static int SProcPseudoramiXDispatch(ClientPtr client);

-

-

-typedef struct {

-    int x;

-    int y;

-    int w;

-    int h;

-} PseudoramiXScreenRec;

-

-static PseudoramiXScreenRec *pseudoramiXScreens = NULL;

-static int pseudoramiXScreensAllocated = 0;

-static int pseudoramiXNumScreens = 0;

-static unsigned long pseudoramiXGeneration = 0;

-

-

-// Add a PseudoramiX screen.

-// The rest of the X server will know nothing about this screen.

-// Can be called before or after extension init.

-// Screens must be re-added once per generation.

-void

-PseudoramiXAddScreen(int x, int y, int w, int h)

-{

-    PseudoramiXScreenRec *s;

-

-    if (noPseudoramiXExtension) return;

-

-    if (pseudoramiXNumScreens == pseudoramiXScreensAllocated) {

-        pseudoramiXScreensAllocated += pseudoramiXScreensAllocated + 1;

-        pseudoramiXScreens = realloc(pseudoramiXScreens,

-                                      pseudoramiXScreensAllocated *

-                                      sizeof(PseudoramiXScreenRec));

-    }

-

-    DEBUG_LOG("x: %d, y: %d, w: %d, h: %d\n", x, y, w, h);

-

-    s = &pseudoramiXScreens[pseudoramiXNumScreens++];

-    s->x = x;

-    s->y = y;

-    s->w = w;

-    s->h = h;

-}

-

-

-// Initialize PseudoramiX.

-// Copied from PanoramiXExtensionInit

-void PseudoramiXExtensionInit(int argc, char *argv[])

-{

-    Bool	     	success = FALSE;

-    ExtensionEntry 	*extEntry;

-

-    if (noPseudoramiXExtension) return;

-

-    TRACE();

-

-    /* Even with only one screen we need to enable PseudoramiX to allow

-       dynamic screen configuration changes. */

-#if 0

-    if (pseudoramiXNumScreens == 1) {

-        // Only one screen - disable Xinerama extension.

-        noPseudoramiXExtension = TRUE;

-        return;

-    }

-#endif

-

-    if (pseudoramiXGeneration != serverGeneration) {

-        extEntry = AddExtension(PANORAMIX_PROTOCOL_NAME, 0, 0,

-                                ProcPseudoramiXDispatch,

-                                SProcPseudoramiXDispatch,

-                                PseudoramiXResetProc,

-                                StandardMinorOpcode);

-        if (!extEntry) {

-            ErrorF("PseudoramiXExtensionInit(): AddExtension failed\n");

-        } else {

-            pseudoramiXGeneration = serverGeneration;

-            success = TRUE;

-        }

-    }

-

-    if (!success) {

-        ErrorF("%s Extension (PseudoramiX) failed to initialize\n",

-               PANORAMIX_PROTOCOL_NAME);

-        return;

-    }

-}

-

-

-void PseudoramiXResetScreens(void)

-{

-    TRACE();

-

-    pseudoramiXNumScreens = 0;

-}

-

-

-static void PseudoramiXResetProc(ExtensionEntry *extEntry)

-{

-    TRACE();

-

-    PseudoramiXResetScreens();

-}

-

-

-// was PanoramiX

-static int ProcPseudoramiXQueryVersion(ClientPtr client)

-{

-    TRACE();

-

-    return ProcPanoramiXQueryVersion(client);

-}

-

-

-// was PanoramiX

-static int ProcPseudoramiXGetState(ClientPtr client)

-{

-    REQUEST(xPanoramiXGetStateReq);

-    WindowPtr pWin;

-    xPanoramiXGetStateReply rep;

-    register int n, rc;

-

-    TRACE();

-    

-    REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);

-    rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);

-    if (rc != Success)

-	return rc;

-

-    rep.type = X_Reply;

-    rep.length = 0;

-    rep.sequenceNumber = client->sequence;

-    rep.state = !noPseudoramiXExtension;

-    if (client->swapped) {

-        swaps (&rep.sequenceNumber, n);

-        swapl (&rep.length, n);

-        swaps (&rep.state, n);

-    }

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

-    return Success;

-}

-

-

-// was PanoramiX

-static int ProcPseudoramiXGetScreenCount(ClientPtr client)

-{

-    REQUEST(xPanoramiXGetScreenCountReq);

-    WindowPtr pWin;

-    xPanoramiXGetScreenCountReply rep;

-    register int n, rc;

-

-    TRACE();

-    

-    REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);

-    rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);

-    if (rc != Success)

-	return rc;

-

-    rep.type = X_Reply;

-    rep.length = 0;

-    rep.sequenceNumber = client->sequence;

-    rep.ScreenCount = pseudoramiXNumScreens;

-    if (client->swapped) {

-        swaps (&rep.sequenceNumber, n);

-        swapl (&rep.length, n);

-        swaps (&rep.ScreenCount, n);

-    }

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

-    return Success;

-}

-

-

-// was PanoramiX

-static int ProcPseudoramiXGetScreenSize(ClientPtr client)

-{

-    REQUEST(xPanoramiXGetScreenSizeReq);

-    WindowPtr			pWin;

-    xPanoramiXGetScreenSizeReply	rep;

-    register int			n, rc;

-

-    TRACE();

-    

-    REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);

-    rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);

-    if (rc != Success)

-	return rc;

-

-    rep.type = X_Reply;

-    rep.length = 0;

-    rep.sequenceNumber = client->sequence;

-    /* screen dimensions */

-    rep.width  = pseudoramiXScreens[stuff->screen].w;

-    // was screenInfo.screens[stuff->screen]->width;

-    rep.height = pseudoramiXScreens[stuff->screen].h;

-    // was screenInfo.screens[stuff->screen]->height;

-    if (client->swapped) {

-        swaps (&rep.sequenceNumber, n);

-        swapl (&rep.length, n);

-        swaps (&rep.width, n);

-        swaps (&rep.height, n);

-    }

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

-    return Success;

-}

-

-

-// was Xinerama

-static int ProcPseudoramiXIsActive(ClientPtr client)

-{

-    /* REQUEST(xXineramaIsActiveReq); */

-    xXineramaIsActiveReply	rep;

-

-    TRACE();

-    

-    REQUEST_SIZE_MATCH(xXineramaIsActiveReq);

-

-    rep.type = X_Reply;

-    rep.length = 0;

-    rep.sequenceNumber = client->sequence;

-    rep.state = !noPseudoramiXExtension;

-    if (client->swapped) {

-	register int n;

-	swaps (&rep.sequenceNumber, n);

-	swapl (&rep.length, n);

-	swapl (&rep.state, n);

-    }

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

-    return Success;

-}

-

-

-// was Xinerama

-static int ProcPseudoramiXQueryScreens(ClientPtr client)

-{

-    /* REQUEST(xXineramaQueryScreensReq); */

-    xXineramaQueryScreensReply	rep;

-

-    DEBUG_LOG("noPseudoramiXExtension=%d, pseudoramiXNumScreens=%d\n", noPseudoramiXExtension, pseudoramiXNumScreens);

-    

-    REQUEST_SIZE_MATCH(xXineramaQueryScreensReq);

-

-    rep.type = X_Reply;

-    rep.sequenceNumber = client->sequence;

-    rep.number = noPseudoramiXExtension ? 0 : pseudoramiXNumScreens;

-    rep.length = bytes_to_int32(rep.number * sz_XineramaScreenInfo);

-    if (client->swapped) {

-	register int n;

-	swaps (&rep.sequenceNumber, n);

-	swapl (&rep.length, n);

-	swapl (&rep.number, n);

-    }

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

-

-    if (!noPseudoramiXExtension) {

-	xXineramaScreenInfo scratch;

-	int i;

-

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

-	    scratch.x_org  = pseudoramiXScreens[i].x;

-	    scratch.y_org  = pseudoramiXScreens[i].y;

-	    scratch.width  = pseudoramiXScreens[i].w;

-	    scratch.height = pseudoramiXScreens[i].h;

-

-	    if(client->swapped) {

-		register int n;

-		swaps (&scratch.x_org, n);

-		swaps (&scratch.y_org, n);

-		swaps (&scratch.width, n);

-		swaps (&scratch.height, n);

-	    }

-	    WriteToClient (client, sz_XineramaScreenInfo, (char *) &scratch);

-	}

-    }

-

-    return Success;

-}

-

-

-// was PanoramiX

-static int ProcPseudoramiXDispatch (ClientPtr client)

-{   REQUEST(xReq);

-    TRACE();

-    switch (stuff->data)

-    {

-	case X_PanoramiXQueryVersion:

-	     return ProcPseudoramiXQueryVersion(client);

-	case X_PanoramiXGetState:

-	     return ProcPseudoramiXGetState(client);

-	case X_PanoramiXGetScreenCount:

-	     return ProcPseudoramiXGetScreenCount(client);

-	case X_PanoramiXGetScreenSize:

-	     return ProcPseudoramiXGetScreenSize(client);

-	case X_XineramaIsActive:

-	     return ProcPseudoramiXIsActive(client);

-	case X_XineramaQueryScreens:

-	     return ProcPseudoramiXQueryScreens(client);

-    }

-    return BadRequest;

-}

-

-

-

-static int

-SProcPseudoramiXQueryVersion (ClientPtr client)

-{

-	REQUEST(xPanoramiXQueryVersionReq);

-	register int n;

-

-    TRACE();

-

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

-	REQUEST_SIZE_MATCH (xPanoramiXQueryVersionReq);

-	return ProcPseudoramiXQueryVersion(client);

-}

-

-static int

-SProcPseudoramiXGetState(ClientPtr client)

-{

-	REQUEST(xPanoramiXGetStateReq);

-	register int n;

-

-    TRACE();

-

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

-	REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);

-	return ProcPseudoramiXGetState(client);

-}

-

-static int

-SProcPseudoramiXGetScreenCount(ClientPtr client)

-{

-	REQUEST(xPanoramiXGetScreenCountReq);

-	register int n;

-

-    TRACE();

-

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

-	REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);

-	return ProcPseudoramiXGetScreenCount(client);

-}

-

-static int

-SProcPseudoramiXGetScreenSize(ClientPtr client)

-{

-	REQUEST(xPanoramiXGetScreenSizeReq);

-	register int n;

-

-    TRACE();

-

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

-	REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);

-	return ProcPseudoramiXGetScreenSize(client);

-}

-

-

-static int

-SProcPseudoramiXIsActive(ClientPtr client)

-{

-	REQUEST(xXineramaIsActiveReq);

-	register int n;

-

-    TRACE();

-

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

-	REQUEST_SIZE_MATCH(xXineramaIsActiveReq);

-	return ProcPseudoramiXIsActive(client);

-}

-

-

-static int

-SProcPseudoramiXQueryScreens(ClientPtr client)

-{

-	REQUEST(xXineramaQueryScreensReq);

-	register int n;

-

-    TRACE();

-

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

-	REQUEST_SIZE_MATCH(xXineramaQueryScreensReq);

-	return ProcPseudoramiXQueryScreens(client);

-}

-

-

-static int

-SProcPseudoramiXDispatch (ClientPtr client)

-{   REQUEST(xReq);

-

-    TRACE();

-

-    switch (stuff->data)

-    {

-	case X_PanoramiXQueryVersion:

-	     return SProcPseudoramiXQueryVersion(client);

-	case X_PanoramiXGetState:

-	     return SProcPseudoramiXGetState(client);

-	case X_PanoramiXGetScreenCount:

-	     return SProcPseudoramiXGetScreenCount(client);

-	case X_PanoramiXGetScreenSize:

-	     return SProcPseudoramiXGetScreenSize(client);

-	case X_XineramaIsActive:

-	     return SProcPseudoramiXIsActive(client);

-	case X_XineramaQueryScreens:

-	     return SProcPseudoramiXQueryScreens(client);

-    }

-    return BadRequest;

-}

+/*
+ * Minimal implementation of PanoramiX/Xinerama
+ *
+ * This is used in rootless mode where the underlying window server
+ * already provides an abstracted view of multiple screens as one
+ * large screen area.
+ *
+ * This code is largely based on panoramiX.c, which contains the
+ * following copyright notice:
+ */
+/*****************************************************************
+Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
+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.
+
+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
+DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
+BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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 Digital Equipment Corporation
+shall not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization from Digital
+Equipment Corporation.
+******************************************************************/
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include "darwin.h"
+#include "pseudoramiX.h"
+#include "extnsionst.h"
+#include "dixstruct.h"
+#include "window.h"
+#include <X11/extensions/panoramiXproto.h>
+#include "globals.h"
+
+Bool noPseudoramiXExtension = FALSE;
+
+extern int ProcPanoramiXQueryVersion (ClientPtr client);
+
+static void PseudoramiXResetProc(ExtensionEntry *extEntry);
+
+static int ProcPseudoramiXQueryVersion(ClientPtr client);
+static int ProcPseudoramiXGetState(ClientPtr client);
+static int ProcPseudoramiXGetScreenCount(ClientPtr client);
+static int ProcPseudoramiXGetScreenSize(ClientPtr client);
+static int ProcPseudoramiXIsActive(ClientPtr client);
+static int ProcPseudoramiXQueryScreens(ClientPtr client);
+static int ProcPseudoramiXDispatch(ClientPtr client);
+
+static int SProcPseudoramiXQueryVersion(ClientPtr client);
+static int SProcPseudoramiXGetState(ClientPtr client);
+static int SProcPseudoramiXGetScreenCount(ClientPtr client);
+static int SProcPseudoramiXGetScreenSize(ClientPtr client);
+static int SProcPseudoramiXIsActive(ClientPtr client);
+static int SProcPseudoramiXQueryScreens(ClientPtr client);
+static int SProcPseudoramiXDispatch(ClientPtr client);
+
+
+typedef struct {
+    int x;
+    int y;
+    int w;
+    int h;
+} PseudoramiXScreenRec;
+
+static PseudoramiXScreenRec *pseudoramiXScreens = NULL;
+static int pseudoramiXScreensAllocated = 0;
+static int pseudoramiXNumScreens = 0;
+static unsigned long pseudoramiXGeneration = 0;
+
+
+// Add a PseudoramiX screen.
+// The rest of the X server will know nothing about this screen.
+// Can be called before or after extension init.
+// Screens must be re-added once per generation.
+void
+PseudoramiXAddScreen(int x, int y, int w, int h)
+{
+    PseudoramiXScreenRec *s;
+
+    if (noPseudoramiXExtension) return;
+
+    if (pseudoramiXNumScreens == pseudoramiXScreensAllocated) {
+        pseudoramiXScreensAllocated += pseudoramiXScreensAllocated + 1;
+        pseudoramiXScreens = realloc(pseudoramiXScreens,
+                                      pseudoramiXScreensAllocated *
+                                      sizeof(PseudoramiXScreenRec));
+    }
+
+    DEBUG_LOG("x: %d, y: %d, w: %d, h: %d\n", x, y, w, h);
+
+    s = &pseudoramiXScreens[pseudoramiXNumScreens++];
+    s->x = x;
+    s->y = y;
+    s->w = w;
+    s->h = h;
+}
+
+
+// Initialize PseudoramiX.
+// Copied from PanoramiXExtensionInit
+void PseudoramiXExtensionInit(int argc, char *argv[])
+{
+    Bool	     	success = FALSE;
+    ExtensionEntry 	*extEntry;
+
+    if (noPseudoramiXExtension) return;
+
+    TRACE();
+
+    /* Even with only one screen we need to enable PseudoramiX to allow
+       dynamic screen configuration changes. */
+#if 0
+    if (pseudoramiXNumScreens == 1) {
+        // Only one screen - disable Xinerama extension.
+        noPseudoramiXExtension = TRUE;
+        return;
+    }
+#endif
+
+    if (pseudoramiXGeneration != serverGeneration) {
+        extEntry = AddExtension(PANORAMIX_PROTOCOL_NAME, 0, 0,
+                                ProcPseudoramiXDispatch,
+                                SProcPseudoramiXDispatch,
+                                PseudoramiXResetProc,
+                                StandardMinorOpcode);
+        if (!extEntry) {
+            ErrorF("PseudoramiXExtensionInit(): AddExtension failed\n");
+        } else {
+            pseudoramiXGeneration = serverGeneration;
+            success = TRUE;
+        }
+    }
+
+    if (!success) {
+        ErrorF("%s Extension (PseudoramiX) failed to initialize\n",
+               PANORAMIX_PROTOCOL_NAME);
+        return;
+    }
+}
+
+
+void PseudoramiXResetScreens(void)
+{
+    TRACE();
+
+    pseudoramiXNumScreens = 0;
+}
+
+
+static void PseudoramiXResetProc(ExtensionEntry *extEntry)
+{
+    TRACE();
+
+    PseudoramiXResetScreens();
+}
+
+
+// was PanoramiX
+static int ProcPseudoramiXQueryVersion(ClientPtr client)
+{
+    TRACE();
+
+    return ProcPanoramiXQueryVersion(client);
+}
+
+
+// was PanoramiX
+static int ProcPseudoramiXGetState(ClientPtr client)
+{
+    REQUEST(xPanoramiXGetStateReq);
+    WindowPtr pWin;
+    xPanoramiXGetStateReply rep;
+    register int rc;
+
+    TRACE();
+    
+    REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);
+    rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
+    if (rc != Success)
+	return rc;
+
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+    rep.state = !noPseudoramiXExtension;
+    if (client->swapped) {
+        swaps(&rep.sequenceNumber);
+        swapl(&rep.length);
+        swaps(&rep.state);
+    }
+    WriteToClient (client, sizeof (xPanoramiXGetStateReply), (char *) &rep);
+    return Success;
+}
+
+
+// was PanoramiX
+static int ProcPseudoramiXGetScreenCount(ClientPtr client)
+{
+    REQUEST(xPanoramiXGetScreenCountReq);
+    WindowPtr pWin;
+    xPanoramiXGetScreenCountReply rep;
+    register int rc;
+
+    TRACE();
+    
+    REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);
+    rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
+    if (rc != Success)
+	return rc;
+
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+    rep.ScreenCount = pseudoramiXNumScreens;
+    if (client->swapped) {
+        swaps(&rep.sequenceNumber);
+        swapl(&rep.length);
+        swaps(&rep.ScreenCount);
+    }
+    WriteToClient (client, sizeof(xPanoramiXGetScreenCountReply), (char *)&rep);
+    return Success;
+}
+
+
+// was PanoramiX
+static int ProcPseudoramiXGetScreenSize(ClientPtr client)
+{
+    REQUEST(xPanoramiXGetScreenSizeReq);
+    WindowPtr			pWin;
+    xPanoramiXGetScreenSizeReply	rep;
+    register int			n, rc;
+
+    TRACE();
+    
+    REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
+    rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
+    if (rc != Success)
+	return rc;
+
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+    /* screen dimensions */
+    rep.width  = pseudoramiXScreens[stuff->screen].w;
+    // was screenInfo.screens[stuff->screen]->width;
+    rep.height = pseudoramiXScreens[stuff->screen].h;
+    // was screenInfo.screens[stuff->screen]->height;
+    if (client->swapped) {
+        swaps(&rep.sequenceNumber);
+        swapl(&rep.length);
+        swaps(&rep.width);
+        swaps(&rep.height);
+    }
+    WriteToClient (client, sizeof(xPanoramiXGetScreenSizeReply), (char *)&rep);
+    return Success;
+}
+
+
+// was Xinerama
+static int ProcPseudoramiXIsActive(ClientPtr client)
+{
+    /* REQUEST(xXineramaIsActiveReq); */
+    xXineramaIsActiveReply	rep;
+
+    TRACE();
+    
+    REQUEST_SIZE_MATCH(xXineramaIsActiveReq);
+
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+    rep.state = !noPseudoramiXExtension;
+    if (client->swapped) {
+	swaps(&rep.sequenceNumber);
+	swapl(&rep.length);
+	swapl(&rep.state);
+    }
+    WriteToClient (client, sizeof (xXineramaIsActiveReply), (char *) &rep);
+    return Success;
+}
+
+
+// was Xinerama
+static int ProcPseudoramiXQueryScreens(ClientPtr client)
+{
+    /* REQUEST(xXineramaQueryScreensReq); */
+    xXineramaQueryScreensReply	rep;
+
+    DEBUG_LOG("noPseudoramiXExtension=%d, pseudoramiXNumScreens=%d\n", noPseudoramiXExtension, pseudoramiXNumScreens);
+    
+    REQUEST_SIZE_MATCH(xXineramaQueryScreensReq);
+
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.number = noPseudoramiXExtension ? 0 : pseudoramiXNumScreens;
+    rep.length = bytes_to_int32(rep.number * sz_XineramaScreenInfo);
+    if (client->swapped) {
+	swaps(&rep.sequenceNumber);
+	swapl(&rep.length);
+	swapl(&rep.number);
+    }
+    WriteToClient (client, sizeof (xXineramaQueryScreensReply), (char *) &rep);
+
+    if (!noPseudoramiXExtension) {
+	xXineramaScreenInfo scratch;
+	int i;
+
+	for(i = 0; i < pseudoramiXNumScreens; i++) {
+	    scratch.x_org  = pseudoramiXScreens[i].x;
+	    scratch.y_org  = pseudoramiXScreens[i].y;
+	    scratch.width  = pseudoramiXScreens[i].w;
+	    scratch.height = pseudoramiXScreens[i].h;
+
+	    if(client->swapped) {
+		swaps(&scratch.x_org);
+		swaps(&scratch.y_org);
+		swaps(&scratch.width);
+		swaps(&scratch.height);
+	    }
+	    WriteToClient (client, sz_XineramaScreenInfo, (char *) &scratch);
+	}
+    }
+
+    return Success;
+}
+
+
+// was PanoramiX
+static int ProcPseudoramiXDispatch (ClientPtr client)
+{   REQUEST(xReq);
+    TRACE();
+    switch (stuff->data)
+    {
+	case X_PanoramiXQueryVersion:
+	     return ProcPseudoramiXQueryVersion(client);
+	case X_PanoramiXGetState:
+	     return ProcPseudoramiXGetState(client);
+	case X_PanoramiXGetScreenCount:
+	     return ProcPseudoramiXGetScreenCount(client);
+	case X_PanoramiXGetScreenSize:
+	     return ProcPseudoramiXGetScreenSize(client);
+	case X_XineramaIsActive:
+	     return ProcPseudoramiXIsActive(client);
+	case X_XineramaQueryScreens:
+	     return ProcPseudoramiXQueryScreens(client);
+    }
+    return BadRequest;
+}
+
+
+
+static int
+SProcPseudoramiXQueryVersion (ClientPtr client)
+{
+	REQUEST(xPanoramiXQueryVersionReq);
+
+    TRACE();
+
+	swaps(&stuff->length);
+	REQUEST_SIZE_MATCH (xPanoramiXQueryVersionReq);
+	return ProcPseudoramiXQueryVersion(client);
+}
+
+static int
+SProcPseudoramiXGetState(ClientPtr client)
+{
+	REQUEST(xPanoramiXGetStateReq);
+
+    TRACE();
+
+	swaps(&stuff->length);
+	REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);
+	return ProcPseudoramiXGetState(client);
+}
+
+static int
+SProcPseudoramiXGetScreenCount(ClientPtr client)
+{
+	REQUEST(xPanoramiXGetScreenCountReq);
+
+    TRACE();
+
+	swaps(&stuff->length);
+	REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);
+	return ProcPseudoramiXGetScreenCount(client);
+}
+
+static int
+SProcPseudoramiXGetScreenSize(ClientPtr client)
+{
+	REQUEST(xPanoramiXGetScreenSizeReq);
+
+    TRACE();
+
+	swaps(&stuff->length);
+	REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
+	return ProcPseudoramiXGetScreenSize(client);
+}
+
+
+static int
+SProcPseudoramiXIsActive(ClientPtr client)
+{
+	REQUEST(xXineramaIsActiveReq);
+
+    TRACE();
+
+	swaps(&stuff->length);
+	REQUEST_SIZE_MATCH(xXineramaIsActiveReq);
+	return ProcPseudoramiXIsActive(client);
+}
+
+
+static int
+SProcPseudoramiXQueryScreens(ClientPtr client)
+{
+	REQUEST(xXineramaQueryScreensReq);
+
+    TRACE();
+
+	swaps(&stuff->length);
+	REQUEST_SIZE_MATCH(xXineramaQueryScreensReq);
+	return ProcPseudoramiXQueryScreens(client);
+}
+
+
+static int
+SProcPseudoramiXDispatch (ClientPtr client)
+{   REQUEST(xReq);
+
+    TRACE();
+
+    switch (stuff->data)
+    {
+	case X_PanoramiXQueryVersion:
+	     return SProcPseudoramiXQueryVersion(client);
+	case X_PanoramiXGetState:
+	     return SProcPseudoramiXGetState(client);
+	case X_PanoramiXGetScreenCount:
+	     return SProcPseudoramiXGetScreenCount(client);
+	case X_PanoramiXGetScreenSize:
+	     return SProcPseudoramiXGetScreenSize(client);
+	case X_XineramaIsActive:
+	     return SProcPseudoramiXIsActive(client);
+	case X_XineramaQueryScreens:
+	     return SProcPseudoramiXQueryScreens(client);
+    }
+    return BadRequest;
+}
diff --git a/xorg-server/hw/xquartz/xpr/appledri.c b/xorg-server/hw/xquartz/xpr/appledri.c
index d42661c22..1304d5a43 100644
--- a/xorg-server/hw/xquartz/xpr/appledri.c
+++ b/xorg-server/hw/xquartz/xpr/appledri.c
@@ -1,420 +1,418 @@
-/**************************************************************************

-

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

-Copyright 2000 VA Linux Systems, Inc.

-Copyright (c) 2002, 2009 Apple Computer, 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@valinux.com>

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

- *

- */

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#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 _APPLEDRI_SERVER_

-#include "appledristr.h"

-#include "swaprep.h"

-#include "dri.h"

-#include "dristruct.h"

-#include "xpr.h"

-#include "x-hash.h"

-#include "protocol-versions.h"

-

-static int DRIErrorBase = 0;

-

-

-static void AppleDRIResetProc(ExtensionEntry* extEntry);

-static int ProcAppleDRICreatePixmap(ClientPtr client);

-

-static unsigned char DRIReqCode = 0;

-static int DRIEventBase = 0;

-

-static void SNotifyEvent(xAppleDRINotifyEvent *from, xAppleDRINotifyEvent *to);

-

-typedef struct _DRIEvent *DRIEventPtr;

-typedef struct _DRIEvent {

-    DRIEventPtr     next;

-    ClientPtr       client;

-    XID             clientResource;

-    unsigned int    mask;

-} DRIEventRec;

-

-/*ARGSUSED*/

-static void

-AppleDRIResetProc (

-    ExtensionEntry* extEntry

-)

-{

-    DRIReset();

-}

-

-static int

-ProcAppleDRIQueryVersion(

-    register ClientPtr client

-)

-{

-    xAppleDRIQueryVersionReply rep;

-    register int n;

-

-    REQUEST_SIZE_MATCH(xAppleDRIQueryVersionReq);

-    rep.type = X_Reply;

-    rep.length = 0;

-    rep.sequenceNumber = client->sequence;

-    rep.majorVersion = SERVER_APPLEDRI_MAJOR_VERSION;

-    rep.minorVersion = SERVER_APPLEDRI_MINOR_VERSION;

-    rep.patchVersion = SERVER_APPLEDRI_PATCH_VERSION;

-    if (client->swapped) {

-        swaps(&rep.sequenceNumber, n);

-        swapl(&rep.length, n);

-    }

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

-    return Success;

-}

-

-

-/* surfaces */

-

-static int

-ProcAppleDRIQueryDirectRenderingCapable(

-    register ClientPtr client

-)

-{

-    xAppleDRIQueryDirectRenderingCapableReply rep;

-    Bool isCapable;

-

-    REQUEST(xAppleDRIQueryDirectRenderingCapableReq);

-    REQUEST_SIZE_MATCH(xAppleDRIQueryDirectRenderingCapableReq);

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

-        rep.isCapable = 0;

-

-    WriteToClient(client, 

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

-    return Success;

-}

-

-static int

-ProcAppleDRIAuthConnection(

-    register ClientPtr client

-)

-{

-    xAppleDRIAuthConnectionReply rep;

-    

-    REQUEST(xAppleDRIAuthConnectionReq);

-    REQUEST_SIZE_MATCH(xAppleDRIAuthConnectionReq);

-

-    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 %u\n", (unsigned int)stuff->magic);

-        rep.authenticated = 0;

-    }

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

-    return Success;

-}

-

-static void surface_notify(

-    void *_arg,

-    void *data

-)

-{

-    DRISurfaceNotifyArg *arg = _arg;

-    int client_index = (int) x_cvt_vptr_to_uint(data);

-    xAppleDRINotifyEvent se;

-

-    if (client_index < 0 || client_index >= currentMaxClients)

-        return;

-

-    se.type = DRIEventBase + AppleDRISurfaceNotify;

-    se.kind = arg->kind;

-    se.arg = arg->id;

-    se.time = currentTime.milliseconds;

-    WriteEventsToClient (clients[client_index], 1, (xEvent *) &se);

-}

-

-static int

-ProcAppleDRICreateSurface(

-    ClientPtr client

-)

-{

-    xAppleDRICreateSurfaceReply rep;

-    DrawablePtr pDrawable;

-    xp_surface_id sid;

-    unsigned int key[2];

-    int rc;

-

-    REQUEST(xAppleDRICreateSurfaceReq);

-    REQUEST_SIZE_MATCH(xAppleDRICreateSurfaceReq);

-    rep.type = X_Reply;

-    rep.length = 0;

-    rep.sequenceNumber = client->sequence;

-

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

-			   DixReadAccess);

-    if (rc != Success)

-	return rc;

-

-    rep.key_0 = rep.key_1 = rep.uid = 0;

-

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

-                           (Drawable)stuff->drawable, pDrawable,

-                           stuff->client_id, &sid, key,

-                           surface_notify,

-                           x_cvt_uint_to_vptr(client->index))) {

-        return BadValue;

-    }

-

-    rep.key_0 = key[0];

-    rep.key_1 = key[1];

-    rep.uid = sid;

-

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

-    return Success;

-}

-

-static int

-ProcAppleDRIDestroySurface(

-    register ClientPtr client

-)

-{

-    int rc;

-    REQUEST(xAppleDRIDestroySurfaceReq);

-    DrawablePtr pDrawable;

-    REQUEST_SIZE_MATCH(xAppleDRIDestroySurfaceReq);

-

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

-			   DixReadAccess);

-    if (rc != Success)

-	return rc;

-

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

-                            (Drawable)stuff->drawable,

-                            pDrawable, NULL, NULL)) {

-        return BadValue;

-    }

-

-    return Success;

-}

-

-static int

-ProcAppleDRICreatePixmap(ClientPtr client)

-{

-    REQUEST(xAppleDRICreatePixmapReq);

-    DrawablePtr pDrawable;

-    int rc;

-    char path[PATH_MAX];

-    xAppleDRICreatePixmapReply rep;

-    int width, height, pitch, bpp;

-    void *ptr;

-

-    REQUEST_SIZE_MATCH(xAppleDRICreatePixmapReq);

-

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

-                           DixReadAccess);

-

-    if(rc != Success)

-        return rc;

-    

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

-                              (Drawable)stuff->drawable,

-                              pDrawable,

-			      path, PATH_MAX)) {

-        return BadValue;

-    }

-

-    if(!DRIGetPixmapData(pDrawable, &width, &height,

-			 &pitch, &bpp, &ptr)) {

-	return BadValue;

-    } 

-	

-    rep.stringLength = strlen(path) + 1;

-		

-    /* No need for swapping, because this only runs if LocalClient is true. */

-    rep.type = X_Reply;

-    rep.length = sizeof(rep) + rep.stringLength;

-    rep.sequenceNumber = client->sequence;

-    rep.width = width;

-    rep.height = height;

-    rep.pitch = pitch;

-    rep.bpp = bpp;

-    rep.size = pitch * height;

-

-    if(sizeof(rep) != sz_xAppleDRICreatePixmapReply)

-	ErrorF("error sizeof(rep) is %zu\n", sizeof(rep)); 

-    

-    WriteReplyToClient(client, sizeof(rep), &rep);

-    (void)WriteToClient(client, rep.stringLength, path);

-

-    return Success;

-}

-

-static int

-ProcAppleDRIDestroyPixmap(ClientPtr client)

-{

-    DrawablePtr pDrawable;

-    int rc;

-    REQUEST(xAppleDRIDestroyPixmapReq);

-    REQUEST_SIZE_MATCH(xAppleDRIDestroyPixmapReq);

-

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

-			    DixReadAccess);

-

-    if(rc != Success)

-	return rc;

-    

-    DRIDestroyPixmap(pDrawable);

-

-    return Success;

-}

-

-/* dispatch */

-

-static int

-ProcAppleDRIDispatch (

-    register ClientPtr client

-)

-{

-    REQUEST(xReq);

-

-    switch (stuff->data)

-    {

-    case X_AppleDRIQueryVersion:

-        return ProcAppleDRIQueryVersion(client);

-    case X_AppleDRIQueryDirectRenderingCapable:

-        return ProcAppleDRIQueryDirectRenderingCapable(client);

-    }

-

-    if (!LocalClient(client))

-        return DRIErrorBase + AppleDRIClientNotLocal;

-

-    switch (stuff->data)

-    {

-    case X_AppleDRIAuthConnection:

-        return ProcAppleDRIAuthConnection(client);

-    case X_AppleDRICreateSurface:

-        return ProcAppleDRICreateSurface(client);

-    case X_AppleDRIDestroySurface:

-        return ProcAppleDRIDestroySurface(client);

-    case X_AppleDRICreatePixmap:

-	return ProcAppleDRICreatePixmap(client);

-    case X_AppleDRIDestroyPixmap:

-	return ProcAppleDRIDestroyPixmap(client);

-

-    default:

-        return BadRequest;

-    }

-}

-

-static void

-SNotifyEvent(

-    xAppleDRINotifyEvent *from,

-    xAppleDRINotifyEvent *to

-)

-{

-    to->type = from->type;

-    to->kind = from->kind;

-    cpswaps (from->sequenceNumber, to->sequenceNumber);

-    cpswapl (from->time, to->time);

-    cpswapl (from->arg, to->arg);

-}

-

-static int

-SProcAppleDRIQueryVersion(

-    register ClientPtr client

-)

-{

-    register int n;

-    REQUEST(xAppleDRIQueryVersionReq);

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

-    return ProcAppleDRIQueryVersion(client);

-}

-

-static int

-SProcAppleDRIDispatch (

-    register ClientPtr client

-)

-{

-    REQUEST(xReq);

-

-    /* It is bound to be non-local when there is byte swapping */

-    if (!LocalClient(client))

-        return DRIErrorBase + AppleDRIClientNotLocal;

-

-    /* only local clients are allowed DRI access */

-    switch (stuff->data)

-    {

-    case X_AppleDRIQueryVersion:

-        return SProcAppleDRIQueryVersion(client);

-    default:

-        return BadRequest;

-    }

-}

-

-void

-AppleDRIExtensionInit(void)

-{

-    ExtensionEntry* extEntry;

-

-    if (DRIExtensionInit() &&

-        (extEntry = AddExtension(APPLEDRINAME,

-                                 AppleDRINumberEvents,

-                                 AppleDRINumberErrors,

-                                 ProcAppleDRIDispatch,

-                                 SProcAppleDRIDispatch,

-                                 AppleDRIResetProc,

-                                 StandardMinorOpcode))) {

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

-        DRIErrorBase = extEntry->errorBase;

-        DRIEventBase = extEntry->eventBase;

-        EventSwapVector[DRIEventBase] = (EventSwapPtr) SNotifyEvent;

-    }

-}

+/**************************************************************************
+
+Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+Copyright 2000 VA Linux Systems, Inc.
+Copyright (c) 2002, 2009 Apple Computer, 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@valinux.com>
+ *   Rickard E. (Rik) Faith <faith@valinux.com>
+ *
+ */
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#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 _APPLEDRI_SERVER_
+#include "appledristr.h"
+#include "swaprep.h"
+#include "dri.h"
+#include "dristruct.h"
+#include "xpr.h"
+#include "x-hash.h"
+#include "protocol-versions.h"
+
+static int DRIErrorBase = 0;
+
+
+static void AppleDRIResetProc(ExtensionEntry* extEntry);
+static int ProcAppleDRICreatePixmap(ClientPtr client);
+
+static unsigned char DRIReqCode = 0;
+static int DRIEventBase = 0;
+
+static void SNotifyEvent(xAppleDRINotifyEvent *from, xAppleDRINotifyEvent *to);
+
+typedef struct _DRIEvent *DRIEventPtr;
+typedef struct _DRIEvent {
+    DRIEventPtr     next;
+    ClientPtr       client;
+    XID             clientResource;
+    unsigned int    mask;
+} DRIEventRec;
+
+/*ARGSUSED*/
+static void
+AppleDRIResetProc (
+    ExtensionEntry* extEntry
+)
+{
+    DRIReset();
+}
+
+static int
+ProcAppleDRIQueryVersion(
+    register ClientPtr client
+)
+{
+    xAppleDRIQueryVersionReply rep;
+
+    REQUEST_SIZE_MATCH(xAppleDRIQueryVersionReq);
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+    rep.majorVersion = SERVER_APPLEDRI_MAJOR_VERSION;
+    rep.minorVersion = SERVER_APPLEDRI_MINOR_VERSION;
+    rep.patchVersion = SERVER_APPLEDRI_PATCH_VERSION;
+    if (client->swapped) {
+        swaps(&rep.sequenceNumber);
+        swapl(&rep.length);
+    }
+    WriteToClient(client, sizeof(xAppleDRIQueryVersionReply), (char *)&rep);
+    return Success;
+}
+
+
+/* surfaces */
+
+static int
+ProcAppleDRIQueryDirectRenderingCapable(
+    register ClientPtr client
+)
+{
+    xAppleDRIQueryDirectRenderingCapableReply rep;
+    Bool isCapable;
+
+    REQUEST(xAppleDRIQueryDirectRenderingCapableReq);
+    REQUEST_SIZE_MATCH(xAppleDRIQueryDirectRenderingCapableReq);
+    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))
+        rep.isCapable = 0;
+
+    WriteToClient(client, 
+        sizeof(xAppleDRIQueryDirectRenderingCapableReply), (char *)&rep);
+    return Success;
+}
+
+static int
+ProcAppleDRIAuthConnection(
+    register ClientPtr client
+)
+{
+    xAppleDRIAuthConnectionReply rep;
+    
+    REQUEST(xAppleDRIAuthConnectionReq);
+    REQUEST_SIZE_MATCH(xAppleDRIAuthConnectionReq);
+
+    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 %u\n", (unsigned int)stuff->magic);
+        rep.authenticated = 0;
+    }
+    WriteToClient(client, sizeof(xAppleDRIAuthConnectionReply), (char *)&rep);
+    return Success;
+}
+
+static void surface_notify(
+    void *_arg,
+    void *data
+)
+{
+    DRISurfaceNotifyArg *arg = _arg;
+    int client_index = (int) x_cvt_vptr_to_uint(data);
+    xAppleDRINotifyEvent se;
+
+    if (client_index < 0 || client_index >= currentMaxClients)
+        return;
+
+    se.type = DRIEventBase + AppleDRISurfaceNotify;
+    se.kind = arg->kind;
+    se.arg = arg->id;
+    se.time = currentTime.milliseconds;
+    WriteEventsToClient (clients[client_index], 1, (xEvent *) &se);
+}
+
+static int
+ProcAppleDRICreateSurface(
+    ClientPtr client
+)
+{
+    xAppleDRICreateSurfaceReply rep;
+    DrawablePtr pDrawable;
+    xp_surface_id sid;
+    unsigned int key[2];
+    int rc;
+
+    REQUEST(xAppleDRICreateSurfaceReq);
+    REQUEST_SIZE_MATCH(xAppleDRICreateSurfaceReq);
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+
+    rc = dixLookupDrawable(&pDrawable, stuff->drawable, client, 0,
+			   DixReadAccess);
+    if (rc != Success)
+	return rc;
+
+    rep.key_0 = rep.key_1 = rep.uid = 0;
+
+    if (!DRICreateSurface( screenInfo.screens[stuff->screen],
+                           (Drawable)stuff->drawable, pDrawable,
+                           stuff->client_id, &sid, key,
+                           surface_notify,
+                           x_cvt_uint_to_vptr(client->index))) {
+        return BadValue;
+    }
+
+    rep.key_0 = key[0];
+    rep.key_1 = key[1];
+    rep.uid = sid;
+
+    WriteToClient(client, sizeof(xAppleDRICreateSurfaceReply), (char *)&rep);
+    return Success;
+}
+
+static int
+ProcAppleDRIDestroySurface(
+    register ClientPtr client
+)
+{
+    int rc;
+    REQUEST(xAppleDRIDestroySurfaceReq);
+    DrawablePtr pDrawable;
+    REQUEST_SIZE_MATCH(xAppleDRIDestroySurfaceReq);
+
+    rc = dixLookupDrawable(&pDrawable, stuff->drawable, client, 0,
+			   DixReadAccess);
+    if (rc != Success)
+	return rc;
+
+    if (!DRIDestroySurface( screenInfo.screens[stuff->screen], 
+                            (Drawable)stuff->drawable,
+                            pDrawable, NULL, NULL)) {
+        return BadValue;
+    }
+
+    return Success;
+}
+
+static int
+ProcAppleDRICreatePixmap(ClientPtr client)
+{
+    REQUEST(xAppleDRICreatePixmapReq);
+    DrawablePtr pDrawable;
+    int rc;
+    char path[PATH_MAX];
+    xAppleDRICreatePixmapReply rep;
+    int width, height, pitch, bpp;
+    void *ptr;
+
+    REQUEST_SIZE_MATCH(xAppleDRICreatePixmapReq);
+
+    rc = dixLookupDrawable(&pDrawable, stuff->drawable, client, 0,
+                           DixReadAccess);
+
+    if(rc != Success)
+        return rc;
+    
+    if(!DRICreatePixmap(screenInfo.screens[stuff->screen],
+                              (Drawable)stuff->drawable,
+                              pDrawable,
+			      path, PATH_MAX)) {
+        return BadValue;
+    }
+
+    if(!DRIGetPixmapData(pDrawable, &width, &height,
+			 &pitch, &bpp, &ptr)) {
+	return BadValue;
+    } 
+	
+    rep.stringLength = strlen(path) + 1;
+		
+    /* No need for swapping, because this only runs if LocalClient is true. */
+    rep.type = X_Reply;
+    rep.length = sizeof(rep) + rep.stringLength;
+    rep.sequenceNumber = client->sequence;
+    rep.width = width;
+    rep.height = height;
+    rep.pitch = pitch;
+    rep.bpp = bpp;
+    rep.size = pitch * height;
+
+    if(sizeof(rep) != sz_xAppleDRICreatePixmapReply)
+	ErrorF("error sizeof(rep) is %zu\n", sizeof(rep)); 
+    
+    WriteReplyToClient(client, sizeof(rep), &rep);
+    (void)WriteToClient(client, rep.stringLength, path);
+
+    return Success;
+}
+
+static int
+ProcAppleDRIDestroyPixmap(ClientPtr client)
+{
+    DrawablePtr pDrawable;
+    int rc;
+    REQUEST(xAppleDRIDestroyPixmapReq);
+    REQUEST_SIZE_MATCH(xAppleDRIDestroyPixmapReq);
+
+    rc = dixLookupDrawable(&pDrawable, stuff->drawable, client, 0,
+			    DixReadAccess);
+
+    if(rc != Success)
+	return rc;
+    
+    DRIDestroyPixmap(pDrawable);
+
+    return Success;
+}
+
+/* dispatch */
+
+static int
+ProcAppleDRIDispatch (
+    register ClientPtr client
+)
+{
+    REQUEST(xReq);
+
+    switch (stuff->data)
+    {
+    case X_AppleDRIQueryVersion:
+        return ProcAppleDRIQueryVersion(client);
+    case X_AppleDRIQueryDirectRenderingCapable:
+        return ProcAppleDRIQueryDirectRenderingCapable(client);
+    }
+
+    if (!LocalClient(client))
+        return DRIErrorBase + AppleDRIClientNotLocal;
+
+    switch (stuff->data)
+    {
+    case X_AppleDRIAuthConnection:
+        return ProcAppleDRIAuthConnection(client);
+    case X_AppleDRICreateSurface:
+        return ProcAppleDRICreateSurface(client);
+    case X_AppleDRIDestroySurface:
+        return ProcAppleDRIDestroySurface(client);
+    case X_AppleDRICreatePixmap:
+	return ProcAppleDRICreatePixmap(client);
+    case X_AppleDRIDestroyPixmap:
+	return ProcAppleDRIDestroyPixmap(client);
+
+    default:
+        return BadRequest;
+    }
+}
+
+static void
+SNotifyEvent(
+    xAppleDRINotifyEvent *from,
+    xAppleDRINotifyEvent *to
+)
+{
+    to->type = from->type;
+    to->kind = from->kind;
+    cpswaps (from->sequenceNumber, to->sequenceNumber);
+    cpswapl (from->time, to->time);
+    cpswapl (from->arg, to->arg);
+}
+
+static int
+SProcAppleDRIQueryVersion(
+    register ClientPtr client
+)
+{
+    REQUEST(xAppleDRIQueryVersionReq);
+    swaps(&stuff->length);
+    return ProcAppleDRIQueryVersion(client);
+}
+
+static int
+SProcAppleDRIDispatch (
+    register ClientPtr client
+)
+{
+    REQUEST(xReq);
+
+    /* It is bound to be non-local when there is byte swapping */
+    if (!LocalClient(client))
+        return DRIErrorBase + AppleDRIClientNotLocal;
+
+    /* only local clients are allowed DRI access */
+    switch (stuff->data)
+    {
+    case X_AppleDRIQueryVersion:
+        return SProcAppleDRIQueryVersion(client);
+    default:
+        return BadRequest;
+    }
+}
+
+void
+AppleDRIExtensionInit(void)
+{
+    ExtensionEntry* extEntry;
+
+    if (DRIExtensionInit() &&
+        (extEntry = AddExtension(APPLEDRINAME,
+                                 AppleDRINumberEvents,
+                                 AppleDRINumberErrors,
+                                 ProcAppleDRIDispatch,
+                                 SProcAppleDRIDispatch,
+                                 AppleDRIResetProc,
+                                 StandardMinorOpcode))) {
+        DRIReqCode = (unsigned char)extEntry->base;
+        DRIErrorBase = extEntry->errorBase;
+        DRIEventBase = extEntry->eventBase;
+        EventSwapVector[DRIEventBase] = (EventSwapPtr) SNotifyEvent;
+    }
+}