xserver xkeyboard-config mesa git update 28 Mar 2011

7 files changed, 1756 insertions, 1877 deletions

diff --git a/xorg-server/hw/xquartz/applewm.c b/xorg-server/hw/xquartz/applewm.c
index d81032aa9..2f26e61d9 100644
--- a/xorg-server/hw/xquartz/applewm.c
+++ b/xorg-server/hw/xquartz/applewm.c
@@ -1,736 +1,736 @@
-/**************************************************************************

-

-Copyright (c) 2002-2007 Apple Inc. All Rights Reserved.

-Copyright (c) 2003 Torrey T. Lyons. 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.

-

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

-

-#include "sanitizedCarbon.h"

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include "quartzCommon.h"

-

-#include "misc.h"

-#include "dixstruct.h"

-#include "globals.h"

-#include "extnsionst.h"

-#include "colormapst.h"

-#include "cursorstr.h"

-#include "scrnintstr.h"

-#include "windowstr.h"

-#include "servermd.h"

-#include "swaprep.h"

-#include "propertyst.h"

-#include <X11/Xatom.h>

-#include "darwin.h"

-#define _APPLEWM_SERVER_

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

-#include "applewmExt.h"

-#include "X11Application.h"

-#include "protocol-versions.h"

-

-#define DEFINE_ATOM_HELPER(func,atom_name)                      \

-static Atom func (void) {                                       \

-    static int generation;                                      \

-    static Atom atom;                                           \

-    if (generation != serverGeneration) {                       \

-        generation = serverGeneration;                          \

-        atom = MakeAtom (atom_name, strlen (atom_name), TRUE);  \

-    }                                                           \

-    return atom;                                                \

-}

-

-DEFINE_ATOM_HELPER(xa_native_screen_origin, "_NATIVE_SCREEN_ORIGIN")

-DEFINE_ATOM_HELPER (xa_apple_no_order_in, "_APPLE_NO_ORDER_IN")

-

-static AppleWMProcsPtr appleWMProcs;

-

-static int WMErrorBase;

-

-

-static unsigned char WMReqCode = 0;

-static int WMEventBase = 0;

-

-static RESTYPE ClientType, EventType; /* resource types for event masks */

-static XID eventResource;

-

-/* Currently selected events */

-static unsigned int eventMask = 0;

-

-static int WMFreeClient (pointer data, XID id);

-static int WMFreeEvents (pointer data, XID id);

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

-

-typedef struct _WMEvent *WMEventPtr;

-typedef struct _WMEvent {

-    WMEventPtr      next;

-    ClientPtr       client;

-    XID             clientResource;

-    unsigned int    mask;

-} WMEventRec;

-

-static inline BoxRec

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

-{

-    BoxRec r;

-    r.x1 = x;

-    r.y1 = y;

-    r.x2 = x + w;

-    r.y2 = y + h;

-    return r;

-}

-

-/* Updates the _NATIVE_SCREEN_ORIGIN property on the given root window. */

-void

-AppleWMSetScreenOrigin(

-    WindowPtr pWin

-)

-{

-    int32_t data[2];

-

-    data[0] = pWin->drawable.pScreen->x + darwinMainScreenX;

-    data[1] = pWin->drawable.pScreen->y + darwinMainScreenY;

-

-    dixChangeWindowProperty(serverClient, pWin, xa_native_screen_origin(),

-			    XA_INTEGER, 32, PropModeReplace, 2, data, TRUE);

-}

-

-/* Window managers can set the _APPLE_NO_ORDER_IN property on windows

-   that are being genie-restored from the Dock. We want them to

-   be mapped but remain ordered-out until the animation

-   completes (when the Dock will order them in). */

-Bool

-AppleWMDoReorderWindow(

-    WindowPtr pWin

-)

-{

-    Atom atom;

-    PropertyPtr prop;

-    int rc;

-

-    atom = xa_apple_no_order_in();

-    rc = dixLookupProperty(&prop, pWin, atom, serverClient, DixReadAccess);

-    

-    if(Success == rc && prop->type == atom)

-	return 0;

-    

-    return 1;

-}

-

-

-static int

-ProcAppleWMQueryVersion(

-    register ClientPtr client

-)

-{

-    xAppleWMQueryVersionReply rep;

-    register int n;

-

-    REQUEST_SIZE_MATCH(xAppleWMQueryVersionReq);

-    rep.type = X_Reply;

-    rep.length = 0;

-    rep.sequenceNumber = client->sequence;

-    rep.majorVersion = SERVER_APPLEWM_MAJOR_VERSION;

-    rep.minorVersion = SERVER_APPLEWM_MINOR_VERSION;

-    rep.patchVersion = SERVER_APPLEWM_PATCH_VERSION;

-    if (client->swapped) {

-        swaps(&rep.sequenceNumber, n);

-        swapl(&rep.length, n);

-    }

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

-    return Success;

-}

-

-

-/* events */

-

-static inline void

-updateEventMask (WMEventPtr *pHead)

-{

-    WMEventPtr pCur;

-

-    eventMask = 0;

-    for (pCur = *pHead; pCur != NULL; pCur = pCur->next)

-        eventMask |= pCur->mask;

-}

-

-/*ARGSUSED*/

-static int

-WMFreeClient (pointer data, XID id) {

-    WMEventPtr   pEvent;

-    WMEventPtr   *pHead, pCur, pPrev;

-    int i;

-

-    pEvent = (WMEventPtr) data;

-    i = dixLookupResourceByType((pointer *)&pHead, eventResource, EventType, serverClient, DixReadAccess | DixWriteAccess | DixDestroyAccess);

-    if (i == Success && pHead) {

-        pPrev = 0;

-        for (pCur = *pHead; pCur && pCur != pEvent; pCur=pCur->next)

-            pPrev = pCur;

-        if (pCur) {

-            if (pPrev)

-                pPrev->next = pEvent->next;

-            else

-                *pHead = pEvent->next;

-        }

-        updateEventMask (pHead);

-    }

-    free((pointer) pEvent);

-    return 1;

-}

-

-/*ARGSUSED*/

-static int

-WMFreeEvents (pointer data, XID id) {

-    WMEventPtr   *pHead, pCur, pNext;

-

-    pHead = (WMEventPtr *) data;

-    for (pCur = *pHead; pCur; pCur = pNext) {

-        pNext = pCur->next;

-        FreeResource (pCur->clientResource, ClientType);

-        free((pointer) pCur);

-    }

-    free((pointer) pHead);

-    eventMask = 0;

-    return 1;

-}

-

-static int

-ProcAppleWMSelectInput (register ClientPtr client)

-{

-    REQUEST(xAppleWMSelectInputReq);

-    WMEventPtr      pEvent, pNewEvent, *pHead;

-    XID             clientResource;

-    int             i;

-

-    REQUEST_SIZE_MATCH (xAppleWMSelectInputReq);

-    i = dixLookupResourceByType((pointer *)&pHead, eventResource, EventType, client, DixWriteAccess);

-    if (stuff->mask != 0) {

-        if (i == Success && pHead) {

-            /* check for existing entry. */

-            for (pEvent = *pHead; pEvent; pEvent = pEvent->next)

-            {

-                if (pEvent->client == client)

-                {

-                    pEvent->mask = stuff->mask;

-                    updateEventMask (pHead);

-                    return Success;

-                }

-            }

-        }

-

-        /* build the entry */

-        pNewEvent = (WMEventPtr) malloc(sizeof (WMEventRec));

-        if (!pNewEvent)

-            return BadAlloc;

-        pNewEvent->next = 0;

-        pNewEvent->client = client;

-        pNewEvent->mask = stuff->mask;

-        /*

-         * add a resource that will be deleted when

-         * the client goes away

-         */

-        clientResource = FakeClientID (client->index);

-        pNewEvent->clientResource = clientResource;

-        if (!AddResource (clientResource, ClientType, (pointer)pNewEvent))

-            return BadAlloc;

-        /*

-         * create a resource to contain a pointer to the list

-         * of clients selecting input.  This must be indirect as

-         * the list may be arbitrarily rearranged which cannot be

-         * done through the resource database.

-         */

-        if (i != Success || !pHead)

-        {

-            pHead = (WMEventPtr *) malloc(sizeof (WMEventPtr));

-            if (!pHead ||

-                !AddResource (eventResource, EventType, (pointer)pHead))

-            {

-                FreeResource (clientResource, RT_NONE);

-                return BadAlloc;

-            }

-            *pHead = 0;

-        }

-        pNewEvent->next = *pHead;

-        *pHead = pNewEvent;

-        updateEventMask (pHead);

-    } else if (stuff->mask == 0) {

-        /* delete the interest */

-        if (i == Success && pHead) {

-            pNewEvent = 0;

-            for (pEvent = *pHead; pEvent; pEvent = pEvent->next) {

-                if (pEvent->client == client)

-                    break;

-                pNewEvent = pEvent;

-            }

-            if (pEvent) {

-                FreeResource (pEvent->clientResource, ClientType);

-                if (pNewEvent)

-                    pNewEvent->next = pEvent->next;

-                else

-                    *pHead = pEvent->next;

-                free(pEvent);

-                updateEventMask (pHead);

-            }

-        }

-    } else {

-        client->errorValue = stuff->mask;

-        return BadValue;

-    }

-    return Success;

-}

-

-/*

- * deliver the event

- */

-

-void

-AppleWMSendEvent (int type, unsigned int mask, int which, int arg) {

-    WMEventPtr      *pHead, pEvent;

-    xAppleWMNotifyEvent se;

-    int             i;

-

-    i = dixLookupResourceByType((pointer *)&pHead, eventResource, EventType, serverClient, DixReadAccess);

-    if (i != Success || !pHead)

-        return;

-    for (pEvent = *pHead; pEvent; pEvent = pEvent->next) {

-        if ((pEvent->mask & mask) == 0)

-            continue;

-        se.type = type + WMEventBase;

-        se.kind = which;

-        se.arg = arg;

-        se.time = currentTime.milliseconds;

-        WriteEventsToClient (pEvent->client, 1, (xEvent *) &se);

-    }

-}

-

-/* Safe to call from any thread. */

-unsigned int

-AppleWMSelectedEvents (void)

-{

-    return eventMask;

-}

-

-

-/* general utility functions */

-

-static int

-ProcAppleWMDisableUpdate(

-    register ClientPtr client

-)

-{

-    REQUEST_SIZE_MATCH(xAppleWMDisableUpdateReq);

-

-    appleWMProcs->DisableUpdate();

-

-    return Success;

-}

-

-static int

-ProcAppleWMReenableUpdate(

-    register ClientPtr client

-)

-{

-    REQUEST_SIZE_MATCH(xAppleWMReenableUpdateReq);

-

-    appleWMProcs->EnableUpdate();

-

-    return Success;

-}

-

-

-/* window functions */

-

-static int

-ProcAppleWMSetWindowMenu(

-    register ClientPtr client

-)

-{

-    const char *bytes, **items;

-    char *shortcuts;

-    int max_len, nitems, i, j;

-    REQUEST(xAppleWMSetWindowMenuReq);

-

-    REQUEST_AT_LEAST_SIZE(xAppleWMSetWindowMenuReq);

-

-    nitems = stuff->nitems;

-    items = malloc(sizeof (char *) * nitems);

-    shortcuts = malloc(sizeof (char) * nitems);

-

-    max_len = (stuff->length << 2) - sizeof(xAppleWMSetWindowMenuReq);

-    bytes = (char *) &stuff[1];

-

-    for (i = j = 0; i < max_len && j < nitems;)

-    {

-        shortcuts[j] = bytes[i++];

-        items[j++] = bytes + i;

-

-        while (i < max_len)

-        {

-            if (bytes[i++] == 0)

-                break;

-        }

-    }

-    X11ApplicationSetWindowMenu (nitems, items, shortcuts);

-    free(items);

-    free(shortcuts);

-

-    return Success;

-}

-

-static int

-ProcAppleWMSetWindowMenuCheck(

-    register ClientPtr client

-)

-{

-    REQUEST(xAppleWMSetWindowMenuCheckReq);

-

-    REQUEST_SIZE_MATCH(xAppleWMSetWindowMenuCheckReq);

-    X11ApplicationSetWindowMenuCheck(stuff->index);

-    return Success;

-}

-

-static int

-ProcAppleWMSetFrontProcess(

-    register ClientPtr client

-)

-{

-    REQUEST_SIZE_MATCH(xAppleWMSetFrontProcessReq);

-

-    X11ApplicationSetFrontProcess();

-    return Success;

-}

-

-static int

-ProcAppleWMSetWindowLevel(register ClientPtr client)

-{

-    REQUEST(xAppleWMSetWindowLevelReq);

-    WindowPtr pWin;

-    int err;

-

-    REQUEST_SIZE_MATCH(xAppleWMSetWindowLevelReq);

-

-    if (Success != dixLookupWindow(&pWin, stuff->window, client,

-				   DixReadAccess))

-        return BadValue;

-

-    if (stuff->level < 0 || stuff->level >= AppleWMNumWindowLevels) {

-        return BadValue;

-    }

-

-     err = appleWMProcs->SetWindowLevel(pWin, stuff->level);

-     if (err != Success) {

-        return err;

-    }

-

-    return Success;

-}

-

-static int

-ProcAppleWMSendPSN(register ClientPtr client)

-{

-    REQUEST(xAppleWMSendPSNReq);

-    int err;

-    

-    REQUEST_SIZE_MATCH(xAppleWMSendPSNReq);

-    

-    if(!appleWMProcs->SendPSN)

-        return BadRequest;

-

-    err = appleWMProcs->SendPSN(stuff->psn_hi, stuff->psn_lo);

-    if (err != Success) {

-        return err;

-    }

-

-    return Success;

-}

-

-static int

-ProcAppleWMAttachTransient(register ClientPtr client)

-{

-    WindowPtr pWinChild, pWinParent;

-    REQUEST(xAppleWMAttachTransientReq);

-    int err;

-    

-    REQUEST_SIZE_MATCH(xAppleWMAttachTransientReq);

-    

-    if(!appleWMProcs->AttachTransient)

-        return BadRequest;

-

-    if (Success != dixLookupWindow(&pWinChild, stuff->child, client, DixReadAccess))

-        return BadValue;

-

-    if(stuff->parent) {

-        if(Success != dixLookupWindow(&pWinParent, stuff->parent, client, DixReadAccess))

-            return BadValue;

-    } else {

-        pWinParent = NULL;

-    }

-

-    err = appleWMProcs->AttachTransient(pWinChild, pWinParent);

-    if (err != Success) {

-        return err;

-    }

-

-    return Success;

-}

