xserver xkeyboard-config mesa git update 3 Jun 2011

12 files changed, 498 insertions, 446 deletions

diff --git a/xorg-server/hw/xquartz/GL/indirect.c b/xorg-server/hw/xquartz/GL/indirect.c
index 6da27c78a..c41840bee 100644
--- a/xorg-server/hw/xquartz/GL/indirect.c
+++ b/xorg-server/hw/xquartz/GL/indirect.c
@@ -155,12 +155,8 @@ typedef long long GLint64EXT;
 
 __GLXprovider * GlxGetDRISWrastProvider (void);
 
-// Write debugging output, or not
-#ifdef GLAQUA_DEBUG
-#define GLAQUA_DEBUG_MSG ErrorF
-#else
-#define GLAQUA_DEBUG_MSG(a, ...)
-#endif
+#include "darwin.h"
+#define GLAQUA_DEBUG_MSG(msg, args...) ASL_LOG(ASL_LEVEL_DEBUG, "GLXAqua", msg, ##args)
 
 static void setup_dispatch_table(void);
 GLuint __glFloorLog2(GLuint val);
@@ -666,7 +662,15 @@ GLuint __glFloorLog2(GLuint val)
 }
 
 static void setup_dispatch_table(void) {
-    struct _glapi_table *disp=_glapi_get_dispatch();
+    static struct _glapi_table *disp = NULL;
+
+    if(disp)  {
+        _glapi_set_dispatch(disp);
+        return;
+    }
+
+    disp=calloc(1,sizeof(struct _glapi_table));
+    assert(disp);
 
     /* to update:
      * for f in $(grep 'define SET_' ../../../glx/dispatch.h  | cut -f2 -d' ' | cut -f1 -d\( | sort -u); do grep -q $f indirect.c || echo $f ; done | grep -v by_offset | sed 's:SET_\(.*\)$:SET_\1(disp, gl\1)\;:' | pbcopy
@@ -1610,4 +1614,6 @@ static void setup_dispatch_table(void) {
     SET_PixelTexGenParameterivSGIS(disp, glPixelTexGenParameterivSGIS);
     SET_PixelTexGenSGIX(disp, glPixelTexGenSGIX);
 #endif
+
+    _glapi_set_dispatch(disp);
 }
diff --git a/xorg-server/hw/xquartz/X11Application.m b/xorg-server/hw/xquartz/X11Application.m
index 7c41cbcb5..a51ee828d 100644
--- a/xorg-server/hw/xquartz/X11Application.m
+++ b/xorg-server/hw/xquartz/X11Application.m
@@ -188,7 +188,7 @@ static void message_kit_thread (SEL selector, NSObject *arg) {
 
 - (void) activateX:(OSX_BOOL)state {
     size_t i;
-    DEBUG_LOG("state=%d, _x_active=%d, \n", state, _x_active)
+    DEBUG_LOG("state=%d, _x_active=%d, \n", state, _x_active);
     if (state) {
         if(bgMouseLocationUpdated) {
             DarwinSendPointerEvents(darwinPointer, MotionNotify, 0, bgMouseLocation.x, bgMouseLocation.y, 0.0, 0.0, 0.0);
diff --git a/xorg-server/hw/xquartz/darwin.c b/xorg-server/hw/xquartz/darwin.c
index fa8d4ced2..29ab83677 100644
--- a/xorg-server/hw/xquartz/darwin.c
+++ b/xorg-server/hw/xquartz/darwin.c
@@ -79,7 +79,7 @@
 
 aslclient aslc;
 
-void debug_asl (const char *file, const char *function, int line, const char *fmt, ...) {
+void xq_asl_log (int level, const char *subsystem, const char *file, const char *function, int line, const char *fmt, ...) {
     va_list args;
     aslmsg msg = asl_new(ASL_TYPE_MSG);
 
@@ -93,10 +93,12 @@ void debug_asl (const char *file, const char *function, int line, const char *fm
             asl_set(msg, "Line", _line);
             free(_line);
         }
+        if(subsystem)
+            asl_set(msg, "Subsystem", subsystem);
     }
 
     va_start(args, fmt);
-    asl_vlog(aslc, msg, ASL_LEVEL_DEBUG, fmt, args);
+    asl_vlog(aslc, msg, level, fmt, args);
     va_end(args);
 
     if(msg)
diff --git a/xorg-server/hw/xquartz/darwin.h b/xorg-server/hw/xquartz/darwin.h
index 659de432c..aafc12fbf 100644
--- a/xorg-server/hw/xquartz/darwin.h
+++ b/xorg-server/hw/xquartz/darwin.h
@@ -76,9 +76,11 @@ extern int              darwinMainScreenY;
 // bundle-main.c
 extern char *bundle_id_prefix;
 
-extern void debug_asl (const char *file, const char *function, int line, const char *fmt, ...) _X_ATTRIBUTE_PRINTF(4,5);
+_X_ATTRIBUTE_PRINTF(6,7)
+extern void xq_asl_log (int level, const char *subsystem, const char *file, const char *function, int line, const char *fmt, ...);
 
-#define DEBUG_LOG(msg, args...) debug_asl(__FILE__, __FUNCTION__, __LINE__, msg, ##args);
+#define ASL_LOG(level, subsystem, msg, args...) xq_asl_log(level, subsystem, __FILE__, __FUNCTION__, __LINE__, msg, ##args)
+#define DEBUG_LOG(msg, args...) ASL_LOG(ASL_LEVEL_DEBUG, "XQuartz", msg, ##args)
 #define TRACE() DEBUG_LOG("TRACE")
 
 #endif  /* _DARWIN_H */
diff --git a/xorg-server/hw/xquartz/mach-startup/Makefile.am b/xorg-server/hw/xquartz/mach-startup/Makefile.am
index 1ce54ad86..4b7b2bce3 100644
--- a/xorg-server/hw/xquartz/mach-startup/Makefile.am
+++ b/xorg-server/hw/xquartz/mach-startup/Makefile.am
@@ -22,9 +22,10 @@ X11_bin_LDADD = \
 	$(top_builddir)/dix/dixfonts.lo \
 	$(top_builddir)/miext/rootless/librootless.la \
 	$(top_builddir)/hw/xquartz/pbproxy/libxpbproxy.la \
-	$(DARWIN_LIBS) $(MAIN_LIB) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lXplugin
+	$(DARWIN_LIBS) $(MAIN_LIB) $(XSERVER_LIBS)
 
 X11_bin_LDFLAGS =  \
+	$(XSERVER_SYS_LIBS) -lXplugin \
 	-XCClinker -Objc \
 	-Wl,-u,_miDCInitialize \
 	-Wl,-framework,Carbon \
diff --git a/xorg-server/hw/xquartz/pbproxy/app-main.m b/xorg-server/hw/xquartz/pbproxy/app-main.m
index a8c3a6055..772c458a1 100644
--- a/xorg-server/hw/xquartz/pbproxy/app-main.m
+++ b/xorg-server/hw/xquartz/pbproxy/app-main.m
@@ -63,6 +63,17 @@ ErrorF(const char * f, ...)
     va_end(args);
 }
 