-

-static int

-ProcAppleWMSetCanQuit(

-    register ClientPtr client

-)

-{

-    REQUEST(xAppleWMSetCanQuitReq);

-

-    REQUEST_SIZE_MATCH(xAppleWMSetCanQuitReq);

-

-    X11ApplicationSetCanQuit(stuff->state);

-    return Success;

-}

-

-

-/* frame functions */

-

-static int

-ProcAppleWMFrameGetRect(

-    register ClientPtr client

-)

-{

-    xAppleWMFrameGetRectReply rep;

-    BoxRec ir, or, rr;

-    REQUEST(xAppleWMFrameGetRectReq);

-

-    REQUEST_SIZE_MATCH(xAppleWMFrameGetRectReq);

-    rep.type = X_Reply;

-    rep.length = 0;

-    rep.sequenceNumber = client->sequence;

-

-    ir = make_box (stuff->ix, stuff->iy, stuff->iw, stuff->ih);

-    or = make_box (stuff->ox, stuff->oy, stuff->ow, stuff->oh);

-

-    if (appleWMProcs->FrameGetRect(stuff->frame_rect,

-                                   stuff->frame_class,

-                                   &or, &ir, &rr) != Success)

-    {

-        return BadValue;

-    }

-

-    rep.x = rr.x1;

-    rep.y = rr.y1;

-    rep.w = rr.x2 - rr.x1;

-    rep.h = rr.y2 - rr.y1;

-

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

-    return Success;

-}

-

-static int

-ProcAppleWMFrameHitTest(

-    register ClientPtr client

-)

-{

-    xAppleWMFrameHitTestReply rep;

-    BoxRec ir, or;

-    int ret;

-    REQUEST(xAppleWMFrameHitTestReq);

-

-    REQUEST_SIZE_MATCH(xAppleWMFrameHitTestReq);

-    rep.type = X_Reply;

-    rep.length = 0;

-    rep.sequenceNumber = client->sequence;

-

-    ir = make_box (stuff->ix, stuff->iy, stuff->iw, stuff->ih);

-    or = make_box (stuff->ox, stuff->oy, stuff->ow, stuff->oh);

-

-    if (appleWMProcs->FrameHitTest(stuff->frame_class, stuff->px,

-                                   stuff->py, &or, &ir, &ret) != Success)

-    {

-        return BadValue;

-    }

-

-    rep.ret = ret;

-

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

-    return Success;

-}

-

-static int

-ProcAppleWMFrameDraw(

-    register ClientPtr client

-)

-{

-    BoxRec ir, or;

-    unsigned int title_length, title_max;

-    unsigned char *title_bytes;

-    REQUEST(xAppleWMFrameDrawReq);

-    WindowPtr pWin;

-

-    REQUEST_AT_LEAST_SIZE(xAppleWMFrameDrawReq);

-

-    if (Success != dixLookupWindow(&pWin, stuff->window, client,

-				   DixReadAccess))

-        return BadValue;

-

-    ir = make_box (stuff->ix, stuff->iy, stuff->iw, stuff->ih);

-    or = make_box (stuff->ox, stuff->oy, stuff->ow, stuff->oh);

-

-    title_length = stuff->title_length;

-    title_max = (stuff->length << 2) - sizeof(xAppleWMFrameDrawReq);

-

-    if (title_max < title_length)

-        return BadValue;

-

-    title_bytes = (unsigned char *) &stuff[1];

-

-    errno = appleWMProcs->FrameDraw(pWin, stuff->frame_class,

-                                    stuff->frame_attr, &or, &ir,

-                                    title_length, title_bytes);

-    if (errno != Success) {

-        return errno;

-    }

-

-    return Success;

-}

-

-

-/* dispatch */

-

-static int

-ProcAppleWMDispatch (

-    register ClientPtr  client

-)

-{

-    REQUEST(xReq);

-

-    switch (stuff->data)

-    {

-    case X_AppleWMQueryVersion:

-        return ProcAppleWMQueryVersion(client);

-    }

-

-    if (!LocalClient(client))

-        return WMErrorBase + AppleWMClientNotLocal;

-

-    switch (stuff->data)

-    {

-    case X_AppleWMSelectInput:

-        return ProcAppleWMSelectInput(client);

-    case X_AppleWMDisableUpdate:

-        return ProcAppleWMDisableUpdate(client);

-    case X_AppleWMReenableUpdate:

-        return ProcAppleWMReenableUpdate(client);

-    case X_AppleWMSetWindowMenu:

-        return ProcAppleWMSetWindowMenu(client);

-    case X_AppleWMSetWindowMenuCheck:

-        return ProcAppleWMSetWindowMenuCheck(client);

-    case X_AppleWMSetFrontProcess:

-        return ProcAppleWMSetFrontProcess(client);

-    case X_AppleWMSetWindowLevel:

-        return ProcAppleWMSetWindowLevel(client);

-    case X_AppleWMSetCanQuit:

-        return ProcAppleWMSetCanQuit(client);

-    case X_AppleWMFrameGetRect:

-        return ProcAppleWMFrameGetRect(client);

-    case X_AppleWMFrameHitTest:

-        return ProcAppleWMFrameHitTest(client);

-    case X_AppleWMFrameDraw:

-        return ProcAppleWMFrameDraw(client);

-    case X_AppleWMSendPSN:

-        return ProcAppleWMSendPSN(client);

-    case X_AppleWMAttachTransient:

-        return ProcAppleWMAttachTransient(client);

-    default:

-        return BadRequest;

-    }

-}

-

-static void

-SNotifyEvent(xAppleWMNotifyEvent *from, xAppleWMNotifyEvent *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

-SProcAppleWMQueryVersion(

-    register ClientPtr  client

-)

-{

-    register int n;

-    REQUEST(xAppleWMQueryVersionReq);

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

-    return ProcAppleWMQueryVersion(client);

-}

-

-static int

-SProcAppleWMDispatch (

-    register ClientPtr  client

-)

-{

-    REQUEST(xReq);

-

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

-    if (!LocalClient(client))

-        return WMErrorBase + AppleWMClientNotLocal;

-

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

-    switch (stuff->data)

-    {

-    case X_AppleWMQueryVersion:

-        return SProcAppleWMQueryVersion(client);

-    default:

-        return BadRequest;

-    }

-}

-

-void

-AppleWMExtensionInit(

-    AppleWMProcsPtr procsPtr)

-{

-    ExtensionEntry* extEntry;

-

-    ClientType = CreateNewResourceType(WMFreeClient, "WMClient");

-    EventType = CreateNewResourceType(WMFreeEvents, "WMEvent");

-    eventResource = FakeClientID(0);

-

-    if (ClientType && EventType &&

-        (extEntry = AddExtension(APPLEWMNAME,

-                                 AppleWMNumberEvents,

-                                 AppleWMNumberErrors,

-                                 ProcAppleWMDispatch,

-                                 SProcAppleWMDispatch,

-                                 NULL,

-                                 StandardMinorOpcode)))

-    {

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

-        WMErrorBase = extEntry->errorBase;

-        WMEventBase = extEntry->eventBase;

-        EventSwapVector[WMEventBase] = (EventSwapPtr) SNotifyEvent;

-        appleWMProcs = procsPtr;

-    }

-}

+/**************************************************************************
+
+Copyright (c) 2002-2007 Apple Inc. All Rights Reserved.
+Copyright (c) 2003 Torrey T. Lyons. 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.
+
+**************************************************************************/
+
+#include "sanitizedCarbon.h"
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include "quartzCommon.h"
+
+#include "misc.h"
+#include "dixstruct.h"
+#include "globals.h"
+#include "extnsionst.h"
+#include "colormapst.h"
+#include "cursorstr.h"
+#include "scrnintstr.h"
+#include "windowstr.h"
+#include "servermd.h"
+#include "swaprep.h"
+#include "propertyst.h"
+#include <X11/Xatom.h>
+#include "darwin.h"
+#define _APPLEWM_SERVER_
+#include <X11/extensions/applewmproto.h>
+#include "applewmExt.h"
+#include "X11Application.h"
+#include "protocol-versions.h"
+
+#define DEFINE_ATOM_HELPER(func,atom_name)                      \
+static Atom func (void) {                                       \
+    static int generation;                                      \
+    static Atom atom;                                           \
+    if (generation != serverGeneration) {                       \
+        generation = serverGeneration;                          \
+        atom = MakeAtom (atom_name, strlen (atom_name), TRUE);  \
+    }                                                           \
+    return atom;                                                \
+}
+
+DEFINE_ATOM_HELPER(xa_native_screen_origin, "_NATIVE_SCREEN_ORIGIN")
+DEFINE_ATOM_HELPER (xa_apple_no_order_in, "_APPLE_NO_ORDER_IN")
+
+static AppleWMProcsPtr appleWMProcs;
+
+static int WMErrorBase;
+
+
+static unsigned char WMReqCode = 0;
+static int WMEventBase = 0;
+
+static RESTYPE ClientType, EventType; /* resource types for event masks */
+static XID eventResource;
+
+/* Currently selected events */
+static unsigned int eventMask = 0;
+
+static int WMFreeClient (pointer data, XID id);
+static int WMFreeEvents (pointer data, XID id);
+static void SNotifyEvent(xAppleWMNotifyEvent *from, xAppleWMNotifyEvent *to);
+
+typedef struct _WMEvent *WMEventPtr;
+typedef struct _WMEvent {
+    WMEventPtr      next;
+    ClientPtr       client;
+    XID             clientResource;
+    unsigned int    mask;
+} WMEventRec;
+
+static inline BoxRec
+make_box (int x, int y, int w, int h)
+{
+    BoxRec r;
+    r.x1 = x;
+    r.y1 = y;
+    r.x2 = x + w;
+    r.y2 = y + h;
+    return r;
+}
+
+/* Updates the _NATIVE_SCREEN_ORIGIN property on the given root window. */
+void
+AppleWMSetScreenOrigin(
+    WindowPtr pWin
+)
+{
+    int32_t data[2];
+
+    data[0] = pWin->drawable.pScreen->x + darwinMainScreenX;
+    data[1] = pWin->drawable.pScreen->y + darwinMainScreenY;
+
+    dixChangeWindowProperty(serverClient, pWin, xa_native_screen_origin(),
+			    XA_INTEGER, 32, PropModeReplace, 2, data, TRUE);
+}
+
+/* Window managers can set the _APPLE_NO_ORDER_IN property on windows
+   that are being genie-restored from the Dock. We want them to
+   be mapped but remain ordered-out until the animation
+   completes (when the Dock will order them in). */
+Bool
+AppleWMDoReorderWindow(
+    WindowPtr pWin
+)
+{
+    Atom atom;
+    PropertyPtr prop;
+    int rc;
+
+    atom = xa_apple_no_order_in();
+    rc = dixLookupProperty(&prop, pWin, atom, serverClient, DixReadAccess);
+    
+    if(Success == rc && prop->type == atom)
+	return 0;
+    
+    return 1;
+}
+
+
+static int
+ProcAppleWMQueryVersion(
+    register ClientPtr client
+)
+{
+    xAppleWMQueryVersionReply rep;
+    register int n;
+
+    REQUEST_SIZE_MATCH(xAppleWMQueryVersionReq);
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+    rep.majorVersion = SERVER_APPLEWM_MAJOR_VERSION;
+    rep.minorVersion = SERVER_APPLEWM_MINOR_VERSION;
+    rep.patchVersion = SERVER_APPLEWM_PATCH_VERSION;
+    if (client->swapped) {
+        swaps(&rep.sequenceNumber, n);
+        swapl(&rep.length, n);
+    }
+    WriteToClient(client, sizeof(xAppleWMQueryVersionReply), (char *)&rep);
+    return Success;
+}
+
+
+/* events */
+
+static inline void
+updateEventMask (WMEventPtr *pHead)
+{
+    WMEventPtr pCur;
+
+    eventMask = 0;
+    for (pCur = *pHead; pCur != NULL; pCur = pCur->next)
+        eventMask |= pCur->mask;
+}
+
+/*ARGSUSED*/
+static int
+WMFreeClient (pointer data, XID id) {
+    WMEventPtr   pEvent;
+    WMEventPtr   *pHead, pCur, pPrev;
+    int i;
+
+    pEvent = (WMEventPtr) data;
+    i = dixLookupResourceByType((pointer *)&pHead, eventResource, EventType, serverClient, DixReadAccess | DixWriteAccess | DixDestroyAccess);
+    if (i == Success && pHead) {
+        pPrev = 0;
+        for (pCur = *pHead; pCur && pCur != pEvent; pCur=pCur->next)
+            pPrev = pCur;
+        if (pCur) {
+            if (pPrev)
+                pPrev->next = pEvent->next;
+            else
+                *pHead = pEvent->next;
+        }
+        updateEventMask (pHead);
+    }
+    free((pointer) pEvent);
+    return 1;
+}
+
+/*ARGSUSED*/
+static int
+WMFreeEvents (pointer data, XID id) {
+    WMEventPtr   *pHead, pCur, pNext;
+
+    pHead = (WMEventPtr *) data;
+    for (pCur = *pHead; pCur; pCur = pNext) {
+        pNext = pCur->next;
+        FreeResource (pCur->clientResource, ClientType);
+        free((pointer) pCur);
+    }
+    free((pointer) pHead);
+    eventMask = 0;
+    return 1;
+}
+
+static int
+ProcAppleWMSelectInput (register ClientPtr client)
+{
+    REQUEST(xAppleWMSelectInputReq);
+    WMEventPtr      pEvent, pNewEvent, *pHead;
+    XID             clientResource;
+    int             i;
+
+    REQUEST_SIZE_MATCH (xAppleWMSelectInputReq);
+    i = dixLookupResourceByType((pointer *)&pHead, eventResource, EventType, client, DixWriteAccess);
+    if (stuff->mask != 0) {
+        if (i == Success && pHead) {
+            /* check for existing entry. */
+            for (pEvent = *pHead; pEvent; pEvent = pEvent->next)
+            {
+                if (pEvent->client == client)
+                {
+                    pEvent->mask = stuff->mask;
+                    updateEventMask (pHead);
+                    return Success;
+                }
+            }
+        }
+
+        /* build the entry */
+        pNewEvent = (WMEventPtr) malloc(sizeof (WMEventRec));
+        if (!pNewEvent)
+            return BadAlloc;
+        pNewEvent->next = 0;
+        pNewEvent->client = client;
+        pNewEvent->mask = stuff->mask;
+        /*
+         * add a resource that will be deleted when
+         * the client goes away
+         */
+        clientResource = FakeClientID (client->index);
+        pNewEvent->clientResource = clientResource;
+        if (!AddResource (clientResource, ClientType, (pointer)pNewEvent))
+            return BadAlloc;
+        /*
+         * create a resource to contain a pointer to the list
+         * of clients selecting input.  This must be indirect as
+         * the list may be arbitrarily rearranged which cannot be
+         * done through the resource database.
+         */
+        if (i != Success || !pHead)
+        {
+            pHead = (WMEventPtr *) malloc(sizeof (WMEventPtr));
+            if (!pHead ||
+                !AddResource (eventResource, EventType, (pointer)pHead))
+            {
+                FreeResource (clientResource, RT_NONE);
+                return BadAlloc;
+            }
+            *pHead = 0;
+        }
+        pNewEvent->next = *pHead;
+        *pHead = pNewEvent;
+        updateEventMask (pHead);
+    } else if (stuff->mask == 0) {
+        /* delete the interest */
+        if (i == Success && pHead) {
+            pNewEvent = 0;
+            for (pEvent = *pHead; pEvent; pEvent = pEvent->next) {
+                if (pEvent->client == client)
+                    break;
+                pNewEvent = pEvent;
+            }
+            if (pEvent) {
+                FreeResource (pEvent->clientResource, ClientType);
+                if (pNewEvent)
+                    pNewEvent->next = pEvent->next;
+                else
+                    *pHead = pEvent->next;
+                free(pEvent);
+                updateEventMask (pHead);
+            }
+        }
+    } else {
+        client->errorValue = stuff->mask;
+        return BadValue;
+    }
+    return Success;
+}
+
+/*
+ * deliver the event
+ */
+
+void
+AppleWMSendEvent (int type, unsigned int mask, int which, int arg) {
+    WMEventPtr      *pHead, pEvent;
+    xAppleWMNotifyEvent se;
+    int             i;
+
+    i = dixLookupResourceByType((pointer *)&pHead, eventResource, EventType, serverClient, DixReadAccess);
+    if (i != Success || !pHead)
+        return;
+    for (pEvent = *pHead; pEvent; pEvent = pEvent->next) {
+        if ((pEvent->mask & mask) == 0)
+            continue;
+        se.type = type + WMEventBase;
+        se.kind = which;
+        se.arg = arg;
+        se.time = currentTime.milliseconds;
+        WriteEventsToClient (pEvent->client, 1, (xEvent *) &se);
+    }
+}
+
+/* Safe to call from any thread. */
+unsigned int
+AppleWMSelectedEvents (void)
+{
+    return eventMask;
+}
+
+
+/* general utility functions */
+
+static int
+ProcAppleWMDisableUpdate(
+    register ClientPtr client
+)
+{
+    REQUEST_SIZE_MATCH(xAppleWMDisableUpdateReq);
+
+    appleWMProcs->DisableUpdate();
+
+    return Success;
+}
+
+static int
+ProcAppleWMReenableUpdate(
+    register ClientPtr client
+)
+{
+    REQUEST_SIZE_MATCH(xAppleWMReenableUpdateReq);
+
+    appleWMProcs->EnableUpdate();
+
+    return Success;
+}
+
+
+/* window functions */
+
+static int
+ProcAppleWMSetWindowMenu(
+    register ClientPtr client
+)
+{
+    const char *bytes, **items;
+    char *shortcuts;
+    int max_len, nitems, i, j;
+    REQUEST(xAppleWMSetWindowMenuReq);
+
+    REQUEST_AT_LEAST_SIZE(xAppleWMSetWindowMenuReq);
+
+    nitems = stuff->nitems;
+    items = malloc(sizeof (char *) * nitems);
+    shortcuts = malloc(sizeof (char) * nitems);
+
+    max_len = (stuff->length << 2) - sizeof(xAppleWMSetWindowMenuReq);
+    bytes = (char *) &stuff[1];
+
+    for (i = j = 0; i < max_len && j < nitems;)
+    {
+        shortcuts[j] = bytes[i++];
+        items[j++] = bytes + i;
+
+        while (i < max_len)
+        {
+            if (bytes[i++] == 0)
+                break;
+        }
+    }
+    X11ApplicationSetWindowMenu (nitems, items, shortcuts);
+    free(items);
+    free(shortcuts);
+
+    return Success;
+}
+
+static int
+ProcAppleWMSetWindowMenuCheck(
+    register ClientPtr client
+)
+{
+    REQUEST(xAppleWMSetWindowMenuCheckReq);
+
+    REQUEST_SIZE_MATCH(xAppleWMSetWindowMenuCheckReq);
+    X11ApplicationSetWindowMenuCheck(stuff->index);
+    return Success;
+}
+
+static int
+ProcAppleWMSetFrontProcess(
+    register ClientPtr client
+)
+{
+    REQUEST_SIZE_MATCH(xAppleWMSetFrontProcessReq);
+
+    X11ApplicationSetFrontProcess();
+    return Success;
+}
+
+static int
+ProcAppleWMSetWindowLevel(register ClientPtr client)
+{
+    REQUEST(xAppleWMSetWindowLevelReq);
+    WindowPtr pWin;
+    int err;
+
+    REQUEST_SIZE_MATCH(xAppleWMSetWindowLevelReq);
+
+    if (Success != dixLookupWindow(&pWin, stuff->window, client,
+				   DixReadAccess))
+        return BadValue;
+
+    if (stuff->level >= AppleWMNumWindowLevels) {
+        return BadValue;
+    }
+
+     err = appleWMProcs->SetWindowLevel(pWin, stuff->level);
+     if (err != Success) {
+        return err;
+    }
+
+    return Success;
+}
+
+static int
+ProcAppleWMSendPSN(register ClientPtr client)
+{
+    REQUEST(xAppleWMSendPSNReq);
+    int err;
+    
+    REQUEST_SIZE_MATCH(xAppleWMSendPSNReq);
+    
+    if(!appleWMProcs->SendPSN)
+        return BadRequest;
+
+    err = appleWMProcs->SendPSN(stuff->psn_hi, stuff->psn_lo);
+    if (err != Success) {
+        return err;
+    }
+
+    return Success;
+}
+
+static int
+ProcAppleWMAttachTransient(register ClientPtr client)
+{
+    WindowPtr pWinChild, pWinParent;
+    REQUEST(xAppleWMAttachTransientReq);
+    int err;
+    
+    REQUEST_SIZE_MATCH(xAppleWMAttachTransientReq);
+    
+    if(!appleWMProcs->AttachTransient)
+        return BadRequest;
+
+    if (Success != dixLookupWindow(&pWinChild, stuff->child, client, DixReadAccess))
+        return BadValue;
+
+    if(stuff->parent) {
+        if(Success != dixLookupWindow(&pWinParent, stuff->parent, client, DixReadAccess))
+            return BadValue;
+    } else {
+        pWinParent = NULL;
+    }
+
+    err = appleWMProcs->AttachTransient(pWinChild, pWinParent);
+    if (err != Success) {
+        return err;
+    }
+
+    return Success;
+}
+
+static int
+ProcAppleWMSetCanQuit(
+    register ClientPtr client
+)
+{
+    REQUEST(xAppleWMSetCanQuitReq);
+
+    REQUEST_SIZE_MATCH(xAppleWMSetCanQuitReq);
+
+    X11ApplicationSetCanQuit(stuff->state);
+    return Success;
+}
+
+
+/* frame functions */
+
+static int
+ProcAppleWMFrameGetRect(
+    register ClientPtr client
+)
+{
+    xAppleWMFrameGetRectReply rep;
+    BoxRec ir, or, rr;
+    REQUEST(xAppleWMFrameGetRectReq);
+
+    REQUEST_SIZE_MATCH(xAppleWMFrameGetRectReq);
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+
+    ir = make_box (stuff->ix, stuff->iy, stuff->iw, stuff->ih);
+    or = make_box (stuff->ox, stuff->oy, stuff->ow, stuff->oh);
+
+    if (appleWMProcs->FrameGetRect(stuff->frame_rect,
+                                   stuff->frame_class,
+                                   &or, &ir, &rr) != Success)
+    {
+        return BadValue;
+    }
+
+    rep.x = rr.x1;
+    rep.y = rr.y1;
+    rep.w = rr.x2 - rr.x1;
+    rep.h = rr.y2 - rr.y1;
+
+    WriteToClient(client, sizeof(xAppleWMFrameGetRectReply), (char *)&rep);
+    return Success;
+}
+
+static int
+ProcAppleWMFrameHitTest(
+    register ClientPtr client
+)
+{
+    xAppleWMFrameHitTestReply rep;
+    BoxRec ir, or;
+    int ret;
+    REQUEST(xAppleWMFrameHitTestReq);
+
+    REQUEST_SIZE_MATCH(xAppleWMFrameHitTestReq);
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+
+    ir = make_box (stuff->ix, stuff->iy, stuff->iw, stuff->ih);
+    or = make_box (stuff->ox, stuff->oy, stuff->ow, stuff->oh);
+
+    if (appleWMProcs->FrameHitTest(stuff->frame_class, stuff->px,
+                                   stuff->py, &or, &ir, &ret) != Success)
+    {
+        return BadValue;
+    }
+
+    rep.ret = ret;
+
+    WriteToClient(client, sizeof(xAppleWMFrameHitTestReply), (char *)&rep);
+    return Success;
+}
+
+static int
+ProcAppleWMFrameDraw(
+    register ClientPtr client
+)
+{
+    BoxRec ir, or;
+    unsigned int title_length, title_max;
+    unsigned char *title_bytes;
+    REQUEST(xAppleWMFrameDrawReq);
+    WindowPtr pWin;
+
+    REQUEST_AT_LEAST_SIZE(xAppleWMFrameDrawReq);
+
+    if (Success != dixLookupWindow(&pWin, stuff->window, client,
+				   DixReadAccess))
+        return BadValue;
+
+    ir = make_box (stuff->ix, stuff->iy, stuff->iw, stuff->ih);
+    or = make_box (stuff->ox, stuff->oy, stuff->ow, stuff->oh);
+
+    title_length = stuff->title_length;
+    title_max = (stuff->length << 2) - sizeof(xAppleWMFrameDrawReq);
+
+    if (title_max < title_length)
+        return BadValue;
+
+    title_bytes = (unsigned char *) &stuff[1];
+
+    errno = appleWMProcs->FrameDraw(pWin, stuff->frame_class,
+                                    stuff->frame_attr, &or, &ir,
+                                    title_length, title_bytes);
+    if (errno != Success) {
+        return errno;
+    }
+
+    return Success;
+}
+
+
+/* dispatch */
+
+static int
+ProcAppleWMDispatch (
+    register ClientPtr  client
+)
+{
+    REQUEST(xReq);
+
+    switch (stuff->data)
+    {
+    case X_AppleWMQueryVersion:
+        return ProcAppleWMQueryVersion(client);
+    }
+
+    if (!LocalClient(client))
+        return WMErrorBase + AppleWMClientNotLocal;
+
+    switch (stuff->data)
+    {
+    case X_AppleWMSelectInput:
+        return ProcAppleWMSelectInput(client);
+    case X_AppleWMDisableUpdate:
+        return ProcAppleWMDisableUpdate(client);
+    case X_AppleWMReenableUpdate:
+        return ProcAppleWMReenableUpdate(client);
+    case X_AppleWMSetWindowMenu:
+        return ProcAppleWMSetWindowMenu(client);
+    case X_AppleWMSetWindowMenuCheck:
+        return ProcAppleWMSetWindowMenuCheck(client);
+    case X_AppleWMSetFrontProcess:
+        return ProcAppleWMSetFrontProcess(client);
+    case X_AppleWMSetWindowLevel:
+        return ProcAppleWMSetWindowLevel(client);
+    case X_AppleWMSetCanQuit:
+        return ProcAppleWMSetCanQuit(client);
+    case X_AppleWMFrameGetRect:
+        return ProcAppleWMFrameGetRect(client);
+    case X_AppleWMFrameHitTest:
+        return ProcAppleWMFrameHitTest(client);
+    case X_AppleWMFrameDraw:
+        return ProcAppleWMFrameDraw(client);
+    case X_AppleWMSendPSN:
+        return ProcAppleWMSendPSN(client);
+    case X_AppleWMAttachTransient:
+        return ProcAppleWMAttachTransient(client);
+    default:
+        return BadRequest;
+    }
+}
+
+static void
+SNotifyEvent(xAppleWMNotifyEvent *from, xAppleWMNotifyEvent *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
+SProcAppleWMQueryVersion(
+    register ClientPtr  client
+)
+{
+    register int n;
+    REQUEST(xAppleWMQueryVersionReq);
+    swaps(&stuff->length, n);
+    return ProcAppleWMQueryVersion(client);
+}
+
+static int
+SProcAppleWMDispatch (
+    register ClientPtr  client
+)
+{
+    REQUEST(xReq);
+
+    /* It is bound to be non-local when there is byte swapping */
+    if (!LocalClient(client))
+        return WMErrorBase + AppleWMClientNotLocal;
+
+    /* only local clients are allowed WM access */
+    switch (stuff->data)
+    {
+    case X_AppleWMQueryVersion:
+        return SProcAppleWMQueryVersion(client);
+    default:
+        return BadRequest;
+    }
+}
+
+void
+AppleWMExtensionInit(
+    AppleWMProcsPtr procsPtr)
+{
+    ExtensionEntry* extEntry;
+
+    ClientType = CreateNewResourceType(WMFreeClient, "WMClient");
+    EventType = CreateNewResourceType(WMFreeEvents, "WMEvent");
+    eventResource = FakeClientID(0);
+
+    if (ClientType && EventType &&
+        (extEntry = AddExtension(APPLEWMNAME,
+                                 AppleWMNumberEvents,
+                                 AppleWMNumberErrors,
+                                 ProcAppleWMDispatch,
+                                 SProcAppleWMDispatch,
+                                 NULL,
+                                 StandardMinorOpcode)))
+    {
+        WMReqCode = (unsigned char)extEntry->base;
+        WMErrorBase = extEntry->errorBase;
+        WMEventBase = extEntry->eventBase;
+        EventSwapVector[WMEventBase] = (EventSwapPtr) SNotifyEvent;
+        appleWMProcs = procsPtr;
+    }
+}
diff --git a/xorg-server/hw/xquartz/darwin.c b/xorg-server/hw/xquartz/darwin.c
index 56021ed0a..3b6f0a29e 100644
--- a/xorg-server/hw/xquartz/darwin.c
+++ b/xorg-server/hw/xquartz/darwin.c
@@ -1,881 +1,769 @@
-/**************************************************************

- *

- * Xquartz initialization code

- *

- * Copyright (c) 2007-2008 Apple Inc.

- * Copyright (c) 2001-2004 Torrey T. Lyons. 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.

- */

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include <X11/X.h>

-#include <X11/Xproto.h>

-#include "os.h"

-#include "servermd.h"

-#include "inputstr.h"

-#include "scrnintstr.h"

-#include "mibstore.h"		// mi backing store implementation

-#include "mipointer.h"		// mi software cursor

-#include "micmap.h"		// mi colormap code

-#include "fb.h"			// fb framebuffer code

-#include "site.h"

-#include "globals.h"

-#include "dix.h"

-#include "xkbsrv.h"

-

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

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

-#include "exevents.h"

-#include "extinit.h"

-

-#include "xserver-properties.h"

-

-#include <sys/types.h>

-#include <sys/time.h>

-#include <sys/syslimits.h>

-#include <stdio.h>

-#include <fcntl.h>

-#include <unistd.h>

-

-#define HAS_UTSNAME 1

-#include <sys/utsname.h>

-

-#define NO_CFPLUGIN

-#include <IOKit/hidsystem/IOHIDLib.h>

-

-#ifdef MITSHM

-#include "shmint.h"

-#endif

-

-#include "darwin.h"

-#include "darwinEvents.h"

-#include "quartzKeyboard.h"

-#include "quartz.h"

-

-#ifdef ENABLE_DEBUG_LOG

-FILE *debug_log_fp = NULL;

-#endif

-

-/*

- * X server shared global variables

- */

-int                     darwinScreensFound = 0;

-DevPrivateKeyRec        darwinScreenKeyRec;

-io_connect_t            darwinParamConnect = 0;

-int                     darwinEventReadFD = -1;

-int                     darwinEventWriteFD = -1;

-// int                     darwinMouseAccelChange = 1;

-int                     darwinFakeButtons = 0;

-

-// location of X11's (0,0) point in global screen coordinates

-int                     darwinMainScreenX = 0;

-int                     darwinMainScreenY = 0;

-

-// parameters read from the command line or user preferences

-int                     darwinDesiredDepth = -1;

-int                     darwinSyncKeymap = FALSE;

-

-// modifier masks for faking mouse buttons - ANY of these bits trigger it  (not all)

-#ifdef NX_DEVICELCMDKEYMASK

-int                     darwinFakeMouse2Mask = NX_DEVICELALTKEYMASK | NX_DEVICERALTKEYMASK;

-int                     darwinFakeMouse3Mask = NX_DEVICELCMDKEYMASK | NX_DEVICERCMDKEYMASK;

-#else

-int                     darwinFakeMouse2Mask = NX_ALTERNATEMASK;

-int                     darwinFakeMouse3Mask = NX_COMMANDMASK;

-#endif

-

-// Modifier mask for overriding event delivery to appkit (might be useful to set this to rcommand for input menu

-unsigned int            darwinAppKitModMask = 0; // Any of these bits

-

-// Modifier mask for items in the Window menu (0 and -1 cause shortcuts to be disabled)

-unsigned int            windowItemModMask = NX_COMMANDMASK;

-

-// devices

-DeviceIntPtr            darwinKeyboard = NULL;

-DeviceIntPtr            darwinPointer = NULL;

-DeviceIntPtr            darwinTabletCurrent = NULL;

-DeviceIntPtr            darwinTabletStylus = NULL;

-DeviceIntPtr            darwinTabletCursor = NULL;

-DeviceIntPtr            darwinTabletEraser = NULL;

-

-// Common pixmap formats

-static PixmapFormatRec formats[] = {

-        { 1,    1,      BITMAP_SCANLINE_PAD },

-        { 4,    8,      BITMAP_SCANLINE_PAD },

-        { 8,    8,      BITMAP_SCANLINE_PAD },

-        { 15,   16,     BITMAP_SCANLINE_PAD },

-        { 16,   16,     BITMAP_SCANLINE_PAD },

-        { 24,   32,     BITMAP_SCANLINE_PAD },

-        { 32,   32,     BITMAP_SCANLINE_PAD }

-};

-const int NUMFORMATS = sizeof(formats)/sizeof(formats[0]);

-

-#ifndef OSNAME

-#define OSNAME " Darwin"

-#endif

-#ifndef OSVENDOR

-#define OSVENDOR ""

-#endif

-#ifndef PRE_RELEASE

-#define PRE_RELEASE XORG_VERSION_SNAP

-#endif

-#ifndef BUILD_DATE

-#define BUILD_DATE ""

-#endif

-#ifndef XORG_RELEASE

-#define XORG_RELEASE "?"

-#endif

-

-void

-DarwinPrintBanner(void)

-{ 

-  // this should change depending on which specific server we are building

-  ErrorF("Xquartz starting:\n");

-  ErrorF("X.Org X Server %s\nBuild Date: %s\n", XSERVER_VERSION, BUILD_DATE );

-}

-

-

-/*

- * DarwinSaveScreen

- *  X screensaver support. Not implemented.

- */

-static Bool DarwinSaveScreen(ScreenPtr pScreen, int on)

-{

-    // FIXME

-    if (on == SCREEN_SAVER_FORCER) {

-    } else if (on == SCREEN_SAVER_ON) {

-    } else {

-    }

-    return TRUE;

-}

-

-/*

- * DarwinScreenInit

- *  This is a callback from dix during AddScreen() from InitOutput().

- *  Initialize the screen and communicate information about it back to dix.

- */

-static Bool DarwinScreenInit(int index, ScreenPtr pScreen, int argc, char **argv) {

-    int         dpi;

-    static int  foundIndex = 0;

-    Bool        ret;

-    DarwinFramebufferPtr dfb;

-

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

-	return FALSE;

-

-    // reset index of found screens for each server generation

-    if (index == 0) {

-        foundIndex = 0;

-

-        // reset the visual list

-        miClearVisualTypes();

-    }

-

-    // allocate space for private per screen storage

-    dfb = malloc(sizeof(DarwinFramebufferRec));

-

-    // SCREEN_PRIV(pScreen) = dfb;

-    dixSetPrivate(&pScreen->devPrivates, darwinScreenKey, dfb);

-

-    // setup hardware/mode specific details

-    ret = QuartzAddScreen(foundIndex, pScreen);

-    foundIndex++;

-    if (! ret)

-        return FALSE;

-

-    // setup a single visual appropriate for our pixel type

-    if(!miSetVisualTypesAndMasks(dfb->depth, dfb->visuals, dfb->bitsPerRGB,

-                                 dfb->preferredCVC, dfb->redMask,

-                                 dfb->greenMask, dfb->blueMask)) {

-        return FALSE;

-    }

-  

-// TODO: Make PseudoColor visuals not suck in TrueColor mode  

-//    if(dfb->depth > 8)

-//        miSetVisualTypesAndMasks(8, PseudoColorMask, 8, PseudoColor, 0, 0, 0);

-    if(dfb->depth > 15)

-        miSetVisualTypesAndMasks(15, TrueColorMask, 5, TrueColor, RM_ARGB(0,5,5,5), GM_ARGB(0,5,5,5), BM_ARGB(0,5,5,5));

-    if(dfb->depth > 24)

-        miSetVisualTypesAndMasks(24, TrueColorMask, 8, TrueColor, RM_ARGB(0,8,8,8), GM_ARGB(0,8,8,8), BM_ARGB(0,8,8,8));

-

-    miSetPixmapDepths();

-

-    // machine independent screen init

-    // setup _Screen structure in pScreen

-    if (monitorResolution)

-        dpi = monitorResolution;

-    else

-        dpi = 96;

-

-    // initialize fb

-    if (! fbScreenInit(pScreen,

-                dfb->framebuffer,                 // pointer to screen bitmap

-                dfb->width, dfb->height,          // screen size in pixels

-                dpi, dpi,                         // dots per inch

-                dfb->pitch/(dfb->bitsPerPixel/8), // pixel width of framebuffer

-                dfb->bitsPerPixel))               // bits per pixel for screen

-    {

-        return FALSE;

-    }

-

-    if (! fbPictureInit(pScreen, 0, 0)) {

-        return FALSE;

-    }

-

-#ifdef MITSHM

-    ShmRegisterFbFuncs(pScreen);

-#endif

-

-    // this must be initialized (why doesn't X have a default?)

-    pScreen->SaveScreen = DarwinSaveScreen;

-

-    // finish mode dependent screen setup including cursor support

-    if (!QuartzSetupScreen(index, pScreen)) {

-        return FALSE;

-    }

-

-    // create and install the default colormap and

-    // set pScreen->blackPixel / pScreen->white

-    if (!miCreateDefColormap( pScreen )) {

-        return FALSE;

-    }

-

-    pScreen->x = dfb->x;

-    pScreen->y = dfb->y;

-

-    /*    ErrorF("Screen %d added: %dx%d @ (%d,%d)\n",

-	  index, dfb->width, dfb->height, dfb->x, dfb->y); */

-

-    return TRUE;

-}

-

-/*

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

-

- mouse and keyboard callbacks

-

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

-*/

-

-/*

- * DarwinMouseProc: Handle the initialization, etc. of a mouse

- */

-static int DarwinMouseProc(DeviceIntPtr pPointer, int what) {

-#define NBUTTONS 7

-#define NAXES 2

-	// 7 buttons: left, right, middle, then four scroll wheel "buttons"

-    CARD8 map[NBUTTONS + 1] = {0, 1, 2, 3, 4, 5, 6, 7};

-    Atom btn_labels[NBUTTONS] = {0};

-    Atom axes_labels[NAXES] = {0};

-

-    switch (what) {

-        case DEVICE_INIT:

-            pPointer->public.on = FALSE;

-

-            btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT);

-            btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE);

-            btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT);

-            btn_labels[3] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_UP);