+/* TODO: Have this actually log to ASL */
+void xq_asl_log (int level, const char *subsystem, const char *file, const char *function, int line, const char *fmt, ...) {
+#ifdef DEBUG
+    va_list args;
+
+    va_start(args, fmt);
+    vfprintf(stderr, fmt, args);
+    va_end(args);
+#endif
+}
+
 int main (int argc, const char *argv[]) {
     const char *s;
     int i;
diff --git a/xorg-server/hw/xquartz/pbproxy/pbproxy.h b/xorg-server/hw/xquartz/pbproxy/pbproxy.h
index fcbf4c4ba..c80a660cc 100644
--- a/xorg-server/hw/xquartz/pbproxy/pbproxy.h
+++ b/xorg-server/hw/xquartz/pbproxy/pbproxy.h
@@ -32,6 +32,8 @@
 
 #import  <Foundation/Foundation.h>
 
+#include <asl.h>
+
 #include <AvailabilityMacros.h>
 #if MAC_OS_X_VERSION_MIN_REQUIRED < 1050
 #if __LP64__ || NS_BUILD_32_LIKE_64
@@ -80,13 +82,12 @@ extern BOOL xpbproxy_input_register (void);
 /* os/log.c or app-main.m */
 extern void ErrorF(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2);
 
-#ifdef DEBUG
-/* BEWARE: this can cause a string memory leak, according to the leaks program. */
-# define DebugF(msg, args...) ErrorF("%s:%s:%d " msg, __FILE__, __FUNCTION__, __LINE__, ##args)
-#else
-# define DebugF(...) /* */
-#endif
+/* from darwin.h */
+_X_ATTRIBUTE_PRINTF(6,7)
+extern void xq_asl_log (int level, const char *subsystem, const char *file, const char *function, int line, const char *fmt, ...);
 
-#define TRACE() DebugF("TRACE\n")
+#define ASL_LOG(level, subsystem, msg, args...) xq_asl_log(level, subsystem, __FILE__, __FUNCTION__, __LINE__, msg, ##args)
+#define DebugF(msg, args...) ASL_LOG(ASL_LEVEL_DEBUG, "xpbproxy", msg, ##args)
+#define TRACE() DebugF("TRACE")
 
 #endif /* PBPROXY_H */
diff --git a/xorg-server/hw/xquartz/pbproxy/x-selection.m b/xorg-server/hw/xquartz/pbproxy/x-selection.m
index 7964f5193..b5f4dde5c 100644
--- a/xorg-server/hw/xquartz/pbproxy/x-selection.m
+++ b/xorg-server/hw/xquartz/pbproxy/x-selection.m
@@ -683,7 +683,11 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete, Ato
 	return;
     }
 
+#ifdef __LP64__
+    DebugF ("pbtypes retainCount after containsObject: %lu\n", [pbtypes retainCount]);
+#else
     DebugF ("pbtypes retainCount after containsObject: %u\n", [pbtypes retainCount]);
+#endif
 
     data = [pb stringForType:NSStringPboardType];
 
@@ -704,7 +708,11 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete, Ato
 	
 	if (length < 50) {
 	    DebugF ("UTF-8: %s\n", bytes);
+#ifdef __LP64__
+	    DebugF ("UTF-8 length: %lu\n", length); 
+#else
 	    DebugF ("UTF-8 length: %u\n", length); 
+#endif
 	}
     } 
     else 
@@ -1223,8 +1231,13 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete, Ato
 	return;
     }
 
+#ifdef __LP64__
+    DebugF ("data retainCount before NSBitmapImageRep initWithData: %lu\n",
+	[data retainCount]);
+#else
     DebugF ("data retainCount before NSBitmapImageRep initWithData: %u\n",
 	[data retainCount]);
+#endif
 
     bmimage = [[NSBitmapImageRep alloc] initWithData:data];
 
@@ -1235,8 +1248,13 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete, Ato
 	return;
     }
 
+#ifdef __LP64__
+    DebugF ("data retainCount after NSBitmapImageRep initWithData: %lu\n", 
+	[data retainCount]);
+#else
     DebugF ("data retainCount after NSBitmapImageRep initWithData: %u\n", 
 	[data retainCount]);
+#endif
 
     @try 
     {
@@ -1251,7 +1269,11 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete, Ato
 	return;
     }
     
+#ifdef __LP64__
+    DebugF ("bmimage retainCount after TIFFRepresentation %lu\n", [bmimage retainCount]);
+#else
     DebugF ("bmimage retainCount after TIFFRepresentation %u\n", [bmimage retainCount]);
+#endif
 
     pbtypes = [NSArray arrayWithObjects:NSTIFFPboardType, nil];
 
@@ -1270,7 +1292,12 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete, Ato
 
     [data autorelease];
 
+#ifdef __LP64__
+    DebugF ("bmimage retainCount before release %lu\n", [bmimage retainCount]);
+#else
     DebugF ("bmimage retainCount before release %u\n", [bmimage retainCount]);
+#endif
+
     [bmimage autorelease];
 }
 
diff --git a/xorg-server/hw/xquartz/xpr/xpr.h b/xorg-server/hw/xquartz/xpr/xpr.h
index ebd89de3a..0b138ddd7 100644
--- a/xorg-server/hw/xquartz/xpr/xpr.h
+++ b/xorg-server/hw/xquartz/xpr/xpr.h
@@ -33,6 +33,11 @@
 #include "screenint.h"
 #include <Xplugin.h>
 
+#include "darwin.h"
+
+#undef DEBUG_LOG
+#define DEBUG_LOG(msg, args...) ASL_LOG(ASL_LEVEL_DEBUG, "xpr", msg, ##args)
+
 Bool QuartzModeBundleInit(void);
 
 void AppleDRIExtensionInit(void);
diff --git a/xorg-server/hw/xquartz/xpr/xprCursor.c b/xorg-server/hw/xquartz/xpr/xprCursor.c
index 4a789cef4..2b31865a5 100644
--- a/xorg-server/hw/xquartz/xpr/xprCursor.c
+++ b/xorg-server/hw/xquartz/xpr/xprCursor.c
@@ -1,424 +1,423 @@
-/**************************************************************

- *

- * Xplugin cursor support

- *

- * Copyright (c) 2001 Torrey T. Lyons and Greg Parker.

- * Copyright (c) 2002 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, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * The above copyright notice and this permission notice shall be included in

- * all copies or substantial portions of the Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

- * THE ABOVE LISTED COPYRIGHT HOLDER(S) 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(s) of the above copyright

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

- * use or other dealings in this Software without prior written authorization.

- */

-

-#include "sanitizedCarbon.h"

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include "quartz.h"

-#include "xpr.h"

-#include "darwin.h"

-#include "darwinEvents.h"

-#include <Xplugin.h>

-

-#include "mi.h"

-#include "scrnintstr.h"

-#include "cursorstr.h"

-#include "mipointrst.h"

-#include "windowstr.h"

-#include "globals.h"

-#include "servermd.h"

-#include "dixevents.h"

-#include "x-hash.h"