-            btn_labels[4] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_DOWN);

-            btn_labels[5] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_LEFT);

-            btn_labels[6] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_RIGHT);

-

-            axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_X);

-            axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Y);

-

-

-            // Set button map.

-            InitPointerDeviceStruct((DevicePtr)pPointer, map, NBUTTONS,

-                                    btn_labels,

-                                    (PtrCtrlProcPtr)NoopDDA,

-                                    GetMotionHistorySize(), NAXES,

-                                    axes_labels);

-            InitAbsoluteClassDeviceStruct(pPointer);

-//            InitValuatorAxisStruct(pPointer, 0, 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);

-//            InitValuatorAxisStruct(pPointer, 1, 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);

-            break;

-        case DEVICE_ON:

-            pPointer->public.on = TRUE;

-            AddEnabledDevice( darwinEventReadFD );

-            return Success;

-        case DEVICE_CLOSE:

-        case DEVICE_OFF:

-            pPointer->public.on = FALSE;

-            RemoveEnabledDevice(darwinEventReadFD);

-            return Success;

-    }

-    

-    return Success;

-#undef NBUTTONS

-#undef NAXES

-}

-

-static int DarwinTabletProc(DeviceIntPtr pPointer, int what) {

-#define NBUTTONS 3

-#define NAXES 5

-    CARD8 map[NBUTTONS + 1] = {0, 1, 2, 3};

-    Atom btn_labels[NBUTTONS] = {0};

-    Atom axes_labels[NAXES] = {0};

-

-    switch (what) {

-        case DEVICE_INIT:

-            pPointer->public.on = FALSE;

-

-            btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT);

-            btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE);

-            btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT);

-

-            axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_X);

-            axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_Y);

-            axes_labels[2] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_PRESSURE);

-            axes_labels[3] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_TILT_X);

-            axes_labels[4] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_TILT_Y);

-

-            // Set button map.

-            InitPointerDeviceStruct((DevicePtr)pPointer, map, NBUTTONS,

-                                    btn_labels,

-                                    (PtrCtrlProcPtr)NoopDDA,

-                                    GetMotionHistorySize(), NAXES,

-                                    axes_labels);

-            InitProximityClassDeviceStruct(pPointer);

-			InitAbsoluteClassDeviceStruct(pPointer);

-

-            InitValuatorAxisStruct(pPointer, 0, axes_labels[0], 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);

-            InitValuatorAxisStruct(pPointer, 1, axes_labels[1], 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);

-            InitValuatorAxisStruct(pPointer, 2, axes_labels[2], 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);

-            InitValuatorAxisStruct(pPointer, 3, axes_labels[3], -XQUARTZ_VALUATOR_LIMIT, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);

-            InitValuatorAxisStruct(pPointer, 4, axes_labels[4], -XQUARTZ_VALUATOR_LIMIT, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);

-//          pPointer->use = IsXExtensionDevice;

-            break;

-        case DEVICE_ON:

-            pPointer->public.on = TRUE;

-            AddEnabledDevice( darwinEventReadFD );

-            return Success;

-        case DEVICE_CLOSE:

-        case DEVICE_OFF:

-            pPointer->public.on = FALSE;

-            RemoveEnabledDevice(darwinEventReadFD);

-            return Success;

-    }

-    return Success;

-#undef NBUTTONS

-#undef NAXES

-}

-

-/*

- * DarwinKeybdProc

- *  Callback from X

- */

-static int DarwinKeybdProc( DeviceIntPtr pDev, int onoff )

-{

-    switch ( onoff ) {

-        case DEVICE_INIT:

-            DarwinKeyboardInit( pDev );

-            break;

-        case DEVICE_ON:

-            pDev->public.on = TRUE;

-            AddEnabledDevice( darwinEventReadFD );

-            break;

-        case DEVICE_OFF:

-            pDev->public.on = FALSE;

-            RemoveEnabledDevice( darwinEventReadFD );

-            break;

-        case DEVICE_CLOSE:

-            break;

-    }

-

-    return Success;

-}

-

-/*

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

-

- Utility routines

-

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

-*/

-

-/*

- * DarwinParseModifierList

- *  Parse a list of modifier names and return a corresponding modifier mask

- */

-int DarwinParseModifierList(const char *constmodifiers, int separatelr)

-{

-    int result = 0;

-

-    if (constmodifiers) {

-        char *modifiers = strdup(constmodifiers);

-        char *modifier;

-        int nxkey;

-        char *p = modifiers;

-

-        while (p) {

-            modifier = strsep(&p, " ,+&|/"); // allow lots of separators

-            nxkey = DarwinModifierStringToNXMask(modifier, separatelr);

-            if(nxkey)

-                result |= nxkey;

-            else

-                ErrorF("fakebuttons: Unknown modifier \"%s\"\n", modifier);

-        }

-        free(modifiers);

-    }

-    return result;

-}

-

-/*

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

-

- Functions needed to link against device independent X

-

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

-*/

-

-/*

- * InitInput

- *  Register the keyboard and mouse devices

- */

-void InitInput( int argc, char **argv )

-{

-    XkbRMLVOSet rmlvo = { .rules = "base", .model = "empty", .layout = "empty",

-                          .variant = NULL, .options = NULL };

-    /* We need to really have rules... or something... */

-    XkbSetRulesDflts(&rmlvo);

-

-    darwinKeyboard = AddInputDevice(serverClient, DarwinKeybdProc, TRUE);

-    darwinKeyboard->name = strdup("keyboard");

-

-    /* here's the snippet from the current gdk sources:

-    if (!strcmp (tmp_name, "pointer"))

-        gdkdev->info.source = GDK_SOURCE_MOUSE;

-    else if (!strcmp (tmp_name, "wacom") ||

-             !strcmp (tmp_name, "pen"))

-        gdkdev->info.source = GDK_SOURCE_PEN;

-    else if (!strcmp (tmp_name, "eraser"))

-        gdkdev->info.source = GDK_SOURCE_ERASER;

-    else if (!strcmp (tmp_name, "cursor"))

-        gdkdev->info.source = GDK_SOURCE_CURSOR;

-    else

-        gdkdev->info.source = GDK_SOURCE_PEN;

-    */

-

-    darwinPointer = AddInputDevice(serverClient, DarwinMouseProc, TRUE);

-    darwinPointer->name = strdup("pointer");

-

-    darwinTabletStylus = AddInputDevice(serverClient, DarwinTabletProc, TRUE);

-    darwinTabletStylus->name = strdup("pen");

-

-    darwinTabletCursor = AddInputDevice(serverClient, DarwinTabletProc, TRUE);

-    darwinTabletCursor->name = strdup("cursor");

-

-    darwinTabletEraser = AddInputDevice(serverClient, DarwinTabletProc, TRUE);

-    darwinTabletEraser->name = strdup("eraser");

-

-    darwinTabletCurrent = darwinTabletStylus;

-

-    DarwinEQInit();

-

-    QuartzInitInput(argc, argv);

-}

-

-

-/*

- * DarwinAdjustScreenOrigins

- *  Shift all screens so the X11 (0, 0) coordinate is at the top

- *  left of the global screen coordinates.

- *

- *  Screens can be arranged so the top left isn't on any screen, so

- *  instead use the top left of the leftmost screen as (0,0). This

- *  may mean some screen space is in -y, but it's better that (0,0)

- *  be onscreen, or else default xterms disappear. It's better that

- *  -y be used than -x, because when popup menus are forced

- *  "onscreen" by dumb window managers like twm, they'll shift the

- *  menus down instead of left, which still looks funny but is an

- *  easier target to hit.

- */

-void

-DarwinAdjustScreenOrigins(ScreenInfo *pScreenInfo)

-{

-    int i, left, top;

-

-    left = pScreenInfo->screens[0]->x;

-    top  = pScreenInfo->screens[0]->y;

-

-    /* Find leftmost screen. If there's a tie, take the topmost of the two. */

-    for (i = 1; i < pScreenInfo->numScreens; i++) {

-        if (pScreenInfo->screens[i]->x < left  ||

-            (pScreenInfo->screens[i]->x == left && pScreenInfo->screens[i]->y < top))

-        {

-            left = pScreenInfo->screens[i]->x;

-            top = pScreenInfo->screens[i]->y;

-        }

-    }

-

-    darwinMainScreenX = left;

-    darwinMainScreenY = top;

-    

-    DEBUG_LOG("top = %d, left=%d\n", top, left);

-

-    /* Shift all screens so that there is a screen whose top left

-     * is at X11 (0,0) and at global screen coordinate

-     * (darwinMainScreenX, darwinMainScreenY).

-     */

-

-    if (darwinMainScreenX != 0 || darwinMainScreenY != 0) {

-        for (i = 0; i < pScreenInfo->numScreens; i++) {

-            pScreenInfo->screens[i]->x -= darwinMainScreenX;

-            pScreenInfo->screens[i]->y -= darwinMainScreenY;

-            DEBUG_LOG("Screen %d placed at X11 coordinate (%d,%d).\n",

-                      i, pScreenInfo->screens[i]->x, pScreenInfo->screens[i]->y);

-        }

-    }

-}

-

-

-/*

- * InitOutput

- *  Initialize screenInfo for all actually accessible framebuffers.

- *

- *  The display mode dependent code gets called three times. The mode

- *  specific InitOutput routines are expected to discover the number

- *  of potentially useful screens and cache routes to them internally.

- *  Inside DarwinScreenInit are two other mode specific calls.

- *  A mode specific AddScreen routine is called for each screen to

- *  actually initialize the screen with the ScreenPtr structure.

- *  After other screen setup has been done, a mode specific

- *  SetupScreen function can be called to finalize screen setup.

- */

-void InitOutput( ScreenInfo *pScreenInfo, int argc, char **argv )

-{

-    int i;

-

-    pScreenInfo->imageByteOrder = IMAGE_BYTE_ORDER;

-    pScreenInfo->bitmapScanlineUnit = BITMAP_SCANLINE_UNIT;

-    pScreenInfo->bitmapScanlinePad = BITMAP_SCANLINE_PAD;

-    pScreenInfo->bitmapBitOrder = BITMAP_BIT_ORDER;

-

-    // List how we want common pixmap formats to be padded

-    pScreenInfo->numPixmapFormats = NUMFORMATS;

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

-        pScreenInfo->formats[i] = formats[i];

-

-    // Discover screens and do mode specific initialization

-    QuartzInitOutput(argc, argv);

-

-    // Add screens

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

-        AddScreen(DarwinScreenInit, argc, argv);

-    }

-

-    DarwinAdjustScreenOrigins(pScreenInfo);

-}

-

-

-/*

- * OsVendorFatalError

- */

-void OsVendorFatalError( void )

-{

-    ErrorF( "   OsVendorFatalError\n" );

-}

-

-

-/*

- * OsVendorInit

- *  Initialization of Darwin OS support.

- */

-void OsVendorInit(void)

-{

-    if (serverGeneration == 1) {

-        DarwinPrintBanner();

-#ifdef ENABLE_DEBUG_LOG

-	{

-	  char *home_dir=NULL, *log_file_path=NULL;

-	  home_dir = getenv("HOME");

-	  if (home_dir) asprintf(&log_file_path, "%s/%s", home_dir, DEBUG_LOG_NAME);

-	  if (log_file_path) {

-	    if (!access(log_file_path, F_OK)) {

-	      debug_log_fp = fopen(log_file_path, "a");

-	      if (debug_log_fp) ErrorF("Debug logging enabled to %s\n", log_file_path);

-	    }

-	    free(log_file_path);

-	  }

-	}

-#endif

-    }

-}

-

-

-/*

- * ddxProcessArgument

- *  Process device-dependent command line args. Returns 0 if argument is

- *  not device dependent, otherwise Count of number of elements of argv

- *  that are part of a device dependent commandline option.

- */

-int ddxProcessArgument( int argc, char *argv[], int i )

-{

-//    if ( !strcmp( argv[i], "-fullscreen" ) ) {

-//        ErrorF( "Running full screen in parallel with Mac OS X Quartz window server.\n" );

-//        return 1;

-//    }

-

-//    if ( !strcmp( argv[i], "-rootless" ) ) {

-//        ErrorF( "Running rootless inside Mac OS X window server.\n" );

-//        return 1;

-//    }

-

-    // This command line arg is passed when launched from the Aqua GUI.

-    if ( !strncmp( argv[i], "-psn_", 5 ) ) {

-        return 1;

-    }

-

-    if ( !strcmp( argv[i], "-fakebuttons" ) ) {

-        darwinFakeButtons = TRUE;

-        ErrorF( "Faking a three button mouse\n" );

-        return 1;

-    }

-

-    if ( !strcmp( argv[i], "-nofakebuttons" ) ) {

-        darwinFakeButtons = FALSE;

-        ErrorF( "Not faking a three button mouse\n" );

-        return 1;

-    }

-

-    if (!strcmp( argv[i], "-fakemouse2" ) ) {

-        if ( i == argc-1 ) {

-            FatalError( "-fakemouse2 must be followed by a modifer list\n" );

-        }

-        if (!strcasecmp(argv[i+1], "none") || !strcmp(argv[i+1], ""))

-            darwinFakeMouse2Mask = 0;

-        else

-            darwinFakeMouse2Mask = DarwinParseModifierList(argv[i+1], 1);

-        ErrorF("Modifier mask to fake mouse button 2 = 0x%x\n",

-               darwinFakeMouse2Mask);

-        return 2;

-    }

-

-    if (!strcmp( argv[i], "-fakemouse3" ) ) {

-        if ( i == argc-1 ) {

-            FatalError( "-fakemouse3 must be followed by a modifer list\n" );

-        }

-        if (!strcasecmp(argv[i+1], "none") || !strcmp(argv[i+1], ""))

-            darwinFakeMouse3Mask = 0;

-        else

-            darwinFakeMouse3Mask = DarwinParseModifierList(argv[i+1], 1);

-        ErrorF("Modifier mask to fake mouse button 3 = 0x%x\n",

-               darwinFakeMouse3Mask);

-        return 2;

-    }

-

-    if ( !strcmp( argv[i], "+synckeymap" ) ) {

-        darwinSyncKeymap = TRUE;

-        return 1;

-    }

-

-    if ( !strcmp( argv[i], "-synckeymap" ) ) {

-        darwinSyncKeymap = FALSE;

-        return 1;

-    }

-

-    if ( !strcmp( argv[i], "-depth" ) ) {

-        if ( i == argc-1 ) {

-            FatalError( "-depth must be followed by a number\n" );

-        }

-        darwinDesiredDepth = atoi( argv[i+1] );

-        if(darwinDesiredDepth != -1 &&

-           darwinDesiredDepth != 8 &&

-           darwinDesiredDepth != 15 &&

-           darwinDesiredDepth != 24) {

-            FatalError( "Unsupported pixel depth. Use 8, 15, or 24 bits\n" );

-        }

-

-        ErrorF( "Attempting to use pixel depth of %i\n", darwinDesiredDepth );

-        return 2;

-    }

-

-    if (!strcmp( argv[i], "-showconfig" ) || !strcmp( argv[i], "-version" )) {

-        DarwinPrintBanner();

-        exit(0);

-    }

-

-    return 0;

-}

-

-

-/*

- * ddxUseMsg --

- *  Print out correct use of device dependent commandline options.

- *  Maybe the user now knows what really to do ...

- */

-void ddxUseMsg( void )

-{

-    ErrorF("\n");

-    ErrorF("\n");

-    ErrorF("Device Dependent Usage:\n");

-    ErrorF("\n");

-    ErrorF("-depth <8,15,24> : use this bit depth.\n");

-    ErrorF("-fakebuttons : fake a three button mouse with Command and Option keys.\n");

-    ErrorF("-nofakebuttons : don't fake a three button mouse.\n");

-    ErrorF("-fakemouse2 <modifiers> : fake middle mouse button with modifier keys.\n");

-    ErrorF("-fakemouse3 <modifiers> : fake right mouse button with modifier keys.\n");

-    ErrorF("  ex: -fakemouse2 \"option,shift\" = option-shift-click is middle button.\n");

-    ErrorF("-version : show the server version.\n");

-    ErrorF("\n");

-}

-

-

-/*

- * ddxGiveUp --

- *      Device dependent cleanup. Called by dix before normal server death.

- */

-void ddxGiveUp( void )

-{

-    ErrorF( "Quitting Xquartz\n" );

-}

-

-

-/*

- * AbortDDX --

- *      DDX - specific abort routine.  Called by AbortServer(). The attempt is

- *      made to restore all original setting of the displays. Also all devices

- *      are closed.

- */

-void AbortDDX( void )

-{

-    ErrorF( "   AbortDDX\n" );

-    OsAbort();

-}

-

-#include "mivalidate.h" // for union _Validate used by windowstr.h

-#include "windowstr.h"  // for struct _Window

-#include "scrnintstr.h" // for struct _Screen

-

-// This is copied from Xserver/hw/xfree86/common/xf86Helper.c.

-// Quartz mode uses this when switching in and out of Quartz.

-// Quartz or IOKit can use this when waking from sleep.

-// Copyright (c) 1997-1998 by The XFree86 Project, Inc.

-

-/*

- * xf86SetRootClip --

- *	Enable or disable rendering to the screen by

- *	setting the root clip list and revalidating

- *	all of the windows

- */

-

-void

-xf86SetRootClip (ScreenPtr pScreen, int enable)