-

-typedef struct {

-    int                     cursorVisible;

-    QueryBestSizeProcPtr    QueryBestSize;

-    miPointerSpriteFuncPtr  spriteFuncs;

-} QuartzCursorScreenRec, *QuartzCursorScreenPtr;

-

-static DevPrivateKeyRec darwinCursorScreenKeyRec;

-#define darwinCursorScreenKey (&darwinCursorScreenKeyRec)

-

-#define CURSOR_PRIV(pScreen) ((QuartzCursorScreenPtr) \

-    dixLookupPrivate(&pScreen->devPrivates, darwinCursorScreenKey))

-

-static Bool

-load_cursor(CursorPtr src, int screen)

-{

-    uint32_t *data;

-    Bool free_data = FALSE;

-    uint32_t rowbytes;

-    int width, height;

-    int hot_x, hot_y;

-

-    uint32_t fg_color, bg_color;

-    uint8_t *srow, *sptr;

-    uint8_t *mrow, *mptr;

-    uint32_t *drow, *dptr;

-    unsigned xcount, ycount;

-

-    xp_error err;

-

-    width = src->bits->width;

-    height = src->bits->height;

-    hot_x = src->bits->xhot;

-    hot_y = src->bits->yhot;

-

-#ifdef ARGB_CURSOR

-    if (src->bits->argb != NULL)

-    {

-#if BITMAP_BIT_ORDER == MSBFirst

-        rowbytes = src->bits->width * sizeof (CARD32);

-        data = (uint32_t *) src->bits->argb;

-#else

-        const uint32_t *be_data=(uint32_t *) src->bits->argb;

-        unsigned i;

-        rowbytes = src->bits->width * sizeof (CARD32);

-        data = malloc(rowbytes * src->bits->height);

-        free_data = TRUE;

-        if(!data) {

-            FatalError("Failed to allocate memory in %s\n", __func__);

-        }

-        for(i=0;i<(src->bits->width*src->bits->height);i++)

-            data[i]=ntohl(be_data[i]);

-#endif

-    }

-    else

-#endif

-    {

-        fg_color = 0xFF00 | (src->foreRed >> 8);

-        fg_color <<= 16;

-        fg_color |= src->foreGreen & 0xFF00;

-        fg_color |= src->foreBlue >> 8;

-

-        bg_color = 0xFF00 | (src->backRed >> 8);

-        bg_color <<= 16;

-        bg_color |= src->backGreen & 0xFF00;

-        bg_color |= src->backBlue >> 8;

-

-        fg_color = htonl(fg_color);

-        bg_color = htonl(bg_color);

-

-        /* round up to 8 pixel boundary so we can convert whole bytes */

-        rowbytes = ((src->bits->width * 4) + 31) & ~31;

-        data = malloc(rowbytes * src->bits->height);

-        free_data = TRUE;

-        if(!data) {

-            FatalError("Failed to allocate memory in %s\n", __func__);

-        }

-        

-        if (!src->bits->emptyMask)

-        {

-            ycount = src->bits->height;

-            srow = src->bits->source; mrow = src->bits->mask;

-            drow = data;

-

-            while (ycount-- > 0)

-            {

-                xcount = bits_to_bytes(src->bits->width);

-                sptr = srow; mptr = mrow;

-                dptr = drow;

-

-                while (xcount-- > 0)

-                {

-                    uint8_t s, m;

-                    int i;

-

-                    s = *sptr++; m = *mptr++;

-                    for (i = 0; i < 8; i++)

-                    {

-#if BITMAP_BIT_ORDER == MSBFirst

-                        if (m & 128)

-                            *dptr++ = (s & 128) ? fg_color : bg_color;

-                        else

-                            *dptr++ = 0;

-                        s <<= 1; m <<= 1;

-#else

-                        if (m & 1)

-                            *dptr++ = (s & 1) ? fg_color : bg_color;

-                        else

-                            *dptr++ = 0;

-                        s >>= 1; m >>= 1;

-#endif

-                    }

-                }

-

-                srow += BitmapBytePad(src->bits->width);

-                mrow += BitmapBytePad(src->bits->width);

-                drow = (uint32_t *) ((char *) drow + rowbytes);

-            }

-        }

-        else

-        {

-            memset(data, 0, src->bits->height * rowbytes);

-        }

-    }

-

-    err = xp_set_cursor(width, height, hot_x, hot_y, data, rowbytes);

-    if(free_data)

-        free(data);

-    return err == Success;

-}

-

-

-/*

-===========================================================================

-

- Pointer sprite functions

-

-===========================================================================

-*/

-

-/*

- * QuartzRealizeCursor

- *  Convert the X cursor representation to native format if possible.

- */

-static Bool

-QuartzRealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)