-{

-    WindowPtr	pWin = pScreen->root;

-    WindowPtr	pChild;

-    Bool	WasViewable = (Bool)(pWin->viewable);

-    Bool	anyMarked = TRUE;

-    RegionPtr	pOldClip = NULL;

-    WindowPtr   pLayerWin;

-    BoxRec	box;

-

-    if (WasViewable)

-    {

-	for (pChild = pWin->firstChild; pChild; pChild = pChild->nextSib)

-	{

-	    (void) (*pScreen->MarkOverlappedWindows)(pChild,

-						     pChild,

-						     &pLayerWin);

-	}

-	(*pScreen->MarkWindow) (pWin);

-	anyMarked = TRUE;

-	if (pWin->valdata)

-	{

-	    if (HasBorder (pWin))

-	    {

-		RegionPtr	borderVisible;

-

-		borderVisible = RegionCreate(NullBox, 1);

-		RegionSubtract(borderVisible,

-				&pWin->borderClip, &pWin->winSize);

-		pWin->valdata->before.borderVisible = borderVisible;

-	    }

-	    pWin->valdata->before.resized = TRUE;

-	}

-    }

-

-    /*

-     * Use REGION_BREAK to avoid optimizations in ValidateTree

-     * that assume the root borderClip can't change well, normally

-     * it doesn't...)

-     */

-    if (enable)

-    {

-	box.x1 = 0;

-	box.y1 = 0;

-	box.x2 = pScreen->width;

-	box.y2 = pScreen->height;

-	RegionReset(&pWin->borderClip, &box);

-	RegionBreak(&pWin->clipList);

-    }

-    else

-    {

-	RegionEmpty(&pWin->borderClip);

-	RegionBreak(&pWin->clipList);

-    }

-

-    ResizeChildrenWinSize (pWin, 0, 0, 0, 0);

-

-    if (WasViewable)

-    {

-	if (pWin->backStorage)

-	{

-	    pOldClip = RegionCreate(NullBox, 1);

-	    RegionCopy(pOldClip, &pWin->clipList);

-	}

-

-	if (pWin->firstChild)

-	{

-	    anyMarked |= (*pScreen->MarkOverlappedWindows)(pWin->firstChild,

-							   pWin->firstChild,

-							   (WindowPtr *)NULL);

-	}

-	else

-	{

-	    (*pScreen->MarkWindow) (pWin);

-	    anyMarked = TRUE;

-	}

-

-

-	if (anyMarked)

-	    (*pScreen->ValidateTree)(pWin, NullWindow, VTOther);

-    }

-

-    if (WasViewable)

-    {

-	if (anyMarked)

-	    (*pScreen->HandleExposures)(pWin);

-	if (anyMarked && pScreen->PostValidateTree)

-	    (*pScreen->PostValidateTree)(pWin, NullWindow, VTOther);

-    }

-    if (pWin->realized)

-	WindowsRestructured ();

-    FlushAllOutput ();

-}