-{

-    if(pCursor == NULL || pCursor->bits == NULL)

-        return FALSE;

-

-    /* FIXME: cache ARGB8888 representation? */

-

-    return TRUE;

-}

-

-

-/*

- * QuartzUnrealizeCursor

- *  Free the storage space associated with a realized cursor.

- */

-static Bool

-QuartzUnrealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)

-{

-    return TRUE;

-}

-

-

-/*

- * QuartzSetCursor

- *  Set the cursor sprite and position.

- */

-static void

-QuartzSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor, int x, int y)

-{

-    QuartzCursorScreenPtr ScreenPriv = CURSOR_PRIV(pScreen);

-

-    if (!XQuartzServerVisible)

-        return;

-

-    if (pCursor == NULL)

-    {

-        if (ScreenPriv->cursorVisible)

-        {

-            xp_hide_cursor();

-            ScreenPriv->cursorVisible = FALSE;

-        }

-    }

-    else

-    {

-        load_cursor(pCursor, pScreen->myNum);

-

-        if (!ScreenPriv->cursorVisible)

-        {

-            xp_show_cursor();

-            ScreenPriv->cursorVisible = TRUE;

-        }

-    }

-}

-

-/*

- * QuartzMoveCursor

- *  Move the cursor. This is a noop for us.

- */

-static void

-QuartzMoveCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)

-{

-}

-

-/*

-===========================================================================

-

- Pointer screen functions

-

-===========================================================================

-*/

-

-/*

- * QuartzCursorOffScreen

- */

-static Bool

-QuartzCursorOffScreen(ScreenPtr *pScreen, int *x, int *y)

-{

-    return FALSE;

-}

-

-

-/*

- * QuartzCrossScreen

- */

-static void

-QuartzCrossScreen(ScreenPtr pScreen, Bool entering)

-{

-    return;

-}

-

-

-/*

- * QuartzWarpCursor

- *  Change the cursor position without generating an event or motion history.

- *  The input coordinates (x,y) are in pScreen-local X11 coordinates.

- *

- */

-static void

-QuartzWarpCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)

-{

-    if (XQuartzServerVisible)

-    {

-        int sx, sy;

-

-        sx = pScreen->x + darwinMainScreenX;

-        sy = pScreen->y + darwinMainScreenY;

-

-        CGWarpMouseCursorPosition(CGPointMake(sx + x, sy + y));

-    }

-

-    miPointerWarpCursor(pDev, pScreen, x, y);

-    miPointerUpdateSprite(pDev);

-}

-

-

-static miPointerScreenFuncRec quartzScreenFuncsRec = {

-    QuartzCursorOffScreen,

-    QuartzCrossScreen,

-    QuartzWarpCursor,

-    NULL,

-    NULL

-};

-

-

-/*

-===========================================================================

-

- Other screen functions

-

-===========================================================================

-*/

-

-/*

- * QuartzCursorQueryBestSize

- *  Handle queries for best cursor size

- */

-static void

-QuartzCursorQueryBestSize(int class, unsigned short *width,

-                          unsigned short *height, ScreenPtr pScreen)

-{

-    QuartzCursorScreenPtr ScreenPriv = CURSOR_PRIV(pScreen);

-

-    if (class == CursorShape)

-    {

-        /* FIXME: query window server? */

-        *width = 32;

-        *height = 32;

-    }

-    else

-    {

-        (*ScreenPriv->QueryBestSize)(class, width, height, pScreen);

-    }

-}

-

-/*

- * QuartzInitCursor

- *  Initialize cursor support

- */

-Bool

-QuartzInitCursor(ScreenPtr pScreen)

-{

-    QuartzCursorScreenPtr ScreenPriv;

-    miPointerScreenPtr PointPriv;

-

-    /* initialize software cursor handling (always needed as backup) */

-    if (!miDCInitialize(pScreen, &quartzScreenFuncsRec))

-        return FALSE;

-

-    if (!dixRegisterPrivateKey(&darwinCursorScreenKeyRec, PRIVATE_SCREEN, 0))

-	return FALSE;

-

-    ScreenPriv = calloc(1, sizeof(QuartzCursorScreenRec));

-    if (ScreenPriv == NULL)

-        return FALSE;

-

-    /* CURSOR_PRIV(pScreen) = ScreenPriv; */

-    dixSetPrivate(&pScreen->devPrivates, darwinCursorScreenKey, ScreenPriv);

-

-    /* override some screen procedures */

-    ScreenPriv->QueryBestSize = pScreen->QueryBestSize;

-    pScreen->QueryBestSize = QuartzCursorQueryBestSize;

-

-    PointPriv = dixLookupPrivate(&pScreen->devPrivates, miPointerScreenKey);

-

-    ScreenPriv->spriteFuncs = PointPriv->spriteFuncs;

-

-    PointPriv->spriteFuncs->RealizeCursor = QuartzRealizeCursor;

-    PointPriv->spriteFuncs->UnrealizeCursor = QuartzUnrealizeCursor;

-    PointPriv->spriteFuncs->SetCursor = QuartzSetCursor;

-    PointPriv->spriteFuncs->MoveCursor = QuartzMoveCursor;

-    

-    ScreenPriv->cursorVisible = TRUE;

-    return TRUE;

-}