+/**************************************************************
+ *
+ * Xquartz initialization code
+ *
+ * Copyright (c) 2007-2008 Apple Inc.
+ * Copyright (c) 2001-2004 Torrey T. Lyons. 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.
+ */
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include <X11/X.h>
+#include <X11/Xproto.h>
+#include "os.h"
+#include "servermd.h"
+#include "inputstr.h"
+#include "scrnintstr.h"
+#include "mibstore.h"		// mi backing store implementation
+#include "mipointer.h"		// mi software cursor
+#include "micmap.h"		// mi colormap code
+#include "fb.h"			// fb framebuffer code
+#include "site.h"
+#include "globals.h"
+#include "dix.h"
+#include "xkbsrv.h"
+
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include "exevents.h"
+#include "extinit.h"
+
+#include "xserver-properties.h"
+
+#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/syslimits.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+#define HAS_UTSNAME 1
+#include <sys/utsname.h>
+
+#define NO_CFPLUGIN
+#include <IOKit/hidsystem/IOHIDLib.h>
+
+#ifdef MITSHM
+#include "shmint.h"
+#endif
+
+#include "darwin.h"
+#include "darwinEvents.h"
+#include "quartzKeyboard.h"
+#include "quartz.h"
+
+#ifdef ENABLE_DEBUG_LOG
+FILE *debug_log_fp = NULL;
+#endif
+
+/*
+ * X server shared global variables
+ */
+int                     darwinScreensFound = 0;
+DevPrivateKeyRec        darwinScreenKeyRec;
+io_connect_t            darwinParamConnect = 0;
+int                     darwinEventReadFD = -1;
+int                     darwinEventWriteFD = -1;
+// int                     darwinMouseAccelChange = 1;
+int                     darwinFakeButtons = 0;
+
+// location of X11's (0,0) point in global screen coordinates
+int                     darwinMainScreenX = 0;
+int                     darwinMainScreenY = 0;
+
+// parameters read from the command line or user preferences
+int                     darwinDesiredDepth = -1;
+int                     darwinSyncKeymap = FALSE;
+
+// modifier masks for faking mouse buttons - ANY of these bits trigger it  (not all)
+#ifdef NX_DEVICELCMDKEYMASK
+int                     darwinFakeMouse2Mask = NX_DEVICELALTKEYMASK | NX_DEVICERALTKEYMASK;
+int                     darwinFakeMouse3Mask = NX_DEVICELCMDKEYMASK | NX_DEVICERCMDKEYMASK;
+#else
+int                     darwinFakeMouse2Mask = NX_ALTERNATEMASK;
+int                     darwinFakeMouse3Mask = NX_COMMANDMASK;
+#endif
+
+// Modifier mask for overriding event delivery to appkit (might be useful to set this to rcommand for input menu
+unsigned int            darwinAppKitModMask = 0; // Any of these bits
+
+// Modifier mask for items in the Window menu (0 and -1 cause shortcuts to be disabled)
+unsigned int            windowItemModMask = NX_COMMANDMASK;
+
+// devices
+DeviceIntPtr            darwinKeyboard = NULL;
+DeviceIntPtr            darwinPointer = NULL;
+DeviceIntPtr            darwinTabletCurrent = NULL;
+DeviceIntPtr            darwinTabletStylus = NULL;
+DeviceIntPtr            darwinTabletCursor = NULL;
+DeviceIntPtr            darwinTabletEraser = NULL;
+
+// Common pixmap formats
+static PixmapFormatRec formats[] = {
+        { 1,    1,      BITMAP_SCANLINE_PAD },
+        { 4,    8,      BITMAP_SCANLINE_PAD },
+        { 8,    8,      BITMAP_SCANLINE_PAD },
+        { 15,   16,     BITMAP_SCANLINE_PAD },
+        { 16,   16,     BITMAP_SCANLINE_PAD },
+        { 24,   32,     BITMAP_SCANLINE_PAD },
+        { 32,   32,     BITMAP_SCANLINE_PAD }
+};
+const int NUMFORMATS = sizeof(formats)/sizeof(formats[0]);
+
+#ifndef OSNAME
+#define OSNAME " Darwin"
+#endif
+#ifndef OSVENDOR
+#define OSVENDOR ""
+#endif
+#ifndef PRE_RELEASE
+#define PRE_RELEASE XORG_VERSION_SNAP
+#endif
+#ifndef BUILD_DATE
+#define BUILD_DATE ""
+#endif
+#ifndef XORG_RELEASE
+#define XORG_RELEASE "?"
+#endif
+
+void
+DarwinPrintBanner(void)
+{ 
+  // this should change depending on which specific server we are building
+  ErrorF("Xquartz starting:\n");
+  ErrorF("X.Org X Server %s\nBuild Date: %s\n", XSERVER_VERSION, BUILD_DATE );
+}
+
+
+/*
+ * DarwinSaveScreen
+ *  X screensaver support. Not implemented.
+ */
+static Bool DarwinSaveScreen(ScreenPtr pScreen, int on)
+{
+    // FIXME
+    if (on == SCREEN_SAVER_FORCER) {
+    } else if (on == SCREEN_SAVER_ON) {
+    } else {
+    }
+    return TRUE;
+}
+
+/*
+ * DarwinScreenInit
+ *  This is a callback from dix during AddScreen() from InitOutput().
+ *  Initialize the screen and communicate information about it back to dix.
+ */
+static Bool DarwinScreenInit(int index, ScreenPtr pScreen, int argc, char **argv) {
+    int         dpi;
+    static int  foundIndex = 0;
+    Bool        ret;
+    DarwinFramebufferPtr dfb;
+
+    if (!dixRegisterPrivateKey(&darwinScreenKeyRec, PRIVATE_SCREEN, 0))
+	return FALSE;
+
+    // reset index of found screens for each server generation
+    if (index == 0) {
+        foundIndex = 0;
+
+        // reset the visual list
+        miClearVisualTypes();
+    }
+
+    // allocate space for private per screen storage
+    dfb = malloc(sizeof(DarwinFramebufferRec));
+
+    // SCREEN_PRIV(pScreen) = dfb;
+    dixSetPrivate(&pScreen->devPrivates, darwinScreenKey, dfb);
+
+    // setup hardware/mode specific details
+    ret = QuartzAddScreen(foundIndex, pScreen);
+    foundIndex++;
+    if (! ret)
+        return FALSE;
+
+    // setup a single visual appropriate for our pixel type
+    if(!miSetVisualTypesAndMasks(dfb->depth, dfb->visuals, dfb->bitsPerRGB,
+                                 dfb->preferredCVC, dfb->redMask,
+                                 dfb->greenMask, dfb->blueMask)) {
+        return FALSE;
+    }
+  
+// TODO: Make PseudoColor visuals not suck in TrueColor mode  
+//    if(dfb->depth > 8)
+//        miSetVisualTypesAndMasks(8, PseudoColorMask, 8, PseudoColor, 0, 0, 0);
+    if(dfb->depth > 15)
+        miSetVisualTypesAndMasks(15, TrueColorMask, 5, TrueColor, RM_ARGB(0,5,5,5), GM_ARGB(0,5,5,5), BM_ARGB(0,5,5,5));
+    if(dfb->depth > 24)
+        miSetVisualTypesAndMasks(24, TrueColorMask, 8, TrueColor, RM_ARGB(0,8,8,8), GM_ARGB(0,8,8,8), BM_ARGB(0,8,8,8));
+
+    miSetPixmapDepths();
+
+    // machine independent screen init
+    // setup _Screen structure in pScreen
+    if (monitorResolution)
+        dpi = monitorResolution;
+    else
+        dpi = 96;
+
+    // initialize fb
+    if (! fbScreenInit(pScreen,
+                dfb->framebuffer,                 // pointer to screen bitmap
+                dfb->width, dfb->height,          // screen size in pixels
+                dpi, dpi,                         // dots per inch
+                dfb->pitch/(dfb->bitsPerPixel/8), // pixel width of framebuffer
+                dfb->bitsPerPixel))               // bits per pixel for screen
+    {
+        return FALSE;
+    }
+
+    if (! fbPictureInit(pScreen, 0, 0)) {
+        return FALSE;
+    }
+
+#ifdef MITSHM
+    ShmRegisterFbFuncs(pScreen);
+#endif
+
+    // this must be initialized (why doesn't X have a default?)
+    pScreen->SaveScreen = DarwinSaveScreen;
+
+    // finish mode dependent screen setup including cursor support
+    if (!QuartzSetupScreen(index, pScreen)) {
+        return FALSE;
+    }
+
+    // create and install the default colormap and
+    // set pScreen->blackPixel / pScreen->white
+    if (!miCreateDefColormap( pScreen )) {
+        return FALSE;
+    }
+
+    pScreen->x = dfb->x;
+    pScreen->y = dfb->y;
+
+    /*    ErrorF("Screen %d added: %dx%d @ (%d,%d)\n",
+	  index, dfb->width, dfb->height, dfb->x, dfb->y); */
+
+    return TRUE;
+}
+
+/*
+ =============================================================================
+
+ mouse and keyboard callbacks
+
+ =============================================================================
+*/
+
+/*
+ * DarwinMouseProc: Handle the initialization, etc. of a mouse
+ */
+static int DarwinMouseProc(DeviceIntPtr pPointer, int what) {
+#define NBUTTONS 7
+#define NAXES 2
+	// 7 buttons: left, right, middle, then four scroll wheel "buttons"
+    CARD8 map[NBUTTONS + 1] = {0, 1, 2, 3, 4, 5, 6, 7};
+    Atom btn_labels[NBUTTONS] = {0};
+    Atom axes_labels[NAXES] = {0};
+
+    switch (what) {
+        case DEVICE_INIT:
+            pPointer->public.on = FALSE;
+
+            btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT);
+            btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE);
+            btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT);
+            btn_labels[3] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_UP);
+            btn_labels[4] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_DOWN);
+            btn_labels[5] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_LEFT);
+            btn_labels[6] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_RIGHT);
+
+            axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_X);
+            axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Y);
+
+
+            // Set button map.
+            InitPointerDeviceStruct((DevicePtr)pPointer, map, NBUTTONS,
+                                    btn_labels,
+                                    (PtrCtrlProcPtr)NoopDDA,
+                                    GetMotionHistorySize(), NAXES,
+                                    axes_labels);
+//            InitValuatorAxisStruct(pPointer, 0, 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);
+//            InitValuatorAxisStruct(pPointer, 1, 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);
+            break;
+        case DEVICE_ON:
+            pPointer->public.on = TRUE;
+            AddEnabledDevice( darwinEventReadFD );
+            return Success;
+        case DEVICE_CLOSE:
+        case DEVICE_OFF:
+            pPointer->public.on = FALSE;
+            RemoveEnabledDevice(darwinEventReadFD);
+            return Success;
+    }
+    
+    return Success;
+#undef NBUTTONS
+#undef NAXES
+}
+
+static int DarwinTabletProc(DeviceIntPtr pPointer, int what) {
+#define NBUTTONS 3
+#define NAXES 5
+    CARD8 map[NBUTTONS + 1] = {0, 1, 2, 3};
+    Atom btn_labels[NBUTTONS] = {0};
+    Atom axes_labels[NAXES] = {0};
+
+    switch (what) {
+        case DEVICE_INIT:
+            pPointer->public.on = FALSE;
+
+            btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT);
+            btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE);
+            btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT);
+
+            axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_X);
+            axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_Y);
+            axes_labels[2] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_PRESSURE);
+            axes_labels[3] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_TILT_X);
+            axes_labels[4] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_TILT_Y);
+
+            // Set button map.
+            InitPointerDeviceStruct((DevicePtr)pPointer, map, NBUTTONS,
+                                    btn_labels,
+                                    (PtrCtrlProcPtr)NoopDDA,
+                                    GetMotionHistorySize(), NAXES,
+                                    axes_labels);
+            InitProximityClassDeviceStruct(pPointer);
+
+            InitValuatorAxisStruct(pPointer, 0, axes_labels[0], 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);
+            InitValuatorAxisStruct(pPointer, 1, axes_labels[1], 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);
+            InitValuatorAxisStruct(pPointer, 2, axes_labels[2], 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);
+            InitValuatorAxisStruct(pPointer, 3, axes_labels[3], -XQUARTZ_VALUATOR_LIMIT, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);
+            InitValuatorAxisStruct(pPointer, 4, axes_labels[4], -XQUARTZ_VALUATOR_LIMIT, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);
+//          pPointer->use = IsXExtensionDevice;
+            break;
+        case DEVICE_ON:
+            pPointer->public.on = TRUE;
+            AddEnabledDevice( darwinEventReadFD );
+            return Success;
+        case DEVICE_CLOSE:
+        case DEVICE_OFF:
+            pPointer->public.on = FALSE;
+            RemoveEnabledDevice(darwinEventReadFD);
+            return Success;
+    }
+    return Success;
+#undef NBUTTONS
+#undef NAXES
+}
+
+/*
+ * DarwinKeybdProc
+ *  Callback from X
+ */
+static int DarwinKeybdProc( DeviceIntPtr pDev, int onoff )
+{
+    switch ( onoff ) {
+        case DEVICE_INIT:
+            DarwinKeyboardInit( pDev );
+            break;
+        case DEVICE_ON:
+            pDev->public.on = TRUE;
+            AddEnabledDevice( darwinEventReadFD );
+            break;
+        case DEVICE_OFF:
+            pDev->public.on = FALSE;
+            RemoveEnabledDevice( darwinEventReadFD );
+            break;
+        case DEVICE_CLOSE:
+            break;
+    }
+
+    return Success;
+}
+
+/*
+===========================================================================
+
+ Utility routines
+
+===========================================================================
+*/
+
+/*
+ * DarwinParseModifierList
+ *  Parse a list of modifier names and return a corresponding modifier mask
+ */
+int DarwinParseModifierList(const char *constmodifiers, int separatelr)
+{
+    int result = 0;
+
+    if (constmodifiers) {
+        char *modifiers = strdup(constmodifiers);
+        char *modifier;
+        int nxkey;
+        char *p = modifiers;
+
+        while (p) {
+            modifier = strsep(&p, " ,+&|/"); // allow lots of separators
+            nxkey = DarwinModifierStringToNXMask(modifier, separatelr);
+            if(nxkey)
+                result |= nxkey;
+            else
+                ErrorF("fakebuttons: Unknown modifier \"%s\"\n", modifier);
+        }
+        free(modifiers);
+    }
+    return result;
+}
+
+/*
+===========================================================================
+
+ Functions needed to link against device independent X
+
+===========================================================================
+*/
+
+/*
+ * InitInput
+ *  Register the keyboard and mouse devices
+ */
+void InitInput( int argc, char **argv )
+{
+    XkbRMLVOSet rmlvo = { .rules = "base", .model = "empty", .layout = "empty",
+                          .variant = NULL, .options = NULL };
+    /* We need to really have rules... or something... */
+    XkbSetRulesDflts(&rmlvo);
+
+    darwinKeyboard = AddInputDevice(serverClient, DarwinKeybdProc, TRUE);
+    darwinKeyboard->name = strdup("keyboard");
+
+    /* here's the snippet from the current gdk sources:
+    if (!strcmp (tmp_name, "pointer"))
+        gdkdev->info.source = GDK_SOURCE_MOUSE;
+    else if (!strcmp (tmp_name, "wacom") ||
+             !strcmp (tmp_name, "pen"))
+        gdkdev->info.source = GDK_SOURCE_PEN;
+    else if (!strcmp (tmp_name, "eraser"))
+        gdkdev->info.source = GDK_SOURCE_ERASER;
+    else if (!strcmp (tmp_name, "cursor"))
+        gdkdev->info.source = GDK_SOURCE_CURSOR;
+    else
+        gdkdev->info.source = GDK_SOURCE_PEN;
+    */
+
+    darwinPointer = AddInputDevice(serverClient, DarwinMouseProc, TRUE);
+    darwinPointer->name = strdup("pointer");
+
+    darwinTabletStylus = AddInputDevice(serverClient, DarwinTabletProc, TRUE);
+    darwinTabletStylus->name = strdup("pen");
+
+    darwinTabletCursor = AddInputDevice(serverClient, DarwinTabletProc, TRUE);
+    darwinTabletCursor->name = strdup("cursor");
+
+    darwinTabletEraser = AddInputDevice(serverClient, DarwinTabletProc, TRUE);
+    darwinTabletEraser->name = strdup("eraser");
+
+    darwinTabletCurrent = darwinTabletStylus;
+
+    DarwinEQInit();
+
+    QuartzInitInput(argc, argv);
+}
+
+
+/*
+ * DarwinAdjustScreenOrigins
+ *  Shift all screens so the X11 (0, 0) coordinate is at the top
+ *  left of the global screen coordinates.
+ *
+ *  Screens can be arranged so the top left isn't on any screen, so
+ *  instead use the top left of the leftmost screen as (0,0). This
+ *  may mean some screen space is in -y, but it's better that (0,0)
+ *  be onscreen, or else default xterms disappear. It's better that
+ *  -y be used than -x, because when popup menus are forced
+ *  "onscreen" by dumb window managers like twm, they'll shift the
+ *  menus down instead of left, which still looks funny but is an
+ *  easier target to hit.
+ */
+void
+DarwinAdjustScreenOrigins(ScreenInfo *pScreenInfo)
+{
+    int i, left, top;
+
+    left = pScreenInfo->screens[0]->x;
+    top  = pScreenInfo->screens[0]->y;
+
+    /* Find leftmost screen. If there's a tie, take the topmost of the two. */
+    for (i = 1; i < pScreenInfo->numScreens; i++) {
+        if (pScreenInfo->screens[i]->x < left  ||
+            (pScreenInfo->screens[i]->x == left && pScreenInfo->screens[i]->y < top))
+        {
+            left = pScreenInfo->screens[i]->x;
+            top = pScreenInfo->screens[i]->y;
+        }
+    }
+
+    darwinMainScreenX = left;
+    darwinMainScreenY = top;
+    
+    DEBUG_LOG("top = %d, left=%d\n", top, left);
+
+    /* Shift all screens so that there is a screen whose top left
+     * is at X11 (0,0) and at global screen coordinate
+     * (darwinMainScreenX, darwinMainScreenY).
+     */
+
+    if (darwinMainScreenX != 0 || darwinMainScreenY != 0) {
+        for (i = 0; i < pScreenInfo->numScreens; i++) {
+            pScreenInfo->screens[i]->x -= darwinMainScreenX;
+            pScreenInfo->screens[i]->y -= darwinMainScreenY;
+            DEBUG_LOG("Screen %d placed at X11 coordinate (%d,%d).\n",
+                      i, pScreenInfo->screens[i]->x, pScreenInfo->screens[i]->y);
+        }
+    }
+}
+
+
+/*
+ * InitOutput
+ *  Initialize screenInfo for all actually accessible framebuffers.
+ *
+ *  The display mode dependent code gets called three times. The mode
+ *  specific InitOutput routines are expected to discover the number
+ *  of potentially useful screens and cache routes to them internally.
+ *  Inside DarwinScreenInit are two other mode specific calls.
+ *  A mode specific AddScreen routine is called for each screen to
+ *  actually initialize the screen with the ScreenPtr structure.
+ *  After other screen setup has been done, a mode specific
+ *  SetupScreen function can be called to finalize screen setup.
+ */
+void InitOutput( ScreenInfo *pScreenInfo, int argc, char **argv )
+{
+    int i;
+
+    pScreenInfo->imageByteOrder = IMAGE_BYTE_ORDER;
+    pScreenInfo->bitmapScanlineUnit = BITMAP_SCANLINE_UNIT;
+    pScreenInfo->bitmapScanlinePad = BITMAP_SCANLINE_PAD;
+    pScreenInfo->bitmapBitOrder = BITMAP_BIT_ORDER;
+
+    // List how we want common pixmap formats to be padded
+    pScreenInfo->numPixmapFormats = NUMFORMATS;
+    for (i = 0; i < NUMFORMATS; i++)
+        pScreenInfo->formats[i] = formats[i];
+
+    // Discover screens and do mode specific initialization
+    QuartzInitOutput(argc, argv);
+
+    // Add screens
+    for (i = 0; i < darwinScreensFound; i++) {
+        AddScreen(DarwinScreenInit, argc, argv);
+    }
+
+    DarwinAdjustScreenOrigins(pScreenInfo);
+}
+
+
+/*
+ * OsVendorFatalError
+ */
+void OsVendorFatalError( void )
+{
+    ErrorF( "   OsVendorFatalError\n" );
+}
+
+
+/*
+ * OsVendorInit
+ *  Initialization of Darwin OS support.
+ */
+void OsVendorInit(void)
+{
+    if (serverGeneration == 1) {
+        DarwinPrintBanner();
+#ifdef ENABLE_DEBUG_LOG
+	{
+	  char *home_dir=NULL, *log_file_path=NULL;
+	  home_dir = getenv("HOME");
+	  if (home_dir) asprintf(&log_file_path, "%s/%s", home_dir, DEBUG_LOG_NAME);
+	  if (log_file_path) {
+	    if (!access(log_file_path, F_OK)) {
+	      debug_log_fp = fopen(log_file_path, "a");
+	      if (debug_log_fp) ErrorF("Debug logging enabled to %s\n", log_file_path);
+	    }
+	    free(log_file_path);
+	  }
+	}
+#endif
+    }
+}
+
+
+/*
+ * ddxProcessArgument
+ *  Process device-dependent command line args. Returns 0 if argument is
+ *  not device dependent, otherwise Count of number of elements of argv
+ *  that are part of a device dependent commandline option.
+ */
+int ddxProcessArgument( int argc, char *argv[], int i )
+{
+//    if ( !strcmp( argv[i], "-fullscreen" ) ) {
+//        ErrorF( "Running full screen in parallel with Mac OS X Quartz window server.\n" );
+//        return 1;
+//    }
+
+//    if ( !strcmp( argv[i], "-rootless" ) ) {
+//        ErrorF( "Running rootless inside Mac OS X window server.\n" );
+//        return 1;
+//    }
+
+    // This command line arg is passed when launched from the Aqua GUI.
+    if ( !strncmp( argv[i], "-psn_", 5 ) ) {
+        return 1;
+    }
+
+    if ( !strcmp( argv[i], "-fakebuttons" ) ) {
+        darwinFakeButtons = TRUE;
+        ErrorF( "Faking a three button mouse\n" );
+        return 1;
+    }
+
+    if ( !strcmp( argv[i], "-nofakebuttons" ) ) {
+        darwinFakeButtons = FALSE;
+        ErrorF( "Not faking a three button mouse\n" );
+        return 1;
+    }
+
+    if (!strcmp( argv[i], "-fakemouse2" ) ) {
+        if ( i == argc-1 ) {
+            FatalError( "-fakemouse2 must be followed by a modifer list\n" );
+        }
+        if (!strcasecmp(argv[i+1], "none") || !strcmp(argv[i+1], ""))
+            darwinFakeMouse2Mask = 0;
+        else
+            darwinFakeMouse2Mask = DarwinParseModifierList(argv[i+1], 1);
+        ErrorF("Modifier mask to fake mouse button 2 = 0x%x\n",
+               darwinFakeMouse2Mask);
+        return 2;
+    }
+
+    if (!strcmp( argv[i], "-fakemouse3" ) ) {
+        if ( i == argc-1 ) {
+            FatalError( "-fakemouse3 must be followed by a modifer list\n" );
+        }
+        if (!strcasecmp(argv[i+1], "none") || !strcmp(argv[i+1], ""))
+            darwinFakeMouse3Mask = 0;
+        else
+            darwinFakeMouse3Mask = DarwinParseModifierList(argv[i+1], 1);
+        ErrorF("Modifier mask to fake mouse button 3 = 0x%x\n",
+               darwinFakeMouse3Mask);
+        return 2;
+    }
+
+    if ( !strcmp( argv[i], "+synckeymap" ) ) {
+        darwinSyncKeymap = TRUE;
+        return 1;
+    }
+
+    if ( !strcmp( argv[i], "-synckeymap" ) ) {
+        darwinSyncKeymap = FALSE;
+        return 1;
+    }
+
+    if ( !strcmp( argv[i], "-depth" ) ) {
+        if ( i == argc-1 ) {
+            FatalError( "-depth must be followed by a number\n" );
+        }
+        darwinDesiredDepth = atoi( argv[i+1] );
+        if(darwinDesiredDepth != -1 &&
+           darwinDesiredDepth != 8 &&
+           darwinDesiredDepth != 15 &&
+           darwinDesiredDepth != 24) {
+            FatalError( "Unsupported pixel depth. Use 8, 15, or 24 bits\n" );
+        }
+
+        ErrorF( "Attempting to use pixel depth of %i\n", darwinDesiredDepth );
+        return 2;
+    }
+
+    if (!strcmp( argv[i], "-showconfig" ) || !strcmp( argv[i], "-version" )) {
+        DarwinPrintBanner();
+        exit(0);
+    }
+
+    return 0;
+}
+
+
+/*
+ * ddxUseMsg --
+ *  Print out correct use of device dependent commandline options.
+ *  Maybe the user now knows what really to do ...
+ */
+void ddxUseMsg( void )
+{
+    ErrorF("\n");
+    ErrorF("\n");
+    ErrorF("Device Dependent Usage:\n");
+    ErrorF("\n");
+    ErrorF("-depth <8,15,24> : use this bit depth.\n");
+    ErrorF("-fakebuttons : fake a three button mouse with Command and Option keys.\n");
+    ErrorF("-nofakebuttons : don't fake a three button mouse.\n");
+    ErrorF("-fakemouse2 <modifiers> : fake middle mouse button with modifier keys.\n");
+    ErrorF("-fakemouse3 <modifiers> : fake right mouse button with modifier keys.\n");
+    ErrorF("  ex: -fakemouse2 \"option,shift\" = option-shift-click is middle button.\n");
+    ErrorF("-version : show the server version.\n");
+    ErrorF("\n");
+}
+
+
+/*
+ * ddxGiveUp --
+ *      Device dependent cleanup. Called by dix before normal server death.
+ */
+void ddxGiveUp( void )
+{
+    ErrorF( "Quitting Xquartz\n" );
+}
+
+
+/*
+ * AbortDDX --
+ *      DDX - specific abort routine.  Called by AbortServer(). The attempt is
+ *      made to restore all original setting of the displays. Also all devices
+ *      are closed.
+ */
+void AbortDDX( void )
+{
+    ErrorF( "   AbortDDX\n" );
+    OsAbort();
+}
+
diff --git a/xorg-server/hw/xquartz/darwin.h b/xorg-server/hw/xquartz/darwin.h
index 7cd4336cd..e874af24c 100644
--- a/xorg-server/hw/xquartz/darwin.h
+++ b/xorg-server/hw/xquartz/darwin.h
@@ -1,92 +1,91 @@
-/*

- * Copyright (C) 2008 Apple, Inc.

- * Copyright (c) 2001-2004 Torrey T. Lyons. 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.

- */

-

-#ifndef _DARWIN_H

-#define _DARWIN_H

-

-#include <IOKit/IOTypes.h>

-#include "inputstr.h"

-#include "scrnintstr.h"

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

-#include <assert.h>

-