-

-/*

- * QuartzSuspendXCursor

- *  X server is hiding. Restore the Aqua cursor.

- */

-void

-QuartzSuspendXCursor(ScreenPtr pScreen)

-{

-}

-

-

-/*

- * QuartzResumeXCursor

- *  X server is showing. Restore the X cursor.

- */

-void

-QuartzResumeXCursor(ScreenPtr pScreen)

-{

-    WindowPtr pWin;

-    CursorPtr pCursor;

-

-    /* TODO: Tablet? */

-    

-    pWin = GetSpriteWindow(darwinPointer);

-    if (pWin->drawable.pScreen != pScreen)

-        return;

-

-    pCursor = GetSpriteCursor(darwinPointer);

-    if (pCursor == NULL)

-        return;

-

-    QuartzSetCursor(darwinPointer, pScreen, pCursor, /* x */ 0, /* y */ 0);

-}

+/**************************************************************
+ *
+ * Xplugin cursor support
+ *
+ * Copyright (c) 2001 Torrey T. Lyons and Greg Parker.
+ * Copyright (c) 2002 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, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE ABOVE LISTED COPYRIGHT HOLDER(S) 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(s) of the above copyright
+ * holders shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in this Software without prior written authorization.
+ */
+
+#include "sanitizedCarbon.h"
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include "quartz.h"
+#include "xpr.h"
+#include "darwinEvents.h"
+#include <Xplugin.h>
+
+#include "mi.h"
+#include "scrnintstr.h"
+#include "cursorstr.h"
+#include "mipointrst.h"
+#include "windowstr.h"
+#include "globals.h"
+#include "servermd.h"
+#include "dixevents.h"
+#include "x-hash.h"
+
+typedef struct {
+    int                     cursorVisible;
+    QueryBestSizeProcPtr    QueryBestSize;
+    miPointerSpriteFuncPtr  spriteFuncs;
+} QuartzCursorScreenRec, *QuartzCursorScreenPtr;
+
+static DevPrivateKeyRec darwinCursorScreenKeyRec;
+#define darwinCursorScreenKey (&darwinCursorScreenKeyRec)
+
+#define CURSOR_PRIV(pScreen) ((QuartzCursorScreenPtr) \
+    dixLookupPrivate(&pScreen->devPrivates, darwinCursorScreenKey))
+
+static Bool
+load_cursor(CursorPtr src, int screen)
+{
+    uint32_t *data;
+    Bool free_data = FALSE;
+    uint32_t rowbytes;
+    int width, height;
+    int hot_x, hot_y;
+
+    uint32_t fg_color, bg_color;
+    uint8_t *srow, *sptr;
+    uint8_t *mrow, *mptr;
+    uint32_t *drow, *dptr;
+    unsigned xcount, ycount;
+
+    xp_error err;
+
+    width = src->bits->width;
+    height = src->bits->height;
+    hot_x = src->bits->xhot;
+    hot_y = src->bits->yhot;
+
+#ifdef ARGB_CURSOR
+    if (src->bits->argb != NULL)
+    {
+#if BITMAP_BIT_ORDER == MSBFirst
+        rowbytes = src->bits->width * sizeof (CARD32);
+        data = (uint32_t *) src->bits->argb;
+#else
+        const uint32_t *be_data=(uint32_t *) src->bits->argb;
+        unsigned i;
+        rowbytes = src->bits->width * sizeof (CARD32);
+        data = malloc(rowbytes * src->bits->height);
+        free_data = TRUE;
+        if(!data) {
+            FatalError("Failed to allocate memory in %s\n", __func__);
+        }
+        for(i=0;i<(src->bits->width*src->bits->height);i++)
+            data[i]=ntohl(be_data[i]);
+#endif
+    }
+    else
+#endif
+    {
+        fg_color = 0xFF00 | (src->foreRed >> 8);
+        fg_color <<= 16;
+        fg_color |= src->foreGreen & 0xFF00;
+        fg_color |= src->foreBlue >> 8;
+
+        bg_color = 0xFF00 | (src->backRed >> 8);
+        bg_color <<= 16;
+        bg_color |= src->backGreen & 0xFF00;
+        bg_color |= src->backBlue >> 8;
+
+        fg_color = htonl(fg_color);
+        bg_color = htonl(bg_color);
+
+        /* round up to 8 pixel boundary so we can convert whole bytes */
+        rowbytes = ((src->bits->width * 4) + 31) & ~31;
+        data = malloc(rowbytes * src->bits->height);
+        free_data = TRUE;
+        if(!data) {
+            FatalError("Failed to allocate memory in %s\n", __func__);
+        }
+        
+        if (!src->bits->emptyMask)
+        {
+            ycount = src->bits->height;
+            srow = src->bits->source; mrow = src->bits->mask;
+            drow = data;
+
+            while (ycount-- > 0)
+            {
+                xcount = bits_to_bytes(src->bits->width);
+                sptr = srow; mptr = mrow;
+                dptr = drow;
+
+                while (xcount-- > 0)
+                {
+                    uint8_t s, m;
+                    int i;
+
+                    s = *sptr++; m = *mptr++;
+                    for (i = 0; i < 8; i++)
+                    {
+#if BITMAP_BIT_ORDER == MSBFirst
+                        if (m & 128)
+                            *dptr++ = (s & 128) ? fg_color : bg_color;
+                        else
+                            *dptr++ = 0;
+                        s <<= 1; m <<= 1;
+#else
+                        if (m & 1)
+                            *dptr++ = (s & 1) ? fg_color : bg_color;
+                        else
+                            *dptr++ = 0;
+                        s >>= 1; m >>= 1;
+#endif
+                    }
+                }
+
+                srow += BitmapBytePad(src->bits->width);
+                mrow += BitmapBytePad(src->bits->width);
+                drow = (uint32_t *) ((char *) drow + rowbytes);
+            }
+        }
+        else
+        {
+            memset(data, 0, src->bits->height * rowbytes);
+        }
+    }
+
+    err = xp_set_cursor(width, height, hot_x, hot_y, data, rowbytes);
+    if(free_data)
+        free(data);
+    return err == Success;
+}
+
+
+/*
+===========================================================================
+
+ Pointer sprite functions
+
+===========================================================================
+*/
+
+/*
+ * QuartzRealizeCursor
+ *  Convert the X cursor representation to native format if possible.
+ */
+static Bool
+QuartzRealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
+{
+    if(pCursor == NULL || pCursor->bits == NULL)
+        return FALSE;
+
+    /* FIXME: cache ARGB8888 representation? */
+
+    return TRUE;
+}
+
+
+/*
+ * QuartzUnrealizeCursor
+ *  Free the storage space associated with a realized cursor.
+ */
+static Bool
+QuartzUnrealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
+{
+    return TRUE;
+}
+
+
+/*
+ * QuartzSetCursor
+ *  Set the cursor sprite and position.
+ */
+static void
+QuartzSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor, int x, int y)
+{
+    QuartzCursorScreenPtr ScreenPriv = CURSOR_PRIV(pScreen);
+
+    if (!XQuartzServerVisible)
+        return;
+
+    if (pCursor == NULL)
+    {
+        if (ScreenPriv->cursorVisible)
+        {
+            xp_hide_cursor();
+            ScreenPriv->cursorVisible = FALSE;
+        }
+    }
+    else
+    {
+        load_cursor(pCursor, pScreen->myNum);
+
+        if (!ScreenPriv->cursorVisible)
+        {
+            xp_show_cursor();
+            ScreenPriv->cursorVisible = TRUE;
+        }
+    }
+}
+
+/*
+ * QuartzMoveCursor
+ *  Move the cursor. This is a noop for us.
+ */
+static void
+QuartzMoveCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
+{
+}
+
+/*
+===========================================================================
+
+ Pointer screen functions
+
+===========================================================================
+*/
+
+/*
+ * QuartzCursorOffScreen
+ */
+static Bool
+QuartzCursorOffScreen(ScreenPtr *pScreen, int *x, int *y)
+{
+    return FALSE;
+}
+
+
+/*
+ * QuartzCrossScreen
+ */
+static void
+QuartzCrossScreen(ScreenPtr pScreen, Bool entering)
+{
+    return;
+}
+
+
+/*
+ * QuartzWarpCursor
+ *  Change the cursor position without generating an event or motion history.
+ *  The input coordinates (x,y) are in pScreen-local X11 coordinates.
+ *
+ */
+static void
+QuartzWarpCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
+{
+    if (XQuartzServerVisible)
+    {
+        int sx, sy;
+
+        sx = pScreen->x + darwinMainScreenX;
+        sy = pScreen->y + darwinMainScreenY;
+
+        CGWarpMouseCursorPosition(CGPointMake(sx + x, sy + y));
+    }
+
+    miPointerWarpCursor(pDev, pScreen, x, y);
+    miPointerUpdateSprite(pDev);
+}
+
+
+static miPointerScreenFuncRec quartzScreenFuncsRec = {
+    QuartzCursorOffScreen,
+    QuartzCrossScreen,
+    QuartzWarpCursor,
+    NULL,
+    NULL
+};
+
+
+/*
+===========================================================================
+
+ Other screen functions
+
+===========================================================================
+*/
+
+/*
+ * QuartzCursorQueryBestSize
+ *  Handle queries for best cursor size
+ */
+static void
+QuartzCursorQueryBestSize(int class, unsigned short *width,
+                          unsigned short *height, ScreenPtr pScreen)
+{
+    QuartzCursorScreenPtr ScreenPriv = CURSOR_PRIV(pScreen);
+
+    if (class == CursorShape)
+    {
+        /* FIXME: query window server? */
+        *width = 32;
+        *height = 32;
+    }
+    else
+    {
+        (*ScreenPriv->QueryBestSize)(class, width, height, pScreen);
+    }
+}
+
+/*
+ * QuartzInitCursor
+ *  Initialize cursor support
+ */
+Bool
+QuartzInitCursor(ScreenPtr pScreen)
+{
+    QuartzCursorScreenPtr ScreenPriv;
+    miPointerScreenPtr PointPriv;
+
+    /* initialize software cursor handling (always needed as backup) */
+    if (!miDCInitialize(pScreen, &quartzScreenFuncsRec))
+        return FALSE;
+
+    if (!dixRegisterPrivateKey(&darwinCursorScreenKeyRec, PRIVATE_SCREEN, 0))
+	return FALSE;
+
+    ScreenPriv = calloc(1, sizeof(QuartzCursorScreenRec));
+    if (ScreenPriv == NULL)
+        return FALSE;
+
+    /* CURSOR_PRIV(pScreen) = ScreenPriv; */
+    dixSetPrivate(&pScreen->devPrivates, darwinCursorScreenKey, ScreenPriv);
+
+    /* override some screen procedures */
+    ScreenPriv->QueryBestSize = pScreen->QueryBestSize;
+    pScreen->QueryBestSize = QuartzCursorQueryBestSize;
+
+    PointPriv = dixLookupPrivate(&pScreen->devPrivates, miPointerScreenKey);
+
+    ScreenPriv->spriteFuncs = PointPriv->spriteFuncs;
+
+    PointPriv->spriteFuncs->RealizeCursor = QuartzRealizeCursor;
+    PointPriv->spriteFuncs->UnrealizeCursor = QuartzUnrealizeCursor;
+    PointPriv->spriteFuncs->SetCursor = QuartzSetCursor;
+    PointPriv->spriteFuncs->MoveCursor = QuartzMoveCursor;
+    
+    ScreenPriv->cursorVisible = TRUE;
+    return TRUE;
+}
+
+/*
+ * QuartzSuspendXCursor
+ *  X server is hiding. Restore the Aqua cursor.
+ */
+void
+QuartzSuspendXCursor(ScreenPtr pScreen)
+{
+}
+
+
+/*
+ * QuartzResumeXCursor
+ *  X server is showing. Restore the X cursor.
+ */
+void
+QuartzResumeXCursor(ScreenPtr pScreen)
+{
+    WindowPtr pWin;
+    CursorPtr pCursor;
+
+    /* TODO: Tablet? */
+    
+    pWin = GetSpriteWindow(darwinPointer);
+    if (pWin->drawable.pScreen != pScreen)
+        return;
+
+    pCursor = GetSpriteCursor(darwinPointer);
+    if (pCursor == NULL)
+        return;
+
+    QuartzSetCursor(darwinPointer, pScreen, pCursor, /* x */ 0, /* y */ 0);
+}
diff --git a/xorg-server/hw/xquartz/xpr/xprEvent.c b/xorg-server/hw/xquartz/xpr/xprEvent.c
index cc86c473d..4e7ece64f 100644
--- a/xorg-server/hw/xquartz/xpr/xprEvent.c
+++ b/xorg-server/hw/xquartz/xpr/xprEvent.c
@@ -44,7 +44,6 @@
 #include   "scrnintstr.h"
 #include   "mipointer.h"
 
-#include "darwin.h"
 #include "quartz.h"
 #include "quartzKeyboard.h"
 #include "darwinEvents.h"
diff --git a/xorg-server/hw/xquartz/xpr/xprScreen.c b/xorg-server/hw/xquartz/xpr/xprScreen.c
index 98250e641..002355eca 100644
--- a/xorg-server/hw/xquartz/xpr/xprScreen.c
+++ b/xorg-server/hw/xquartz/xpr/xprScreen.c
@@ -40,7 +40,6 @@
 #include "xpr.h"
 #include "xprEvent.h"
 #include "pseudoramiX.h"
-#include "darwin.h"
 #include "darwinEvents.h"
 #include "rootless.h"
 #include "dri.h"