-#include "threadSafety.h"

-

-#include "darwinfb.h"

-

-// From darwin.c

-void DarwinPrintBanner(void);

-int DarwinParseModifierList(const char *constmodifiers, int separatelr);

-void DarwinAdjustScreenOrigins(ScreenInfo *pScreenInfo);

-void xf86SetRootClip (ScreenPtr pScreen, int enable);

-

-#define SCREEN_PRIV(pScreen) ((DarwinFramebufferPtr) \

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

-

-/*

- * Global variables from darwin.c

- */

-extern DevPrivateKeyRec darwinScreenKeyRec;

-#define darwinScreenKey (&darwinScreenKeyRec)

-extern int              darwinScreensFound;

-extern io_connect_t     darwinParamConnect;

-extern int              darwinEventReadFD;

-extern int              darwinEventWriteFD;

-extern DeviceIntPtr     darwinPointer;

-extern DeviceIntPtr     darwinTabletCurrent;

-extern DeviceIntPtr     darwinTabletCursor;

-extern DeviceIntPtr     darwinTabletStylus;

-extern DeviceIntPtr     darwinTabletEraser;

-extern DeviceIntPtr     darwinKeyboard;

-

-// User preferences

-extern int              darwinMouseAccelChange;

-extern int              darwinFakeButtons;

-extern int              darwinFakeMouse2Mask;

-extern int              darwinFakeMouse3Mask;

-extern unsigned int     darwinAppKitModMask;

-extern unsigned int     windowItemModMask;

-extern int              darwinSyncKeymap;

-extern int              darwinDesiredDepth;

-

-// location of X11's (0,0) point in global screen coordinates

-extern int              darwinMainScreenX;

-extern int              darwinMainScreenY;

-

-#define ENABLE_DEBUG_LOG 1

-

-#ifdef ENABLE_DEBUG_LOG

-extern FILE *debug_log_fp;

-#define DEBUG_LOG_NAME "x11-debug.txt"

-#define DEBUG_LOG(msg, args...) if (debug_log_fp) fprintf(debug_log_fp, "%s:%s:%s:%d " msg, threadSafetyID(pthread_self()), __FILE__, __FUNCTION__, __LINE__, ##args ); fflush(debug_log_fp);

-#else

-#define DEBUG_LOG(msg, args...) 

-#endif

-

-#define TRACE() DEBUG_LOG("\n")

-

-#endif  /* _DARWIN_H */

+/*
+ * Copyright (C) 2008 Apple, Inc.
+ * Copyright (c) 2001-2004 Torrey T. Lyons. 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.
+ */
+
+#ifndef _DARWIN_H
+#define _DARWIN_H
+
+#include <IOKit/IOTypes.h>
+#include "inputstr.h"
+#include "scrnintstr.h"
+#include <X11/extensions/XKB.h>
+#include <assert.h>
+
+#include "threadSafety.h"
+
+#include "darwinfb.h"
+
+// From darwin.c
+void DarwinPrintBanner(void);
+int DarwinParseModifierList(const char *constmodifiers, int separatelr);
+void DarwinAdjustScreenOrigins(ScreenInfo *pScreenInfo);
+
+#define SCREEN_PRIV(pScreen) ((DarwinFramebufferPtr) \
+    dixLookupPrivate(&pScreen->devPrivates, darwinScreenKey))
+
+/*
+ * Global variables from darwin.c
+ */
+extern DevPrivateKeyRec darwinScreenKeyRec;
+#define darwinScreenKey (&darwinScreenKeyRec)
+extern int              darwinScreensFound;
+extern io_connect_t     darwinParamConnect;
+extern int              darwinEventReadFD;
+extern int              darwinEventWriteFD;
+extern DeviceIntPtr     darwinPointer;
+extern DeviceIntPtr     darwinTabletCurrent;
+extern DeviceIntPtr     darwinTabletCursor;
+extern DeviceIntPtr     darwinTabletStylus;
+extern DeviceIntPtr     darwinTabletEraser;
+extern DeviceIntPtr     darwinKeyboard;
+
+// User preferences
+extern int              darwinMouseAccelChange;
+extern int              darwinFakeButtons;
+extern int              darwinFakeMouse2Mask;
+extern int              darwinFakeMouse3Mask;
+extern unsigned int     darwinAppKitModMask;
+extern unsigned int     windowItemModMask;
+extern int              darwinSyncKeymap;
+extern int              darwinDesiredDepth;
+
+// location of X11's (0,0) point in global screen coordinates
+extern int              darwinMainScreenX;
+extern int              darwinMainScreenY;
+
+#define ENABLE_DEBUG_LOG 1
+
+#ifdef ENABLE_DEBUG_LOG
+extern FILE *debug_log_fp;
+#define DEBUG_LOG_NAME "x11-debug.txt"
+#define DEBUG_LOG(msg, args...) if (debug_log_fp) fprintf(debug_log_fp, "%s:%s:%s:%d " msg, threadSafetyID(pthread_self()), __FILE__, __FUNCTION__, __LINE__, ##args ); fflush(debug_log_fp);
+#else
+#define DEBUG_LOG(msg, args...) 
+#endif
+
+#define TRACE() DEBUG_LOG("\n")
+
+#endif  /* _DARWIN_H */
diff --git a/xorg-server/hw/xquartz/darwinXinput.c b/xorg-server/hw/xquartz/darwinXinput.c
index 527c5bcff..3ef34fec0 100644
--- a/xorg-server/hw/xquartz/darwinXinput.c
+++ b/xorg-server/hw/xquartz/darwinXinput.c
@@ -1,166 +1,156 @@
-/*

- * X server support of the XINPUT extension for xquartz

- *

- * This is currently a copy of Xi/stubs.c, but eventually this

- * should include more complete XINPUT support.

- */

-

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

-

-Copyright 1989, 1998  The Open Group

-

-Permission to use, copy, modify, distribute, and sell this software and its

-documentation for any purpose is hereby granted without fee, provided that

-the above copyright notice appear in all copies and that both that

-copyright notice and this permission notice appear in supporting

-documentation.

-

-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

-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-

-Except as contained in this notice, the name of The Open Group shall not be

-used in advertising or otherwise to promote the sale, use or other dealings

-in this Software without prior written authorization from The Open Group.

-

-Copyright 1989 by Hewlett-Packard Company, Palo Alto, California.

-

-			All Rights Reserved

-

-Permission to use, copy, modify, and distribute this software and its

-documentation for any purpose and without fee is hereby granted,

-provided that the above copyright notice appear in all copies and that

-both that copyright notice and this permission notice appear in

-supporting documentation, and that the name of Hewlett-Packard not be

-used in advertising or publicity pertaining to distribution of the

-software without specific, written prior permission.

-

-HEWLETT-PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING

-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL

-HEWLETT-PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR

-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,

-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,

-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS

-SOFTWARE.

-

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

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include <X11/X.h>

-#include <X11/Xproto.h>

-#include "inputstr.h"

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

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

-#include "XIstubs.h"

-#include "darwin.h"

-

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

- *

- * Caller:	ProcXSetDeviceMode

- *

- * Change the mode of an extension device.

- * This function is used to change the mode of a device from reporting

- * relative motion to reporting absolute positional information, and

- * vice versa.

- * The default implementation below is that no such devices are supported.

- *

- */

-

-int

-SetDeviceMode(ClientPtr client, DeviceIntPtr dev, int mode)

-{

-  DEBUG_LOG("SetDeviceMode(%p, %p, %d)\n", client, dev, mode);

-    return BadMatch;

-}

-

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

- *

- * Caller:	ProcXSetDeviceValuators

- *

- * Set the value of valuators on an extension input device.

- * This function is used to set the initial value of valuators on

- * those input devices that are capable of reporting either relative

- * motion or an absolute position, and allow an initial position to be set.

- * The default implementation below is that no such devices are supported.

- *

- */

-

-int

-SetDeviceValuators(ClientPtr client, DeviceIntPtr dev,

-		   int *valuators, int first_valuator, int num_valuators)

-{

-  DEBUG_LOG("SetDeviceValuators(%p, %p, %p, %d, %d)\n", client,

-	    dev, valuators, first_valuator, num_valuators);

-  return BadMatch;

-}

-

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

- *

- * Caller:	ProcXChangeDeviceControl

- *

- * Change the specified device controls on an extension input device.

- *

- */

-

-int

-ChangeDeviceControl(ClientPtr client, DeviceIntPtr dev,

-		    xDeviceCtl * control)

-{

-

-  DEBUG_LOG("ChangeDeviceControl(%p, %p, %p)\n", client, dev, control);

-    switch (control->control) {

-    case DEVICE_RESOLUTION:

-	return BadMatch;

-    case DEVICE_ABS_CALIB:

-    case DEVICE_ABS_AREA:

-        return BadMatch;

-    case DEVICE_CORE:

-        return BadMatch;

-    default:

-	return BadMatch;

-    }

-}

-

-

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

- *

- * Caller: configAddDevice (and others)

- *

- * Add a new device with the specified options.

- *

- */

-int

-NewInputDeviceRequest(InputOption *options, InputAttributes *attrs,

-                      DeviceIntPtr *pdev)

-{

-  DEBUG_LOG("NewInputDeviceRequest(%p, %p)\n", options, pdev);

-  return BadValue;

-}

-

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

- *

- * Caller: configRemoveDevice (and others)

- *

- * Remove the specified device previously added.

- *

- */

-void

-DeleteInputDeviceRequest(DeviceIntPtr dev)

-{

-  DEBUG_LOG("DeleteInputDeviceRequest(%p)\n", dev);

-}

-

-void

-CloseInput (void)

-{

-}

-

+/*
+ * X server support of the XINPUT extension for xquartz
+ *
+ * This is currently a copy of Xi/stubs.c, but eventually this
+ * should include more complete XINPUT support.
+ */
+
+/************************************************************
+
+Copyright 1989, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+Copyright 1989 by Hewlett-Packard Company, Palo Alto, California.
+
+			All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Hewlett-Packard not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+HEWLETT-PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+HEWLETT-PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+********************************************************/
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include <X11/X.h>
+#include <X11/Xproto.h>
+#include "inputstr.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include "XIstubs.h"
+#include "darwin.h"
+
+/****************************************************************************
+ *
+ * Caller:	ProcXSetDeviceMode
+ *
+ * Change the mode of an extension device.
+ * This function is used to change the mode of a device from reporting
+ * relative motion to reporting absolute positional information, and
+ * vice versa.
+ * The default implementation below is that no such devices are supported.
+ *
+ */
+
+int
+SetDeviceMode(ClientPtr client, DeviceIntPtr dev, int mode)
+{
+  DEBUG_LOG("SetDeviceMode(%p, %p, %d)\n", client, dev, mode);
+    return BadMatch;
+}
+
+/****************************************************************************
+ *
+ * Caller:	ProcXSetDeviceValuators
+ *
+ * Set the value of valuators on an extension input device.
+ * This function is used to set the initial value of valuators on
+ * those input devices that are capable of reporting either relative
+ * motion or an absolute position, and allow an initial position to be set.
+ * The default implementation below is that no such devices are supported.
+ *
+ */
+
+int
+SetDeviceValuators(ClientPtr client, DeviceIntPtr dev,
+		   int *valuators, int first_valuator, int num_valuators)
+{
+  DEBUG_LOG("SetDeviceValuators(%p, %p, %p, %d, %d)\n", client,
+	    dev, valuators, first_valuator, num_valuators);
+  return BadMatch;
+}
+
+/****************************************************************************
+ *
+ * Caller:	ProcXChangeDeviceControl
+ *
+ * Change the specified device controls on an extension input device.
+ *
+ */
+
+int
+ChangeDeviceControl(ClientPtr client, DeviceIntPtr dev,
+		    xDeviceCtl * control)
+{
+
+  DEBUG_LOG("ChangeDeviceControl(%p, %p, %p)\n", client, dev, control);
+  return BadMatch;
+}
+
+
+/****************************************************************************
+ *
+ * Caller: configAddDevice (and others)
+ *
+ * Add a new device with the specified options.
+ *
+ */
+int
+NewInputDeviceRequest(InputOption *options, InputAttributes *attrs,
+                      DeviceIntPtr *pdev)
+{
+  DEBUG_LOG("NewInputDeviceRequest(%p, %p)\n", options, pdev);
+  return BadValue;
+}
+
+/****************************************************************************
+ *
+ * Caller: configRemoveDevice (and others)
+ *
+ * Remove the specified device previously added.
+ *
+ */
+void
+DeleteInputDeviceRequest(DeviceIntPtr dev)
+{
+  DEBUG_LOG("DeleteInputDeviceRequest(%p)\n", dev);
+}
+
+void
+CloseInput (void)
+{
+}
+
diff --git a/xorg-server/hw/xquartz/quartz.c b/xorg-server/hw/xquartz/quartz.c
index 11e5a74d7..4b72a89d3 100644
--- a/xorg-server/hw/xquartz/quartz.c
+++ b/xorg-server/hw/xquartz/quartz.c
@@ -442,7 +442,7 @@ void QuartzSetRootClip(
 
     for (i = 0; i < screenInfo.numScreens; i++) {
         if (screenInfo.screens[i]) {
-            xf86SetRootClip(screenInfo.screens[i], enable);
+            SetRootClip(screenInfo.screens[i], enable);
         }
     }
 }
diff --git a/xorg-server/hw/xquartz/threadSafety.h b/xorg-server/hw/xquartz/threadSafety.h
index 7b009103a..3ff9eaf7e 100644
--- a/xorg-server/hw/xquartz/threadSafety.h
+++ b/xorg-server/hw/xquartz/threadSafety.h
@@ -53,4 +53,4 @@ const char *threadSafetyID(pthread_t tid);
 #define TA_APPKIT() 
 #endif
 
-#endif _XQ_THREAD_SAFETY_H_
+#endif /* _XQ_THREAD_SAFETY_H_ */
diff --git a/xorg-server/hw/xquartz/xpr/xprScreen.c b/xorg-server/hw/xquartz/xpr/xprScreen.c
index 972278b75..f6a712906 100644
--- a/xorg-server/hw/xquartz/xpr/xprScreen.c
+++ b/xorg-server/hw/xquartz/xpr/xprScreen.c
@@ -326,7 +326,9 @@ xprAddScreen(int index, ScreenPtr pScreen)
 #endif
     }
     
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
 have_depth:
+#endif
     switch(depth) {
         case 8: // pseudo-working
             dfb->visuals = PseudoColorMask;