102 files changed, 18885 insertions, 18691 deletions

diff --git a/xorg-server/Xext/Makefile.am b/xorg-server/Xext/Makefile.am
index 8a604c3e7..cb47d38cc 100644
--- a/xorg-server/Xext/Makefile.am
+++ b/xorg-server/Xext/Makefile.am
@@ -94,12 +94,6 @@ if XCSECURITY
 BUILTIN_SRCS += $(XCSECURITY_SRCS)

 endif

 

-XCALIBRATE_SRCS = xcalibrate.c

-if XCALIBRATE

-BUILTIN_SRCS += $(XCALIBRATE_SRCS)

-# XCalibrate needs tslib

-endif

-

 # XF86 Big Font extension

 BIGFONT_SRCS = xf86bigfont.c xf86bigfontsrv.h

 if XF86BIGFONT

@@ -132,7 +126,6 @@ EXTRA_DIST = \
 	$(XACE_SRCS) \

 	$(XCSECURITY_SRCS) \

 	$(XSELINUX_SRCS) \

-	$(XCALIBRATE_SRCS) \

 	$(XINERAMA_SRCS) \

 	$(BIGFONT_SRCS) \

 	$(DPMS_SRCS) \

diff --git a/xorg-server/Xext/xcalibrate.c b/xorg-server/Xext/xcalibrate.c
deleted file mode 100644
index a16c11bab..000000000
--- a/xorg-server/Xext/xcalibrate.c
+++ /dev/null
@@ -1,297 +0,0 @@
-/*

- * Copyright © 2003 Philip Blundell

- *

- * 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, and that the name of Philip Blundell not be used in

- * advertising or publicity pertaining to distribution of the software without

- * specific, written prior permission.  Philip Blundell makes no

- * representations about the suitability of this software for any purpose.  It

- * is provided "as is" without express or implied warranty.

- *

- * PHILIP BLUNDELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

- * EVENT SHALL PHILIP BLUNDELL 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_KDRIVE_CONFIG_H

-#include <kdrive-config.h>

-#endif

-

-

-#include <X11/X.h>

-#include <X11/Xproto.h>

-#include "misc.h"

-#include "os.h"

-#include "dixstruct.h"

-#include "extnsionst.h"

-#include "swaprep.h"

-#include "protocol-versions.h"

-

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

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

-

-extern void (*tslib_raw_event_hook)(int x, int y, int pressure, void *closure);

-extern void *tslib_raw_event_closure;

-

-static CARD8	XCalibrateReqCode;

-int		XCalibrateEventBase;

-int		XCalibrateReqBase;

-int		XCalibrateErrorBase;

-

-static ClientPtr xcalibrate_client;

-

-static void

-xcalibrate_event_hook (int x, int y, int pressure, void *closure)

-{

-  ClientPtr pClient = (ClientPtr) closure;

-  xXCalibrateRawTouchscreenEvent	ev;

-

-  ev.type = XCalibrateEventBase + X_XCalibrateRawTouchscreen;

-  ev.x = x;

-  ev.y = y;

-  ev.pressure = pressure;

-

-  WriteEventsToClient (pClient, 1, (xEvent *) &ev);

-}

-

-static int

-ProcXCalibrateQueryVersion (ClientPtr client)

-{

-  REQUEST(xXCalibrateQueryVersionReq);

-  xXCalibrateQueryVersionReply rep;

-  CARD16 client_major, client_minor;  /* not used */

-

-  REQUEST_SIZE_MATCH (xXCalibrateQueryVersionReq);

-

-  client_major = stuff->majorVersion;

-  client_minor = stuff->minorVersion;

-

-  fprintf(stderr, "%s(): called\n", __func__); 

-

-  rep.type = X_Reply;

-  rep.length = 0;

-  rep.sequenceNumber = client->sequence;

-  rep.majorVersion = SERVER_XCALIBRATE_MAJOR_VERSION;

-  rep.minorVersion = SERVER_XCALIBRATE_MINOR_VERSION;

-  if (client->swapped) { 

-    int n;

-    swaps(&rep.sequenceNumber, n);

-    swapl(&rep.length, n);     

-    swaps(&rep.majorVersion, n);

-    swaps(&rep.minorVersion, n);

-  }

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

-  return Success;

-}

-

-static int

-SProcXCalibrateQueryVersion (ClientPtr client)

-{

-    REQUEST(xXCalibrateQueryVersionReq);

-    int n;

-

-    REQUEST_SIZE_MATCH (xXCalibrateQueryVersionReq);

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

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

-    return ProcXCalibrateQueryVersion(client);

-}

-

-static int

-ProcXCalibrateSetRawMode (ClientPtr client)

-{

-  REQUEST(xXCalibrateRawModeReq);

-  xXCalibrateRawModeReply rep;

-

-  REQUEST_SIZE_MATCH (xXCalibrateRawModeReq);

-

-  memset (&rep, 0, sizeof (rep));

-  rep.type = X_Reply;

-  rep.sequenceNumber = client->sequence;

-

-  if (stuff->on)

-    {

-      if (xcalibrate_client == NULL)

-	{

-	  /* Start calibrating.  */

-	  xcalibrate_client = client;

-	  tslib_raw_event_hook = xcalibrate_event_hook;

-	  tslib_raw_event_closure = client;

-	  rep.status = GrabSuccess;

-	}

-      else

-	{

-	  rep.status = AlreadyGrabbed;

-	}

-    }

-  else

-    {

-      if (xcalibrate_client == client)

-	{

-	  /* Stop calibrating.  */

-	  xcalibrate_client = NULL;

-	  tslib_raw_event_hook = NULL;

-	  tslib_raw_event_closure = NULL;

-	  rep.status = GrabSuccess;

-

-	  /* Cycle input off and on to reload configuration.  */

-	  KdDisableInput ();

-	  KdEnableInput ();

-	}

-      else

-	{

-	  rep.status = AlreadyGrabbed;

-	}

-    }

-

-  if (client->swapped)

-    {

-      int n;

-

-      swaps (&rep.sequenceNumber, n);

-      swaps (&rep.status, n);

-    }

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

-  return Success;

-}

-

-static int

-SProcXCalibrateSetRawMode (ClientPtr client)

-{

-  REQUEST(xXCalibrateRawModeReq);

-  int n;

-

-  REQUEST_SIZE_MATCH (xXCalibrateRawModeReq);

-

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

-

-  return ProcXCalibrateSetRawMode(client);

-}

-

-static int

-ProcXCalibrateScreenToCoord (ClientPtr client)

-{

-  REQUEST(xXCalibrateScreenToCoordReq);

-  xXCalibrateScreenToCoordReply rep;

-

-  REQUEST_SIZE_MATCH (xXCalibrateScreenToCoordReq);

-

-  memset (&rep, 0, sizeof (rep));

-  rep.type = X_Reply;

-  rep.sequenceNumber = client->sequence;

-  rep.x = stuff->x;

-  rep.y = stuff->y;

-

-  KdScreenToPointerCoords(&rep.x, &rep.y);

-

-  if (client->swapped)

-    {

-      int n;

-

-      swaps (&rep.x, n);

-      swaps (&rep.y, n);

-    }

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

-  return Success;

-}

-

-static int

-SProcXCalibrateScreenToCoord (ClientPtr client)

-{

-  REQUEST(xXCalibrateScreenToCoordReq);

-  int n;

-

-  REQUEST_SIZE_MATCH (xXCalibrateScreenToCoordReq);

-

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

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

-

-  return ProcXCalibrateScreenToCoord(client);

-}

-

-static int

-ProcXCalibrateDispatch (ClientPtr client)

-{

-    REQUEST(xReq);

-    switch (stuff->data) {

-    case X_XCalibrateQueryVersion:

-        return ProcXCalibrateQueryVersion(client);

-    case X_XCalibrateRawMode:

-        return ProcXCalibrateSetRawMode(client);

-    case X_XCalibrateScreenToCoord:

-        return ProcXCalibrateScreenToCoord(client);

-

-    default: break;

-    }

-

-    return BadRequest;

-}

-

-static int

-SProcXCalibrateDispatch (ClientPtr client)

-{

-    REQUEST(xReq);

-    int n;

-

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

-

-    switch (stuff->data) {

-    case X_XCalibrateQueryVersion:

-        return SProcXCalibrateQueryVersion(client);

-    case X_XCalibrateRawMode:

-        return SProcXCalibrateSetRawMode(client);

-    case X_XCalibrateScreenToCoord:

-        return SProcXCalibrateScreenToCoord(client);

-

-    default: break;

-    }

-

-    return BadRequest;

-}

-

-static void

-XCalibrateClientCallback (CallbackListPtr	*list,

-			  pointer		closure,

-			  pointer		data)

-{

-    NewClientInfoRec	*clientinfo = (NewClientInfoRec *) data;

-    ClientPtr		pClient = clientinfo->client;

-

-    if (clientinfo->setup == NULL

-	&& xcalibrate_client != NULL

-	&& xcalibrate_client == pClient)

-      {

-	/* Stop calibrating.  */

-	xcalibrate_client = NULL;

-	tslib_raw_event_hook = NULL;

-	tslib_raw_event_closure = NULL;

-      }

-}

-

-void

-XCalibrateExtensionInit(void)

-{

-  ExtensionEntry *extEntry;

-

-  if (!AddCallback (&ClientStateCallback, XCalibrateClientCallback, 0))

-    return;  

-

-  extEntry = AddExtension(XCALIBRATE_NAME, XCalibrateNumberEvents, XCalibrateNumberErrors,

-			  ProcXCalibrateDispatch, SProcXCalibrateDispatch,

-			  NULL, StandardMinorOpcode);

-

-  if (!extEntry)

-    return;

-

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

-  XCalibrateEventBase = extEntry->eventBase;

-  XCalibrateErrorBase = extEntry->errorBase;

-

-  xcalibrate_client = 0;

-}

diff --git a/xorg-server/Xext/xselinux_hooks.c b/xorg-server/Xext/xselinux_hooks.c
index 57e49c090..1c048bd68 100644
--- a/xorg-server/Xext/xselinux_hooks.c
+++ b/xorg-server/Xext/xselinux_hooks.c
@@ -40,6 +40,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "propertyst.h"

 #include "extnsionst.h"

 #include "xacestr.h"

+#include "client.h"

 #include "../os/osdep.h"

 #define _XSELINUX_NEED_FLASK_MAP

 #include "xselinuxint.h"

@@ -129,26 +130,25 @@ SELinuxLabelClient(ClientPtr client)
 

     /* For local clients, try and determine the executable name */

     if (XaceIsLocal(client)) {

-	struct ucred creds;

-	socklen_t len = sizeof(creds);

-	char path[PATH_MAX + 1];

-	size_t bytes;

-

-	memset(&creds, 0, sizeof(creds));

-	if (getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &creds, &len) < 0)

-	    goto finish;

+	/* Get cached command name if CLIENTIDS is enabled. */

+	const char *cmdname = GetClientCmdName(client);

+	Bool cached = (cmdname != NULL);

+	/* If CLIENTIDS is disabled, figure out the command name from

+	 * scratch. */

+	if (!cmdname)

+	{

+	    pid_t pid = DetermineClientPid(client);

+	    if (pid != -1)

+		DetermineClientCmd(pid, &cmdname, NULL);

+	}

 

-	snprintf(path, PATH_MAX + 1, "/proc/%d/cmdline", creds.pid);

-	fd = open(path, O_RDONLY);

-	if (fd < 0)

+	if (!cmdname)

 	    goto finish;

 

-	bytes = read(fd, path, PATH_MAX + 1);

-	close(fd);

-	if (bytes <= 0)

-	    goto finish;

+	strncpy(subj->command, cmdname, COMMAND_LEN - 1);

 

-	strncpy(subj->command, path, COMMAND_LEN - 1);

+	if (!cached)

+	    free((void *) cmdname); /* const char * */

     }

 

 finish:

diff --git a/xorg-server/Xi/exevents.c b/xorg-server/Xi/exevents.c
index 1f6fdde18..b17b61990 100644
--- a/xorg-server/Xi/exevents.c
+++ b/xorg-server/Xi/exevents.c
@@ -1,2186 +1,2187 @@
-/************************************************************
-
-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.
-
-********************************************************/
-
-/********************************************************************
- *
- *  Routines to register and initialize extension input devices.
- *  This also contains ProcessOtherEvent, the routine called from DDX
- *  to route extension events.
- *
- */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#else
-#define XINPUT
-#endif
-
-#include "inputstr.h"
-#include <X11/X.h>
-#include <X11/Xproto.h>
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
-#include <X11/extensions/XI2proto.h>
-#include <X11/extensions/geproto.h>
-#include "windowstr.h"
-#include "miscstruct.h"
-#include "region.h"
-#include "exevents.h"
-#include "extnsionst.h"
-#include "exglobals.h"
-#include "dixevents.h"	/* DeliverFocusedEvent */
-#include "dixgrabs.h"	/* CreateGrab() */
-#include "scrnintstr.h"
-#include "listdev.h" /* for CopySwapXXXClass */
-#include "xace.h"
-#include "xiquerydevice.h" /* For List*Info */
-#include "eventconvert.h"
-#include "eventstr.h"
-
-#include <X11/extensions/XKBproto.h>
-#include "xkbsrv.h"
-
-#define WID(w) ((w) ? ((w)->drawable.id) : 0)
-#define AllModifiersMask ( \
-	ShiftMask | LockMask | ControlMask | Mod1Mask | Mod2Mask | \
-	Mod3Mask | Mod4Mask | Mod5Mask )
-#define AllButtonsMask ( \
-	Button1Mask | Button2Mask | Button3Mask | Button4Mask | Button5Mask )
-
-Bool ShouldFreeInputMasks(WindowPtr /* pWin */ ,
-				 Bool	/* ignoreSelectedEvents */
-    );
-static Bool MakeInputMasks(WindowPtr	/* pWin */
-    );
-
-/*
- * Only let the given client know of core events which will affect its
- * interpretation of input events, if the client's ClientPointer (or the
- * paired keyboard) is the current device.
- */
-int
-XIShouldNotify(ClientPtr client, DeviceIntPtr dev)
-{
-    DeviceIntPtr current_ptr = PickPointer(client);
-    DeviceIntPtr current_kbd = GetPairedDevice(current_ptr);
-
-    if (dev == current_kbd || dev == current_ptr)
-        return 1;
-
-    return 0;
-}
-
-Bool
-IsPointerEvent(InternalEvent* event)
-{
-    switch(event->any.type)
-    {
-        case ET_ButtonPress:
-        case ET_ButtonRelease:
-        case ET_Motion:
-            /* XXX: enter/leave ?? */
-            return TRUE;
-        default:
-            break;
-    }
-    return FALSE;
-}
-
-/**
- * @return the device matching the deviceid of the device set in the event, or
- * NULL if the event is not an XInput event.
- */
-DeviceIntPtr
-XIGetDevice(xEvent* xE)
-{
-    DeviceIntPtr pDev = NULL;
-
-    if (xE->u.u.type == DeviceButtonPress ||
-        xE->u.u.type == DeviceButtonRelease ||
-        xE->u.u.type == DeviceMotionNotify ||
-        xE->u.u.type == ProximityIn ||
-        xE->u.u.type == ProximityOut ||
-        xE->u.u.type == DevicePropertyNotify)
-    {
-        int rc;
-        int id;
-
-        id = ((deviceKeyButtonPointer*)xE)->deviceid & ~MORE_EVENTS;
-
-        rc = dixLookupDevice(&pDev, id, serverClient, DixUnknownAccess);
-        if (rc != Success)
-            ErrorF("[dix] XIGetDevice failed on XACE restrictions (%d)\n", rc);
-    }
-    return pDev;
-}
-
-
-/**
- * Copy the device->key into master->key and send a mapping notify to the
- * clients if appropriate.
- * master->key needs to be allocated by the caller.
- *
- * Device is the slave device. If it is attached to a master device, we may
- * need to send a mapping notify to the client because it causes the MD
- * to change state.
- *
- * Mapping notify needs to be sent in the following cases:
- *      - different slave device on same master
- *      - different master
- *
- * XXX: They way how the code is we also send a map notify if the slave device
- * stays the same, but the master changes. This isn't really necessary though.
- *
- * XXX: this gives you funny behaviour with the ClientPointer. When a
- * MappingNotify is sent to the client, the client usually responds with a
- * GetKeyboardMapping. This will retrieve the ClientPointer's keyboard
- * mapping, regardless of which keyboard sent the last mapping notify request.
- * So depending on the CP setting, your keyboard may change layout in each
- * app...
- *
- * This code is basically the old SwitchCoreKeyboard.
- */
-
-void
-CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master)
-{
-    KeyClassPtr mk = master->key;
-
-    if (device == master)
-        return;
-
-    mk->sourceid = device->id;
-
-
-    if (!XkbCopyDeviceKeymap(master, device))
-        FatalError("Couldn't pivot keymap from device to core!\n");
-}
-
-/**
- * Copies the feedback classes from device "from" into device "to". Classes
- * are duplicated (not just flipping the pointers). All feedback classes are
- * linked lists, the full list is duplicated.
- */
-static void
-DeepCopyFeedbackClasses(DeviceIntPtr from, DeviceIntPtr to)
-{
-    ClassesPtr classes;
-
-
-    if (from->intfeed)
-    {
-        IntegerFeedbackPtr *i, it;
-
-        if (!to->intfeed)
-        {
-            classes = to->unused_classes;
-            to->intfeed = classes->intfeed;
-            classes->intfeed = NULL;
-        }
-
-        i = &to->intfeed;
-        for (it = from->intfeed; it; it = it->next)
-        {
-            if (!(*i))
-            {
-                *i = calloc(1, sizeof(IntegerFeedbackClassRec));
-                if (!(*i))
-                {
-                    ErrorF("[Xi] Cannot alloc memory for class copy.");
-                    return;
-                }
-            }
-            (*i)->CtrlProc = it->CtrlProc;
-            (*i)->ctrl     = it->ctrl;
-
-            i = &(*i)->next;
-        }
-    } else if (to->intfeed && !from->intfeed)
-    {
-        ClassesPtr classes;
-        classes = to->unused_classes;
-        classes->intfeed = to->intfeed;
-        to->intfeed      = NULL;
-    }
-
-    if (from->stringfeed)
-    {
-        StringFeedbackPtr *s, it;
-
-        if (!to->stringfeed)
-        {
-            classes = to->unused_classes;
-            to->stringfeed = classes->stringfeed;
-            classes->stringfeed = NULL;
-        }
-
-        s = &to->stringfeed;
-        for (it = from->stringfeed; it; it = it->next)
-        {
-            if (!(*s))
-            {
-                *s = calloc(1, sizeof(StringFeedbackClassRec));
-                if (!(*s))
-                {
-                    ErrorF("[Xi] Cannot alloc memory for class copy.");
-                    return;
-                }
-            }
-            (*s)->CtrlProc = it->CtrlProc;
-            (*s)->ctrl     = it->ctrl;
-
-            s = &(*s)->next;
-        }
-    } else if (to->stringfeed && !from->stringfeed)
-    {
-        ClassesPtr classes;
-        classes = to->unused_classes;
-        classes->stringfeed = to->stringfeed;
-        to->stringfeed      = NULL;
-    }
-
-    if (from->bell)
-    {
-        BellFeedbackPtr *b, it;
-
-        if (!to->bell)
-        {
-            classes = to->unused_classes;
-            to->bell = classes->bell;
-            classes->bell = NULL;
-        }
-
-        b = &to->bell;
-        for (it = from->bell; it; it = it->next)
-        {
-            if (!(*b))
-            {
-                *b = calloc(1, sizeof(BellFeedbackClassRec));
-                if (!(*b))
-                {
-                    ErrorF("[Xi] Cannot alloc memory for class copy.");
-                    return;
-                }
-            }
-            (*b)->BellProc = it->BellProc;
-            (*b)->CtrlProc = it->CtrlProc;
-            (*b)->ctrl     = it->ctrl;
-
-            b = &(*b)->next;
-        }
-    } else if (to->bell && !from->bell)
-    {
-        ClassesPtr classes;
-        classes = to->unused_classes;
-        classes->bell = to->bell;
-        to->bell      = NULL;
-    }
-
-    if (from->leds)
-    {
-        LedFeedbackPtr *l, it;
-
-        if (!to->leds)
-        {
-            classes = to->unused_classes;
-            to->leds = classes->leds;
-            classes->leds = NULL;
-        }
-
-        l = &to->leds;
-        for (it = from->leds; it; it = it->next)
-        {
-            if (!(*l))
-            {
-                *l = calloc(1, sizeof(LedFeedbackClassRec));
-                if (!(*l))
-                {
-                    ErrorF("[Xi] Cannot alloc memory for class copy.");
-                    return;
-                }
-            }
-            (*l)->CtrlProc = it->CtrlProc;
-            (*l)->ctrl     = it->ctrl;
-            if ((*l)->xkb_sli)
-                XkbFreeSrvLedInfo((*l)->xkb_sli);
-            (*l)->xkb_sli = XkbCopySrvLedInfo(from, it->xkb_sli, NULL, *l);
-
-            l = &(*l)->next;
-        }
-    } else if (to->leds && !from->leds)
-    {
-        ClassesPtr classes;
-        classes = to->unused_classes;
-        classes->leds = to->leds;
-        to->leds      = NULL;
-    }
-}
-
-static void
-DeepCopyKeyboardClasses(DeviceIntPtr from, DeviceIntPtr to)
-{
-    ClassesPtr classes;
-
-    /* XkbInitDevice (->XkbInitIndicatorMap->XkbFindSrvLedInfo) relies on the
-     * kbdfeed to be set up properly, so let's do the feedback classes first.
-     */
-    if (from->kbdfeed)
-    {
-        KbdFeedbackPtr *k, it;
-
-        if (!to->kbdfeed)
-        {
-            classes = to->unused_classes;
-
-            to->kbdfeed = classes->kbdfeed;
-            if (!to->kbdfeed)
-                InitKeyboardDeviceStruct(to, NULL, NULL, NULL);
-            classes->kbdfeed = NULL;
-        }
-
-        k = &to->kbdfeed;
-        for(it = from->kbdfeed; it; it = it->next)
-        {
-            if (!(*k))
-            {
-                *k = calloc(1, sizeof(KbdFeedbackClassRec));
-                if (!*k)
-                {
-                    ErrorF("[Xi] Cannot alloc memory for class copy.");
-                    return;
-                }
-            }
-            (*k)->BellProc = it->BellProc;
-            (*k)->CtrlProc = it->CtrlProc;
-            (*k)->ctrl     = it->ctrl;
-            if ((*k)->xkb_sli)
-                XkbFreeSrvLedInfo((*k)->xkb_sli);
-            (*k)->xkb_sli = XkbCopySrvLedInfo(from, it->xkb_sli, *k, NULL);
-
-            k = &(*k)->next;
-        }
-    } else if (to->kbdfeed && !from->kbdfeed)
-    {
-        ClassesPtr classes;
-        classes = to->unused_classes;
-        classes->kbdfeed = to->kbdfeed;
-        to->kbdfeed      = NULL;
-    }
-
-    if (from->key)
-    {
-        if (!to->key)
-        {
-            classes = to->unused_classes;
-            to->key = classes->key;
-            if (!to->key)
-                InitKeyboardDeviceStruct(to, NULL, NULL, NULL);
-            else
-                classes->key = NULL;
-        }
-
-        CopyKeyClass(from, to);
-    } else if (to->key && !from->key)
-    {
-        ClassesPtr classes;
-        classes = to->unused_classes;
-        classes->key = to->key;
-        to->key      = NULL;
-    }
-
-    /* If a SrvLedInfoPtr's flags are XkbSLI_IsDefault, the names and maps
-     * pointer point into the xkbInfo->desc struct.  XkbCopySrvLedInfo
-     * didn't update the pointers so we need to do it manually here.
-     */
-    if (to->kbdfeed)
-    {
-        KbdFeedbackPtr k;
-
-        for (k = to->kbdfeed; k; k = k->next)
-        {
-            if (!k->xkb_sli)
-                continue;
-            if (k->xkb_sli->flags & XkbSLI_IsDefault)
-            {
-                k->xkb_sli->names = to->key->xkbInfo->desc->names->indicators;
-                k->xkb_sli->maps = to->key->xkbInfo->desc->indicators->maps;
-            }
-        }
-    }
-
-    /* We can't just copy over the focus class. When an app sets the focus,
-     * it'll do so on the master device. Copying the SDs focus means losing
-     * the focus.
-     * So we only copy the focus class if the device didn't have one,
-     * otherwise we leave it as it is.
-     */
-    if (from->focus)
-    {
-        if (!to->focus)
-        {
-            WindowPtr *oldTrace;
-
-            classes = to->unused_classes;
-            to->focus = classes->focus;
-            if (!to->focus)
-            {
-                to->focus = calloc(1, sizeof(FocusClassRec));
-                if (!to->focus)
-                    FatalError("[Xi] no memory for class shift.\n");
-            } else
-                classes->focus = NULL;
-
-            oldTrace = to->focus->trace;
-            memcpy(to->focus, from->focus, sizeof(FocusClassRec));
-            to->focus->trace = realloc(oldTrace,
-                                  to->focus->traceSize * sizeof(WindowPtr));
-            if (!to->focus->trace && to->focus->traceSize)
-                FatalError("[Xi] no memory for trace.\n");
-            memcpy(to->focus->trace, from->focus->trace,
-                    from->focus->traceSize * sizeof(WindowPtr));
-            to->focus->sourceid = from->id;
-        }
-    } else if (to->focus)
-    {
-        ClassesPtr classes;
-        classes = to->unused_classes;
-        classes->focus = to->focus;
-        to->focus      = NULL;
-    }
-
-}
-
-static void
-DeepCopyPointerClasses(DeviceIntPtr from, DeviceIntPtr to)
-{
-    ClassesPtr classes;
-
-    /* Feedback classes must be copied first */
-    if (from->ptrfeed)
-    {
-        PtrFeedbackPtr *p, it;
-        if (!to->ptrfeed)
-        {
-            classes = to->unused_classes;
-            to->ptrfeed = classes->ptrfeed;
-            classes->ptrfeed = NULL;
-        }
-
-        p = &to->ptrfeed;
-        for (it = from->ptrfeed; it; it = it->next)
-        {
-            if (!(*p))
-            {
-                *p = calloc(1, sizeof(PtrFeedbackClassRec));
-                if (!*p)
-                {
-                    ErrorF("[Xi] Cannot alloc memory for class copy.");
-                    return;
-                }
-            }
-            (*p)->CtrlProc = it->CtrlProc;
-            (*p)->ctrl     = it->ctrl;
-
-            p = &(*p)->next;
-        }
-    } else if (to->ptrfeed && !from->ptrfeed)
-    {
-        ClassesPtr classes;
-        classes = to->unused_classes;
-        classes->ptrfeed = to->ptrfeed;
-        to->ptrfeed      = NULL;
-    }
-
-    if (from->valuator)
-    {
-        ValuatorClassPtr v;
-        if (!to->valuator)
-        {
-            classes = to->unused_classes;
-            to->valuator = classes->valuator;
-            if (to->valuator)
-                classes->valuator = NULL;
-        }
-
-        to->valuator = realloc(to->valuator, sizeof(ValuatorClassRec) +
-                from->valuator->numAxes * sizeof(AxisInfo) +
-                from->valuator->numAxes * sizeof(double));
-        v = to->valuator;
-        if (!v)
-            FatalError("[Xi] no memory for class shift.\n");
-
-        v->numAxes = from->valuator->numAxes;
-        v->axes = (AxisInfoPtr)&v[1];
-        memcpy(v->axes, from->valuator->axes, v->numAxes * sizeof(AxisInfo));
-
-        v->axisVal = (double*)(v->axes + from->valuator->numAxes);
-        v->sourceid = from->id;
-    } else if (to->valuator && !from->valuator)
-    {
-        ClassesPtr classes;
-        classes = to->unused_classes;
-        classes->valuator = to->valuator;
-        to->valuator      = NULL;
-    }
-
-    if (from->button)
-    {
-        if (!to->button)
-        {
-            classes = to->unused_classes;
-            to->button = classes->button;
-            if (!to->button)
-            {
-                to->button = calloc(1, sizeof(ButtonClassRec));
-                if (!to->button)
-                    FatalError("[Xi] no memory for class shift.\n");
-            } else
-                classes->button = NULL;
-        }
-
-        if (from->button->xkb_acts)
-        {
-            if (!to->button->xkb_acts)
-            {
-                to->button->xkb_acts = calloc(1, sizeof(XkbAction));
-                if (!to->button->xkb_acts)
-                    FatalError("[Xi] not enough memory for xkb_acts.\n");
-            }
-            memcpy(to->button->xkb_acts, from->button->xkb_acts,
-                    sizeof(XkbAction));
-        } else
-            free(to->button->xkb_acts);
-
-         memcpy(to->button->labels, from->button->labels,
-                from->button->numButtons * sizeof(Atom));
-        to->button->sourceid = from->id;
-    } else if (to->button && !from->button)
-    {
-        ClassesPtr classes;
-        classes = to->unused_classes;
-        classes->button = to->button;
-        to->button      = NULL;
-    }
-
-    if (from->proximity)
-    {
-        if (!to->proximity)
-        {
-            classes = to->unused_classes;
-            to->proximity = classes->proximity;
-            if (!to->proximity)
-            {
-                to->proximity = calloc(1, sizeof(ProximityClassRec));
-                if (!to->proximity)
-                    FatalError("[Xi] no memory for class shift.\n");
-            } else
-                classes->proximity = NULL;
-        }
-        memcpy(to->proximity, from->proximity, sizeof(ProximityClassRec));
-        to->proximity->sourceid = from->id;
-    } else if (to->proximity)
-    {
-        ClassesPtr classes;
-        classes = to->unused_classes;
-        classes->proximity = to->proximity;
-        to->proximity      = NULL;
-    }
-
-    if (from->absolute)
-    {
-        if (!to->absolute)
-        {
-            classes = to->unused_classes;
-            to->absolute = classes->absolute;
-            if (!to->absolute)
-            {
-                to->absolute = calloc(1, sizeof(AbsoluteClassRec));
-                if (!to->absolute)
-                    FatalError("[Xi] no memory for class shift.\n");
-            } else
-                classes->absolute = NULL;
-        }
-        memcpy(to->absolute, from->absolute, sizeof(AbsoluteClassRec));
-        to->absolute->sourceid = from->id;
-    } else if (to->absolute)
-    {
-        ClassesPtr classes;
-        classes = to->unused_classes;
-        classes->absolute = to->absolute;
-        to->absolute      = NULL;
-    }
-}
-
-/**
- * Copies the CONTENT of the classes of device from into the classes in device
- * to. From and to are identical after finishing.
- *
- * If to does not have classes from currenly has, the classes are stored in
- * to's devPrivates system. Later, we recover it again from there if needed.
- * Saves a few memory allocations.
- */
-void
-DeepCopyDeviceClasses(DeviceIntPtr from, DeviceIntPtr to, DeviceChangedEvent *dce)
-{
-    /* generic feedback classes, not tied to pointer and/or keyboard */
-    DeepCopyFeedbackClasses(from, to);
-
-    if ((dce->flags & DEVCHANGE_KEYBOARD_EVENT))
-        DeepCopyKeyboardClasses(from, to);
-    if ((dce->flags & DEVCHANGE_POINTER_EVENT))
-        DeepCopyPointerClasses(from, to);
-}
-
-
-/**
- * Send an XI2 DeviceChangedEvent to all interested clients.
- */
-void
-XISendDeviceChangedEvent(DeviceIntPtr device, DeviceIntPtr master, DeviceChangedEvent *dce)
-{
-    xXIDeviceChangedEvent *dcce;
-    int rc;
-
-    rc = EventToXI2((InternalEvent*)dce, (xEvent**)&dcce);
-    if (rc != Success)
-    {
-        ErrorF("[Xi] event conversion from DCE failed with code %d\n", rc);
-        return;
-    }
-
-    /* we don't actually swap if there's a NullClient, swapping is done
-     * later when event is delivered. */
-    SendEventToAllWindows(master, XI_DeviceChangedMask, (xEvent*)dcce, 1);
-    free(dcce);
-}
-
-static void
-ChangeMasterDeviceClasses(DeviceIntPtr device, DeviceChangedEvent *dce)
-{
-    DeviceIntPtr slave;
-    int rc;
-
-    /* For now, we don't have devices that change physically. */
-    if (!IsMaster(device))
-        return;
-
-    rc = dixLookupDevice(&slave, dce->sourceid, serverClient, DixReadAccess);
-
-    if (rc != Success)
-        return; /* Device has disappeared */
-
-    if (!slave->u.master)
-        return; /* set floating since the event */
-
-    if (slave->u.master->id != dce->masterid)
-        return; /* not our slave anymore, don't care */
-
-    /* FIXME: we probably need to send a DCE for the new slave now */
-
-    device->public.devicePrivate = slave->public.devicePrivate;
-
-    /* FIXME: the classes may have changed since we generated the event. */
-    DeepCopyDeviceClasses(slave, device, dce);
-    XISendDeviceChangedEvent(slave, device, dce);
-}
-
-/**
- * Update the device state according to the data in the event.
- *
- * return values are
- *   DEFAULT ... process as normal
- *   DONT_PROCESS ... return immediately from caller
- */
-#define DEFAULT 0
-#define DONT_PROCESS 1
-int
-UpdateDeviceState(DeviceIntPtr device, DeviceEvent* event)
-{
-    int i;
-    int key = 0,
-        bit = 0,
-        last_valuator;
-
-    KeyClassPtr k       = NULL;
-    ButtonClassPtr b    = NULL;
-    ValuatorClassPtr v  = NULL;
-
-    /* This event is always the first we get, before the actual events with
-     * the data. However, the way how the DDX is set up, "device" will
-     * actually be the slave device that caused the event.
-     */
-    switch(event->type)
-    {
-        case ET_DeviceChanged:
-            ChangeMasterDeviceClasses(device, (DeviceChangedEvent*)event);
-            return DONT_PROCESS; /* event has been sent already */
-        case ET_Motion:
-        case ET_ButtonPress:
-        case ET_ButtonRelease:
-        case ET_KeyPress:
-        case ET_KeyRelease:
-        case ET_ProximityIn:
-        case ET_ProximityOut:
-            break;
-        default:
-            /* other events don't update the device */
-            return DEFAULT;
-    }
-
-    k = device->key;
-    v = device->valuator;
-    b = device->button;
-
-    key = event->detail.key;
-    bit = 1 << (key & 7);
-
-    /* Update device axis */
-    /* Check valuators first */
-    last_valuator = -1;
-    for (i = 0; i < MAX_VALUATORS; i++)
-    {
-        if (BitIsOn(&event->valuators.mask, i))
-        {
-            if (!v)
-            {
-                ErrorF("[Xi] Valuators reported for non-valuator device '%s'. "
-                        "Ignoring event.\n", device->name);
-                return DONT_PROCESS;
-            } else if (v->numAxes < i)
-            {
-                ErrorF("[Xi] Too many valuators reported for device '%s'. "
-                        "Ignoring event.\n", device->name);
-                return DONT_PROCESS;
-            }
-            last_valuator = i;
-        }
-    }
-
-    for (i = 0; i <= last_valuator && i < v->numAxes; i++)
-    {
-        if (BitIsOn(&event->valuators.mask, i))
-        {
-            /* XXX: Relative/Absolute mode */
-            v->axisVal[i] = event->valuators.data[i];
-            v->axisVal[i] += (event->valuators.data_frac[i] * 1.0f / (1 << 16) / (1 << 16));
-        }
-    }
-
-    if (event->type == ET_KeyPress) {
-        if (!k)
-            return DONT_PROCESS;
-
-	/* don't allow ddx to generate multiple downs, but repeats are okay */
-	if (key_is_down(device, key, KEY_PROCESSED) && !event->key_repeat)
-	    return DONT_PROCESS;
-
-	if (device->valuator)
-	    device->valuator->motionHintWindow = NullWindow;
-	set_key_down(device, key, KEY_PROCESSED);
-    } else if (event->type == ET_KeyRelease) {
-        if (!k)
-            return DONT_PROCESS;
-
-	if (!key_is_down(device, key, KEY_PROCESSED))	/* guard against duplicates */
-	    return DONT_PROCESS;
-	if (device->valuator)
-	    device->valuator->motionHintWindow = NullWindow;
-	set_key_up(device, key, KEY_PROCESSED);
-    } else if (event->type == ET_ButtonPress) {
-        Mask mask;
-        if (!b)
-            return DONT_PROCESS;
-
-        if (button_is_down(device, key, BUTTON_PROCESSED))
-            return DONT_PROCESS;
-
-        set_button_down(device, key, BUTTON_PROCESSED);
-	if (device->valuator)
-	    device->valuator->motionHintWindow = NullWindow;
-        if (!b->map[key])
-            return DONT_PROCESS;
-        b->buttonsDown++;
-	b->motionMask = DeviceButtonMotionMask;
-        if (b->map[key] <= 5)
-	    b->state |= (Button1Mask >> 1) << b->map[key];
-
-        /* Add state and motionMask to the filter for this event */
-        mask = DevicePointerMotionMask | b->state | b->motionMask;
-        SetMaskForEvent(device->id, mask, DeviceMotionNotify);
-        mask = PointerMotionMask | b->state | b->motionMask;
-        SetMaskForEvent(device->id, mask, MotionNotify);
-    } else if (event->type == ET_ButtonRelease) {
-        Mask mask;
-        if (!b)
-            return DONT_PROCESS;
-
-        if (!button_is_down(device, key, BUTTON_PROCESSED))
-            return DONT_PROCESS;
-        if (IsMaster(device)) {
-            DeviceIntPtr sd;
-
-            /*
-             * Leave the button down if any slave has the
-             * button still down. Note that this depends on the
-             * event being delivered through the slave first
-             */
-            for (sd = inputInfo.devices; sd; sd = sd->next) {
-                if (IsMaster(sd) || sd->u.master != device)
-                    continue;
-                if (!sd->button)
-                    continue;
-                for (i = 1; i <= sd->button->numButtons; i++)
-                    if (sd->button->map[i] == key &&
-                        button_is_down(sd, i, BUTTON_PROCESSED))
-                        return DONT_PROCESS;
-            }
-        }
-        set_button_up(device, key, BUTTON_PROCESSED);
-	if (device->valuator)
-	    device->valuator->motionHintWindow = NullWindow;
-        if (!b->map[key])
-            return DONT_PROCESS;
-        if (b->buttonsDown >= 1 && !--b->buttonsDown)
-	    b->motionMask = 0;
-	if (b->map[key] <= 5)
-	    b->state &= ~((Button1Mask >> 1) << b->map[key]);
-
-        /* Add state and motionMask to the filter for this event */
-        mask = DevicePointerMotionMask | b->state | b->motionMask;
-        SetMaskForEvent(device->id, mask, DeviceMotionNotify);
-        mask = PointerMotionMask | b->state | b->motionMask;
-        SetMaskForEvent(device->id, mask, MotionNotify);
-    } else if (event->type == ET_ProximityIn)
-	device->proximity->in_proximity = TRUE;
-    else if (event->type == ET_ProximityOut)
-	device->proximity->in_proximity = FALSE;
-
-    return DEFAULT;
-}
-
-static void
-ProcessRawEvent(RawDeviceEvent *ev, DeviceIntPtr device)
-{
-    GrabPtr grab = device->deviceGrab.grab;
-
-    if (grab)
-        DeliverGrabbedEvent((InternalEvent*)ev, device, FALSE);
-    else { /* deliver to all root windows */
-        xEvent *xi;
-        int i;
-
-        i = EventToXI2((InternalEvent*)ev, (xEvent**)&xi);
-        if (i != Success)
-        {
-            ErrorF("[Xi] %s: XI2 conversion failed in ProcessRawEvent (%d)\n",
-                    device->name, i);
-            return;
-        }
-
-        for (i = 0; i < screenInfo.numScreens; i++)
-          if (screenInfo.screens[i] && screenInfo.screens[i]->root)
-            DeliverEventsToWindow(device, screenInfo.screens[i]->root, xi, 1,
-                                  GetEventFilter(device, xi), NULL);
-        free(xi);
-    }
-}
-
-/**
- * Main device event processing function.
- * Called from when processing the events from the event queue.
- *
- */
-void
-ProcessOtherEvent(InternalEvent *ev, DeviceIntPtr device)
-{
-    GrabPtr grab;
-    Bool deactivateDeviceGrab = FALSE;
-    int key = 0, rootX, rootY;
-    ButtonClassPtr b;
-    KeyClassPtr k;
-    ValuatorClassPtr v;
-    int ret = 0;
-    int state, i;
-    DeviceIntPtr mouse = NULL, kbd = NULL;
-    DeviceEvent *event = &ev->device_event;
-
-    CHECKEVENT(ev);
-
-    if (ev->any.type == ET_RawKeyPress ||
-        ev->any.type == ET_RawKeyRelease ||
-        ev->any.type == ET_RawButtonPress ||
-        ev->any.type == ET_RawButtonRelease ||
-        ev->any.type == ET_RawMotion)
-    {
-        ProcessRawEvent(&ev->raw_event, device);
-        return;
-    }
-
-    if (IsPointerDevice(device))
-    {
-        kbd = GetPairedDevice(device);
-        mouse = device;
-        if (kbd && !kbd->key) /* can happen with floating SDs */
-            kbd = NULL;
-    } else
-    {
-        mouse = GetPairedDevice(device);
-        kbd = device;
-        if (!mouse->valuator || !mouse->button) /* may be float. SDs */
-            mouse = NULL;
-    }
-
-    /* State needs to be assembled BEFORE the device is updated. */
-    state = (kbd && kbd->key) ? XkbStateFieldFromRec(&kbd->key->xkbInfo->state) : 0;
-    state |= (mouse && mouse->button) ? (mouse->button->state) : 0;
-
-    for (i = 0; mouse && mouse->button && i < mouse->button->numButtons; i++)
-        if (BitIsOn(mouse->button->down, i))
-            SetBit(event->buttons, i);
-
-    if (kbd && kbd->key)
-    {
-        XkbStatePtr state;
-        /* we need the state before the event happens */
-        if (event->type == ET_KeyPress || event->type == ET_KeyRelease)
-            state = &kbd->key->xkbInfo->prev_state;
-        else
-            state = &kbd->key->xkbInfo->state;
-
-        event->mods.base = state->base_mods;
-        event->mods.latched = state->latched_mods;
-        event->mods.locked = state->locked_mods;
-        event->mods.effective = state->mods;
-
-        event->group.base = state->base_group;
-        event->group.latched = state->latched_group;
-        event->group.locked = state->locked_group;
-        event->group.effective = state->group;
-    }
-
-    ret = UpdateDeviceState(device, event);
-    if (ret == DONT_PROCESS)
-        return;
-
-    v = device->valuator;
-    b = device->button;
-    k = device->key;
-
-    if (IsMaster(device) || !device->u.master)
-        CheckMotion(event, device);
-
-    switch (event->type)
-    {
-        case ET_Motion:
-        case ET_ButtonPress:
-        case ET_ButtonRelease:
-        case ET_KeyPress:
-        case ET_KeyRelease:
-        case ET_ProximityIn:
-        case ET_ProximityOut:
-            if (!device->spriteInfo->sprite)
-              return;
-            GetSpritePosition(device, &rootX, &rootY);
-            event->root_x = rootX;
-            event->root_y = rootY;
-            NoticeEventTime((InternalEvent*)event);
-            event->corestate = state;
-            key = event->detail.key;
-            break;
-        default:
-            break;
-    }
-
-    if (DeviceEventCallback && !syncEvents.playingEvents) {
-	DeviceEventInfoRec eventinfo;
-	SpritePtr pSprite = device->spriteInfo->sprite;
-
-	/* see comment in EnqueueEvents regarding the next three lines */
-	if (ev->any.type == ET_Motion)
-	    ev->device_event.root = pSprite->hotPhys.pScreen->root->drawable.id;
-
-	eventinfo.device = device;
-	eventinfo.event = ev;
-	CallCallbacks(&DeviceEventCallback, (pointer) & eventinfo);
-    }
-
-    grab = device->deviceGrab.grab;
-
-    switch(event->type)
-    {
-        case ET_KeyPress:
-            if (!grab && CheckDeviceGrabs(device, event, 0)) {
-                device->deviceGrab.activatingKey = key;
-                return;
-            }
-            break;
-        case ET_KeyRelease:
-            if (grab && device->deviceGrab.fromPassiveGrab &&
-                (key == device->deviceGrab.activatingKey) &&
-                (device->deviceGrab.grab->type == KeyPress ||
-                 device->deviceGrab.grab->type == DeviceKeyPress ||
-                 device->deviceGrab.grab->type == XI_KeyPress))
-                deactivateDeviceGrab = TRUE;
-            break;
-        case ET_ButtonPress:
-            event->detail.button = b->map[key];
-            if (!event->detail.button) { /* there's no button 0 */
-                event->detail.button = key;
-                return;
-            }
-            if (!grab && CheckDeviceGrabs(device, event, 0))
-            {
-                /* if a passive grab was activated, the event has been sent
-                 * already */
-                return;
-            }
-            break;
-        case ET_ButtonRelease:
-            event->detail.button = b->map[key];
-            if (!event->detail.button) { /* there's no button 0 */
-                event->detail.button = key;
-                return;
-            }
-            if (grab && !b->buttonsDown &&
-                device->deviceGrab.fromPassiveGrab &&
-                (device->deviceGrab.grab->type == ButtonPress ||
-                 device->deviceGrab.grab->type == DeviceButtonPress ||
-                 device->deviceGrab.grab->type == XI_ButtonPress))
-                deactivateDeviceGrab = TRUE;
-        default:
-            break;
-    }
-
-
-    if (grab)
-        DeliverGrabbedEvent((InternalEvent*)event, device, deactivateDeviceGrab);
-    else if (device->focus && !IsPointerEvent((InternalEvent*)ev))
-        DeliverFocusedEvent(device, (InternalEvent*)event,
-                            GetSpriteWindow(device));
-    else
-        DeliverDeviceEvents(GetSpriteWindow(device), (InternalEvent*)event,
-                            NullGrab, NullWindow, device);
-
-    if (deactivateDeviceGrab == TRUE)
-	(*device->deviceGrab.DeactivateGrab) (device);
-    event->detail.key = key;
-}
-
-int
-InitProximityClassDeviceStruct(DeviceIntPtr dev)
-{
-    ProximityClassPtr proxc;
-
-    proxc = (ProximityClassPtr) malloc(sizeof(ProximityClassRec));
-    if (!proxc)
-	return FALSE;
-    proxc->sourceid = dev->id;
-    proxc->in_proximity = TRUE;
-    dev->proximity = proxc;
-    return TRUE;
-}
-
-/**
- * Initialise the device's valuators. The memory must already be allocated,
- * this function merely inits the matching axis (specified through axnum) to
- * sane values.
- *
- * It is a condition that (minval < maxval).
- *
- * @see InitValuatorClassDeviceStruct
- */
-void
-InitValuatorAxisStruct(DeviceIntPtr dev, int axnum, Atom label, int minval, int maxval,
-		       int resolution, int min_res, int max_res, int mode)
-{
-    AxisInfoPtr ax;
-
-    if (!dev || !dev->valuator || minval > maxval)
-        return;
-    if (axnum >= dev->valuator->numAxes)
-        return;
-
-    ax = dev->valuator->axes + axnum;
-
-    ax->min_value = minval;
-    ax->max_value = maxval;
-    ax->resolution = resolution;
-    ax->min_resolution = min_res;
-    ax->max_resolution = max_res;
-    ax->label = label;
-    ax->mode = mode;
-
-    if (mode & OutOfProximity)
-        dev->proximity->in_proximity = FALSE;
-}
-
-static void
-FixDeviceStateNotify(DeviceIntPtr dev, deviceStateNotify * ev, KeyClassPtr k,
-		     ButtonClassPtr b, ValuatorClassPtr v, int first)
-{
-    ev->type = DeviceStateNotify;
-    ev->deviceid = dev->id;
-    ev->time = currentTime.milliseconds;
-    ev->classes_reported = 0;
-    ev->num_keys = 0;
-    ev->num_buttons = 0;
-    ev->num_valuators = 0;
-
-    if (b) {
-	ev->classes_reported |= (1 << ButtonClass);
-	ev->num_buttons = b->numButtons;
-	memcpy((char*)ev->buttons, (char*)b->down, 4);
-    } else if (k) {
-	ev->classes_reported |= (1 << KeyClass);
-	ev->num_keys = k->xkbInfo->desc->max_key_code -
-                       k->xkbInfo->desc->min_key_code;
-	memmove((char *)&ev->keys[0], (char *)k->down, 4);
-    }
-    if (v) {
-	int nval = v->numAxes - first;
-
-	ev->classes_reported |= (1 << ValuatorClass);
-	ev->classes_reported |= valuator_get_mode(dev, 0) << ModeBitsShift;
-	ev->num_valuators = nval < 3 ? nval : 3;
-	switch (ev->num_valuators) {
-	case 3:
-	    ev->valuator2 = v->axisVal[first + 2];
-	case 2:
-	    ev->valuator1 = v->axisVal[first + 1];
-	case 1:
-	    ev->valuator0 = v->axisVal[first];
-	    break;
-	}
-    }
-}
-
-static void
-FixDeviceValuator(DeviceIntPtr dev, deviceValuator * ev, ValuatorClassPtr v,
-		  int first)
-{
-    int nval = v->numAxes - first;
-
-    ev->type = DeviceValuator;
-    ev->deviceid = dev->id;
-    ev->num_valuators = nval < 3 ? nval : 3;
-    ev->first_valuator = first;
-    switch (ev->num_valuators) {
-    case 3:
-	ev->valuator2 = v->axisVal[first + 2];
-    case 2:
-	ev->valuator1 = v->axisVal[first + 1];
-    case 1:
-	ev->valuator0 = v->axisVal[first];
-	break;
-    }
-    first += ev->num_valuators;
-}
-
-void
-DeviceFocusEvent(DeviceIntPtr dev, int type, int mode, int detail,
-		 WindowPtr pWin)
-{
-    deviceFocus event;
-    xXIFocusInEvent *xi2event;
-    DeviceIntPtr mouse;
-    int btlen, len, i;
-
-    mouse = (IsMaster(dev) || dev->u.master) ? GetMaster(dev, MASTER_POINTER) : dev;
-
-    /* XI 2 event */
-    btlen = (mouse->button) ? bits_to_bytes(mouse->button->numButtons) : 0;
-    btlen = bytes_to_int32(btlen);
-    len = sizeof(xXIFocusInEvent) + btlen * 4;
-
-    xi2event = calloc(1, len);
-    xi2event->type         = GenericEvent;
-    xi2event->extension    = IReqCode;
-    xi2event->evtype       = type;
-    xi2event->length       = bytes_to_int32(len - sizeof(xEvent));
-    xi2event->buttons_len  = btlen;
-    xi2event->detail       = detail;
-    xi2event->time         = currentTime.milliseconds;
-    xi2event->deviceid     = dev->id;
-    xi2event->sourceid     = dev->id; /* a device doesn't change focus by itself */
-    xi2event->mode         = mode;
-    xi2event->root_x       = FP1616(mouse->spriteInfo->sprite->hot.x, 0);
-    xi2event->root_y       = FP1616(mouse->spriteInfo->sprite->hot.y, 0);
-
-    for (i = 0; mouse && mouse->button && i < mouse->button->numButtons; i++)
-        if (BitIsOn(mouse->button->down, i))
-            SetBit(&xi2event[1], i);
-
-    if (dev->key)
-    {
-        xi2event->mods.base_mods = dev->key->xkbInfo->state.base_mods;
-        xi2event->mods.latched_mods = dev->key->xkbInfo->state.latched_mods;
-        xi2event->mods.locked_mods = dev->key->xkbInfo->state.locked_mods;
-        xi2event->mods.effective_mods = dev->key->xkbInfo->state.mods;
-
-        xi2event->group.base_group = dev->key->xkbInfo->state.base_group;
-        xi2event->group.latched_group = dev->key->xkbInfo->state.latched_group;
-        xi2event->group.locked_group = dev->key->xkbInfo->state.locked_group;
-        xi2event->group.effective_group = dev->key->xkbInfo->state.group;
-    }
-
-    FixUpEventFromWindow(dev->spriteInfo->sprite, (xEvent*)xi2event, pWin,
-                         None, FALSE);
-
-    DeliverEventsToWindow(dev, pWin, (xEvent*)xi2event, 1,
-                          GetEventFilter(dev, (xEvent*)xi2event), NullGrab);
-
-    free(xi2event);
-
-    /* XI 1.x event */
-    event.deviceid = dev->id;
-    event.mode = mode;
-    event.type = (type == XI_FocusIn) ? DeviceFocusIn : DeviceFocusOut;
-    event.detail = detail;
-    event.window = pWin->drawable.id;
-    event.time = currentTime.milliseconds;
-
-    DeliverEventsToWindow(dev, pWin, (xEvent *) & event, 1,
-				DeviceFocusChangeMask, NullGrab);
-
-    if ((type == DeviceFocusIn) &&
-	(wOtherInputMasks(pWin)) &&
-	(wOtherInputMasks(pWin)->inputEvents[dev->id] & DeviceStateNotifyMask))
-    {
-	int evcount = 1;
-	deviceStateNotify *ev, *sev;
-	deviceKeyStateNotify *kev;
-	deviceButtonStateNotify *bev;
-
-	KeyClassPtr k;
-	ButtonClassPtr b;
-	ValuatorClassPtr v;
-	int nval = 0, nkeys = 0, nbuttons = 0, first = 0;
-
-	if ((b = dev->button) != NULL) {
-	    nbuttons = b->numButtons;
-	    if (nbuttons > 32)
-		evcount++;
-	}
-	if ((k = dev->key) != NULL) {
-	    nkeys = k->xkbInfo->desc->max_key_code -
-                    k->xkbInfo->desc->min_key_code;
-	    if (nkeys > 32)
-		evcount++;
-	    if (nbuttons > 0) {
-		evcount++;
-	    }
-	}
-	if ((v = dev->valuator) != NULL) {
-	    nval = v->numAxes;
-
-	    if (nval > 3)
-		evcount++;
-	    if (nval > 6) {
-		if (!(k && b))
-		    evcount++;
-		if (nval > 9)
-		    evcount += ((nval - 7) / 3);
-	    }
-	}
-
-	sev = ev = (deviceStateNotify *) malloc(evcount * sizeof(xEvent));
-	FixDeviceStateNotify(dev, ev, NULL, NULL, NULL, first);
-
-	if (b != NULL) {
-	    FixDeviceStateNotify(dev, ev++, NULL, b, v, first);
-	    first += 3;
-	    nval -= 3;
-	    if (nbuttons > 32) {
-		(ev - 1)->deviceid |= MORE_EVENTS;
-		bev = (deviceButtonStateNotify *) ev++;
-		bev->type = DeviceButtonStateNotify;
-		bev->deviceid = dev->id;
-		memcpy((char*)&bev->buttons[4], (char*)&b->down[4], DOWN_LENGTH - 4);
-	    }
-	    if (nval > 0) {
-		(ev - 1)->deviceid |= MORE_EVENTS;
-		FixDeviceValuator(dev, (deviceValuator *) ev++, v, first);
-		first += 3;
-		nval -= 3;
-	    }
-	}
-
-	if (k != NULL) {
-	    FixDeviceStateNotify(dev, ev++, k, NULL, v, first);
-	    first += 3;
-	    nval -= 3;
-	    if (nkeys > 32) {
-		(ev - 1)->deviceid |= MORE_EVENTS;
-		kev = (deviceKeyStateNotify *) ev++;
-		kev->type = DeviceKeyStateNotify;
-		kev->deviceid = dev->id;
-		memmove((char *)&kev->keys[0], (char *)&k->down[4], 28);
-	    }
-	    if (nval > 0) {
-		(ev - 1)->deviceid |= MORE_EVENTS;
-		FixDeviceValuator(dev, (deviceValuator *) ev++, v, first);
-		first += 3;
-		nval -= 3;
-	    }
-	}
-
-	while (nval > 0) {
-	    FixDeviceStateNotify(dev, ev++, NULL, NULL, v, first);
-	    first += 3;
-	    nval -= 3;
-	    if (nval > 0) {
-		(ev - 1)->deviceid |= MORE_EVENTS;
-		FixDeviceValuator(dev, (deviceValuator *) ev++, v, first);
-		first += 3;
-		nval -= 3;
-	    }
-	}
-
-	DeliverEventsToWindow(dev, pWin, (xEvent *) sev, evcount,
-				    DeviceStateNotifyMask, NullGrab);
-	free(sev);
-    }
-}
-
-int
-CheckGrabValues(ClientPtr client, GrabParameters* param)
-{
-    if (param->grabtype != GRABTYPE_CORE &&
-        param->grabtype != GRABTYPE_XI &&
-        param->grabtype != GRABTYPE_XI2)
-    {
-        ErrorF("[Xi] grabtype is invalid. This is a bug.\n");
-        return BadImplementation;
-    }
-
-    if ((param->this_device_mode != GrabModeSync) &&
-	(param->this_device_mode != GrabModeAsync)) {
-	client->errorValue = param->this_device_mode;
-	return BadValue;
-    }
-    if ((param->other_devices_mode != GrabModeSync) &&
-	(param->other_devices_mode != GrabModeAsync)) {
-	client->errorValue = param->other_devices_mode;
-	return BadValue;
-    }
-
-    if (param->grabtype != GRABTYPE_XI2 && (param->modifiers != AnyModifier) &&
-        (param->modifiers & ~AllModifiersMask)) {
-	client->errorValue = param->modifiers;
-	return BadValue;
-    }
-
-    if ((param->ownerEvents != xFalse) && (param->ownerEvents != xTrue)) {
-	client->errorValue = param->ownerEvents;
-	return BadValue;
-    }
-    return Success;
-}
-
-int
-GrabButton(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr modifier_device,
-           int button, GrabParameters *param, GrabType grabtype,
-	   GrabMask *mask)
-{
-    WindowPtr pWin, confineTo;
-    CursorPtr cursor;
-    GrabPtr grab;
-    int rc, type = -1;
-    Mask access_mode = DixGrabAccess;
-
-    rc = CheckGrabValues(client, param);
-    if (rc != Success)
-	return rc;
-    if (param->confineTo == None)
-	confineTo = NullWindow;
-    else {
-	rc = dixLookupWindow(&confineTo, param->confineTo, client, DixSetAttrAccess);
-	if (rc != Success)
-	    return rc;
-    }
-    if (param->cursor == None)
-	cursor = NullCursor;
-    else {
-	rc = dixLookupResourceByType((pointer *)&cursor, param->cursor,
-				     RT_CURSOR, client, DixUseAccess);
-	if (rc != Success)
-	{
-	    client->errorValue = param->cursor;
-	    return rc;
-	}
-	access_mode |= DixForceAccess;
-    }
-    if (param->this_device_mode == GrabModeSync || param->other_devices_mode == GrabModeSync)
-	access_mode |= DixFreezeAccess;
-    rc = XaceHook(XACE_DEVICE_ACCESS, client, dev, access_mode);
-    if (rc != Success)
-	return rc;
-    rc = dixLookupWindow(&pWin, param->grabWindow, client, DixSetAttrAccess);
-    if (rc != Success)
-	return rc;
-
-    if (grabtype == GRABTYPE_XI)
-        type = DeviceButtonPress;
-    else if (grabtype == GRABTYPE_XI2)
-        type = XI_ButtonPress;
-
-    grab = CreateGrab(client->index, dev, modifier_device, pWin, grabtype,
-                      mask, param, type, button, confineTo, cursor);
-    if (!grab)
-	return BadAlloc;
-    return AddPassiveGrabToList(client, grab);
-}
-
-/**
- * Grab the given key. If grabtype is GRABTYPE_XI, the key is a keycode. If
- * grabtype is GRABTYPE_XI2, the key is a keysym.
- */
-int
-GrabKey(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr modifier_device,
-        int key, GrabParameters *param, GrabType grabtype, GrabMask *mask)
-{
-    WindowPtr pWin;
-    GrabPtr grab;
-    KeyClassPtr k = dev->key;
-    Mask access_mode = DixGrabAccess;
-    int rc, type = -1;
-
-    rc = CheckGrabValues(client, param);
-    if (rc != Success)
-        return rc;
-    if (k == NULL)
-	return BadMatch;
-    if (grabtype == GRABTYPE_XI)
-    {
-        if ((key > k->xkbInfo->desc->max_key_code ||
-                    key < k->xkbInfo->desc->min_key_code)
-                && (key != AnyKey)) {
-            client->errorValue = key;
-            return BadValue;
-        }
-        type = DeviceKeyPress;
-    } else if (grabtype == GRABTYPE_XI2)
-        type = XI_KeyPress;
-
-    rc = dixLookupWindow(&pWin, param->grabWindow, client, DixSetAttrAccess);
-    if (rc != Success)
-	return rc;
-    if (param->this_device_mode == GrabModeSync || param->other_devices_mode == GrabModeSync)
-	access_mode |= DixFreezeAccess;
-    rc = XaceHook(XACE_DEVICE_ACCESS, client, dev, access_mode);
-    if (rc != Success)
-	return rc;
-
-    grab = CreateGrab(client->index, dev, modifier_device, pWin, grabtype,
-                      mask, param, type, key, NULL, NULL);
-    if (!grab)
-	return BadAlloc;
-    return AddPassiveGrabToList(client, grab);
-}
-
-/* Enter/FocusIn grab */
-int
-GrabWindow(ClientPtr client, DeviceIntPtr dev, int type,
-           GrabParameters *param, GrabMask *mask)
-{
-    WindowPtr pWin;
-    CursorPtr cursor;
-    GrabPtr grab;
-    Mask access_mode = DixGrabAccess;
-    int rc;
-
-    rc = CheckGrabValues(client, param);
-    if (rc != Success)
-        return rc;
-
-    rc = dixLookupWindow(&pWin, param->grabWindow, client, DixSetAttrAccess);
-    if (rc != Success)
-	return rc;
-    if (param->cursor == None)
-	cursor = NullCursor;
-    else {
-	rc = dixLookupResourceByType((pointer *)&cursor, param->cursor,
-				     RT_CURSOR, client, DixUseAccess);
-	if (rc != Success)
-	{
-	    client->errorValue = param->cursor;
-	    return rc;
-	}
-	access_mode |= DixForceAccess;
-    }
-    if (param->this_device_mode == GrabModeSync || param->other_devices_mode == GrabModeSync)
-	access_mode |= DixFreezeAccess;
-    rc = XaceHook(XACE_DEVICE_ACCESS, client, dev, access_mode);
-    if (rc != Success)
-	return rc;
-
-    grab = CreateGrab(client->index, dev, dev, pWin, GRABTYPE_XI2,
-                      mask, param, (type == XIGrabtypeEnter) ? XI_Enter : XI_FocusIn,
-                      0, NULL, cursor);
-
-    if (!grab)
-        return BadAlloc;
-
-    return AddPassiveGrabToList(client, grab);
-}
-
-int
-SelectForWindow(DeviceIntPtr dev, WindowPtr pWin, ClientPtr client,
-		Mask mask, Mask exclusivemasks)
-{
-    int mskidx = dev->id;
-    int i, ret;
-    Mask check;
-    InputClientsPtr others;
-
-    check = (mask & exclusivemasks);
-    if (wOtherInputMasks(pWin)) {
-	if (check & wOtherInputMasks(pWin)->inputEvents[mskidx]) {	/* It is illegal for two different
-									 * clients to select on any of the
-									 * events for maskcheck. However,
-									 * it is OK, for some client to
-									 * continue selecting on one of those
-									 * events.  */
-	    for (others = wOtherInputMasks(pWin)->inputClients; others;
-		 others = others->next) {
-		if (!SameClient(others, client) && (check &
-						    others->mask[mskidx]))
-		    return BadAccess;
-	    }
-	}
-	for (others = wOtherInputMasks(pWin)->inputClients; others;
-	     others = others->next) {
-	    if (SameClient(others, client)) {
-		check = others->mask[mskidx];
-		others->mask[mskidx] = mask;
-		if (mask == 0) {
-		    for (i = 0; i < EMASKSIZE; i++)
-			if (i != mskidx && others->mask[i] != 0)
-			    break;
-		    if (i == EMASKSIZE) {
-			RecalculateDeviceDeliverableEvents(pWin);
-			if (ShouldFreeInputMasks(pWin, FALSE))
-			    FreeResource(others->resource, RT_NONE);
-			return Success;
-		    }
-		}
-		goto maskSet;
-	    }
-	}
-    }
-    check = 0;
-    if ((ret = AddExtensionClient(pWin, client, mask, mskidx)) != Success)
-	return ret;
-  maskSet:
-    if (dev->valuator)
-	if ((dev->valuator->motionHintWindow == pWin) &&
-	    (mask & DevicePointerMotionHintMask) &&
-	    !(check & DevicePointerMotionHintMask) && !dev->deviceGrab.grab)
-	    dev->valuator->motionHintWindow = NullWindow;
-    RecalculateDeviceDeliverableEvents(pWin);
-    return Success;
-}
-
-int
-AddExtensionClient(WindowPtr pWin, ClientPtr client, Mask mask, int mskidx)
-{
-    InputClientsPtr others;
-
-    if (!pWin->optional && !MakeWindowOptional(pWin))
-	return BadAlloc;
-    others = calloc(1, sizeof(InputClients));
-    if (!others)
-	return BadAlloc;
-    if (!pWin->optional->inputMasks && !MakeInputMasks(pWin))
-	return BadAlloc;
-    others->mask[mskidx] = mask;
-    others->resource = FakeClientID(client->index);
-    others->next = pWin->optional->inputMasks->inputClients;
-    pWin->optional->inputMasks->inputClients = others;
-    if (!AddResource(others->resource, RT_INPUTCLIENT, (pointer) pWin))
-	return BadAlloc;
-    return Success;
-}
-
-static Bool
-MakeInputMasks(WindowPtr pWin)
-{
-    struct _OtherInputMasks *imasks;
-
-    imasks = calloc(1, sizeof(struct _OtherInputMasks));
-    if (!imasks)
-	return FALSE;
-    pWin->optional->inputMasks = imasks;
-    return TRUE;
-}
-
-void
-RecalculateDeviceDeliverableEvents(WindowPtr pWin)
-{
-    InputClientsPtr others;
-    struct _OtherInputMasks *inputMasks;	/* default: NULL */
-    WindowPtr pChild, tmp;
-    int i, j;
-
-    pChild = pWin;
-    while (1) {
-	if ((inputMasks = wOtherInputMasks(pChild)) != 0) {
-            for (i = 0; i < EMASKSIZE; i++)
-                memset(inputMasks->xi2mask[i], 0, sizeof(inputMasks->xi2mask[i]));
-	    for (others = inputMasks->inputClients; others;
-		 others = others->next) {
-		for (i = 0; i < EMASKSIZE; i++)
-		    inputMasks->inputEvents[i] |= others->mask[i];
-                for (i = 0; i < EMASKSIZE; i++)
-                    for (j = 0; j < XI2MASKSIZE; j++)
-                        inputMasks->xi2mask[i][j] |= others->xi2mask[i][j];
-	    }
-	    for (i = 0; i < EMASKSIZE; i++)
-		inputMasks->deliverableEvents[i] = inputMasks->inputEvents[i];
-	    for (tmp = pChild->parent; tmp; tmp = tmp->parent)
-		if (wOtherInputMasks(tmp))
-		    for (i = 0; i < EMASKSIZE; i++)
-			inputMasks->deliverableEvents[i] |=
-			    (wOtherInputMasks(tmp)->deliverableEvents[i]
-			     & ~inputMasks->
-			     dontPropagateMask[i] & PropagateMask[i]);
-	}
-	if (pChild->firstChild) {
-	    pChild = pChild->firstChild;
-	    continue;
-	}
-	while (!pChild->nextSib && (pChild != pWin))
-	    pChild = pChild->parent;
-	if (pChild == pWin)
-	    break;
-	pChild = pChild->nextSib;
-    }
-}
-
-#ifdef _MSC_VER
-#pragma warning(disable:4715) /* Not all control paths return a value */
-#endif
-
-int
-InputClientGone(WindowPtr pWin, XID id)
-{
-    InputClientsPtr other, prev;
-
-    if (!wOtherInputMasks(pWin))
-	return Success;
-    prev = 0;
-    for (other = wOtherInputMasks(pWin)->inputClients; other;
-	 other = other->next) {
-	if (other->resource == id) {
-	    if (prev) {
-		prev->next = other->next;
-		free(other);
-	    } else if (!(other->next)) {
-		if (ShouldFreeInputMasks(pWin, TRUE)) {
-		    wOtherInputMasks(pWin)->inputClients = other->next;
-		    free(wOtherInputMasks(pWin));
-		    pWin->optional->inputMasks = (OtherInputMasks *) NULL;
-		    CheckWindowOptionalNeed(pWin);
-		    free(other);
-		} else {
-		    other->resource = FakeClientID(0);
-		    if (!AddResource(other->resource, RT_INPUTCLIENT,
-				     (pointer) pWin))
-			return BadAlloc;
-		}
-	    } else {
-		wOtherInputMasks(pWin)->inputClients = other->next;
-		free(other);
-	    }
-	    RecalculateDeviceDeliverableEvents(pWin);
-	    return Success;
-	}
-	prev = other;
-    }
-    FatalError("client not on device event list");
-}
-
-int
-SendEvent(ClientPtr client, DeviceIntPtr d, Window dest, Bool propagate,
-	  xEvent * ev, Mask mask, int count)
-{
-    WindowPtr pWin;
-    WindowPtr effectiveFocus = NullWindow;	/* only set if dest==InputFocus */
-    WindowPtr spriteWin = GetSpriteWindow(d);
-
-    if (dest == PointerWindow)
-	pWin = spriteWin;
-    else if (dest == InputFocus) {
-	WindowPtr inputFocus;
-
-	if (!d->focus)
-	    inputFocus = spriteWin;
-	else
-	    inputFocus = d->focus->win;
-
-	if (inputFocus == FollowKeyboardWin)
-	    inputFocus = inputInfo.keyboard->focus->win;
-
-	if (inputFocus == NoneWin)
-	    return Success;
-
-	/* If the input focus is PointerRootWin, send the event to where
-	 * the pointer is if possible, then perhaps propogate up to root. */
-	if (inputFocus == PointerRootWin)
-	    inputFocus = GetCurrentRootWindow(d);
-
-	if (IsParent(inputFocus, spriteWin)) {
-	    effectiveFocus = inputFocus;
-	    pWin = spriteWin;
-	} else
-	    effectiveFocus = pWin = inputFocus;
-    } else
-	dixLookupWindow(&pWin, dest, client, DixSendAccess);
-    if (!pWin)
-	return BadWindow;
-    if ((propagate != xFalse) && (propagate != xTrue)) {
-	client->errorValue = propagate;
-	return BadValue;
-    }
-    ev->u.u.type |= 0x80;
-    if (propagate) {
-	for (; pWin; pWin = pWin->parent) {
-	    if (DeliverEventsToWindow(d, pWin, ev, count, mask, NullGrab))
-		return Success;
-	    if (pWin == effectiveFocus)
-		return Success;
-	    if (wOtherInputMasks(pWin))
-		mask &= ~wOtherInputMasks(pWin)->dontPropagateMask[d->id];
-	    if (!mask)
-		break;
-	}
-    } else if (!XaceHook(XACE_SEND_ACCESS, client, NULL, pWin, ev, count))
-	DeliverEventsToWindow(d, pWin, ev, count, mask, NullGrab);
-    return Success;
-}
-
-int
-SetButtonMapping(ClientPtr client, DeviceIntPtr dev, int nElts, BYTE * map)
-{
-    int i;
-    ButtonClassPtr b = dev->button;
-
-    if (b == NULL)
-	return BadMatch;
-
-    if (nElts != b->numButtons) {
-	client->errorValue = nElts;
-	return BadValue;
-    }
-    if (BadDeviceMap(&map[0], nElts, 1, 255, &client->errorValue))
-	return BadValue;
-    for (i = 0; i < nElts; i++)
-	if ((b->map[i + 1] != map[i]) && BitIsOn(b->down, i + 1))
-	    return MappingBusy;
-    for (i = 0; i < nElts; i++)
-	b->map[i + 1] = map[i];
-    return Success;
-}
-
-int
-ChangeKeyMapping(ClientPtr client,
-		 DeviceIntPtr dev,
-		 unsigned len,
-		 int type,
-		 KeyCode firstKeyCode,
-		 CARD8 keyCodes, CARD8 keySymsPerKeyCode, KeySym * map)
-{
-    KeySymsRec keysyms;
-    KeyClassPtr k = dev->key;
-
-    if (k == NULL)
-	return BadMatch;
-
-    if (len != (keyCodes * keySymsPerKeyCode))
-	return BadLength;
-
-    if ((firstKeyCode < k->xkbInfo->desc->min_key_code) ||
-	(firstKeyCode + keyCodes - 1 > k->xkbInfo->desc->max_key_code)) {
-	client->errorValue = firstKeyCode;
-	return BadValue;
-    }
-    if (keySymsPerKeyCode == 0) {
-	client->errorValue = 0;
-	return BadValue;
-    }
-    keysyms.minKeyCode = firstKeyCode;
-    keysyms.maxKeyCode = firstKeyCode + keyCodes - 1;
-    keysyms.mapWidth = keySymsPerKeyCode;
-    keysyms.map = map;
-
-    XkbApplyMappingChange(dev, &keysyms, firstKeyCode, keyCodes, NULL,
-                          serverClient);
-
-    return Success;
-}
-
-static void
-DeleteDeviceFromAnyExtEvents(WindowPtr pWin, DeviceIntPtr dev)
-{
-    WindowPtr parent;
-
-    /* Deactivate any grabs performed on this window, before making
-     * any input focus changes.
-     * Deactivating a device grab should cause focus events. */
-
-    if (dev->deviceGrab.grab && (dev->deviceGrab.grab->window == pWin))
-	(*dev->deviceGrab.DeactivateGrab) (dev);
-
-    /* If the focus window is a root window (ie. has no parent)
-     * then don't delete the focus from it. */
-
-    if (dev->focus && (pWin == dev->focus->win) && (pWin->parent != NullWindow)) {
-	int focusEventMode = NotifyNormal;
-
-	/* If a grab is in progress, then alter the mode of focus events. */
-
-	if (dev->deviceGrab.grab)
-	    focusEventMode = NotifyWhileGrabbed;
-
-	switch (dev->focus->revert) {
-	case RevertToNone:
-	    if (!ActivateFocusInGrab(dev, pWin, NoneWin))
-		DoFocusEvents(dev, pWin, NoneWin, focusEventMode);
-	    dev->focus->win = NoneWin;
-	    dev->focus->traceGood = 0;
-	    break;
-	case RevertToParent:
-	    parent = pWin;
-	    do {
-		parent = parent->parent;
-		dev->focus->traceGood--;
-	    }
-	    while (!parent->realized);
-	    if (!ActivateFocusInGrab(dev, pWin, parent))
-		DoFocusEvents(dev, pWin, parent, focusEventMode);
-	    dev->focus->win = parent;
-	    dev->focus->revert = RevertToNone;
-	    break;
-	case RevertToPointerRoot:
-	    if (!ActivateFocusInGrab(dev, pWin, PointerRootWin))
-		DoFocusEvents(dev, pWin, PointerRootWin, focusEventMode);
-	    dev->focus->win = PointerRootWin;
-	    dev->focus->traceGood = 0;
-	    break;
-	case RevertToFollowKeyboard:
-            {
-                DeviceIntPtr kbd = GetMaster(dev, MASTER_KEYBOARD);
-                if (!kbd || (kbd == dev && kbd != inputInfo.keyboard))
-                    kbd = inputInfo.keyboard;
-	    if (kbd->focus->win) {
-		if (!ActivateFocusInGrab(dev, pWin, kbd->focus->win))
-		    DoFocusEvents(dev, pWin, kbd->focus->win, focusEventMode);
-		dev->focus->win = FollowKeyboardWin;
-		dev->focus->traceGood = 0;
-	    } else {
-                if (!ActivateFocusInGrab(dev, pWin, NoneWin))
-                    DoFocusEvents(dev, pWin, NoneWin, focusEventMode);
-		dev->focus->win = NoneWin;
-		dev->focus->traceGood = 0;
-	    }
-            }
-	    break;
-	}
-    }
-
-    if (dev->valuator)
-	if (dev->valuator->motionHintWindow == pWin)
-	    dev->valuator->motionHintWindow = NullWindow;
-}
-
-void
-DeleteWindowFromAnyExtEvents(WindowPtr pWin, Bool freeResources)
-{
-    int i;
-    DeviceIntPtr dev;
-    InputClientsPtr ic;
-    struct _OtherInputMasks *inputMasks;
-
-    for (dev = inputInfo.devices; dev; dev = dev->next) {
-	DeleteDeviceFromAnyExtEvents(pWin, dev);
-    }
-
-    for (dev = inputInfo.off_devices; dev; dev = dev->next)
-	DeleteDeviceFromAnyExtEvents(pWin, dev);
-
-    if (freeResources)
-	while ((inputMasks = wOtherInputMasks(pWin)) != 0) {
-	    ic = inputMasks->inputClients;
-	    for (i = 0; i < EMASKSIZE; i++)
-		inputMasks->dontPropagateMask[i] = 0;
-	    FreeResource(ic->resource, RT_NONE);
-	}
-}
-
-int
-MaybeSendDeviceMotionNotifyHint(deviceKeyButtonPointer * pEvents, Mask mask)
-{
-    DeviceIntPtr dev;
-
-    dixLookupDevice(&dev, pEvents->deviceid & DEVICE_BITS, serverClient,
-		    DixReadAccess);
-    if (!dev)
-        return 0;
-
-    if (pEvents->type == DeviceMotionNotify) {
-	if (mask & DevicePointerMotionHintMask) {
-	    if (WID(dev->valuator->motionHintWindow) == pEvents->event) {
-		return 1;	/* don't send, but pretend we did */
-	    }
-	    pEvents->detail = NotifyHint;
-	} else {
-	    pEvents->detail = NotifyNormal;
-	}
-    }
-    return 0;
-}
-
-void
-CheckDeviceGrabAndHintWindow(WindowPtr pWin, int type,
-			     deviceKeyButtonPointer * xE, GrabPtr grab,
-			     ClientPtr client, Mask deliveryMask)
-{
-    DeviceIntPtr dev;
-
-    dixLookupDevice(&dev, xE->deviceid & DEVICE_BITS, serverClient,
-		    DixGrabAccess);
-    if (!dev)
-        return;
-
-    if (type == DeviceMotionNotify)
-	dev->valuator->motionHintWindow = pWin;
-    else if ((type == DeviceButtonPress) && (!grab) &&
-	     (deliveryMask & DeviceButtonGrabMask)) {
-	GrabRec tempGrab;
-
-	tempGrab.device = dev;
-	tempGrab.resource = client->clientAsMask;
-	tempGrab.window = pWin;
-	tempGrab.ownerEvents =
-	    (deliveryMask & DeviceOwnerGrabButtonMask) ? TRUE : FALSE;
-	tempGrab.eventMask = deliveryMask;
-	tempGrab.keyboardMode = GrabModeAsync;
-	tempGrab.pointerMode = GrabModeAsync;
-	tempGrab.confineTo = NullWindow;
-	tempGrab.cursor = NullCursor;
-        tempGrab.next = NULL;
-	(*dev->deviceGrab.ActivateGrab) (dev, &tempGrab, currentTime, TRUE);
-    }
-}
-
-static Mask
-DeviceEventMaskForClient(DeviceIntPtr dev, WindowPtr pWin, ClientPtr client)
-{
-    InputClientsPtr other;
-
-    if (!wOtherInputMasks(pWin))
-	return 0;
-    for (other = wOtherInputMasks(pWin)->inputClients; other;
-	 other = other->next) {
-	if (SameClient(other, client))
-	    return other->mask[dev->id];
-    }
-    return 0;
-}
-
-void
-MaybeStopDeviceHint(DeviceIntPtr dev, ClientPtr client)
-{
-    WindowPtr pWin;
-    GrabPtr grab = dev->deviceGrab.grab;
-
-    pWin = dev->valuator->motionHintWindow;
-
-    if ((grab && SameClient(grab, client) &&
-	 ((grab->eventMask & DevicePointerMotionHintMask) ||
-	  (grab->ownerEvents &&
-	   (DeviceEventMaskForClient(dev, pWin, client) &
-	    DevicePointerMotionHintMask)))) ||
-	(!grab &&
-	 (DeviceEventMaskForClient(dev, pWin, client) &
-	  DevicePointerMotionHintMask)))
-	dev->valuator->motionHintWindow = NullWindow;
-}
-
-int
-DeviceEventSuppressForWindow(WindowPtr pWin, ClientPtr client, Mask mask,
-			     int maskndx)
-{
-    struct _OtherInputMasks *inputMasks = wOtherInputMasks(pWin);
-
-    if (mask & ~PropagateMask[maskndx]) {
-	client->errorValue = mask;
-	return BadValue;
-    }
-
-    if (mask == 0) {
-	if (inputMasks)
-	    inputMasks->dontPropagateMask[maskndx] = mask;
-    } else {
-	if (!inputMasks)
-	    AddExtensionClient(pWin, client, 0, 0);
-	inputMasks = wOtherInputMasks(pWin);
-	inputMasks->dontPropagateMask[maskndx] = mask;
-    }
-    RecalculateDeviceDeliverableEvents(pWin);
-    if (ShouldFreeInputMasks(pWin, FALSE))
-	FreeResource(inputMasks->inputClients->resource, RT_NONE);
-    return Success;
-}
-
-Bool
-ShouldFreeInputMasks(WindowPtr pWin, Bool ignoreSelectedEvents)
-{
-    int i;
-    Mask allInputEventMasks = 0;
-    struct _OtherInputMasks *inputMasks = wOtherInputMasks(pWin);
-
-    for (i = 0; i < EMASKSIZE; i++)
-	allInputEventMasks |= inputMasks->dontPropagateMask[i];
-    if (!ignoreSelectedEvents)
-	for (i = 0; i < EMASKSIZE; i++)
-	    allInputEventMasks |= inputMasks->inputEvents[i];
-    if (allInputEventMasks == 0)
-	return TRUE;
-    else
-	return FALSE;
-}
-
-/***********************************************************************
- *
- * Walk through the window tree, finding all clients that want to know
- * about the Event.
- *
- */
-
-static void
-FindInterestedChildren(DeviceIntPtr dev, WindowPtr p1, Mask mask,
-                       xEvent * ev, int count)
-{
-    WindowPtr p2;
-
-    while (p1) {
-        p2 = p1->firstChild;
-        DeliverEventsToWindow(dev, p1, ev, count, mask, NullGrab);
-        FindInterestedChildren(dev, p2, mask, ev, count);
-        p1 = p1->nextSib;
-    }
-}
-
-/***********************************************************************
- *
- * Send an event to interested clients in all windows on all screens.
- *
- */
-
-void
-SendEventToAllWindows(DeviceIntPtr dev, Mask mask, xEvent * ev, int count)
-{
-    int i;
-    WindowPtr pWin, p1;
-
-    for (i = 0; i < screenInfo.numScreens; i++) {
-        pWin = screenInfo.screens[i]->root;
-        if (!pWin)
-            continue;
-        DeliverEventsToWindow(dev, pWin, ev, count, mask, NullGrab);
-        p1 = pWin->firstChild;
-        FindInterestedChildren(dev, p1, mask, ev, count);
-    }
-}
-
-/**
- * Set the XI2 mask for the given client on the given window.
- * @param dev The device to set the mask for.
- * @param win The window to set the mask on.
- * @param client The client setting the mask.
- * @param len Number of bytes in mask.
- * @param mask Event mask in the form of (1 << eventtype)
- */
-int
-XISetEventMask(DeviceIntPtr dev, WindowPtr win, ClientPtr client,
-               unsigned int len, unsigned char* mask)
-{
-    OtherInputMasks *masks;
-    InputClientsPtr others = NULL;
-
-    masks = wOtherInputMasks(win);
-    if (masks)
-    {
-	for (others = wOtherInputMasks(win)->inputClients; others;
-	     others = others->next) {
-	    if (SameClient(others, client)) {
-                memset(others->xi2mask[dev->id], 0,
-                       sizeof(others->xi2mask[dev->id]));
-                break;
-            }
-        }
-    }
-
-    len = min(len, sizeof(others->xi2mask[dev->id]));
-
-    if (len && !others)
-    {
-        if (AddExtensionClient(win, client, 0, 0) != Success)
-            return BadAlloc;
-        others= wOtherInputMasks(win)->inputClients;
-    }
-
-    if (others)
-        memset(others->xi2mask[dev->id], 0, sizeof(others->xi2mask[dev->id]));
-
-    if (len)
-        memcpy(others->xi2mask[dev->id], mask, len);
-
-    RecalculateDeviceDeliverableEvents(win);
-
-    return Success;
-}
+/************************************************************

+

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

+

+********************************************************/

+

+/********************************************************************

+ *

+ *  Routines to register and initialize extension input devices.

+ *  This also contains ProcessOtherEvent, the routine called from DDX

+ *  to route extension events.

+ *

+ */

+

+#ifdef HAVE_DIX_CONFIG_H

+#include <dix-config.h>

+#else

+#define XINPUT

+#endif

+

+#include "inputstr.h"

+#include <X11/X.h>

+#include <X11/Xproto.h>

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

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

+#include <X11/extensions/XI2proto.h>

+#include <X11/extensions/geproto.h>

+#include "windowstr.h"

+#include "miscstruct.h"

+#include "region.h"

+#include "exevents.h"

+#include "extnsionst.h"

+#include "exglobals.h"

+#include "dixevents.h"	/* DeliverFocusedEvent */

+#include "dixgrabs.h"	/* CreateGrab() */

+#include "scrnintstr.h"

+#include "listdev.h" /* for CopySwapXXXClass */

+#include "xace.h"

+#include "xiquerydevice.h" /* For List*Info */

+#include "eventconvert.h"

+#include "eventstr.h"

+

+#include <X11/extensions/XKBproto.h>

+#include "xkbsrv.h"

+

+#define WID(w) ((w) ? ((w)->drawable.id) : 0)

+#define AllModifiersMask ( \

+	ShiftMask | LockMask | ControlMask | Mod1Mask | Mod2Mask | \

+	Mod3Mask | Mod4Mask | Mod5Mask )

+#define AllButtonsMask ( \

+	Button1Mask | Button2Mask | Button3Mask | Button4Mask | Button5Mask )

+

+Bool ShouldFreeInputMasks(WindowPtr /* pWin */ ,

+				 Bool	/* ignoreSelectedEvents */

+    );

+static Bool MakeInputMasks(WindowPtr	/* pWin */

+    );

+

+/*

+ * Only let the given client know of core events which will affect its

+ * interpretation of input events, if the client's ClientPointer (or the

+ * paired keyboard) is the current device.

+ */

+int

+XIShouldNotify(ClientPtr client, DeviceIntPtr dev)

+{

+    DeviceIntPtr current_ptr = PickPointer(client);

+    DeviceIntPtr current_kbd = GetPairedDevice(current_ptr);

+

+    if (dev == current_kbd || dev == current_ptr)

+        return 1;

+

+    return 0;

+}

+

+Bool

+IsPointerEvent(InternalEvent* event)

+{

+    switch(event->any.type)

+    {

+        case ET_ButtonPress:

+        case ET_ButtonRelease:

+        case ET_Motion:

+            /* XXX: enter/leave ?? */

+            return TRUE;

+        default:

+            break;

+    }

+    return FALSE;

+}

+

+/**

+ * @return the device matching the deviceid of the device set in the event, or

+ * NULL if the event is not an XInput event.

+ */

+DeviceIntPtr

+XIGetDevice(xEvent* xE)

+{

+    DeviceIntPtr pDev = NULL;

+

+    if (xE->u.u.type == DeviceButtonPress ||

+        xE->u.u.type == DeviceButtonRelease ||

+        xE->u.u.type == DeviceMotionNotify ||

+        xE->u.u.type == ProximityIn ||

+        xE->u.u.type == ProximityOut ||

+        xE->u.u.type == DevicePropertyNotify)

+    {

+        int rc;

+        int id;

+

+        id = ((deviceKeyButtonPointer*)xE)->deviceid & ~MORE_EVENTS;

+

+        rc = dixLookupDevice(&pDev, id, serverClient, DixUnknownAccess);

+        if (rc != Success)

+            ErrorF("[dix] XIGetDevice failed on XACE restrictions (%d)\n", rc);

+    }

+    return pDev;

+}

+

+

+/**

+ * Copy the device->key into master->key and send a mapping notify to the

+ * clients if appropriate.

+ * master->key needs to be allocated by the caller.

+ *

+ * Device is the slave device. If it is attached to a master device, we may

+ * need to send a mapping notify to the client because it causes the MD

+ * to change state.

+ *

+ * Mapping notify needs to be sent in the following cases:

+ *      - different slave device on same master

+ *      - different master

+ *

+ * XXX: They way how the code is we also send a map notify if the slave device

+ * stays the same, but the master changes. This isn't really necessary though.

+ *

+ * XXX: this gives you funny behaviour with the ClientPointer. When a

+ * MappingNotify is sent to the client, the client usually responds with a

+ * GetKeyboardMapping. This will retrieve the ClientPointer's keyboard

+ * mapping, regardless of which keyboard sent the last mapping notify request.

+ * So depending on the CP setting, your keyboard may change layout in each

+ * app...

+ *

+ * This code is basically the old SwitchCoreKeyboard.

+ */

+

+void

+CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master)

+{

+    KeyClassPtr mk = master->key;

+

+    if (device == master)

+        return;

+

+    mk->sourceid = device->id;

+

+

+    if (!XkbCopyDeviceKeymap(master, device))

+        FatalError("Couldn't pivot keymap from device to core!\n");

+}

+

+/**

+ * Copies the feedback classes from device "from" into device "to". Classes

+ * are duplicated (not just flipping the pointers). All feedback classes are

+ * linked lists, the full list is duplicated.

+ */

+static void

+DeepCopyFeedbackClasses(DeviceIntPtr from, DeviceIntPtr to)

+{

+    ClassesPtr classes;

+

+

+    if (from->intfeed)

+    {

+        IntegerFeedbackPtr *i, it;

+

+        if (!to->intfeed)

+        {

+            classes = to->unused_classes;

+            to->intfeed = classes->intfeed;

+            classes->intfeed = NULL;

+        }

+

+        i = &to->intfeed;

+        for (it = from->intfeed; it; it = it->next)

+        {

+            if (!(*i))

+            {

+                *i = calloc(1, sizeof(IntegerFeedbackClassRec));

+                if (!(*i))

+                {

+                    ErrorF("[Xi] Cannot alloc memory for class copy.");

+                    return;

+                }

+            }

+            (*i)->CtrlProc = it->CtrlProc;

+            (*i)->ctrl     = it->ctrl;

+

+            i = &(*i)->next;

+        }

+    } else if (to->intfeed && !from->intfeed)

+    {

+        ClassesPtr classes;

+        classes = to->unused_classes;

+        classes->intfeed = to->intfeed;

+        to->intfeed      = NULL;

+    }

+

+    if (from->stringfeed)

+    {

+        StringFeedbackPtr *s, it;

+

+        if (!to->stringfeed)

+        {

+            classes = to->unused_classes;

+            to->stringfeed = classes->stringfeed;

+            classes->stringfeed = NULL;

+        }

+

+        s = &to->stringfeed;

+        for (it = from->stringfeed; it; it = it->next)

+        {

+            if (!(*s))

+            {

+                *s = calloc(1, sizeof(StringFeedbackClassRec));

+                if (!(*s))

+                {

+                    ErrorF("[Xi] Cannot alloc memory for class copy.");

+                    return;

+                }

+            }

+            (*s)->CtrlProc = it->CtrlProc;

+            (*s)->ctrl     = it->ctrl;

+

+            s = &(*s)->next;

+        }

+    } else if (to->stringfeed && !from->stringfeed)

+    {

+        ClassesPtr classes;

+        classes = to->unused_classes;

+        classes->stringfeed = to->stringfeed;

+        to->stringfeed      = NULL;

+    }

+

+    if (from->bell)

+    {

+        BellFeedbackPtr *b, it;

+

+        if (!to->bell)

+        {

+            classes = to->unused_classes;

+            to->bell = classes->bell;

+            classes->bell = NULL;

+        }

+

+        b = &to->bell;

+        for (it = from->bell; it; it = it->next)

+        {

+            if (!(*b))

+            {

+                *b = calloc(1, sizeof(BellFeedbackClassRec));

+                if (!(*b))

+                {

+                    ErrorF("[Xi] Cannot alloc memory for class copy.");

+                    return;

+                }

+            }

+            (*b)->BellProc = it->BellProc;

+            (*b)->CtrlProc = it->CtrlProc;

+            (*b)->ctrl     = it->ctrl;

+

+            b = &(*b)->next;

+        }

+    } else if (to->bell && !from->bell)

+    {

+        ClassesPtr classes;

+        classes = to->unused_classes;

+        classes->bell = to->bell;

+        to->bell      = NULL;

+    }

+

+    if (from->leds)

+    {

+        LedFeedbackPtr *l, it;

+

+        if (!to->leds)

+        {

+            classes = to->unused_classes;

+            to->leds = classes->leds;

+            classes->leds = NULL;

+        }

+

+        l = &to->leds;

+        for (it = from->leds; it; it = it->next)

+        {

+            if (!(*l))

+            {

+                *l = calloc(1, sizeof(LedFeedbackClassRec));

+                if (!(*l))

+                {

+                    ErrorF("[Xi] Cannot alloc memory for class copy.");

+                    return;

+                }

+            }

+            (*l)->CtrlProc = it->CtrlProc;

+            (*l)->ctrl     = it->ctrl;

+            if ((*l)->xkb_sli)

+                XkbFreeSrvLedInfo((*l)->xkb_sli);

+            (*l)->xkb_sli = XkbCopySrvLedInfo(from, it->xkb_sli, NULL, *l);

+

+            l = &(*l)->next;

+        }

+    } else if (to->leds && !from->leds)

+    {

+        ClassesPtr classes;

+        classes = to->unused_classes;

+        classes->leds = to->leds;

+        to->leds      = NULL;

+    }

+}

+

+static void

+DeepCopyKeyboardClasses(DeviceIntPtr from, DeviceIntPtr to)

+{

+    ClassesPtr classes;

+

+    /* XkbInitDevice (->XkbInitIndicatorMap->XkbFindSrvLedInfo) relies on the

+     * kbdfeed to be set up properly, so let's do the feedback classes first.

+     */

+    if (from->kbdfeed)

+    {

+        KbdFeedbackPtr *k, it;

+

+        if (!to->kbdfeed)

+        {

+            classes = to->unused_classes;

+

+            to->kbdfeed = classes->kbdfeed;

+            if (!to->kbdfeed)

+                InitKeyboardDeviceStruct(to, NULL, NULL, NULL);

+            classes->kbdfeed = NULL;

+        }

+

+        k = &to->kbdfeed;

+        for(it = from->kbdfeed; it; it = it->next)

+        {

+            if (!(*k))

+            {

+                *k = calloc(1, sizeof(KbdFeedbackClassRec));

+                if (!*k)

+                {

+                    ErrorF("[Xi] Cannot alloc memory for class copy.");

+                    return;

+                }

+            }

+            (*k)->BellProc = it->BellProc;

+            (*k)->CtrlProc = it->CtrlProc;

+            (*k)->ctrl     = it->ctrl;

+            if ((*k)->xkb_sli)

+                XkbFreeSrvLedInfo((*k)->xkb_sli);

+            (*k)->xkb_sli = XkbCopySrvLedInfo(from, it->xkb_sli, *k, NULL);

+

+            k = &(*k)->next;

+        }

+    } else if (to->kbdfeed && !from->kbdfeed)

+    {

+        ClassesPtr classes;

+        classes = to->unused_classes;

+        classes->kbdfeed = to->kbdfeed;

+        to->kbdfeed      = NULL;

+    }

+

+    if (from->key)

+    {

+        if (!to->key)

+        {

+            classes = to->unused_classes;

+            to->key = classes->key;

+            if (!to->key)

+                InitKeyboardDeviceStruct(to, NULL, NULL, NULL);

+            else

+                classes->key = NULL;

+        }

+

+        CopyKeyClass(from, to);

+    } else if (to->key && !from->key)

+    {

+        ClassesPtr classes;

+        classes = to->unused_classes;

+        classes->key = to->key;

+        to->key      = NULL;

+    }

+

+    /* If a SrvLedInfoPtr's flags are XkbSLI_IsDefault, the names and maps

+     * pointer point into the xkbInfo->desc struct.  XkbCopySrvLedInfo

+     * didn't update the pointers so we need to do it manually here.

+     */

+    if (to->kbdfeed)

+    {

+        KbdFeedbackPtr k;

+

+        for (k = to->kbdfeed; k; k = k->next)

+        {

+            if (!k->xkb_sli)

+                continue;

+            if (k->xkb_sli->flags & XkbSLI_IsDefault)

+            {

+                k->xkb_sli->names = to->key->xkbInfo->desc->names->indicators;

+                k->xkb_sli->maps = to->key->xkbInfo->desc->indicators->maps;

+            }

+        }

+    }

+

+    /* We can't just copy over the focus class. When an app sets the focus,

+     * it'll do so on the master device. Copying the SDs focus means losing

+     * the focus.

+     * So we only copy the focus class if the device didn't have one,

+     * otherwise we leave it as it is.

+     */

+    if (from->focus)

+    {

+        if (!to->focus)

+        {

+            WindowPtr *oldTrace;

+

+            classes = to->unused_classes;

+            to->focus = classes->focus;

+            if (!to->focus)

+            {

+                to->focus = calloc(1, sizeof(FocusClassRec));

+                if (!to->focus)

+                    FatalError("[Xi] no memory for class shift.\n");

+            } else

+                classes->focus = NULL;

+

+            oldTrace = to->focus->trace;

+            memcpy(to->focus, from->focus, sizeof(FocusClassRec));

+            to->focus->trace = realloc(oldTrace,

+                                  to->focus->traceSize * sizeof(WindowPtr));

+            if (!to->focus->trace && to->focus->traceSize)

+                FatalError("[Xi] no memory for trace.\n");

+            memcpy(to->focus->trace, from->focus->trace,

+                    from->focus->traceSize * sizeof(WindowPtr));

+            to->focus->sourceid = from->id;

+        }

+    } else if (to->focus)

+    {

+        ClassesPtr classes;

+        classes = to->unused_classes;

+        classes->focus = to->focus;

+        to->focus      = NULL;

+    }

+

+}

+

+static void

+DeepCopyPointerClasses(DeviceIntPtr from, DeviceIntPtr to)

+{

+    ClassesPtr classes;

+

+    /* Feedback classes must be copied first */

+    if (from->ptrfeed)

+    {

+        PtrFeedbackPtr *p, it;

+        if (!to->ptrfeed)

+        {

+            classes = to->unused_classes;

+            to->ptrfeed = classes->ptrfeed;

+            classes->ptrfeed = NULL;

+        }

+

+        p = &to->ptrfeed;

+        for (it = from->ptrfeed; it; it = it->next)

+        {

+            if (!(*p))

+            {

+                *p = calloc(1, sizeof(PtrFeedbackClassRec));

+                if (!*p)

+                {

+                    ErrorF("[Xi] Cannot alloc memory for class copy.");

+                    return;

+                }

+            }

+            (*p)->CtrlProc = it->CtrlProc;

+            (*p)->ctrl     = it->ctrl;

+

+            p = &(*p)->next;

+        }

+    } else if (to->ptrfeed && !from->ptrfeed)

+    {

+        ClassesPtr classes;

+        classes = to->unused_classes;

+        classes->ptrfeed = to->ptrfeed;

+        to->ptrfeed      = NULL;

+    }

+

+    if (from->valuator)

+    {

+        ValuatorClassPtr v;

+        if (!to->valuator)

+        {

+            classes = to->unused_classes;

+            to->valuator = classes->valuator;

+            if (to->valuator)

+                classes->valuator = NULL;

+        }

+

+        to->valuator = realloc(to->valuator, sizeof(ValuatorClassRec) +

+                from->valuator->numAxes * sizeof(AxisInfo) +

+                from->valuator->numAxes * sizeof(double));

+        v = to->valuator;

+        if (!v)

+            FatalError("[Xi] no memory for class shift.\n");

+

+        v->numAxes = from->valuator->numAxes;

+        v->axes = (AxisInfoPtr)&v[1];

+        memcpy(v->axes, from->valuator->axes, v->numAxes * sizeof(AxisInfo));

+

+        v->axisVal = (double*)(v->axes + from->valuator->numAxes);

+        v->sourceid = from->id;

+    } else if (to->valuator && !from->valuator)

+    {

+        ClassesPtr classes;

+        classes = to->unused_classes;

+        classes->valuator = to->valuator;

+        to->valuator      = NULL;

+    }

+

+    if (from->button)

+    {

+        if (!to->button)

+        {

+            classes = to->unused_classes;

+            to->button = classes->button;

+            if (!to->button)

+            {

+                to->button = calloc(1, sizeof(ButtonClassRec));

+                if (!to->button)

+                    FatalError("[Xi] no memory for class shift.\n");

+            } else

+                classes->button = NULL;

+        }

+

+        if (from->button->xkb_acts)

+        {

+            if (!to->button->xkb_acts)

+            {

+                to->button->xkb_acts = calloc(1, sizeof(XkbAction));

+                if (!to->button->xkb_acts)

+                    FatalError("[Xi] not enough memory for xkb_acts.\n");

+            }

+            memcpy(to->button->xkb_acts, from->button->xkb_acts,

+                    sizeof(XkbAction));

+        } else

+            free(to->button->xkb_acts);

+

+         memcpy(to->button->labels, from->button->labels,

+                from->button->numButtons * sizeof(Atom));

+        to->button->sourceid = from->id;

+    } else if (to->button && !from->button)

+    {

+        ClassesPtr classes;

+        classes = to->unused_classes;

+        classes->button = to->button;

+        to->button      = NULL;

+    }

+

+    if (from->proximity)

+    {

+        if (!to->proximity)

+        {

+            classes = to->unused_classes;

+            to->proximity = classes->proximity;

+            if (!to->proximity)

+            {

+                to->proximity = calloc(1, sizeof(ProximityClassRec));

+                if (!to->proximity)

+                    FatalError("[Xi] no memory for class shift.\n");

+            } else

+                classes->proximity = NULL;

+        }

+        memcpy(to->proximity, from->proximity, sizeof(ProximityClassRec));

+        to->proximity->sourceid = from->id;

+    } else if (to->proximity)

+    {

+        ClassesPtr classes;

+        classes = to->unused_classes;

+        classes->proximity = to->proximity;

+        to->proximity      = NULL;

+    }

+

+    if (from->absolute)

+    {

+        if (!to->absolute)

+        {

+            classes = to->unused_classes;

+            to->absolute = classes->absolute;

+            if (!to->absolute)

+            {

+                to->absolute = calloc(1, sizeof(AbsoluteClassRec));

+                if (!to->absolute)

+                    FatalError("[Xi] no memory for class shift.\n");

+            } else

+                classes->absolute = NULL;

+        }

+        memcpy(to->absolute, from->absolute, sizeof(AbsoluteClassRec));

+        to->absolute->sourceid = from->id;

+    } else if (to->absolute)

+    {

+        ClassesPtr classes;

+        classes = to->unused_classes;

+        classes->absolute = to->absolute;

+        to->absolute      = NULL;

+    }

+}

+

+/**

+ * Copies the CONTENT of the classes of device from into the classes in device

+ * to. From and to are identical after finishing.

+ *

+ * If to does not have classes from currenly has, the classes are stored in

+ * to's devPrivates system. Later, we recover it again from there if needed.

+ * Saves a few memory allocations.

+ */

+void

+DeepCopyDeviceClasses(DeviceIntPtr from, DeviceIntPtr to, DeviceChangedEvent *dce)

+{

+    /* generic feedback classes, not tied to pointer and/or keyboard */

+    DeepCopyFeedbackClasses(from, to);

+

+    if ((dce->flags & DEVCHANGE_KEYBOARD_EVENT))

+        DeepCopyKeyboardClasses(from, to);

+    if ((dce->flags & DEVCHANGE_POINTER_EVENT))

+        DeepCopyPointerClasses(from, to);

+}

+

+

+/**

+ * Send an XI2 DeviceChangedEvent to all interested clients.

+ */

+void

+XISendDeviceChangedEvent(DeviceIntPtr device, DeviceIntPtr master, DeviceChangedEvent *dce)

+{

+    xXIDeviceChangedEvent *dcce;

+    int rc;

+

+    rc = EventToXI2((InternalEvent*)dce, (xEvent**)&dcce);

+    if (rc != Success)

+    {

+        ErrorF("[Xi] event conversion from DCE failed with code %d\n", rc);

+        return;

+    }

+

+    /* we don't actually swap if there's a NullClient, swapping is done

+     * later when event is delivered. */

+    SendEventToAllWindows(master, XI_DeviceChangedMask, (xEvent*)dcce, 1);

+    free(dcce);

+}

+

+static void

+ChangeMasterDeviceClasses(DeviceIntPtr device, DeviceChangedEvent *dce)

+{

+    DeviceIntPtr slave;

+    int rc;

+

+    /* For now, we don't have devices that change physically. */

+    if (!IsMaster(device))

+        return;

+

+    rc = dixLookupDevice(&slave, dce->sourceid, serverClient, DixReadAccess);

+

+    if (rc != Success)

+        return; /* Device has disappeared */

+

+    if (IsMaster(slave))

+        return;

+

+    if (IsFloating(slave))

+        return; /* set floating since the event */

+

+    if (GetMaster(slave, MASTER_ATTACHED)->id != dce->masterid)

+        return; /* not our slave anymore, don't care */

+

+    /* FIXME: we probably need to send a DCE for the new slave now */

+

+    device->public.devicePrivate = slave->public.devicePrivate;

+

+    /* FIXME: the classes may have changed since we generated the event. */

+    DeepCopyDeviceClasses(slave, device, dce);

+    XISendDeviceChangedEvent(slave, device, dce);

+}

+

+/**

+ * Update the device state according to the data in the event.

+ *

+ * return values are

+ *   DEFAULT ... process as normal

+ *   DONT_PROCESS ... return immediately from caller

+ */

+#define DEFAULT 0

+#define DONT_PROCESS 1

+int

+UpdateDeviceState(DeviceIntPtr device, DeviceEvent* event)

+{

+    int i;

+    int key = 0,

+        bit = 0,

+        last_valuator;

+

+    KeyClassPtr k       = NULL;

+    ButtonClassPtr b    = NULL;

+    ValuatorClassPtr v  = NULL;

+

+    /* This event is always the first we get, before the actual events with

+     * the data. However, the way how the DDX is set up, "device" will

+     * actually be the slave device that caused the event.

+     */

+    switch(event->type)

+    {

+        case ET_DeviceChanged:

+            ChangeMasterDeviceClasses(device, (DeviceChangedEvent*)event);

+            return DONT_PROCESS; /* event has been sent already */

+        case ET_Motion:

+        case ET_ButtonPress:

+        case ET_ButtonRelease:

+        case ET_KeyPress:

+        case ET_KeyRelease:

+        case ET_ProximityIn:

+        case ET_ProximityOut:

+            break;

+        default:

+            /* other events don't update the device */

+            return DEFAULT;

+    }

+

+    k = device->key;

+    v = device->valuator;

+    b = device->button;

+

+    key = event->detail.key;

+    bit = 1 << (key & 7);

+

+    /* Update device axis */

+    /* Check valuators first */

+    last_valuator = -1;

+    for (i = 0; i < MAX_VALUATORS; i++)

+    {

+        if (BitIsOn(&event->valuators.mask, i))

+        {

+            if (!v)

+            {

+                ErrorF("[Xi] Valuators reported for non-valuator device '%s'. "

+                        "Ignoring event.\n", device->name);

+                return DONT_PROCESS;

+            } else if (v->numAxes < i)

+            {

+                ErrorF("[Xi] Too many valuators reported for device '%s'. "

+                        "Ignoring event.\n", device->name);

+                return DONT_PROCESS;

+            }

+            last_valuator = i;

+        }

+    }

+

+    for (i = 0; i <= last_valuator && i < v->numAxes; i++)

+    {

+        if (BitIsOn(&event->valuators.mask, i))

+        {

+            /* XXX: Relative/Absolute mode */

+            v->axisVal[i] = event->valuators.data[i];

+            v->axisVal[i] += (event->valuators.data_frac[i] * 1.0f / (1 << 16) / (1 << 16));

+        }

+    }

+

+    if (event->type == ET_KeyPress) {

+        if (!k)

+            return DONT_PROCESS;

+

+	/* don't allow ddx to generate multiple downs, but repeats are okay */

+	if (key_is_down(device, key, KEY_PROCESSED) && !event->key_repeat)

+	    return DONT_PROCESS;

+

+	if (device->valuator)

+	    device->valuator->motionHintWindow = NullWindow;

+	set_key_down(device, key, KEY_PROCESSED);

+    } else if (event->type == ET_KeyRelease) {

+        if (!k)

+            return DONT_PROCESS;

+

+	if (!key_is_down(device, key, KEY_PROCESSED))	/* guard against duplicates */

+	    return DONT_PROCESS;

+	if (device->valuator)

+	    device->valuator->motionHintWindow = NullWindow;

+	set_key_up(device, key, KEY_PROCESSED);

+    } else if (event->type == ET_ButtonPress) {

+        Mask mask;

+        if (!b)

+            return DONT_PROCESS;

+

+        if (button_is_down(device, key, BUTTON_PROCESSED))

+            return DONT_PROCESS;

+

+        set_button_down(device, key, BUTTON_PROCESSED);

+	if (device->valuator)

+	    device->valuator->motionHintWindow = NullWindow;

+        if (!b->map[key])

+            return DONT_PROCESS;

+        b->buttonsDown++;

+	b->motionMask = DeviceButtonMotionMask;

+        if (b->map[key] <= 5)

+	    b->state |= (Button1Mask >> 1) << b->map[key];

+

+        /* Add state and motionMask to the filter for this event */

+        mask = DevicePointerMotionMask | b->state | b->motionMask;

+        SetMaskForEvent(device->id, mask, DeviceMotionNotify);

+        mask = PointerMotionMask | b->state | b->motionMask;

+        SetMaskForEvent(device->id, mask, MotionNotify);

+    } else if (event->type == ET_ButtonRelease) {

+        Mask mask;

+        if (!b)

+            return DONT_PROCESS;

+

+        if (!button_is_down(device, key, BUTTON_PROCESSED))

+            return DONT_PROCESS;

+        if (IsMaster(device)) {

+            DeviceIntPtr sd;

+

+            /*

+             * Leave the button down if any slave has the

+             * button still down. Note that this depends on the

+             * event being delivered through the slave first

+             */

+            for (sd = inputInfo.devices; sd; sd = sd->next) {

+                if (IsMaster(sd) || GetMaster(sd, MASTER_POINTER) != device)

+                    continue;

+                if (!sd->button)

+                    continue;

+                for (i = 1; i <= sd->button->numButtons; i++)

+                    if (sd->button->map[i] == key &&

+                        button_is_down(sd, i, BUTTON_PROCESSED))

+                        return DONT_PROCESS;

+            }

+        }

+        set_button_up(device, key, BUTTON_PROCESSED);

+	if (device->valuator)

+	    device->valuator->motionHintWindow = NullWindow;

+        if (!b->map[key])

+            return DONT_PROCESS;

+        if (b->buttonsDown >= 1 && !--b->buttonsDown)

+	    b->motionMask = 0;

+	if (b->map[key] <= 5)

+	    b->state &= ~((Button1Mask >> 1) << b->map[key]);

+

+        /* Add state and motionMask to the filter for this event */

+        mask = DevicePointerMotionMask | b->state | b->motionMask;

+        SetMaskForEvent(device->id, mask, DeviceMotionNotify);

+        mask = PointerMotionMask | b->state | b->motionMask;

+        SetMaskForEvent(device->id, mask, MotionNotify);

+    } else if (event->type == ET_ProximityIn)

+	device->proximity->in_proximity = TRUE;

+    else if (event->type == ET_ProximityOut)

+	device->proximity->in_proximity = FALSE;

+

+    return DEFAULT;

+}

+

+static void

+ProcessRawEvent(RawDeviceEvent *ev, DeviceIntPtr device)

+{

+    GrabPtr grab = device->deviceGrab.grab;

+

+    if (grab)

+        DeliverGrabbedEvent((InternalEvent*)ev, device, FALSE);

+    else { /* deliver to all root windows */

+        xEvent *xi;

+        int i;

+

+        i = EventToXI2((InternalEvent*)ev, (xEvent**)&xi);

+        if (i != Success)

+        {

+            ErrorF("[Xi] %s: XI2 conversion failed in ProcessRawEvent (%d)\n",

+                    device->name, i);

+            return;

+        }

+

+        for (i = 0; i < screenInfo.numScreens; i++)

+          if (screenInfo.screens[i] && screenInfo.screens[i]->root)

+            DeliverEventsToWindow(device, screenInfo.screens[i]->root, xi, 1,

+                                  GetEventFilter(device, xi), NULL);

+        free(xi);

+    }

+}

+

+/**

+ * Main device event processing function.

+ * Called from when processing the events from the event queue.

+ *

+ */

+void

+ProcessOtherEvent(InternalEvent *ev, DeviceIntPtr device)

+{

+    GrabPtr grab;

+    Bool deactivateDeviceGrab = FALSE;

+    int key = 0, rootX, rootY;

+    ButtonClassPtr b;

+    KeyClassPtr k;

+    ValuatorClassPtr v;

+    int ret = 0;

+    int state, i;

+    DeviceIntPtr mouse = NULL, kbd = NULL;

+    DeviceEvent *event = &ev->device_event;

+

+    CHECKEVENT(ev);

+

+    if (ev->any.type == ET_RawKeyPress ||

+        ev->any.type == ET_RawKeyRelease ||

+        ev->any.type == ET_RawButtonPress ||

+        ev->any.type == ET_RawButtonRelease ||

+        ev->any.type == ET_RawMotion)

+    {

+        ProcessRawEvent(&ev->raw_event, device);

+        return;

+    }

+

+    if (IsPointerDevice(device))

+    {

+        kbd = GetPairedDevice(device);

+        mouse = device;

+        if (kbd && !kbd->key) /* can happen with floating SDs */

+            kbd = NULL;

+    } else

+    {

+        mouse = GetPairedDevice(device);

+        kbd = device;

+        if (!mouse->valuator || !mouse->button) /* may be float. SDs */

+            mouse = NULL;

+    }

+

+    /* State needs to be assembled BEFORE the device is updated. */

+    state = (kbd && kbd->key) ? XkbStateFieldFromRec(&kbd->key->xkbInfo->state) : 0;

+    state |= (mouse && mouse->button) ? (mouse->button->state) : 0;

+

+    for (i = 0; mouse && mouse->button && i < mouse->button->numButtons; i++)

+        if (BitIsOn(mouse->button->down, i))

+            SetBit(event->buttons, i);

+

+    if (kbd && kbd->key)

+    {

+        XkbStatePtr state;

+        /* we need the state before the event happens */

+        if (event->type == ET_KeyPress || event->type == ET_KeyRelease)

+            state = &kbd->key->xkbInfo->prev_state;

+        else

+            state = &kbd->key->xkbInfo->state;

+

+        event->mods.base = state->base_mods;

+        event->mods.latched = state->latched_mods;

+        event->mods.locked = state->locked_mods;

+        event->mods.effective = state->mods;

+

+        event->group.base = state->base_group;

+        event->group.latched = state->latched_group;

+        event->group.locked = state->locked_group;

+        event->group.effective = state->group;

+    }

+

+    ret = UpdateDeviceState(device, event);

+    if (ret == DONT_PROCESS)

+        return;

+

+    v = device->valuator;

+    b = device->button;

+    k = device->key;

+

+    if (IsMaster(device) || IsFloating(device))

+        CheckMotion(event, device);

+

+    switch (event->type)

+    {

+        case ET_Motion:

+        case ET_ButtonPress:

+        case ET_ButtonRelease:

+        case ET_KeyPress:

+        case ET_KeyRelease:

+        case ET_ProximityIn:

+        case ET_ProximityOut:

+            if (!device->spriteInfo->sprite)

+              return;

+            GetSpritePosition(device, &rootX, &rootY);

+            event->root_x = rootX;

+            event->root_y = rootY;

+            NoticeEventTime((InternalEvent*)event);

+            event->corestate = state;

+            key = event->detail.key;

+            break;

+        default:

+            break;

+    }

+

+    if (DeviceEventCallback && !syncEvents.playingEvents) {

+	DeviceEventInfoRec eventinfo;

+	SpritePtr pSprite = device->spriteInfo->sprite;

+

+	/* see comment in EnqueueEvents regarding the next three lines */

+	if (ev->any.type == ET_Motion)

+	    ev->device_event.root = pSprite->hotPhys.pScreen->root->drawable.id;

+

+	eventinfo.device = device;

+	eventinfo.event = ev;

+	CallCallbacks(&DeviceEventCallback, (pointer) & eventinfo);

+    }

+

+    grab = device->deviceGrab.grab;

+

+    switch(event->type)

+    {

+        case ET_KeyPress:

+            if (!grab && CheckDeviceGrabs(device, event, 0))

+                return;

+            break;

+        case ET_KeyRelease:

+            if (grab && device->deviceGrab.fromPassiveGrab &&

+                (key == device->deviceGrab.activatingKey) &&

+                (device->deviceGrab.grab->type == KeyPress ||

+                 device->deviceGrab.grab->type == DeviceKeyPress ||

+                 device->deviceGrab.grab->type == XI_KeyPress))

+                deactivateDeviceGrab = TRUE;

+            break;

+        case ET_ButtonPress:

+            event->detail.button = b->map[key];

+            if (!event->detail.button) { /* there's no button 0 */

+                event->detail.button = key;

+                return;

+            }

+            if (!grab && CheckDeviceGrabs(device, event, 0))

+            {

+                /* if a passive grab was activated, the event has been sent

+                 * already */

+                return;

+            }

+            break;

+        case ET_ButtonRelease:

+            event->detail.button = b->map[key];

+            if (!event->detail.button) { /* there's no button 0 */

+                event->detail.button = key;

+                return;

+            }

+            if (grab && !b->buttonsDown &&

+                device->deviceGrab.fromPassiveGrab &&

+                (device->deviceGrab.grab->type == ButtonPress ||

+                 device->deviceGrab.grab->type == DeviceButtonPress ||

+                 device->deviceGrab.grab->type == XI_ButtonPress))

+                deactivateDeviceGrab = TRUE;

+        default:

+            break;

+    }

+

+

+    if (grab)

+        DeliverGrabbedEvent((InternalEvent*)event, device, deactivateDeviceGrab);

+    else if (device->focus && !IsPointerEvent((InternalEvent*)ev))

+        DeliverFocusedEvent(device, (InternalEvent*)event,

+                            GetSpriteWindow(device));

+    else

+        DeliverDeviceEvents(GetSpriteWindow(device), (InternalEvent*)event,

+                            NullGrab, NullWindow, device);

+

+    if (deactivateDeviceGrab == TRUE)

+	(*device->deviceGrab.DeactivateGrab) (device);

+    event->detail.key = key;

+}

+

+int

+InitProximityClassDeviceStruct(DeviceIntPtr dev)

+{

+    ProximityClassPtr proxc;

+

+    proxc = (ProximityClassPtr) malloc(sizeof(ProximityClassRec));

+    if (!proxc)

+	return FALSE;

+    proxc->sourceid = dev->id;

+    proxc->in_proximity = TRUE;

+    dev->proximity = proxc;

+    return TRUE;

+}

+

+/**

+ * Initialise the device's valuators. The memory must already be allocated,

+ * this function merely inits the matching axis (specified through axnum) to

+ * sane values.

+ *

+ * It is a condition that (minval < maxval).

+ *

+ * @see InitValuatorClassDeviceStruct

+ */

+void

+InitValuatorAxisStruct(DeviceIntPtr dev, int axnum, Atom label, int minval, int maxval,

+		       int resolution, int min_res, int max_res, int mode)

+{

+    AxisInfoPtr ax;

+

+    if (!dev || !dev->valuator || minval > maxval)

+        return;

+    if (axnum >= dev->valuator->numAxes)

+        return;

+

+    ax = dev->valuator->axes + axnum;

+

+    ax->min_value = minval;

+    ax->max_value = maxval;

+    ax->resolution = resolution;

+    ax->min_resolution = min_res;

+    ax->max_resolution = max_res;

+    ax->label = label;

+    ax->mode = mode;

+

+    if (mode & OutOfProximity)

+        dev->proximity->in_proximity = FALSE;

+}

+

+static void

+FixDeviceStateNotify(DeviceIntPtr dev, deviceStateNotify * ev, KeyClassPtr k,

+		     ButtonClassPtr b, ValuatorClassPtr v, int first)

+{

+    ev->type = DeviceStateNotify;

+    ev->deviceid = dev->id;

+    ev->time = currentTime.milliseconds;

+    ev->classes_reported = 0;

+    ev->num_keys = 0;

+    ev->num_buttons = 0;

+    ev->num_valuators = 0;

+

+    if (b) {

+	ev->classes_reported |= (1 << ButtonClass);

+	ev->num_buttons = b->numButtons;

+	memcpy((char*)ev->buttons, (char*)b->down, 4);

+    } else if (k) {

+	ev->classes_reported |= (1 << KeyClass);

+	ev->num_keys = k->xkbInfo->desc->max_key_code -

+                       k->xkbInfo->desc->min_key_code;

+	memmove((char *)&ev->keys[0], (char *)k->down, 4);

+    }

+    if (v) {

+	int nval = v->numAxes - first;

+

+	ev->classes_reported |= (1 << ValuatorClass);

+	ev->classes_reported |= valuator_get_mode(dev, 0) << ModeBitsShift;

+	ev->num_valuators = nval < 3 ? nval : 3;

+	switch (ev->num_valuators) {

+	case 3:

+	    ev->valuator2 = v->axisVal[first + 2];

+	case 2:

+	    ev->valuator1 = v->axisVal[first + 1];

+	case 1:

+	    ev->valuator0 = v->axisVal[first];

+	    break;

+	}

+    }

+}

+

+static void

+FixDeviceValuator(DeviceIntPtr dev, deviceValuator * ev, ValuatorClassPtr v,

+		  int first)

+{

+    int nval = v->numAxes - first;

+

+    ev->type = DeviceValuator;

+    ev->deviceid = dev->id;

+    ev->num_valuators = nval < 3 ? nval : 3;

+    ev->first_valuator = first;

+    switch (ev->num_valuators) {

+    case 3:

+	ev->valuator2 = v->axisVal[first + 2];

+    case 2:

+	ev->valuator1 = v->axisVal[first + 1];

+    case 1:

+	ev->valuator0 = v->axisVal[first];

+	break;

+    }

+    first += ev->num_valuators;

+}

+

+void

+DeviceFocusEvent(DeviceIntPtr dev, int type, int mode, int detail,

+		 WindowPtr pWin)

+{

+    deviceFocus event;

+    xXIFocusInEvent *xi2event;

+    DeviceIntPtr mouse;

+    int btlen, len, i;

+

+    mouse = IsFloating(dev) ? dev : GetMaster(dev, MASTER_POINTER);

+

+    /* XI 2 event */

+    btlen = (mouse->button) ? bits_to_bytes(mouse->button->numButtons) : 0;

+    btlen = bytes_to_int32(btlen);

+    len = sizeof(xXIFocusInEvent) + btlen * 4;

+

+    xi2event = calloc(1, len);

+    xi2event->type         = GenericEvent;

+    xi2event->extension    = IReqCode;

+    xi2event->evtype       = type;

+    xi2event->length       = bytes_to_int32(len - sizeof(xEvent));

+    xi2event->buttons_len  = btlen;

+    xi2event->detail       = detail;

+    xi2event->time         = currentTime.milliseconds;

+    xi2event->deviceid     = dev->id;

+    xi2event->sourceid     = dev->id; /* a device doesn't change focus by itself */

+    xi2event->mode         = mode;

+    xi2event->root_x       = FP1616(mouse->spriteInfo->sprite->hot.x, 0);

+    xi2event->root_y       = FP1616(mouse->spriteInfo->sprite->hot.y, 0);

+

+    for (i = 0; mouse && mouse->button && i < mouse->button->numButtons; i++)

+        if (BitIsOn(mouse->button->down, i))

+            SetBit(&xi2event[1], i);

+

+    if (dev->key)

+    {

+        xi2event->mods.base_mods = dev->key->xkbInfo->state.base_mods;

+        xi2event->mods.latched_mods = dev->key->xkbInfo->state.latched_mods;

+        xi2event->mods.locked_mods = dev->key->xkbInfo->state.locked_mods;

+        xi2event->mods.effective_mods = dev->key->xkbInfo->state.mods;

+

+        xi2event->group.base_group = dev->key->xkbInfo->state.base_group;

+        xi2event->group.latched_group = dev->key->xkbInfo->state.latched_group;

+        xi2event->group.locked_group = dev->key->xkbInfo->state.locked_group;

+        xi2event->group.effective_group = dev->key->xkbInfo->state.group;

+    }

+

+    FixUpEventFromWindow(dev->spriteInfo->sprite, (xEvent*)xi2event, pWin,

+                         None, FALSE);

+

+    DeliverEventsToWindow(dev, pWin, (xEvent*)xi2event, 1,

+                          GetEventFilter(dev, (xEvent*)xi2event), NullGrab);

+

+    free(xi2event);

+

+    /* XI 1.x event */

+    event.deviceid = dev->id;

+    event.mode = mode;

+    event.type = (type == XI_FocusIn) ? DeviceFocusIn : DeviceFocusOut;

+    event.detail = detail;

+    event.window = pWin->drawable.id;

+    event.time = currentTime.milliseconds;

+

+    DeliverEventsToWindow(dev, pWin, (xEvent *) & event, 1,

+				DeviceFocusChangeMask, NullGrab);

+

+    if ((event.type == DeviceFocusIn) &&

+	(wOtherInputMasks(pWin)) &&

+	(wOtherInputMasks(pWin)->inputEvents[dev->id] & DeviceStateNotifyMask))

+    {

+	int evcount = 1;

+	deviceStateNotify *ev, *sev;

+	deviceKeyStateNotify *kev;

+	deviceButtonStateNotify *bev;

+

+	KeyClassPtr k;

+	ButtonClassPtr b;

+	ValuatorClassPtr v;

+	int nval = 0, nkeys = 0, nbuttons = 0, first = 0;

+

+	if ((b = dev->button) != NULL) {

+	    nbuttons = b->numButtons;

+	    if (nbuttons > 32)

+		evcount++;

+	}

+	if ((k = dev->key) != NULL) {

+	    nkeys = k->xkbInfo->desc->max_key_code -

+                    k->xkbInfo->desc->min_key_code;

+	    if (nkeys > 32)

+		evcount++;

+	    if (nbuttons > 0) {

+		evcount++;

+	    }

+	}

+	if ((v = dev->valuator) != NULL) {

+	    nval = v->numAxes;

+

+	    if (nval > 3)

+		evcount++;

+	    if (nval > 6) {

+		if (!(k && b))

+		    evcount++;

+		if (nval > 9)

+		    evcount += ((nval - 7) / 3);

+	    }

+	}

+

+	sev = ev = (deviceStateNotify *) malloc(evcount * sizeof(xEvent));

+	FixDeviceStateNotify(dev, ev, NULL, NULL, NULL, first);

+

+	if (b != NULL) {

+	    FixDeviceStateNotify(dev, ev++, NULL, b, v, first);

+	    first += 3;

+	    nval -= 3;

+	    if (nbuttons > 32) {

+		(ev - 1)->deviceid |= MORE_EVENTS;

+		bev = (deviceButtonStateNotify *) ev++;

+		bev->type = DeviceButtonStateNotify;

+		bev->deviceid = dev->id;

+		memcpy((char*)&bev->buttons[4], (char*)&b->down[4], DOWN_LENGTH - 4);

+	    }

+	    if (nval > 0) {

+		(ev - 1)->deviceid |= MORE_EVENTS;

+		FixDeviceValuator(dev, (deviceValuator *) ev++, v, first);

+		first += 3;

+		nval -= 3;

+	    }

+	}

+

+	if (k != NULL) {

+	    FixDeviceStateNotify(dev, ev++, k, NULL, v, first);

+	    first += 3;

+	    nval -= 3;

+	    if (nkeys > 32) {

+		(ev - 1)->deviceid |= MORE_EVENTS;

+		kev = (deviceKeyStateNotify *) ev++;

+		kev->type = DeviceKeyStateNotify;

+		kev->deviceid = dev->id;

+		memmove((char *)&kev->keys[0], (char *)&k->down[4], 28);

+	    }

+	    if (nval > 0) {

+		(ev - 1)->deviceid |= MORE_EVENTS;

+		FixDeviceValuator(dev, (deviceValuator *) ev++, v, first);

+		first += 3;

+		nval -= 3;

+	    }

+	}

+

+	while (nval > 0) {

+	    FixDeviceStateNotify(dev, ev++, NULL, NULL, v, first);

+	    first += 3;

+	    nval -= 3;

+	    if (nval > 0) {

+		(ev - 1)->deviceid |= MORE_EVENTS;

+		FixDeviceValuator(dev, (deviceValuator *) ev++, v, first);

+		first += 3;

+		nval -= 3;

+	    }

+	}

+

+	DeliverEventsToWindow(dev, pWin, (xEvent *) sev, evcount,

+				    DeviceStateNotifyMask, NullGrab);

+	free(sev);

+    }

+}

+

+int

+CheckGrabValues(ClientPtr client, GrabParameters* param)

+{

+    if (param->grabtype != GRABTYPE_CORE &&

+        param->grabtype != GRABTYPE_XI &&

+        param->grabtype != GRABTYPE_XI2)

+    {

+        ErrorF("[Xi] grabtype is invalid. This is a bug.\n");

+        return BadImplementation;

+    }

+

+    if ((param->this_device_mode != GrabModeSync) &&

+	(param->this_device_mode != GrabModeAsync)) {

+	client->errorValue = param->this_device_mode;

+	return BadValue;

+    }

+    if ((param->other_devices_mode != GrabModeSync) &&

+	(param->other_devices_mode != GrabModeAsync)) {

+	client->errorValue = param->other_devices_mode;

+	return BadValue;

+    }

+

+    if (param->grabtype != GRABTYPE_XI2 && (param->modifiers != AnyModifier) &&

+        (param->modifiers & ~AllModifiersMask)) {

+	client->errorValue = param->modifiers;

+	return BadValue;

+    }

+

+    if ((param->ownerEvents != xFalse) && (param->ownerEvents != xTrue)) {

+	client->errorValue = param->ownerEvents;

+	return BadValue;

+    }

+    return Success;

+}

+

+int

+GrabButton(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr modifier_device,

+           int button, GrabParameters *param, GrabType grabtype,

+	   GrabMask *mask)

+{

+    WindowPtr pWin, confineTo;

+    CursorPtr cursor;

+    GrabPtr grab;

+    int rc, type = -1;

+    Mask access_mode = DixGrabAccess;

+

+    rc = CheckGrabValues(client, param);

+    if (rc != Success)

+	return rc;

+    if (param->confineTo == None)

+	confineTo = NullWindow;

+    else {

+	rc = dixLookupWindow(&confineTo, param->confineTo, client, DixSetAttrAccess);

+	if (rc != Success)

+	    return rc;

+    }

+    if (param->cursor == None)

+	cursor = NullCursor;

+    else {

+	rc = dixLookupResourceByType((pointer *)&cursor, param->cursor,

+				     RT_CURSOR, client, DixUseAccess);

+	if (rc != Success)

+	{

+	    client->errorValue = param->cursor;

+	    return rc;

+	}

+	access_mode |= DixForceAccess;

+    }

+    if (param->this_device_mode == GrabModeSync || param->other_devices_mode == GrabModeSync)

+	access_mode |= DixFreezeAccess;

+    rc = XaceHook(XACE_DEVICE_ACCESS, client, dev, access_mode);

+    if (rc != Success)

+	return rc;

+    rc = dixLookupWindow(&pWin, param->grabWindow, client, DixSetAttrAccess);

+    if (rc != Success)

+	return rc;

+

+    if (grabtype == GRABTYPE_XI)

+        type = DeviceButtonPress;

+    else if (grabtype == GRABTYPE_XI2)

+        type = XI_ButtonPress;

+

+    grab = CreateGrab(client->index, dev, modifier_device, pWin, grabtype,

+                      mask, param, type, button, confineTo, cursor);

+    if (!grab)

+	return BadAlloc;

+    return AddPassiveGrabToList(client, grab);

+}

+

+/**

+ * Grab the given key. If grabtype is GRABTYPE_XI, the key is a keycode. If

+ * grabtype is GRABTYPE_XI2, the key is a keysym.

+ */

+int

+GrabKey(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr modifier_device,

+        int key, GrabParameters *param, GrabType grabtype, GrabMask *mask)

+{

+    WindowPtr pWin;

+    GrabPtr grab;

+    KeyClassPtr k = dev->key;

+    Mask access_mode = DixGrabAccess;

+    int rc, type = -1;

+

+    rc = CheckGrabValues(client, param);

+    if (rc != Success)

+        return rc;

+    if (k == NULL)

+	return BadMatch;

+    if (grabtype == GRABTYPE_XI)

+    {

+        if ((key > k->xkbInfo->desc->max_key_code ||

+                    key < k->xkbInfo->desc->min_key_code)

+                && (key != AnyKey)) {

+            client->errorValue = key;

+            return BadValue;

+        }

+        type = DeviceKeyPress;

+    } else if (grabtype == GRABTYPE_XI2)

+        type = XI_KeyPress;

+

+    rc = dixLookupWindow(&pWin, param->grabWindow, client, DixSetAttrAccess);

+    if (rc != Success)

+	return rc;

+    if (param->this_device_mode == GrabModeSync || param->other_devices_mode == GrabModeSync)

+	access_mode |= DixFreezeAccess;

+    rc = XaceHook(XACE_DEVICE_ACCESS, client, dev, access_mode);

+    if (rc != Success)

+	return rc;

+

+    grab = CreateGrab(client->index, dev, modifier_device, pWin, grabtype,

+                      mask, param, type, key, NULL, NULL);

+    if (!grab)

+	return BadAlloc;

+    return AddPassiveGrabToList(client, grab);

+}

+

+/* Enter/FocusIn grab */

+int

+GrabWindow(ClientPtr client, DeviceIntPtr dev, int type,

+           GrabParameters *param, GrabMask *mask)

+{

+    WindowPtr pWin;

+    CursorPtr cursor;

+    GrabPtr grab;

+    Mask access_mode = DixGrabAccess;

+    int rc;

+

+    rc = CheckGrabValues(client, param);

+    if (rc != Success)

+        return rc;

+

+    rc = dixLookupWindow(&pWin, param->grabWindow, client, DixSetAttrAccess);

+    if (rc != Success)

+	return rc;

+    if (param->cursor == None)

+	cursor = NullCursor;

+    else {

+	rc = dixLookupResourceByType((pointer *)&cursor, param->cursor,

+				     RT_CURSOR, client, DixUseAccess);

+	if (rc != Success)

+	{

+	    client->errorValue = param->cursor;

+	    return rc;

+	}

+	access_mode |= DixForceAccess;

+    }

+    if (param->this_device_mode == GrabModeSync || param->other_devices_mode == GrabModeSync)

+	access_mode |= DixFreezeAccess;

+    rc = XaceHook(XACE_DEVICE_ACCESS, client, dev, access_mode);

+    if (rc != Success)

+	return rc;

+

+    grab = CreateGrab(client->index, dev, dev, pWin, GRABTYPE_XI2,

+                      mask, param, (type == XIGrabtypeEnter) ? XI_Enter : XI_FocusIn,

+                      0, NULL, cursor);

+

+    if (!grab)

+        return BadAlloc;

+

+    return AddPassiveGrabToList(client, grab);

+}

+

+int

+SelectForWindow(DeviceIntPtr dev, WindowPtr pWin, ClientPtr client,

+		Mask mask, Mask exclusivemasks)

+{

+    int mskidx = dev->id;

+    int i, ret;

+    Mask check;

+    InputClientsPtr others;

+

+    check = (mask & exclusivemasks);

+    if (wOtherInputMasks(pWin)) {

+	if (check & wOtherInputMasks(pWin)->inputEvents[mskidx]) {	/* It is illegal for two different

+									 * clients to select on any of the

+									 * events for maskcheck. However,

+									 * it is OK, for some client to

+									 * continue selecting on one of those

+									 * events.  */

+	    for (others = wOtherInputMasks(pWin)->inputClients; others;

+		 others = others->next) {

+		if (!SameClient(others, client) && (check &

+						    others->mask[mskidx]))

+		    return BadAccess;

+	    }

+	}

+	for (others = wOtherInputMasks(pWin)->inputClients; others;

+	     others = others->next) {

+	    if (SameClient(others, client)) {

+		check = others->mask[mskidx];

+		others->mask[mskidx] = mask;

+		if (mask == 0) {

+		    for (i = 0; i < EMASKSIZE; i++)

+			if (i != mskidx && others->mask[i] != 0)

+			    break;

+		    if (i == EMASKSIZE) {

+			RecalculateDeviceDeliverableEvents(pWin);

+			if (ShouldFreeInputMasks(pWin, FALSE))

+			    FreeResource(others->resource, RT_NONE);

+			return Success;

+		    }

+		}

+		goto maskSet;

+	    }

+	}

+    }

+    check = 0;

+    if ((ret = AddExtensionClient(pWin, client, mask, mskidx)) != Success)

+	return ret;

+  maskSet:

+    if (dev->valuator)

+	if ((dev->valuator->motionHintWindow == pWin) &&

+	    (mask & DevicePointerMotionHintMask) &&

+	    !(check & DevicePointerMotionHintMask) && !dev->deviceGrab.grab)

+	    dev->valuator->motionHintWindow = NullWindow;

+    RecalculateDeviceDeliverableEvents(pWin);

+    return Success;

+}

+

+int

+AddExtensionClient(WindowPtr pWin, ClientPtr client, Mask mask, int mskidx)

+{

+    InputClientsPtr others;

+

+    if (!pWin->optional && !MakeWindowOptional(pWin))

+	return BadAlloc;

+    others = calloc(1, sizeof(InputClients));

+    if (!others)

+	return BadAlloc;

+    if (!pWin->optional->inputMasks && !MakeInputMasks(pWin))

+	return BadAlloc;

+    others->mask[mskidx] = mask;

+    others->resource = FakeClientID(client->index);

+    others->next = pWin->optional->inputMasks->inputClients;

+    pWin->optional->inputMasks->inputClients = others;

+    if (!AddResource(others->resource, RT_INPUTCLIENT, (pointer) pWin))

+	return BadAlloc;

+    return Success;

+}

+

+static Bool

+MakeInputMasks(WindowPtr pWin)

+{

+    struct _OtherInputMasks *imasks;

+

+    imasks = calloc(1, sizeof(struct _OtherInputMasks));

+    if (!imasks)

+	return FALSE;

+    pWin->optional->inputMasks = imasks;

+    return TRUE;

+}

+

+void

+RecalculateDeviceDeliverableEvents(WindowPtr pWin)

+{

+    InputClientsPtr others;

+    struct _OtherInputMasks *inputMasks;	/* default: NULL */

+    WindowPtr pChild, tmp;

+    int i, j;

+

+    pChild = pWin;

+    while (1) {

+	if ((inputMasks = wOtherInputMasks(pChild)) != 0) {

+            for (i = 0; i < EMASKSIZE; i++)

+                memset(inputMasks->xi2mask[i], 0, sizeof(inputMasks->xi2mask[i]));

+	    for (others = inputMasks->inputClients; others;

+		 others = others->next) {

+		for (i = 0; i < EMASKSIZE; i++)

+		    inputMasks->inputEvents[i] |= others->mask[i];

+                for (i = 0; i < EMASKSIZE; i++)

+                    for (j = 0; j < XI2MASKSIZE; j++)

+                        inputMasks->xi2mask[i][j] |= others->xi2mask[i][j];

+	    }

+	    for (i = 0; i < EMASKSIZE; i++)

+		inputMasks->deliverableEvents[i] = inputMasks->inputEvents[i];

+	    for (tmp = pChild->parent; tmp; tmp = tmp->parent)

+		if (wOtherInputMasks(tmp))

+		    for (i = 0; i < EMASKSIZE; i++)

+			inputMasks->deliverableEvents[i] |=

+			    (wOtherInputMasks(tmp)->deliverableEvents[i]

+			     & ~inputMasks->

+			     dontPropagateMask[i] & PropagateMask[i]);

+	}

+	if (pChild->firstChild) {

+	    pChild = pChild->firstChild;

+	    continue;

+	}

+	while (!pChild->nextSib && (pChild != pWin))

+	    pChild = pChild->parent;

+	if (pChild == pWin)

+	    break;

+	pChild = pChild->nextSib;

+    }

+}

+

+#ifdef _MSC_VER

+#pragma warning(disable:4715) /* Not all control paths return a value */

+#endif

+

+int

+InputClientGone(WindowPtr pWin, XID id)

+{

+    InputClientsPtr other, prev;

+

+    if (!wOtherInputMasks(pWin))

+	return Success;

+    prev = 0;

+    for (other = wOtherInputMasks(pWin)->inputClients; other;

+	 other = other->next) {

+	if (other->resource == id) {

+	    if (prev) {

+		prev->next = other->next;

+		free(other);

+	    } else if (!(other->next)) {

+		if (ShouldFreeInputMasks(pWin, TRUE)) {

+		    wOtherInputMasks(pWin)->inputClients = other->next;

+		    free(wOtherInputMasks(pWin));

+		    pWin->optional->inputMasks = (OtherInputMasks *) NULL;

+		    CheckWindowOptionalNeed(pWin);

+		    free(other);

+		} else {

+		    other->resource = FakeClientID(0);

+		    if (!AddResource(other->resource, RT_INPUTCLIENT,

+				     (pointer) pWin))

+			return BadAlloc;

+		}

+	    } else {

+		wOtherInputMasks(pWin)->inputClients = other->next;

+		free(other);

+	    }

+	    RecalculateDeviceDeliverableEvents(pWin);

+	    return Success;

+	}

+	prev = other;

+    }

+    FatalError("client not on device event list");

+}

+

+int

+SendEvent(ClientPtr client, DeviceIntPtr d, Window dest, Bool propagate,

+	  xEvent * ev, Mask mask, int count)

+{

+    WindowPtr pWin;

+    WindowPtr effectiveFocus = NullWindow;	/* only set if dest==InputFocus */

+    WindowPtr spriteWin = GetSpriteWindow(d);

+

+    if (dest == PointerWindow)

+	pWin = spriteWin;

+    else if (dest == InputFocus) {

+	WindowPtr inputFocus;

+

+	if (!d->focus)

+	    inputFocus = spriteWin;

+	else

+	    inputFocus = d->focus->win;

+

+	if (inputFocus == FollowKeyboardWin)

+	    inputFocus = inputInfo.keyboard->focus->win;

+

+	if (inputFocus == NoneWin)

+	    return Success;

+

+	/* If the input focus is PointerRootWin, send the event to where

+	 * the pointer is if possible, then perhaps propogate up to root. */

+	if (inputFocus == PointerRootWin)

+	    inputFocus = GetCurrentRootWindow(d);

+

+	if (IsParent(inputFocus, spriteWin)) {

+	    effectiveFocus = inputFocus;

+	    pWin = spriteWin;

+	} else

+	    effectiveFocus = pWin = inputFocus;

+    } else

+	dixLookupWindow(&pWin, dest, client, DixSendAccess);

+    if (!pWin)

+	return BadWindow;

+    if ((propagate != xFalse) && (propagate != xTrue)) {

+	client->errorValue = propagate;

+	return BadValue;

+    }

+    ev->u.u.type |= 0x80;

+    if (propagate) {

+	for (; pWin; pWin = pWin->parent) {

+	    if (DeliverEventsToWindow(d, pWin, ev, count, mask, NullGrab))

+		return Success;

+	    if (pWin == effectiveFocus)

+		return Success;

+	    if (wOtherInputMasks(pWin))

+		mask &= ~wOtherInputMasks(pWin)->dontPropagateMask[d->id];

+	    if (!mask)

+		break;

+	}

+    } else if (!XaceHook(XACE_SEND_ACCESS, client, NULL, pWin, ev, count))

+	DeliverEventsToWindow(d, pWin, ev, count, mask, NullGrab);

+    return Success;

+}

+

+int

+SetButtonMapping(ClientPtr client, DeviceIntPtr dev, int nElts, BYTE * map)

+{

+    int i;

+    ButtonClassPtr b = dev->button;

+

+    if (b == NULL)

+	return BadMatch;

+

+    if (nElts != b->numButtons) {

+	client->errorValue = nElts;

+	return BadValue;

+    }

+    if (BadDeviceMap(&map[0], nElts, 1, 255, &client->errorValue))

+	return BadValue;

+    for (i = 0; i < nElts; i++)

+	if ((b->map[i + 1] != map[i]) && BitIsOn(b->down, i + 1))

+	    return MappingBusy;

+    for (i = 0; i < nElts; i++)

+	b->map[i + 1] = map[i];

+    return Success;

+}

+

+int

+ChangeKeyMapping(ClientPtr client,

+		 DeviceIntPtr dev,

+		 unsigned len,

+		 int type,

+		 KeyCode firstKeyCode,

+		 CARD8 keyCodes, CARD8 keySymsPerKeyCode, KeySym * map)

+{

+    KeySymsRec keysyms;

+    KeyClassPtr k = dev->key;

+

+    if (k == NULL)

+	return BadMatch;

+

+    if (len != (keyCodes * keySymsPerKeyCode))

+	return BadLength;

+

+    if ((firstKeyCode < k->xkbInfo->desc->min_key_code) ||

+	(firstKeyCode + keyCodes - 1 > k->xkbInfo->desc->max_key_code)) {

+	client->errorValue = firstKeyCode;

+	return BadValue;

+    }

+    if (keySymsPerKeyCode == 0) {

+	client->errorValue = 0;

+	return BadValue;

+    }

+    keysyms.minKeyCode = firstKeyCode;

+    keysyms.maxKeyCode = firstKeyCode + keyCodes - 1;

+    keysyms.mapWidth = keySymsPerKeyCode;

+    keysyms.map = map;

+

+    XkbApplyMappingChange(dev, &keysyms, firstKeyCode, keyCodes, NULL,

+                          serverClient);

+

+    return Success;

+}

+

+static void

+DeleteDeviceFromAnyExtEvents(WindowPtr pWin, DeviceIntPtr dev)

+{

+    WindowPtr parent;

+

+    /* Deactivate any grabs performed on this window, before making

+     * any input focus changes.

+     * Deactivating a device grab should cause focus events. */

+

+    if (dev->deviceGrab.grab && (dev->deviceGrab.grab->window == pWin))

+	(*dev->deviceGrab.DeactivateGrab) (dev);

+

+    /* If the focus window is a root window (ie. has no parent)

+     * then don't delete the focus from it. */

+

+    if (dev->focus && (pWin == dev->focus->win) && (pWin->parent != NullWindow)) {

+	int focusEventMode = NotifyNormal;

+

+	/* If a grab is in progress, then alter the mode of focus events. */

+

+	if (dev->deviceGrab.grab)

+	    focusEventMode = NotifyWhileGrabbed;

+

+	switch (dev->focus->revert) {

+	case RevertToNone:

+	    if (!ActivateFocusInGrab(dev, pWin, NoneWin))

+		DoFocusEvents(dev, pWin, NoneWin, focusEventMode);

+	    dev->focus->win = NoneWin;

+	    dev->focus->traceGood = 0;

+	    break;

+	case RevertToParent:

+	    parent = pWin;

+	    do {

+		parent = parent->parent;

+		dev->focus->traceGood--;

+	    }

+	    while (!parent->realized);

+	    if (!ActivateFocusInGrab(dev, pWin, parent))

+		DoFocusEvents(dev, pWin, parent, focusEventMode);

+	    dev->focus->win = parent;

+	    dev->focus->revert = RevertToNone;

+	    break;

+	case RevertToPointerRoot:

+	    if (!ActivateFocusInGrab(dev, pWin, PointerRootWin))

+		DoFocusEvents(dev, pWin, PointerRootWin, focusEventMode);

+	    dev->focus->win = PointerRootWin;

+	    dev->focus->traceGood = 0;

+	    break;

+	case RevertToFollowKeyboard:

+            {

+                DeviceIntPtr kbd = GetMaster(dev, MASTER_KEYBOARD);

+                if (!kbd || (kbd == dev && kbd != inputInfo.keyboard))

+                    kbd = inputInfo.keyboard;

+	    if (kbd->focus->win) {

+		if (!ActivateFocusInGrab(dev, pWin, kbd->focus->win))

+		    DoFocusEvents(dev, pWin, kbd->focus->win, focusEventMode);

+		dev->focus->win = FollowKeyboardWin;

+		dev->focus->traceGood = 0;

+	    } else {

+                if (!ActivateFocusInGrab(dev, pWin, NoneWin))

+                    DoFocusEvents(dev, pWin, NoneWin, focusEventMode);

+		dev->focus->win = NoneWin;

+		dev->focus->traceGood = 0;

+	    }

+            }

+	    break;

+	}

+    }

+

+    if (dev->valuator)

+	if (dev->valuator->motionHintWindow == pWin)

+	    dev->valuator->motionHintWindow = NullWindow;

+}

+

+void

+DeleteWindowFromAnyExtEvents(WindowPtr pWin, Bool freeResources)

+{

+    int i;

+    DeviceIntPtr dev;

+    InputClientsPtr ic;

+    struct _OtherInputMasks *inputMasks;

+

+    for (dev = inputInfo.devices; dev; dev = dev->next) {

+	DeleteDeviceFromAnyExtEvents(pWin, dev);

+    }

+

+    for (dev = inputInfo.off_devices; dev; dev = dev->next)

+	DeleteDeviceFromAnyExtEvents(pWin, dev);

+

+    if (freeResources)

+	while ((inputMasks = wOtherInputMasks(pWin)) != 0) {

+	    ic = inputMasks->inputClients;

+	    for (i = 0; i < EMASKSIZE; i++)

+		inputMasks->dontPropagateMask[i] = 0;

+	    FreeResource(ic->resource, RT_NONE);

+	}

+}

+

+int

+MaybeSendDeviceMotionNotifyHint(deviceKeyButtonPointer * pEvents, Mask mask)

+{

+    DeviceIntPtr dev;

+

+    dixLookupDevice(&dev, pEvents->deviceid & DEVICE_BITS, serverClient,

+		    DixReadAccess);

+    if (!dev)

+        return 0;

+

+    if (pEvents->type == DeviceMotionNotify) {

+	if (mask & DevicePointerMotionHintMask) {

+	    if (WID(dev->valuator->motionHintWindow) == pEvents->event) {

+		return 1;	/* don't send, but pretend we did */

+	    }

+	    pEvents->detail = NotifyHint;

+	} else {

+	    pEvents->detail = NotifyNormal;

+	}

+    }

+    return 0;

+}

+

+void

+CheckDeviceGrabAndHintWindow(WindowPtr pWin, int type,

+			     deviceKeyButtonPointer * xE, GrabPtr grab,

+			     ClientPtr client, Mask deliveryMask)

+{

+    DeviceIntPtr dev;

+

+    dixLookupDevice(&dev, xE->deviceid & DEVICE_BITS, serverClient,

+		    DixGrabAccess);

+    if (!dev)

+        return;

+

+    if (type == DeviceMotionNotify)

+	dev->valuator->motionHintWindow = pWin;

+    else if ((type == DeviceButtonPress) && (!grab) &&

+	     (deliveryMask & DeviceButtonGrabMask)) {

+	GrabRec tempGrab;

+

+	tempGrab.device = dev;

+	tempGrab.resource = client->clientAsMask;

+	tempGrab.window = pWin;

+	tempGrab.ownerEvents =

+	    (deliveryMask & DeviceOwnerGrabButtonMask) ? TRUE : FALSE;

+	tempGrab.eventMask = deliveryMask;

+	tempGrab.keyboardMode = GrabModeAsync;

+	tempGrab.pointerMode = GrabModeAsync;

+	tempGrab.confineTo = NullWindow;

+	tempGrab.cursor = NullCursor;

+        tempGrab.next = NULL;

+	(*dev->deviceGrab.ActivateGrab) (dev, &tempGrab, currentTime, TRUE);

+    }

+}

+

+static Mask

+DeviceEventMaskForClient(DeviceIntPtr dev, WindowPtr pWin, ClientPtr client)

+{

+    InputClientsPtr other;

+

+    if (!wOtherInputMasks(pWin))

+	return 0;

+    for (other = wOtherInputMasks(pWin)->inputClients; other;

+	 other = other->next) {

+	if (SameClient(other, client))

+	    return other->mask[dev->id];

+    }

+    return 0;

+}

+

+void

+MaybeStopDeviceHint(DeviceIntPtr dev, ClientPtr client)

+{

+    WindowPtr pWin;

+    GrabPtr grab = dev->deviceGrab.grab;

+

+    pWin = dev->valuator->motionHintWindow;

+

+    if ((grab && SameClient(grab, client) &&

+	 ((grab->eventMask & DevicePointerMotionHintMask) ||

+	  (grab->ownerEvents &&

+	   (DeviceEventMaskForClient(dev, pWin, client) &

+	    DevicePointerMotionHintMask)))) ||

+	(!grab &&

+	 (DeviceEventMaskForClient(dev, pWin, client) &

+	  DevicePointerMotionHintMask)))

+	dev->valuator->motionHintWindow = NullWindow;

+}

+

+int

+DeviceEventSuppressForWindow(WindowPtr pWin, ClientPtr client, Mask mask,

+			     int maskndx)

+{

+    struct _OtherInputMasks *inputMasks = wOtherInputMasks(pWin);

+

+    if (mask & ~PropagateMask[maskndx]) {

+	client->errorValue = mask;

+	return BadValue;

+    }

+

+    if (mask == 0) {

+	if (inputMasks)

+	    inputMasks->dontPropagateMask[maskndx] = mask;

+    } else {

+	if (!inputMasks)

+	    AddExtensionClient(pWin, client, 0, 0);

+	inputMasks = wOtherInputMasks(pWin);

+	inputMasks->dontPropagateMask[maskndx] = mask;

+    }

+    RecalculateDeviceDeliverableEvents(pWin);

+    if (ShouldFreeInputMasks(pWin, FALSE))

+	FreeResource(inputMasks->inputClients->resource, RT_NONE);

+    return Success;

+}

+

+Bool

+ShouldFreeInputMasks(WindowPtr pWin, Bool ignoreSelectedEvents)

+{

+    int i;

+    Mask allInputEventMasks = 0;

+    struct _OtherInputMasks *inputMasks = wOtherInputMasks(pWin);

+

+    for (i = 0; i < EMASKSIZE; i++)

+	allInputEventMasks |= inputMasks->dontPropagateMask[i];

+    if (!ignoreSelectedEvents)

+	for (i = 0; i < EMASKSIZE; i++)

+	    allInputEventMasks |= inputMasks->inputEvents[i];

+    if (allInputEventMasks == 0)

+	return TRUE;

+    else

+	return FALSE;

+}

+

+/***********************************************************************

+ *

+ * Walk through the window tree, finding all clients that want to know

+ * about the Event.

+ *

+ */

+

+static void

+FindInterestedChildren(DeviceIntPtr dev, WindowPtr p1, Mask mask,

+                       xEvent * ev, int count)

+{

+    WindowPtr p2;

+

+    while (p1) {

+        p2 = p1->firstChild;

+        DeliverEventsToWindow(dev, p1, ev, count, mask, NullGrab);

+        FindInterestedChildren(dev, p2, mask, ev, count);

+        p1 = p1->nextSib;

+    }

+}

+

+/***********************************************************************

+ *

+ * Send an event to interested clients in all windows on all screens.

+ *

+ */

+

+void

+SendEventToAllWindows(DeviceIntPtr dev, Mask mask, xEvent * ev, int count)

+{

+    int i;

+    WindowPtr pWin, p1;

+

+    for (i = 0; i < screenInfo.numScreens; i++) {

+        pWin = screenInfo.screens[i]->root;

+        if (!pWin)

+            continue;

+        DeliverEventsToWindow(dev, pWin, ev, count, mask, NullGrab);

+        p1 = pWin->firstChild;

+        FindInterestedChildren(dev, p1, mask, ev, count);

+    }

+}

+

+/**

+ * Set the XI2 mask for the given client on the given window.

+ * @param dev The device to set the mask for.

+ * @param win The window to set the mask on.

+ * @param client The client setting the mask.

+ * @param len Number of bytes in mask.

+ * @param mask Event mask in the form of (1 << eventtype)

+ */

+int

+XISetEventMask(DeviceIntPtr dev, WindowPtr win, ClientPtr client,

+               unsigned int len, unsigned char* mask)

+{

+    OtherInputMasks *masks;

+    InputClientsPtr others = NULL;

+

+    masks = wOtherInputMasks(win);

+    if (masks)

+    {

+	for (others = wOtherInputMasks(win)->inputClients; others;

+	     others = others->next) {

+	    if (SameClient(others, client)) {

+                memset(others->xi2mask[dev->id], 0,

+                       sizeof(others->xi2mask[dev->id]));

+                break;

+            }

+        }

+    }

+

+    len = min(len, sizeof(others->xi2mask[dev->id]));

+

+    if (len && !others)

+    {

+        if (AddExtensionClient(win, client, 0, 0) != Success)

+            return BadAlloc;

+        others= wOtherInputMasks(win)->inputClients;

+    }

+

+    if (others)

+        memset(others->xi2mask[dev->id], 0, sizeof(others->xi2mask[dev->id]));

+

+    if (len)

+        memcpy(others->xi2mask[dev->id], mask, len);

+

+    RecalculateDeviceDeliverableEvents(win);

+

+    return Success;

+}

diff --git a/xorg-server/Xi/xichangehierarchy.c b/xorg-server/Xi/xichangehierarchy.c
index 6b0288c88..d48200b04 100644
--- a/xorg-server/Xi/xichangehierarchy.c
+++ b/xorg-server/Xi/xichangehierarchy.c
@@ -70,6 +70,8 @@ void XISendDeviceHierarchyEvent(int flags[MAXDEVICES])
 

     ev = calloc(1, sizeof(xXIHierarchyEvent) +

                  MAXDEVICES * sizeof(xXIHierarchyInfo));

+    if (!ev)

+        return;

     ev->type = GenericEvent;

     ev->extension = IReqCode;

     ev->evtype = XI_HierarchyChanged;

@@ -282,12 +284,12 @@ remove_master(ClientPtr client, xXIRemoveMasterInfo *r,
         for (attached = inputInfo.devices; attached; attached = attached->next)

         {

             if (!IsMaster(attached)) {

-                if (attached->u.master == ptr)

+                if (GetMaster(attached, MASTER_ATTACHED) == ptr)

                 {

                     AttachDevice(client, attached, newptr);

                     flags[attached->id] |= XISlaveAttached;

                 }

-                if (attached->u.master == keybd)

+                if (GetMaster(attached, MASTER_ATTACHED) == keybd)

                 {

                     AttachDevice(client, attached, newkeybd);

                     flags[attached->id] |= XISlaveAttached;

diff --git a/xorg-server/Xi/xipassivegrab.c b/xorg-server/Xi/xipassivegrab.c
index 6b689f45e..3b98a79cd 100644
--- a/xorg-server/Xi/xipassivegrab.c
+++ b/xorg-server/Xi/xipassivegrab.c
@@ -162,10 +162,7 @@ ProcXIPassiveGrabDevice(ClientPtr client)
     if (!modifiers_failed)

         return BadAlloc;

 

-    if (!IsMaster(dev) && dev->u.master)

-        mod_dev = GetMaster(dev, MASTER_KEYBOARD);

-    else

-        mod_dev = dev;

+    mod_dev = (IsFloating(dev)) ? dev : GetMaster(dev, MASTER_KEYBOARD);

 

     for (i = 0; i < stuff->num_modifiers; i++, modifiers++)

     {

@@ -280,10 +277,7 @@ ProcXIPassiveUngrabDevice(ClientPtr client)
     if (rc != Success)

         return rc;

 

-    if (!IsMaster(dev) && dev->u.master)

-        mod_dev = GetMaster(dev, MASTER_KEYBOARD);

-    else

-        mod_dev = dev;

+    mod_dev = (IsFloating(dev)) ? dev : GetMaster(dev, MASTER_KEYBOARD);

 

     tempGrab.resource = client->clientAsMask;

     tempGrab.device = dev;

diff --git a/xorg-server/Xi/xiquerydevice.c b/xorg-server/Xi/xiquerydevice.c
index 4e1cae406..f8a4eb8a5 100644
--- a/xorg-server/Xi/xiquerydevice.c
+++ b/xorg-server/Xi/xiquerydevice.c
@@ -375,7 +375,7 @@ SwapValuatorInfo(DeviceIntPtr dev, xXIValuatorInfo* info)
 

 int GetDeviceUse(DeviceIntPtr dev, uint16_t *attachment)

 {

-    DeviceIntPtr master = dev->u.master;

+    DeviceIntPtr master = GetMaster(dev, MASTER_ATTACHED);

     int use;

 

     if (IsMaster(dev))

@@ -383,7 +383,7 @@ int GetDeviceUse(DeviceIntPtr dev, uint16_t *attachment)
         DeviceIntPtr paired = GetPairedDevice(dev);

         use = IsPointerDevice(dev) ? XIMasterPointer : XIMasterKeyboard;

         *attachment = (paired ? paired->id : 0);

-    } else if (master)

+    } else if (!IsFloating(dev))

     {

         use = IsPointerDevice(master) ? XISlavePointer : XISlaveKeyboard;

         *attachment = master->id;

diff --git a/xorg-server/Xi/xiquerypointer.c b/xorg-server/Xi/xiquerypointer.c
index 2dc057d67..ce025432e 100644
--- a/xorg-server/Xi/xiquerypointer.c
+++ b/xorg-server/Xi/xiquerypointer.c
@@ -93,7 +93,7 @@ ProcXIQueryPointer(ClientPtr client)
     }

 

     if (pDev->valuator == NULL || IsKeyboardDevice(pDev) ||

-        (!IsMaster(pDev) && pDev->u.master)) /* no attached devices */

+        (!IsMaster(pDev) && !IsFloating(pDev))) /* no attached devices */

     {

         client->errorValue = stuff->deviceid;

         return BadDevice;

diff --git a/xorg-server/Xi/xiwarppointer.c b/xorg-server/Xi/xiwarppointer.c
index c01b115f3..66888008f 100644
--- a/xorg-server/Xi/xiwarppointer.c
+++ b/xorg-server/Xi/xiwarppointer.c
@@ -1,203 +1,203 @@
-/*
- * Copyright 2007-2008 Peter Hutterer
- *
- * 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 (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 NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS 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.
- *
- * Author: Peter Hutterer, University of South Australia, NICTA
- */
-
-/***********************************************************************
- *
- * Request to Warp the pointer location of an extension input device.
- *
- */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include <X11/X.h>	/* for inputstr.h    */
-#include <X11/Xproto.h>	/* Request macro     */
-#include "inputstr.h"	/* DeviceIntPtr      */
-#include "windowstr.h"	/* window structure  */
-#include "scrnintstr.h"	/* screen structure  */
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XI2proto.h>
-#include "extnsionst.h"
-#include "exevents.h"
-#include "exglobals.h"
-#include "mipointer.h" /* for miPointerUpdateSprite */
-
-
-#include "xiwarppointer.h"
-/***********************************************************************
- *
- * This procedure allows a client to warp the pointer of a device.
- *
- */
-
-int
-SProcXIWarpPointer(ClientPtr client)
-{
-    char n;
-
-    REQUEST(xXIWarpPointerReq);
-    swaps(&stuff->length, n);
-    swapl(&stuff->src_win, n);
-    swapl(&stuff->dst_win, n);
-    swapl(&stuff->src_x, n);
-    swapl(&stuff->src_y, n);
-    swaps(&stuff->src_width, n);
-    swaps(&stuff->src_height, n);
-    swapl(&stuff->dst_x, n);
-    swapl(&stuff->dst_y, n);
-    swaps(&stuff->deviceid, n);
-    return (ProcXIWarpPointer(client));
-}
-
-int
-ProcXIWarpPointer(ClientPtr client)
-{
-    int rc;
-    int x, y;
-    WindowPtr dest = NULL;
-    DeviceIntPtr pDev;
-    SpritePtr pSprite;
-    ScreenPtr newScreen;
-    int src_x, src_y;
-    int dst_x, dst_y;
-
-    REQUEST(xXIWarpPointerReq);
-    REQUEST_SIZE_MATCH(xXIWarpPointerReq);
-
-    /* FIXME: panoramix stuff is missing, look at ProcWarpPointer */
-
-    rc = dixLookupDevice(&pDev, stuff->deviceid, client, DixWriteAccess);
-
-    if (rc != Success)
-    {
-        client->errorValue = stuff->deviceid;
-        return rc;
-    }
-
-    if ((!IsMaster(pDev) && pDev->u.master) ||
-        (IsMaster(pDev) && !IsPointerDevice(pDev)))
-    {
-        client->errorValue = stuff->deviceid;
-        return BadDevice;
-    }
-
-    if (stuff->dst_win != None)
-    {
-        rc = dixLookupWindow(&dest, stuff->dst_win, client, DixGetAttrAccess);
-        if (rc != Success)
-        {
-            client->errorValue = stuff->dst_win;
-            return rc;
-        }
-    }
-
-    pSprite = pDev->spriteInfo->sprite;
-    x = pSprite->hotPhys.x;
-    y = pSprite->hotPhys.y;
-
-    src_x = stuff->src_x / (double)(1 << 16);
-    src_y = stuff->src_y / (double)(1 << 16);
-    dst_x = stuff->dst_x / (double)(1 << 16);
-    dst_y = stuff->dst_y / (double)(1 << 16);
-
-    if (stuff->src_win != None)
-    {
-        int winX, winY;
-        WindowPtr src;
-
-        rc = dixLookupWindow(&src, stuff->src_win, client, DixGetAttrAccess);
-        if (rc != Success)
-        {
-            client->errorValue = stuff->src_win;
-            return rc;
-        }
-
-        winX = src->drawable.x;
-        winY = src->drawable.y;
-        if (src->drawable.pScreen != pSprite->hotPhys.pScreen ||
-                x < winX + src_x ||
-                y < winY + src_y ||
-                (stuff->src_width != 0 &&
-                 winX + src_x + (int)stuff->src_width < 0) ||
-                (stuff->src_height != 0 &&
-                 winY + src_y + (int)stuff->src_height < y) ||
-                !PointInWindowIsVisible(src, x, y))
-            return Success;
-    }
-
-    if (dest)
-    {
-        x = dest->drawable.x;
-        y = dest->drawable.y;
-        newScreen = dest->drawable.pScreen;
-    } else
-        newScreen = pSprite->hotPhys.pScreen;
-
-    x += dst_x;
-    y += dst_y;
-
-    if (x < 0)
-        x = 0;
-    else if (x > newScreen->width)
-        x = newScreen->width - 1;
-
-    if (y < 0)
-        y = 0;
-    else if (y > newScreen->height)
-        y = newScreen->height - 1;
-
-    if (newScreen == pSprite->hotPhys.pScreen)
-    {
-        if (x < pSprite->physLimits.x1)
-            x = pSprite->physLimits.x1;
-        else if (x >= pSprite->physLimits.x2)
-            x = pSprite->physLimits.x2 - 1;
-
-        if (y < pSprite->physLimits.y1)
-            y = pSprite->physLimits.y1;
-        else if (y >= pSprite->physLimits.y2)
-            y = pSprite->physLimits.y2 - 1;
-
-        if (pSprite->hotShape)
-            ConfineToShape(pDev, pSprite->hotShape, &x, &y);
-        (*newScreen->SetCursorPosition)(pDev, newScreen, x, y, TRUE);
-    } else if (!PointerConfinedToScreen(pDev))
-    {
-        NewCurrentScreen(pDev, newScreen, x, y);
-    }
-
-    /* if we don't update the device, we get a jump next time it moves */
-    pDev->last.valuators[0] = x;
-    pDev->last.valuators[1] = y;
-    pDev->last.remainder[0] = 0;
-    pDev->last.remainder[1] = 0;
-    miPointerUpdateSprite(pDev);
-
-    /* FIXME: XWarpPointer is supposed to generate an event. It doesn't do it
-       here though. */
-    return Success;
-}
-
+/*

+ * Copyright 2007-2008 Peter Hutterer

+ *

+ * 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 (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 NONINFRINGEMENT.  IN NO EVENT SHALL

+ * THE AUTHORS OR COPYRIGHT HOLDERS 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.

+ *

+ * Author: Peter Hutterer, University of South Australia, NICTA

+ */

+

+/***********************************************************************

+ *

+ * Request to Warp the pointer location of an extension input device.

+ *

+ */

+

+#ifdef HAVE_DIX_CONFIG_H

+#include <dix-config.h>

+#endif

+

+#include <X11/X.h>	/* for inputstr.h    */

+#include <X11/Xproto.h>	/* Request macro     */

+#include "inputstr.h"	/* DeviceIntPtr      */

+#include "windowstr.h"	/* window structure  */

+#include "scrnintstr.h"	/* screen structure  */

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

+#include <X11/extensions/XI2proto.h>

+#include "extnsionst.h"

+#include "exevents.h"

+#include "exglobals.h"

+#include "mipointer.h" /* for miPointerUpdateSprite */

+

+

+#include "xiwarppointer.h"

+/***********************************************************************

+ *

+ * This procedure allows a client to warp the pointer of a device.

+ *

+ */

+

+int

+SProcXIWarpPointer(ClientPtr client)

+{

+    char n;

+

+    REQUEST(xXIWarpPointerReq);

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

+    swapl(&stuff->src_win, n);

+    swapl(&stuff->dst_win, n);

+    swapl(&stuff->src_x, n);

+    swapl(&stuff->src_y, n);

+    swaps(&stuff->src_width, n);

+    swaps(&stuff->src_height, n);

+    swapl(&stuff->dst_x, n);

+    swapl(&stuff->dst_y, n);

+    swaps(&stuff->deviceid, n);

+    return (ProcXIWarpPointer(client));

+}

+

+int

+ProcXIWarpPointer(ClientPtr client)

+{

+    int rc;

+    int x, y;

+    WindowPtr dest = NULL;

+    DeviceIntPtr pDev;

+    SpritePtr pSprite;

+    ScreenPtr newScreen;

+    int src_x, src_y;

+    int dst_x, dst_y;

+

+    REQUEST(xXIWarpPointerReq);

+    REQUEST_SIZE_MATCH(xXIWarpPointerReq);

+

+    /* FIXME: panoramix stuff is missing, look at ProcWarpPointer */

+

+    rc = dixLookupDevice(&pDev, stuff->deviceid, client, DixWriteAccess);

+

+    if (rc != Success)

+    {

+        client->errorValue = stuff->deviceid;

+        return rc;

+    }

+

+    if ((!IsMaster(pDev) && !IsFloating(pDev)) ||

+        (IsMaster(pDev) && !IsPointerDevice(pDev)))

+    {

+        client->errorValue = stuff->deviceid;

+        return BadDevice;

+    }

+

+    if (stuff->dst_win != None)

+    {

+        rc = dixLookupWindow(&dest, stuff->dst_win, client, DixGetAttrAccess);

+        if (rc != Success)

+        {

+            client->errorValue = stuff->dst_win;

+            return rc;

+        }

+    }

+

+    pSprite = pDev->spriteInfo->sprite;

+    x = pSprite->hotPhys.x;

+    y = pSprite->hotPhys.y;

+

+    src_x = stuff->src_x / (double)(1 << 16);

+    src_y = stuff->src_y / (double)(1 << 16);

+    dst_x = stuff->dst_x / (double)(1 << 16);

+    dst_y = stuff->dst_y / (double)(1 << 16);

+

+    if (stuff->src_win != None)

+    {

+        int winX, winY;

+        WindowPtr src;

+

+        rc = dixLookupWindow(&src, stuff->src_win, client, DixGetAttrAccess);

+        if (rc != Success)

+        {

+            client->errorValue = stuff->src_win;

+            return rc;

+        }

+

+        winX = src->drawable.x;

+        winY = src->drawable.y;

+        if (src->drawable.pScreen != pSprite->hotPhys.pScreen ||

+                x < winX + src_x ||

+                y < winY + src_y ||

+                (stuff->src_width != 0 &&

+                 winX + src_x + (int)stuff->src_width < 0) ||

+                (stuff->src_height != 0 &&

+                 winY + src_y + (int)stuff->src_height < y) ||

+                !PointInWindowIsVisible(src, x, y))

+            return Success;

+    }

+

+    if (dest)

+    {

+        x = dest->drawable.x;

+        y = dest->drawable.y;

+        newScreen = dest->drawable.pScreen;

+    } else

+        newScreen = pSprite->hotPhys.pScreen;

+

+    x += dst_x;

+    y += dst_y;

+

+    if (x < 0)

+        x = 0;

+    else if (x > newScreen->width)

+        x = newScreen->width - 1;

+

+    if (y < 0)

+        y = 0;

+    else if (y > newScreen->height)

+        y = newScreen->height - 1;

+

+    if (newScreen == pSprite->hotPhys.pScreen)

+    {

+        if (x < pSprite->physLimits.x1)

+            x = pSprite->physLimits.x1;

+        else if (x >= pSprite->physLimits.x2)

+            x = pSprite->physLimits.x2 - 1;

+

+        if (y < pSprite->physLimits.y1)

+            y = pSprite->physLimits.y1;

+        else if (y >= pSprite->physLimits.y2)

+            y = pSprite->physLimits.y2 - 1;

+

+        if (pSprite->hotShape)

+            ConfineToShape(pDev, pSprite->hotShape, &x, &y);

+        (*newScreen->SetCursorPosition)(pDev, newScreen, x, y, TRUE);

+    } else if (!PointerConfinedToScreen(pDev))

+    {

+        NewCurrentScreen(pDev, newScreen, x, y);

+    }

+

+    /* if we don't update the device, we get a jump next time it moves */

+    pDev->last.valuators[0] = x;

+    pDev->last.valuators[1] = y;

+    pDev->last.remainder[0] = 0;

+    pDev->last.remainder[1] = 0;

+    miPointerUpdateSprite(pDev);

+

+    /* FIXME: XWarpPointer is supposed to generate an event. It doesn't do it

+       here though. */

+    return Success;

+}

+

diff --git a/xorg-server/configure.ac b/xorg-server/configure.ac
index d02f4a0a1..f6d153035 100644
--- a/xorg-server/configure.ac
+++ b/xorg-server/configure.ac
@@ -26,8 +26,8 @@ dnl
 dnl Process this file with autoconf to create configure.

 

 AC_PREREQ(2.57)

-AC_INIT([xorg-server], 1.10.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)

-RELEASE_DATE="2011-2-25"

+AC_INIT([xorg-server], 1.10.99.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)

+RELEASE_DATE="unreleased"

 AC_CONFIG_SRCDIR([Makefile.am])

 AM_INIT_AUTOMAKE([foreign dist-bzip2])

 AM_MAINTAINER_MODE

@@ -312,19 +312,6 @@ AC_CHECK_HEADER([execinfo.h],[
     ])]

 )

 

-dnl ARM needs additional compiler flags for proper backtraces if GCC is

-dnl used. Compile a dummy program with the -mapcs-frame option. If it

-dnl succeeds, we know that we are building for ARM with GCC.

-old_CFLAGS="$CFLAGS"

-CFLAGS="-mapcs-frame"

-AC_COMPILE_IFELSE(

-        AC_LANG_PROGRAM([[ ]]),

-        ARM_BACKTRACE_CFLAGS="$CFLAGS",

-        ARM_BACKTRACE_CFLAGS=""

-)

-CFLAGS="$old_CFLAGS"

-AC_SUBST(ARM_BACKTRACE_CFLAGS)

-

 dnl ---------------------------------------------------------------------------

 dnl Bus options and CPU capabilities.  Replaces logic in

 dnl hw/xfree86/os-support/bus/Makefile.am, among others.

@@ -626,7 +613,6 @@ AC_ARG_ENABLE(xf86vidmode,    AS_HELP_STRING([--disable-xf86vidmode], [Build XF8
 AC_ARG_ENABLE(xace,           AS_HELP_STRING([--disable-xace], [Build X-ACE extension (default: enabled)]), [XACE=$enableval], [XACE=yes])

 AC_ARG_ENABLE(xselinux,       AS_HELP_STRING([--enable-xselinux], [Build SELinux extension (default: disabled)]), [XSELINUX=$enableval], [XSELINUX=no])

 AC_ARG_ENABLE(xcsecurity,     AS_HELP_STRING([--enable-xcsecurity], [Build Security extension (default: disabled)]), [XCSECURITY=$enableval], [XCSECURITY=no])

-AC_ARG_ENABLE(xcalibrate,     AS_HELP_STRING([--enable-xcalibrate], [Build XCalibrate extension (default: disabled)]), [XCALIBRATE=$enableval], [XCALIBRATE=no])

 AC_ARG_ENABLE(tslib,          AS_HELP_STRING([--enable-tslib], [Build kdrive tslib touchscreen support (default: disabled)]), [TSLIB=$enableval], [TSLIB=no])

 AC_ARG_ENABLE(dbe,            AS_HELP_STRING([--disable-dbe], [Build DBE extension (default: enabled)]), [DBE=$enableval], [DBE=yes])

 AC_ARG_ENABLE(xf86bigfont,    AS_HELP_STRING([--enable-xf86bigfont], [Build XF86 Big Font extension (default: disabled)]), [XF86BIGFONT=$enableval], [XF86BIGFONT=no])

@@ -641,6 +627,7 @@ AC_ARG_ENABLE(vbe,            AS_HELP_STRING([--enable-vbe], [Build Xorg with VB
 AC_ARG_ENABLE(int10-module,     AS_HELP_STRING([--enable-int10-module], [Build Xorg with int10 module (default: enabled)]), [INT10MODULE=$enableval], [INT10MODULE=yes])

 AC_ARG_ENABLE(windowswm,      AS_HELP_STRING([--enable-windowswm], [Build XWin with WindowsWM extension (default: no)]), [WINDOWSWM=$enableval], [WINDOWSWM=no])

 AC_ARG_ENABLE(libdrm,         AS_HELP_STRING([--enable-libdrm], [Build Xorg with libdrm support (default: enabled)]), [DRM=$enableval],[DRM=yes])

+AC_ARG_ENABLE(clientids,      AS_HELP_STRING([--disable-clientids], [Build Xorg with client ID tracking (default: enabled)]), [CLIENTIDS=$enableval], [CLIENTIDS=yes])

 

 dnl DDXes.

 AC_ARG_ENABLE(xorg,    	      AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])

@@ -779,7 +766,6 @@ DRIPROTO="xf86driproto >= 2.1.0"
 DRI2PROTO="dri2proto >= 2.3"

 XINERAMAPROTO="xineramaproto"

 BIGFONTPROTO="xf86bigfontproto >= 1.2.0"

-XCALIBRATEPROTO="xcalibrateproto"

 DGAPROTO="xf86dgaproto >= 2.0.99.1"

 GLPROTO="glproto >= 1.4.10"

 DMXPROTO="dmxproto >= 2.2.99.1"

@@ -807,7 +793,7 @@ LIBGLIB="glib-2.0 >= 2.16"
 LIBUDEV="libudev >= 143"

 LIBSELINUX="libselinux >= 2.0.86"

 LIBDBUS="dbus-1 >= 1.0"

-LIBPIXMAN="pixman-1 >= 0.15.20"

+LIBPIXMAN="pixman-1 >= 0.21.6"

 

 dnl Pixman is always required, but we separate it out so we can link

 dnl specific modules against it

@@ -994,6 +980,18 @@ if test "x$RES" = xyes; then
 	REQUIRED_MODULES="$REQUIRED_MODULES $RESOURCEPROTO"

 fi

 

+# The XRes extension may support client ID tracking only if it has

+# been specifically enabled. Client ID tracking is implicitly not

+# supported if XRes extension is disabled.

+AC_MSG_CHECKING([whether to track client ids])

+if test "x$RES" = xyes && test "x$CLIENTIDS" = xyes; then

+	AC_DEFINE(CLIENTIDS, 1, [Support client ID tracking])

+else

+	CLIENTIDS=no

+fi

+AC_MSG_RESULT([$CLIENTIDS])

+AM_CONDITIONAL(CLIENTIDS, [test "x$CLIENTIDS" = xyes])

+

 if test "x$GLX" = xyes; then

 	PKG_CHECK_MODULES([XLIB], [x11])

 	PKG_CHECK_MODULES([GL], $GLPROTO $LIBGL)

@@ -1120,14 +1118,6 @@ if test "x$DPMSExtension" = xyes; then
 	AC_DEFINE(DPMSExtension, 1, [Support DPMS extension])

 fi

 

-if test "x$XCALIBRATE" = xyes && test "$KDRIVE" = yes; then

-   AC_DEFINE(XCALIBRATE, 1, [Build XCalibrate extension])

-   REQUIRED_MODULES="$REQUIRED_MODULES $XCALIBRATEPROTO"

-else

-   XCALIBRATE=no

-fi

-AM_CONDITIONAL(XCALIBRATE, [test "x$XCALIBRATE" = xyes])

-

 AC_DEFINE(RENDER, 1, [Support RENDER extension])

 RENDER_LIB='$(top_builddir)/render/librender.la'

 RENDER_INC='-I$(top_srcdir)/render'

@@ -1525,7 +1515,7 @@ if test "x$XNEST" = xyes; then
 	if test "x$have_xnest" = xno; then

 		AC_MSG_ERROR([Xnest build explicitly requested, but required modules not found.])

 	fi

-	XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DIX_LIB $MAIN_LIB $OS_LIB"

+	XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB $DIX_LIB $OS_LIB"

 	XNEST_SYS_LIBS="$XNESTMODULES_LIBS $GLX_SYS_LIBS"

 	AC_SUBST([XNEST_LIBS])

 	AC_SUBST([XNEST_SYS_LIBS])

@@ -1923,7 +1913,7 @@ if test "x$XQUARTZ" = xyes; then
 

 	AC_CHECK_LIB([Xplugin],[xp_init],[:])

 

-	CFLAGS="${CFLAGS} -DROOTLESS_SAFEALPHA -DNO_ALLOCA"

+	CFLAGS="${CFLAGS} -DROOTLESS_WORKAROUND -DROOTLESS_SAFEALPHA -DNO_ALLOCA"

 

 	PKG_CHECK_MODULES(XPBPROXY, $APPLEWMPROTO $LIBAPPLEWM xfixes x11)

 

diff --git a/xorg-server/dix/devices.c b/xorg-server/dix/devices.c
index 1c2cc9807..03a4bee97 100644
--- a/xorg-server/dix/devices.c
+++ b/xorg-server/dix/devices.c
@@ -450,7 +450,7 @@ DisableDevice(DeviceIntPtr dev, BOOL sendevent)
     {

         for (other = inputInfo.devices; other; other = other->next)

         {

-            if (other->u.master == dev)

+            if (!IsMaster(other) && GetMaster(other, MASTER_ATTACHED) == dev)

             {

                 AttachDevice(NULL, other, NULL);

                 flags[other->id] |= XISlaveDetached;

@@ -461,8 +461,8 @@ DisableDevice(DeviceIntPtr dev, BOOL sendevent)
     {

         for (other = inputInfo.devices; other; other = other->next)

         {

-	    if (IsMaster(other) && other->u.lastSlave == dev)

-		other->u.lastSlave = NULL;

+	    if (IsMaster(other) && other->lastSlave == dev)

+		other->lastSlave = NULL;

 	}

     }

 

@@ -991,8 +991,8 @@ CloseDownDevices(void)
      */

     for (dev = inputInfo.devices; dev; dev = dev->next)

     {

-        if (!IsMaster(dev) && dev->u.master)

-            dev->u.master = NULL;

+        if (!IsMaster(dev) && !IsFloating(dev))

+            dev->master = NULL;

         /* Initialise the sprite and paired members of all devices

            to avoid crashes in CloseDevice later */

         dev->spriteInfo->sprite=NULL;

@@ -1289,10 +1289,11 @@ InitValuatorClassDeviceStruct(DeviceIntPtr dev, int numAxes, Atom *labels,
 

 /* global list of acceleration schemes */

 ValuatorAccelerationRec pointerAccelerationScheme[] = {

-    {PtrAccelNoOp,        NULL, NULL, NULL},

-    {PtrAccelPredictable, acceleratePointerPredictable, NULL, AccelerationDefaultCleanup},

-    {PtrAccelLightweight, acceleratePointerLightweight, NULL, NULL},

-    {-1, NULL, NULL, NULL} /* terminator */

+    {PtrAccelNoOp, NULL, NULL, NULL, NULL},

+    {PtrAccelPredictable, acceleratePointerPredictable, NULL,

+        InitPredictableAccelerationScheme, AccelerationDefaultCleanup},

+    {PtrAccelLightweight, acceleratePointerLightweight, NULL, NULL, NULL},

+    {-1, NULL, NULL, NULL, NULL} /* terminator */

 };

 

 /**

@@ -1304,59 +1305,37 @@ InitPointerAccelerationScheme(DeviceIntPtr dev,
                               int scheme)

 {

     int x, i = -1;

-    void* data = NULL;

     ValuatorClassPtr val;

 

     val = dev->valuator;

 

-    if(!val)

-	return FALSE;

+    if (!val)

+        return FALSE;

 

-    if(IsMaster(dev) && scheme != PtrAccelNoOp)

+    if (IsMaster(dev) && scheme != PtrAccelNoOp)

         return FALSE;

 

-    for(x = 0; pointerAccelerationScheme[x].number >= 0; x++) {

+    for (x = 0; pointerAccelerationScheme[x].number >= 0; x++) {

         if(pointerAccelerationScheme[x].number == scheme){

             i = x;

             break;

         }

     }

 

-    if(-1 == i)

+    if (-1 == i)

         return FALSE;

 

     if (val->accelScheme.AccelCleanupProc)

         val->accelScheme.AccelCleanupProc(dev);

 

-    /* init scheme-specific data */

-    switch(scheme){

-        case PtrAccelPredictable:

-        {

-            DeviceVelocityPtr s;

-            s = malloc(sizeof(DeviceVelocityRec));

-            if(!s)

-        	return FALSE;

-            InitVelocityData(s);

-            data = s;

-            break;

+    if (pointerAccelerationScheme[i].AccelInitProc) {

+        if (!pointerAccelerationScheme[i].AccelInitProc(dev,

+                                            &pointerAccelerationScheme[i])) {

+            return FALSE;

         }

-        default:

-            break;

+    } else {

+        val->accelScheme = pointerAccelerationScheme[i];

     }

-

-    val->accelScheme = pointerAccelerationScheme[i];

-    val->accelScheme.accelData = data;

-

-    /* post-init scheme */

-    switch(scheme){

-        case PtrAccelPredictable:

-            InitializePredictableAccelerationProperties(dev);

-            break;

-

-        default:

-            break;

-    }

-

     return TRUE;

 }

 

@@ -1674,7 +1653,7 @@ ProcChangeKeyboardMapping(ClientPtr client)
                           stuff->keyCodes, NULL, client);

 

     for (tmp = inputInfo.devices; tmp; tmp = tmp->next) {

-        if (IsMaster(tmp) || tmp->u.master != pDev)

+        if (IsMaster(tmp) || GetMaster(tmp, MASTER_KEYBOARD) != pDev)

             continue;

         if (!tmp->key)

             continue;

@@ -2337,7 +2316,7 @@ RecalculateMasterButtons(DeviceIntPtr slave)
     for (dev = inputInfo.devices; dev; dev = dev->next)

     {

         if (IsMaster(dev) ||

-            dev->u.master != master ||

+            GetMaster(dev, MASTER_ATTACHED) != master ||

             !dev->button)

             continue;

 

@@ -2386,6 +2365,46 @@ RecalculateMasterButtons(DeviceIntPtr slave)
 }

 

 /**

+ * Generate release events for all keys/button currently down on this

+ * device.

+ */

+static void

+ReleaseButtonsAndKeys(DeviceIntPtr dev)

+{

+    EventListPtr        eventlist = InitEventList(GetMaximumEventsNum());

+    ButtonClassPtr      b = dev->button;

+    KeyClassPtr         k = dev->key;

+    int                 i, j, nevents;

+

+    if (!eventlist) /* no release events for you */

+        return;

+

+    /* Release all buttons */

+    for (i = 0; b && i < b->numButtons; i++)

+    {

+        if (BitIsOn(b->down, i))

+        {

+            nevents = GetPointerEvents(eventlist, dev, ButtonRelease, i, 0, NULL);

+            for (j = 0; j < nevents; j++)

+                mieqProcessDeviceEvent(dev, (InternalEvent*)(eventlist+j)->event, NULL);

+        }

+    }

+

+    /* Release all keys */

+    for (i = 0; k && i < MAP_LENGTH; i++)

+    {

+        if (BitIsOn(k->down, i))

+        {

+            nevents = GetKeyboardEvents(eventlist, dev, KeyRelease, i);

+            for (j = 0; j < nevents; j++)

+                mieqProcessDeviceEvent(dev, (InternalEvent*)(eventlist+j)->event, NULL);

+        }

+    }

+

+    FreeEventList(eventlist, GetMaximumEventsNum());

+}

+

+/**

  * Attach device 'dev' to device 'master'.

  * Client is set to the client that issued the request, or NULL if it comes

  * from some internal automatic pairing.

@@ -2407,19 +2426,21 @@ AttachDevice(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr master)
         return BadDevice;

 

     /* set from floating to floating? */

-    if (!dev->u.master && !master && dev->enabled)

+    if (IsFloating(dev) && !master && dev->enabled)

         return Success;

 

     /* free the existing sprite. */

-    if (!dev->u.master && dev->spriteInfo->paired == dev)

+    if (IsFloating(dev) && dev->spriteInfo->paired == dev)

     {

         screen = miPointerGetScreen(dev);

         screen->DeviceCursorCleanup(dev, screen);

         free(dev->spriteInfo->sprite);

     }

 

-    oldmaster = dev->u.master;

-    dev->u.master = master;

+    ReleaseButtonsAndKeys(dev);

+

+    oldmaster = GetMaster(dev, MASTER_ATTACHED);

+    dev->master = master;

 

     /* If device is set to floating, we need to create a sprite for it,

      * otherwise things go bad. However, we don't want to render the cursor,

@@ -2469,8 +2490,8 @@ AttachDevice(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr master)
 DeviceIntPtr

 GetPairedDevice(DeviceIntPtr dev)

 {

-    if (!IsMaster(dev) && dev->u.master)

-        dev = dev->u.master;

+    if (!IsMaster(dev) && !IsFloating(dev))

+        dev = GetMaster(dev, MASTER_ATTACHED);

 

     return dev->spriteInfo->paired;

 }

@@ -2483,7 +2504,10 @@ GetPairedDevice(DeviceIntPtr dev)
  * returned master is either the device itself or the paired master device.

  * If dev is a floating slave device, NULL is returned.

  *

- * @type ::MASTER_KEYBOARD or ::MASTER_POINTER

+ * @type ::MASTER_KEYBOARD or ::MASTER_POINTER or ::MASTER_ATTACHED

+ * @return The requested master device. In the case of MASTER_ATTACHED, this

+ * is the directly attached master to this device, regardless of the type.

+ * Otherwise, it is either the master keyboard or pointer for this device.

  */

 DeviceIntPtr

 GetMaster(DeviceIntPtr dev, int which)

@@ -2493,9 +2517,9 @@ GetMaster(DeviceIntPtr dev, int which)
     if (IsMaster(dev))

         master = dev;

     else

-        master = dev->u.master;

+        master = dev->master;

 

-    if (master)

+    if (master && which != MASTER_ATTACHED)

     {

         if (which == MASTER_KEYBOARD)

         {

@@ -2548,7 +2572,7 @@ AllocDevicePair (ClientPtr client, char* name,
     pointer->coreEvents = TRUE;

     pointer->spriteInfo->spriteOwner = TRUE;

 

-    pointer->u.lastSlave = NULL;

+    pointer->lastSlave = NULL;

     pointer->last.slave = NULL;

     pointer->type = (master) ? MASTER_POINTER : SLAVE;

 

@@ -2574,7 +2598,7 @@ AllocDevicePair (ClientPtr client, char* name,
     keyboard->coreEvents = TRUE;

     keyboard->spriteInfo->spriteOwner = FALSE;

 

-    keyboard->u.lastSlave = NULL;

+    keyboard->lastSlave = NULL;

     keyboard->last.slave = NULL;

     keyboard->type = (master) ? MASTER_KEYBOARD : SLAVE;

 

diff --git a/xorg-server/dix/dispatch.c b/xorg-server/dix/dispatch.c
index 87b27dfa6..5e1c858b6 100644
--- a/xorg-server/dix/dispatch.c
+++ b/xorg-server/dix/dispatch.c
@@ -134,6 +134,7 @@ int ProcInitialConnection();
 #include "inputstr.h"

 #include "xkbsrv.h"

 #include "site.h"

+#include "client.h"

 

 #ifdef XSERVER_DTRACE

 #include "registry.h"

@@ -3500,6 +3501,9 @@ CloseDownClient(ClientPtr client)
 	    CallCallbacks((&ClientStateCallback), (pointer)&clientinfo);

 	} 	    

 	FreeClientResources(client);

+	/* Disable client ID tracking. This must be done after

+	 * ClientStateCallback. */

+	ReleaseClientIds(client);

 #ifdef XSERVER_DTRACE

 	XSERVER_CLIENT_DISCONNECT(client->index);

 #endif	

@@ -3537,6 +3541,7 @@ void InitClient(ClientPtr client, int i, pointer ospriv)
     client->smart_start_tick = SmartScheduleTime;

     client->smart_stop_tick = SmartScheduleTime;

     client->smart_check_tick = SmartScheduleTime;

+    client->clientIds = NULL;

 }

 

 /************************

@@ -3576,6 +3581,11 @@ ClientPtr NextAvailableClient(pointer ospriv)
 	currentMaxClients++;

     while ((nextFreeClientID < MAXCLIENTS) && clients[nextFreeClientID])

 	nextFreeClientID++;

+

+    /* Enable client ID tracking. This must be done before

+     * ClientStateCallback. */

+    ReserveClientIds(client);

+

     if (ClientStateCallback)

     {

 	NewClientInfoRec clientinfo;

diff --git a/xorg-server/dix/eventconvert.c b/xorg-server/dix/eventconvert.c
index 1009550c3..93715f35d 100644
--- a/xorg-server/dix/eventconvert.c
+++ b/xorg-server/dix/eventconvert.c
@@ -97,8 +97,12 @@ EventIsKeyRepeat(xEvent *event)
  * @return Success or the matching error code.

  */

 int

-EventToCore(InternalEvent *event, xEvent *core)

+EventToCore(InternalEvent *event, xEvent **core_out, int *count_out)

 {

+    xEvent *core = NULL;

+    int count = 0;

+    int ret = BadImplementation;

+

     switch(event->any.type)

     {

         case ET_Motion:

@@ -108,7 +112,10 @@ EventToCore(InternalEvent *event, xEvent *core)
                  * present */

                 if (!BitIsOn(e->valuators.mask, 0) &&

                     !BitIsOn(e->valuators.mask, 1))

-                    return BadMatch;

+                {

+                    ret = BadMatch;

+                    goto out;

+                }

             }

             /* fallthrough */

         case ET_ButtonPress:

@@ -119,9 +126,15 @@ EventToCore(InternalEvent *event, xEvent *core)
                 DeviceEvent *e = &event->device_event;

 

                 if (e->detail.key > 0xFF)

-                    return BadMatch;

-

-                memset(core, 0, sizeof(xEvent));

+                {

+                    ret = BadMatch;

+                    goto out;

+                }

+

+                core = calloc(1, sizeof(*core));

+                if (!core)

+                    return BadAlloc;

+                count = 1;

                 core->u.u.type = e->type - ET_KeyPress + KeyPress;

                 core->u.u.detail = e->detail.key & 0xFF;

                 core->u.keyButtonPointer.time = e->time;

@@ -129,7 +142,10 @@ EventToCore(InternalEvent *event, xEvent *core)
                 core->u.keyButtonPointer.rootY = e->root_y;

                 core->u.keyButtonPointer.state = e->corestate;

                 core->u.keyButtonPointer.root = e->root;

-                EventSetKeyRepeatFlag(core, (e->type == ET_KeyPress && e->key_repeat));

+                EventSetKeyRepeatFlag(core,

+                                      (e->type == ET_KeyPress &&

+                                       e->key_repeat));

+                ret = Success;

             }

             break;

         case ET_ProximityIn:

@@ -139,13 +155,18 @@ EventToCore(InternalEvent *event, xEvent *core)
         case ET_RawButtonPress:

         case ET_RawButtonRelease:

         case ET_RawMotion:

-            return BadMatch;

+            ret = BadMatch;

+            goto out;

         default:

             /* XXX: */

             ErrorF("[dix] EventToCore: Not implemented yet \n");

-            return BadImplementation;

+            ret = BadImplementation;

     }

-    return Success;

+

+out:

+    *core_out = core;

+    *count_out = count;

+    return ret;

 }

 

 /**

diff --git a/xorg-server/dix/events.c b/xorg-server/dix/events.c
index 47f35ac93..0eda63a51 100644
--- a/xorg-server/dix/events.c
+++ b/xorg-server/dix/events.c
@@ -1,5819 +1,5858 @@
-/************************************************************
-
-Copyright 1987, 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 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        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 Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL 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.
-
-********************************************************/
-
-/* The panoramix components contained the following notice */
-/*****************************************************************
-
-Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
-BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL DAMAGES, OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of Digital Equipment Corporation
-shall not be used in advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization from Digital
-Equipment Corporation.
-
-******************************************************************/
-
-/*
- * Copyright (c) 2003-2005, Oracle and/or its affiliates. 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 (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 NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS 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.
- */
-
-/** @file events.c
- * This file handles event delivery and a big part of the server-side protocol
- * handling (the parts for input devices).
- */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include <X11/X.h>
-#include "misc.h"
-#include "resource.h"
-#include <X11/Xproto.h>
-#include "windowstr.h"
-#include "inputstr.h"
-#include "scrnintstr.h"
-#include "cursorstr.h"
-
-#include "dixstruct.h"
-#ifdef PANORAMIX
-#include "panoramiX.h"
-#include "panoramiXsrv.h"
-#endif
-#include "globals.h"
-
-#include <X11/extensions/XKBproto.h>
-#include "xkbsrv.h"
-#include "xace.h"
-
-#ifdef XSERVER_DTRACE
-#include <sys/types.h>
-typedef const char *string;
-#include "Xserver-dtrace.h"
-#endif
-
-#include <X11/extensions/XIproto.h>
-#include <X11/extensions/XI2proto.h>
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XI2.h>
-#include "exglobals.h"
-#include "exevents.h"
-#include "exglobals.h"
-#include "extnsionst.h"
-
-#include "dixevents.h"
-#include "dixgrabs.h"
-#include "dispatch.h"
-
-#include <X11/extensions/ge.h>
-#include "geext.h"
-#include "geint.h"
-
-#include "eventstr.h"
-#include "enterleave.h"
-#include "eventconvert.h"
-
-/* Extension events type numbering starts at EXTENSION_EVENT_BASE.  */
-#define NoSuchEvent 0x80000000	/* so doesn't match NoEventMask */
-#define StructureAndSubMask ( StructureNotifyMask | SubstructureNotifyMask )
-#define AllButtonsMask ( \
-	Button1Mask | Button2Mask | Button3Mask | Button4Mask | Button5Mask )
-#define MotionMask ( \
-	PointerMotionMask | Button1MotionMask | \
-	Button2MotionMask | Button3MotionMask | Button4MotionMask | \
-	Button5MotionMask | ButtonMotionMask )
-#define PropagateMask ( \
-	KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | \
-	MotionMask )
-#define PointerGrabMask ( \
-	ButtonPressMask | ButtonReleaseMask | \
-	EnterWindowMask | LeaveWindowMask | \
-	PointerMotionHintMask | KeymapStateMask | \
-	MotionMask )
-#define AllModifiersMask ( \
-	ShiftMask | LockMask | ControlMask | Mod1Mask | Mod2Mask | \
-	Mod3Mask | Mod4Mask | Mod5Mask )
-#define LastEventMask OwnerGrabButtonMask
-#define AllEventMasks (LastEventMask|(LastEventMask-1))
-
-
-#define CORE_EVENT(event) \
-    (!((event)->u.u.type & EXTENSION_EVENT_BASE) && \
-      (event)->u.u.type != GenericEvent)
-#define XI2_EVENT(event) \
-    (((event)->u.u.type == GenericEvent) && \
-    ((xGenericEvent*)(event))->extension == IReqCode)
-
-/**
- * Used to indicate a implicit passive grab created by a ButtonPress event.
- * See DeliverEventsToWindow().
- */
-#define ImplicitGrabMask (1 << 7)
-
-#define WID(w) ((w) ? ((w)->drawable.id) : 0)
-
-#define XE_KBPTR (xE->u.keyButtonPointer)
-
-
-CallbackListPtr EventCallback;
-CallbackListPtr DeviceEventCallback;
-
-#define DNPMCOUNT 8
-
-Mask DontPropagateMasks[DNPMCOUNT];
-static int DontPropagateRefCnts[DNPMCOUNT];
-
-static void CheckVirtualMotion( DeviceIntPtr pDev, QdEventPtr qe, WindowPtr pWin);
-static void CheckPhysLimits(DeviceIntPtr pDev,
-                            CursorPtr cursor,
-                            Bool generateEvents,
-                            Bool confineToScreen,
-                            ScreenPtr pScreen);
-
-/** Key repeat hack. Do not use but in TryClientEvents */
-extern BOOL EventIsKeyRepeat(xEvent *event);
-
-/**
- * Main input device struct.
- *     inputInfo.pointer
- *     is the core pointer. Referred to as "virtual core pointer", "VCP",
- *     "core pointer" or inputInfo.pointer. The VCP is the first master
- *     pointer device and cannot be deleted.
- *
- *     inputInfo.keyboard
- *     is the core keyboard ("virtual core keyboard", "VCK", "core keyboard").
- *     See inputInfo.pointer.
- *
- *     inputInfo.devices
- *     linked list containing all devices including VCP and VCK.
- *
- *     inputInfo.off_devices
- *     Devices that have not been initialized and are thus turned off.
- *
- *     inputInfo.numDevices
- *     Total number of devices.
- *
- *     inputInfo.all_devices
- *     Virtual device used for XIAllDevices passive grabs. This device is
- *     not part of the inputInfo.devices list and mostly unset except for
- *     the deviceid. It exists because passivegrabs need a valid device
- *     reference.
- *
- *     inputInfo.all_master_devices
- *     Virtual device used for XIAllMasterDevices passive grabs. This device
- *     is not part of the inputInfo.devices list and mostly unset except for
- *     the deviceid. It exists because passivegrabs need a valid device
- *     reference.
- */
-InputInfo inputInfo;
-
-EventSyncInfoRec syncEvents;
-
-/**
- * The root window the given device is currently on.
- */
-#define RootWindow(sprite) sprite->spriteTrace[0]
-
-static xEvent* swapEvent = NULL;
-static int swapEventLen = 0;
-
-void
-NotImplemented(xEvent *from, xEvent *to)
-{
-    FatalError("Not implemented");
-}
-
-/**
- * Convert the given event type from an XI event to a core event.
- * @param[in] The XI 1.x event type.
- * @return The matching core event type or 0 if there is none.
- */
-int
-XItoCoreType(int xitype)
-{
-    int coretype = 0;
-    if (xitype == DeviceMotionNotify)
-        coretype = MotionNotify;
-    else if (xitype == DeviceButtonPress)
-        coretype = ButtonPress;
-    else if (xitype == DeviceButtonRelease)
-        coretype = ButtonRelease;
-    else if (xitype == DeviceKeyPress)
-        coretype = KeyPress;
-    else if (xitype == DeviceKeyRelease)
-        coretype = KeyRelease;
-
-    return coretype;
-}
-
-/**
- * @return true if the device owns a cursor, false if device shares a cursor
- * sprite with another device.
- */
-Bool
-DevHasCursor(DeviceIntPtr pDev)
-{
-    return pDev->spriteInfo->spriteOwner;
-}
-
-/*
- * @return true if a device is a pointer, check is the same as used by XI to
- * fill the 'use' field.
- */
-Bool
-IsPointerDevice(DeviceIntPtr dev)
-{
-    return (dev->type == MASTER_POINTER) ||
-            (dev->valuator && dev->button) ||
-            (dev->valuator && !dev->key);
-}
-
-/*
- * @return true if a device is a keyboard, check is the same as used by XI to
- * fill the 'use' field.
- *
- * Some pointer devices have keys as well (e.g. multimedia keys). Try to not
- * count them as keyboard devices.
- */
-Bool
-IsKeyboardDevice(DeviceIntPtr dev)
-{
-    return (dev->type == MASTER_KEYBOARD) ||
-            ((dev->key && dev->kbdfeed) && !IsPointerDevice(dev));
-}
-
-Bool
-IsMaster(DeviceIntPtr dev)
-{
-    return dev->type == MASTER_POINTER || dev->type == MASTER_KEYBOARD;
-}
-
-/**
- * Max event opcode.
- */
-extern int lastEvent;
-
-extern int DeviceMotionNotify;
-
-#define CantBeFiltered NoEventMask
-/**
- * Event masks for each event type.
- *
- * One set of filters for each device, but only the first layer
- * is initialized. The rest is memcpy'd in InitEvents.
- *
- * Filters are used whether a given event may be delivered to a client,
- * usually in the form of if (window-event-mask & filter); then deliver event.
- *
- * One notable filter is for PointerMotion/DevicePointerMotion events. Each
- * time a button is pressed, the filter is modified to also contain the
- * matching ButtonXMotion mask.
- */
-static Mask filters[MAXDEVICES][128] = {
-{
-	NoSuchEvent,		       /* 0 */
-	NoSuchEvent,		       /* 1 */
-	KeyPressMask,		       /* KeyPress */
-	KeyReleaseMask,		       /* KeyRelease */
-	ButtonPressMask,	       /* ButtonPress */
-	ButtonReleaseMask,	       /* ButtonRelease */
-	PointerMotionMask,	       /* MotionNotify (initial state) */
-	EnterWindowMask,	       /* EnterNotify */
-	LeaveWindowMask,	       /* LeaveNotify */
-	FocusChangeMask,	       /* FocusIn */
-	FocusChangeMask,	       /* FocusOut */
-	KeymapStateMask,	       /* KeymapNotify */
-	ExposureMask,		       /* Expose */
-	CantBeFiltered,		       /* GraphicsExpose */
-	CantBeFiltered,		       /* NoExpose */
-	VisibilityChangeMask,	       /* VisibilityNotify */
-	SubstructureNotifyMask,	       /* CreateNotify */
-	StructureAndSubMask,	       /* DestroyNotify */
-	StructureAndSubMask,	       /* UnmapNotify */
-	StructureAndSubMask,	       /* MapNotify */
-	SubstructureRedirectMask,      /* MapRequest */
-	StructureAndSubMask,	       /* ReparentNotify */
-	StructureAndSubMask,	       /* ConfigureNotify */
-	SubstructureRedirectMask,      /* ConfigureRequest */
-	StructureAndSubMask,	       /* GravityNotify */
-	ResizeRedirectMask,	       /* ResizeRequest */
-	StructureAndSubMask,	       /* CirculateNotify */
-	SubstructureRedirectMask,      /* CirculateRequest */
-	PropertyChangeMask,	       /* PropertyNotify */
-	CantBeFiltered,		       /* SelectionClear */
-	CantBeFiltered,		       /* SelectionRequest */
-	CantBeFiltered,		       /* SelectionNotify */
-	ColormapChangeMask,	       /* ColormapNotify */
-	CantBeFiltered,		       /* ClientMessage */
-	CantBeFiltered		       /* MappingNotify */
-}};
-
-/**
- * For the given event, return the matching event filter. This filter may then
- * be AND'ed with the selected event mask.
- *
- * For XI2 events, the returned filter is simply the byte containing the event
- * mask we're interested in. E.g. for a mask of (1 << 13), this would be
- * byte[1].
- *
- * @param[in] dev The device the event belongs to, may be NULL.
- * @param[in] event The event to get the filter for. Only the type of the
- *                  event matters, or the extension + evtype for GenericEvents.
- * @return The filter mask for the given event.
- *
- * @see GetEventMask
- */
-Mask
-GetEventFilter(DeviceIntPtr dev, xEvent *event)
-{
-    if (event->u.u.type != GenericEvent)
-        return filters[dev ? dev->id : 0][event->u.u.type];
-    else if (XI2_EVENT(event))
-        return (1 << (((xXIDeviceEvent*)event)->evtype % 8));
-    ErrorF("[dix] Unknown device type %d. No filter\n", event->u.u.type);
-    return 0;
-}
-
-/**
- * Return the windows complete XI2 mask for the given XI2 event type.
- */
-Mask
-GetWindowXI2Mask(DeviceIntPtr dev, WindowPtr win, xEvent* ev)
-{
-    OtherInputMasks *inputMasks = wOtherInputMasks(win);
-    int filter;
-    int evtype;
-
-    if (!inputMasks || !XI2_EVENT(ev))
-        return 0;
-
-    evtype = ((xGenericEvent*)ev)->evtype;
-    filter = GetEventFilter(dev, ev);
-
-    return ((inputMasks->xi2mask[dev->id][evtype/8] & filter) ||
-            inputMasks->xi2mask[XIAllDevices][evtype/8] ||
-            (inputMasks->xi2mask[XIAllMasterDevices][evtype/8] && IsMaster(dev)));
-}
-
-Mask
-GetEventMask(DeviceIntPtr dev, xEvent *event, InputClients* other)
-{
-    /* XI2 filters are only ever 8 bit, so let's return a 8 bit mask */
-    if (XI2_EVENT(event))
-    {
-        int byte = ((xGenericEvent*)event)->evtype / 8;
-        return (other->xi2mask[dev->id][byte] |
-                other->xi2mask[XIAllDevices][byte] |
-                (IsMaster(dev)? other->xi2mask[XIAllMasterDevices][byte] : 0));
-    } else if (CORE_EVENT(event))
-        return other->mask[XIAllDevices];
-    else
-        return other->mask[dev->id];
-}
-
-
-static CARD8 criticalEvents[32] =
-{
-    0x7c, 0x30, 0x40			/* key, button, expose, and configure events */
-};
-
-static void
-SyntheticMotion(DeviceIntPtr dev, int x, int y) {
-    int screenno = 0;
-
-#ifdef PANORAMIX
-    if (!noPanoramiXExtension)
-        screenno = dev->spriteInfo->sprite->screen->myNum;
-#endif
-    PostSyntheticMotion(dev, x, y, screenno,
-            (syncEvents.playingEvents) ?  syncEvents.time.milliseconds : currentTime.milliseconds);
-
-}
-
-#ifdef PANORAMIX
-static void PostNewCursor(DeviceIntPtr pDev);
-
-static Bool
-pointOnScreen(ScreenPtr pScreen, int x, int y)
-{
-    return x >= pScreen->x && x < pScreen->x + pScreen->width &&
-           y >= pScreen->y && y < pScreen->y + pScreen->height;
-}
-
-static Bool
-XineramaSetCursorPosition(
-    DeviceIntPtr pDev,
-    int x,
-    int y,
-    Bool generateEvent
-){
-    ScreenPtr pScreen;
-    int i;
-    SpritePtr pSprite = pDev->spriteInfo->sprite;
-
-    /* x,y are in Screen 0 coordinates.  We need to decide what Screen
-       to send the message too and what the coordinates relative to
-       that screen are. */
-
-    pScreen = pSprite->screen;
-    x += screenInfo.screens[0]->x;
-    y += screenInfo.screens[0]->y;
-
-    if(!pointOnScreen(pScreen, x, y))
-    {
-	FOR_NSCREENS(i)
-	{
-	    if(i == pScreen->myNum)
-		continue;
-	    if(pointOnScreen(screenInfo.screens[i], x, y))
-	    {
-		pScreen = screenInfo.screens[i];
-		break;
-	    }
-	}
-    }
-
-    pSprite->screen = pScreen;
-    pSprite->hotPhys.x = x - screenInfo.screens[0]->x;
-    pSprite->hotPhys.y = y - screenInfo.screens[0]->y;
-    x -= pScreen->x;
-    y -= pScreen->y;
-
-    return (*pScreen->SetCursorPosition)(pDev, pScreen, x, y, generateEvent);
-}
-
-
-static void
-XineramaConstrainCursor(DeviceIntPtr pDev)
-{
-    SpritePtr pSprite = pDev->spriteInfo->sprite;
-    ScreenPtr pScreen;
-    BoxRec newBox;
-
-    pScreen = pSprite->screen;
-    newBox = pSprite->physLimits;
-
-    /* Translate the constraining box to the screen
-       the sprite is actually on */
-    newBox.x1 += screenInfo.screens[0]->x - pScreen->x;
-    newBox.x2 += screenInfo.screens[0]->x - pScreen->x;
-    newBox.y1 += screenInfo.screens[0]->y - pScreen->y;
-    newBox.y2 += screenInfo.screens[0]->y - pScreen->y;
-
-    (* pScreen->ConstrainCursor)(pDev, pScreen, &newBox);
-}
-
-
-static Bool
-XineramaSetWindowPntrs(DeviceIntPtr pDev, WindowPtr pWin)
-{
-    SpritePtr pSprite = pDev->spriteInfo->sprite;
-
-    if(pWin == screenInfo.screens[0]->root) {
-	int i;
-	for (i = 0; i < PanoramiXNumScreens; i++)
-	    pSprite->windows[i] = screenInfo.screens[i]->root;
-    } else {
-	PanoramiXRes *win;
-	int rc, i;
-
-	rc = dixLookupResourceByType((pointer *)&win, pWin->drawable.id,
-				     XRT_WINDOW, serverClient, DixReadAccess);
-	if (rc != Success)
-	    return FALSE;
-
-	for(i = 0; i < PanoramiXNumScreens; i++) {
-	    rc = dixLookupWindow(pSprite->windows + i, win->info[i].id,
-				 serverClient, DixReadAccess);
-	    if (rc != Success)  /* window is being unmapped */
-		return FALSE;
-	}
-    }
-    return TRUE;
-}
-
-static void
-XineramaConfineCursorToWindow(DeviceIntPtr pDev,
-                              WindowPtr pWin,
-                              Bool generateEvents)
-{
-    SpritePtr pSprite = pDev->spriteInfo->sprite;
-
-    int x, y, off_x, off_y, i;
-
-    if(!XineramaSetWindowPntrs(pDev, pWin))
-        return;
-
-    i = PanoramiXNumScreens - 1;
-
-    RegionCopy(&pSprite->Reg1,
-            &pSprite->windows[i]->borderSize);
-    off_x = screenInfo.screens[i]->x;
-    off_y = screenInfo.screens[i]->y;
-
-    while(i--) {
-        x = off_x - screenInfo.screens[i]->x;
-        y = off_y - screenInfo.screens[i]->y;
-
-        if(x || y)
-            RegionTranslate(&pSprite->Reg1, x, y);
-
-        RegionUnion(&pSprite->Reg1, &pSprite->Reg1,
-                &pSprite->windows[i]->borderSize);
-
-        off_x = screenInfo.screens[i]->x;
-        off_y = screenInfo.screens[i]->y;
-    }
-
-    pSprite->hotLimits = *RegionExtents(&pSprite->Reg1);
-
-    if(RegionNumRects(&pSprite->Reg1) > 1)
-        pSprite->hotShape = &pSprite->Reg1;
-    else
-        pSprite->hotShape = NullRegion;
-
-    pSprite->confined = FALSE;
-    pSprite->confineWin = (pWin == screenInfo.screens[0]->root) ? NullWindow : pWin;
-
-    CheckPhysLimits(pDev, pSprite->current, generateEvents, FALSE, NULL);
-}
-
-#endif  /* PANORAMIX */
-
-/**
- * Modifies the filter for the given protocol event type to the given masks.
- *
- * There's only two callers: UpdateDeviceState() and XI's SetMaskForExtEvent().
- * The latter initialises masks for the matching XI events, it's a once-off
- * setting.
- * UDS however changes the mask for MotionNotify and DeviceMotionNotify each
- * time a button is pressed to include the matching ButtonXMotion mask in the
- * filter.
- *
- * @param[in] deviceid The device to modify the filter for.
- * @param[in] mask The new filter mask.
- * @param[in] event Protocol event type.
- */
-void
-SetMaskForEvent(int deviceid, Mask mask, int event)
-{
-    if (deviceid < 0 || deviceid >= MAXDEVICES)
-        FatalError("SetMaskForEvent: bogus device id");
-    filters[deviceid][event] = mask;
-}
-
-void
-SetCriticalEvent(int event)
-{
-    if (event >= 128)
-	FatalError("SetCriticalEvent: bogus event number");
-    criticalEvents[event >> 3] |= 1 << (event & 7);
-}
-
-void
-ConfineToShape(DeviceIntPtr pDev, RegionPtr shape, int *px, int *py)
-{
-    BoxRec box;
-    int x = *px, y = *py;
-    int incx = 1, incy = 1;
-    SpritePtr pSprite;
-
-    pSprite = pDev->spriteInfo->sprite;
-    if (RegionContainsPoint(shape, x, y, &box))
-	return;
-    box = *RegionExtents(shape);
-    /* this is rather crude */
-    do {
-	x += incx;
-	if (x >= box.x2)
-	{
-	    incx = -1;
-	    x = *px - 1;
-	}
-	else if (x < box.x1)
-	{
-	    incx = 1;
-	    x = *px;
-	    y += incy;
-	    if (y >= box.y2)
-	    {
-		incy = -1;
-		y = *py - 1;
-	    }
-	    else if (y < box.y1)
-		return; /* should never get here! */
-	}
-    } while (!RegionContainsPoint(shape, x, y, &box));
-    *px = x;
-    *py = y;
-}
-
-static void
-CheckPhysLimits(
-    DeviceIntPtr pDev,
-    CursorPtr cursor,
-    Bool generateEvents,
-    Bool confineToScreen, /* unused if PanoramiX on */
-    ScreenPtr pScreen)    /* unused if PanoramiX on */
-{
-    HotSpot new;
-    SpritePtr pSprite = pDev->spriteInfo->sprite;
-
-    if (!cursor)
-	return;
-    new = pSprite->hotPhys;
-#ifdef PANORAMIX
-    if (!noPanoramiXExtension)
-        /* I don't care what the DDX has to say about it */
-        pSprite->physLimits = pSprite->hotLimits;
-    else
-#endif
-    {
-        if (pScreen)
-            new.pScreen = pScreen;
-        else
-            pScreen = new.pScreen;
-        (*pScreen->CursorLimits) (pDev, pScreen, cursor, &pSprite->hotLimits,
-                &pSprite->physLimits);
-        pSprite->confined = confineToScreen;
-        (* pScreen->ConstrainCursor)(pDev, pScreen, &pSprite->physLimits);
-    }
-
-    /* constrain the pointer to those limits */
-    if (new.x < pSprite->physLimits.x1)
-	new.x = pSprite->physLimits.x1;
-    else
-	if (new.x >= pSprite->physLimits.x2)
-	    new.x = pSprite->physLimits.x2 - 1;
-    if (new.y < pSprite->physLimits.y1)
-	new.y = pSprite->physLimits.y1;
-    else
-	if (new.y >= pSprite->physLimits.y2)
-	    new.y = pSprite->physLimits.y2 - 1;
-    if (pSprite->hotShape)
-	ConfineToShape(pDev, pSprite->hotShape, &new.x, &new.y);
-    if ((
-#ifdef PANORAMIX
-            noPanoramiXExtension &&
-#endif
-            (pScreen != pSprite->hotPhys.pScreen)) ||
-	(new.x != pSprite->hotPhys.x) || (new.y != pSprite->hotPhys.y))
-    {
-#ifdef PANORAMIX
-        if (!noPanoramiXExtension)
-        {
-            if (pScreen && ((new.x != pSprite->hotPhys.x) || (new.y != pSprite->hotPhys.y)))
-              XineramaSetCursorPosition (pDev, new.x, new.y, generateEvents);
-        }
-        else
-#endif
-        {
-            if (pScreen != pSprite->hotPhys.pScreen)
-                pSprite->hotPhys = new;
-            (*pScreen->SetCursorPosition)
-                (pDev, pScreen, new.x, new.y, generateEvents);
-        }
-        if (!generateEvents)
-            SyntheticMotion(pDev, new.x, new.y);
-    }
-
-#ifdef PANORAMIX
-    /* Tell DDX what the limits are */
-    if (!noPanoramiXExtension)
-        XineramaConstrainCursor(pDev);
-#endif
-}
-
-static void
-CheckVirtualMotion(
-    DeviceIntPtr pDev,
-    QdEventPtr qe,
-    WindowPtr pWin)
-{
-    SpritePtr pSprite = pDev->spriteInfo->sprite;
-    RegionPtr reg = NULL;
-    DeviceEvent *ev = NULL;
-
-    if (qe)
-    {
-        ev = &qe->event->device_event;
-        switch(ev->type)
-        {
-            case ET_Motion:
-            case ET_ButtonPress:
-            case ET_ButtonRelease:
-            case ET_KeyPress:
-            case ET_KeyRelease:
-            case ET_ProximityIn:
-            case ET_ProximityOut:
-                pSprite->hot.pScreen = qe->pScreen;
-                pSprite->hot.x = ev->root_x;
-                pSprite->hot.y = ev->root_y;
-                pWin = pDev->deviceGrab.grab ? pDev->deviceGrab.grab->confineTo : NullWindow;
-                break;
-            default:
-                break;
-        }
-    }
-    if (pWin)
-    {
-	BoxRec lims;
-
-#ifdef PANORAMIX
-        if (!noPanoramiXExtension) {
-            int x, y, off_x, off_y, i;
-
-            if(!XineramaSetWindowPntrs(pDev, pWin))
-                return;
-
-            i = PanoramiXNumScreens - 1;
-
-            RegionCopy(&pSprite->Reg2,
-                    &pSprite->windows[i]->borderSize);
-            off_x = screenInfo.screens[i]->x;
-            off_y = screenInfo.screens[i]->y;
-
-            while(i--) {
-                x = off_x - screenInfo.screens[i]->x;
-                y = off_y - screenInfo.screens[i]->y;
-
-                if(x || y)
-                    RegionTranslate(&pSprite->Reg2, x, y);
-
-                RegionUnion(&pSprite->Reg2, &pSprite->Reg2,
-                        &pSprite->windows[i]->borderSize);
-
-                off_x = screenInfo.screens[i]->x;
-                off_y = screenInfo.screens[i]->y;
-            }
-        } else
-#endif
-        {
-            if (pSprite->hot.pScreen != pWin->drawable.pScreen)
-            {
-                pSprite->hot.pScreen = pWin->drawable.pScreen;
-                pSprite->hot.x = pSprite->hot.y = 0;
-            }
-        }
-
-	lims = *RegionExtents(&pWin->borderSize);
-	if (pSprite->hot.x < lims.x1)
-	    pSprite->hot.x = lims.x1;
-	else if (pSprite->hot.x >= lims.x2)
-	    pSprite->hot.x = lims.x2 - 1;
-	if (pSprite->hot.y < lims.y1)
-	    pSprite->hot.y = lims.y1;
-	else if (pSprite->hot.y >= lims.y2)
-	    pSprite->hot.y = lims.y2 - 1;
-
-#ifdef PANORAMIX
-        if (!noPanoramiXExtension)
-        {
-            if (RegionNumRects(&pSprite->Reg2) > 1)
-                reg = &pSprite->Reg2;
-
-        } else
-#endif
-        {
-            if (wBoundingShape(pWin))
-                reg = &pWin->borderSize;
-        }
-
-        if (reg)
-            ConfineToShape(pDev, reg, &pSprite->hot.x, &pSprite->hot.y);
-
-	if (qe && ev)
-	{
-	    qe->pScreen = pSprite->hot.pScreen;
-	    ev->root_x = pSprite->hot.x;
-	    ev->root_y = pSprite->hot.y;
-	}
-    }
-#ifdef PANORAMIX
-    if (noPanoramiXExtension) /* No typo. Only set the root win if disabled */
-#endif
-        RootWindow(pDev->spriteInfo->sprite) = pSprite->hot.pScreen->root;
-}
-
-static void
-ConfineCursorToWindow(DeviceIntPtr pDev, WindowPtr pWin, Bool generateEvents, Bool confineToScreen)
-{
-    SpritePtr pSprite = pDev->spriteInfo->sprite;
-
-    if (syncEvents.playingEvents)
-    {
-	CheckVirtualMotion(pDev, (QdEventPtr)NULL, pWin);
-	SyntheticMotion(pDev, pSprite->hot.x, pSprite->hot.y);
-    }
-    else
-    {
-#ifdef PANORAMIX
-        if(!noPanoramiXExtension) {
-            XineramaConfineCursorToWindow(pDev, pWin, generateEvents);
-            return;
-        }
-#endif
-	pSprite->hotLimits = *RegionExtents(&pWin->borderSize);
-	pSprite->hotShape = wBoundingShape(pWin) ? &pWin->borderSize
-					       : NullRegion;
-        CheckPhysLimits(pDev, pSprite->current, generateEvents,
-                        confineToScreen, pWin->drawable.pScreen);
-    }
-}
-
-Bool
-PointerConfinedToScreen(DeviceIntPtr pDev)
-{
-    return pDev->spriteInfo->sprite->confined;
-}
-
-/**
- * Update the sprite cursor to the given cursor.
- *
- * ChangeToCursor() will display the new cursor and free the old cursor (if
- * applicable). If the provided cursor is already the updated cursor, nothing
- * happens.
- */
-static void
-ChangeToCursor(DeviceIntPtr pDev, CursorPtr cursor)
-{
-    SpritePtr pSprite = pDev->spriteInfo->sprite;
-    ScreenPtr pScreen;
-
-    if (cursor != pSprite->current)
-    {
-	if ((pSprite->current->bits->xhot != cursor->bits->xhot) ||
-		(pSprite->current->bits->yhot != cursor->bits->yhot))
-	    CheckPhysLimits(pDev, cursor, FALSE, pSprite->confined,
-			    (ScreenPtr)NULL);
-#ifdef PANORAMIX
-        /* XXX: is this really necessary?? (whot) */
-        if (!noPanoramiXExtension)
-            pScreen = pSprite->screen;
-        else
-#endif
-            pScreen = pSprite->hotPhys.pScreen;
-
-        (*pScreen->DisplayCursor)(pDev, pScreen, cursor);
-	FreeCursor(pSprite->current, (Cursor)0);
-	pSprite->current = cursor;
-	pSprite->current->refcnt++;
-    }
-}
-
-/**
- * @returns true if b is a descendent of a
- */
-Bool
-IsParent(WindowPtr a, WindowPtr b)
-{
-    for (b = b->parent; b; b = b->parent)
-	if (b == a) return TRUE;
-    return FALSE;
-}
-
-/**
- * Update the cursor displayed on the screen.
- *
- * Called whenever a cursor may have changed shape or position.
- */
-static void
-PostNewCursor(DeviceIntPtr pDev)
-{
-    WindowPtr win;
-    GrabPtr grab = pDev->deviceGrab.grab;
-    SpritePtr   pSprite = pDev->spriteInfo->sprite;
-    CursorPtr   pCursor;
-
-    if (syncEvents.playingEvents)
-	return;
-    if (grab)
-    {
-	if (grab->cursor)
-	{
-	    ChangeToCursor(pDev, grab->cursor);
-	    return;
-	}
-	if (IsParent(grab->window, pSprite->win))
-	    win = pSprite->win;
-	else
-	    win = grab->window;
-    }
-    else
-	win = pSprite->win;
-    for (; win; win = win->parent)
-    {
-	if (win->optional)
-        {
-            pCursor = WindowGetDeviceCursor(win, pDev);
-            if (!pCursor && win->optional->cursor != NullCursor)
-                pCursor = win->optional->cursor;
-            if (pCursor)
-            {
-                ChangeToCursor(pDev, pCursor);
-                return;
-            }
-	}
-    }
-}
-
-
-/**
- * @param dev device which you want to know its current root window
- * @return root window where dev's sprite is located
- */
-WindowPtr
-GetCurrentRootWindow(DeviceIntPtr dev)
-{
-    return RootWindow(dev->spriteInfo->sprite);
-}
-
-/**
- * @return window underneath the cursor sprite.
- */
-WindowPtr
-GetSpriteWindow(DeviceIntPtr pDev)
-{
-    return pDev->spriteInfo->sprite->win;
-}
-
-/**
- * @return current sprite cursor.
- */
-CursorPtr
-GetSpriteCursor(DeviceIntPtr pDev)
-{
-    return pDev->spriteInfo->sprite->current;
-}
-
-/**
- * Set x/y current sprite position in screen coordinates.
- */
-void
-GetSpritePosition(DeviceIntPtr pDev, int *px, int *py)
-{
-    SpritePtr pSprite = pDev->spriteInfo->sprite;
-    *px = pSprite->hotPhys.x;
-    *py = pSprite->hotPhys.y;
-}
-
-#ifdef PANORAMIX
-int
-XineramaGetCursorScreen(DeviceIntPtr pDev)
-{
-    if(!noPanoramiXExtension) {
-	return pDev->spriteInfo->sprite->screen->myNum;
-    } else {
-	return 0;
-    }
-}
-#endif /* PANORAMIX */
-
-#define TIMESLOP (5 * 60 * 1000) /* 5 minutes */
-
-static void
-MonthChangedOrBadTime(InternalEvent *ev)
-{
-    /* If the ddx/OS is careless about not processing timestamped events from
-     * different sources in sorted order, then it's possible for time to go
-     * backwards when it should not.  Here we ensure a decent time.
-     */
-    if ((currentTime.milliseconds - ev->any.time) > TIMESLOP)
-	currentTime.months++;
-    else
-        ev->any.time = currentTime.milliseconds;
-}
-
-static void
-NoticeTime(InternalEvent *ev)
-{
-    if (ev->any.time < currentTime.milliseconds)
-        MonthChangedOrBadTime(ev);
-    currentTime.milliseconds = ev->any.time;
-    lastDeviceEventTime = currentTime;
-}
-
-void
-NoticeEventTime(InternalEvent *ev)
-{
-    if (!syncEvents.playingEvents)
-	NoticeTime(ev);
-}
-
-/**************************************************************************
- *            The following procedures deal with synchronous events       *
- **************************************************************************/
-
-/**
- * EnqueueEvent is a device's processInputProc if a device is frozen.
- * Instead of delivering the events to the client, the event is tacked onto a
- * linked list for later delivery.
- */
-void
-EnqueueEvent(InternalEvent *ev, DeviceIntPtr device)
-{
-    QdEventPtr	tail = *syncEvents.pendtail;
-    QdEventPtr	qe;
-    SpritePtr	pSprite = device->spriteInfo->sprite;
-    int		eventlen;
-    DeviceEvent *event = &ev->device_event;
-
-    NoticeTime((InternalEvent*)event);
-
-    /* Fix for key repeating bug. */
-    if (device->key != NULL && device->key->xkbInfo != NULL &&
-        event->type == ET_KeyRelease)
-	AccessXCancelRepeatKey(device->key->xkbInfo, event->detail.key);
-
-    if (DeviceEventCallback)
-    {
-	DeviceEventInfoRec eventinfo;
-
-	/*  The RECORD spec says that the root window field of motion events
-	 *  must be valid.  At this point, it hasn't been filled in yet, so
-	 *  we do it here.  The long expression below is necessary to get
-	 *  the current root window; the apparently reasonable alternative
-	 *  GetCurrentRootWindow()->drawable.id doesn't give you the right
-	 *  answer on the first motion event after a screen change because
-	 *  the data that GetCurrentRootWindow relies on hasn't been
-	 *  updated yet.
-	 */
-	if (ev->any.type == ET_Motion)
-	    ev->device_event.root = pSprite->hotPhys.pScreen->root->drawable.id;
-
-	eventinfo.event = ev;
-	eventinfo.device = device;
-	CallCallbacks(&DeviceEventCallback, (pointer)&eventinfo);
-    }
-
-    if (event->type == ET_Motion)
-    {
-#ifdef PANORAMIX
-	if(!noPanoramiXExtension) {
-	    event->root_x += pSprite->screen->x - screenInfo.screens[0]->x;
-	    event->root_y += pSprite->screen->y - screenInfo.screens[0]->y;
-	}
-#endif
-	pSprite->hotPhys.x = event->root_x;
-	pSprite->hotPhys.y = event->root_y;
-	/* do motion compression, but not if from different devices */
-	if (tail &&
-	    (tail->event->any.type == ET_Motion) &&
-            (tail->device == device) &&
-	    (tail->pScreen == pSprite->hotPhys.pScreen))
-	{
-            DeviceEvent *tailev = &tail->event->device_event;
-	    tailev->root_x = pSprite->hotPhys.x;
-	    tailev->root_y = pSprite->hotPhys.y;
-	    tailev->time = event->time;
-	    tail->months = currentTime.months;
-	    return;
-	}
-    }
-
-    eventlen = event->length;
-
-    qe = malloc(sizeof(QdEventRec) + eventlen);
-    if (!qe)
-	return;
-    qe->next = (QdEventPtr)NULL;
-    qe->device = device;
-    qe->pScreen = pSprite->hotPhys.pScreen;
-    qe->months = currentTime.months;
-    qe->event = (InternalEvent *)(qe + 1);
-    memcpy(qe->event, event, eventlen);
-    if (tail)
-	syncEvents.pendtail = &tail->next;
-    *syncEvents.pendtail = qe;
-}
-
-/**
- * Run through the list of events queued up in syncEvents.
- * For each event do:
- * If the device for this event is not frozen anymore, take it and process it
- * as usually.
- * After that, check if there's any devices in the list that are not frozen.
- * If there is none, we're done. If there is at least one device that is not
- * frozen, then re-run from the beginning of the event queue.
- */
-static void
-PlayReleasedEvents(void)
-{
-    QdEventPtr *prev, qe;
-    DeviceIntPtr dev;
-    DeviceIntPtr pDev;
-
-    prev = &syncEvents.pending;
-    while ( (qe = *prev) )
-    {
-	if (!qe->device->deviceGrab.sync.frozen)
-	{
-	    *prev = qe->next;
-            pDev = qe->device;
-	    if (*syncEvents.pendtail == *prev)
-		syncEvents.pendtail = prev;
-	    if (qe->event->any.type == ET_Motion)
-		CheckVirtualMotion(pDev, qe, NullWindow);
-	    syncEvents.time.months = qe->months;
-            syncEvents.time.milliseconds = qe->event->any.time;
-#ifdef PANORAMIX
-	   /* Translate back to the sprite screen since processInputProc
-	      will translate from sprite screen to screen 0 upon reentry
-	      to the DIX layer */
-	    if(!noPanoramiXExtension) {
-                DeviceEvent *ev = &qe->event->device_event;
-                switch(ev->type)
-                {
-                    case ET_Motion:
-                    case ET_ButtonPress:
-                    case ET_ButtonRelease:
-                    case ET_KeyPress:
-                    case ET_KeyRelease:
-                    case ET_ProximityIn:
-                    case ET_ProximityOut:
-                        ev->root_x += screenInfo.screens[0]->x -
-                            pDev->spriteInfo->sprite->screen->x;
-                        ev->root_y += screenInfo.screens[0]->y -
-                            pDev->spriteInfo->sprite->screen->y;
-                        break;
-                    default:
-                        break;
-                }
-
-	    }
-#endif
-	    (*qe->device->public.processInputProc)(qe->event, qe->device);
-	    free(qe);
-	    for (dev = inputInfo.devices; dev && dev->deviceGrab.sync.frozen; dev = dev->next)
-		;
-	    if (!dev)
-		break;
-	    /* Playing the event may have unfrozen another device. */
-	    /* So to play it safe, restart at the head of the queue */
-	    prev = &syncEvents.pending;
-	}
-	else
-	    prev = &qe->next;
-    }
-}
-
-/**
- * Freeze or thaw the given devices. The device's processing proc is
- * switched to either the real processing proc (in case of thawing) or an
- * enqueuing processing proc (usually EnqueueEvent()).
- *
- * @param dev The device to freeze/thaw
- * @param frozen True to freeze or false to thaw.
- */
-static void
-FreezeThaw(DeviceIntPtr dev, Bool frozen)
-{
-    dev->deviceGrab.sync.frozen = frozen;
-    if (frozen)
-	dev->public.processInputProc = dev->public.enqueueInputProc;
-    else
-	dev->public.processInputProc = dev->public.realInputProc;
-}
-
-/**
- * Unfreeze devices and replay all events to the respective clients.
- *
- * ComputeFreezes takes the first event in the device's frozen event queue. It
- * runs up the sprite tree (spriteTrace) and searches for the window to replay
- * the events from. If it is found, it checks for passive grabs one down from
- * the window or delivers the events.
- */
-static void
-ComputeFreezes(void)
-{
-    DeviceIntPtr replayDev = syncEvents.replayDev;
-    WindowPtr w;
-    GrabPtr grab;
-    DeviceIntPtr dev;
-
-    for (dev = inputInfo.devices; dev; dev = dev->next)
-	FreezeThaw(dev, dev->deviceGrab.sync.other ||
-                (dev->deviceGrab.sync.state >= FROZEN));
-    if (syncEvents.playingEvents || (!replayDev && !syncEvents.pending))
-	return;
-    syncEvents.playingEvents = TRUE;
-    if (replayDev)
-    {
-        DeviceEvent* event = replayDev->deviceGrab.sync.event;
-
-	syncEvents.replayDev = (DeviceIntPtr)NULL;
-
-        w = XYToWindow(replayDev->spriteInfo->sprite,
-                       event->root_x, event->root_y);
-        if (!CheckDeviceGrabs(replayDev, event, syncEvents.replayWin))
-        {
-            if (replayDev->focus && !IsPointerEvent((InternalEvent*)event))
-                DeliverFocusedEvent(replayDev, (InternalEvent*)event, w);
-            else
-                DeliverDeviceEvents(w, (InternalEvent*)event, NullGrab,
-                                    NullWindow, replayDev);
-        }
-    }
-    for (dev = inputInfo.devices; dev; dev = dev->next)
-    {
-	if (!dev->deviceGrab.sync.frozen)
-	{
-	    PlayReleasedEvents();
-	    break;
-	}
-    }
-    syncEvents.playingEvents = FALSE;
-    for (dev = inputInfo.devices; dev; dev = dev->next)
-    {
-        if (DevHasCursor(dev))
-        {
-            /* the following may have been skipped during replay,
-              so do it now */
-            if ((grab = dev->deviceGrab.grab) && grab->confineTo)
-            {
-                if (grab->confineTo->drawable.pScreen !=
-                        dev->spriteInfo->sprite->hotPhys.pScreen)
-                    dev->spriteInfo->sprite->hotPhys.x =
-                        dev->spriteInfo->sprite->hotPhys.y = 0;
-                ConfineCursorToWindow(dev, grab->confineTo, TRUE, TRUE);
-            }
-            else
-                ConfineCursorToWindow(dev,
-                        dev->spriteInfo->sprite->hotPhys.pScreen->root,
-                        TRUE, FALSE);
-            PostNewCursor(dev);
-        }
-    }
-}
-
-#ifdef RANDR
-void
-ScreenRestructured (ScreenPtr pScreen)
-{
-    GrabPtr grab;
-    DeviceIntPtr pDev;
-
-    for (pDev = inputInfo.devices; pDev; pDev = pDev->next)
-    {
-        if (!DevHasCursor(pDev))
-            continue;
-
-        /* GrabDevice doesn't have a confineTo field, so we don't need to
-         * worry about it. */
-        if ((grab = pDev->deviceGrab.grab) && grab->confineTo)
-        {
-            if (grab->confineTo->drawable.pScreen
-                    != pDev->spriteInfo->sprite->hotPhys.pScreen)
-                pDev->spriteInfo->sprite->hotPhys.x = pDev->spriteInfo->sprite->hotPhys.y = 0;
-            ConfineCursorToWindow(pDev, grab->confineTo, TRUE, TRUE);
-        }
-        else
-            ConfineCursorToWindow(pDev,
-                    pDev->spriteInfo->sprite->hotPhys.pScreen->root,
-                    TRUE, FALSE);
-    }
-}
-#endif
-
-static void
-CheckGrabForSyncs(DeviceIntPtr thisDev, Bool thisMode, Bool otherMode)
-{
-    GrabPtr grab = thisDev->deviceGrab.grab;
-    DeviceIntPtr dev;
-
-    if (thisMode == GrabModeSync)
-	thisDev->deviceGrab.sync.state = FROZEN_NO_EVENT;
-    else
-    {	/* free both if same client owns both */
-	thisDev->deviceGrab.sync.state = THAWED;
-	if (thisDev->deviceGrab.sync.other &&
-	    (CLIENT_BITS(thisDev->deviceGrab.sync.other->resource) ==
-	     CLIENT_BITS(grab->resource)))
-	    thisDev->deviceGrab.sync.other = NullGrab;
-    }
-
-    if (IsMaster(thisDev))
-    {
-        dev = GetPairedDevice(thisDev);
-        if (otherMode == GrabModeSync)
-            dev->deviceGrab.sync.other = grab;
-        else
-        {	/* free both if same client owns both */
-            if (dev->deviceGrab.sync.other &&
-                    (CLIENT_BITS(dev->deviceGrab.sync.other->resource) ==
-                     CLIENT_BITS(grab->resource)))
-                dev->deviceGrab.sync.other = NullGrab;
-        }
-    }
-    ComputeFreezes();
-}
-
-/**
- * Save the device's master device id. This needs to be done
- * if a client directly grabs a slave device that is attached to a master. For
- * the duration of the grab, the device is detached, ungrabbing re-attaches it
- * though.
- *
- * We store the ID of the master device only in case the master disappears
- * while the device has a grab.
- */
-static void
-DetachFromMaster(DeviceIntPtr dev)
-{
-    if (!dev->u.master)
-        return;
-
-    dev->saved_master_id = dev->u.master->id;
-
-    AttachDevice(NULL, dev, NULL);
-}
-
-static void
-ReattachToOldMaster(DeviceIntPtr dev)
-{
-    DeviceIntPtr master = NULL;
-
-    if (IsMaster(dev))
-        return;
-
-    dixLookupDevice(&master, dev->saved_master_id, serverClient, DixUseAccess);
-
-    if (master)
-    {
-        AttachDevice(serverClient, dev, master);
-	dev->saved_master_id = 0;
-    }
-}
-
-/**
- * Activate a pointer grab on the given device. A pointer grab will cause all
- * core pointer events of this device to be delivered to the grabbing client only.
- * No other device will send core events to the grab client while the grab is
- * on, but core events will be sent to other clients.
- * Can cause the cursor to change if a grab cursor is set.
- *
- * Note that parameter autoGrab may be (True & ImplicitGrabMask) if the grab
- * is an implicit grab caused by a ButtonPress event.
- *
- * @param mouse The device to grab.
- * @param grab The grab structure, needs to be setup.
- * @param autoGrab True if the grab was caused by a button down event and not
- * explicitely by a client.
- */
-void
-ActivatePointerGrab(DeviceIntPtr mouse, GrabPtr grab,
-                    TimeStamp time, Bool autoGrab)
-{
-    GrabInfoPtr grabinfo = &mouse->deviceGrab;
-    WindowPtr oldWin = (grabinfo->grab) ?
-                        grabinfo->grab->window
-                        : mouse->spriteInfo->sprite->win;
-    Bool isPassive = autoGrab & ~ImplicitGrabMask;
-
-    /* slave devices need to float for the duration of the grab. */
-    if (grab->grabtype == GRABTYPE_XI2 &&
-        !(autoGrab & ImplicitGrabMask) && !IsMaster(mouse))
-        DetachFromMaster(mouse);
-
-    if (grab->confineTo)
-    {
-	if (grab->confineTo->drawable.pScreen
-                != mouse->spriteInfo->sprite->hotPhys.pScreen)
-	    mouse->spriteInfo->sprite->hotPhys.x =
-                mouse->spriteInfo->sprite->hotPhys.y = 0;
-	ConfineCursorToWindow(mouse, grab->confineTo, FALSE, TRUE);
-    }
-    DoEnterLeaveEvents(mouse, mouse->id, oldWin, grab->window, NotifyGrab);
-    mouse->valuator->motionHintWindow = NullWindow;
-    if (syncEvents.playingEvents)
-        grabinfo->grabTime = syncEvents.time;
-    else
-	grabinfo->grabTime = time;
-    if (grab->cursor)
-	grab->cursor->refcnt++;
-    grabinfo->activeGrab = *grab;
-    grabinfo->grab = &grabinfo->activeGrab;
-    grabinfo->fromPassiveGrab = isPassive;
-    grabinfo->implicitGrab = autoGrab & ImplicitGrabMask;
-    PostNewCursor(mouse);
-    CheckGrabForSyncs(mouse,(Bool)grab->pointerMode, (Bool)grab->keyboardMode);
-}
-
-/**
- * Delete grab on given device, update the sprite.
- *
- * Extension devices are set up for ActivateKeyboardGrab().
- */
-void
-DeactivatePointerGrab(DeviceIntPtr mouse)
-{
-    GrabPtr grab = mouse->deviceGrab.grab;
-    DeviceIntPtr dev;
-    Bool wasImplicit = (mouse->deviceGrab.fromPassiveGrab &&
-                        mouse->deviceGrab.implicitGrab);
-
-    mouse->valuator->motionHintWindow = NullWindow;
-    mouse->deviceGrab.grab = NullGrab;
-    mouse->deviceGrab.sync.state = NOT_GRABBED;
-    mouse->deviceGrab.fromPassiveGrab = FALSE;
-
-    for (dev = inputInfo.devices; dev; dev = dev->next)
-    {
-	if (dev->deviceGrab.sync.other == grab)
-	    dev->deviceGrab.sync.other = NullGrab;
-    }
-    DoEnterLeaveEvents(mouse, mouse->id, grab->window,
-                       mouse->spriteInfo->sprite->win, NotifyUngrab);
-    if (grab->confineTo)
-	ConfineCursorToWindow(mouse, GetCurrentRootWindow(mouse), FALSE, FALSE);
-    PostNewCursor(mouse);
-    if (grab->cursor)
-	FreeCursor(grab->cursor, (Cursor)0);
-
-    if (!wasImplicit && grab->grabtype == GRABTYPE_XI2)
-        ReattachToOldMaster(mouse);
-
-    ComputeFreezes();
-}
-
-/**
- * Activate a keyboard grab on the given device.
- *
- * Extension devices have ActivateKeyboardGrab() set as their grabbing proc.
- */
-void
-ActivateKeyboardGrab(DeviceIntPtr keybd, GrabPtr grab, TimeStamp time, Bool passive)
-{
-    GrabInfoPtr grabinfo = &keybd->deviceGrab;
-    WindowPtr oldWin;
-
-    /* slave devices need to float for the duration of the grab. */
-    if (grab->grabtype == GRABTYPE_XI2 &&
-        !(passive & ImplicitGrabMask) &&
-        !IsMaster(keybd))
-        DetachFromMaster(keybd);
-
-    if (grabinfo->grab)
-	oldWin = grabinfo->grab->window;
-    else if (keybd->focus)
-	oldWin = keybd->focus->win;
-    else
-	oldWin = keybd->spriteInfo->sprite->win;
-    if (oldWin == FollowKeyboardWin)
-	oldWin = keybd->focus->win;
-    if (keybd->valuator)
-	keybd->valuator->motionHintWindow = NullWindow;
-    DoFocusEvents(keybd, oldWin, grab->window, NotifyGrab);
-    if (syncEvents.playingEvents)
-	grabinfo->grabTime = syncEvents.time;
-    else
-	grabinfo->grabTime = time;
-    grabinfo->activeGrab = *grab;
-    grabinfo->grab = &grabinfo->activeGrab;
-    grabinfo->fromPassiveGrab = passive;
-    grabinfo->implicitGrab = passive & ImplicitGrabMask;
-    CheckGrabForSyncs(keybd, (Bool)grab->keyboardMode, (Bool)grab->pointerMode);
-}
-
-/**
- * Delete keyboard grab for the given device.
- */
-void
-DeactivateKeyboardGrab(DeviceIntPtr keybd)
-{
-    GrabPtr grab = keybd->deviceGrab.grab;
-    DeviceIntPtr dev;
-    WindowPtr focusWin = keybd->focus ? keybd->focus->win
-                                           : keybd->spriteInfo->sprite->win;
-    Bool wasImplicit = (keybd->deviceGrab.fromPassiveGrab &&
-                        keybd->deviceGrab.implicitGrab);
-
-    if (focusWin == FollowKeyboardWin)
-	focusWin = inputInfo.keyboard->focus->win;
-    if (keybd->valuator)
-	keybd->valuator->motionHintWindow = NullWindow;
-    keybd->deviceGrab.grab = NullGrab;
-    keybd->deviceGrab.sync.state = NOT_GRABBED;
-    keybd->deviceGrab.fromPassiveGrab = FALSE;
-
-    for (dev = inputInfo.devices; dev; dev = dev->next)
-    {
-	if (dev->deviceGrab.sync.other == grab)
-	    dev->deviceGrab.sync.other = NullGrab;
-    }
-    DoFocusEvents(keybd, grab->window, focusWin, NotifyUngrab);
-
-    if (!wasImplicit && grab->grabtype == GRABTYPE_XI2)
-        ReattachToOldMaster(keybd);
-
-    ComputeFreezes();
-}
-
-void
-AllowSome(ClientPtr client,
-          TimeStamp time,
-          DeviceIntPtr thisDev,
-          int newState)
-{
-    Bool thisGrabbed, otherGrabbed, othersFrozen, thisSynced;
-    TimeStamp grabTime;
-    DeviceIntPtr dev;
-    GrabInfoPtr devgrabinfo,
-                grabinfo = &thisDev->deviceGrab;
-
-    thisGrabbed = grabinfo->grab && SameClient(grabinfo->grab, client);
-    thisSynced = FALSE;
-    otherGrabbed = FALSE;
-    othersFrozen = FALSE;
-    grabTime = grabinfo->grabTime;
-    for (dev = inputInfo.devices; dev; dev = dev->next)
-    {
-        devgrabinfo = &dev->deviceGrab;
-
-	if (dev == thisDev)
-	    continue;
-	if (devgrabinfo->grab && SameClient(devgrabinfo->grab, client))
-	{
-	    if (!(thisGrabbed || otherGrabbed) ||
-		(CompareTimeStamps(devgrabinfo->grabTime, grabTime) == LATER))
-		grabTime = devgrabinfo->grabTime;
-	    otherGrabbed = TRUE;
-	    if (grabinfo->sync.other == devgrabinfo->grab)
-		thisSynced = TRUE;
-	    if (devgrabinfo->sync.state >= FROZEN)
-		othersFrozen = TRUE;
-	}
-    }
-    if (!((thisGrabbed && grabinfo->sync.state >= FROZEN) || thisSynced))
-	return;
-    if ((CompareTimeStamps(time, currentTime) == LATER) ||
-	(CompareTimeStamps(time, grabTime) == EARLIER))
-	return;
-    switch (newState)
-    {
-	case THAWED:		       /* Async */
-	    if (thisGrabbed)
-		grabinfo->sync.state = THAWED;
-	    if (thisSynced)
-		grabinfo->sync.other = NullGrab;
-	    ComputeFreezes();
-	    break;
-	case FREEZE_NEXT_EVENT:		/* Sync */
-	    if (thisGrabbed)
-	    {
-		grabinfo->sync.state = FREEZE_NEXT_EVENT;
-		if (thisSynced)
-		    grabinfo->sync.other = NullGrab;
-		ComputeFreezes();
-	    }
-	    break;
-	case THAWED_BOTH:		/* AsyncBoth */
-	    if (othersFrozen)
-	    {
-		for (dev = inputInfo.devices; dev; dev = dev->next)
-		{
-                    devgrabinfo = &dev->deviceGrab;
-		    if (devgrabinfo->grab
-                            && SameClient(devgrabinfo->grab, client))
-			devgrabinfo->sync.state = THAWED;
-		    if (devgrabinfo->sync.other &&
-                            SameClient(devgrabinfo->sync.other, client))
-			devgrabinfo->sync.other = NullGrab;
-		}
-		ComputeFreezes();
-	    }
-	    break;
-	case FREEZE_BOTH_NEXT_EVENT:	/* SyncBoth */
-	    if (othersFrozen)
-	    {
-		for (dev = inputInfo.devices; dev; dev = dev->next)
-		{
-                    devgrabinfo = &dev->deviceGrab;
-		    if (devgrabinfo->grab
-                            && SameClient(devgrabinfo->grab, client))
-			devgrabinfo->sync.state = FREEZE_BOTH_NEXT_EVENT;
-		    if (devgrabinfo->sync.other
-                            && SameClient(devgrabinfo->sync.other, client))
-			devgrabinfo->sync.other = NullGrab;
-		}
-		ComputeFreezes();
-	    }
-	    break;
-	case NOT_GRABBED:		/* Replay */
-	    if (thisGrabbed && grabinfo->sync.state == FROZEN_WITH_EVENT)
-	    {
-		if (thisSynced)
-		    grabinfo->sync.other = NullGrab;
-		syncEvents.replayDev = thisDev;
-		syncEvents.replayWin = grabinfo->grab->window;
-		(*grabinfo->DeactivateGrab)(thisDev);
-		syncEvents.replayDev = (DeviceIntPtr)NULL;
-	    }
-	    break;
-	case THAW_OTHERS:		/* AsyncOthers */
-	    if (othersFrozen)
-	    {
-		for (dev = inputInfo.devices; dev; dev = dev->next)
-		{
-		    if (dev == thisDev)
-			continue;
-                    devgrabinfo = &dev->deviceGrab;
-		    if (devgrabinfo->grab
-                            && SameClient(devgrabinfo->grab, client))
-			devgrabinfo->sync.state = THAWED;
-		    if (devgrabinfo->sync.other
-                            && SameClient(devgrabinfo->sync.other, client))
-			devgrabinfo->sync.other = NullGrab;
-		}
-		ComputeFreezes();
-	    }
-	    break;
-    }
-}
-
-/**
- * Server-side protocol handling for AllowEvents request.
- *
- * Release some events from a frozen device.
- */
-int
-ProcAllowEvents(ClientPtr client)
-{
-    TimeStamp		time;
-    DeviceIntPtr	mouse = NULL;
-    DeviceIntPtr	keybd = NULL;
-    REQUEST(xAllowEventsReq);
-
-    REQUEST_SIZE_MATCH(xAllowEventsReq);
-    time = ClientTimeToServerTime(stuff->time);
-
-    mouse = PickPointer(client);
-    keybd = PickKeyboard(client);
-
-    switch (stuff->mode)
-    {
-	case ReplayPointer:
-	    AllowSome(client, time, mouse, NOT_GRABBED);
-	    break;
-	case SyncPointer:
-	    AllowSome(client, time, mouse, FREEZE_NEXT_EVENT);
-	    break;
-	case AsyncPointer:
-	    AllowSome(client, time, mouse, THAWED);
-	    break;
-	case ReplayKeyboard:
-	    AllowSome(client, time, keybd, NOT_GRABBED);
-	    break;
-	case SyncKeyboard:
-	    AllowSome(client, time, keybd, FREEZE_NEXT_EVENT);
-	    break;
-	case AsyncKeyboard:
-	    AllowSome(client, time, keybd, THAWED);
-	    break;
-	case SyncBoth:
-	    AllowSome(client, time, keybd, FREEZE_BOTH_NEXT_EVENT);
-	    break;
-	case AsyncBoth:
-	    AllowSome(client, time, keybd, THAWED_BOTH);
-	    break;
-	default:
-	    client->errorValue = stuff->mode;
-	    return BadValue;
-    }
-    return Success;
-}
-
-/**
- * Deactivate grabs from any device that has been grabbed by the client.
- */
-void
-ReleaseActiveGrabs(ClientPtr client)
-{
-    DeviceIntPtr dev;
-    Bool    done;
-
-    /* XXX CloseDownClient should remove passive grabs before
-     * releasing active grabs.
-     */
-    do {
-	done = TRUE;
-	for (dev = inputInfo.devices; dev; dev = dev->next)
-	{
-	    if (dev->deviceGrab.grab && SameClient(dev->deviceGrab.grab, client))
-	    {
-		(*dev->deviceGrab.DeactivateGrab)(dev);
-		done = FALSE;
-	    }
-	}
-    } while (!done);
-}
-
-/**************************************************************************
- *            The following procedures deal with delivering events        *
- **************************************************************************/
-
-/**
- * Deliver the given events to the given client.
- *
- * More than one event may be delivered at a time. This is the case with
- * DeviceMotionNotifies which may be followed by DeviceValuator events.
- *
- * TryClientEvents() is the last station before actually writing the events to
- * the socket. Anything that is not filtered here, will get delivered to the
- * client.
- * An event is only delivered if
- *   - mask and filter match up.
- *   - no other client has a grab on the device that caused the event.
- *
- *
- * @param client The target client to deliver to.
- * @param dev The device the event came from. May be NULL.
- * @param pEvents The events to be delivered.
- * @param count Number of elements in pEvents.
- * @param mask Event mask as set by the window.
- * @param filter Mask based on event type.
- * @param grab Possible grab on the device that caused the event.
- *
- * @return 1 if event was delivered, 0 if not or -1 if grab was not set by the
- * client.
- */
-int
-TryClientEvents (ClientPtr client, DeviceIntPtr dev, xEvent *pEvents,
-                 int count, Mask mask, Mask filter, GrabPtr grab)
-{
-    int type;
-
-#ifdef DEBUG_EVENTS
-    ErrorF("[dix] Event([%d, %d], mask=0x%lx), client=%d%s",
-           pEvents->u.u.type, pEvents->u.u.detail, mask,
-           client ? client->index : -1,
-           (client && client->clientGone) ? " (gone)" : "");
-#endif
-
-    if (!client || client == serverClient || client->clientGone) {
-#ifdef DEBUG_EVENTS
-        ErrorF(" not delivered to fake/dead client\n");
-#endif
-        return 0;
-    }
-
-    if (filter != CantBeFiltered && !(mask & filter))
-    {
- #ifdef DEBUG_EVENTS
-        ErrorF(" filtered\n");
- #endif
-        return 0;
-    }
-
-    if (grab && !SameClient(grab, client))
-    {
-#ifdef DEBUG_EVENTS
-        ErrorF(" not delivered due to grab\n");
-#endif
-        return -1; /* don't send, but notify caller */
-    }
-
-    type = pEvents->u.u.type;
-    if (type == MotionNotify)
-    {
-        if (mask & PointerMotionHintMask)
-        {
-            if (WID(dev->valuator->motionHintWindow) ==
-                    pEvents->u.keyButtonPointer.event)
-            {
-#ifdef DEBUG_EVENTS
-                ErrorF("[dix] \n");
-                ErrorF("[dix] motionHintWindow == keyButtonPointer.event\n");
-#endif
-                return 1; /* don't send, but pretend we did */
-            }
-            pEvents->u.u.detail = NotifyHint;
-        }
-        else
-        {
-            pEvents->u.u.detail = NotifyNormal;
-        }
-    }
-    else if (type == DeviceMotionNotify)
-    {
-        if (MaybeSendDeviceMotionNotifyHint((deviceKeyButtonPointer*)pEvents,
-                                            mask) != 0)
-            return 1;
-    } else if (type == KeyPress)
-    {
-        if (EventIsKeyRepeat(pEvents))
-        {
-            if (!_XkbWantsDetectableAutoRepeat(client))
-            {
-                xEvent release = *pEvents;
-                release.u.u.type = KeyRelease;
-                WriteEventsToClient(client, 1, &release);
-#ifdef DEBUG_EVENTS
-                ErrorF(" (plus fake core release for repeat)");
-#endif
-            } else
-            {
-#ifdef DEBUG_EVENTS
-                ErrorF(" (detectable autorepeat for core)");
-#endif
-            }
-        }
-
-    } else if (type == DeviceKeyPress)
-    {
-        if (EventIsKeyRepeat(pEvents))
-        {
-            if (!_XkbWantsDetectableAutoRepeat(client))
-            {
-                deviceKeyButtonPointer release = *(deviceKeyButtonPointer *)pEvents;
-                release.type = DeviceKeyRelease;
-#ifdef DEBUG_EVENTS
-                ErrorF(" (plus fake xi1 release for repeat)");
-#endif
-                WriteEventsToClient(client, 1, (xEvent *) &release);
-            }
-            else {
-#ifdef DEBUG_EVENTS
-                ErrorF(" (detectable autorepeat for core)");
-#endif
-            }
-        }
-    }
-
-    if (BitIsOn(criticalEvents, type))
-    {
-        if (client->smart_priority < SMART_MAX_PRIORITY)
-            client->smart_priority++;
-        SetCriticalOutputPending();
-    }
-
-    WriteEventsToClient(client, count, pEvents);
-#ifdef DEBUG_EVENTS
-    ErrorF("[dix]  delivered\n");
-#endif
-    return 1;
-}
-
-/**
- * Deliver events to a window. At this point, we do not yet know if the event
- * actually needs to be delivered. May activate a grab if the event is a
- * button press.
- *
- * Core events are always delivered to the window owner. If the filter is
- * something other than CantBeFiltered, the event is also delivered to other
- * clients with the matching mask on the window.
- *
- * More than one event may be delivered at a time. This is the case with
- * DeviceMotionNotifies which may be followed by DeviceValuator events.
- *
- * @param pWin The window that would get the event.
- * @param pEvents The events to be delivered.
- * @param count Number of elements in pEvents.
- * @param filter Mask based on event type.
- * @param grab Possible grab on the device that caused the event.
- *
- * @return Number of events delivered to various clients.
- */
-int
-DeliverEventsToWindow(DeviceIntPtr pDev, WindowPtr pWin, xEvent
-        *pEvents, int count, Mask filter, GrabPtr grab)
-{
-    int deliveries = 0, nondeliveries = 0;
-    int attempt;
-    InputClients *other;
-    ClientPtr client = NullClient;
-    Mask deliveryMask = 0; /* If a grab occurs due to a button press, then
-		              this mask is the mask of the grab. */
-    int type = pEvents->u.u.type;
-
-
-    /* Deliver to window owner */
-    if ((filter == CantBeFiltered) || CORE_EVENT(pEvents))
-    {
-	/* if nobody ever wants to see this event, skip some work */
-	if (filter != CantBeFiltered &&
-	    !((wOtherEventMasks(pWin)|pWin->eventMask) & filter))
-	    return 0;
-
-        if (IsInterferingGrab(wClient(pWin), pDev, pEvents))
-                return 0;
-
-	if (XaceHook(XACE_RECEIVE_ACCESS, wClient(pWin), pWin, pEvents, count))
-	    /* do nothing */;
-        else if ( (attempt = TryClientEvents(wClient(pWin), pDev, pEvents,
-                                             count, pWin->eventMask,
-                                             filter, grab)) )
-	{
-	    if (attempt > 0)
-	    {
-		deliveries++;
-		client = wClient(pWin);
-		deliveryMask = pWin->eventMask;
-	    } else
-		nondeliveries--;
-	}
-    }
-
-    /* CantBeFiltered means only window owner gets the event */
-    if (filter != CantBeFiltered)
-    {
-        if (CORE_EVENT(pEvents))
-            other = (InputClients *)wOtherClients(pWin);
-        else if (XI2_EVENT(pEvents))
-        {
-            OtherInputMasks *inputMasks = wOtherInputMasks(pWin);
-            /* Has any client selected for the event? */
-            if (!GetWindowXI2Mask(pDev, pWin, pEvents))
-                return 0;
-            other = inputMasks->inputClients;
-        } else {
-            OtherInputMasks *inputMasks = wOtherInputMasks(pWin);
-            /* Has any client selected for the event? */
-            if (!inputMasks ||
-                !(inputMasks->inputEvents[pDev->id] & filter))
-                return 0;
-
-            other = inputMasks->inputClients;
-        }
-
-        for (; other; other = other->next)
-        {
-            Mask mask;
-            if (IsInterferingGrab(rClient(other), pDev, pEvents))
-                continue;
-
-            mask = GetEventMask(pDev, pEvents, other);
-
-            if (XaceHook(XACE_RECEIVE_ACCESS, rClient(other), pWin,
-                        pEvents, count))
-                /* do nothing */;
-            else if ( (attempt = TryClientEvents(rClient(other), pDev,
-                            pEvents, count,
-                            mask, filter, grab)) )
-            {
-                if (attempt > 0)
-                {
-                    deliveries++;
-                    client = rClient(other);
-                    deliveryMask = mask;
-                } else
-                    nondeliveries--;
-            }
-        }
-    }
-    /*
-     * Note that since core events are delivered first, an implicit grab may
-     * be activated on a core grab, stopping the XI events.
-     */
-    if ((type == DeviceButtonPress || type == ButtonPress ||
-        ((XI2_EVENT(pEvents) && ((xGenericEvent*)pEvents)->evtype == XI_ButtonPress)))
-            && deliveries
-            && (!grab))
-    {
-	GrabRec tempGrab;
-        OtherInputMasks *inputMasks;
-
-        memset(&tempGrab, 0, sizeof(GrabRec));
-        tempGrab.next = NULL;
-	tempGrab.device = pDev;
-	tempGrab.resource = client->clientAsMask;
-	tempGrab.window = pWin;
-	tempGrab.ownerEvents = (deliveryMask & OwnerGrabButtonMask) ? TRUE : FALSE;
-	tempGrab.eventMask = deliveryMask;
-	tempGrab.keyboardMode = GrabModeAsync;
-	tempGrab.pointerMode = GrabModeAsync;
-	tempGrab.confineTo = NullWindow;
-	tempGrab.cursor = NullCursor;
-        tempGrab.type = type;
-        if (type == ButtonPress)
-            tempGrab.grabtype = GRABTYPE_CORE;
-        else if (type == DeviceButtonPress)
-            tempGrab.grabtype = GRABTYPE_XI;
-        else
-        {
-            tempGrab.type = ((xGenericEvent*)pEvents)->evtype;
-            tempGrab.grabtype = GRABTYPE_XI2;
-        }
-
-        /* get the XI and XI2 device mask */
-        inputMasks = wOtherInputMasks(pWin);
-        tempGrab.deviceMask = (inputMasks) ? inputMasks->inputEvents[pDev->id]: 0;
-
-        if (inputMasks)
-            memcpy(tempGrab.xi2mask, inputMasks->xi2mask,
-                    sizeof(tempGrab.xi2mask));
-
-	(*pDev->deviceGrab.ActivateGrab)(pDev, &tempGrab,
-                                        currentTime, TRUE | ImplicitGrabMask);
-    }
-    else if ((type == MotionNotify) && deliveries)
-	pDev->valuator->motionHintWindow = pWin;
-    else
-    {
-	if ((type == DeviceMotionNotify || type == DeviceButtonPress) &&
-	    deliveries)
-	    CheckDeviceGrabAndHintWindow (pWin, type,
-					  (deviceKeyButtonPointer*) pEvents,
-					  grab, client, deliveryMask);
-    }
-    if (deliveries)
-	return deliveries;
-    return nondeliveries;
-}
-
-/* If the event goes to dontClient, don't send it and return 0.  if
-   send works,  return 1 or if send didn't work, return 2.
-   Only works for core events.
-*/
-
-#ifdef PANORAMIX
-static int
-XineramaTryClientEventsResult(
-    ClientPtr client,
-    GrabPtr grab,
-    Mask mask,
-    Mask filter
-){
-    if ((client) && (client != serverClient) && (!client->clientGone) &&
-        ((filter == CantBeFiltered) || (mask & filter)))
-    {
-        if (grab && !SameClient(grab, client)) return -1;
-	else return 1;
-    }
-    return 0;
-}
-#endif
-
-/**
- * Try to deliver events to the interested parties.
- *
- * @param pWin The window that would get the event.
- * @param pEvents The events to be delivered.
- * @param count Number of elements in pEvents.
- * @param filter Mask based on event type.
- * @param dontClient Don't deliver to the dontClient.
- */
-int
-MaybeDeliverEventsToClient(WindowPtr pWin, xEvent *pEvents,
-                           int count, Mask filter, ClientPtr dontClient)
-{
-    OtherClients *other;
-
-
-    if (pWin->eventMask & filter)
-    {
-        if (wClient(pWin) == dontClient)
-	    return 0;
-#ifdef PANORAMIX
-	if(!noPanoramiXExtension && pWin->drawable.pScreen->myNum)
-	    return XineramaTryClientEventsResult(
-			wClient(pWin), NullGrab, pWin->eventMask, filter);
-#endif
-	if (XaceHook(XACE_RECEIVE_ACCESS, wClient(pWin), pWin, pEvents, count))
-	    return 1; /* don't send, but pretend we did */
-	return TryClientEvents(wClient(pWin), NULL, pEvents, count,
-			       pWin->eventMask, filter, NullGrab);
-    }
-    for (other = wOtherClients(pWin); other; other = other->next)
-    {
-	if (other->mask & filter)
-	{
-            if (SameClient(other, dontClient))
-		return 0;
-#ifdef PANORAMIX
-	    if(!noPanoramiXExtension && pWin->drawable.pScreen->myNum)
-	      return XineramaTryClientEventsResult(
-			rClient(other), NullGrab, other->mask, filter);
-#endif
-	    if (XaceHook(XACE_RECEIVE_ACCESS, rClient(other), pWin, pEvents,
-			 count))
-		return 1; /* don't send, but pretend we did */
-	    return TryClientEvents(rClient(other), NULL, pEvents, count,
-				   other->mask, filter, NullGrab);
-	}
-    }
-    return 2;
-}
-
-static Window FindChildForEvent(SpritePtr pSprite, WindowPtr event)
-{
-    WindowPtr w = pSprite->spriteTrace[pSprite->spriteTraceGood-1];
-    Window child = None;
-
-    /* If the search ends up past the root should the child field be
-       set to none or should the value in the argument be passed
-       through. It probably doesn't matter since everyone calls
-       this function with child == None anyway. */
-    while (w)
-    {
-        /* If the source window is same as event window, child should be
-           none.  Don't bother going all all the way back to the root. */
-
-        if (w == event)
-        {
-            child = None;
-            break;
-        }
-
-        if (w->parent == event)
-        {
-            child = w->drawable.id;
-            break;
-        }
-        w = w->parent;
-    }
-    return child;
-}
-
-/**
- * Adjust event fields to comply with the window properties.
- *
- * @param xE Event to be modified in place
- * @param pWin The window to get the information from.
- * @param child Child window setting for event (if applicable)
- * @param calcChild If True, calculate the child window.
- */
-void
-FixUpEventFromWindow(
-    SpritePtr pSprite,
-    xEvent *xE,
-    WindowPtr pWin,
-    Window child,
-    Bool calcChild)
-{
-    if (calcChild)
-        child = FindChildForEvent(pSprite, pWin);
-
-    if (XI2_EVENT(xE))
-    {
-        xXIDeviceEvent* event = (xXIDeviceEvent*)xE;
-
-        if (event->evtype == XI_RawKeyPress ||
-            event->evtype == XI_RawKeyRelease ||
-            event->evtype == XI_RawButtonPress ||
-            event->evtype == XI_RawButtonRelease ||
-            event->evtype == XI_RawMotion ||
-            event->evtype == XI_DeviceChanged ||
-            event->evtype == XI_HierarchyChanged ||
-            event->evtype == XI_PropertyEvent)
-            return;
-
-        event->root = RootWindow(pSprite)->drawable.id;
-        event->event = pWin->drawable.id;
-        if (pSprite->hot.pScreen == pWin->drawable.pScreen)
-        {
-            event->event_x = event->root_x - FP1616(pWin->drawable.x, 0);
-            event->event_y = event->root_y - FP1616(pWin->drawable.y, 0);
-            event->child = child;
-        } else
-        {
-            event->event_x = 0;
-            event->event_y = 0;
-            event->child = None;
-        }
-
-        if (event->evtype == XI_Enter || event->evtype == XI_Leave ||
-            event->evtype == XI_FocusIn || event->evtype == XI_FocusOut)
-            ((xXIEnterEvent*)event)->same_screen =
-                (pSprite->hot.pScreen == pWin->drawable.pScreen);
-
-    } else
-    {
-        XE_KBPTR.root = RootWindow(pSprite)->drawable.id;
-        XE_KBPTR.event = pWin->drawable.id;
-        if (pSprite->hot.pScreen == pWin->drawable.pScreen)
-        {
-            XE_KBPTR.sameScreen = xTrue;
-            XE_KBPTR.child = child;
-            XE_KBPTR.eventX =
-                XE_KBPTR.rootX - pWin->drawable.x;
-            XE_KBPTR.eventY =
-                XE_KBPTR.rootY - pWin->drawable.y;
-        }
-        else
-        {
-            XE_KBPTR.sameScreen = xFalse;
-            XE_KBPTR.child = None;
-            XE_KBPTR.eventX = 0;
-            XE_KBPTR.eventY = 0;
-        }
-    }
-}
-
-/**
- * Check if a given event is deliverable at all on a given window.
- *
- * This function only checks if any client wants it, not for a specific
- * client.
- *
- * @param[in] dev The device this event is being sent for.
- * @param[in] event The event that is to be sent.
- * @param[in] win The current event window.
- *
- * @return Bitmask of ::XI2_MASK, ::XI_MASK, ::CORE_MASK, and
- * ::DONT_PROPAGATE_MASK.
- */
-int
-EventIsDeliverable(DeviceIntPtr dev, InternalEvent* event, WindowPtr win)
-{
-    int rc = 0;
-    int filter = 0;
-    int type;
-    OtherInputMasks *inputMasks = wOtherInputMasks(win);
-    xEvent ev;
-
-    /* XXX: this makes me gag */
-    type = GetXI2Type(event);
-    ev.u.u.type = GenericEvent; /* GetEventFilter only cares about type and evtype*/
-    ((xGenericEvent*)&ev)->extension = IReqCode;
-    ((xGenericEvent*)&ev)->evtype = type;
-    filter = GetEventFilter(dev, &ev);
-    if (type && inputMasks &&
-        ((inputMasks->xi2mask[XIAllDevices][type/8] & filter) ||
-         ((inputMasks->xi2mask[XIAllMasterDevices][type/8] & filter) && IsMaster(dev)) ||
-         (inputMasks->xi2mask[dev->id][type/8] & filter)))
-        rc |= XI2_MASK;
-
-    type = GetXIType(event);
-    ev.u.u.type = type;
-    filter = GetEventFilter(dev, &ev);
-
-    /* Check for XI mask */
-    if (type && inputMasks &&
-        (inputMasks->deliverableEvents[dev->id] & filter) &&
-        (inputMasks->inputEvents[dev->id] & filter))
-        rc |= XI_MASK;
-
-    /* Check for XI DontPropagate mask */
-    if (type && inputMasks &&
-        (inputMasks->dontPropagateMask[dev->id] & filter))
-        rc |= DONT_PROPAGATE_MASK;
-
-    /* Check for core mask */
-    type = GetCoreType(event);
-    if (type && (win->deliverableEvents & filter) &&
-        ((wOtherEventMasks(win) | win->eventMask) & filter))
-        rc |= CORE_MASK;
-
-    /* Check for core DontPropagate mask */
-    if (type && (filter & wDontPropagateMask(win)))
-        rc |= DONT_PROPAGATE_MASK;
-
-    return rc;
-}
-
-/**
- * Deliver events caused by input devices.
- *
- * For events from a non-grabbed, non-focus device, DeliverDeviceEvents is
- * called directly from the processInputProc.
- * For grabbed devices, DeliverGrabbedEvent is called first, and _may_ call
- * DeliverDeviceEvents.
- * For focused events, DeliverFocusedEvent is called first, and _may_ call
- * DeliverDeviceEvents.
- *
- * @param pWin Window to deliver event to.
- * @param event The events to deliver, not yet in wire format.
- * @param grab Possible grab on a device.
- * @param stopAt Don't recurse up to the root window.
- * @param dev The device that is responsible for the event.
- *
- * @see DeliverGrabbedEvent
- * @see DeliverFocusedEvent
- */
-int
-DeliverDeviceEvents(WindowPtr pWin, InternalEvent *event, GrabPtr grab,
-                    WindowPtr stopAt, DeviceIntPtr dev)
-{
-    SpritePtr pSprite = dev->spriteInfo->sprite;
-    Window child = None;
-    Mask filter;
-    int deliveries = 0;
-    xEvent core;
-    xEvent *xE = NULL;
-    int rc, mask, count = 0;
-
-    CHECKEVENT(event);
-
-    while (pWin)
-    {
-        if ((mask = EventIsDeliverable(dev, event, pWin)))
-        {
-            /* XI2 events first */
-            if (mask & XI2_MASK)
-            {
-                xEvent *xi2 = NULL;
-                rc = EventToXI2(event, &xi2);
-                if (rc == Success)
-                {
-                    /* XXX: XACE */
-                    filter = GetEventFilter(dev, xi2);
-                    FixUpEventFromWindow(pSprite, xi2, pWin, child, FALSE);
-                    deliveries = DeliverEventsToWindow(dev, pWin, xi2, 1,
-                                                       filter, grab);
-                    free(xi2);
-                    if (deliveries > 0)
-                        goto unwind;
-                } else if (rc != BadMatch)
-                    ErrorF("[dix] %s: XI2 conversion failed in DDE (%d).\n",
-                            dev->name, rc);
-            }
-
-            /* XI events */
-            if (mask & XI_MASK)
-            {
-                rc = EventToXI(event, &xE, &count);
-                if (rc == Success) {
-                    if (XaceHook(XACE_SEND_ACCESS, NULL, dev, pWin, xE, count) == Success) {
-                        filter = GetEventFilter(dev, xE);
-                        FixUpEventFromWindow(pSprite, xE, pWin, child, FALSE);
-                        deliveries = DeliverEventsToWindow(dev, pWin, xE, count,
-                                                           filter, grab);
-                        if (deliveries > 0)
-                            goto unwind;
-                    }
-                } else if (rc != BadMatch)
-                    ErrorF("[dix] %s: XI conversion failed in DDE (%d, %d). Skipping delivery.\n",
-                            dev->name, event->any.type, rc);
-            }
-
-            /* Core event */
-            if ((mask & CORE_MASK) && IsMaster(dev) && dev->coreEvents)
-            {
-                rc = EventToCore(event, &core);
-                if (rc == Success) {
-                    if (XaceHook(XACE_SEND_ACCESS, NULL, dev, pWin, &core, 1) == Success) {
-                        filter = GetEventFilter(dev, &core);
-                        FixUpEventFromWindow(pSprite, &core, pWin, child, FALSE);
-                        deliveries = DeliverEventsToWindow(dev, pWin, &core, 1,
-                                                           filter, grab);
-                        if (deliveries > 0)
-                            goto unwind;
-                    }
-                } else if (rc != BadMatch)
-                        ErrorF("[dix] %s: Core conversion failed in DDE (%d, %d).\n",
-                                dev->name, event->any.type, rc);
-            }
-
-            if ((deliveries < 0) || (pWin == stopAt) ||
-                (mask & DONT_PROPAGATE_MASK))
-            {
-                deliveries = 0;
-                goto unwind;
-            }
-        }
-
-        child = pWin->drawable.id;
-        pWin = pWin->parent;
-    }
-
-unwind:
-    free(xE);
-    return deliveries;
-}
-
-#undef XI_MASK
-#undef CORE_MASK
-#undef DONT_PROPAGATE_MASK
-
-/**
- * Deliver event to a window and it's immediate parent. Used for most window
- * events (CreateNotify, ConfigureNotify, etc.). Not useful for events that
- * propagate up the tree or extension events
- *
- * In case of a ReparentNotify event, the event will be delivered to the
- * otherParent as well.
- *
- * @param pWin Window to deliver events to.
- * @param xE Events to deliver.
- * @param count number of events in xE.
- * @param otherParent Used for ReparentNotify events.
- */
-int
-DeliverEvents(WindowPtr pWin, xEvent *xE, int count,
-              WindowPtr otherParent)
-{
-    Mask filter;
-    int     deliveries;
-    DeviceIntRec dummy;
-
-#ifdef PANORAMIX
-    if(!noPanoramiXExtension && pWin->drawable.pScreen->myNum)
-	return count;
-#endif
-
-    if (!count)
-	return 0;
-
-    dummy.id = XIAllDevices;
-    filter = GetEventFilter(&dummy, xE);
-    if ((filter & SubstructureNotifyMask) && (xE->u.u.type != CreateNotify))
-	xE->u.destroyNotify.event = pWin->drawable.id;
-    if (filter != StructureAndSubMask)
-	return DeliverEventsToWindow(&dummy, pWin, xE, count, filter, NullGrab);
-    deliveries = DeliverEventsToWindow(&dummy, pWin, xE, count,
-                                       StructureNotifyMask, NullGrab);
-    if (pWin->parent)
-    {
-	xE->u.destroyNotify.event = pWin->parent->drawable.id;
-	deliveries += DeliverEventsToWindow(&dummy, pWin->parent, xE, count,
-					    SubstructureNotifyMask, NullGrab);
-	if (xE->u.u.type == ReparentNotify)
-	{
-	    xE->u.destroyNotify.event = otherParent->drawable.id;
-            deliveries += DeliverEventsToWindow(&dummy,
-                    otherParent, xE, count, SubstructureNotifyMask,
-						NullGrab);
-	}
-    }
-    return deliveries;
-}
-
-
-static Bool
-PointInBorderSize(WindowPtr pWin, int x, int y)
-{
-    BoxRec box;
-
-    if(RegionContainsPoint(&pWin->borderSize, x, y, &box))
-	return TRUE;
-
-#ifdef PANORAMIX
-    if(!noPanoramiXExtension &&
-            XineramaSetWindowPntrs(inputInfo.pointer, pWin)) {
-	SpritePtr pSprite = inputInfo.pointer->spriteInfo->sprite;
-	int i;
-
-	for(i = 1; i < PanoramiXNumScreens; i++) {
-	   if(RegionContainsPoint(&pSprite->windows[i]->borderSize,
-				  x + screenInfo.screens[0]->x - screenInfo.screens[i]->x,
-				  y + screenInfo.screens[0]->y - screenInfo.screens[i]->y,
-				  &box))
-		return TRUE;
-	}
-    }
-#endif
-    return FALSE;
-}
-
-/**
- * Traversed from the root window to the window at the position x/y. While
- * traversing, it sets up the traversal history in the spriteTrace array.
- * After completing, the spriteTrace history is set in the following way:
- *   spriteTrace[0] ... root window
- *   spriteTrace[1] ... top level window that encloses x/y
- *       ...
- *   spriteTrace[spriteTraceGood - 1] ... window at x/y
- *
- * @returns the window at the given coordinates.
- */
-WindowPtr
-XYToWindow(SpritePtr pSprite, int x, int y)
-{
-    WindowPtr  pWin;
-    BoxRec		box;
-
-    pSprite->spriteTraceGood = 1;	/* root window still there */
-    pWin = RootWindow(pSprite)->firstChild;
-    while (pWin)
-    {
-	if ((pWin->mapped) &&
-	    (x >= pWin->drawable.x - wBorderWidth (pWin)) &&
-	    (x < pWin->drawable.x + (int)pWin->drawable.width +
-	     wBorderWidth(pWin)) &&
-	    (y >= pWin->drawable.y - wBorderWidth (pWin)) &&
-	    (y < pWin->drawable.y + (int)pWin->drawable.height +
-	     wBorderWidth (pWin))
-	    /* When a window is shaped, a further check
-	     * is made to see if the point is inside
-	     * borderSize
-	     */
-	    && (!wBoundingShape(pWin) || PointInBorderSize(pWin, x, y))
-	    && (!wInputShape(pWin) ||
-		RegionContainsPoint(wInputShape(pWin),
-				    x - pWin->drawable.x,
-				    y - pWin->drawable.y, &box))
-#ifdef ROOTLESS
-    /* In rootless mode windows may be offscreen, even when
-     * they're in X's stack. (E.g. if the native window system
-     * implements some form of virtual desktop system).
-     */
-		&& !pWin->rootlessUnhittable
-#endif
-	    )
-	{
-	    if (pSprite->spriteTraceGood >= pSprite->spriteTraceSize)
-	    {
-		pSprite->spriteTraceSize += 10;
-		pSprite->spriteTrace = realloc(pSprite->spriteTrace,
-		                    pSprite->spriteTraceSize*sizeof(WindowPtr));
-	    }
-	    pSprite->spriteTrace[pSprite->spriteTraceGood++] = pWin;
-	    pWin = pWin->firstChild;
-	}
-	else
-	    pWin = pWin->nextSib;
-    }
-    return pSprite->spriteTrace[pSprite->spriteTraceGood-1];
-}
-
-/**
- * Ungrab a currently FocusIn grabbed device and grab the device on the
- * given window. If the win given is the NoneWin, the device is ungrabbed if
- * applicable and FALSE is returned.
- *
- * @returns TRUE if the device has been grabbed, or FALSE otherwise.
- */
-BOOL
-ActivateFocusInGrab(DeviceIntPtr dev, WindowPtr old, WindowPtr win)
-{
-    BOOL rc = FALSE;
-    DeviceEvent event;
-
-    if (dev->deviceGrab.grab)
-    {
-        if (!dev->deviceGrab.fromPassiveGrab ||
-            dev->deviceGrab.grab->type != XI_Enter ||
-            dev->deviceGrab.grab->window == win ||
-            IsParent(dev->deviceGrab.grab->window, win))
-            return FALSE;
-        DoEnterLeaveEvents(dev, dev->id, old, win, XINotifyPassiveUngrab);
-        (*dev->deviceGrab.DeactivateGrab)(dev);
-    }
-
-    if (win == NoneWin || win == PointerRootWin)
-        return FALSE;
-
-    memset(&event, 0, sizeof(DeviceEvent));
-    event.header = ET_Internal;
-    event.type = ET_FocusIn;
-    event.length = sizeof(DeviceEvent);
-    event.time = GetTimeInMillis();
-    event.deviceid = dev->id;
-    event.sourceid = dev->id;
-    event.detail.button = 0;
-    rc = (CheckPassiveGrabsOnWindow(win, dev, &event, FALSE, TRUE) != NULL);
-    if (rc)
-        DoEnterLeaveEvents(dev, dev->id, old, win, XINotifyPassiveUngrab);
-    return rc;
-}
-
-/**
- * Ungrab a currently Enter grabbed device and grab the device for the given
- * window.
- *
- * @returns TRUE if the device has been grabbed, or FALSE otherwise.
- */
-static BOOL
-ActivateEnterGrab(DeviceIntPtr dev, WindowPtr old, WindowPtr win)
-{
-    BOOL rc = FALSE;
-    DeviceEvent event;
-
-    if (dev->deviceGrab.grab)
-    {
-        if (!dev->deviceGrab.fromPassiveGrab ||
-            dev->deviceGrab.grab->type != XI_Enter ||
-            dev->deviceGrab.grab->window == win ||
-            IsParent(dev->deviceGrab.grab->window, win))
-            return FALSE;
-        DoEnterLeaveEvents(dev, dev->id, old, win, XINotifyPassiveUngrab);
-        (*dev->deviceGrab.DeactivateGrab)(dev);
-    }
-
-    memset(&event, 0, sizeof(DeviceEvent));
-    event.header = ET_Internal;
-    event.type = ET_Enter;
-    event.length = sizeof(DeviceEvent);
-    event.time = GetTimeInMillis();
-    event.deviceid = dev->id;
-    event.sourceid = dev->id;
-    event.detail.button = 0;
-    rc = (CheckPassiveGrabsOnWindow(win, dev, &event, FALSE, TRUE) != NULL);
-    if (rc)
-        DoEnterLeaveEvents(dev, dev->id, old, win, XINotifyPassiveGrab);
-    return rc;
-}
-
-/**
- * Update the sprite coordinates based on the event. Update the cursor
- * position, then update the event with the new coordinates that may have been
- * changed. If the window underneath the sprite has changed, change to new
- * cursor and send enter/leave events.
- *
- * CheckMotion() will not do anything and return FALSE if the event is not a
- * pointer event.
- *
- * @return TRUE if the sprite has moved or FALSE otherwise.
- */
-Bool
-CheckMotion(DeviceEvent *ev, DeviceIntPtr pDev)
-{
-    WindowPtr prevSpriteWin, newSpriteWin;
-    SpritePtr pSprite = pDev->spriteInfo->sprite;
-
-    CHECKEVENT(ev);
-
-    if (!pSprite)
-      return FALSE;
-
-    prevSpriteWin = pSprite->win;
-
-    if (ev && !syncEvents.playingEvents)
-    {
-        /* GetPointerEvents() guarantees that pointer events have the correct
-           rootX/Y set already. */
-        switch (ev->type)
-        {
-            case ET_ButtonPress:
-            case ET_ButtonRelease:
-            case ET_Motion:
-                break;
-            default:
-                /* all other events return FALSE */
-                return FALSE;
-        }
-
-
-#ifdef PANORAMIX
-        if (!noPanoramiXExtension)
-        {
-            /* Motion events entering DIX get translated to Screen 0
-               coordinates.  Replayed events have already been
-               translated since they've entered DIX before */
-            ev->root_x += pSprite->screen->x - screenInfo.screens[0]->x;
-            ev->root_y += pSprite->screen->y - screenInfo.screens[0]->y;
-        } else
-#endif
-        {
-            if (pSprite->hot.pScreen != pSprite->hotPhys.pScreen)
-            {
-                pSprite->hot.pScreen = pSprite->hotPhys.pScreen;
-                RootWindow(pDev->spriteInfo->sprite) =
-                    pSprite->hot.pScreen->root;
-            }
-        }
-
-        pSprite->hot.x = ev->root_x;
-        pSprite->hot.y = ev->root_y;
-        if (pSprite->hot.x < pSprite->physLimits.x1)
-            pSprite->hot.x = pSprite->physLimits.x1;
-        else if (pSprite->hot.x >= pSprite->physLimits.x2)
-            pSprite->hot.x = pSprite->physLimits.x2 - 1;
-        if (pSprite->hot.y < pSprite->physLimits.y1)
-            pSprite->hot.y = pSprite->physLimits.y1;
-        else if (pSprite->hot.y >= pSprite->physLimits.y2)
-            pSprite->hot.y = pSprite->physLimits.y2 - 1;
-	if (pSprite->hotShape)
-	    ConfineToShape(pDev, pSprite->hotShape, &pSprite->hot.x, &pSprite->hot.y);
-	pSprite->hotPhys = pSprite->hot;
-
-	if ((pSprite->hotPhys.x != ev->root_x) ||
-	    (pSprite->hotPhys.y != ev->root_y))
-	{
-#ifdef PANORAMIX
-            if (!noPanoramiXExtension)
-            {
-                XineramaSetCursorPosition(
-                        pDev, pSprite->hotPhys.x, pSprite->hotPhys.y, FALSE);
-            } else
-#endif
-            {
-                (*pSprite->hotPhys.pScreen->SetCursorPosition)(
-                        pDev, pSprite->hotPhys.pScreen,
-                        pSprite->hotPhys.x, pSprite->hotPhys.y, FALSE);
-            }
-	}
-
-	ev->root_x = pSprite->hot.x;
-	ev->root_y = pSprite->hot.y;
-    }
-
-    newSpriteWin = XYToWindow(pSprite, pSprite->hot.x, pSprite->hot.y);
-
-    if (newSpriteWin != prevSpriteWin)
-    {
-        int sourceid;
-        if (!ev) {
-            UpdateCurrentTimeIf();
-            sourceid = pDev->id; /* when from WindowsRestructured */
-        } else
-            sourceid = ev->sourceid;
-
-	if (prevSpriteWin != NullWindow) {
-            if (!ActivateEnterGrab(pDev, prevSpriteWin, newSpriteWin))
-                DoEnterLeaveEvents(pDev, sourceid, prevSpriteWin,
-                                   newSpriteWin, NotifyNormal);
-        }
-        /* set pSprite->win after ActivateEnterGrab, otherwise
-           sprite window == grab_window and no enter/leave events are
-           sent. */
-        pSprite->win = newSpriteWin;
-        PostNewCursor(pDev);
-        return FALSE;
-    }
-    return TRUE;
-}
-
-/**
- * Windows have restructured, we need to update the sprite position and the
- * sprite's cursor.
- */
-void
-WindowsRestructured(void)
-{
-    DeviceIntPtr pDev = inputInfo.devices;
-    while(pDev)
-    {
-        if (IsMaster(pDev) || !pDev->u.master)
-            CheckMotion(NULL, pDev);
-        pDev = pDev->next;
-    }
-}
-
-#ifdef PANORAMIX
-/* This was added to support reconfiguration under Xdmx.  The problem is
- * that if the 0th screen (i.e., screenInfo.screens[0]) is moved to an origin
- * other than 0,0, the information in the private sprite structure must
- * be updated accordingly, or XYToWindow (and other routines) will not
- * compute correctly. */
-void ReinitializeRootWindow(WindowPtr win, int xoff, int yoff)
-{
-    GrabPtr   grab;
-    DeviceIntPtr pDev;
-    SpritePtr pSprite;
-
-    if (noPanoramiXExtension) return;
-
-    pDev = inputInfo.devices;
-    while(pDev)
-    {
-        if (DevHasCursor(pDev))
-        {
-            pSprite = pDev->spriteInfo->sprite;
-            pSprite->hot.x        -= xoff;
-            pSprite->hot.y        -= yoff;
-
-            pSprite->hotPhys.x    -= xoff;
-            pSprite->hotPhys.y    -= yoff;
-
-            pSprite->hotLimits.x1 -= xoff;
-            pSprite->hotLimits.y1 -= yoff;
-            pSprite->hotLimits.x2 -= xoff;
-            pSprite->hotLimits.y2 -= yoff;
-
-            if (RegionNotEmpty(&pSprite->Reg1))
-                RegionTranslate(&pSprite->Reg1, xoff, yoff);
-            if (RegionNotEmpty(&pSprite->Reg2))
-                RegionTranslate(&pSprite->Reg2, xoff, yoff);
-
-            /* FIXME: if we call ConfineCursorToWindow, must we do anything else? */
-            if ((grab = pDev->deviceGrab.grab) && grab->confineTo) {
-                if (grab->confineTo->drawable.pScreen
-                        != pSprite->hotPhys.pScreen)
-                    pSprite->hotPhys.x = pSprite->hotPhys.y = 0;
-                ConfineCursorToWindow(pDev, grab->confineTo, TRUE, TRUE);
-            } else
-                ConfineCursorToWindow(
-                        pDev,
-                        pSprite->hotPhys.pScreen->root,
-                        TRUE, FALSE);
-
-        }
-        pDev = pDev->next;
-    }
-}
-#endif
-
-/**
- * Initialize a sprite for the given device and set it to some sane values. If
- * the device already has a sprite alloc'd, don't realloc but just reset to
- * default values.
- * If a window is supplied, the sprite will be initialized with the window's
- * cursor and positioned in the center of the window's screen. The root window
- * is a good choice to pass in here.
- *
- * It's a good idea to call it only for pointer devices, unless you have a
- * really talented keyboard.
- *
- * @param pDev The device to initialize.
- * @param pWin The window where to generate the sprite in.
- *
- */
-void
-InitializeSprite(DeviceIntPtr pDev, WindowPtr pWin)
-{
-    SpritePtr pSprite;
-    ScreenPtr pScreen;
-    CursorPtr pCursor;
-
-    if (!pDev->spriteInfo->sprite)
-    {
-        DeviceIntPtr it;
-
-        pDev->spriteInfo->sprite = (SpritePtr)calloc(1, sizeof(SpriteRec));
-        if (!pDev->spriteInfo->sprite)
-            FatalError("InitializeSprite: failed to allocate sprite struct");
-
-        /* We may have paired another device with this device before our
-         * device had a actual sprite. We need to check for this and reset the
-         * sprite field for all paired devices.
-         *
-         * The VCK is always paired with the VCP before the VCP has a sprite.
-         */
-        for (it = inputInfo.devices; it; it = it->next)
-        {
-            if (it->spriteInfo->paired == pDev)
-                it->spriteInfo->sprite = pDev->spriteInfo->sprite;
-        }
-        if (inputInfo.keyboard->spriteInfo->paired == pDev)
-            inputInfo.keyboard->spriteInfo->sprite = pDev->spriteInfo->sprite;
-    }
-
-    pSprite = pDev->spriteInfo->sprite;
-    pDev->spriteInfo->spriteOwner = TRUE;
-
-    pScreen = (pWin) ? pWin->drawable.pScreen : (ScreenPtr)NULL;
-    pSprite->hot.pScreen = pScreen;
-    pSprite->hotPhys.pScreen = pScreen;
-    if (pScreen)
-    {
-        pSprite->hotPhys.x = pScreen->width / 2;
-        pSprite->hotPhys.y = pScreen->height / 2;
-        pSprite->hotLimits.x2 = pScreen->width;
-        pSprite->hotLimits.y2 = pScreen->height;
-    }
-
-    pSprite->hot = pSprite->hotPhys;
-    pSprite->win = pWin;
-
-    if (pWin)
-    {
-	pCursor = wCursor(pWin);
-	pSprite->spriteTrace = (WindowPtr *)calloc(1, 32*sizeof(WindowPtr));
-	if (!pSprite->spriteTrace)
-	    FatalError("Failed to allocate spriteTrace");
-	pSprite->spriteTraceSize = 32;
-
-	RootWindow(pDev->spriteInfo->sprite) = pWin;
-	pSprite->spriteTraceGood = 1;
-
-	pSprite->pEnqueueScreen = pScreen;
-	pSprite->pDequeueScreen = pSprite->pEnqueueScreen;
-
-    } else {
-        pCursor = NullCursor;
-	pSprite->spriteTrace = NULL;
-	pSprite->spriteTraceSize = 0;
-	pSprite->spriteTraceGood = 0;
-	pSprite->pEnqueueScreen = screenInfo.screens[0];
-	pSprite->pDequeueScreen = pSprite->pEnqueueScreen;
-    }
-    if (pCursor)
-	pCursor->refcnt++;
-    if (pSprite->current)
-	FreeCursor(pSprite->current, None);
-    pSprite->current = pCursor;
-
-    if (pScreen)
-    {
-        (*pScreen->RealizeCursor) ( pDev, pScreen, pSprite->current);
-        (*pScreen->CursorLimits) ( pDev, pScreen, pSprite->current,
-                                   &pSprite->hotLimits, &pSprite->physLimits);
-        pSprite->confined = FALSE;
-
-        (*pScreen->ConstrainCursor) (pDev, pScreen,
-                                     &pSprite->physLimits);
-        (*pScreen->SetCursorPosition) (pDev, pScreen, pSprite->hot.x,
-                                       pSprite->hot.y,
-                                       FALSE);
-        (*pScreen->DisplayCursor) (pDev, pScreen, pSprite->current);
-    }
-#ifdef PANORAMIX
-    if(!noPanoramiXExtension) {
-        pSprite->hotLimits.x1 = -screenInfo.screens[0]->x;
-        pSprite->hotLimits.y1 = -screenInfo.screens[0]->y;
-        pSprite->hotLimits.x2 = PanoramiXPixWidth  - screenInfo.screens[0]->x;
-        pSprite->hotLimits.y2 = PanoramiXPixHeight - screenInfo.screens[0]->y;
-        pSprite->physLimits = pSprite->hotLimits;
-        pSprite->confineWin = NullWindow;
-        pSprite->hotShape = NullRegion;
-        pSprite->screen = pScreen;
-        /* gotta UNINIT these someplace */
-        RegionNull(&pSprite->Reg1);
-        RegionNull(&pSprite->Reg2);
-    }
-#endif
-}
-
-/**
- * Update the mouse sprite info when the server switches from a pScreen to another.
- * Otherwise, the pScreen of the mouse sprite is never updated when we switch
- * from a pScreen to another. Never updating the pScreen of the mouse sprite
- * implies that windows that are in pScreen whose pScreen->myNum >0 will never
- * get pointer events. This is  because in CheckMotion(), sprite.hotPhys.pScreen
- * always points to the first pScreen it has been set by
- * DefineInitialRootWindow().
- *
- * Calling this function is useful for use cases where the server
- * has more than one pScreen.
- * This function is similar to DefineInitialRootWindow() but it does not
- * reset the mouse pointer position.
- * @param win must be the new pScreen we are switching to.
- */
-void
-UpdateSpriteForScreen(DeviceIntPtr pDev, ScreenPtr pScreen)
-{
-    SpritePtr pSprite = NULL;
-    WindowPtr win = NULL;
-    CursorPtr pCursor;
-    if (!pScreen)
-        return ;
-
-    if (!pDev->spriteInfo->sprite)
-        return;
-
-    pSprite = pDev->spriteInfo->sprite;
-
-    win = pScreen->root;
-
-    pSprite->hotPhys.pScreen = pScreen;
-    pSprite->hot = pSprite->hotPhys;
-    pSprite->hotLimits.x2 = pScreen->width;
-    pSprite->hotLimits.y2 = pScreen->height;
-    pSprite->win = win;
-    pCursor = wCursor(win);
-    if (pCursor)
-	pCursor->refcnt++;
-    if (pSprite->current)
-	FreeCursor(pSprite->current, 0);
-    pSprite->current = pCursor;
-    pSprite->spriteTraceGood = 1;
-    pSprite->spriteTrace[0] = win;
-    (*pScreen->CursorLimits) (pDev,
-                              pScreen,
-                              pSprite->current,
-                              &pSprite->hotLimits,
-                              &pSprite->physLimits);
-    pSprite->confined = FALSE;
-    (*pScreen->ConstrainCursor) (pDev, pScreen, &pSprite->physLimits);
-    (*pScreen->DisplayCursor) (pDev, pScreen, pSprite->current);
-
-#ifdef PANORAMIX
-    if(!noPanoramiXExtension) {
-        pSprite->hotLimits.x1 = -screenInfo.screens[0]->x;
-        pSprite->hotLimits.y1 = -screenInfo.screens[0]->y;
-        pSprite->hotLimits.x2 = PanoramiXPixWidth  - screenInfo.screens[0]->x;
-        pSprite->hotLimits.y2 = PanoramiXPixHeight - screenInfo.screens[0]->y;
-        pSprite->physLimits = pSprite->hotLimits;
-        pSprite->screen = pScreen;
-    }
-#endif
-}
-
-/*
- * This does not take any shortcuts, and even ignores its argument, since
- * it does not happen very often, and one has to walk up the tree since
- * this might be a newly instantiated cursor for an intermediate window
- * between the one the pointer is in and the one that the last cursor was
- * instantiated from.
- */
-void
-WindowHasNewCursor(WindowPtr pWin)
-{
-    DeviceIntPtr pDev;
-
-    for(pDev = inputInfo.devices; pDev; pDev = pDev->next)
-        if (DevHasCursor(pDev))
-            PostNewCursor(pDev);
-}
-
-void
-NewCurrentScreen(DeviceIntPtr pDev, ScreenPtr newScreen, int x, int y)
-{
-    SpritePtr pSprite = pDev->spriteInfo->sprite;
-
-    pSprite->hotPhys.x = x;
-    pSprite->hotPhys.y = y;
-#ifdef PANORAMIX
-    if(!noPanoramiXExtension) {
-	pSprite->hotPhys.x += newScreen->x - screenInfo.screens[0]->x;
-	pSprite->hotPhys.y += newScreen->y - screenInfo.screens[0]->y;
-	if (newScreen != pSprite->screen) {
-	    pSprite->screen = newScreen;
-	    /* Make sure we tell the DDX to update its copy of the screen */
-	    if(pSprite->confineWin)
-		XineramaConfineCursorToWindow(pDev,
-                        pSprite->confineWin, TRUE);
-	    else
-		XineramaConfineCursorToWindow(pDev, screenInfo.screens[0]->root, TRUE);
-	    /* if the pointer wasn't confined, the DDX won't get
-	       told of the pointer warp so we reposition it here */
-	    if(!syncEvents.playingEvents)
-		(*pSprite->screen->SetCursorPosition)(
-                                                      pDev,
-                                                      pSprite->screen,
-		    pSprite->hotPhys.x + screenInfo.screens[0]->x -
-			pSprite->screen->x,
-		    pSprite->hotPhys.y + screenInfo.screens[0]->y -
-			pSprite->screen->y, FALSE);
-	}
-    } else
-#endif
-    if (newScreen != pSprite->hotPhys.pScreen)
-	ConfineCursorToWindow(pDev, newScreen->root, TRUE, FALSE);
-}
-
-#ifdef PANORAMIX
-
-static Bool
-XineramaPointInWindowIsVisible(
-    WindowPtr pWin,
-    int x,
-    int y
-)
-{
-    BoxRec box;
-    int i, xoff, yoff;
-
-    if (!pWin->realized) return FALSE;
-
-    if (RegionContainsPoint(&pWin->borderClip, x, y, &box))
-        return TRUE;
-
-    if(!XineramaSetWindowPntrs(inputInfo.pointer, pWin)) return FALSE;
-
-    xoff = x + screenInfo.screens[0]->x;
-    yoff = y + screenInfo.screens[0]->y;
-
-    for(i = 1; i < PanoramiXNumScreens; i++) {
-	pWin = inputInfo.pointer->spriteInfo->sprite->windows[i];
-	x = xoff - screenInfo.screens[i]->x;
-	y = yoff - screenInfo.screens[i]->y;
-
-	if(RegionContainsPoint(&pWin->borderClip, x, y, &box)
-	   && (!wInputShape(pWin) ||
-	       RegionContainsPoint(wInputShape(pWin),
-				   x - pWin->drawable.x,
-				   y - pWin->drawable.y, &box)))
-            return TRUE;
-
-    }
-
-    return FALSE;
-}
-
-static int
-XineramaWarpPointer(ClientPtr client)
-{
-    WindowPtr	dest = NULL;
-    int		x, y, rc;
-    SpritePtr   pSprite = PickPointer(client)->spriteInfo->sprite;
-
-    REQUEST(xWarpPointerReq);
-
-
-    if (stuff->dstWid != None) {
-	rc = dixLookupWindow(&dest, stuff->dstWid, client, DixReadAccess);
-	if (rc != Success)
-	    return rc;
-    }
-    x = pSprite->hotPhys.x;
-    y = pSprite->hotPhys.y;
-
-    if (stuff->srcWid != None)
-    {
-	int     winX, winY;
-	XID	winID = stuff->srcWid;
-        WindowPtr source;
-
-	rc = dixLookupWindow(&source, winID, client, DixReadAccess);
-	if (rc != Success)
-	    return rc;
-
-	winX = source->drawable.x;
-	winY = source->drawable.y;
-	if(source == screenInfo.screens[0]->root) {
-	    winX -= screenInfo.screens[0]->x;
-	    winY -= screenInfo.screens[0]->y;
-	}
-	if (x < winX + stuff->srcX ||
-	    y < winY + stuff->srcY ||
-	    (stuff->srcWidth != 0 &&
-	     winX + stuff->srcX + (int)stuff->srcWidth < x) ||
-	    (stuff->srcHeight != 0 &&
-	     winY + stuff->srcY + (int)stuff->srcHeight < y) ||
-	    !XineramaPointInWindowIsVisible(source, x, y))
-	    return Success;
-    }
-    if (dest) {
-	x = dest->drawable.x;
-	y = dest->drawable.y;
-	if(dest == screenInfo.screens[0]->root) {
-	    x -= screenInfo.screens[0]->x;
-	    y -= screenInfo.screens[0]->y;
-	}
-    }
-
-    x += stuff->dstX;
-    y += stuff->dstY;
-
-    if (x < pSprite->physLimits.x1)
-	x = pSprite->physLimits.x1;
-    else if (x >= pSprite->physLimits.x2)
-	x = pSprite->physLimits.x2 - 1;
-    if (y < pSprite->physLimits.y1)
-	y = pSprite->physLimits.y1;
-    else if (y >= pSprite->physLimits.y2)
-	y = pSprite->physLimits.y2 - 1;
-    if (pSprite->hotShape)
-	ConfineToShape(PickPointer(client), pSprite->hotShape, &x, &y);
-
-    XineramaSetCursorPosition(PickPointer(client), x, y, TRUE);
-
-    return Success;
-}
-
-#endif
-
-
-/**
- * Server-side protocol handling for WarpPointer request.
- * Warps the cursor position to the coordinates given in the request.
- */
-int
-ProcWarpPointer(ClientPtr client)
-{
-    WindowPtr	dest = NULL;
-    int		x, y, rc;
-    ScreenPtr	newScreen;
-    DeviceIntPtr dev, tmp;
-    SpritePtr   pSprite;
-
-    REQUEST(xWarpPointerReq);
-    REQUEST_SIZE_MATCH(xWarpPointerReq);
-
-    dev = PickPointer(client);
-
-    for (tmp = inputInfo.devices; tmp; tmp = tmp->next) {
-        if ((tmp == dev) || (!IsMaster(tmp) && tmp->u.master == dev)) {
-	    rc = XaceHook(XACE_DEVICE_ACCESS, client, dev, DixWriteAccess);
-	    if (rc != Success)
-		return rc;
-	}
-    }
-
-    if (dev->u.lastSlave)
-        dev = dev->u.lastSlave;
-    pSprite = dev->spriteInfo->sprite;
-
-#ifdef PANORAMIX
-    if(!noPanoramiXExtension)
-	return XineramaWarpPointer(client);
-#endif
-
-    if (stuff->dstWid != None) {
-	rc = dixLookupWindow(&dest, stuff->dstWid, client, DixGetAttrAccess);
-	if (rc != Success)
-	    return rc;
-    }
-    x = pSprite->hotPhys.x;
-    y = pSprite->hotPhys.y;
-
-    if (stuff->srcWid != None)
-    {
-	int     winX, winY;
-	XID	winID = stuff->srcWid;
-        WindowPtr source;
-
-	rc = dixLookupWindow(&source, winID, client, DixGetAttrAccess);
-	if (rc != Success)
-	    return rc;
-
-	winX = source->drawable.x;
-	winY = source->drawable.y;
-	if (source->drawable.pScreen != pSprite->hotPhys.pScreen ||
-	    x < winX + stuff->srcX ||
-	    y < winY + stuff->srcY ||
-	    (stuff->srcWidth != 0 &&
-	     winX + stuff->srcX + (int)stuff->srcWidth < x) ||
-	    (stuff->srcHeight != 0 &&
-	     winY + stuff->srcY + (int)stuff->srcHeight < y) ||
-	    !PointInWindowIsVisible(source, x, y))
-	    return Success;
-    }
-    if (dest)
-    {
-	x = dest->drawable.x;
-	y = dest->drawable.y;
-	newScreen = dest->drawable.pScreen;
-    } else
-	newScreen = pSprite->hotPhys.pScreen;
-
-    x += stuff->dstX;
-    y += stuff->dstY;
-
-    if (x < 0)
-	x = 0;
-    else if (x >= newScreen->width)
-	x = newScreen->width - 1;
-    if (y < 0)
-	y = 0;
-    else if (y >= newScreen->height)
-	y = newScreen->height - 1;
-
-    if (newScreen == pSprite->hotPhys.pScreen)
-    {
-	if (x < pSprite->physLimits.x1)
-	    x = pSprite->physLimits.x1;
-	else if (x >= pSprite->physLimits.x2)
-	    x = pSprite->physLimits.x2 - 1;
-	if (y < pSprite->physLimits.y1)
-	    y = pSprite->physLimits.y1;
-	else if (y >= pSprite->physLimits.y2)
-	    y = pSprite->physLimits.y2 - 1;
-	if (pSprite->hotShape)
-	    ConfineToShape(dev, pSprite->hotShape, &x, &y);
-        (*newScreen->SetCursorPosition)(dev, newScreen, x, y, TRUE);
-    }
-    else if (!PointerConfinedToScreen(dev))
-    {
-	NewCurrentScreen(dev, newScreen, x, y);
-    }
-    return Success;
-}
-
-static Bool
-BorderSizeNotEmpty(DeviceIntPtr pDev, WindowPtr pWin)
-{
-     if(RegionNotEmpty(&pWin->borderSize))
-	return TRUE;
-
-#ifdef PANORAMIX
-     if(!noPanoramiXExtension && XineramaSetWindowPntrs(pDev, pWin)) {
-	int i;
-
-	for(i = 1; i < PanoramiXNumScreens; i++) {
-	    if(RegionNotEmpty(&pDev->spriteInfo->sprite->windows[i]->borderSize))
-		return TRUE;
-	}
-     }
-#endif
-     return FALSE;
-}
-
-/**
- * "CheckPassiveGrabsOnWindow" checks to see if the event passed in causes a
- * passive grab set on the window to be activated.
- * If activate is true and a passive grab is found, it will be activated,
- * and the event will be delivered to the client.
- *
- * @param pWin The window that may be subject to a passive grab.
- * @param device Device that caused the event.
- * @param event The current device event.
- * @param checkCore Check for core grabs too.
- * @param activate If a grab is found, activate it and deliver the event.
- */
-
-GrabPtr
-CheckPassiveGrabsOnWindow(
-    WindowPtr pWin,
-    DeviceIntPtr device,
-    DeviceEvent *event,
-    BOOL checkCore,
-    BOOL activate)
-{
-    SpritePtr pSprite = device->spriteInfo->sprite;
-    GrabPtr grab = wPassiveGrabs(pWin);
-    GrabRec tempGrab;
-    GrabInfoPtr grabinfo;
-#define CORE_MATCH      0x1
-#define XI_MATCH        0x2
-#define XI2_MATCH        0x4
-    int match = 0;
-
-    if (!grab)
-	return NULL;
-    /* Fill out the grab details, but leave the type for later before
-     * comparing */
-    tempGrab.window = pWin;
-    tempGrab.device = device;
-    tempGrab.detail.exact = event->detail.key;
-    tempGrab.detail.pMask = NULL;
-    tempGrab.modifiersDetail.pMask = NULL;
-    tempGrab.next = NULL;
-    for (; grab; grab = grab->next)
-    {
-	DeviceIntPtr	gdev;
-	XkbSrvInfoPtr	xkbi = NULL;
-
-	gdev= grab->modifierDevice;
-        if (grab->grabtype == GRABTYPE_CORE)
-        {
-            if (IsPointerDevice(device))
-                gdev = GetPairedDevice(device);
-            else
-                gdev = device;
-        } else if (grab->grabtype == GRABTYPE_XI2)
-        {
-            /* if the device is an attached slave device, gdev must be the
-             * attached master keyboard. Since the slave may have been
-             * reattached after the grab, the modifier device may not be the
-             * same. */
-            if (!IsMaster(grab->device) && device->u.master)
-                gdev = GetMaster(device, MASTER_KEYBOARD);
-        }
-
-
-        if (gdev && gdev->key)
-            xkbi= gdev->key->xkbInfo;
-	tempGrab.modifierDevice = grab->modifierDevice;
-        tempGrab.modifiersDetail.exact = xkbi ? xkbi->state.grab_mods : 0;
-
-        /* Check for XI2 and XI grabs first */
-        tempGrab.type = GetXI2Type((InternalEvent*)event);
-        tempGrab.grabtype = GRABTYPE_XI2;
-        if (GrabMatchesSecond(&tempGrab, grab, FALSE))
-            match = XI2_MATCH;
-
-        tempGrab.detail.exact = event->detail.key;
-        if (!match)
-        {
-            tempGrab.grabtype = GRABTYPE_XI;
-            if ((tempGrab.type = GetXIType((InternalEvent*)event)) &&
-                (GrabMatchesSecond(&tempGrab, grab, FALSE)))
-                match = XI_MATCH;
-        }
-
-        /* Check for a core grab (ignore the device when comparing) */
-        if (!match && checkCore)
-        {
-            tempGrab.grabtype = GRABTYPE_CORE;
-            if ((tempGrab.type = GetCoreType((InternalEvent*)event)) &&
-                (GrabMatchesSecond(&tempGrab, grab, TRUE)))
-                match = CORE_MATCH;
-        }
-
-        if (match && (!grab->confineTo ||
-	     (grab->confineTo->realized &&
-				BorderSizeNotEmpty(device, grab->confineTo))))
-	{
-            int rc, count = 0;
-            xEvent *xE = NULL;
-            xEvent core;
-
-            event->corestate &= 0x1f00;
-            event->corestate |= tempGrab.modifiersDetail.exact & (~0x1f00);
-            grabinfo = &device->deviceGrab;
-            /* In some cases a passive core grab may exist, but the client
-             * already has a core grab on some other device. In this case we
-             * must not get the grab, otherwise we may never ungrab the
-             * device.
-             */
-
-            if (grab->grabtype == GRABTYPE_CORE)
-            {
-                DeviceIntPtr other;
-                BOOL interfering = FALSE;
-
-                /* A passive grab may have been created for a different device
-                   than it is assigned to at this point in time.
-                   Update the grab's device and modifier device to reflect the
-                   current state.
-                   Since XGrabDeviceButton requires to specify the
-                   modifierDevice explicitly, we don't override this choice.
-                   */
-                if (tempGrab.type < GenericEvent)
-                {
-                    grab->device = device;
-                    grab->modifierDevice = GetPairedDevice(device);
-                }
-
-                for (other = inputInfo.devices; other; other = other->next)
-                {
-                    GrabPtr othergrab = other->deviceGrab.grab;
-                    if (othergrab && othergrab->grabtype == GRABTYPE_CORE &&
-                        SameClient(grab, rClient(othergrab)) &&
-                        ((IsPointerDevice(grab->device) &&
-                         IsPointerDevice(othergrab->device)) ||
-                         (IsKeyboardDevice(grab->device) &&
-                          IsKeyboardDevice(othergrab->device))))
-                    {
-                        interfering = TRUE;
-                        break;
-                    }
-                }
-                if (interfering)
-                    continue;
-            }
-
-            if (!activate)
-                return grab;
-
-            if (match & CORE_MATCH)
-            {
-                rc = EventToCore((InternalEvent*)event, &core);
-                if (rc != Success)
-                {
-                    if (rc != BadMatch)
-                        ErrorF("[dix] %s: core conversion failed in CPGFW "
-                                "(%d, %d).\n", device->name, event->type, rc);
-                    continue;
-                }
-                xE = &core;
-                count = 1;
-            } else if (match & XI2_MATCH)
-            {
-                rc = EventToXI2((InternalEvent*)event, &xE);
-                if (rc != Success)
-                {
-                    if (rc != BadMatch)
-                        ErrorF("[dix] %s: XI2 conversion failed in CPGFW "
-                                "(%d, %d).\n", device->name, event->type, rc);
-                    continue;
-                }
-                count = 1;
-            } else
-            {
-                rc = EventToXI((InternalEvent*)event, &xE, &count);
-                if (rc != Success)
-                {
-                    if (rc != BadMatch)
-                        ErrorF("[dix] %s: XI conversion failed in CPGFW "
-                                "(%d, %d).\n", device->name, event->type, rc);
-                    continue;
-                }
-            }
-
-	    (*grabinfo->ActivateGrab)(device, grab, currentTime, TRUE);
-
-            if (xE)
-            {
-                FixUpEventFromWindow(pSprite, xE, grab->window, None, TRUE);
-
-                TryClientEvents(rClient(grab), device, xE, count,
-                                       GetEventFilter(device, xE),
-                                       GetEventFilter(device, xE), grab);
-            }
-
-	    if (grabinfo->sync.state == FROZEN_NO_EVENT)
-	    {
-                if (!grabinfo->sync.event)
-                    grabinfo->sync.event = calloc(1, sizeof(InternalEvent));
-                *grabinfo->sync.event = *event;
-		grabinfo->sync.state = FROZEN_WITH_EVENT;
-            }
-
-            if (match & (XI_MATCH | XI2_MATCH))
-                free(xE); /* on core match xE == &core */
-	    return grab;
-	}
-    }
-    return NULL;
-#undef CORE_MATCH
-#undef XI_MATCH
-#undef XI2_MATCH
-}
-
-/**
- * CheckDeviceGrabs handles both keyboard and pointer events that may cause
- * a passive grab to be activated.
- *
- * If the event is a keyboard event, the ancestors of the focus window are
- * traced down and tried to see if they have any passive grabs to be
- * activated.  If the focus window itself is reached and it's descendants
- * contain the pointer, the ancestors of the window that the pointer is in
- * are then traced down starting at the focus window, otherwise no grabs are
- * activated.
- * If the event is a pointer event, the ancestors of the window that the
- * pointer is in are traced down starting at the root until CheckPassiveGrabs
- * causes a passive grab to activate or all the windows are
- * tried. PRH
- *
- * If a grab is activated, the event has been sent to the client already!
- *
- * The event we pass in must always be an XI event. From this, we then emulate
- * the core event and then check for grabs.
- *
- * @param device The device that caused the event.
- * @param xE The event to handle (Device{Button|Key}Press).
- * @param count Number of events in list.
- * @return TRUE if a grab has been activated or false otherwise.
-*/
-
-Bool
-CheckDeviceGrabs(DeviceIntPtr device, DeviceEvent *event, WindowPtr ancestor)
-{
-    int i;
-    WindowPtr pWin = NULL;
-    FocusClassPtr focus = IsPointerEvent((InternalEvent*)event) ? NULL : device->focus;
-    BOOL sendCore = (IsMaster(device) && device->coreEvents);
-
-    if (event->type != ET_ButtonPress &&
-        event->type != ET_KeyPress)
-        return FALSE;
-
-    if (event->type == ET_ButtonPress
-        && (device->button->buttonsDown != 1))
-	return FALSE;
-
-    if (device->deviceGrab.grab)
-        return FALSE;
-
-    i = 0;
-    if (ancestor)
-    {
-        while (i < device->spriteInfo->sprite->spriteTraceGood)
-            if (device->spriteInfo->sprite->spriteTrace[i++] == ancestor)
-                break;
-        if (i == device->spriteInfo->sprite->spriteTraceGood)
-            return FALSE;
-    }
-
-    if (focus)
-    {
-	for (; i < focus->traceGood; i++)
-	{
-	    pWin = focus->trace[i];
-	    if (CheckPassiveGrabsOnWindow(pWin, device, event, sendCore, TRUE))
-		return TRUE;
-	}
-
-	if ((focus->win == NoneWin) ||
-	    (i >= device->spriteInfo->sprite->spriteTraceGood) ||
-	    (pWin && pWin != device->spriteInfo->sprite->spriteTrace[i-1]))
-	    return FALSE;
-    }
-
-    for (; i < device->spriteInfo->sprite->spriteTraceGood; i++)
-    {
-	pWin = device->spriteInfo->sprite->spriteTrace[i];
-	if (CheckPassiveGrabsOnWindow(pWin, device, event, sendCore, TRUE))
-	    return TRUE;
-    }
-
-    return FALSE;
-}
-
-/**
- * Called for keyboard events to deliver event to whatever client owns the
- * focus.
- *
- * The event is delivered to the keyboard's focus window, the root window or
- * to the window owning the input focus.
- *
- * @param keybd The keyboard originating the event.
- * @param event The event, not yet in wire format.
- * @param window Window underneath the sprite.
- */
-void
-DeliverFocusedEvent(DeviceIntPtr keybd, InternalEvent *event, WindowPtr window)
-{
-    DeviceIntPtr ptr;
-    WindowPtr focus = keybd->focus->win;
-    BOOL sendCore = (IsMaster(keybd) && keybd->coreEvents);
-    xEvent core;
-    xEvent *xE = NULL, *xi2 = NULL;
-    int count, rc;
-    int deliveries = 0;
-
-    if (focus == FollowKeyboardWin)
-	focus = inputInfo.keyboard->focus->win;
-    if (!focus)
-	return;
-    if (focus == PointerRootWin)
-    {
-	DeliverDeviceEvents(window, event, NullGrab, NullWindow, keybd);
-	return;
-    }
-    if ((focus == window) || IsParent(focus, window))
-    {
-	if (DeliverDeviceEvents(window, event, NullGrab, focus, keybd))
-	    return;
-    }
-
-    /* just deliver it to the focus window */
-    ptr = GetPairedDevice(keybd);
-
-
-    rc = EventToXI2(event, &xi2);
-    if (rc == Success)
-    {
-        /* XXX: XACE */
-        int filter = GetEventFilter(keybd, xi2);
-        FixUpEventFromWindow(ptr->spriteInfo->sprite, xi2, focus, None, FALSE);
-        deliveries = DeliverEventsToWindow(keybd, focus, xi2, 1,
-                                           filter, NullGrab);
-        if (deliveries > 0)
-            goto unwind;
-    } else if (rc != BadMatch)
-        ErrorF("[dix] %s: XI2 conversion failed in DFE (%d, %d). Skipping delivery.\n",
-               keybd->name, event->any.type, rc);
-
-    rc = EventToXI(event, &xE, &count);
-    if (rc == Success &&
-        XaceHook(XACE_SEND_ACCESS, NULL, keybd, focus, xE, count) == Success)
-    {
-        FixUpEventFromWindow(ptr->spriteInfo->sprite, xE, focus, None, FALSE);
-        deliveries = DeliverEventsToWindow(keybd, focus, xE, count,
-                GetEventFilter(keybd, xE),
-                NullGrab);
-
-        if (deliveries > 0)
-            goto unwind;
-    } else if (rc != BadMatch)
-        ErrorF("[dix] %s: XI conversion failed in DFE (%d, %d). Skipping delivery.\n",
-               keybd->name, event->any.type, rc);
-
-    if (sendCore)
-    {
-        rc = EventToCore(event, &core);
-        if (rc == Success) {
-            if (XaceHook(XACE_SEND_ACCESS, NULL, keybd, focus, &core, 1) == Success) {
-                FixUpEventFromWindow(keybd->spriteInfo->sprite, &core, focus,
-                                     None, FALSE);
-                deliveries = DeliverEventsToWindow(keybd, focus, &core, 1,
-                                                   GetEventFilter(keybd, &core),
-                                                   NullGrab);
-            }
-        } else if (rc != BadMatch)
-            ErrorF("[dix] %s: core conversion failed DFE (%d, %d). Skipping delivery.\n",
-                    keybd->name, event->any.type, rc);
-    }
-
-unwind:
-    free(xE);
-    free(xi2);
-    return;
-}
-
-/**
- * Deliver an event from a device that is currently grabbed. Uses
- * DeliverDeviceEvents() for further delivery if a ownerEvents is set on the
- * grab. If not, TryClientEvents() is used.
- *
- * @param deactivateGrab True if the device's grab should be deactivated.
- */
-void
-DeliverGrabbedEvent(InternalEvent *event, DeviceIntPtr thisDev,
-                    Bool deactivateGrab)
-{
-    GrabPtr grab;
-    GrabInfoPtr grabinfo;
-    int deliveries = 0;
-    DeviceIntPtr dev;
-    SpritePtr pSprite = thisDev->spriteInfo->sprite;
-    BOOL sendCore = FALSE;
-    int rc, count = 0;
-    xEvent *xi = NULL;
-    xEvent *xi2 = NULL;
-
-    grabinfo = &thisDev->deviceGrab;
-    grab = grabinfo->grab;
-
-    if (grab->ownerEvents)
-    {
-	WindowPtr focus;
-
-        /* Hack: Some pointer device have a focus class. So we need to check
-         * for the type of event, to see if we really want to deliver it to
-         * the focus window. For pointer events, the answer is no.
-         */
-        if (IsPointerEvent(event))
-            focus = PointerRootWin;
-        else if (thisDev->focus)
-	{
-	    focus = thisDev->focus->win;
-	    if (focus == FollowKeyboardWin)
-		focus = inputInfo.keyboard->focus->win;
-	}
-	else
-	    focus = PointerRootWin;
-	if (focus == PointerRootWin)
-	    deliveries = DeliverDeviceEvents(pSprite->win, event, grab,
-                                             NullWindow, thisDev);
-	else if (focus && (focus == pSprite->win ||
-                    IsParent(focus, pSprite->win)))
-	    deliveries = DeliverDeviceEvents(pSprite->win, event, grab, focus,
-					     thisDev);
-	else if (focus)
-	    deliveries = DeliverDeviceEvents(focus, event, grab, focus,
-					     thisDev);
-    }
-    if (!deliveries)
-    {
-        Mask mask;
-
-        /* XXX: In theory, we could pass the internal events through to
-         * everything and only convert just before hitting the wire. We can't
-         * do that yet, so DGE is the last stop for internal events. From here
-         * onwards, we deal with core/XI events.
-         */
-
-        mask = grab->eventMask;
-
-        sendCore = (IsMaster(thisDev) && thisDev->coreEvents);
-        /* try core event */
-        if (sendCore && grab->grabtype == GRABTYPE_CORE)
-        {
-            xEvent core;
-
-            rc = EventToCore(event, &core);
-            if (rc == Success)
-            {
-                FixUpEventFromWindow(pSprite, &core, grab->window, None, TRUE);
-                if (XaceHook(XACE_SEND_ACCESS, 0, thisDev,
-                            grab->window, &core, 1) ||
-                        XaceHook(XACE_RECEIVE_ACCESS, rClient(grab),
-                            grab->window, &core, 1))
-                    deliveries = 1; /* don't send, but pretend we did */
-                else if (!IsInterferingGrab(rClient(grab), thisDev, &core))
-                {
-                    deliveries = TryClientEvents(rClient(grab), thisDev,
-                            &core, 1, mask,
-                            GetEventFilter(thisDev, &core),
-                            grab);
-                }
-            } else if (rc != BadMatch)
-                ErrorF("[dix] DeliverGrabbedEvent. Core conversion failed.\n");
-        }
-
-        if (!deliveries)
-        {
-            rc = EventToXI2(event, &xi2);
-            if (rc == Success)
-            {
-                int evtype = ((xGenericEvent*)xi2)->evtype;
-                mask = grab->xi2mask[XIAllDevices][evtype/8] |
-                    grab->xi2mask[XIAllMasterDevices][evtype/8] |
-                    grab->xi2mask[thisDev->id][evtype/8];
-                /* try XI2 event */
-                FixUpEventFromWindow(pSprite, xi2, grab->window, None, TRUE);
-                /* XXX: XACE */
-                deliveries = TryClientEvents(rClient(grab), thisDev, xi2, 1, mask,
-                        GetEventFilter(thisDev, xi2), grab);
-            } else if (rc != BadMatch)
-                ErrorF("[dix] %s: XI2 conversion failed in DGE (%d, %d). Skipping delivery.\n",
-                        thisDev->name, event->any.type, rc);
-        }
-
-        if (!deliveries)
-        {
-            rc = EventToXI(event, &xi, &count);
-            if (rc == Success)
-            {
-                /* try XI event */
-                if (grabinfo->fromPassiveGrab  &&
-                        grabinfo->implicitGrab)
-                    mask = grab->deviceMask;
-                else
-                    mask = grab->eventMask;
-
-                FixUpEventFromWindow(pSprite, xi, grab->window, None, TRUE);
-
-                if (XaceHook(XACE_SEND_ACCESS, 0, thisDev,
-                            grab->window, xi, count) ||
-                        XaceHook(XACE_RECEIVE_ACCESS, rClient(grab),
-                            grab->window, xi, count))
-                    deliveries = 1; /* don't send, but pretend we did */
-                else
-                {
-                    deliveries =
-                        TryClientEvents(rClient(grab), thisDev,
-                                xi, count,
-                                mask,
-                                GetEventFilter(thisDev, xi),
-                                grab);
-                }
-            } else if (rc != BadMatch)
-                ErrorF("[dix] %s: XI conversion failed in DGE (%d, %d). Skipping delivery.\n",
-                        thisDev->name, event->any.type, rc);
-        }
-
-        if (deliveries && (event->any.type == ET_Motion))
-            thisDev->valuator->motionHintWindow = grab->window;
-    }
-    if (deliveries && !deactivateGrab && event->any.type != ET_Motion)
-    {
-	switch (grabinfo->sync.state)
-	{
-	case FREEZE_BOTH_NEXT_EVENT:
-	    for (dev = inputInfo.devices; dev; dev = dev->next)
-	    {
-		if (dev == thisDev)
-		    continue;
-		FreezeThaw(dev, TRUE);
-		if ((dev->deviceGrab.sync.state == FREEZE_BOTH_NEXT_EVENT) &&
-		    (CLIENT_BITS(grab->resource) ==
-		     CLIENT_BITS(dev->deviceGrab.grab->resource)))
-		    dev->deviceGrab.sync.state = FROZEN_NO_EVENT;
-		else if (GetPairedDevice(thisDev) == dev)
-                    dev->deviceGrab.sync.other = grab;
-	    }
-	    /* fall through */
-	case FREEZE_NEXT_EVENT:
-	    grabinfo->sync.state = FROZEN_WITH_EVENT;
-	    FreezeThaw(thisDev, TRUE);
-	    if (!grabinfo->sync.event)
-		grabinfo->sync.event = calloc(1, sizeof(InternalEvent));
-	    *grabinfo->sync.event = event->device_event;
-	    break;
-	}
-    }
-
-    free(xi);
-    free(xi2);
-}
-
-/* This function is used to set the key pressed or key released state -
-   this is only used when the pressing of keys does not cause
-   the device's processInputProc to be called, as in for example Mouse Keys.
-*/
-void
-FixKeyState (DeviceEvent *event, DeviceIntPtr keybd)
-{
-    int key = event->detail.key;
-
-    if (event->type == ET_KeyPress) {
-	DebugF("FixKeyState: Key %d %s\n",key,
-               ((event->type == ET_KeyPress) ? "down" : "up"));
-    }
-
-    if (event->type == ET_KeyPress)
-        set_key_down(keybd, key, KEY_PROCESSED);
-    else if (event->type == ET_KeyRelease)
-        set_key_up(keybd, key, KEY_PROCESSED);
-    else
-        FatalError("Impossible keyboard event");
-}
-
-#define AtMostOneClient \
-	(SubstructureRedirectMask | ResizeRedirectMask | ButtonPressMask)
-#define ManagerMask \
-	(SubstructureRedirectMask | ResizeRedirectMask)
-
-/**
- * Recalculate which events may be deliverable for the given window.
- * Recalculated mask is used for quicker determination which events may be
- * delivered to a window.
- *
- * The otherEventMasks on a WindowOptional is the combination of all event
- * masks set by all clients on the window.
- * deliverableEventMask is the combination of the eventMask and the
- * otherEventMask plus the events that may be propagated to the parent.
- *
- * Traverses to siblings and parents of the window.
- */
-void
-RecalculateDeliverableEvents(WindowPtr pWin)
-{
-    OtherClients *others;
-    WindowPtr pChild;
-
-    pChild = pWin;
-    while (1)
-    {
-	if (pChild->optional)
-	{
-	    pChild->optional->otherEventMasks = 0;
-	    for (others = wOtherClients(pChild); others; others = others->next)
-	    {
-		pChild->optional->otherEventMasks |= others->mask;
-	    }
-	}
-	pChild->deliverableEvents = pChild->eventMask|
-				    wOtherEventMasks(pChild);
-	if (pChild->parent)
-	    pChild->deliverableEvents |=
-		(pChild->parent->deliverableEvents &
-		 ~wDontPropagateMask(pChild) & PropagateMask);
-	if (pChild->firstChild)
-	{
-	    pChild = pChild->firstChild;
-	    continue;
-	}
-	while (!pChild->nextSib && (pChild != pWin))
-	    pChild = pChild->parent;
-	if (pChild == pWin)
-	    break;
-	pChild = pChild->nextSib;
-    }
-}
-
-/**
- *
- *  \param value must conform to DeleteType
- */
-int
-OtherClientGone(pointer value, XID id)
-{
-    OtherClientsPtr other, prev;
-    WindowPtr pWin = (WindowPtr)value;
-
-    prev = 0;
-    for (other = wOtherClients(pWin); other; other = other->next)
-    {
-	if (other->resource == id)
-	{
-	    if (prev)
-		prev->next = other->next;
-	    else
-	    {
-		if (!(pWin->optional->otherClients = other->next))
-		    CheckWindowOptionalNeed (pWin);
-	    }
-	    free(other);
-	    RecalculateDeliverableEvents(pWin);
-	    return Success;
-	}
-	prev = other;
-    }
-    FatalError("client not on event list");
-    /*NOTREACHED*/
-    return -1; /* make compiler happy */
-}
-
-int
-EventSelectForWindow(WindowPtr pWin, ClientPtr client, Mask mask)
-{
-    Mask check;
-    OtherClients * others;
-    DeviceIntPtr dev;
-    int rc;
-
-    if (mask & ~AllEventMasks)
-    {
-	client->errorValue = mask;
-	return BadValue;
-    }
-    check = (mask & ManagerMask);
-    if (check) {
-	rc = XaceHook(XACE_RESOURCE_ACCESS, client, pWin->drawable.id,
-		      RT_WINDOW, pWin, RT_NONE, NULL, DixManageAccess);
-	if (rc != Success)
-	    return rc;
-    }
-    check = (mask & AtMostOneClient);
-    if (check & (pWin->eventMask|wOtherEventMasks(pWin)))
-    {				       /* It is illegal for two different
-				          clients to select on any of the
-				          events for AtMostOneClient. However,
-				          it is OK, for some client to
-				          continue selecting on one of those
-				          events.  */
-	if ((wClient(pWin) != client) && (check & pWin->eventMask))
-	    return BadAccess;
-	for (others = wOtherClients (pWin); others; others = others->next)
-	{
-	    if (!SameClient(others, client) && (check & others->mask))
-		return BadAccess;
-	}
-    }
-    if (wClient (pWin) == client)
-    {
-	check = pWin->eventMask;
-	pWin->eventMask = mask;
-    }
-    else
-    {
-	for (others = wOtherClients (pWin); others; others = others->next)
-	{
-	    if (SameClient(others, client))
-	    {
-		check = others->mask;
-		if (mask == 0)
-		{
-		    FreeResource(others->resource, RT_NONE);
-		    return Success;
-		}
-		else
-		    others->mask = mask;
-		goto maskSet;
-	    }
-	}
-	check = 0;
-	if (!pWin->optional && !MakeWindowOptional (pWin))
-	    return BadAlloc;
-	others = malloc(sizeof(OtherClients));
-	if (!others)
-	    return BadAlloc;
-	others->mask = mask;
-	others->resource = FakeClientID(client->index);
-	others->next = pWin->optional->otherClients;
-	pWin->optional->otherClients = others;
-	if (!AddResource(others->resource, RT_OTHERCLIENT, (pointer)pWin))
-	    return BadAlloc;
-    }
-maskSet:
-    if ((mask & PointerMotionHintMask) && !(check & PointerMotionHintMask))
-    {
-        for (dev = inputInfo.devices; dev; dev = dev->next)
-        {
-            if (dev->valuator && dev->valuator->motionHintWindow == pWin)
-                dev->valuator->motionHintWindow = NullWindow;
-        }
-    }
-    RecalculateDeliverableEvents(pWin);
-    return Success;
-}
-
-int
-EventSuppressForWindow(WindowPtr pWin, ClientPtr client,
-                       Mask mask, Bool *checkOptional)
-{
-    int i, free;
-
-    if (mask & ~PropagateMask)
-    {
-	client->errorValue = mask;
-	return BadValue;
-    }
-    if (pWin->dontPropagate)
-	DontPropagateRefCnts[pWin->dontPropagate]--;
-    if (!mask)
-	i = 0;
-    else
-    {
-	for (i = DNPMCOUNT, free = 0; --i > 0; )
-	{
-	    if (!DontPropagateRefCnts[i])
-		free = i;
-	    else if (mask == DontPropagateMasks[i])
-		break;
-	}
-	if (!i && free)
-	{
-	    i = free;
-	    DontPropagateMasks[i] = mask;
-	}
-    }
-    if (i || !mask)
-    {
-	pWin->dontPropagate = i;
-	if (i)
-	    DontPropagateRefCnts[i]++;
-	if (pWin->optional)
-	{
-	    pWin->optional->dontPropagateMask = mask;
-	    *checkOptional = TRUE;
-	}
-    }
-    else
-    {
-	if (!pWin->optional && !MakeWindowOptional (pWin))
-	{
-	    if (pWin->dontPropagate)
-		DontPropagateRefCnts[pWin->dontPropagate]++;
-	    return BadAlloc;
-	}
-	pWin->dontPropagate = 0;
-        pWin->optional->dontPropagateMask = mask;
-    }
-    RecalculateDeliverableEvents(pWin);
-    return Success;
-}
-
-/**
- * Assembles an EnterNotify or LeaveNotify and sends it event to the client.
- * Uses the paired keyboard to get some additional information.
- */
-void
-CoreEnterLeaveEvent(
-    DeviceIntPtr mouse,
-    int type,
-    int mode,
-    int detail,
-    WindowPtr pWin,
-    Window child)
-{
-    xEvent              event;
-    WindowPtr		focus;
-    DeviceIntPtr        keybd;
-    GrabPtr	        grab = mouse->deviceGrab.grab;
-    Mask		mask;
-
-    keybd = GetPairedDevice(mouse);
-
-    if ((pWin == mouse->valuator->motionHintWindow) &&
-	(detail != NotifyInferior))
-	mouse->valuator->motionHintWindow = NullWindow;
-    if (grab)
-    {
-	mask = (pWin == grab->window) ? grab->eventMask : 0;
-	if (grab->ownerEvents)
-	    mask |= EventMaskForClient(pWin, rClient(grab));
-    }
-    else
-    {
-	mask = pWin->eventMask | wOtherEventMasks(pWin);
-    }
-
-    memset(&event, 0, sizeof(xEvent));
-    event.u.u.type = type;
-    event.u.u.detail = detail;
-    event.u.enterLeave.time = currentTime.milliseconds;
-    event.u.enterLeave.rootX = mouse->spriteInfo->sprite->hot.x;
-    event.u.enterLeave.rootY = mouse->spriteInfo->sprite->hot.y;
-    /* Counts on the same initial structure of crossing & button events! */
-    FixUpEventFromWindow(mouse->spriteInfo->sprite, &event, pWin, None, FALSE);
-    /* Enter/Leave events always set child */
-    event.u.enterLeave.child = child;
-    event.u.enterLeave.flags = event.u.keyButtonPointer.sameScreen ?
-        ELFlagSameScreen : 0;
-    event.u.enterLeave.state = mouse->button ? (mouse->button->state & 0x1f00) : 0;
-    if (keybd)
-        event.u.enterLeave.state |=
-                XkbGrabStateFromRec(&keybd->key->xkbInfo->state);
-    event.u.enterLeave.mode = mode;
-    focus = (keybd) ? keybd->focus->win : None;
-    if ((focus != NoneWin) &&
-            ((pWin == focus) || (focus == PointerRootWin) ||
-             IsParent(focus, pWin)))
-        event.u.enterLeave.flags |= ELFlagFocus;
-
-    if ((mask & GetEventFilter(mouse, &event)))
-    {
-        if (grab)
-            TryClientEvents(rClient(grab), mouse, &event, 1, mask,
-                            GetEventFilter(mouse, &event), grab);
-        else
-            DeliverEventsToWindow(mouse, pWin, &event, 1,
-                                  GetEventFilter(mouse, &event),
-                                  NullGrab);
-    }
-
-    if ((type == EnterNotify) && (mask & KeymapStateMask))
-    {
-        xKeymapEvent ke;
-        ClientPtr client = grab ? rClient(grab) : wClient(pWin);
-        if (XaceHook(XACE_DEVICE_ACCESS, client, keybd, DixReadAccess))
-            memset((char *)&ke.map[0], 0, 31);
-        else
-            memmove((char *)&ke.map[0], (char *)&keybd->key->down[1], 31);
-
-        ke.type = KeymapNotify;
-        if (grab)
-            TryClientEvents(rClient(grab), keybd, (xEvent *)&ke, 1,
-                            mask, KeymapStateMask, grab);
-        else
-            DeliverEventsToWindow(mouse, pWin, (xEvent *)&ke, 1,
-                                  KeymapStateMask, NullGrab);
-    }
-}
-
-void
-DeviceEnterLeaveEvent(
-    DeviceIntPtr mouse,
-    int sourceid,
-    int type,
-    int mode,
-    int detail,
-    WindowPtr pWin,
-    Window child)
-{
-    GrabPtr             grab = mouse->deviceGrab.grab;
-    xXIEnterEvent       *event;
-    int                 filter;
-    int                 btlen, len, i;
-    DeviceIntPtr        kbd;
-
-    if ((mode == XINotifyPassiveGrab && type == XI_Leave) ||
-        (mode == XINotifyPassiveUngrab && type == XI_Enter))
-        return;
-
-    btlen = (mouse->button) ? bits_to_bytes(mouse->button->numButtons) : 0;
-    btlen = bytes_to_int32(btlen);
-    len = sizeof(xXIEnterEvent) + btlen * 4;
-
-    event = calloc(1, len);
-    event->type         = GenericEvent;
-    event->extension    = IReqCode;
-    event->evtype       = type;
-    event->length       = (len - sizeof(xEvent))/4;
-    event->buttons_len  = btlen;
-    event->detail       = detail;
-    event->time         = currentTime.milliseconds;
-    event->deviceid     = mouse->id;
-    event->sourceid     = sourceid;
-    event->mode         = mode;
-    event->root_x       = FP1616(mouse->spriteInfo->sprite->hot.x, 0);
-    event->root_y       = FP1616(mouse->spriteInfo->sprite->hot.y, 0);
-
-    for (i = 0; mouse && mouse->button && i < mouse->button->numButtons; i++)
-        if (BitIsOn(mouse->button->down, i))
-            SetBit(&event[1], i);
-
-    kbd = (IsMaster(mouse) || mouse->u.master) ? GetPairedDevice(mouse) : NULL;
-    if (kbd && kbd->key)
-    {
-        event->mods.base_mods = kbd->key->xkbInfo->state.base_mods;
-        event->mods.latched_mods = kbd->key->xkbInfo->state.latched_mods;
-        event->mods.locked_mods = kbd->key->xkbInfo->state.locked_mods;
-
-        event->group.base_group = kbd->key->xkbInfo->state.base_group;
-        event->group.latched_group = kbd->key->xkbInfo->state.latched_group;
-        event->group.locked_group = kbd->key->xkbInfo->state.locked_group;
-    }
-
-    FixUpEventFromWindow(mouse->spriteInfo->sprite, (xEvent*)event, pWin,
-                         None, FALSE);
-
-    filter = GetEventFilter(mouse, (xEvent*)event);
-
-    if (grab)
-    {
-        Mask mask;
-        mask = grab->xi2mask[XIAllDevices][type/8] |
-               grab->xi2mask[XIAllMasterDevices][type/8] |
-               grab->xi2mask[mouse->id][type/8];
-        TryClientEvents(rClient(grab), mouse, (xEvent*)event, 1, mask,
-                        filter, grab);
-    } else {
-        if (!GetWindowXI2Mask(mouse, pWin, (xEvent*)event))
-            goto out;
-        DeliverEventsToWindow(mouse, pWin, (xEvent*)event, 1, filter,
-                              NullGrab);
-    }
-
-out:
-    free(event);
-}
-
-void
-CoreFocusEvent(DeviceIntPtr dev, int type, int mode, int detail, WindowPtr pWin)
-{
-    xEvent event;
-
-    memset(&event, 0, sizeof(xEvent));
-    event.u.focus.mode = mode;
-    event.u.u.type = type;
-    event.u.u.detail = detail;
-    event.u.focus.window = pWin->drawable.id;
-
-    DeliverEventsToWindow(dev, pWin, &event, 1,
-                          GetEventFilter(dev, &event), NullGrab);
-    if ((type == FocusIn) &&
-            ((pWin->eventMask | wOtherEventMasks(pWin)) & KeymapStateMask))
-    {
-        xKeymapEvent ke;
-        ClientPtr client = wClient(pWin);
-        if (XaceHook(XACE_DEVICE_ACCESS, client, dev, DixReadAccess))
-            memset((char *)&ke.map[0], 0, 31);
-        else
-            memmove((char *)&ke.map[0], (char *)&dev->key->down[1], 31);
-
-        ke.type = KeymapNotify;
-        DeliverEventsToWindow(dev, pWin, (xEvent *)&ke, 1,
-                KeymapStateMask, NullGrab);
-    }
-}
-
-/**
- * Set the input focus to the given window. Subsequent keyboard events will be
- * delivered to the given window.
- *
- * Usually called from ProcSetInputFocus as result of a client request. If so,
- * the device is the inputInfo.keyboard.
- * If called from ProcXSetInputFocus as result of a client xinput request, the
- * device is set to the device specified by the client.
- *
- * @param client Client that requested input focus change.
- * @param dev Focus device.
- * @param focusID The window to obtain the focus. Can be PointerRoot or None.
- * @param revertTo Specifies where the focus reverts to when window becomes
- * unviewable.
- * @param ctime Specifies the time.
- * @param followOK True if pointer is allowed to follow the keyboard.
- */
-int
-SetInputFocus(
-    ClientPtr client,
-    DeviceIntPtr dev,
-    Window focusID,
-    CARD8 revertTo,
-    Time ctime,
-    Bool followOK)
-{
-    FocusClassPtr focus;
-    WindowPtr focusWin;
-    int mode, rc;
-    TimeStamp time;
-    DeviceIntPtr keybd; /* used for FollowKeyboard or FollowKeyboardWin */
-
-
-    UpdateCurrentTime();
-    if ((revertTo != RevertToParent) &&
-	(revertTo != RevertToPointerRoot) &&
-	(revertTo != RevertToNone) &&
-	((revertTo != RevertToFollowKeyboard) || !followOK))
-    {
-	client->errorValue = revertTo;
-	return BadValue;
-    }
-    time = ClientTimeToServerTime(ctime);
-
-    if (IsKeyboardDevice(dev))
-        keybd = dev;
-    else
-        keybd = GetPairedDevice(dev);
-
-    if ((focusID == None) || (focusID == PointerRoot))
-	focusWin = (WindowPtr)(long)focusID;
-    else if ((focusID == FollowKeyboard) && followOK)
-    {
-	focusWin = keybd->focus->win;
-    }
-    else {
-	rc = dixLookupWindow(&focusWin, focusID, client, DixSetAttrAccess);
-	if (rc != Success)
-	    return rc;
-	/* It is a match error to try to set the input focus to an
-	unviewable window. */
-	if(!focusWin->realized)
-	    return BadMatch;
-    }
-    rc = XaceHook(XACE_DEVICE_ACCESS, client, dev, DixSetFocusAccess);
-    if (rc != Success)
-	return Success;
-
-    focus = dev->focus;
-    if ((CompareTimeStamps(time, currentTime) == LATER) ||
-	(CompareTimeStamps(time, focus->time) == EARLIER))
-	return Success;
-    mode = (dev->deviceGrab.grab) ? NotifyWhileGrabbed : NotifyNormal;
-    if (focus->win == FollowKeyboardWin)
-    {
-        if (!ActivateFocusInGrab(dev, keybd->focus->win, focusWin))
-            DoFocusEvents(dev, keybd->focus->win, focusWin, mode);
-    } else
-    {
-        if (!ActivateFocusInGrab(dev, focus->win, focusWin))
-            DoFocusEvents(dev, focus->win, focusWin, mode);
-    }
-    focus->time = time;
-    focus->revert = revertTo;
-    if (focusID == FollowKeyboard)
-	focus->win = FollowKeyboardWin;
-    else
-	focus->win = focusWin;
-    if ((focusWin == NoneWin) || (focusWin == PointerRootWin))
-	focus->traceGood = 0;
-    else
-    {
-        int depth = 0;
-	WindowPtr pWin;
-
-        for (pWin = focusWin; pWin; pWin = pWin->parent) depth++;
-        if (depth > focus->traceSize)
-        {
-	    focus->traceSize = depth+1;
-	    focus->trace = realloc(focus->trace,
-				    focus->traceSize * sizeof(WindowPtr));
-	}
-	focus->traceGood = depth;
-        for (pWin = focusWin, depth--; pWin; pWin = pWin->parent, depth--)
-	    focus->trace[depth] = pWin;
-    }
-    return Success;
-}
-
-/**
- * Server-side protocol handling for SetInputFocus request.
- *
- * Sets the input focus for the virtual core keyboard.
- */
-int
-ProcSetInputFocus(ClientPtr client)
-{
-    DeviceIntPtr kbd = PickKeyboard(client);
-    REQUEST(xSetInputFocusReq);
-
-    REQUEST_SIZE_MATCH(xSetInputFocusReq);
-
-    return SetInputFocus(client, kbd, stuff->focus,
-			 stuff->revertTo, stuff->time, FALSE);
-}
-
-/**
- * Server-side protocol handling for GetInputFocus request.
- *
- * Sends the current input focus for the client's keyboard back to the
- * client.
- */
-int
-ProcGetInputFocus(ClientPtr client)
-{
-    DeviceIntPtr kbd = PickKeyboard(client);
-    xGetInputFocusReply rep;
-    FocusClassPtr focus = kbd->focus;
-    int rc;
-    /* REQUEST(xReq); */
-    REQUEST_SIZE_MATCH(xReq);
-
-    rc = XaceHook(XACE_DEVICE_ACCESS, client, kbd, DixGetFocusAccess);
-    if (rc != Success)
-	return rc;
-
-    memset(&rep, 0, sizeof(xGetInputFocusReply));
-    rep.type = X_Reply;
-    rep.length = 0;
-    rep.sequenceNumber = client->sequence;
-    if (focus->win == NoneWin)
-	rep.focus = None;
-    else if (focus->win == PointerRootWin)
-	rep.focus = PointerRoot;
-    else rep.focus = focus->win->drawable.id;
-    rep.revertTo = focus->revert;
-    WriteReplyToClient(client, sizeof(xGetInputFocusReply), &rep);
-    return Success;
-}
-
-/**
- * Server-side protocol handling for GrabPointer request.
- *
- * Sets an active grab on the client's ClientPointer and returns success
- * status to client.
- */
-int
-ProcGrabPointer(ClientPtr client)
-{
-    xGrabPointerReply rep;
-    DeviceIntPtr device = PickPointer(client);
-    GrabPtr grab;
-    GrabMask mask;
-    WindowPtr confineTo;
-    CursorPtr oldCursor;
-    REQUEST(xGrabPointerReq);
-    TimeStamp time;
-    int rc;
-
-    REQUEST_SIZE_MATCH(xGrabPointerReq);
-    UpdateCurrentTime();
-
-    if (stuff->eventMask & ~PointerGrabMask)
-    {
-	client->errorValue = stuff->eventMask;
-        return BadValue;
-    }
-
-    if (stuff->confineTo == None)
-	confineTo = NullWindow;
-    else
-    {
-	rc = dixLookupWindow(&confineTo, stuff->confineTo, client,
-			     DixSetAttrAccess);
-	if (rc != Success)
-	    return rc;
-    }
-
-    memset(&rep, 0, sizeof(xGrabPointerReply));
-    oldCursor = NullCursor;
-    grab = device->deviceGrab.grab;
-
-    if (grab)
-    {
-        if (grab->confineTo && !confineTo)
-            ConfineCursorToWindow(device, GetCurrentRootWindow(device), FALSE,
-                                  FALSE);
-        oldCursor = grab->cursor;
-    }
-
-    mask.core = stuff->eventMask;
-
-    rc = GrabDevice(client, device, stuff->pointerMode, stuff->keyboardMode,
-                    stuff->grabWindow, stuff->ownerEvents, stuff->time,
-                    &mask, GRABTYPE_CORE, stuff->cursor,
-                    stuff->confineTo, &rep.status);
-    if (rc != Success)
-        return rc;
-
-    if (oldCursor && rep.status == GrabSuccess)
-        FreeCursor (oldCursor, (Cursor)0);
-
-    time = ClientTimeToServerTime(stuff->time);
-    rep.type = X_Reply;
-    rep.sequenceNumber = client->sequence;
-    rep.length = 0;
-    WriteReplyToClient(client, sizeof(xGrabPointerReply), &rep);
-    return Success;
-}
-
-/**
- * Server-side protocol handling for ChangeActivePointerGrab request.
- *
- * Changes properties of the grab hold by the client. If the client does not
- * hold an active grab on the device, nothing happens.
- */
-int
-ProcChangeActivePointerGrab(ClientPtr client)
-{
-    DeviceIntPtr device;
-    GrabPtr      grab;
-    CursorPtr newCursor, oldCursor;
-    REQUEST(xChangeActivePointerGrabReq);
-    TimeStamp time;
-
-    REQUEST_SIZE_MATCH(xChangeActivePointerGrabReq);
-    if (stuff->eventMask & ~PointerGrabMask)
-    {
-	client->errorValue = stuff->eventMask;
-        return BadValue;
-    }
-    if (stuff->cursor == None)
-	newCursor = NullCursor;
-    else
-    {
-	int rc = dixLookupResourceByType((pointer *)&newCursor, stuff->cursor,
-					 RT_CURSOR, client, DixUseAccess);
-	if (rc != Success)
-	{
-	    client->errorValue = stuff->cursor;
-	    return rc;
-	}
-    }
-
-    device = PickPointer(client);
-    grab = device->deviceGrab.grab;
-
-    if (!grab)
-	return Success;
-    if (!SameClient(grab, client))
-	return Success;
-    time = ClientTimeToServerTime(stuff->time);
-    if ((CompareTimeStamps(time, currentTime) == LATER) ||
-	     (CompareTimeStamps(time, device->deviceGrab.grabTime) == EARLIER))
-	return Success;
-    oldCursor = grab->cursor;
-    grab->cursor = newCursor;
-    if (newCursor)
-	newCursor->refcnt++;
-    PostNewCursor(device);
-    if (oldCursor)
-	FreeCursor(oldCursor, (Cursor)0);
-    grab->eventMask = stuff->eventMask;
-    return Success;
-}
-
-/**
- * Server-side protocol handling for UngrabPointer request.
- *
- * Deletes a pointer grab on a device the client has grabbed.
- */
-int
-ProcUngrabPointer(ClientPtr client)
-{
-    DeviceIntPtr device = PickPointer(client);
-    GrabPtr grab;
-    TimeStamp time;
-    REQUEST(xResourceReq);
-
-    REQUEST_SIZE_MATCH(xResourceReq);
-    UpdateCurrentTime();
-    grab = device->deviceGrab.grab;
-
-    time = ClientTimeToServerTime(stuff->id);
-    if ((CompareTimeStamps(time, currentTime) != LATER) &&
-	    (CompareTimeStamps(time, device->deviceGrab.grabTime) != EARLIER) &&
-	    (grab) && SameClient(grab, client))
-	(*device->deviceGrab.DeactivateGrab)(device);
-    return Success;
-}
-
-/**
- * Sets a grab on the given device.
- *
- * Called from ProcGrabKeyboard to work on the client's keyboard.
- * Called from ProcXGrabDevice to work on the device specified by the client.
- *
- * The parameters this_mode and other_mode represent the keyboard_mode and
- * pointer_mode parameters of XGrabKeyboard().
- * See man page for details on all the parameters
- *
- * @param client Client that owns the grab.
- * @param dev The device to grab.
- * @param this_mode GrabModeSync or GrabModeAsync
- * @param other_mode GrabModeSync or GrabModeAsync
- * @param status Return code to be returned to the caller.
- *
- * @returns Success or BadValue.
- */
-int
-GrabDevice(ClientPtr client, DeviceIntPtr dev,
-           unsigned pointer_mode, unsigned keyboard_mode, Window grabWindow,
-           unsigned ownerEvents, Time ctime, GrabMask *mask,
-           int grabtype, Cursor curs, Window confineToWin, CARD8 *status)
-{
-    WindowPtr pWin, confineTo;
-    GrabPtr grab;
-    TimeStamp time;
-    Mask access_mode = DixGrabAccess;
-    int rc;
-    GrabInfoPtr grabInfo = &dev->deviceGrab;
-    CursorPtr cursor;
-
-    UpdateCurrentTime();
-    if ((keyboard_mode != GrabModeSync) && (keyboard_mode != GrabModeAsync))
-    {
-	client->errorValue = keyboard_mode;
-        return BadValue;
-    }
-    if ((pointer_mode != GrabModeSync) && (pointer_mode != GrabModeAsync))
-    {
-	client->errorValue = pointer_mode;
-        return BadValue;
-    }
-    if ((ownerEvents != xFalse) && (ownerEvents != xTrue))
-    {
-	client->errorValue = ownerEvents;
-        return BadValue;
-    }
-
-    rc = dixLookupWindow(&pWin, grabWindow, client, DixSetAttrAccess);
-    if (rc != Success)
-	return rc;
-
-    if (confineToWin == None)
-	confineTo = NullWindow;
-    else
-    {
-	rc = dixLookupWindow(&confineTo, confineToWin, client,
-			     DixSetAttrAccess);
-	if (rc != Success)
-	    return rc;
-    }
-
-    if (curs == None)
-	cursor = NullCursor;
-    else
-    {
-	rc = dixLookupResourceByType((pointer *)&cursor, curs, RT_CURSOR,
-			       client, DixUseAccess);
-	if (rc != Success)
-	{
-	    client->errorValue = curs;
-	    return rc;
-	}
-	access_mode |= DixForceAccess;
-    }
-
-    if (keyboard_mode == GrabModeSync || pointer_mode == GrabModeSync)
-	access_mode |= DixFreezeAccess;
-    rc = XaceHook(XACE_DEVICE_ACCESS, client, dev, access_mode);
-    if (rc != Success)
-	return rc;
-
-    time = ClientTimeToServerTime(ctime);
-    grab = grabInfo->grab;
-    if (grab && grab->grabtype != grabtype)
-        *status = AlreadyGrabbed;
-    if (grab && !SameClient(grab, client))
-	*status = AlreadyGrabbed;
-    else if ((!pWin->realized) ||
-             (confineTo &&
-                !(confineTo->realized
-                    && BorderSizeNotEmpty(dev, confineTo))))
-	*status = GrabNotViewable;
-    else if ((CompareTimeStamps(time, currentTime) == LATER) ||
-	     (CompareTimeStamps(time, grabInfo->grabTime) == EARLIER))
-	*status = GrabInvalidTime;
-    else if (grabInfo->sync.frozen &&
-	     grabInfo->sync.other && !SameClient(grabInfo->sync.other, client))
-	*status = GrabFrozen;
-    else
-    {
-	GrabRec tempGrab;
-
-        /* Otherwise segfaults happen on grabbed MPX devices */
-        memset(&tempGrab, 0, sizeof(GrabRec));
-
-        tempGrab.next = NULL;
-	tempGrab.window = pWin;
-	tempGrab.resource = client->clientAsMask;
-	tempGrab.ownerEvents = ownerEvents;
-	tempGrab.keyboardMode = keyboard_mode;
-	tempGrab.pointerMode = pointer_mode;
-	if (grabtype == GRABTYPE_CORE)
-	    tempGrab.eventMask = mask->core;
-	else if (grabtype == GRABTYPE_XI)
-	    tempGrab.eventMask = mask->xi;
-	else
-	    memcpy(tempGrab.xi2mask, mask->xi2mask, sizeof(tempGrab.xi2mask));
-	tempGrab.device = dev;
-	tempGrab.cursor = cursor;
-	tempGrab.confineTo = confineTo;
-	tempGrab.grabtype = grabtype;
-	(*grabInfo->ActivateGrab)(dev, &tempGrab, time, FALSE);
-	*status = GrabSuccess;
-    }
-    return Success;
-}
-
-/**
- * Server-side protocol handling for GrabKeyboard request.
- *
- * Grabs the client's keyboard and returns success status to client.
- */
-int
-ProcGrabKeyboard(ClientPtr client)
-{
-    xGrabKeyboardReply rep;
-    REQUEST(xGrabKeyboardReq);
-    int result;
-    DeviceIntPtr keyboard = PickKeyboard(client);
-    GrabMask mask;
-
-    REQUEST_SIZE_MATCH(xGrabKeyboardReq);
-
-    memset(&rep, 0, sizeof(xGrabKeyboardReply));
-    mask.core = KeyPressMask | KeyReleaseMask;
-
-    result = GrabDevice(client, keyboard, stuff->pointerMode,
-            stuff->keyboardMode, stuff->grabWindow, stuff->ownerEvents,
-            stuff->time, &mask, GRABTYPE_CORE, None, None,
-            &rep.status);
-
-    if (result != Success)
-	return result;
-    rep.type = X_Reply;
-    rep.sequenceNumber = client->sequence;
-    rep.length = 0;
-    WriteReplyToClient(client, sizeof(xGrabKeyboardReply), &rep);
-    return Success;
-}
-
-/**
- * Server-side protocol handling for UngrabKeyboard request.
- *
- * Deletes a possible grab on the client's keyboard.
- */
-int
-ProcUngrabKeyboard(ClientPtr client)
-{
-    DeviceIntPtr device = PickKeyboard(client);
-    GrabPtr grab;
-    TimeStamp time;
-    REQUEST(xResourceReq);
-
-    REQUEST_SIZE_MATCH(xResourceReq);
-    UpdateCurrentTime();
-
-    grab = device->deviceGrab.grab;
-
-    time = ClientTimeToServerTime(stuff->id);
-    if ((CompareTimeStamps(time, currentTime) != LATER) &&
-	(CompareTimeStamps(time, device->deviceGrab.grabTime) != EARLIER) &&
-	(grab) && SameClient(grab, client) && grab->grabtype == GRABTYPE_CORE)
-	(*device->deviceGrab.DeactivateGrab)(device);
-    return Success;
-}
-
-/**
- * Server-side protocol handling for QueryPointer request.
- *
- * Returns the current state and position of the client's ClientPointer to the
- * client.
- */
-int
-ProcQueryPointer(ClientPtr client)
-{
-    xQueryPointerReply rep;
-    WindowPtr pWin, t;
-    DeviceIntPtr mouse = PickPointer(client);
-    DeviceIntPtr keyboard;
-    SpritePtr pSprite;
-    int rc;
-    REQUEST(xResourceReq);
-    REQUEST_SIZE_MATCH(xResourceReq);
-
-    rc = dixLookupWindow(&pWin, stuff->id, client, DixGetAttrAccess);
-    if (rc != Success)
-	return rc;
-    rc = XaceHook(XACE_DEVICE_ACCESS, client, mouse, DixReadAccess);
-    if (rc != Success && rc != BadAccess)
-	return rc;
-
-    keyboard = GetPairedDevice(mouse);
-
-    pSprite = mouse->spriteInfo->sprite;
-    if (mouse->valuator->motionHintWindow)
-	MaybeStopHint(mouse, client);
-    memset(&rep, 0, sizeof(xQueryPointerReply));
-    rep.type = X_Reply;
-    rep.sequenceNumber = client->sequence;
-    rep.mask = mouse->button ? (mouse->button->state) : 0;
-    rep.mask |= XkbStateFieldFromRec(&keyboard->key->xkbInfo->state);
-    rep.length = 0;
-    rep.root = (GetCurrentRootWindow(mouse))->drawable.id;
-    rep.rootX = pSprite->hot.x;
-    rep.rootY = pSprite->hot.y;
-    rep.child = None;
-    if (pSprite->hot.pScreen == pWin->drawable.pScreen)
-    {
-	rep.sameScreen = xTrue;
-	rep.winX = pSprite->hot.x - pWin->drawable.x;
-	rep.winY = pSprite->hot.y - pWin->drawable.y;
-	for (t = pSprite->win; t; t = t->parent)
-	    if (t->parent == pWin)
-	    {
-		rep.child = t->drawable.id;
-		break;
-	    }
-    }
-    else
-    {
-	rep.sameScreen = xFalse;
-	rep.winX = 0;
-	rep.winY = 0;
-    }
-
-#ifdef PANORAMIX
-    if(!noPanoramiXExtension) {
-	rep.rootX += screenInfo.screens[0]->x;
-	rep.rootY += screenInfo.screens[0]->y;
-	if(stuff->id == rep.root) {
-	    rep.winX += screenInfo.screens[0]->x;
-	    rep.winY += screenInfo.screens[0]->y;
-	}
-    }
-#endif
-
-    if (rc == BadAccess) {
-	rep.mask = 0;
-	rep.child = None;
-	rep.rootX = 0;
-	rep.rootY = 0;
-	rep.winX = 0;
-	rep.winY = 0;
-    }
-
-    WriteReplyToClient(client, sizeof(xQueryPointerReply), &rep);
-
-    return Success;
-}
-
-/**
- * Initializes the device list and the DIX sprite to sane values. Allocates
- * trace memory used for quick window traversal.
- */
-void
-InitEvents(void)
-{
-    int i;
-
-    inputInfo.numDevices = 0;
-    inputInfo.devices = (DeviceIntPtr)NULL;
-    inputInfo.off_devices = (DeviceIntPtr)NULL;
-    inputInfo.keyboard = (DeviceIntPtr)NULL;
-    inputInfo.pointer = (DeviceIntPtr)NULL;
-    /* The mask for pointer motion events may have changed in the last server
-     * generation. See comment above definition of filters. */
-    filters[0][PointerMotionMask] = MotionNotify;
-    for (i = 1; i < MAXDEVICES; i++)
-    {
-        memcpy(&filters[i], filters[0], sizeof(filters[0]));
-    }
-
-    syncEvents.replayDev = (DeviceIntPtr)NULL;
-    syncEvents.replayWin = NullWindow;
-    while (syncEvents.pending)
-    {
-	QdEventPtr next = syncEvents.pending->next;
-	free(syncEvents.pending);
-	syncEvents.pending = next;
-    }
-    syncEvents.pendtail = &syncEvents.pending;
-    syncEvents.playingEvents = FALSE;
-    syncEvents.time.months = 0;
-    syncEvents.time.milliseconds = 0;	/* hardly matters */
-    currentTime.months = 0;
-    currentTime.milliseconds = GetTimeInMillis();
-    lastDeviceEventTime = currentTime;
-    for (i = 0; i < DNPMCOUNT; i++)
-    {
-	DontPropagateMasks[i] = 0;
-	DontPropagateRefCnts[i] = 0;
-    }
-
-    InputEventListLen = GetMaximumEventsNum();
-    InputEventList = InitEventList(InputEventListLen);
-    if (!InputEventList)
-        FatalError("[dix] Failed to allocate input event list.\n");
-}
-
-void
-CloseDownEvents(void)
-{
-    FreeEventList(InputEventList, InputEventListLen);
-    InputEventListLen = 0;
-    InputEventList = NULL;
-}
-
-/**
- * Server-side protocol handling for SendEvent request.
- *
- * Locates the window to send the event to and forwards the event.
- */
-int
-ProcSendEvent(ClientPtr client)
-{
-    WindowPtr pWin;
-    WindowPtr effectiveFocus = NullWindow; /* only set if dest==InputFocus */
-    DeviceIntPtr dev = PickPointer(client);
-    DeviceIntPtr keybd = GetPairedDevice(dev);
-    SpritePtr pSprite = dev->spriteInfo->sprite;
-    REQUEST(xSendEventReq);
-
-    REQUEST_SIZE_MATCH(xSendEventReq);
-
-    /* The client's event type must be a core event type or one defined by an
-	extension. */
-
-    if ( ! ((stuff->event.u.u.type > X_Reply &&
-	     stuff->event.u.u.type < LASTEvent) ||
-	    (stuff->event.u.u.type >= EXTENSION_EVENT_BASE &&
-	     stuff->event.u.u.type < (unsigned)lastEvent)))
-    {
-	client->errorValue = stuff->event.u.u.type;
-	return BadValue;
-    }
-    if (stuff->event.u.u.type == ClientMessage &&
-	stuff->event.u.u.detail != 8 &&
-	stuff->event.u.u.detail != 16 &&
-	stuff->event.u.u.detail != 32)
-    {
-	client->errorValue = stuff->event.u.u.detail;
-	return BadValue;
-    }
-    if (stuff->eventMask & ~AllEventMasks)
-    {
-	client->errorValue = stuff->eventMask;
-	return BadValue;
-    }
-
-    if (stuff->destination == PointerWindow)
-	pWin = pSprite->win;
-    else if (stuff->destination == InputFocus)
-    {
-	WindowPtr inputFocus = (keybd) ? keybd->focus->win : NoneWin;
-
-	if (inputFocus == NoneWin)
-	    return Success;
-
-	/* If the input focus is PointerRootWin, send the event to where
-	the pointer is if possible, then perhaps propogate up to root. */
-	if (inputFocus == PointerRootWin)
-	    inputFocus = GetCurrentRootWindow(dev);
-
-	if (IsParent(inputFocus, pSprite->win))
-	{
-	    effectiveFocus = inputFocus;
-	    pWin = pSprite->win;
-	}
-	else
-	    effectiveFocus = pWin = inputFocus;
-    }
-    else
-	dixLookupWindow(&pWin, stuff->destination, client, DixSendAccess);
-
-    if (!pWin)
-	return BadWindow;
-    if ((stuff->propagate != xFalse) && (stuff->propagate != xTrue))
-    {
-	client->errorValue = stuff->propagate;
-	return BadValue;
-    }
-    stuff->event.u.u.type |= 0x80;
-    if (stuff->propagate)
-    {
-	for (;pWin; pWin = pWin->parent)
-	{
-	    if (XaceHook(XACE_SEND_ACCESS, client, NULL, pWin,
-			 &stuff->event, 1))
-		return Success;
-            if (DeliverEventsToWindow(dev, pWin,
-                        &stuff->event, 1, stuff->eventMask, NullGrab))
-		return Success;
-	    if (pWin == effectiveFocus)
-		return Success;
-	    stuff->eventMask &= ~wDontPropagateMask(pWin);
-	    if (!stuff->eventMask)
-		break;
-	}
-    }
-    else if (!XaceHook(XACE_SEND_ACCESS, client, NULL, pWin, &stuff->event, 1))
-        DeliverEventsToWindow(dev, pWin, &stuff->event,
-                                    1, stuff->eventMask, NullGrab);
-    return Success;
-}
-
-/**
- * Server-side protocol handling for UngrabKey request.
- *
- * Deletes a passive grab for the given key. Works on the
- * client's keyboard.
- */
-int
-ProcUngrabKey(ClientPtr client)
-{
-    REQUEST(xUngrabKeyReq);
-    WindowPtr pWin;
-    GrabRec tempGrab;
-    DeviceIntPtr keybd = PickKeyboard(client);
-    int rc;
-
-    REQUEST_SIZE_MATCH(xUngrabKeyReq);
-    rc = dixLookupWindow(&pWin, stuff->grabWindow, client, DixGetAttrAccess);
-    if (rc != Success)
-	return rc;
-
-    if (((stuff->key > keybd->key->xkbInfo->desc->max_key_code) ||
-	 (stuff->key < keybd->key->xkbInfo->desc->min_key_code))
-	&& (stuff->key != AnyKey))
-    {
-	client->errorValue = stuff->key;
-        return BadValue;
-    }
-    if ((stuff->modifiers != AnyModifier) &&
-	(stuff->modifiers & ~AllModifiersMask))
-    {
-	client->errorValue = stuff->modifiers;
-	return BadValue;
-    }
-    tempGrab.resource = client->clientAsMask;
-    tempGrab.device = keybd;
-    tempGrab.window = pWin;
-    tempGrab.modifiersDetail.exact = stuff->modifiers;
-    tempGrab.modifiersDetail.pMask = NULL;
-    tempGrab.modifierDevice = GetPairedDevice(keybd);
-    tempGrab.type = KeyPress;
-    tempGrab.grabtype = GRABTYPE_CORE;
-    tempGrab.detail.exact = stuff->key;
-    tempGrab.detail.pMask = NULL;
-    tempGrab.next = NULL;
-
-    if (!DeletePassiveGrabFromList(&tempGrab))
-	return BadAlloc;
-    return Success;
-}
-
-/**
- * Server-side protocol handling for GrabKey request.
- *
- * Creates a grab for the client's keyboard and adds it to the list of passive
- * grabs.
- */
-int
-ProcGrabKey(ClientPtr client)
-{
-    WindowPtr pWin;
-    REQUEST(xGrabKeyReq);
-    GrabPtr grab;
-    DeviceIntPtr keybd = PickKeyboard(client);
-    int rc;
-    GrabParameters param;
-    GrabMask mask;
-
-    REQUEST_SIZE_MATCH(xGrabKeyReq);
-
-    memset(&param, 0, sizeof(param));
-    param.grabtype = GRABTYPE_CORE;
-    param.ownerEvents = stuff->ownerEvents;
-    param.this_device_mode = stuff->keyboardMode;
-    param.other_devices_mode = stuff->pointerMode;
-    param.modifiers = stuff->modifiers;
-
-    rc = CheckGrabValues(client, &param);
-    if (rc != Success)
-        return rc;
-
-    if (((stuff->key > keybd->key->xkbInfo->desc->max_key_code) ||
-	 (stuff->key < keybd->key->xkbInfo->desc->min_key_code))
-	&& (stuff->key != AnyKey))
-    {
-	client->errorValue = stuff->key;
-        return BadValue;
-    }
-    rc = dixLookupWindow(&pWin, stuff->grabWindow, client, DixSetAttrAccess);
-    if (rc != Success)
-	return rc;
-
-
-    mask.core = (KeyPressMask | KeyReleaseMask);
-
-    grab = CreateGrab(client->index, keybd, keybd, pWin, GRABTYPE_CORE, &mask,
-                      &param, KeyPress, stuff->key, NullWindow, NullCursor);
-    if (!grab)
-	return BadAlloc;
-    return AddPassiveGrabToList(client, grab);
-}
-
-
-/**
- * Server-side protocol handling for GrabButton request.
- *
- * Creates a grab for the client's ClientPointer and adds it as a passive grab
- * to the list.
- */
-int
-ProcGrabButton(ClientPtr client)
-{
-    WindowPtr pWin, confineTo;
-    REQUEST(xGrabButtonReq);
-    CursorPtr cursor;
-    GrabPtr grab;
-    DeviceIntPtr ptr, modifierDevice;
-    Mask access_mode = DixGrabAccess;
-    GrabMask mask;
-    GrabParameters param;
-    int rc;
-
-    REQUEST_SIZE_MATCH(xGrabButtonReq);
-    if ((stuff->pointerMode != GrabModeSync) &&
-	(stuff->pointerMode != GrabModeAsync))
-    {
-	client->errorValue = stuff->pointerMode;
-        return BadValue;
-    }
-    if ((stuff->keyboardMode != GrabModeSync) &&
-	(stuff->keyboardMode != GrabModeAsync))
-    {
-	client->errorValue = stuff->keyboardMode;
-        return BadValue;
-    }
-    if ((stuff->modifiers != AnyModifier) &&
-	(stuff->modifiers & ~AllModifiersMask))
-    {
-	client->errorValue = stuff->modifiers;
-	return BadValue;
-    }
-    if ((stuff->ownerEvents != xFalse) && (stuff->ownerEvents != xTrue))
-    {
-	client->errorValue = stuff->ownerEvents;
-	return BadValue;
-    }
-    if (stuff->eventMask & ~PointerGrabMask)
-    {
-	client->errorValue = stuff->eventMask;
-        return BadValue;
-    }
-    rc = dixLookupWindow(&pWin, stuff->grabWindow, client, DixSetAttrAccess);
-    if (rc != Success)
-	return rc;
-    if (stuff->confineTo == None)
-       confineTo = NullWindow;
-    else {
-	rc = dixLookupWindow(&confineTo, stuff->confineTo, client,
-			     DixSetAttrAccess);
-	if (rc != Success)
-	    return rc;
-    }
-    if (stuff->cursor == None)
-	cursor = NullCursor;
-    else
-    {
-	rc = dixLookupResourceByType((pointer *)&cursor, stuff->cursor, RT_CURSOR,
-			       client, DixUseAccess);
-	if (rc != Success)
-	{
-	    client->errorValue = stuff->cursor;
-	    return rc;
-	}
-	access_mode |= DixForceAccess;
-    }
-
-    ptr = PickPointer(client);
-    modifierDevice = GetPairedDevice(ptr);
-    if (stuff->pointerMode == GrabModeSync ||
-	stuff->keyboardMode == GrabModeSync)
-	access_mode |= DixFreezeAccess;
-    rc = XaceHook(XACE_DEVICE_ACCESS, client, ptr, access_mode);
-    if (rc != Success)
-	return rc;
-
-    memset(&param, 0, sizeof(param));
-    param.grabtype = GRABTYPE_CORE;
-    param.ownerEvents = stuff->ownerEvents;
-    param.this_device_mode = stuff->keyboardMode;
-    param.other_devices_mode = stuff->pointerMode;
-    param.modifiers = stuff->modifiers;
-
-    mask.core = stuff->eventMask;
-
-    grab = CreateGrab(client->index, ptr, modifierDevice, pWin,
-                      GRABTYPE_CORE, &mask, &param, ButtonPress,
-                      stuff->button, confineTo, cursor);
-    if (!grab)
-	return BadAlloc;
-    return AddPassiveGrabToList(client, grab);
-}
-
-/**
- * Server-side protocol handling for UngrabButton request.
- *
- * Deletes a passive grab on the client's ClientPointer from the list.
- */
-int
-ProcUngrabButton(ClientPtr client)
-{
-    REQUEST(xUngrabButtonReq);
-    WindowPtr pWin;
-    GrabRec tempGrab;
-    int rc;
-    DeviceIntPtr ptr;
-
-    REQUEST_SIZE_MATCH(xUngrabButtonReq);
-    if ((stuff->modifiers != AnyModifier) &&
-	(stuff->modifiers & ~AllModifiersMask))
-    {
-	client->errorValue = stuff->modifiers;
-	return BadValue;
-    }
-    rc = dixLookupWindow(&pWin, stuff->grabWindow, client, DixReadAccess);
-    if (rc != Success)
-	return rc;
-
-    ptr = PickPointer(client);
-
-    tempGrab.resource = client->clientAsMask;
-    tempGrab.device = ptr;
-    tempGrab.window = pWin;
-    tempGrab.modifiersDetail.exact = stuff->modifiers;
-    tempGrab.modifiersDetail.pMask = NULL;
-    tempGrab.modifierDevice = GetPairedDevice(ptr);
-    tempGrab.type = ButtonPress;
-    tempGrab.detail.exact = stuff->button;
-    tempGrab.grabtype = GRABTYPE_CORE;
-    tempGrab.detail.pMask = NULL;
-    tempGrab.next = NULL;
-
-    if (!DeletePassiveGrabFromList(&tempGrab))
-	return BadAlloc;
-    return Success;
-}
-
-/**
- * Deactivate any grab that may be on the window, remove the focus.
- * Delete any XInput extension events from the window too. Does not change the
- * window mask. Use just before the window is deleted.
- *
- * If freeResources is set, passive grabs on the window are deleted.
- *
- * @param pWin The window to delete events from.
- * @param freeResources True if resources associated with the window should be
- * deleted.
- */
-void
-DeleteWindowFromAnyEvents(WindowPtr pWin, Bool freeResources)
-{
-    WindowPtr		parent;
-    DeviceIntPtr	mouse = inputInfo.pointer;
-    DeviceIntPtr	keybd = inputInfo.keyboard;
-    FocusClassPtr	focus;
-    OtherClientsPtr	oc;
-    GrabPtr		passive;
-    GrabPtr             grab;
-
-
-    /* Deactivate any grabs performed on this window, before making any
-	input focus changes. */
-    grab = mouse->deviceGrab.grab;
-    if (grab &&
-	((grab->window == pWin) || (grab->confineTo == pWin)))
-	(*mouse->deviceGrab.DeactivateGrab)(mouse);
-
-
-    /* Deactivating a keyboard grab should cause focus events. */
-    grab = keybd->deviceGrab.grab;
-    if (grab && (grab->window == pWin))
-	(*keybd->deviceGrab.DeactivateGrab)(keybd);
-
-    /* And now the real devices */
-    for (mouse = inputInfo.devices; mouse; mouse = mouse->next)
-    {
-        grab = mouse->deviceGrab.grab;
-        if (grab && ((grab->window == pWin) || (grab->confineTo == pWin)))
-            (*mouse->deviceGrab.DeactivateGrab)(mouse);
-    }
-
-
-    for (keybd = inputInfo.devices; keybd; keybd = keybd->next)
-    {
-        if (IsKeyboardDevice(keybd))
-        {
-            focus = keybd->focus;
-
-            /* If the focus window is a root window (ie. has no parent) then don't
-               delete the focus from it. */
-
-            if ((pWin == focus->win) && (pWin->parent != NullWindow))
-            {
-                int focusEventMode = NotifyNormal;
-
-                /* If a grab is in progress, then alter the mode of focus events. */
-
-                if (keybd->deviceGrab.grab)
-                    focusEventMode = NotifyWhileGrabbed;
-
-                switch (focus->revert)
-                {
-                    case RevertToNone:
-                        DoFocusEvents(keybd, pWin, NoneWin, focusEventMode);
-                        focus->win = NoneWin;
-                        focus->traceGood = 0;
-                        break;
-                    case RevertToParent:
-                        parent = pWin;
-                        do
-                        {
-                            parent = parent->parent;
-                            focus->traceGood--;
-                        } while (!parent->realized
-                                /* This would be a good protocol change -- windows being reparented
-                                   during SaveSet processing would cause the focus to revert to the
-                                   nearest enclosing window which will survive the death of the exiting
-                                   client, instead of ending up reverting to a dying window and thence
-                                   to None
-                                 */
-#ifdef NOTDEF
-				 || wClient(parent)->clientGone
-#endif
-                                );
-                        if (!ActivateFocusInGrab(keybd, pWin, parent))
-                            DoFocusEvents(keybd, pWin, parent, focusEventMode);
-                        focus->win = parent;
-                        focus->revert = RevertToNone;
-                        break;
-                    case RevertToPointerRoot:
-                        if (!ActivateFocusInGrab(keybd, pWin, PointerRootWin))
-                            DoFocusEvents(keybd, pWin, PointerRootWin, focusEventMode);
-                        focus->win = PointerRootWin;
-                        focus->traceGood = 0;
-                        break;
-                }
-            }
-        }
-
-        if (IsPointerDevice(keybd))
-        {
-            if (keybd->valuator->motionHintWindow == pWin)
-                keybd->valuator->motionHintWindow = NullWindow;
-        }
-    }
-
-    if (freeResources)
-    {
-	if (pWin->dontPropagate)
-	    DontPropagateRefCnts[pWin->dontPropagate]--;
-	while ( (oc = wOtherClients(pWin)) )
-	    FreeResource(oc->resource, RT_NONE);
-	while ( (passive = wPassiveGrabs(pWin)) )
-	    FreeResource(passive->resource, RT_NONE);
-     }
-
-    DeleteWindowFromAnyExtEvents(pWin, freeResources);
-}
-
-/**
- * Call this whenever some window at or below pWin has changed geometry. If
- * there is a grab on the window, the cursor will be re-confined into the
- * window.
- */
-void
-CheckCursorConfinement(WindowPtr pWin)
-{
-    GrabPtr grab;
-    WindowPtr confineTo;
-    DeviceIntPtr pDev;
-
-#ifdef PANORAMIX
-    if(!noPanoramiXExtension && pWin->drawable.pScreen->myNum) return;
-#endif
-
-    for (pDev = inputInfo.devices; pDev; pDev = pDev->next)
-    {
-        if (DevHasCursor(pDev))
-        {
-            grab = pDev->deviceGrab.grab;
-            if (grab && (confineTo = grab->confineTo))
-            {
-                if (!BorderSizeNotEmpty(pDev, confineTo))
-                    (*pDev->deviceGrab.DeactivateGrab)(pDev);
-                else if ((pWin == confineTo) || IsParent(pWin, confineTo))
-                    ConfineCursorToWindow(pDev, confineTo, TRUE, TRUE);
-            }
-        }
-    }
-}
-
-Mask
-EventMaskForClient(WindowPtr pWin, ClientPtr client)
-{
-    OtherClientsPtr	other;
-
-    if (wClient (pWin) == client)
-	return pWin->eventMask;
-    for (other = wOtherClients(pWin); other; other = other->next)
-    {
-	if (SameClient(other, client))
-	    return other->mask;
-    }
-    return 0;
-}
-
-/**
- * Server-side protocol handling for RecolorCursor request.
- */
-int
-ProcRecolorCursor(ClientPtr client)
-{
-    CursorPtr pCursor;
-    int		rc, nscr;
-    ScreenPtr	pscr;
-    Bool	displayed;
-    SpritePtr   pSprite = PickPointer(client)->spriteInfo->sprite;
-    REQUEST(xRecolorCursorReq);
-
-    REQUEST_SIZE_MATCH(xRecolorCursorReq);
-    rc = dixLookupResourceByType((pointer *)&pCursor, stuff->cursor, RT_CURSOR,
-			   client, DixWriteAccess);
-    if (rc != Success)
-    {
-	client->errorValue = stuff->cursor;
-	return rc;
-    }
-
-    pCursor->foreRed = stuff->foreRed;
-    pCursor->foreGreen = stuff->foreGreen;
-    pCursor->foreBlue = stuff->foreBlue;
-
-    pCursor->backRed = stuff->backRed;
-    pCursor->backGreen = stuff->backGreen;
-    pCursor->backBlue = stuff->backBlue;
-
-    for (nscr = 0; nscr < screenInfo.numScreens; nscr++)
-    {
-	pscr = screenInfo.screens[nscr];
-#ifdef PANORAMIX
-	if(!noPanoramiXExtension)
-	    displayed = (pscr == pSprite->screen);
-	else
-#endif
-	    displayed = (pscr == pSprite->hotPhys.pScreen);
-	( *pscr->RecolorCursor)(PickPointer(client), pscr, pCursor,
-				(pCursor == pSprite->current) && displayed);
-    }
-    return Success;
-}
-
-/**
- * Write the given events to a client, swapping the byte order if necessary.
- * To swap the byte ordering, a callback is called that has to be set up for
- * the given event type.
- *
- * In the case of DeviceMotionNotify trailed by DeviceValuators, the events
- * can be more than one. Usually it's just one event.
- *
- * Do not modify the event structure passed in. See comment below.
- *
- * @param pClient Client to send events to.
- * @param count Number of events.
- * @param events The event list.
- */
-void
-WriteEventsToClient(ClientPtr pClient, int count, xEvent *events)
-{
-#ifdef PANORAMIX
-    xEvent    eventCopy;
-#endif
-    xEvent    *eventTo, *eventFrom;
-    int       i,
-              eventlength = sizeof(xEvent);
-
-    if (!pClient || pClient == serverClient || pClient->clientGone)
-	return;
-
-    for (i = 0; i < count; i++)
-	if ((events[i].u.u.type & 0x7f) != KeymapNotify)
-	    events[i].u.u.sequenceNumber = pClient->sequence;
-
-    /* Let XKB rewrite the state, as it depends on client preferences. */
-    XkbFilterEvents(pClient, count, events);
-
-#ifdef PANORAMIX
-    if(!noPanoramiXExtension &&
-       (screenInfo.screens[0]->x || screenInfo.screens[0]->y))
-    {
-	switch(events->u.u.type) {
-	case MotionNotify:
-	case ButtonPress:
-	case ButtonRelease:
-	case KeyPress:
-	case KeyRelease:
-	case EnterNotify:
-	case LeaveNotify:
-	/*
-	   When multiple clients want the same event DeliverEventsToWindow
-	   passes the same event structure multiple times so we can't
-	   modify the one passed to us
-        */
-	    count = 1;  /* should always be 1 */
-	    memcpy(&eventCopy, events, sizeof(xEvent));
-	    eventCopy.u.keyButtonPointer.rootX += screenInfo.screens[0]->x;
-	    eventCopy.u.keyButtonPointer.rootY += screenInfo.screens[0]->y;
-	    if(eventCopy.u.keyButtonPointer.event ==
-	       eventCopy.u.keyButtonPointer.root)
-	    {
-		eventCopy.u.keyButtonPointer.eventX += screenInfo.screens[0]->x;
-		eventCopy.u.keyButtonPointer.eventY += screenInfo.screens[0]->y;
-	    }
-	    events = &eventCopy;
-	    break;
-	default: break;
-	}
-    }
-#endif
-
-    if (EventCallback)
-    {
-	EventInfoRec eventinfo;
-	eventinfo.client = pClient;
-	eventinfo.events = events;
-	eventinfo.count = count;
-	CallCallbacks(&EventCallback, (pointer)&eventinfo);
-    }
-#ifdef XSERVER_DTRACE
-    if (XSERVER_SEND_EVENT_ENABLED()) {
-	for (i = 0; i < count; i++)
-	{
-	    XSERVER_SEND_EVENT(pClient->index, events[i].u.u.type, &events[i]);
-	}
-    }
-#endif
-    /* Just a safety check to make sure we only have one GenericEvent, it just
-     * makes things easier for me right now. (whot) */
-    for (i = 1; i < count; i++)
-    {
-        if (events[i].u.u.type == GenericEvent)
-        {
-            ErrorF("[dix] TryClientEvents: Only one GenericEvent at a time.\n");
-            return;
-        }
-    }
-
-    if (events->u.u.type == GenericEvent)
-    {
-        eventlength += ((xGenericEvent*)events)->length * 4;
-    }
-
-    if(pClient->swapped)
-    {
-        if (eventlength > swapEventLen)
-        {
-            swapEventLen = eventlength;
-            swapEvent = realloc(swapEvent, swapEventLen);
-            if (!swapEvent)
-            {
-                FatalError("WriteEventsToClient: Out of memory.\n");
-                return;
-            }
-        }
-
-	for(i = 0; i < count; i++)
-	{
-	    eventFrom = &events[i];
-            eventTo = swapEvent;
-
-	    /* Remember to strip off the leading bit of type in case
-	       this event was sent with "SendEvent." */
-	    (*EventSwapVector[eventFrom->u.u.type & 0177])
-		(eventFrom, eventTo);
-
-	    WriteToClient(pClient, eventlength, (char *)eventTo);
-	}
-    }
-    else
-    {
-        /* only one GenericEvent, remember? that means either count is 1 and
-         * eventlength is arbitrary or eventlength is 32 and count doesn't
-         * matter. And we're all set. Woohoo. */
-	WriteToClient(pClient, count * eventlength, (char *) events);
-    }
-}
-
-/*
- * Set the client pointer for the given client.
- *
- * A client can have exactly one ClientPointer. Each time a
- * request/reply/event is processed and the choice of devices is ambiguous
- * (e.g. QueryPointer request), the server will pick the ClientPointer (see
- * PickPointer()).
- * If a keyboard is needed, the first keyboard paired with the CP is used.
- */
-int
-SetClientPointer(ClientPtr client, DeviceIntPtr device)
-{
-    int rc = XaceHook(XACE_DEVICE_ACCESS, client, device, DixUseAccess);
-    if (rc != Success)
-	return rc;
-
-    if (!IsMaster(device))
-    {
-        ErrorF("[dix] Need master device for ClientPointer. This is a bug.\n");
-        return BadDevice;
-    } else if (!device->spriteInfo->spriteOwner)
-    {
-        ErrorF("[dix] Device %d does not have a sprite. "
-                "Cannot be ClientPointer\n", device->id);
-        return BadDevice;
-    }
-    client->clientPtr = device;
-    return Success;
-}
-
-/* PickPointer will pick an appropriate pointer for the given client.
- *
- * An "appropriate device" is (in order of priority):
- *  1) A device the given client has a core grab on.
- *  2) A device set as ClientPointer for the given client.
- *  3) The first master device.
- */
-DeviceIntPtr
-PickPointer(ClientPtr client)
-{
-    DeviceIntPtr it = inputInfo.devices;
-
-    /* First, check if the client currently has a grab on a device. Even
-     * keyboards count. */
-    for(it = inputInfo.devices; it; it = it->next)
-    {
-        GrabPtr grab = it->deviceGrab.grab;
-        if (grab && grab->grabtype == GRABTYPE_CORE && SameClient(grab, client))
-        {
-            it = GetMaster(it, MASTER_POINTER);
-            return it; /* Always return a core grabbed device */
-        }
-    }
-
-    if (!client->clientPtr)
-    {
-        DeviceIntPtr it = inputInfo.devices;
-        while (it)
-        {
-            if (IsMaster(it) && it->spriteInfo->spriteOwner)
-            {
-                client->clientPtr = it;
-                break;
-            }
-            it = it->next;
-        }
-    }
-    return client->clientPtr;
-}
-
-/* PickKeyboard will pick an appropriate keyboard for the given client by
- * searching the list of devices for the keyboard device that is paired with
- * the client's pointer.
- */
-DeviceIntPtr
-PickKeyboard(ClientPtr client)
-{
-    DeviceIntPtr ptr = PickPointer(client);
-    DeviceIntPtr kbd = GetMaster(ptr, MASTER_KEYBOARD);
-
-    if (!kbd)
-    {
-        ErrorF("[dix] ClientPointer not paired with a keyboard. This "
-                "is a bug.\n");
-    }
-
-    return kbd;
-}
-
-/* A client that has one or more core grabs does not get core events from
- * devices it does not have a grab on. Legacy applications behave bad
- * otherwise because they are not used to it and the events interfere.
- * Only applies for core events.
- *
- * Return true if a core event from the device would interfere and should not
- * be delivered.
- */
-Bool
-IsInterferingGrab(ClientPtr client, DeviceIntPtr dev, xEvent* event)
-{
-    DeviceIntPtr it = inputInfo.devices;
-
-    switch(event->u.u.type)
-    {
-        case KeyPress:
-        case KeyRelease:
-        case ButtonPress:
-        case ButtonRelease:
-        case MotionNotify:
-        case EnterNotify:
-        case LeaveNotify:
-            break;
-        default:
-            return FALSE;
-    }
-
-    if (dev->deviceGrab.grab && SameClient(dev->deviceGrab.grab, client))
-        return FALSE;
-
-    while(it)
-    {
-        if (it != dev)
-        {
-            if (it->deviceGrab.grab && SameClient(it->deviceGrab.grab, client)
-                        && !it->deviceGrab.fromPassiveGrab)
-            {
-                if ((IsPointerDevice(it) && IsPointerDevice(dev)) ||
-                        (IsKeyboardDevice(it) && IsKeyboardDevice(dev)))
-                    return TRUE;
-            }
-        }
-        it = it->next;
-    }
-
-    return FALSE;
-}
-
+/************************************************************

+

+Copyright 1987, 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 1987 by Digital Equipment Corporation, Maynard, Massachusetts.

+

+                        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 Digital not be

+used in advertising or publicity pertaining to distribution of the

+software without specific, written prior permission.

+

+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING

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

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

+

+********************************************************/

+

+/* The panoramix components contained the following notice */

+/*****************************************************************

+

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

+

+Permission is hereby granted, free of charge, to any person obtaining a copy

+of this software and associated documentation files (the "Software"), to deal

+in the Software without restriction, including without limitation the rights

+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

+copies of the Software.

+

+The above copyright notice and this permission notice shall be included in

+all copies or substantial portions of the Software.

+

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

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

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

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

+BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL DAMAGES, OR OTHER LIABILITY,

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

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

+

+Except as contained in this notice, the name of Digital Equipment Corporation

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

+dealings in this Software without prior written authorization from Digital

+Equipment Corporation.

+

+******************************************************************/

+

+/*

+ * Copyright (c) 2003-2005, Oracle and/or its affiliates. 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 (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 NONINFRINGEMENT.  IN NO EVENT SHALL

+ * THE AUTHORS OR COPYRIGHT HOLDERS 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.

+ */

+

+/** @file events.c

+ * This file handles event delivery and a big part of the server-side protocol

+ * handling (the parts for input devices).

+ */

+

+#ifdef HAVE_DIX_CONFIG_H

+#include <dix-config.h>

+#endif

+

+#include <X11/X.h>

+#include "misc.h"

+#include "resource.h"

+#include <X11/Xproto.h>

+#include "windowstr.h"

+#include "inputstr.h"

+#include "scrnintstr.h"

+#include "cursorstr.h"

+

+#include "dixstruct.h"

+#ifdef PANORAMIX

+#include "panoramiX.h"

+#include "panoramiXsrv.h"

+#endif

+#include "globals.h"

+

+#include <X11/extensions/XKBproto.h>

+#include "xkbsrv.h"

+#include "xace.h"

+

+#ifdef XSERVER_DTRACE

+#include <sys/types.h>

+typedef const char *string;

+#include "Xserver-dtrace.h"

+#endif

+

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

+#include <X11/extensions/XI2proto.h>

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

+#include <X11/extensions/XI2.h>

+#include "exglobals.h"

+#include "exevents.h"

+#include "exglobals.h"

+#include "extnsionst.h"

+

+#include "dixevents.h"

+#include "dixgrabs.h"

+#include "dispatch.h"

+

+#include <X11/extensions/ge.h>

+#include "geext.h"

+#include "geint.h"

+

+#include "eventstr.h"

+#include "enterleave.h"

+#include "eventconvert.h"

+

+/* Extension events type numbering starts at EXTENSION_EVENT_BASE.  */

+#define NoSuchEvent 0x80000000	/* so doesn't match NoEventMask */

+#define StructureAndSubMask ( StructureNotifyMask | SubstructureNotifyMask )

+#define AllButtonsMask ( \

+	Button1Mask | Button2Mask | Button3Mask | Button4Mask | Button5Mask )

+#define MotionMask ( \

+	PointerMotionMask | Button1MotionMask | \

+	Button2MotionMask | Button3MotionMask | Button4MotionMask | \

+	Button5MotionMask | ButtonMotionMask )

+#define PropagateMask ( \

+	KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | \

+	MotionMask )

+#define PointerGrabMask ( \

+	ButtonPressMask | ButtonReleaseMask | \

+	EnterWindowMask | LeaveWindowMask | \

+	PointerMotionHintMask | KeymapStateMask | \

+	MotionMask )

+#define AllModifiersMask ( \

+	ShiftMask | LockMask | ControlMask | Mod1Mask | Mod2Mask | \

+	Mod3Mask | Mod4Mask | Mod5Mask )

+#define LastEventMask OwnerGrabButtonMask

+#define AllEventMasks (LastEventMask|(LastEventMask-1))

+

+

+#define CORE_EVENT(event) \

+    (!((event)->u.u.type & EXTENSION_EVENT_BASE) && \

+      (event)->u.u.type != GenericEvent)

+#define XI2_EVENT(event) \

+    (((event)->u.u.type == GenericEvent) && \

+    ((xGenericEvent*)(event))->extension == IReqCode)

+

+/**

+ * Used to indicate a implicit passive grab created by a ButtonPress event.

+ * See DeliverEventsToWindow().

+ */

+#define ImplicitGrabMask (1 << 7)

+

+#define WID(w) ((w) ? ((w)->drawable.id) : 0)

+

+#define XE_KBPTR (xE->u.keyButtonPointer)

+

+

+CallbackListPtr EventCallback;

+CallbackListPtr DeviceEventCallback;

+

+#define DNPMCOUNT 8

+

+Mask DontPropagateMasks[DNPMCOUNT];

+static int DontPropagateRefCnts[DNPMCOUNT];

+

+static void CheckVirtualMotion( DeviceIntPtr pDev, QdEventPtr qe, WindowPtr pWin);

+static void CheckPhysLimits(DeviceIntPtr pDev,

+                            CursorPtr cursor,

+                            Bool generateEvents,

+                            Bool confineToScreen,

+                            ScreenPtr pScreen);

+

+/** Key repeat hack. Do not use but in TryClientEvents */

+extern BOOL EventIsKeyRepeat(xEvent *event);

+

+/**

+ * Main input device struct.

+ *     inputInfo.pointer

+ *     is the core pointer. Referred to as "virtual core pointer", "VCP",

+ *     "core pointer" or inputInfo.pointer. The VCP is the first master

+ *     pointer device and cannot be deleted.

+ *

+ *     inputInfo.keyboard

+ *     is the core keyboard ("virtual core keyboard", "VCK", "core keyboard").

+ *     See inputInfo.pointer.

+ *

+ *     inputInfo.devices

+ *     linked list containing all devices including VCP and VCK.

+ *

+ *     inputInfo.off_devices

+ *     Devices that have not been initialized and are thus turned off.

+ *

+ *     inputInfo.numDevices

+ *     Total number of devices.

+ *

+ *     inputInfo.all_devices

+ *     Virtual device used for XIAllDevices passive grabs. This device is

+ *     not part of the inputInfo.devices list and mostly unset except for

+ *     the deviceid. It exists because passivegrabs need a valid device

+ *     reference.

+ *

+ *     inputInfo.all_master_devices

+ *     Virtual device used for XIAllMasterDevices passive grabs. This device

+ *     is not part of the inputInfo.devices list and mostly unset except for

+ *     the deviceid. It exists because passivegrabs need a valid device

+ *     reference.

+ */

+InputInfo inputInfo;

+

+EventSyncInfoRec syncEvents;

+

+/**

+ * The root window the given device is currently on.

+ */

+#define RootWindow(sprite) sprite->spriteTrace[0]

+

+static xEvent* swapEvent = NULL;

+static int swapEventLen = 0;

+

+void

+NotImplemented(xEvent *from, xEvent *to)

+{

+    FatalError("Not implemented");

+}

+

+/**

+ * Convert the given event type from an XI event to a core event.

+ * @param[in] The XI 1.x event type.

+ * @return The matching core event type or 0 if there is none.

+ */

+int

+XItoCoreType(int xitype)

+{

+    int coretype = 0;

+    if (xitype == DeviceMotionNotify)

+        coretype = MotionNotify;

+    else if (xitype == DeviceButtonPress)

+        coretype = ButtonPress;

+    else if (xitype == DeviceButtonRelease)

+        coretype = ButtonRelease;

+    else if (xitype == DeviceKeyPress)

+        coretype = KeyPress;

+    else if (xitype == DeviceKeyRelease)

+        coretype = KeyRelease;

+

+    return coretype;

+}

+

+/**

+ * @return true if the device owns a cursor, false if device shares a cursor

+ * sprite with another device.

+ */

+Bool

+DevHasCursor(DeviceIntPtr pDev)

+{

+    return pDev->spriteInfo->spriteOwner;

+}

+

+/*

+ * @return true if a device is a pointer, check is the same as used by XI to

+ * fill the 'use' field.

+ */

+Bool

+IsPointerDevice(DeviceIntPtr dev)

+{

+    return (dev->type == MASTER_POINTER) ||

+            (dev->valuator && dev->button) ||

+            (dev->valuator && !dev->key);

+}

+

+/*

+ * @return true if a device is a keyboard, check is the same as used by XI to

+ * fill the 'use' field.

+ *

+ * Some pointer devices have keys as well (e.g. multimedia keys). Try to not

+ * count them as keyboard devices.

+ */

+Bool

+IsKeyboardDevice(DeviceIntPtr dev)

+{

+    return (dev->type == MASTER_KEYBOARD) ||

+            ((dev->key && dev->kbdfeed) && !IsPointerDevice(dev));

+}

+

+Bool

+IsMaster(DeviceIntPtr dev)

+{

+    return dev->type == MASTER_POINTER || dev->type == MASTER_KEYBOARD;

+}

+

+Bool

+IsFloating(DeviceIntPtr dev)

+{

+    return GetMaster(dev, MASTER_KEYBOARD) == NULL;

+}

+

+

+/**

+ * Max event opcode.

+ */

+extern int lastEvent;

+

+extern int DeviceMotionNotify;

+

+#define CantBeFiltered NoEventMask

+/**

+ * Event masks for each event type.

+ *

+ * One set of filters for each device, but only the first layer

+ * is initialized. The rest is memcpy'd in InitEvents.

+ *

+ * Filters are used whether a given event may be delivered to a client,

+ * usually in the form of if (window-event-mask & filter); then deliver event.

+ *

+ * One notable filter is for PointerMotion/DevicePointerMotion events. Each

+ * time a button is pressed, the filter is modified to also contain the

+ * matching ButtonXMotion mask.

+ */

+static Mask filters[MAXDEVICES][128] = {

+{

+	NoSuchEvent,		       /* 0 */

+	NoSuchEvent,		       /* 1 */

+	KeyPressMask,		       /* KeyPress */

+	KeyReleaseMask,		       /* KeyRelease */

+	ButtonPressMask,	       /* ButtonPress */

+	ButtonReleaseMask,	       /* ButtonRelease */

+	PointerMotionMask,	       /* MotionNotify (initial state) */

+	EnterWindowMask,	       /* EnterNotify */

+	LeaveWindowMask,	       /* LeaveNotify */

+	FocusChangeMask,	       /* FocusIn */

+	FocusChangeMask,	       /* FocusOut */

+	KeymapStateMask,	       /* KeymapNotify */

+	ExposureMask,		       /* Expose */

+	CantBeFiltered,		       /* GraphicsExpose */

+	CantBeFiltered,		       /* NoExpose */

+	VisibilityChangeMask,	       /* VisibilityNotify */

+	SubstructureNotifyMask,	       /* CreateNotify */

+	StructureAndSubMask,	       /* DestroyNotify */

+	StructureAndSubMask,	       /* UnmapNotify */

+	StructureAndSubMask,	       /* MapNotify */

+	SubstructureRedirectMask,      /* MapRequest */

+	StructureAndSubMask,	       /* ReparentNotify */

+	StructureAndSubMask,	       /* ConfigureNotify */

+	SubstructureRedirectMask,      /* ConfigureRequest */

+	StructureAndSubMask,	       /* GravityNotify */

+	ResizeRedirectMask,	       /* ResizeRequest */

+	StructureAndSubMask,	       /* CirculateNotify */

+	SubstructureRedirectMask,      /* CirculateRequest */

+	PropertyChangeMask,	       /* PropertyNotify */

+	CantBeFiltered,		       /* SelectionClear */

+	CantBeFiltered,		       /* SelectionRequest */

+	CantBeFiltered,		       /* SelectionNotify */

+	ColormapChangeMask,	       /* ColormapNotify */

+	CantBeFiltered,		       /* ClientMessage */

+	CantBeFiltered		       /* MappingNotify */

+}};

+

+/**

+ * For the given event, return the matching event filter. This filter may then

+ * be AND'ed with the selected event mask.

+ *

+ * For XI2 events, the returned filter is simply the byte containing the event

+ * mask we're interested in. E.g. for a mask of (1 << 13), this would be

+ * byte[1].

+ *

+ * @param[in] dev The device the event belongs to, may be NULL.

+ * @param[in] event The event to get the filter for. Only the type of the

+ *                  event matters, or the extension + evtype for GenericEvents.

+ * @return The filter mask for the given event.

+ *

+ * @see GetEventMask

+ */

+Mask

+GetEventFilter(DeviceIntPtr dev, xEvent *event)

+{

+    if (event->u.u.type != GenericEvent)

+        return filters[dev ? dev->id : 0][event->u.u.type];

+    else if (XI2_EVENT(event))

+        return (1 << (((xXIDeviceEvent*)event)->evtype % 8));

+    ErrorF("[dix] Unknown device type %d. No filter\n", event->u.u.type);

+    return 0;

+}

+

+/**

+ * Return the windows complete XI2 mask for the given XI2 event type.

+ */

+Mask

+GetWindowXI2Mask(DeviceIntPtr dev, WindowPtr win, xEvent* ev)

+{

+    OtherInputMasks *inputMasks = wOtherInputMasks(win);

+    int filter;

+    int evtype;

+

+    if (!inputMasks || !XI2_EVENT(ev))

+        return 0;

+

+    evtype = ((xGenericEvent*)ev)->evtype;

+    filter = GetEventFilter(dev, ev);

+

+    return ((inputMasks->xi2mask[dev->id][evtype/8] & filter) ||

+            inputMasks->xi2mask[XIAllDevices][evtype/8] ||

+            (inputMasks->xi2mask[XIAllMasterDevices][evtype/8] && IsMaster(dev)));

+}

+

+Mask

+GetEventMask(DeviceIntPtr dev, xEvent *event, InputClients* other)

+{

+    /* XI2 filters are only ever 8 bit, so let's return a 8 bit mask */

+    if (XI2_EVENT(event))

+    {

+        int byte = ((xGenericEvent*)event)->evtype / 8;

+        return (other->xi2mask[dev->id][byte] |

+                other->xi2mask[XIAllDevices][byte] |

+                (IsMaster(dev)? other->xi2mask[XIAllMasterDevices][byte] : 0));

+    } else if (CORE_EVENT(event))

+        return other->mask[XIAllDevices];

+    else

+        return other->mask[dev->id];

+}

+

+

+static CARD8 criticalEvents[32] =

+{

+    0x7c, 0x30, 0x40			/* key, button, expose, and configure events */

+};

+

+static void

+SyntheticMotion(DeviceIntPtr dev, int x, int y) {

+    int screenno = 0;

+

+#ifdef PANORAMIX

+    if (!noPanoramiXExtension)

+        screenno = dev->spriteInfo->sprite->screen->myNum;

+#endif

+    PostSyntheticMotion(dev, x, y, screenno,

+            (syncEvents.playingEvents) ?  syncEvents.time.milliseconds : currentTime.milliseconds);

+

+}

+

+#ifdef PANORAMIX

+static void PostNewCursor(DeviceIntPtr pDev);

+

+static Bool

+pointOnScreen(ScreenPtr pScreen, int x, int y)

+{

+    return x >= pScreen->x && x < pScreen->x + pScreen->width &&

+           y >= pScreen->y && y < pScreen->y + pScreen->height;

+}

+

+static Bool

+XineramaSetCursorPosition(

+    DeviceIntPtr pDev,

+    int x,

+    int y,

+    Bool generateEvent

+){

+    ScreenPtr pScreen;

+    int i;

+    SpritePtr pSprite = pDev->spriteInfo->sprite;

+

+    /* x,y are in Screen 0 coordinates.  We need to decide what Screen

+       to send the message too and what the coordinates relative to

+       that screen are. */

+

+    pScreen = pSprite->screen;

+    x += screenInfo.screens[0]->x;

+    y += screenInfo.screens[0]->y;

+

+    if(!pointOnScreen(pScreen, x, y))

+    {

+	FOR_NSCREENS(i)

+	{

+	    if(i == pScreen->myNum)

+		continue;

+	    if(pointOnScreen(screenInfo.screens[i], x, y))

+	    {

+		pScreen = screenInfo.screens[i];

+		break;

+	    }

+	}

+    }

+

+    pSprite->screen = pScreen;

+    pSprite->hotPhys.x = x - screenInfo.screens[0]->x;

+    pSprite->hotPhys.y = y - screenInfo.screens[0]->y;

+    x -= pScreen->x;

+    y -= pScreen->y;

+

+    return (*pScreen->SetCursorPosition)(pDev, pScreen, x, y, generateEvent);

+}

+

+

+static void

+XineramaConstrainCursor(DeviceIntPtr pDev)

+{

+    SpritePtr pSprite = pDev->spriteInfo->sprite;

+    ScreenPtr pScreen;

+    BoxRec newBox;

+

+    pScreen = pSprite->screen;

+    newBox = pSprite->physLimits;

+

+    /* Translate the constraining box to the screen

+       the sprite is actually on */

+    newBox.x1 += screenInfo.screens[0]->x - pScreen->x;

+    newBox.x2 += screenInfo.screens[0]->x - pScreen->x;

+    newBox.y1 += screenInfo.screens[0]->y - pScreen->y;

+    newBox.y2 += screenInfo.screens[0]->y - pScreen->y;

+

+    (* pScreen->ConstrainCursor)(pDev, pScreen, &newBox);

+}

+

+

+static Bool

+XineramaSetWindowPntrs(DeviceIntPtr pDev, WindowPtr pWin)

+{

+    SpritePtr pSprite = pDev->spriteInfo->sprite;

+

+    if(pWin == screenInfo.screens[0]->root) {

+	int i;

+	for (i = 0; i < PanoramiXNumScreens; i++)

+	    pSprite->windows[i] = screenInfo.screens[i]->root;

+    } else {

+	PanoramiXRes *win;

+	int rc, i;

+

+	rc = dixLookupResourceByType((pointer *)&win, pWin->drawable.id,

+				     XRT_WINDOW, serverClient, DixReadAccess);

+	if (rc != Success)

+	    return FALSE;

+

+	for(i = 0; i < PanoramiXNumScreens; i++) {

+	    rc = dixLookupWindow(pSprite->windows + i, win->info[i].id,

+				 serverClient, DixReadAccess);

+	    if (rc != Success)  /* window is being unmapped */

+		return FALSE;

+	}

+    }

+    return TRUE;

+}

+

+static void

+XineramaConfineCursorToWindow(DeviceIntPtr pDev,

+                              WindowPtr pWin,

+                              Bool generateEvents)

+{

+    SpritePtr pSprite = pDev->spriteInfo->sprite;

+

+    int x, y, off_x, off_y, i;

+

+    if(!XineramaSetWindowPntrs(pDev, pWin))

+        return;

+

+    i = PanoramiXNumScreens - 1;

+

+    RegionCopy(&pSprite->Reg1,

+            &pSprite->windows[i]->borderSize);

+    off_x = screenInfo.screens[i]->x;

+    off_y = screenInfo.screens[i]->y;

+

+    while(i--) {

+        x = off_x - screenInfo.screens[i]->x;

+        y = off_y - screenInfo.screens[i]->y;

+

+        if(x || y)

+            RegionTranslate(&pSprite->Reg1, x, y);

+

+        RegionUnion(&pSprite->Reg1, &pSprite->Reg1,

+                &pSprite->windows[i]->borderSize);

+

+        off_x = screenInfo.screens[i]->x;

+        off_y = screenInfo.screens[i]->y;

+    }

+

+    pSprite->hotLimits = *RegionExtents(&pSprite->Reg1);

+

+    if(RegionNumRects(&pSprite->Reg1) > 1)

+        pSprite->hotShape = &pSprite->Reg1;

+    else

+        pSprite->hotShape = NullRegion;

+

+    pSprite->confined = FALSE;

+    pSprite->confineWin = (pWin == screenInfo.screens[0]->root) ? NullWindow : pWin;

+

+    CheckPhysLimits(pDev, pSprite->current, generateEvents, FALSE, NULL);

+}

+

+#endif  /* PANORAMIX */

+

+/**

+ * Modifies the filter for the given protocol event type to the given masks.

+ *

+ * There's only two callers: UpdateDeviceState() and XI's SetMaskForExtEvent().

+ * The latter initialises masks for the matching XI events, it's a once-off

+ * setting.

+ * UDS however changes the mask for MotionNotify and DeviceMotionNotify each

+ * time a button is pressed to include the matching ButtonXMotion mask in the

+ * filter.

+ *

+ * @param[in] deviceid The device to modify the filter for.

+ * @param[in] mask The new filter mask.

+ * @param[in] event Protocol event type.

+ */

+void

+SetMaskForEvent(int deviceid, Mask mask, int event)

+{

+    if (deviceid < 0 || deviceid >= MAXDEVICES)

+        FatalError("SetMaskForEvent: bogus device id");

+    filters[deviceid][event] = mask;

+}

+

+void

+SetCriticalEvent(int event)

+{

+    if (event >= 128)

+	FatalError("SetCriticalEvent: bogus event number");

+    criticalEvents[event >> 3] |= 1 << (event & 7);

+}

+

+void

+ConfineToShape(DeviceIntPtr pDev, RegionPtr shape, int *px, int *py)

+{

+    BoxRec box;

+    int x = *px, y = *py;

+    int incx = 1, incy = 1;

+    SpritePtr pSprite;

+

+    pSprite = pDev->spriteInfo->sprite;

+    if (RegionContainsPoint(shape, x, y, &box))

+	return;

+    box = *RegionExtents(shape);

+    /* this is rather crude */

+    do {

+	x += incx;

+	if (x >= box.x2)

+	{

+	    incx = -1;

+	    x = *px - 1;

+	}

+	else if (x < box.x1)

+	{

+	    incx = 1;

+	    x = *px;

+	    y += incy;

+	    if (y >= box.y2)

+	    {

+		incy = -1;

+		y = *py - 1;

+	    }

+	    else if (y < box.y1)

+		return; /* should never get here! */

+	}

+    } while (!RegionContainsPoint(shape, x, y, &box));

+    *px = x;

+    *py = y;

+}

+

+static void

+CheckPhysLimits(

+    DeviceIntPtr pDev,

+    CursorPtr cursor,

+    Bool generateEvents,

+    Bool confineToScreen, /* unused if PanoramiX on */

+    ScreenPtr pScreen)    /* unused if PanoramiX on */

+{

+    HotSpot new;

+    SpritePtr pSprite = pDev->spriteInfo->sprite;

+

+    if (!cursor)

+	return;

+    new = pSprite->hotPhys;

+#ifdef PANORAMIX

+    if (!noPanoramiXExtension)

+        /* I don't care what the DDX has to say about it */

+        pSprite->physLimits = pSprite->hotLimits;

+    else

+#endif

+    {

+        if (pScreen)

+            new.pScreen = pScreen;

+        else

+            pScreen = new.pScreen;

+        (*pScreen->CursorLimits) (pDev, pScreen, cursor, &pSprite->hotLimits,

+                &pSprite->physLimits);

+        pSprite->confined = confineToScreen;

+        (* pScreen->ConstrainCursor)(pDev, pScreen, &pSprite->physLimits);

+    }

+

+    /* constrain the pointer to those limits */

+    if (new.x < pSprite->physLimits.x1)

+	new.x = pSprite->physLimits.x1;

+    else

+	if (new.x >= pSprite->physLimits.x2)

+	    new.x = pSprite->physLimits.x2 - 1;

+    if (new.y < pSprite->physLimits.y1)

+	new.y = pSprite->physLimits.y1;

+    else

+	if (new.y >= pSprite->physLimits.y2)

+	    new.y = pSprite->physLimits.y2 - 1;

+    if (pSprite->hotShape)

+	ConfineToShape(pDev, pSprite->hotShape, &new.x, &new.y);

+    if ((

+#ifdef PANORAMIX

+            noPanoramiXExtension &&

+#endif

+            (pScreen != pSprite->hotPhys.pScreen)) ||

+	(new.x != pSprite->hotPhys.x) || (new.y != pSprite->hotPhys.y))

+    {

+#ifdef PANORAMIX

+        if (!noPanoramiXExtension)

+        {

+            if (pScreen && ((new.x != pSprite->hotPhys.x) || (new.y != pSprite->hotPhys.y)))

+              XineramaSetCursorPosition (pDev, new.x, new.y, generateEvents);

+        }

+        else

+#endif

+        {

+            if (pScreen != pSprite->hotPhys.pScreen)

+                pSprite->hotPhys = new;

+            (*pScreen->SetCursorPosition)

+                (pDev, pScreen, new.x, new.y, generateEvents);

+        }

+        if (!generateEvents)

+            SyntheticMotion(pDev, new.x, new.y);

+    }

+

+#ifdef PANORAMIX

+    /* Tell DDX what the limits are */

+    if (!noPanoramiXExtension)

+        XineramaConstrainCursor(pDev);

+#endif

+}

+

+static void

+CheckVirtualMotion(

+    DeviceIntPtr pDev,

+    QdEventPtr qe,

+    WindowPtr pWin)

+{

+    SpritePtr pSprite = pDev->spriteInfo->sprite;

+    RegionPtr reg = NULL;

+    DeviceEvent *ev = NULL;

+

+    if (qe)

+    {

+        ev = &qe->event->device_event;

+        switch(ev->type)

+        {

+            case ET_Motion:

+            case ET_ButtonPress:

+            case ET_ButtonRelease:

+            case ET_KeyPress:

+            case ET_KeyRelease:

+            case ET_ProximityIn:

+            case ET_ProximityOut:

+                pSprite->hot.pScreen = qe->pScreen;

+                pSprite->hot.x = ev->root_x;

+                pSprite->hot.y = ev->root_y;

+                pWin = pDev->deviceGrab.grab ? pDev->deviceGrab.grab->confineTo : NullWindow;

+                break;

+            default:

+                break;

+        }

+    }

+    if (pWin)

+    {

+	BoxRec lims;

+

+#ifdef PANORAMIX

+        if (!noPanoramiXExtension) {

+            int x, y, off_x, off_y, i;

+

+            if(!XineramaSetWindowPntrs(pDev, pWin))

+                return;

+

+            i = PanoramiXNumScreens - 1;

+

+            RegionCopy(&pSprite->Reg2,

+                    &pSprite->windows[i]->borderSize);

+            off_x = screenInfo.screens[i]->x;

+            off_y = screenInfo.screens[i]->y;

+

+            while(i--) {

+                x = off_x - screenInfo.screens[i]->x;

+                y = off_y - screenInfo.screens[i]->y;

+

+                if(x || y)

+                    RegionTranslate(&pSprite->Reg2, x, y);

+

+                RegionUnion(&pSprite->Reg2, &pSprite->Reg2,

+                        &pSprite->windows[i]->borderSize);

+

+                off_x = screenInfo.screens[i]->x;

+                off_y = screenInfo.screens[i]->y;

+            }

+        } else

+#endif

+        {

+            if (pSprite->hot.pScreen != pWin->drawable.pScreen)

+            {

+                pSprite->hot.pScreen = pWin->drawable.pScreen;

+                pSprite->hot.x = pSprite->hot.y = 0;

+            }

+        }

+

+	lims = *RegionExtents(&pWin->borderSize);

+	if (pSprite->hot.x < lims.x1)

+	    pSprite->hot.x = lims.x1;

+	else if (pSprite->hot.x >= lims.x2)

+	    pSprite->hot.x = lims.x2 - 1;

+	if (pSprite->hot.y < lims.y1)

+	    pSprite->hot.y = lims.y1;

+	else if (pSprite->hot.y >= lims.y2)

+	    pSprite->hot.y = lims.y2 - 1;

+

+#ifdef PANORAMIX

+        if (!noPanoramiXExtension)

+        {

+            if (RegionNumRects(&pSprite->Reg2) > 1)

+                reg = &pSprite->Reg2;

+

+        } else

+#endif

+        {

+            if (wBoundingShape(pWin))

+                reg = &pWin->borderSize;

+        }

+

+        if (reg)

+            ConfineToShape(pDev, reg, &pSprite->hot.x, &pSprite->hot.y);

+

+	if (qe && ev)

+	{

+	    qe->pScreen = pSprite->hot.pScreen;

+	    ev->root_x = pSprite->hot.x;

+	    ev->root_y = pSprite->hot.y;

+	}

+    }

+#ifdef PANORAMIX

+    if (noPanoramiXExtension) /* No typo. Only set the root win if disabled */

+#endif

+        RootWindow(pDev->spriteInfo->sprite) = pSprite->hot.pScreen->root;

+}

+

+static void

+ConfineCursorToWindow(DeviceIntPtr pDev, WindowPtr pWin, Bool generateEvents, Bool confineToScreen)

+{

+    SpritePtr pSprite = pDev->spriteInfo->sprite;

+

+    if (syncEvents.playingEvents)

+    {

+	CheckVirtualMotion(pDev, (QdEventPtr)NULL, pWin);

+	SyntheticMotion(pDev, pSprite->hot.x, pSprite->hot.y);

+    }

+    else

+    {

+#ifdef PANORAMIX

+        if(!noPanoramiXExtension) {

+            XineramaConfineCursorToWindow(pDev, pWin, generateEvents);

+            return;

+        }

+#endif

+	pSprite->hotLimits = *RegionExtents(&pWin->borderSize);

+	pSprite->hotShape = wBoundingShape(pWin) ? &pWin->borderSize

+					       : NullRegion;

+        CheckPhysLimits(pDev, pSprite->current, generateEvents,

+                        confineToScreen, pWin->drawable.pScreen);

+    }

+}

+

+Bool

+PointerConfinedToScreen(DeviceIntPtr pDev)

+{

+    return pDev->spriteInfo->sprite->confined;

+}

+

+/**

+ * Update the sprite cursor to the given cursor.

+ *

+ * ChangeToCursor() will display the new cursor and free the old cursor (if

+ * applicable). If the provided cursor is already the updated cursor, nothing

+ * happens.

+ */

+static void

+ChangeToCursor(DeviceIntPtr pDev, CursorPtr cursor)

+{

+    SpritePtr pSprite = pDev->spriteInfo->sprite;

+    ScreenPtr pScreen;

+

+    if (cursor != pSprite->current)

+    {

+	if ((pSprite->current->bits->xhot != cursor->bits->xhot) ||

+		(pSprite->current->bits->yhot != cursor->bits->yhot))

+	    CheckPhysLimits(pDev, cursor, FALSE, pSprite->confined,

+			    (ScreenPtr)NULL);

+#ifdef PANORAMIX

+        /* XXX: is this really necessary?? (whot) */

+        if (!noPanoramiXExtension)

+            pScreen = pSprite->screen;

+        else

+#endif

+            pScreen = pSprite->hotPhys.pScreen;

+

+        (*pScreen->DisplayCursor)(pDev, pScreen, cursor);

+	FreeCursor(pSprite->current, (Cursor)0);

+	pSprite->current = cursor;

+	pSprite->current->refcnt++;

+    }

+}

+

+/**

+ * @returns true if b is a descendent of a

+ */

+Bool

+IsParent(WindowPtr a, WindowPtr b)

+{

+    for (b = b->parent; b; b = b->parent)

+	if (b == a) return TRUE;

+    return FALSE;

+}

+

+/**

+ * Update the cursor displayed on the screen.

+ *

+ * Called whenever a cursor may have changed shape or position.

+ */

+static void

+PostNewCursor(DeviceIntPtr pDev)

+{

+    WindowPtr win;

+    GrabPtr grab = pDev->deviceGrab.grab;

+    SpritePtr   pSprite = pDev->spriteInfo->sprite;

+    CursorPtr   pCursor;

+

+    if (syncEvents.playingEvents)

+	return;

+    if (grab)

+    {

+	if (grab->cursor)

+	{

+	    ChangeToCursor(pDev, grab->cursor);

+	    return;

+	}

+	if (IsParent(grab->window, pSprite->win))

+	    win = pSprite->win;

+	else

+	    win = grab->window;

+    }

+    else

+	win = pSprite->win;

+    for (; win; win = win->parent)

+    {

+	if (win->optional)

+        {

+            pCursor = WindowGetDeviceCursor(win, pDev);

+            if (!pCursor && win->optional->cursor != NullCursor)

+                pCursor = win->optional->cursor;

+            if (pCursor)

+            {

+                ChangeToCursor(pDev, pCursor);

+                return;

+            }

+	}

+    }

+}

+

+

+/**

+ * @param dev device which you want to know its current root window

+ * @return root window where dev's sprite is located

+ */

+WindowPtr

+GetCurrentRootWindow(DeviceIntPtr dev)

+{

+    return RootWindow(dev->spriteInfo->sprite);

+}

+

+/**

+ * @return window underneath the cursor sprite.

+ */

+WindowPtr

+GetSpriteWindow(DeviceIntPtr pDev)

+{

+    return pDev->spriteInfo->sprite->win;

+}

+

+/**

+ * @return current sprite cursor.

+ */

+CursorPtr

+GetSpriteCursor(DeviceIntPtr pDev)

+{

+    return pDev->spriteInfo->sprite->current;

+}

+

+/**

+ * Set x/y current sprite position in screen coordinates.

+ */

+void

+GetSpritePosition(DeviceIntPtr pDev, int *px, int *py)

+{

+    SpritePtr pSprite = pDev->spriteInfo->sprite;

+    *px = pSprite->hotPhys.x;

+    *py = pSprite->hotPhys.y;

+}

+

+#ifdef PANORAMIX

+int

+XineramaGetCursorScreen(DeviceIntPtr pDev)

+{

+    if(!noPanoramiXExtension) {

+	return pDev->spriteInfo->sprite->screen->myNum;

+    } else {

+	return 0;

+    }

+}

+#endif /* PANORAMIX */

+

+#define TIMESLOP (5 * 60 * 1000) /* 5 minutes */

+

+static void

+MonthChangedOrBadTime(InternalEvent *ev)

+{

+    /* If the ddx/OS is careless about not processing timestamped events from

+     * different sources in sorted order, then it's possible for time to go

+     * backwards when it should not.  Here we ensure a decent time.

+     */

+    if ((currentTime.milliseconds - ev->any.time) > TIMESLOP)

+	currentTime.months++;

+    else

+        ev->any.time = currentTime.milliseconds;

+}

+

+static void

+NoticeTime(InternalEvent *ev)

+{

+    if (ev->any.time < currentTime.milliseconds)

+        MonthChangedOrBadTime(ev);

+    currentTime.milliseconds = ev->any.time;

+    lastDeviceEventTime = currentTime;

+}

+

+void

+NoticeEventTime(InternalEvent *ev)

+{

+    if (!syncEvents.playingEvents)

+	NoticeTime(ev);

+}

+

+/**************************************************************************

+ *            The following procedures deal with synchronous events       *

+ **************************************************************************/

+

+/**

+ * EnqueueEvent is a device's processInputProc if a device is frozen.

+ * Instead of delivering the events to the client, the event is tacked onto a

+ * linked list for later delivery.

+ */

+void

+EnqueueEvent(InternalEvent *ev, DeviceIntPtr device)

+{

+    QdEventPtr	tail = *syncEvents.pendtail;

+    QdEventPtr	qe;

+    SpritePtr	pSprite = device->spriteInfo->sprite;

+    int		eventlen;

+    DeviceEvent *event = &ev->device_event;

+

+    NoticeTime((InternalEvent*)event);

+

+    /* Fix for key repeating bug. */

+    if (device->key != NULL && device->key->xkbInfo != NULL &&

+        event->type == ET_KeyRelease)

+	AccessXCancelRepeatKey(device->key->xkbInfo, event->detail.key);

+

+    if (DeviceEventCallback)

+    {

+	DeviceEventInfoRec eventinfo;

+

+	/*  The RECORD spec says that the root window field of motion events

+	 *  must be valid.  At this point, it hasn't been filled in yet, so

+	 *  we do it here.  The long expression below is necessary to get

+	 *  the current root window; the apparently reasonable alternative

+	 *  GetCurrentRootWindow()->drawable.id doesn't give you the right

+	 *  answer on the first motion event after a screen change because

+	 *  the data that GetCurrentRootWindow relies on hasn't been

+	 *  updated yet.

+	 */

+	if (ev->any.type == ET_Motion)

+	    ev->device_event.root = pSprite->hotPhys.pScreen->root->drawable.id;

+

+	eventinfo.event = ev;

+	eventinfo.device = device;

+	CallCallbacks(&DeviceEventCallback, (pointer)&eventinfo);

+    }

+

+    if (event->type == ET_Motion)

+    {

+#ifdef PANORAMIX

+	if(!noPanoramiXExtension) {

+	    event->root_x += pSprite->screen->x - screenInfo.screens[0]->x;

+	    event->root_y += pSprite->screen->y - screenInfo.screens[0]->y;

+	}

+#endif

+	pSprite->hotPhys.x = event->root_x;

+	pSprite->hotPhys.y = event->root_y;

+	/* do motion compression, but not if from different devices */

+	if (tail &&

+	    (tail->event->any.type == ET_Motion) &&

+            (tail->device == device) &&

+	    (tail->pScreen == pSprite->hotPhys.pScreen))

+	{

+            DeviceEvent *tailev = &tail->event->device_event;

+	    tailev->root_x = pSprite->hotPhys.x;

+	    tailev->root_y = pSprite->hotPhys.y;

+	    tailev->time = event->time;

+	    tail->months = currentTime.months;

+	    return;

+	}

+    }

+

+    eventlen = event->length;

+

+    qe = malloc(sizeof(QdEventRec) + eventlen);

+    if (!qe)

+	return;

+    qe->next = (QdEventPtr)NULL;

+    qe->device = device;

+    qe->pScreen = pSprite->hotPhys.pScreen;

+    qe->months = currentTime.months;

+    qe->event = (InternalEvent *)(qe + 1);

+    memcpy(qe->event, event, eventlen);

+    if (tail)

+	syncEvents.pendtail = &tail->next;

+    *syncEvents.pendtail = qe;

+}

+

+/**

+ * Run through the list of events queued up in syncEvents.

+ * For each event do:

+ * If the device for this event is not frozen anymore, take it and process it

+ * as usually.

+ * After that, check if there's any devices in the list that are not frozen.

+ * If there is none, we're done. If there is at least one device that is not

+ * frozen, then re-run from the beginning of the event queue.

+ */

+static void

+PlayReleasedEvents(void)

+{

+    QdEventPtr *prev, qe;

+    DeviceIntPtr dev;

+    DeviceIntPtr pDev;

+

+    prev = &syncEvents.pending;

+    while ( (qe = *prev) )

+    {

+	if (!qe->device->deviceGrab.sync.frozen)

+	{

+	    *prev = qe->next;

+            pDev = qe->device;

+	    if (*syncEvents.pendtail == *prev)

+		syncEvents.pendtail = prev;

+	    if (qe->event->any.type == ET_Motion)

+		CheckVirtualMotion(pDev, qe, NullWindow);

+	    syncEvents.time.months = qe->months;

+            syncEvents.time.milliseconds = qe->event->any.time;

+#ifdef PANORAMIX

+	   /* Translate back to the sprite screen since processInputProc

+	      will translate from sprite screen to screen 0 upon reentry

+	      to the DIX layer */

+	    if(!noPanoramiXExtension) {

+                DeviceEvent *ev = &qe->event->device_event;

+                switch(ev->type)

+                {

+                    case ET_Motion:

+                    case ET_ButtonPress:

+                    case ET_ButtonRelease:

+                    case ET_KeyPress:

+                    case ET_KeyRelease:

+                    case ET_ProximityIn:

+                    case ET_ProximityOut:

+                        ev->root_x += screenInfo.screens[0]->x -

+                            pDev->spriteInfo->sprite->screen->x;

+                        ev->root_y += screenInfo.screens[0]->y -

+                            pDev->spriteInfo->sprite->screen->y;

+                        break;

+                    default:

+                        break;

+                }

+

+	    }

+#endif

+	    (*qe->device->public.processInputProc)(qe->event, qe->device);

+	    free(qe);

+	    for (dev = inputInfo.devices; dev && dev->deviceGrab.sync.frozen; dev = dev->next)

+		;

+	    if (!dev)

+		break;

+	    /* Playing the event may have unfrozen another device. */

+	    /* So to play it safe, restart at the head of the queue */

+	    prev = &syncEvents.pending;

+	}

+	else

+	    prev = &qe->next;

+    }

+}

+

+/**

+ * Freeze or thaw the given devices. The device's processing proc is

+ * switched to either the real processing proc (in case of thawing) or an

+ * enqueuing processing proc (usually EnqueueEvent()).

+ *

+ * @param dev The device to freeze/thaw

+ * @param frozen True to freeze or false to thaw.

+ */

+static void

+FreezeThaw(DeviceIntPtr dev, Bool frozen)

+{

+    dev->deviceGrab.sync.frozen = frozen;

+    if (frozen)

+	dev->public.processInputProc = dev->public.enqueueInputProc;

+    else

+	dev->public.processInputProc = dev->public.realInputProc;

+}

+

+/**

+ * Unfreeze devices and replay all events to the respective clients.

+ *

+ * ComputeFreezes takes the first event in the device's frozen event queue. It

+ * runs up the sprite tree (spriteTrace) and searches for the window to replay

+ * the events from. If it is found, it checks for passive grabs one down from

+ * the window or delivers the events.

+ */

+static void

+ComputeFreezes(void)

+{

+    DeviceIntPtr replayDev = syncEvents.replayDev;

+    WindowPtr w;

+    GrabPtr grab;

+    DeviceIntPtr dev;

+

+    for (dev = inputInfo.devices; dev; dev = dev->next)

+	FreezeThaw(dev, dev->deviceGrab.sync.other ||

+                (dev->deviceGrab.sync.state >= FROZEN));

+    if (syncEvents.playingEvents || (!replayDev && !syncEvents.pending))

+	return;

+    syncEvents.playingEvents = TRUE;

+    if (replayDev)

+    {

+        DeviceEvent* event = replayDev->deviceGrab.sync.event;

+

+	syncEvents.replayDev = (DeviceIntPtr)NULL;

+

+        w = XYToWindow(replayDev->spriteInfo->sprite,

+                       event->root_x, event->root_y);

+        if (!CheckDeviceGrabs(replayDev, event, syncEvents.replayWin))

+        {

+            if (replayDev->focus && !IsPointerEvent((InternalEvent*)event))

+                DeliverFocusedEvent(replayDev, (InternalEvent*)event, w);

+            else

+                DeliverDeviceEvents(w, (InternalEvent*)event, NullGrab,

+                                    NullWindow, replayDev);

+        }

+    }

+    for (dev = inputInfo.devices; dev; dev = dev->next)

+    {

+	if (!dev->deviceGrab.sync.frozen)

+	{

+	    PlayReleasedEvents();

+	    break;

+	}

+    }

+    syncEvents.playingEvents = FALSE;

+    for (dev = inputInfo.devices; dev; dev = dev->next)

+    {

+        if (DevHasCursor(dev))

+        {

+            /* the following may have been skipped during replay,

+              so do it now */

+            if ((grab = dev->deviceGrab.grab) && grab->confineTo)

+            {

+                if (grab->confineTo->drawable.pScreen !=

+                        dev->spriteInfo->sprite->hotPhys.pScreen)

+                    dev->spriteInfo->sprite->hotPhys.x =

+                        dev->spriteInfo->sprite->hotPhys.y = 0;

+                ConfineCursorToWindow(dev, grab->confineTo, TRUE, TRUE);

+            }

+            else

+                ConfineCursorToWindow(dev,

+                        dev->spriteInfo->sprite->hotPhys.pScreen->root,

+                        TRUE, FALSE);

+            PostNewCursor(dev);

+        }

+    }

+}

+

+#ifdef RANDR

+void

+ScreenRestructured (ScreenPtr pScreen)

+{

+    GrabPtr grab;

+    DeviceIntPtr pDev;

+

+    for (pDev = inputInfo.devices; pDev; pDev = pDev->next)

+    {

+        if (!DevHasCursor(pDev))

+            continue;

+

+        /* GrabDevice doesn't have a confineTo field, so we don't need to

+         * worry about it. */

+        if ((grab = pDev->deviceGrab.grab) && grab->confineTo)

+        {

+            if (grab->confineTo->drawable.pScreen

+                    != pDev->spriteInfo->sprite->hotPhys.pScreen)

+                pDev->spriteInfo->sprite->hotPhys.x = pDev->spriteInfo->sprite->hotPhys.y = 0;

+            ConfineCursorToWindow(pDev, grab->confineTo, TRUE, TRUE);

+        }

+        else

+            ConfineCursorToWindow(pDev,

+                    pDev->spriteInfo->sprite->hotPhys.pScreen->root,

+                    TRUE, FALSE);

+    }

+}

+#endif

+

+static void

+CheckGrabForSyncs(DeviceIntPtr thisDev, Bool thisMode, Bool otherMode)

+{

+    GrabPtr grab = thisDev->deviceGrab.grab;

+    DeviceIntPtr dev;

+

+    if (thisMode == GrabModeSync)

+	thisDev->deviceGrab.sync.state = FROZEN_NO_EVENT;

+    else

+    {	/* free both if same client owns both */

+	thisDev->deviceGrab.sync.state = THAWED;

+	if (thisDev->deviceGrab.sync.other &&

+	    (CLIENT_BITS(thisDev->deviceGrab.sync.other->resource) ==

+	     CLIENT_BITS(grab->resource)))

+	    thisDev->deviceGrab.sync.other = NullGrab;

+    }

+

+    if (IsMaster(thisDev))

+    {

+        dev = GetPairedDevice(thisDev);

+        if (otherMode == GrabModeSync)

+            dev->deviceGrab.sync.other = grab;

+        else

+        {	/* free both if same client owns both */

+            if (dev->deviceGrab.sync.other &&

+                    (CLIENT_BITS(dev->deviceGrab.sync.other->resource) ==

+                     CLIENT_BITS(grab->resource)))

+                dev->deviceGrab.sync.other = NullGrab;

+        }

+    }

+    ComputeFreezes();

+}

+

+/**

+ * Save the device's master device id. This needs to be done

+ * if a client directly grabs a slave device that is attached to a master. For

+ * the duration of the grab, the device is detached, ungrabbing re-attaches it

+ * though.

+ *

+ * We store the ID of the master device only in case the master disappears

+ * while the device has a grab.

+ */

+static void

+DetachFromMaster(DeviceIntPtr dev)

+{

+    if (!IsFloating(dev))

+        return;

+

+    dev->saved_master_id = GetMaster(dev, MASTER_ATTACHED)->id;

+

+    AttachDevice(NULL, dev, NULL);

+}

+

+static void

+ReattachToOldMaster(DeviceIntPtr dev)

+{

+    DeviceIntPtr master = NULL;

+

+    if (IsMaster(dev))

+        return;

+

+    dixLookupDevice(&master, dev->saved_master_id, serverClient, DixUseAccess);

+

+    if (master)

+    {

+        AttachDevice(serverClient, dev, master);

+	dev->saved_master_id = 0;

+    }

+}

+

+/**

+ * Activate a pointer grab on the given device. A pointer grab will cause all

+ * core pointer events of this device to be delivered to the grabbing client only.

+ * No other device will send core events to the grab client while the grab is

+ * on, but core events will be sent to other clients.

+ * Can cause the cursor to change if a grab cursor is set.

+ *

+ * Note that parameter autoGrab may be (True & ImplicitGrabMask) if the grab

+ * is an implicit grab caused by a ButtonPress event.

+ *

+ * @param mouse The device to grab.

+ * @param grab The grab structure, needs to be setup.

+ * @param autoGrab True if the grab was caused by a button down event and not

+ * explicitely by a client.

+ */

+void

+ActivatePointerGrab(DeviceIntPtr mouse, GrabPtr grab,

+                    TimeStamp time, Bool autoGrab)

+{

+    GrabInfoPtr grabinfo = &mouse->deviceGrab;

+    WindowPtr oldWin = (grabinfo->grab) ?

+                        grabinfo->grab->window

+                        : mouse->spriteInfo->sprite->win;

+    Bool isPassive = autoGrab & ~ImplicitGrabMask;

+

+    /* slave devices need to float for the duration of the grab. */

+    if (grab->grabtype == GRABTYPE_XI2 &&

+        !(autoGrab & ImplicitGrabMask) && !IsMaster(mouse))

+        DetachFromMaster(mouse);

+

+    if (grab->confineTo)

+    {

+	if (grab->confineTo->drawable.pScreen

+                != mouse->spriteInfo->sprite->hotPhys.pScreen)

+	    mouse->spriteInfo->sprite->hotPhys.x =

+                mouse->spriteInfo->sprite->hotPhys.y = 0;

+	ConfineCursorToWindow(mouse, grab->confineTo, FALSE, TRUE);

+    }

+    DoEnterLeaveEvents(mouse, mouse->id, oldWin, grab->window, NotifyGrab);

+    mouse->valuator->motionHintWindow = NullWindow;

+    if (syncEvents.playingEvents)

+        grabinfo->grabTime = syncEvents.time;

+    else

+	grabinfo->grabTime = time;

+    if (grab->cursor)

+	grab->cursor->refcnt++;

+    grabinfo->activeGrab = *grab;

+    grabinfo->grab = &grabinfo->activeGrab;

+    grabinfo->fromPassiveGrab = isPassive;

+    grabinfo->implicitGrab = autoGrab & ImplicitGrabMask;

+    PostNewCursor(mouse);

+    CheckGrabForSyncs(mouse,(Bool)grab->pointerMode, (Bool)grab->keyboardMode);

+}

+

+/**

+ * Delete grab on given device, update the sprite.

+ *

+ * Extension devices are set up for ActivateKeyboardGrab().

+ */

+void

+DeactivatePointerGrab(DeviceIntPtr mouse)

+{

+    GrabPtr grab = mouse->deviceGrab.grab;

+    DeviceIntPtr dev;

+    Bool wasImplicit = (mouse->deviceGrab.fromPassiveGrab &&

+                        mouse->deviceGrab.implicitGrab);

+

+    mouse->valuator->motionHintWindow = NullWindow;

+    mouse->deviceGrab.grab = NullGrab;

+    mouse->deviceGrab.sync.state = NOT_GRABBED;

+    mouse->deviceGrab.fromPassiveGrab = FALSE;

+

+    for (dev = inputInfo.devices; dev; dev = dev->next)

+    {

+	if (dev->deviceGrab.sync.other == grab)

+	    dev->deviceGrab.sync.other = NullGrab;

+    }

+    DoEnterLeaveEvents(mouse, mouse->id, grab->window,

+                       mouse->spriteInfo->sprite->win, NotifyUngrab);

+    if (grab->confineTo)

+	ConfineCursorToWindow(mouse, GetCurrentRootWindow(mouse), FALSE, FALSE);

+    PostNewCursor(mouse);

+    if (grab->cursor)

+	FreeCursor(grab->cursor, (Cursor)0);

+

+    if (!wasImplicit && grab->grabtype == GRABTYPE_XI2)

+        ReattachToOldMaster(mouse);

+

+    ComputeFreezes();

+}

+

+/**

+ * Activate a keyboard grab on the given device.

+ *

+ * Extension devices have ActivateKeyboardGrab() set as their grabbing proc.

+ */

+void

+ActivateKeyboardGrab(DeviceIntPtr keybd, GrabPtr grab, TimeStamp time, Bool passive)

+{

+    GrabInfoPtr grabinfo = &keybd->deviceGrab;

+    WindowPtr oldWin;

+

+    /* slave devices need to float for the duration of the grab. */

+    if (grab->grabtype == GRABTYPE_XI2 &&

+        !(passive & ImplicitGrabMask) &&

+        !IsMaster(keybd))

+        DetachFromMaster(keybd);

+

+    if (grabinfo->grab)

+	oldWin = grabinfo->grab->window;

+    else if (keybd->focus)

+	oldWin = keybd->focus->win;

+    else

+	oldWin = keybd->spriteInfo->sprite->win;

+    if (oldWin == FollowKeyboardWin)

+	oldWin = keybd->focus->win;

+    if (keybd->valuator)

+	keybd->valuator->motionHintWindow = NullWindow;

+    DoFocusEvents(keybd, oldWin, grab->window, NotifyGrab);

+    if (syncEvents.playingEvents)

+	grabinfo->grabTime = syncEvents.time;

+    else

+	grabinfo->grabTime = time;

+    grabinfo->activeGrab = *grab;

+    grabinfo->grab = &grabinfo->activeGrab;

+    grabinfo->fromPassiveGrab = passive;

+    grabinfo->implicitGrab = passive & ImplicitGrabMask;

+    CheckGrabForSyncs(keybd, (Bool)grab->keyboardMode, (Bool)grab->pointerMode);

+}

+

+/**

+ * Delete keyboard grab for the given device.

+ */

+void

+DeactivateKeyboardGrab(DeviceIntPtr keybd)

+{

+    GrabPtr grab = keybd->deviceGrab.grab;

+    DeviceIntPtr dev;

+    WindowPtr focusWin = keybd->focus ? keybd->focus->win

+                                           : keybd->spriteInfo->sprite->win;

+    Bool wasImplicit = (keybd->deviceGrab.fromPassiveGrab &&

+                        keybd->deviceGrab.implicitGrab);

+

+    if (focusWin == FollowKeyboardWin)

+	focusWin = inputInfo.keyboard->focus->win;

+    if (keybd->valuator)

+	keybd->valuator->motionHintWindow = NullWindow;

+    keybd->deviceGrab.grab = NullGrab;

+    keybd->deviceGrab.sync.state = NOT_GRABBED;

+    keybd->deviceGrab.fromPassiveGrab = FALSE;

+

+    for (dev = inputInfo.devices; dev; dev = dev->next)

+    {

+	if (dev->deviceGrab.sync.other == grab)

+	    dev->deviceGrab.sync.other = NullGrab;

+    }

+    DoFocusEvents(keybd, grab->window, focusWin, NotifyUngrab);

+

+    if (!wasImplicit && grab->grabtype == GRABTYPE_XI2)

+        ReattachToOldMaster(keybd);

+

+    ComputeFreezes();

+}

+

+void

+AllowSome(ClientPtr client,

+          TimeStamp time,

+          DeviceIntPtr thisDev,

+          int newState)

+{

+    Bool thisGrabbed, otherGrabbed, othersFrozen, thisSynced;

+    TimeStamp grabTime;

+    DeviceIntPtr dev;

+    GrabInfoPtr devgrabinfo,

+                grabinfo = &thisDev->deviceGrab;

+

+    thisGrabbed = grabinfo->grab && SameClient(grabinfo->grab, client);

+    thisSynced = FALSE;

+    otherGrabbed = FALSE;

+    othersFrozen = FALSE;

+    grabTime = grabinfo->grabTime;

+    for (dev = inputInfo.devices; dev; dev = dev->next)

+    {

+        devgrabinfo = &dev->deviceGrab;

+

+	if (dev == thisDev)

+	    continue;

+	if (devgrabinfo->grab && SameClient(devgrabinfo->grab, client))

+	{

+	    if (!(thisGrabbed || otherGrabbed) ||

+		(CompareTimeStamps(devgrabinfo->grabTime, grabTime) == LATER))

+		grabTime = devgrabinfo->grabTime;

+	    otherGrabbed = TRUE;

+	    if (grabinfo->sync.other == devgrabinfo->grab)

+		thisSynced = TRUE;

+	    if (devgrabinfo->sync.state >= FROZEN)

+		othersFrozen = TRUE;

+	}

+    }

+    if (!((thisGrabbed && grabinfo->sync.state >= FROZEN) || thisSynced))

+	return;

+    if ((CompareTimeStamps(time, currentTime) == LATER) ||

+	(CompareTimeStamps(time, grabTime) == EARLIER))

+	return;

+    switch (newState)

+    {

+	case THAWED:		       /* Async */

+	    if (thisGrabbed)

+		grabinfo->sync.state = THAWED;

+	    if (thisSynced)

+		grabinfo->sync.other = NullGrab;

+	    ComputeFreezes();

+	    break;

+	case FREEZE_NEXT_EVENT:		/* Sync */

+	    if (thisGrabbed)

+	    {

+		grabinfo->sync.state = FREEZE_NEXT_EVENT;

+		if (thisSynced)

+		    grabinfo->sync.other = NullGrab;

+		ComputeFreezes();

+	    }

+	    break;

+	case THAWED_BOTH:		/* AsyncBoth */

+	    if (othersFrozen)

+	    {

+		for (dev = inputInfo.devices; dev; dev = dev->next)

+		{

+                    devgrabinfo = &dev->deviceGrab;

+		    if (devgrabinfo->grab

+                            && SameClient(devgrabinfo->grab, client))

+			devgrabinfo->sync.state = THAWED;

+		    if (devgrabinfo->sync.other &&

+                            SameClient(devgrabinfo->sync.other, client))

+			devgrabinfo->sync.other = NullGrab;

+		}

+		ComputeFreezes();

+	    }

+	    break;

+	case FREEZE_BOTH_NEXT_EVENT:	/* SyncBoth */

+	    if (othersFrozen)

+	    {

+		for (dev = inputInfo.devices; dev; dev = dev->next)

+		{

+                    devgrabinfo = &dev->deviceGrab;

+		    if (devgrabinfo->grab

+                            && SameClient(devgrabinfo->grab, client))

+			devgrabinfo->sync.state = FREEZE_BOTH_NEXT_EVENT;

+		    if (devgrabinfo->sync.other

+                            && SameClient(devgrabinfo->sync.other, client))

+			devgrabinfo->sync.other = NullGrab;

+		}

+		ComputeFreezes();

+	    }

+	    break;

+	case NOT_GRABBED:		/* Replay */

+	    if (thisGrabbed && grabinfo->sync.state == FROZEN_WITH_EVENT)

+	    {

+		if (thisSynced)

+		    grabinfo->sync.other = NullGrab;

+		syncEvents.replayDev = thisDev;

+		syncEvents.replayWin = grabinfo->grab->window;

+		(*grabinfo->DeactivateGrab)(thisDev);

+		syncEvents.replayDev = (DeviceIntPtr)NULL;

+	    }

+	    break;

+	case THAW_OTHERS:		/* AsyncOthers */

+	    if (othersFrozen)

+	    {

+		for (dev = inputInfo.devices; dev; dev = dev->next)

+		{

+		    if (dev == thisDev)

+			continue;

+                    devgrabinfo = &dev->deviceGrab;

+		    if (devgrabinfo->grab

+                            && SameClient(devgrabinfo->grab, client))

+			devgrabinfo->sync.state = THAWED;

+		    if (devgrabinfo->sync.other

+                            && SameClient(devgrabinfo->sync.other, client))

+			devgrabinfo->sync.other = NullGrab;

+		}

+		ComputeFreezes();

+	    }

+	    break;

+    }

+}

+

+/**

+ * Server-side protocol handling for AllowEvents request.

+ *

+ * Release some events from a frozen device.

+ */

+int

+ProcAllowEvents(ClientPtr client)

+{

+    TimeStamp		time;

+    DeviceIntPtr	mouse = NULL;

+    DeviceIntPtr	keybd = NULL;

+    REQUEST(xAllowEventsReq);

+

+    REQUEST_SIZE_MATCH(xAllowEventsReq);

+    time = ClientTimeToServerTime(stuff->time);

+

+    mouse = PickPointer(client);

+    keybd = PickKeyboard(client);

+

+    switch (stuff->mode)

+    {

+	case ReplayPointer:

+	    AllowSome(client, time, mouse, NOT_GRABBED);

+	    break;

+	case SyncPointer:

+	    AllowSome(client, time, mouse, FREEZE_NEXT_EVENT);

+	    break;

+	case AsyncPointer:

+	    AllowSome(client, time, mouse, THAWED);

+	    break;

+	case ReplayKeyboard:

+	    AllowSome(client, time, keybd, NOT_GRABBED);

+	    break;

+	case SyncKeyboard:

+	    AllowSome(client, time, keybd, FREEZE_NEXT_EVENT);

+	    break;

+	case AsyncKeyboard:

+	    AllowSome(client, time, keybd, THAWED);

+	    break;

+	case SyncBoth:

+	    AllowSome(client, time, keybd, FREEZE_BOTH_NEXT_EVENT);

+	    break;

+	case AsyncBoth:

+	    AllowSome(client, time, keybd, THAWED_BOTH);

+	    break;

+	default:

+	    client->errorValue = stuff->mode;

+	    return BadValue;

+    }

+    return Success;

+}

+

+/**

+ * Deactivate grabs from any device that has been grabbed by the client.

+ */

+void

+ReleaseActiveGrabs(ClientPtr client)

+{

+    DeviceIntPtr dev;

+    Bool    done;

+

+    /* XXX CloseDownClient should remove passive grabs before

+     * releasing active grabs.

+     */

+    do {

+	done = TRUE;

+	for (dev = inputInfo.devices; dev; dev = dev->next)

+	{

+	    if (dev->deviceGrab.grab && SameClient(dev->deviceGrab.grab, client))

+	    {

+		(*dev->deviceGrab.DeactivateGrab)(dev);

+		done = FALSE;

+	    }

+	}

+    } while (!done);

+}

+

+/**************************************************************************

+ *            The following procedures deal with delivering events        *

+ **************************************************************************/

+

+/**

+ * Deliver the given events to the given client.

+ *

+ * More than one event may be delivered at a time. This is the case with

+ * DeviceMotionNotifies which may be followed by DeviceValuator events.

+ *

+ * TryClientEvents() is the last station before actually writing the events to

+ * the socket. Anything that is not filtered here, will get delivered to the

+ * client.

+ * An event is only delivered if

+ *   - mask and filter match up.

+ *   - no other client has a grab on the device that caused the event.

+ *

+ *

+ * @param client The target client to deliver to.

+ * @param dev The device the event came from. May be NULL.

+ * @param pEvents The events to be delivered.

+ * @param count Number of elements in pEvents.

+ * @param mask Event mask as set by the window.

+ * @param filter Mask based on event type.

+ * @param grab Possible grab on the device that caused the event.

+ *

+ * @return 1 if event was delivered, 0 if not or -1 if grab was not set by the

+ * client.

+ */

+int

+TryClientEvents (ClientPtr client, DeviceIntPtr dev, xEvent *pEvents,

+                 int count, Mask mask, Mask filter, GrabPtr grab)

+{

+    int type;

+

+#ifdef DEBUG_EVENTS

+    ErrorF("[dix] Event([%d, %d], mask=0x%lx), client=%d%s",

+           pEvents->u.u.type, pEvents->u.u.detail, mask,

+           client ? client->index : -1,

+           (client && client->clientGone) ? " (gone)" : "");

+#endif

+

+    if (!client || client == serverClient || client->clientGone) {

+#ifdef DEBUG_EVENTS

+        ErrorF(" not delivered to fake/dead client\n");

+#endif

+        return 0;

+    }

+

+    if (filter != CantBeFiltered && !(mask & filter))

+    {

+ #ifdef DEBUG_EVENTS

+        ErrorF(" filtered\n");

+ #endif

+        return 0;

+    }

+

+    if (grab && !SameClient(grab, client))

+    {

+#ifdef DEBUG_EVENTS

+        ErrorF(" not delivered due to grab\n");

+#endif

+        return -1; /* don't send, but notify caller */

+    }

+

+    type = pEvents->u.u.type;

+    if (type == MotionNotify)

+    {

+        if (mask & PointerMotionHintMask)

+        {

+            if (WID(dev->valuator->motionHintWindow) ==

+                    pEvents->u.keyButtonPointer.event)

+            {

+#ifdef DEBUG_EVENTS

+                ErrorF("[dix] \n");

+                ErrorF("[dix] motionHintWindow == keyButtonPointer.event\n");

+#endif

+                return 1; /* don't send, but pretend we did */

+            }

+            pEvents->u.u.detail = NotifyHint;

+        }

+        else

+        {

+            pEvents->u.u.detail = NotifyNormal;

+        }

+    }

+    else if (type == DeviceMotionNotify)

+    {

+        if (MaybeSendDeviceMotionNotifyHint((deviceKeyButtonPointer*)pEvents,

+                                            mask) != 0)

+            return 1;

+    } else if (type == KeyPress)

+    {

+        if (EventIsKeyRepeat(pEvents))

+        {

+            if (!_XkbWantsDetectableAutoRepeat(client))

+            {

+                xEvent release = *pEvents;

+                release.u.u.type = KeyRelease;

+                WriteEventsToClient(client, 1, &release);

+#ifdef DEBUG_EVENTS

+                ErrorF(" (plus fake core release for repeat)");

+#endif

+            } else

+            {

+#ifdef DEBUG_EVENTS

+                ErrorF(" (detectable autorepeat for core)");

+#endif

+            }

+        }

+

+    } else if (type == DeviceKeyPress)

+    {

+        if (EventIsKeyRepeat(pEvents))

+        {

+            if (!_XkbWantsDetectableAutoRepeat(client))

+            {

+                deviceKeyButtonPointer release = *(deviceKeyButtonPointer *)pEvents;

+                release.type = DeviceKeyRelease;

+#ifdef DEBUG_EVENTS

+                ErrorF(" (plus fake xi1 release for repeat)");

+#endif

+                WriteEventsToClient(client, 1, (xEvent *) &release);

+            }

+            else {

+#ifdef DEBUG_EVENTS

+                ErrorF(" (detectable autorepeat for core)");

+#endif

+            }

+        }

+    }

+

+    if (BitIsOn(criticalEvents, type))

+    {

+        if (client->smart_priority < SMART_MAX_PRIORITY)

+            client->smart_priority++;

+        SetCriticalOutputPending();

+    }

+

+    WriteEventsToClient(client, count, pEvents);

+#ifdef DEBUG_EVENTS

+    ErrorF("[dix]  delivered\n");

+#endif

+    return 1;

+}

+

+/**

+ * Deliver events to a window. At this point, we do not yet know if the event

+ * actually needs to be delivered. May activate a grab if the event is a

+ * button press.

+ *

+ * Core events are always delivered to the window owner. If the filter is

+ * something other than CantBeFiltered, the event is also delivered to other

+ * clients with the matching mask on the window.

+ *

+ * More than one event may be delivered at a time. This is the case with

+ * DeviceMotionNotifies which may be followed by DeviceValuator events.

+ *

+ * @param pWin The window that would get the event.

+ * @param pEvents The events to be delivered.

+ * @param count Number of elements in pEvents.

+ * @param filter Mask based on event type.

+ * @param grab Possible grab on the device that caused the event.

+ *

+ * @return Number of events delivered to various clients.

+ */

+int

+DeliverEventsToWindow(DeviceIntPtr pDev, WindowPtr pWin, xEvent

+        *pEvents, int count, Mask filter, GrabPtr grab)

+{

+    int deliveries = 0, nondeliveries = 0;

+    int attempt;

+    InputClients *other;

+    ClientPtr client = NullClient;

+    Mask deliveryMask = 0; /* If a grab occurs due to a button press, then

+		              this mask is the mask of the grab. */

+    int type = pEvents->u.u.type;

+

+

+    /* Deliver to window owner */

+    if ((filter == CantBeFiltered) || CORE_EVENT(pEvents))

+    {

+	/* if nobody ever wants to see this event, skip some work */

+	if (filter != CantBeFiltered &&

+	    !((wOtherEventMasks(pWin)|pWin->eventMask) & filter))

+	    return 0;

+

+        if (IsInterferingGrab(wClient(pWin), pDev, pEvents))

+                return 0;

+

+	if (XaceHook(XACE_RECEIVE_ACCESS, wClient(pWin), pWin, pEvents, count))

+	    /* do nothing */;

+        else if ( (attempt = TryClientEvents(wClient(pWin), pDev, pEvents,

+                                             count, pWin->eventMask,

+                                             filter, grab)) )

+	{

+	    if (attempt > 0)

+	    {

+		deliveries++;

+		client = wClient(pWin);

+		deliveryMask = pWin->eventMask;

+	    } else

+		nondeliveries--;

+	}

+    }

+

+    /* CantBeFiltered means only window owner gets the event */

+    if (filter != CantBeFiltered)

+    {

+        if (CORE_EVENT(pEvents))

+            other = (InputClients *)wOtherClients(pWin);

+        else if (XI2_EVENT(pEvents))

+        {

+            OtherInputMasks *inputMasks = wOtherInputMasks(pWin);

+            /* Has any client selected for the event? */

+            if (!GetWindowXI2Mask(pDev, pWin, pEvents))

+                return 0;

+            other = inputMasks->inputClients;

+        } else {

+            OtherInputMasks *inputMasks = wOtherInputMasks(pWin);

+            /* Has any client selected for the event? */

+            if (!inputMasks ||

+                !(inputMasks->inputEvents[pDev->id] & filter))

+                return 0;

+

+            other = inputMasks->inputClients;

+        }

+

+        for (; other; other = other->next)

+        {

+            Mask mask;

+            if (IsInterferingGrab(rClient(other), pDev, pEvents))

+                continue;

+

+            mask = GetEventMask(pDev, pEvents, other);

+

+            if (XaceHook(XACE_RECEIVE_ACCESS, rClient(other), pWin,

+                        pEvents, count))

+                /* do nothing */;

+            else if ( (attempt = TryClientEvents(rClient(other), pDev,

+                            pEvents, count,

+                            mask, filter, grab)) )

+            {

+                if (attempt > 0)

+                {

+                    deliveries++;

+                    client = rClient(other);

+                    deliveryMask = mask;

+                } else

+                    nondeliveries--;

+            }

+        }

+    }

+    /*

+     * Note that since core events are delivered first, an implicit grab may

+     * be activated on a core grab, stopping the XI events.

+     */

+    if ((type == DeviceButtonPress || type == ButtonPress ||

+        ((XI2_EVENT(pEvents) && ((xGenericEvent*)pEvents)->evtype == XI_ButtonPress)))

+            && deliveries

+            && (!grab))

+    {

+	GrabRec tempGrab;

+        OtherInputMasks *inputMasks;

+

+        memset(&tempGrab, 0, sizeof(GrabRec));

+        tempGrab.next = NULL;

+	tempGrab.device = pDev;

+	tempGrab.resource = client->clientAsMask;

+	tempGrab.window = pWin;

+	tempGrab.ownerEvents = (deliveryMask & OwnerGrabButtonMask) ? TRUE : FALSE;

+	tempGrab.eventMask = deliveryMask;

+	tempGrab.keyboardMode = GrabModeAsync;

+	tempGrab.pointerMode = GrabModeAsync;

+	tempGrab.confineTo = NullWindow;

+	tempGrab.cursor = NullCursor;

+        tempGrab.type = type;

+        if (type == ButtonPress)

+            tempGrab.grabtype = GRABTYPE_CORE;

+        else if (type == DeviceButtonPress)

+            tempGrab.grabtype = GRABTYPE_XI;

+        else

+        {

+            tempGrab.type = ((xGenericEvent*)pEvents)->evtype;

+            tempGrab.grabtype = GRABTYPE_XI2;

+        }

+

+        /* get the XI and XI2 device mask */

+        inputMasks = wOtherInputMasks(pWin);

+        tempGrab.deviceMask = (inputMasks) ? inputMasks->inputEvents[pDev->id]: 0;

+

+        if (inputMasks)

+            memcpy(tempGrab.xi2mask, inputMasks->xi2mask,

+                    sizeof(tempGrab.xi2mask));

+

+	(*pDev->deviceGrab.ActivateGrab)(pDev, &tempGrab,

+                                        currentTime, TRUE | ImplicitGrabMask);

+    }

+    else if ((type == MotionNotify) && deliveries)

+	pDev->valuator->motionHintWindow = pWin;

+    else

+    {

+	if ((type == DeviceMotionNotify || type == DeviceButtonPress) &&

+	    deliveries)

+	    CheckDeviceGrabAndHintWindow (pWin, type,

+					  (deviceKeyButtonPointer*) pEvents,

+					  grab, client, deliveryMask);

+    }

+    if (deliveries)

+	return deliveries;

+    return nondeliveries;

+}

+

+/* If the event goes to dontClient, don't send it and return 0.  if

+   send works,  return 1 or if send didn't work, return 2.

+   Only works for core events.

+*/

+

+#ifdef PANORAMIX

+static int

+XineramaTryClientEventsResult(

+    ClientPtr client,

+    GrabPtr grab,

+    Mask mask,

+    Mask filter

+){

+    if ((client) && (client != serverClient) && (!client->clientGone) &&

+        ((filter == CantBeFiltered) || (mask & filter)))

+    {

+        if (grab && !SameClient(grab, client)) return -1;

+	else return 1;

+    }

+    return 0;

+}

+#endif

+

+/**

+ * Try to deliver events to the interested parties.

+ *

+ * @param pWin The window that would get the event.

+ * @param pEvents The events to be delivered.

+ * @param count Number of elements in pEvents.

+ * @param filter Mask based on event type.

+ * @param dontClient Don't deliver to the dontClient.

+ */

+int

+MaybeDeliverEventsToClient(WindowPtr pWin, xEvent *pEvents,

+                           int count, Mask filter, ClientPtr dontClient)

+{

+    OtherClients *other;

+

+

+    if (pWin->eventMask & filter)

+    {

+        if (wClient(pWin) == dontClient)

+	    return 0;

+#ifdef PANORAMIX

+	if(!noPanoramiXExtension && pWin->drawable.pScreen->myNum)

+	    return XineramaTryClientEventsResult(

+			wClient(pWin), NullGrab, pWin->eventMask, filter);

+#endif

+	if (XaceHook(XACE_RECEIVE_ACCESS, wClient(pWin), pWin, pEvents, count))

+	    return 1; /* don't send, but pretend we did */

+	return TryClientEvents(wClient(pWin), NULL, pEvents, count,

+			       pWin->eventMask, filter, NullGrab);

+    }

+    for (other = wOtherClients(pWin); other; other = other->next)

+    {

+	if (other->mask & filter)

+	{

+            if (SameClient(other, dontClient))

+		return 0;

+#ifdef PANORAMIX

+	    if(!noPanoramiXExtension && pWin->drawable.pScreen->myNum)

+	      return XineramaTryClientEventsResult(

+			rClient(other), NullGrab, other->mask, filter);

+#endif

+	    if (XaceHook(XACE_RECEIVE_ACCESS, rClient(other), pWin, pEvents,

+			 count))

+		return 1; /* don't send, but pretend we did */

+	    return TryClientEvents(rClient(other), NULL, pEvents, count,

+				   other->mask, filter, NullGrab);

+	}

+    }

+    return 2;

+}

+

+static Window FindChildForEvent(SpritePtr pSprite, WindowPtr event)

+{

+    WindowPtr w = pSprite->spriteTrace[pSprite->spriteTraceGood-1];

+    Window child = None;

+

+    /* If the search ends up past the root should the child field be

+       set to none or should the value in the argument be passed

+       through. It probably doesn't matter since everyone calls

+       this function with child == None anyway. */

+    while (w)

+    {

+        /* If the source window is same as event window, child should be

+           none.  Don't bother going all all the way back to the root. */

+

+        if (w == event)

+        {

+            child = None;

+            break;

+        }

+

+        if (w->parent == event)

+        {

+            child = w->drawable.id;

+            break;

+        }

+        w = w->parent;

+    }

+    return child;

+}

+

+/**

+ * Adjust event fields to comply with the window properties.

+ *

+ * @param xE Event to be modified in place

+ * @param pWin The window to get the information from.

+ * @param child Child window setting for event (if applicable)

+ * @param calcChild If True, calculate the child window.

+ */

+void

+FixUpEventFromWindow(

+    SpritePtr pSprite,

+    xEvent *xE,

+    WindowPtr pWin,

+    Window child,

+    Bool calcChild)

+{

+    if (calcChild)

+        child = FindChildForEvent(pSprite, pWin);

+

+    if (XI2_EVENT(xE))

+    {

+        xXIDeviceEvent* event = (xXIDeviceEvent*)xE;

+

+        if (event->evtype == XI_RawKeyPress ||

+            event->evtype == XI_RawKeyRelease ||

+            event->evtype == XI_RawButtonPress ||

+            event->evtype == XI_RawButtonRelease ||

+            event->evtype == XI_RawMotion ||

+            event->evtype == XI_DeviceChanged ||

+            event->evtype == XI_HierarchyChanged ||

+            event->evtype == XI_PropertyEvent)

+            return;

+

+        event->root = RootWindow(pSprite)->drawable.id;

+        event->event = pWin->drawable.id;

+        if (pSprite->hot.pScreen == pWin->drawable.pScreen)

+        {

+            event->event_x = event->root_x - FP1616(pWin->drawable.x, 0);

+            event->event_y = event->root_y - FP1616(pWin->drawable.y, 0);

+            event->child = child;

+        } else

+        {

+            event->event_x = 0;

+            event->event_y = 0;

+            event->child = None;

+        }

+

+        if (event->evtype == XI_Enter || event->evtype == XI_Leave ||

+            event->evtype == XI_FocusIn || event->evtype == XI_FocusOut)

+            ((xXIEnterEvent*)event)->same_screen =

+                (pSprite->hot.pScreen == pWin->drawable.pScreen);

+

+    } else

+    {

+        XE_KBPTR.root = RootWindow(pSprite)->drawable.id;

+        XE_KBPTR.event = pWin->drawable.id;

+        if (pSprite->hot.pScreen == pWin->drawable.pScreen)

+        {

+            XE_KBPTR.sameScreen = xTrue;

+            XE_KBPTR.child = child;

+            XE_KBPTR.eventX =

+                XE_KBPTR.rootX - pWin->drawable.x;

+            XE_KBPTR.eventY =

+                XE_KBPTR.rootY - pWin->drawable.y;

+        }

+        else

+        {

+            XE_KBPTR.sameScreen = xFalse;

+            XE_KBPTR.child = None;

+            XE_KBPTR.eventX = 0;

+            XE_KBPTR.eventY = 0;

+        }

+    }

+}

+

+/**

+ * Check if a given event is deliverable at all on a given window.

+ *

+ * This function only checks if any client wants it, not for a specific

+ * client.

+ *

+ * @param[in] dev The device this event is being sent for.

+ * @param[in] event The event that is to be sent.

+ * @param[in] win The current event window.

+ *

+ * @return Bitmask of ::EVENT_XI2_MASK, ::EVENT_XI1_MASK, ::EVENT_CORE_MASK, and

+ *         ::EVENT_DONT_PROPAGATE_MASK.

+ */

+int

+EventIsDeliverable(DeviceIntPtr dev, InternalEvent* event, WindowPtr win)

+{

+    int rc = 0;

+    int filter = 0;

+    int type;

+    OtherInputMasks *inputMasks = wOtherInputMasks(win);

+    xEvent ev;

+

+    /* XXX: this makes me gag */

+    type = GetXI2Type(event);

+    ev.u.u.type = GenericEvent; /* GetEventFilter only cares about type and evtype*/

+    ((xGenericEvent*)&ev)->extension = IReqCode;

+    ((xGenericEvent*)&ev)->evtype = type;

+    filter = GetEventFilter(dev, &ev);

+    if (type && inputMasks &&

+        ((inputMasks->xi2mask[XIAllDevices][type/8] & filter) ||

+         ((inputMasks->xi2mask[XIAllMasterDevices][type/8] & filter) && IsMaster(dev)) ||

+         (inputMasks->xi2mask[dev->id][type/8] & filter)))

+        rc |= EVENT_XI2_MASK;

+

+    type = GetXIType(event);

+    ev.u.u.type = type;

+    filter = GetEventFilter(dev, &ev);

+

+    /* Check for XI mask */

+    if (type && inputMasks &&

+        (inputMasks->deliverableEvents[dev->id] & filter) &&

+        (inputMasks->inputEvents[dev->id] & filter))

+        rc |= EVENT_XI1_MASK;

+

+    /* Check for XI DontPropagate mask */

+    if (type && inputMasks &&

+        (inputMasks->dontPropagateMask[dev->id] & filter))

+        rc |= EVENT_DONT_PROPAGATE_MASK;

+

+    /* Check for core mask */

+    type = GetCoreType(event);

+    if (type && (win->deliverableEvents & filter) &&

+        ((wOtherEventMasks(win) | win->eventMask) & filter))

+        rc |= EVENT_CORE_MASK;

+

+    /* Check for core DontPropagate mask */

+    if (type && (filter & wDontPropagateMask(win)))

+        rc |= EVENT_DONT_PROPAGATE_MASK;

+

+    return rc;

+}

+

+/**

+ * Deliver events caused by input devices.

+ *

+ * For events from a non-grabbed, non-focus device, DeliverDeviceEvents is

+ * called directly from the processInputProc.

+ * For grabbed devices, DeliverGrabbedEvent is called first, and _may_ call

+ * DeliverDeviceEvents.

+ * For focused events, DeliverFocusedEvent is called first, and _may_ call

+ * DeliverDeviceEvents.

+ *

+ * @param pWin Window to deliver event to.

+ * @param event The events to deliver, not yet in wire format.

+ * @param grab Possible grab on a device.

+ * @param stopAt Don't recurse up to the root window.

+ * @param dev The device that is responsible for the event.

+ *

+ * @see DeliverGrabbedEvent

+ * @see DeliverFocusedEvent

+ */

+int

+DeliverDeviceEvents(WindowPtr pWin, InternalEvent *event, GrabPtr grab,

+                    WindowPtr stopAt, DeviceIntPtr dev)

+{

+    SpritePtr pSprite = dev->spriteInfo->sprite;

+    Window child = None;

+    Mask filter;

+    int deliveries = 0;

+    xEvent *xE = NULL, *core = NULL;

+    int rc, mask, count = 0;

+

+    CHECKEVENT(event);

+

+    while (pWin)

+    {

+        if ((mask = EventIsDeliverable(dev, event, pWin)))

+        {

+            /* XI2 events first */

+            if (mask & EVENT_XI2_MASK)

+            {

+                xEvent *xi2 = NULL;

+                rc = EventToXI2(event, &xi2);

+                if (rc == Success)

+                {

+                    /* XXX: XACE */

+                    filter = GetEventFilter(dev, xi2);

+                    FixUpEventFromWindow(pSprite, xi2, pWin, child, FALSE);

+                    deliveries = DeliverEventsToWindow(dev, pWin, xi2, 1,

+                                                       filter, grab);

+                    free(xi2);

+                    if (deliveries > 0)

+                        goto unwind;

+                } else if (rc != BadMatch)

+                    ErrorF("[dix] %s: XI2 conversion failed in DDE (%d).\n",

+                            dev->name, rc);

+            }

+

+            /* XI events */

+            if (mask & EVENT_XI1_MASK)

+            {

+                rc = EventToXI(event, &xE, &count);

+                if (rc == Success) {

+                    if (XaceHook(XACE_SEND_ACCESS, NULL, dev, pWin, xE, count) == Success) {

+                        filter = GetEventFilter(dev, xE);

+                        FixUpEventFromWindow(pSprite, xE, pWin, child, FALSE);

+                        deliveries = DeliverEventsToWindow(dev, pWin, xE, count,

+                                                           filter, grab);

+                        if (deliveries > 0)

+                            goto unwind;

+                    }

+                } else if (rc != BadMatch)

+                    ErrorF("[dix] %s: XI conversion failed in DDE (%d, %d). Skipping delivery.\n",

+                            dev->name, event->any.type, rc);

+            }

+

+            /* Core event */

+            if ((mask & EVENT_CORE_MASK) && IsMaster(dev) && dev->coreEvents)

+            {

+                rc = EventToCore(event, &core, &count);

+                if (rc == Success) {

+                    if (XaceHook(XACE_SEND_ACCESS, NULL, dev, pWin, core, count) == Success) {

+                        filter = GetEventFilter(dev, core);

+                        FixUpEventFromWindow(pSprite, core, pWin, child, FALSE);

+                        deliveries = DeliverEventsToWindow(dev, pWin, core,

+                                                           count, filter, grab);

+                        if (deliveries > 0)

+                            goto unwind;

+                    }

+                } else if (rc != BadMatch)

+                        ErrorF("[dix] %s: Core conversion failed in DDE (%d, %d).\n",

+                                dev->name, event->any.type, rc);

+            }

+

+            if ((deliveries < 0) || (pWin == stopAt) ||

+                (mask & EVENT_DONT_PROPAGATE_MASK))

+            {

+                deliveries = 0;

+                goto unwind;

+            }

+        }

+

+        child = pWin->drawable.id;

+        pWin = pWin->parent;

+    }

+

+unwind:

+    free(core);

+    free(xE);

+    return deliveries;

+}

+

+/**

+ * Deliver event to a window and it's immediate parent. Used for most window

+ * events (CreateNotify, ConfigureNotify, etc.). Not useful for events that

+ * propagate up the tree or extension events

+ *

+ * In case of a ReparentNotify event, the event will be delivered to the

+ * otherParent as well.

+ *

+ * @param pWin Window to deliver events to.

+ * @param xE Events to deliver.

+ * @param count number of events in xE.

+ * @param otherParent Used for ReparentNotify events.

+ */

+int

+DeliverEvents(WindowPtr pWin, xEvent *xE, int count,

+              WindowPtr otherParent)

+{

+    DeviceIntRec dummy;

+    int     deliveries;

+

+#ifdef PANORAMIX

+    if(!noPanoramiXExtension && pWin->drawable.pScreen->myNum)

+	return count;

+#endif

+

+    if (!count)

+	return 0;

+

+    dummy.id = XIAllDevices;

+

+    switch (xE->u.u.type)

+    {

+        case DestroyNotify:

+        case UnmapNotify:

+        case MapNotify:

+        case MapRequest:

+        case ReparentNotify:

+        case ConfigureNotify:

+        case ConfigureRequest:

+        case GravityNotify:

+        case CirculateNotify:

+        case CirculateRequest:

+            xE->u.destroyNotify.event = pWin->drawable.id;

+            break;

+    }

+

+    switch (xE->u.u.type)

+    {

+        case DestroyNotify:

+        case UnmapNotify:

+        case MapNotify:

+        case ReparentNotify:

+        case ConfigureNotify:

+        case GravityNotify:

+        case CirculateNotify:

+            break;

+        default:

+        {

+            Mask filter;

+            filter = GetEventFilter(&dummy, xE);

+            return DeliverEventsToWindow(&dummy, pWin, xE, count, filter,

+                                         NullGrab);

+        }

+    }

+

+    deliveries = DeliverEventsToWindow(&dummy, pWin, xE, count,

+                                       StructureNotifyMask, NullGrab);

+    if (pWin->parent)

+    {

+	xE->u.destroyNotify.event = pWin->parent->drawable.id;

+	deliveries += DeliverEventsToWindow(&dummy, pWin->parent, xE, count,

+					    SubstructureNotifyMask, NullGrab);

+	if (xE->u.u.type == ReparentNotify)

+	{

+	    xE->u.destroyNotify.event = otherParent->drawable.id;

+            deliveries += DeliverEventsToWindow(&dummy,

+                    otherParent, xE, count, SubstructureNotifyMask,

+						NullGrab);

+	}

+    }

+    return deliveries;

+}

+

+

+static Bool

+PointInBorderSize(WindowPtr pWin, int x, int y)

+{

+    BoxRec box;

+

+    if(RegionContainsPoint(&pWin->borderSize, x, y, &box))

+	return TRUE;

+

+#ifdef PANORAMIX

+    if(!noPanoramiXExtension &&

+            XineramaSetWindowPntrs(inputInfo.pointer, pWin)) {

+	SpritePtr pSprite = inputInfo.pointer->spriteInfo->sprite;

+	int i;

+

+	for(i = 1; i < PanoramiXNumScreens; i++) {

+	   if(RegionContainsPoint(&pSprite->windows[i]->borderSize,

+				  x + screenInfo.screens[0]->x - screenInfo.screens[i]->x,

+				  y + screenInfo.screens[0]->y - screenInfo.screens[i]->y,

+				  &box))

+		return TRUE;

+	}

+    }

+#endif

+    return FALSE;

+}

+

+/**

+ * Traversed from the root window to the window at the position x/y. While

+ * traversing, it sets up the traversal history in the spriteTrace array.

+ * After completing, the spriteTrace history is set in the following way:

+ *   spriteTrace[0] ... root window

+ *   spriteTrace[1] ... top level window that encloses x/y

+ *       ...

+ *   spriteTrace[spriteTraceGood - 1] ... window at x/y

+ *

+ * @returns the window at the given coordinates.

+ */

+WindowPtr

+XYToWindow(SpritePtr pSprite, int x, int y)

+{

+    WindowPtr  pWin;

+    BoxRec		box;

+

+    pSprite->spriteTraceGood = 1;	/* root window still there */

+    pWin = RootWindow(pSprite)->firstChild;

+    while (pWin)

+    {

+	if ((pWin->mapped) &&

+	    (x >= pWin->drawable.x - wBorderWidth (pWin)) &&

+	    (x < pWin->drawable.x + (int)pWin->drawable.width +

+	     wBorderWidth(pWin)) &&

+	    (y >= pWin->drawable.y - wBorderWidth (pWin)) &&

+	    (y < pWin->drawable.y + (int)pWin->drawable.height +

+	     wBorderWidth (pWin))

+	    /* When a window is shaped, a further check

+	     * is made to see if the point is inside

+	     * borderSize

+	     */

+	    && (!wBoundingShape(pWin) || PointInBorderSize(pWin, x, y))

+	    && (!wInputShape(pWin) ||

+		RegionContainsPoint(wInputShape(pWin),

+				    x - pWin->drawable.x,

+				    y - pWin->drawable.y, &box))

+#ifdef ROOTLESS

+    /* In rootless mode windows may be offscreen, even when

+     * they're in X's stack. (E.g. if the native window system

+     * implements some form of virtual desktop system).

+     */

+		&& !pWin->rootlessUnhittable

+#endif

+	    )

+	{

+	    if (pSprite->spriteTraceGood >= pSprite->spriteTraceSize)

+	    {

+		pSprite->spriteTraceSize += 10;

+		pSprite->spriteTrace = realloc(pSprite->spriteTrace,

+		                    pSprite->spriteTraceSize*sizeof(WindowPtr));

+	    }

+	    pSprite->spriteTrace[pSprite->spriteTraceGood++] = pWin;

+	    pWin = pWin->firstChild;

+	}

+	else

+	    pWin = pWin->nextSib;

+    }

+    return pSprite->spriteTrace[pSprite->spriteTraceGood-1];

+}

+

+/**

+ * Ungrab a currently FocusIn grabbed device and grab the device on the

+ * given window. If the win given is the NoneWin, the device is ungrabbed if

+ * applicable and FALSE is returned.

+ *

+ * @returns TRUE if the device has been grabbed, or FALSE otherwise.

+ */

+BOOL

+ActivateFocusInGrab(DeviceIntPtr dev, WindowPtr old, WindowPtr win)

+{

+    BOOL rc = FALSE;

+    DeviceEvent event;

+

+    if (dev->deviceGrab.grab)

+    {

+        if (!dev->deviceGrab.fromPassiveGrab ||

+            dev->deviceGrab.grab->type != XI_Enter ||

+            dev->deviceGrab.grab->window == win ||

+            IsParent(dev->deviceGrab.grab->window, win))

+            return FALSE;

+        DoEnterLeaveEvents(dev, dev->id, old, win, XINotifyPassiveUngrab);

+        (*dev->deviceGrab.DeactivateGrab)(dev);

+    }

+

+    if (win == NoneWin || win == PointerRootWin)

+        return FALSE;

+

+    memset(&event, 0, sizeof(DeviceEvent));

+    event.header = ET_Internal;

+    event.type = ET_FocusIn;

+    event.length = sizeof(DeviceEvent);

+    event.time = GetTimeInMillis();

+    event.deviceid = dev->id;

+    event.sourceid = dev->id;

+    event.detail.button = 0;

+    rc = (CheckPassiveGrabsOnWindow(win, dev, &event, FALSE, TRUE) != NULL);

+    if (rc)

+        DoEnterLeaveEvents(dev, dev->id, old, win, XINotifyPassiveUngrab);

+    return rc;

+}

+

+/**

+ * Ungrab a currently Enter grabbed device and grab the device for the given

+ * window.

+ *

+ * @returns TRUE if the device has been grabbed, or FALSE otherwise.

+ */

+static BOOL

+ActivateEnterGrab(DeviceIntPtr dev, WindowPtr old, WindowPtr win)

+{

+    BOOL rc = FALSE;

+    DeviceEvent event;

+

+    if (dev->deviceGrab.grab)

+    {

+        if (!dev->deviceGrab.fromPassiveGrab ||

+            dev->deviceGrab.grab->type != XI_Enter ||

+            dev->deviceGrab.grab->window == win ||

+            IsParent(dev->deviceGrab.grab->window, win))

+            return FALSE;

+        DoEnterLeaveEvents(dev, dev->id, old, win, XINotifyPassiveUngrab);

+        (*dev->deviceGrab.DeactivateGrab)(dev);

+    }

+

+    memset(&event, 0, sizeof(DeviceEvent));

+    event.header = ET_Internal;

+    event.type = ET_Enter;

+    event.length = sizeof(DeviceEvent);

+    event.time = GetTimeInMillis();

+    event.deviceid = dev->id;

+    event.sourceid = dev->id;

+    event.detail.button = 0;

+    rc = (CheckPassiveGrabsOnWindow(win, dev, &event, FALSE, TRUE) != NULL);

+    if (rc)

+        DoEnterLeaveEvents(dev, dev->id, old, win, XINotifyPassiveGrab);

+    return rc;

+}

+

+/**

+ * Update the sprite coordinates based on the event. Update the cursor

+ * position, then update the event with the new coordinates that may have been

+ * changed. If the window underneath the sprite has changed, change to new

+ * cursor and send enter/leave events.

+ *

+ * CheckMotion() will not do anything and return FALSE if the event is not a

+ * pointer event.

+ *

+ * @return TRUE if the sprite has moved or FALSE otherwise.

+ */

+Bool

+CheckMotion(DeviceEvent *ev, DeviceIntPtr pDev)

+{

+    WindowPtr prevSpriteWin, newSpriteWin;

+    SpritePtr pSprite = pDev->spriteInfo->sprite;

+

+    CHECKEVENT(ev);

+

+    if (!pSprite)

+      return FALSE;

+

+    prevSpriteWin = pSprite->win;

+

+    if (ev && !syncEvents.playingEvents)

+    {

+        /* GetPointerEvents() guarantees that pointer events have the correct

+           rootX/Y set already. */

+        switch (ev->type)

+        {

+            case ET_ButtonPress:

+            case ET_ButtonRelease:

+            case ET_Motion:

+                break;

+            default:

+                /* all other events return FALSE */

+                return FALSE;

+        }

+

+

+#ifdef PANORAMIX

+        if (!noPanoramiXExtension)

+        {

+            /* Motion events entering DIX get translated to Screen 0

+               coordinates.  Replayed events have already been

+               translated since they've entered DIX before */

+            ev->root_x += pSprite->screen->x - screenInfo.screens[0]->x;

+            ev->root_y += pSprite->screen->y - screenInfo.screens[0]->y;

+        } else

+#endif

+        {

+            if (pSprite->hot.pScreen != pSprite->hotPhys.pScreen)

+            {

+                pSprite->hot.pScreen = pSprite->hotPhys.pScreen;

+                RootWindow(pDev->spriteInfo->sprite) =

+                    pSprite->hot.pScreen->root;

+            }

+        }

+

+        pSprite->hot.x = ev->root_x;

+        pSprite->hot.y = ev->root_y;

+        if (pSprite->hot.x < pSprite->physLimits.x1)

+            pSprite->hot.x = pSprite->physLimits.x1;

+        else if (pSprite->hot.x >= pSprite->physLimits.x2)

+            pSprite->hot.x = pSprite->physLimits.x2 - 1;

+        if (pSprite->hot.y < pSprite->physLimits.y1)

+            pSprite->hot.y = pSprite->physLimits.y1;

+        else if (pSprite->hot.y >= pSprite->physLimits.y2)

+            pSprite->hot.y = pSprite->physLimits.y2 - 1;

+	if (pSprite->hotShape)

+	    ConfineToShape(pDev, pSprite->hotShape, &pSprite->hot.x, &pSprite->hot.y);

+	pSprite->hotPhys = pSprite->hot;

+

+	if ((pSprite->hotPhys.x != ev->root_x) ||

+	    (pSprite->hotPhys.y != ev->root_y))

+	{

+#ifdef PANORAMIX

+            if (!noPanoramiXExtension)

+            {

+                XineramaSetCursorPosition(

+                        pDev, pSprite->hotPhys.x, pSprite->hotPhys.y, FALSE);

+            } else

+#endif

+            {

+                (*pSprite->hotPhys.pScreen->SetCursorPosition)(

+                        pDev, pSprite->hotPhys.pScreen,

+                        pSprite->hotPhys.x, pSprite->hotPhys.y, FALSE);

+            }

+	}

+

+	ev->root_x = pSprite->hot.x;

+	ev->root_y = pSprite->hot.y;

+    }

+

+    newSpriteWin = XYToWindow(pSprite, pSprite->hot.x, pSprite->hot.y);

+

+    if (newSpriteWin != prevSpriteWin)

+    {

+        int sourceid;

+        if (!ev) {

+            UpdateCurrentTimeIf();

+            sourceid = pDev->id; /* when from WindowsRestructured */

+        } else

+            sourceid = ev->sourceid;

+

+	if (prevSpriteWin != NullWindow) {

+            if (!ActivateEnterGrab(pDev, prevSpriteWin, newSpriteWin))

+                DoEnterLeaveEvents(pDev, sourceid, prevSpriteWin,

+                                   newSpriteWin, NotifyNormal);

+        }

+        /* set pSprite->win after ActivateEnterGrab, otherwise

+           sprite window == grab_window and no enter/leave events are

+           sent. */

+        pSprite->win = newSpriteWin;

+        PostNewCursor(pDev);

+        return FALSE;

+    }

+    return TRUE;

+}

+

+/**

+ * Windows have restructured, we need to update the sprite position and the

+ * sprite's cursor.

+ */

+void

+WindowsRestructured(void)

+{

+    DeviceIntPtr pDev = inputInfo.devices;

+    while(pDev)

+    {

+        if (IsMaster(pDev) || IsFloating(pDev))

+            CheckMotion(NULL, pDev);

+        pDev = pDev->next;

+    }

+}

+

+#ifdef PANORAMIX

+/* This was added to support reconfiguration under Xdmx.  The problem is

+ * that if the 0th screen (i.e., screenInfo.screens[0]) is moved to an origin

+ * other than 0,0, the information in the private sprite structure must

+ * be updated accordingly, or XYToWindow (and other routines) will not

+ * compute correctly. */

+void ReinitializeRootWindow(WindowPtr win, int xoff, int yoff)

+{

+    GrabPtr   grab;

+    DeviceIntPtr pDev;

+    SpritePtr pSprite;

+

+    if (noPanoramiXExtension) return;

+

+    pDev = inputInfo.devices;

+    while(pDev)

+    {

+        if (DevHasCursor(pDev))

+        {

+            pSprite = pDev->spriteInfo->sprite;

+            pSprite->hot.x        -= xoff;

+            pSprite->hot.y        -= yoff;

+

+            pSprite->hotPhys.x    -= xoff;

+            pSprite->hotPhys.y    -= yoff;

+

+            pSprite->hotLimits.x1 -= xoff;

+            pSprite->hotLimits.y1 -= yoff;

+            pSprite->hotLimits.x2 -= xoff;

+            pSprite->hotLimits.y2 -= yoff;

+

+            if (RegionNotEmpty(&pSprite->Reg1))

+                RegionTranslate(&pSprite->Reg1, xoff, yoff);

+            if (RegionNotEmpty(&pSprite->Reg2))

+                RegionTranslate(&pSprite->Reg2, xoff, yoff);

+

+            /* FIXME: if we call ConfineCursorToWindow, must we do anything else? */

+            if ((grab = pDev->deviceGrab.grab) && grab->confineTo) {

+                if (grab->confineTo->drawable.pScreen

+                        != pSprite->hotPhys.pScreen)

+                    pSprite->hotPhys.x = pSprite->hotPhys.y = 0;

+                ConfineCursorToWindow(pDev, grab->confineTo, TRUE, TRUE);

+            } else

+                ConfineCursorToWindow(

+                        pDev,

+                        pSprite->hotPhys.pScreen->root,

+                        TRUE, FALSE);

+

+        }

+        pDev = pDev->next;

+    }

+}

+#endif

+

+/**

+ * Initialize a sprite for the given device and set it to some sane values. If

+ * the device already has a sprite alloc'd, don't realloc but just reset to

+ * default values.

+ * If a window is supplied, the sprite will be initialized with the window's

+ * cursor and positioned in the center of the window's screen. The root window

+ * is a good choice to pass in here.

+ *

+ * It's a good idea to call it only for pointer devices, unless you have a

+ * really talented keyboard.

+ *

+ * @param pDev The device to initialize.

+ * @param pWin The window where to generate the sprite in.

+ *

+ */

+void

+InitializeSprite(DeviceIntPtr pDev, WindowPtr pWin)

+{

+    SpritePtr pSprite;

+    ScreenPtr pScreen;

+    CursorPtr pCursor;

+

+    if (!pDev->spriteInfo->sprite)

+    {

+        DeviceIntPtr it;

+

+        pDev->spriteInfo->sprite = (SpritePtr)calloc(1, sizeof(SpriteRec));

+        if (!pDev->spriteInfo->sprite)

+            FatalError("InitializeSprite: failed to allocate sprite struct");

+

+        /* We may have paired another device with this device before our

+         * device had a actual sprite. We need to check for this and reset the

+         * sprite field for all paired devices.

+         *

+         * The VCK is always paired with the VCP before the VCP has a sprite.

+         */

+        for (it = inputInfo.devices; it; it = it->next)

+        {

+            if (it->spriteInfo->paired == pDev)

+                it->spriteInfo->sprite = pDev->spriteInfo->sprite;

+        }

+        if (inputInfo.keyboard->spriteInfo->paired == pDev)

+            inputInfo.keyboard->spriteInfo->sprite = pDev->spriteInfo->sprite;

+    }

+

+    pSprite = pDev->spriteInfo->sprite;

+    pDev->spriteInfo->spriteOwner = TRUE;

+

+    pScreen = (pWin) ? pWin->drawable.pScreen : (ScreenPtr)NULL;

+    pSprite->hot.pScreen = pScreen;

+    pSprite->hotPhys.pScreen = pScreen;

+    if (pScreen)

+    {

+        pSprite->hotPhys.x = pScreen->width / 2;

+        pSprite->hotPhys.y = pScreen->height / 2;

+        pSprite->hotLimits.x2 = pScreen->width;

+        pSprite->hotLimits.y2 = pScreen->height;

+    }

+

+    pSprite->hot = pSprite->hotPhys;

+    pSprite->win = pWin;

+

+    if (pWin)

+    {

+	pCursor = wCursor(pWin);

+	pSprite->spriteTrace = (WindowPtr *)calloc(1, 32*sizeof(WindowPtr));

+	if (!pSprite->spriteTrace)

+	    FatalError("Failed to allocate spriteTrace");

+	pSprite->spriteTraceSize = 32;

+

+	RootWindow(pDev->spriteInfo->sprite) = pWin;

+	pSprite->spriteTraceGood = 1;

+

+	pSprite->pEnqueueScreen = pScreen;

+	pSprite->pDequeueScreen = pSprite->pEnqueueScreen;

+

+    } else {

+        pCursor = NullCursor;

+	pSprite->spriteTrace = NULL;

+	pSprite->spriteTraceSize = 0;

+	pSprite->spriteTraceGood = 0;

+	pSprite->pEnqueueScreen = screenInfo.screens[0];

+	pSprite->pDequeueScreen = pSprite->pEnqueueScreen;

+    }

+    if (pCursor)

+	pCursor->refcnt++;

+    if (pSprite->current)

+	FreeCursor(pSprite->current, None);

+    pSprite->current = pCursor;

+

+    if (pScreen)

+    {

+        (*pScreen->RealizeCursor) ( pDev, pScreen, pSprite->current);

+        (*pScreen->CursorLimits) ( pDev, pScreen, pSprite->current,

+                                   &pSprite->hotLimits, &pSprite->physLimits);

+        pSprite->confined = FALSE;

+

+        (*pScreen->ConstrainCursor) (pDev, pScreen,

+                                     &pSprite->physLimits);

+        (*pScreen->SetCursorPosition) (pDev, pScreen, pSprite->hot.x,

+                                       pSprite->hot.y,

+                                       FALSE);

+        (*pScreen->DisplayCursor) (pDev, pScreen, pSprite->current);

+    }

+#ifdef PANORAMIX

+    if(!noPanoramiXExtension) {

+        pSprite->hotLimits.x1 = -screenInfo.screens[0]->x;

+        pSprite->hotLimits.y1 = -screenInfo.screens[0]->y;

+        pSprite->hotLimits.x2 = PanoramiXPixWidth  - screenInfo.screens[0]->x;

+        pSprite->hotLimits.y2 = PanoramiXPixHeight - screenInfo.screens[0]->y;

+        pSprite->physLimits = pSprite->hotLimits;

+        pSprite->confineWin = NullWindow;

+        pSprite->hotShape = NullRegion;

+        pSprite->screen = pScreen;

+        /* gotta UNINIT these someplace */

+        RegionNull(&pSprite->Reg1);

+        RegionNull(&pSprite->Reg2);

+    }

+#endif

+}

+

+/**

+ * Update the mouse sprite info when the server switches from a pScreen to another.

+ * Otherwise, the pScreen of the mouse sprite is never updated when we switch

+ * from a pScreen to another. Never updating the pScreen of the mouse sprite

+ * implies that windows that are in pScreen whose pScreen->myNum >0 will never

+ * get pointer events. This is  because in CheckMotion(), sprite.hotPhys.pScreen

+ * always points to the first pScreen it has been set by

+ * DefineInitialRootWindow().

+ *

+ * Calling this function is useful for use cases where the server

+ * has more than one pScreen.

+ * This function is similar to DefineInitialRootWindow() but it does not

+ * reset the mouse pointer position.

+ * @param win must be the new pScreen we are switching to.

+ */

+void

+UpdateSpriteForScreen(DeviceIntPtr pDev, ScreenPtr pScreen)

+{

+    SpritePtr pSprite = NULL;

+    WindowPtr win = NULL;

+    CursorPtr pCursor;

+    if (!pScreen)

+        return ;

+

+    if (!pDev->spriteInfo->sprite)

+        return;

+

+    pSprite = pDev->spriteInfo->sprite;

+

+    win = pScreen->root;

+

+    pSprite->hotPhys.pScreen = pScreen;

+    pSprite->hot = pSprite->hotPhys;

+    pSprite->hotLimits.x2 = pScreen->width;

+    pSprite->hotLimits.y2 = pScreen->height;

+    pSprite->win = win;

+    pCursor = wCursor(win);

+    if (pCursor)

+	pCursor->refcnt++;

+    if (pSprite->current)

+	FreeCursor(pSprite->current, 0);

+    pSprite->current = pCursor;

+    pSprite->spriteTraceGood = 1;

+    pSprite->spriteTrace[0] = win;

+    (*pScreen->CursorLimits) (pDev,

+                              pScreen,

+                              pSprite->current,

+                              &pSprite->hotLimits,

+                              &pSprite->physLimits);

+    pSprite->confined = FALSE;

+    (*pScreen->ConstrainCursor) (pDev, pScreen, &pSprite->physLimits);

+    (*pScreen->DisplayCursor) (pDev, pScreen, pSprite->current);

+

+#ifdef PANORAMIX

+    if(!noPanoramiXExtension) {

+        pSprite->hotLimits.x1 = -screenInfo.screens[0]->x;

+        pSprite->hotLimits.y1 = -screenInfo.screens[0]->y;

+        pSprite->hotLimits.x2 = PanoramiXPixWidth  - screenInfo.screens[0]->x;

+        pSprite->hotLimits.y2 = PanoramiXPixHeight - screenInfo.screens[0]->y;

+        pSprite->physLimits = pSprite->hotLimits;

+        pSprite->screen = pScreen;

+    }

+#endif

+}

+

+/*

+ * This does not take any shortcuts, and even ignores its argument, since

+ * it does not happen very often, and one has to walk up the tree since

+ * this might be a newly instantiated cursor for an intermediate window

+ * between the one the pointer is in and the one that the last cursor was

+ * instantiated from.

+ */

+void

+WindowHasNewCursor(WindowPtr pWin)

+{

+    DeviceIntPtr pDev;

+

+    for(pDev = inputInfo.devices; pDev; pDev = pDev->next)

+        if (DevHasCursor(pDev))

+            PostNewCursor(pDev);

+}

+

+void

+NewCurrentScreen(DeviceIntPtr pDev, ScreenPtr newScreen, int x, int y)

+{

+    SpritePtr pSprite = pDev->spriteInfo->sprite;

+

+    pSprite->hotPhys.x = x;

+    pSprite->hotPhys.y = y;

+#ifdef PANORAMIX

+    if(!noPanoramiXExtension) {

+	pSprite->hotPhys.x += newScreen->x - screenInfo.screens[0]->x;

+	pSprite->hotPhys.y += newScreen->y - screenInfo.screens[0]->y;

+	if (newScreen != pSprite->screen) {

+	    pSprite->screen = newScreen;

+	    /* Make sure we tell the DDX to update its copy of the screen */

+	    if(pSprite->confineWin)

+		XineramaConfineCursorToWindow(pDev,

+                        pSprite->confineWin, TRUE);

+	    else

+		XineramaConfineCursorToWindow(pDev, screenInfo.screens[0]->root, TRUE);

+	    /* if the pointer wasn't confined, the DDX won't get

+	       told of the pointer warp so we reposition it here */

+	    if(!syncEvents.playingEvents)

+		(*pSprite->screen->SetCursorPosition)(

+                                                      pDev,

+                                                      pSprite->screen,

+		    pSprite->hotPhys.x + screenInfo.screens[0]->x -

+			pSprite->screen->x,

+		    pSprite->hotPhys.y + screenInfo.screens[0]->y -

+			pSprite->screen->y, FALSE);

+	}

+    } else

+#endif

+    if (newScreen != pSprite->hotPhys.pScreen)

+	ConfineCursorToWindow(pDev, newScreen->root, TRUE, FALSE);

+}

+

+#ifdef PANORAMIX

+

+static Bool

+XineramaPointInWindowIsVisible(

+    WindowPtr pWin,

+    int x,

+    int y

+)

+{

+    BoxRec box;

+    int i, xoff, yoff;

+

+    if (!pWin->realized) return FALSE;

+

+    if (RegionContainsPoint(&pWin->borderClip, x, y, &box))

+        return TRUE;

+

+    if(!XineramaSetWindowPntrs(inputInfo.pointer, pWin)) return FALSE;

+

+    xoff = x + screenInfo.screens[0]->x;

+    yoff = y + screenInfo.screens[0]->y;

+

+    for(i = 1; i < PanoramiXNumScreens; i++) {

+	pWin = inputInfo.pointer->spriteInfo->sprite->windows[i];

+	x = xoff - screenInfo.screens[i]->x;

+	y = yoff - screenInfo.screens[i]->y;

+

+	if(RegionContainsPoint(&pWin->borderClip, x, y, &box)

+	   && (!wInputShape(pWin) ||

+	       RegionContainsPoint(wInputShape(pWin),

+				   x - pWin->drawable.x,

+				   y - pWin->drawable.y, &box)))

+            return TRUE;

+

+    }

+

+    return FALSE;

+}

+

+static int

+XineramaWarpPointer(ClientPtr client)

+{

+    WindowPtr	dest = NULL;

+    int		x, y, rc;

+    SpritePtr   pSprite = PickPointer(client)->spriteInfo->sprite;

+

+    REQUEST(xWarpPointerReq);

+

+

+    if (stuff->dstWid != None) {

+	rc = dixLookupWindow(&dest, stuff->dstWid, client, DixReadAccess);

+	if (rc != Success)

+	    return rc;

+    }

+    x = pSprite->hotPhys.x;

+    y = pSprite->hotPhys.y;

+

+    if (stuff->srcWid != None)

+    {

+	int     winX, winY;

+	XID	winID = stuff->srcWid;

+        WindowPtr source;

+

+	rc = dixLookupWindow(&source, winID, client, DixReadAccess);

+	if (rc != Success)

+	    return rc;

+

+	winX = source->drawable.x;

+	winY = source->drawable.y;

+	if(source == screenInfo.screens[0]->root) {

+	    winX -= screenInfo.screens[0]->x;

+	    winY -= screenInfo.screens[0]->y;

+	}

+	if (x < winX + stuff->srcX ||

+	    y < winY + stuff->srcY ||

+	    (stuff->srcWidth != 0 &&

+	     winX + stuff->srcX + (int)stuff->srcWidth < x) ||

+	    (stuff->srcHeight != 0 &&

+	     winY + stuff->srcY + (int)stuff->srcHeight < y) ||

+	    !XineramaPointInWindowIsVisible(source, x, y))

+	    return Success;

+    }

+    if (dest) {

+	x = dest->drawable.x;

+	y = dest->drawable.y;

+	if(dest == screenInfo.screens[0]->root) {

+	    x -= screenInfo.screens[0]->x;

+	    y -= screenInfo.screens[0]->y;

+	}

+    }

+

+    x += stuff->dstX;

+    y += stuff->dstY;

+

+    if (x < pSprite->physLimits.x1)

+	x = pSprite->physLimits.x1;

+    else if (x >= pSprite->physLimits.x2)

+	x = pSprite->physLimits.x2 - 1;

+    if (y < pSprite->physLimits.y1)

+	y = pSprite->physLimits.y1;

+    else if (y >= pSprite->physLimits.y2)

+	y = pSprite->physLimits.y2 - 1;

+    if (pSprite->hotShape)

+	ConfineToShape(PickPointer(client), pSprite->hotShape, &x, &y);

+

+    XineramaSetCursorPosition(PickPointer(client), x, y, TRUE);

+

+    return Success;

+}

+

+#endif

+

+

+/**

+ * Server-side protocol handling for WarpPointer request.

+ * Warps the cursor position to the coordinates given in the request.

+ */

+int

+ProcWarpPointer(ClientPtr client)

+{

+    WindowPtr	dest = NULL;

+    int		x, y, rc;

+    ScreenPtr	newScreen;

+    DeviceIntPtr dev, tmp;

+    SpritePtr   pSprite;

+

+    REQUEST(xWarpPointerReq);

+    REQUEST_SIZE_MATCH(xWarpPointerReq);

+

+    dev = PickPointer(client);

+

+    for (tmp = inputInfo.devices; tmp; tmp = tmp->next) {

+        if (GetMaster(tmp, MASTER_ATTACHED) == dev) {

+	    rc = XaceHook(XACE_DEVICE_ACCESS, client, dev, DixWriteAccess);

+	    if (rc != Success)

+		return rc;

+	}

+    }

+

+    if (dev->lastSlave)

+        dev = dev->lastSlave;

+    pSprite = dev->spriteInfo->sprite;

+

+#ifdef PANORAMIX

+    if(!noPanoramiXExtension)

+	return XineramaWarpPointer(client);

+#endif

+

+    if (stuff->dstWid != None) {

+	rc = dixLookupWindow(&dest, stuff->dstWid, client, DixGetAttrAccess);

+	if (rc != Success)

+	    return rc;

+    }

+    x = pSprite->hotPhys.x;

+    y = pSprite->hotPhys.y;

+

+    if (stuff->srcWid != None)

+    {

+	int     winX, winY;

+	XID	winID = stuff->srcWid;

+        WindowPtr source;

+

+	rc = dixLookupWindow(&source, winID, client, DixGetAttrAccess);

+	if (rc != Success)

+	    return rc;

+

+	winX = source->drawable.x;

+	winY = source->drawable.y;

+	if (source->drawable.pScreen != pSprite->hotPhys.pScreen ||

+	    x < winX + stuff->srcX ||

+	    y < winY + stuff->srcY ||

+	    (stuff->srcWidth != 0 &&

+	     winX + stuff->srcX + (int)stuff->srcWidth < x) ||

+	    (stuff->srcHeight != 0 &&

+	     winY + stuff->srcY + (int)stuff->srcHeight < y) ||

+	    !PointInWindowIsVisible(source, x, y))

+	    return Success;

+    }

+    if (dest)

+    {

+	x = dest->drawable.x;

+	y = dest->drawable.y;

+	newScreen = dest->drawable.pScreen;

+    } else

+	newScreen = pSprite->hotPhys.pScreen;

+

+    x += stuff->dstX;

+    y += stuff->dstY;

+

+    if (x < 0)

+	x = 0;

+    else if (x >= newScreen->width)

+	x = newScreen->width - 1;

+    if (y < 0)

+	y = 0;

+    else if (y >= newScreen->height)

+	y = newScreen->height - 1;

+

+    if (newScreen == pSprite->hotPhys.pScreen)

+    {

+	if (x < pSprite->physLimits.x1)

+	    x = pSprite->physLimits.x1;

+	else if (x >= pSprite->physLimits.x2)

+	    x = pSprite->physLimits.x2 - 1;

+	if (y < pSprite->physLimits.y1)

+	    y = pSprite->physLimits.y1;

+	else if (y >= pSprite->physLimits.y2)

+	    y = pSprite->physLimits.y2 - 1;

+	if (pSprite->hotShape)

+	    ConfineToShape(dev, pSprite->hotShape, &x, &y);

+        (*newScreen->SetCursorPosition)(dev, newScreen, x, y, TRUE);

+    }

+    else if (!PointerConfinedToScreen(dev))

+    {

+	NewCurrentScreen(dev, newScreen, x, y);

+    }

+    return Success;

+}

+

+static Bool

+BorderSizeNotEmpty(DeviceIntPtr pDev, WindowPtr pWin)

+{

+     if(RegionNotEmpty(&pWin->borderSize))

+	return TRUE;

+

+#ifdef PANORAMIX

+     if(!noPanoramiXExtension && XineramaSetWindowPntrs(pDev, pWin)) {

+	int i;

+

+	for(i = 1; i < PanoramiXNumScreens; i++) {

+	    if(RegionNotEmpty(&pDev->spriteInfo->sprite->windows[i]->borderSize))

+		return TRUE;

+	}

+     }

+#endif

+     return FALSE;

+}

+

+/**

+ * "CheckPassiveGrabsOnWindow" checks to see if the event passed in causes a

+ * passive grab set on the window to be activated.

+ * If activate is true and a passive grab is found, it will be activated,

+ * and the event will be delivered to the client.

+ *

+ * @param pWin The window that may be subject to a passive grab.

+ * @param device Device that caused the event.

+ * @param event The current device event.

+ * @param checkCore Check for core grabs too.

+ * @param activate If a grab is found, activate it and deliver the event.

+ */

+

+GrabPtr

+CheckPassiveGrabsOnWindow(

+    WindowPtr pWin,

+    DeviceIntPtr device,

+    DeviceEvent *event,

+    BOOL checkCore,

+    BOOL activate)

+{

+    SpritePtr pSprite = device->spriteInfo->sprite;

+    GrabPtr grab = wPassiveGrabs(pWin);

+    GrabRec tempGrab;

+    GrabInfoPtr grabinfo;

+#define CORE_MATCH      0x1

+#define XI_MATCH        0x2

+#define XI2_MATCH        0x4

+    int match = 0;

+

+    if (!grab)

+	return NULL;

+    /* Fill out the grab details, but leave the type for later before

+     * comparing */

+    tempGrab.window = pWin;

+    tempGrab.device = device;

+    tempGrab.detail.exact = event->detail.key;

+    tempGrab.detail.pMask = NULL;

+    tempGrab.modifiersDetail.pMask = NULL;

+    tempGrab.next = NULL;

+    for (; grab; grab = grab->next)

+    {

+	DeviceIntPtr	gdev;

+	XkbSrvInfoPtr	xkbi = NULL;

+

+	gdev= grab->modifierDevice;

+        if (grab->grabtype == GRABTYPE_CORE)

+        {

+            if (IsPointerDevice(device))

+                gdev = GetPairedDevice(device);

+            else

+                gdev = device;

+        } else if (grab->grabtype == GRABTYPE_XI2)

+        {

+            /* if the device is an attached slave device, gdev must be the

+             * attached master keyboard. Since the slave may have been

+             * reattached after the grab, the modifier device may not be the

+             * same. */

+            if (!IsMaster(grab->device) && !IsFloating(device))

+                gdev = GetMaster(device, MASTER_KEYBOARD);

+        }

+

+

+        if (gdev && gdev->key)

+            xkbi= gdev->key->xkbInfo;

+	tempGrab.modifierDevice = grab->modifierDevice;

+        tempGrab.modifiersDetail.exact = xkbi ? xkbi->state.grab_mods : 0;

+

+        /* Check for XI2 and XI grabs first */

+        tempGrab.type = GetXI2Type((InternalEvent*)event);

+        tempGrab.grabtype = GRABTYPE_XI2;

+        if (GrabMatchesSecond(&tempGrab, grab, FALSE))

+            match = XI2_MATCH;

+

+        tempGrab.detail.exact = event->detail.key;

+        if (!match)

+        {

+            tempGrab.grabtype = GRABTYPE_XI;

+            if ((tempGrab.type = GetXIType((InternalEvent*)event)) &&

+                (GrabMatchesSecond(&tempGrab, grab, FALSE)))

+                match = XI_MATCH;

+        }

+

+        /* Check for a core grab (ignore the device when comparing) */

+        if (!match && checkCore)

+        {

+            tempGrab.grabtype = GRABTYPE_CORE;

+            if ((tempGrab.type = GetCoreType((InternalEvent*)event)) &&

+                (GrabMatchesSecond(&tempGrab, grab, TRUE)))

+                match = CORE_MATCH;

+        }

+

+        if (match && (!grab->confineTo ||

+	     (grab->confineTo->realized &&

+				BorderSizeNotEmpty(device, grab->confineTo))))

+	{

+            int rc, count = 0;

+            xEvent *xE = NULL;

+

+            event->corestate &= 0x1f00;

+            event->corestate |= tempGrab.modifiersDetail.exact & (~0x1f00);

+            grabinfo = &device->deviceGrab;

+            /* In some cases a passive core grab may exist, but the client

+             * already has a core grab on some other device. In this case we

+             * must not get the grab, otherwise we may never ungrab the

+             * device.

+             */

+

+            if (grab->grabtype == GRABTYPE_CORE)

+            {

+                DeviceIntPtr other;

+                BOOL interfering = FALSE;

+

+                /* A passive grab may have been created for a different device

+                   than it is assigned to at this point in time.

+                   Update the grab's device and modifier device to reflect the

+                   current state.

+                   Since XGrabDeviceButton requires to specify the

+                   modifierDevice explicitly, we don't override this choice.

+                   */

+                if (tempGrab.type < GenericEvent)

+                {

+                    grab->device = device;

+                    grab->modifierDevice = GetPairedDevice(device);

+                }

+

+                for (other = inputInfo.devices; other; other = other->next)

+                {

+                    GrabPtr othergrab = other->deviceGrab.grab;

+                    if (othergrab && othergrab->grabtype == GRABTYPE_CORE &&

+                        SameClient(grab, rClient(othergrab)) &&

+                        ((IsPointerDevice(grab->device) &&

+                         IsPointerDevice(othergrab->device)) ||

+                         (IsKeyboardDevice(grab->device) &&

+                          IsKeyboardDevice(othergrab->device))))

+                    {

+                        interfering = TRUE;

+                        break;

+                    }

+                }

+                if (interfering)

+                    continue;

+            }

+

+            if (!activate)

+                return grab;

+

+            if (match & CORE_MATCH)

+            {

+                rc = EventToCore((InternalEvent*)event, &xE, &count);

+                if (rc != Success)

+                {

+                    if (rc != BadMatch)

+                        ErrorF("[dix] %s: core conversion failed in CPGFW "

+                                "(%d, %d).\n", device->name, event->type, rc);

+                    continue;

+                }

+            } else if (match & XI2_MATCH)

+            {

+                rc = EventToXI2((InternalEvent*)event, &xE);

+                if (rc != Success)

+                {

+                    if (rc != BadMatch)

+                        ErrorF("[dix] %s: XI2 conversion failed in CPGFW "

+                                "(%d, %d).\n", device->name, event->type, rc);

+                    continue;

+                }

+                count = 1;

+            } else

+            {

+                rc = EventToXI((InternalEvent*)event, &xE, &count);

+                if (rc != Success)

+                {

+                    if (rc != BadMatch)

+                        ErrorF("[dix] %s: XI conversion failed in CPGFW "

+                                "(%d, %d).\n", device->name, event->type, rc);

+                    continue;

+                }

+            }

+

+	    (*grabinfo->ActivateGrab)(device, grab, currentTime, TRUE);

+

+            if (xE)

+            {

+                FixUpEventFromWindow(pSprite, xE, grab->window, None, TRUE);

+

+                /* XXX: XACE? */

+                TryClientEvents(rClient(grab), device, xE, count,

+                                       GetEventFilter(device, xE),

+                                       GetEventFilter(device, xE), grab);

+            }

+

+	    if (grabinfo->sync.state == FROZEN_NO_EVENT)

+	    {

+                if (!grabinfo->sync.event)

+                    grabinfo->sync.event = calloc(1, sizeof(InternalEvent));

+                *grabinfo->sync.event = *event;

+		grabinfo->sync.state = FROZEN_WITH_EVENT;

+            }

+

+            free(xE);

+	    return grab;

+	}

+    }

+    return NULL;

+#undef CORE_MATCH

+#undef XI_MATCH

+#undef XI2_MATCH

+}

+

+/**

+ * CheckDeviceGrabs handles both keyboard and pointer events that may cause

+ * a passive grab to be activated.

+ *

+ * If the event is a keyboard event, the ancestors of the focus window are

+ * traced down and tried to see if they have any passive grabs to be

+ * activated.  If the focus window itself is reached and it's descendants

+ * contain the pointer, the ancestors of the window that the pointer is in

+ * are then traced down starting at the focus window, otherwise no grabs are

+ * activated.

+ * If the event is a pointer event, the ancestors of the window that the

+ * pointer is in are traced down starting at the root until CheckPassiveGrabs

+ * causes a passive grab to activate or all the windows are

+ * tried. PRH

+ *

+ * If a grab is activated, the event has been sent to the client already!

+ *

+ * The event we pass in must always be an XI event. From this, we then emulate

+ * the core event and then check for grabs.

+ *

+ * @param device The device that caused the event.

+ * @param xE The event to handle (Device{Button|Key}Press).

+ * @param count Number of events in list.

+ * @return TRUE if a grab has been activated or false otherwise.

+*/

+

+Bool

+CheckDeviceGrabs(DeviceIntPtr device, DeviceEvent *event, WindowPtr ancestor)

+{

+    int i;

+    WindowPtr pWin = NULL;

+    FocusClassPtr focus = IsPointerEvent((InternalEvent*)event) ? NULL : device->focus;

+    BOOL sendCore = (IsMaster(device) && device->coreEvents);

+    Bool ret = FALSE;

+

+    if (event->type != ET_ButtonPress &&

+        event->type != ET_KeyPress)

+        return FALSE;

+

+    if (event->type == ET_ButtonPress

+        && (device->button->buttonsDown != 1))

+	return FALSE;

+

+    if (device->deviceGrab.grab)

+        return FALSE;

+

+    i = 0;

+    if (ancestor)

+    {

+        while (i < device->spriteInfo->sprite->spriteTraceGood)

+            if (device->spriteInfo->sprite->spriteTrace[i++] == ancestor)

+                break;

+        if (i == device->spriteInfo->sprite->spriteTraceGood)

+            goto out;

+    }

+

+    if (focus)

+    {

+	for (; i < focus->traceGood; i++)

+	{

+	    pWin = focus->trace[i];

+	    if (CheckPassiveGrabsOnWindow(pWin, device, event, sendCore, TRUE))

+	    {

+		ret = TRUE;

+		goto out;

+	    }

+	}

+

+	if ((focus->win == NoneWin) ||

+	    (i >= device->spriteInfo->sprite->spriteTraceGood) ||

+	    (pWin && pWin != device->spriteInfo->sprite->spriteTrace[i-1]))

+	    goto out;

+    }

+

+    for (; i < device->spriteInfo->sprite->spriteTraceGood; i++)

+    {

+	pWin = device->spriteInfo->sprite->spriteTrace[i];

+	if (CheckPassiveGrabsOnWindow(pWin, device, event, sendCore, TRUE))

+	{

+	    ret = TRUE;

+	    goto out;

+	}

+    }

+

+out:

+    if (ret == TRUE && event->type == ET_KeyPress)

+        device->deviceGrab.activatingKey = event->detail.key;

+    return ret;

+}

+

+/**

+ * Called for keyboard events to deliver event to whatever client owns the

+ * focus.

+ *

+ * The event is delivered to the keyboard's focus window, the root window or

+ * to the window owning the input focus.

+ *

+ * @param keybd The keyboard originating the event.

+ * @param event The event, not yet in wire format.

+ * @param window Window underneath the sprite.

+ */

+void

+DeliverFocusedEvent(DeviceIntPtr keybd, InternalEvent *event, WindowPtr window)

+{

+    DeviceIntPtr ptr;

+    WindowPtr focus = keybd->focus->win;

+    BOOL sendCore = (IsMaster(keybd) && keybd->coreEvents);

+    xEvent *core = NULL, *xE = NULL, *xi2 = NULL;

+    int count, rc;

+    int deliveries = 0;

+

+    if (focus == FollowKeyboardWin)

+	focus = inputInfo.keyboard->focus->win;

+    if (!focus)

+	return;

+    if (focus == PointerRootWin)

+    {

+	DeliverDeviceEvents(window, event, NullGrab, NullWindow, keybd);

+	return;

+    }

+    if ((focus == window) || IsParent(focus, window))

+    {

+	if (DeliverDeviceEvents(window, event, NullGrab, focus, keybd))

+	    return;

+    }

+

+    /* just deliver it to the focus window */

+    ptr = GetPairedDevice(keybd);

+

+

+    rc = EventToXI2(event, &xi2);

+    if (rc == Success)

+    {

+        /* XXX: XACE */

+        int filter = GetEventFilter(keybd, xi2);

+        FixUpEventFromWindow(ptr->spriteInfo->sprite, xi2, focus, None, FALSE);

+        deliveries = DeliverEventsToWindow(keybd, focus, xi2, 1,

+                                           filter, NullGrab);

+        if (deliveries > 0)

+            goto unwind;

+    } else if (rc != BadMatch)

+        ErrorF("[dix] %s: XI2 conversion failed in DFE (%d, %d). Skipping delivery.\n",

+               keybd->name, event->any.type, rc);

+

+    rc = EventToXI(event, &xE, &count);

+    if (rc == Success &&

+        XaceHook(XACE_SEND_ACCESS, NULL, keybd, focus, xE, count) == Success)

+    {

+        FixUpEventFromWindow(ptr->spriteInfo->sprite, xE, focus, None, FALSE);

+        deliveries = DeliverEventsToWindow(keybd, focus, xE, count,

+                GetEventFilter(keybd, xE),

+                NullGrab);

+

+        if (deliveries > 0)

+            goto unwind;

+    } else if (rc != BadMatch)

+        ErrorF("[dix] %s: XI conversion failed in DFE (%d, %d). Skipping delivery.\n",

+               keybd->name, event->any.type, rc);

+

+    if (sendCore)

+    {

+        rc = EventToCore(event, &core, &count);

+        if (rc == Success) {

+            if (XaceHook(XACE_SEND_ACCESS, NULL, keybd, focus, core, count) == Success) {

+                FixUpEventFromWindow(keybd->spriteInfo->sprite, core, focus,

+                                     None, FALSE);

+                deliveries = DeliverEventsToWindow(keybd, focus, core, count,

+                                                   GetEventFilter(keybd, core),

+                                                   NullGrab);

+            }

+        } else if (rc != BadMatch)

+            ErrorF("[dix] %s: core conversion failed DFE (%d, %d). Skipping delivery.\n",

+                    keybd->name, event->any.type, rc);

+    }

+

+unwind:

+    free(core);

+    free(xE);

+    free(xi2);

+    return;

+}

+

+/**

+ * Deliver an event from a device that is currently grabbed. Uses

+ * DeliverDeviceEvents() for further delivery if a ownerEvents is set on the

+ * grab. If not, TryClientEvents() is used.

+ *

+ * @param deactivateGrab True if the device's grab should be deactivated.

+ */

+void

+DeliverGrabbedEvent(InternalEvent *event, DeviceIntPtr thisDev,

+                    Bool deactivateGrab)

+{

+    GrabPtr grab;

+    GrabInfoPtr grabinfo;

+    int deliveries = 0;

+    DeviceIntPtr dev;

+    SpritePtr pSprite = thisDev->spriteInfo->sprite;

+    BOOL sendCore = FALSE;

+    int rc, count = 0;

+    xEvent *xi = NULL;

+    xEvent *xi2 = NULL;

+    xEvent *core = NULL;

+

+    grabinfo = &thisDev->deviceGrab;

+    grab = grabinfo->grab;

+

+    if (grab->ownerEvents)

+    {

+	WindowPtr focus;

+

+        /* Hack: Some pointer device have a focus class. So we need to check

+         * for the type of event, to see if we really want to deliver it to

+         * the focus window. For pointer events, the answer is no.

+         */

+        if (IsPointerEvent(event))

+            focus = PointerRootWin;

+        else if (thisDev->focus)

+	{

+	    focus = thisDev->focus->win;

+	    if (focus == FollowKeyboardWin)

+		focus = inputInfo.keyboard->focus->win;

+	}

+	else

+	    focus = PointerRootWin;

+	if (focus == PointerRootWin)

+	    deliveries = DeliverDeviceEvents(pSprite->win, event, grab,

+                                             NullWindow, thisDev);

+	else if (focus && (focus == pSprite->win ||

+                    IsParent(focus, pSprite->win)))

+	    deliveries = DeliverDeviceEvents(pSprite->win, event, grab, focus,

+					     thisDev);

+	else if (focus)

+	    deliveries = DeliverDeviceEvents(focus, event, grab, focus,

+					     thisDev);

+    }

+    if (!deliveries)

+    {

+        Mask mask;

+

+        /* XXX: In theory, we could pass the internal events through to

+         * everything and only convert just before hitting the wire. We can't

+         * do that yet, so DGE is the last stop for internal events. From here

+         * onwards, we deal with core/XI events.

+         */

+

+        mask = grab->eventMask;

+

+        sendCore = (IsMaster(thisDev) && thisDev->coreEvents);

+        /* try core event */

+        if (sendCore && grab->grabtype == GRABTYPE_CORE)

+        {

+            rc = EventToCore(event, &core, &count);

+            if (rc == Success)

+            {

+                FixUpEventFromWindow(pSprite, core, grab->window, None, TRUE);

+                if (XaceHook(XACE_SEND_ACCESS, 0, thisDev,

+                            grab->window, core, count) ||

+                        XaceHook(XACE_RECEIVE_ACCESS, rClient(grab),

+                            grab->window, core, count))

+                    deliveries = 1; /* don't send, but pretend we did */

+                else if (!IsInterferingGrab(rClient(grab), thisDev, core))

+                {

+                    deliveries = TryClientEvents(rClient(grab), thisDev,

+                            core, count, mask,

+                            GetEventFilter(thisDev, core),

+                            grab);

+                }

+            } else if (rc != BadMatch)

+                ErrorF("[dix] DeliverGrabbedEvent. Core conversion failed.\n");

+        }

+

+        if (!deliveries)

+        {

+            rc = EventToXI2(event, &xi2);

+            if (rc == Success)

+            {

+                int evtype = ((xGenericEvent*)xi2)->evtype;

+                mask = grab->xi2mask[XIAllDevices][evtype/8] |

+                    grab->xi2mask[XIAllMasterDevices][evtype/8] |

+                    grab->xi2mask[thisDev->id][evtype/8];

+                /* try XI2 event */

+                FixUpEventFromWindow(pSprite, xi2, grab->window, None, TRUE);

+                /* XXX: XACE */

+                deliveries = TryClientEvents(rClient(grab), thisDev, xi2, 1, mask,

+                        GetEventFilter(thisDev, xi2), grab);

+            } else if (rc != BadMatch)

+                ErrorF("[dix] %s: XI2 conversion failed in DGE (%d, %d). Skipping delivery.\n",

+                        thisDev->name, event->any.type, rc);

+        }

+

+        if (!deliveries)

+        {

+            rc = EventToXI(event, &xi, &count);

+            if (rc == Success)

+            {

+                /* try XI event */

+                if (grabinfo->fromPassiveGrab  &&

+                        grabinfo->implicitGrab)

+                    mask = grab->deviceMask;

+                else

+                    mask = grab->eventMask;

+

+                FixUpEventFromWindow(pSprite, xi, grab->window, None, TRUE);

+

+                if (XaceHook(XACE_SEND_ACCESS, 0, thisDev,

+                            grab->window, xi, count) ||

+                        XaceHook(XACE_RECEIVE_ACCESS, rClient(grab),

+                            grab->window, xi, count))

+                    deliveries = 1; /* don't send, but pretend we did */

+                else

+                {

+                    deliveries =

+                        TryClientEvents(rClient(grab), thisDev,

+                                xi, count,

+                                mask,

+                                GetEventFilter(thisDev, xi),

+                                grab);

+                }

+            } else if (rc != BadMatch)

+                ErrorF("[dix] %s: XI conversion failed in DGE (%d, %d). Skipping delivery.\n",

+                        thisDev->name, event->any.type, rc);

+        }

+

+        if (deliveries && (event->any.type == ET_Motion))

+            thisDev->valuator->motionHintWindow = grab->window;

+    }

+    if (deliveries && !deactivateGrab && event->any.type != ET_Motion)

+    {

+	switch (grabinfo->sync.state)

+	{

+	case FREEZE_BOTH_NEXT_EVENT:

+	    dev = GetPairedDevice(thisDev);

+	    if (dev)

+	    {

+		FreezeThaw(dev, TRUE);

+		if ((dev->deviceGrab.sync.state == FREEZE_BOTH_NEXT_EVENT) &&

+		    (CLIENT_BITS(grab->resource) ==

+		     CLIENT_BITS(dev->deviceGrab.grab->resource)))

+		    dev->deviceGrab.sync.state = FROZEN_NO_EVENT;

+		else

+                    dev->deviceGrab.sync.other = grab;

+	    }

+	    /* fall through */

+	case FREEZE_NEXT_EVENT:

+	    grabinfo->sync.state = FROZEN_WITH_EVENT;

+	    FreezeThaw(thisDev, TRUE);

+	    if (!grabinfo->sync.event)

+		grabinfo->sync.event = calloc(1, sizeof(InternalEvent));

+	    *grabinfo->sync.event = event->device_event;

+	    break;

+	}

+    }

+

+    free(core);

+    free(xi);

+    free(xi2);

+}

+

+/* This function is used to set the key pressed or key released state -

+   this is only used when the pressing of keys does not cause

+   the device's processInputProc to be called, as in for example Mouse Keys.

+*/

+void

+FixKeyState (DeviceEvent *event, DeviceIntPtr keybd)

+{

+    int key = event->detail.key;

+

+    if (event->type == ET_KeyPress) {

+	DebugF("FixKeyState: Key %d %s\n",key,

+               ((event->type == ET_KeyPress) ? "down" : "up"));

+    }

+

+    if (event->type == ET_KeyPress)

+        set_key_down(keybd, key, KEY_PROCESSED);

+    else if (event->type == ET_KeyRelease)

+        set_key_up(keybd, key, KEY_PROCESSED);

+    else

+        FatalError("Impossible keyboard event");

+}

+

+#define AtMostOneClient \

+	(SubstructureRedirectMask | ResizeRedirectMask | ButtonPressMask)

+#define ManagerMask \

+	(SubstructureRedirectMask | ResizeRedirectMask)

+

+/**

+ * Recalculate which events may be deliverable for the given window.

+ * Recalculated mask is used for quicker determination which events may be

+ * delivered to a window.

+ *

+ * The otherEventMasks on a WindowOptional is the combination of all event

+ * masks set by all clients on the window.

+ * deliverableEventMask is the combination of the eventMask and the

+ * otherEventMask plus the events that may be propagated to the parent.

+ *

+ * Traverses to siblings and parents of the window.

+ */

+void

+RecalculateDeliverableEvents(WindowPtr pWin)

+{

+    OtherClients *others;

+    WindowPtr pChild;

+

+    pChild = pWin;

+    while (1)

+    {

+	if (pChild->optional)

+	{

+	    pChild->optional->otherEventMasks = 0;

+	    for (others = wOtherClients(pChild); others; others = others->next)

+	    {

+		pChild->optional->otherEventMasks |= others->mask;

+	    }

+	}

+	pChild->deliverableEvents = pChild->eventMask|

+				    wOtherEventMasks(pChild);

+	if (pChild->parent)

+	    pChild->deliverableEvents |=

+		(pChild->parent->deliverableEvents &

+		 ~wDontPropagateMask(pChild) & PropagateMask);

+	if (pChild->firstChild)

+	{

+	    pChild = pChild->firstChild;

+	    continue;

+	}

+	while (!pChild->nextSib && (pChild != pWin))

+	    pChild = pChild->parent;

+	if (pChild == pWin)

+	    break;

+	pChild = pChild->nextSib;

+    }

+}

+

+/**

+ *

+ *  \param value must conform to DeleteType

+ */

+int

+OtherClientGone(pointer value, XID id)

+{

+    OtherClientsPtr other, prev;

+    WindowPtr pWin = (WindowPtr)value;

+

+    prev = 0;

+    for (other = wOtherClients(pWin); other; other = other->next)

+    {

+	if (other->resource == id)

+	{

+	    if (prev)

+		prev->next = other->next;

+	    else

+	    {

+		if (!(pWin->optional->otherClients = other->next))

+		    CheckWindowOptionalNeed (pWin);

+	    }

+	    free(other);

+	    RecalculateDeliverableEvents(pWin);

+	    return Success;

+	}

+	prev = other;

+    }

+    FatalError("client not on event list");

+    /*NOTREACHED*/

+    return -1; /* make compiler happy */

+}

+

+int

+EventSelectForWindow(WindowPtr pWin, ClientPtr client, Mask mask)

+{

+    Mask check;

+    OtherClients * others;

+    DeviceIntPtr dev;

+    int rc;

+

+    if (mask & ~AllEventMasks)

+    {

+	client->errorValue = mask;

+	return BadValue;

+    }

+    check = (mask & ManagerMask);

+    if (check) {

+	rc = XaceHook(XACE_RESOURCE_ACCESS, client, pWin->drawable.id,

+		      RT_WINDOW, pWin, RT_NONE, NULL, DixManageAccess);

+	if (rc != Success)

+	    return rc;

+    }

+    check = (mask & AtMostOneClient);

+    if (check & (pWin->eventMask|wOtherEventMasks(pWin)))

+    {				       /* It is illegal for two different

+				          clients to select on any of the

+				          events for AtMostOneClient. However,

+				          it is OK, for some client to

+				          continue selecting on one of those

+				          events.  */

+	if ((wClient(pWin) != client) && (check & pWin->eventMask))

+	    return BadAccess;

+	for (others = wOtherClients (pWin); others; others = others->next)

+	{

+	    if (!SameClient(others, client) && (check & others->mask))

+		return BadAccess;

+	}

+    }

+    if (wClient (pWin) == client)

+    {

+	check = pWin->eventMask;

+	pWin->eventMask = mask;

+    }

+    else

+    {

+	for (others = wOtherClients (pWin); others; others = others->next)

+	{

+	    if (SameClient(others, client))

+	    {

+		check = others->mask;

+		if (mask == 0)

+		{

+		    FreeResource(others->resource, RT_NONE);

+		    return Success;

+		}

+		else

+		    others->mask = mask;

+		goto maskSet;

+	    }

+	}

+	check = 0;

+	if (!pWin->optional && !MakeWindowOptional (pWin))

+	    return BadAlloc;

+	others = malloc(sizeof(OtherClients));

+	if (!others)

+	    return BadAlloc;

+	others->mask = mask;

+	others->resource = FakeClientID(client->index);

+	others->next = pWin->optional->otherClients;

+	pWin->optional->otherClients = others;

+	if (!AddResource(others->resource, RT_OTHERCLIENT, (pointer)pWin))

+	    return BadAlloc;

+    }

+maskSet:

+    if ((mask & PointerMotionHintMask) && !(check & PointerMotionHintMask))

+    {

+        for (dev = inputInfo.devices; dev; dev = dev->next)

+        {

+            if (dev->valuator && dev->valuator->motionHintWindow == pWin)

+                dev->valuator->motionHintWindow = NullWindow;

+        }

+    }

+    RecalculateDeliverableEvents(pWin);

+    return Success;

+}

+

+int

+EventSuppressForWindow(WindowPtr pWin, ClientPtr client,

+                       Mask mask, Bool *checkOptional)

+{

+    int i, free;

+

+    if (mask & ~PropagateMask)

+    {

+	client->errorValue = mask;

+	return BadValue;

+    }

+    if (pWin->dontPropagate)

+	DontPropagateRefCnts[pWin->dontPropagate]--;

+    if (!mask)

+	i = 0;

+    else

+    {

+	for (i = DNPMCOUNT, free = 0; --i > 0; )

+	{

+	    if (!DontPropagateRefCnts[i])

+		free = i;

+	    else if (mask == DontPropagateMasks[i])

+		break;

+	}

+	if (!i && free)

+	{

+	    i = free;

+	    DontPropagateMasks[i] = mask;

+	}

+    }

+    if (i || !mask)

+    {

+	pWin->dontPropagate = i;

+	if (i)

+	    DontPropagateRefCnts[i]++;

+	if (pWin->optional)

+	{

+	    pWin->optional->dontPropagateMask = mask;

+	    *checkOptional = TRUE;

+	}

+    }

+    else

+    {

+	if (!pWin->optional && !MakeWindowOptional (pWin))

+	{

+	    if (pWin->dontPropagate)

+		DontPropagateRefCnts[pWin->dontPropagate]++;

+	    return BadAlloc;

+	}

+	pWin->dontPropagate = 0;

+        pWin->optional->dontPropagateMask = mask;

+    }

+    RecalculateDeliverableEvents(pWin);

+    return Success;

+}

+

+/**

+ * Assembles an EnterNotify or LeaveNotify and sends it event to the client.

+ * Uses the paired keyboard to get some additional information.

+ */

+void

+CoreEnterLeaveEvent(

+    DeviceIntPtr mouse,

+    int type,

+    int mode,

+    int detail,

+    WindowPtr pWin,

+    Window child)

+{

+    xEvent              event;

+    WindowPtr		focus;

+    DeviceIntPtr        keybd;

+    GrabPtr	        grab = mouse->deviceGrab.grab;

+    Mask		mask;

+

+    keybd = GetPairedDevice(mouse);

+

+    if ((pWin == mouse->valuator->motionHintWindow) &&

+	(detail != NotifyInferior))

+	mouse->valuator->motionHintWindow = NullWindow;

+    if (grab)

+    {

+	mask = (pWin == grab->window) ? grab->eventMask : 0;

+	if (grab->ownerEvents)

+	    mask |= EventMaskForClient(pWin, rClient(grab));

+    }

+    else

+    {

+	mask = pWin->eventMask | wOtherEventMasks(pWin);

+    }

+

+    memset(&event, 0, sizeof(xEvent));

+    event.u.u.type = type;

+    event.u.u.detail = detail;

+    event.u.enterLeave.time = currentTime.milliseconds;

+    event.u.enterLeave.rootX = mouse->spriteInfo->sprite->hot.x;

+    event.u.enterLeave.rootY = mouse->spriteInfo->sprite->hot.y;

+    /* Counts on the same initial structure of crossing & button events! */

+    FixUpEventFromWindow(mouse->spriteInfo->sprite, &event, pWin, None, FALSE);

+    /* Enter/Leave events always set child */

+    event.u.enterLeave.child = child;

+    event.u.enterLeave.flags = event.u.keyButtonPointer.sameScreen ?

+        ELFlagSameScreen : 0;

+    event.u.enterLeave.state = mouse->button ? (mouse->button->state & 0x1f00) : 0;

+    if (keybd)

+        event.u.enterLeave.state |=

+                XkbGrabStateFromRec(&keybd->key->xkbInfo->state);

+    event.u.enterLeave.mode = mode;

+    focus = (keybd) ? keybd->focus->win : None;

+    if ((focus != NoneWin) &&

+            ((pWin == focus) || (focus == PointerRootWin) ||

+             IsParent(focus, pWin)))

+        event.u.enterLeave.flags |= ELFlagFocus;

+

+    if ((mask & GetEventFilter(mouse, &event)))

+    {

+        if (grab)

+            TryClientEvents(rClient(grab), mouse, &event, 1, mask,

+                            GetEventFilter(mouse, &event), grab);

+        else

+            DeliverEventsToWindow(mouse, pWin, &event, 1,

+                                  GetEventFilter(mouse, &event),

+                                  NullGrab);

+    }

+

+    if ((type == EnterNotify) && (mask & KeymapStateMask))

+    {

+        xKeymapEvent ke;

+        ClientPtr client = grab ? rClient(grab) : wClient(pWin);

+        if (XaceHook(XACE_DEVICE_ACCESS, client, keybd, DixReadAccess))

+            memset((char *)&ke.map[0], 0, 31);

+        else

+            memmove((char *)&ke.map[0], (char *)&keybd->key->down[1], 31);

+

+        ke.type = KeymapNotify;

+        if (grab)

+            TryClientEvents(rClient(grab), keybd, (xEvent *)&ke, 1,

+                            mask, KeymapStateMask, grab);

+        else

+            DeliverEventsToWindow(mouse, pWin, (xEvent *)&ke, 1,

+                                  KeymapStateMask, NullGrab);

+    }

+}

+

+void

+DeviceEnterLeaveEvent(

+    DeviceIntPtr mouse,

+    int sourceid,

+    int type,

+    int mode,

+    int detail,

+    WindowPtr pWin,

+    Window child)

+{

+    GrabPtr             grab = mouse->deviceGrab.grab;

+    xXIEnterEvent       *event;

+    int                 filter;

+    int                 btlen, len, i;

+    DeviceIntPtr        kbd;

+

+    if ((mode == XINotifyPassiveGrab && type == XI_Leave) ||

+        (mode == XINotifyPassiveUngrab && type == XI_Enter))

+        return;

+

+    btlen = (mouse->button) ? bits_to_bytes(mouse->button->numButtons) : 0;

+    btlen = bytes_to_int32(btlen);

+    len = sizeof(xXIEnterEvent) + btlen * 4;

+

+    event = calloc(1, len);

+    event->type         = GenericEvent;

+    event->extension    = IReqCode;

+    event->evtype       = type;

+    event->length       = (len - sizeof(xEvent))/4;

+    event->buttons_len  = btlen;

+    event->detail       = detail;

+    event->time         = currentTime.milliseconds;

+    event->deviceid     = mouse->id;

+    event->sourceid     = sourceid;

+    event->mode         = mode;

+    event->root_x       = FP1616(mouse->spriteInfo->sprite->hot.x, 0);

+    event->root_y       = FP1616(mouse->spriteInfo->sprite->hot.y, 0);

+

+    for (i = 0; mouse && mouse->button && i < mouse->button->numButtons; i++)

+        if (BitIsOn(mouse->button->down, i))

+            SetBit(&event[1], i);

+

+    kbd = GetMaster(mouse, MASTER_KEYBOARD);

+    if (kbd && kbd->key)

+    {

+        event->mods.base_mods = kbd->key->xkbInfo->state.base_mods;

+        event->mods.latched_mods = kbd->key->xkbInfo->state.latched_mods;

+        event->mods.locked_mods = kbd->key->xkbInfo->state.locked_mods;

+

+        event->group.base_group = kbd->key->xkbInfo->state.base_group;

+        event->group.latched_group = kbd->key->xkbInfo->state.latched_group;

+        event->group.locked_group = kbd->key->xkbInfo->state.locked_group;

+    }

+

+    FixUpEventFromWindow(mouse->spriteInfo->sprite, (xEvent*)event, pWin,

+                         None, FALSE);

+

+    filter = GetEventFilter(mouse, (xEvent*)event);

+

+    if (grab)

+    {

+        Mask mask;

+        mask = grab->xi2mask[XIAllDevices][type/8] |

+               grab->xi2mask[XIAllMasterDevices][type/8] |

+               grab->xi2mask[mouse->id][type/8];

+        TryClientEvents(rClient(grab), mouse, (xEvent*)event, 1, mask,

+                        filter, grab);

+    } else {

+        if (!GetWindowXI2Mask(mouse, pWin, (xEvent*)event))

+            goto out;

+        DeliverEventsToWindow(mouse, pWin, (xEvent*)event, 1, filter,

+                              NullGrab);

+    }

+

+out:

+    free(event);

+}

+

+void

+CoreFocusEvent(DeviceIntPtr dev, int type, int mode, int detail, WindowPtr pWin)

+{

+    xEvent event;

+

+    memset(&event, 0, sizeof(xEvent));

+    event.u.focus.mode = mode;

+    event.u.u.type = type;

+    event.u.u.detail = detail;

+    event.u.focus.window = pWin->drawable.id;

+

+    DeliverEventsToWindow(dev, pWin, &event, 1,

+                          GetEventFilter(dev, &event), NullGrab);

+    if ((type == FocusIn) &&

+            ((pWin->eventMask | wOtherEventMasks(pWin)) & KeymapStateMask))

+    {

+        xKeymapEvent ke;

+        ClientPtr client = wClient(pWin);

+        if (XaceHook(XACE_DEVICE_ACCESS, client, dev, DixReadAccess))

+            memset((char *)&ke.map[0], 0, 31);

+        else

+            memmove((char *)&ke.map[0], (char *)&dev->key->down[1], 31);

+

+        ke.type = KeymapNotify;

+        DeliverEventsToWindow(dev, pWin, (xEvent *)&ke, 1,

+                KeymapStateMask, NullGrab);

+    }

+}

+

+/**

+ * Set the input focus to the given window. Subsequent keyboard events will be

+ * delivered to the given window.

+ *

+ * Usually called from ProcSetInputFocus as result of a client request. If so,

+ * the device is the inputInfo.keyboard.

+ * If called from ProcXSetInputFocus as result of a client xinput request, the

+ * device is set to the device specified by the client.

+ *

+ * @param client Client that requested input focus change.

+ * @param dev Focus device.

+ * @param focusID The window to obtain the focus. Can be PointerRoot or None.

+ * @param revertTo Specifies where the focus reverts to when window becomes

+ * unviewable.

+ * @param ctime Specifies the time.

+ * @param followOK True if pointer is allowed to follow the keyboard.

+ */

+int

+SetInputFocus(

+    ClientPtr client,

+    DeviceIntPtr dev,

+    Window focusID,

+    CARD8 revertTo,

+    Time ctime,

+    Bool followOK)

+{

+    FocusClassPtr focus;

+    WindowPtr focusWin;

+    int mode, rc;

+    TimeStamp time;

+    DeviceIntPtr keybd; /* used for FollowKeyboard or FollowKeyboardWin */

+

+

+    UpdateCurrentTime();

+    if ((revertTo != RevertToParent) &&

+	(revertTo != RevertToPointerRoot) &&

+	(revertTo != RevertToNone) &&

+	((revertTo != RevertToFollowKeyboard) || !followOK))

+    {

+	client->errorValue = revertTo;

+	return BadValue;

+    }

+    time = ClientTimeToServerTime(ctime);

+

+    if (IsKeyboardDevice(dev))

+        keybd = dev;

+    else

+        keybd = GetPairedDevice(dev);

+

+    if ((focusID == None) || (focusID == PointerRoot))

+	focusWin = (WindowPtr)(long)focusID;

+    else if ((focusID == FollowKeyboard) && followOK)

+    {

+	focusWin = keybd->focus->win;

+    }

+    else {

+	rc = dixLookupWindow(&focusWin, focusID, client, DixSetAttrAccess);

+	if (rc != Success)

+	    return rc;

+	/* It is a match error to try to set the input focus to an

+	unviewable window. */

+	if(!focusWin->realized)

+	    return BadMatch;

+    }

+    rc = XaceHook(XACE_DEVICE_ACCESS, client, dev, DixSetFocusAccess);

+    if (rc != Success)

+	return Success;

+

+    focus = dev->focus;

+    if ((CompareTimeStamps(time, currentTime) == LATER) ||

+	(CompareTimeStamps(time, focus->time) == EARLIER))

+	return Success;

+    mode = (dev->deviceGrab.grab) ? NotifyWhileGrabbed : NotifyNormal;

+    if (focus->win == FollowKeyboardWin)

+    {

+        if (!ActivateFocusInGrab(dev, keybd->focus->win, focusWin))

+            DoFocusEvents(dev, keybd->focus->win, focusWin, mode);

+    } else

+    {

+        if (!ActivateFocusInGrab(dev, focus->win, focusWin))

+            DoFocusEvents(dev, focus->win, focusWin, mode);

+    }

+    focus->time = time;

+    focus->revert = revertTo;

+    if (focusID == FollowKeyboard)

+	focus->win = FollowKeyboardWin;

+    else

+	focus->win = focusWin;

+    if ((focusWin == NoneWin) || (focusWin == PointerRootWin))

+	focus->traceGood = 0;

+    else

+    {

+        int depth = 0;

+	WindowPtr pWin;

+

+        for (pWin = focusWin; pWin; pWin = pWin->parent) depth++;

+        if (depth > focus->traceSize)

+        {

+	    focus->traceSize = depth+1;

+	    focus->trace = realloc(focus->trace,

+				    focus->traceSize * sizeof(WindowPtr));

+	}

+	focus->traceGood = depth;

+        for (pWin = focusWin, depth--; pWin; pWin = pWin->parent, depth--)

+	    focus->trace[depth] = pWin;

+    }

+    return Success;

+}

+

+/**

+ * Server-side protocol handling for SetInputFocus request.

+ *

+ * Sets the input focus for the virtual core keyboard.

+ */

+int

+ProcSetInputFocus(ClientPtr client)

+{

+    DeviceIntPtr kbd = PickKeyboard(client);

+    REQUEST(xSetInputFocusReq);

+

+    REQUEST_SIZE_MATCH(xSetInputFocusReq);

+

+    return SetInputFocus(client, kbd, stuff->focus,

+			 stuff->revertTo, stuff->time, FALSE);

+}

+

+/**

+ * Server-side protocol handling for GetInputFocus request.

+ *

+ * Sends the current input focus for the client's keyboard back to the

+ * client.

+ */

+int

+ProcGetInputFocus(ClientPtr client)

+{

+    DeviceIntPtr kbd = PickKeyboard(client);

+    xGetInputFocusReply rep;

+    FocusClassPtr focus = kbd->focus;

+    int rc;

+    /* REQUEST(xReq); */

+    REQUEST_SIZE_MATCH(xReq);

+

+    rc = XaceHook(XACE_DEVICE_ACCESS, client, kbd, DixGetFocusAccess);

+    if (rc != Success)

+	return rc;

+

+    memset(&rep, 0, sizeof(xGetInputFocusReply));

+    rep.type = X_Reply;

+    rep.length = 0;

+    rep.sequenceNumber = client->sequence;

+    if (focus->win == NoneWin)

+	rep.focus = None;

+    else if (focus->win == PointerRootWin)

+	rep.focus = PointerRoot;

+    else rep.focus = focus->win->drawable.id;

+    rep.revertTo = focus->revert;

+    WriteReplyToClient(client, sizeof(xGetInputFocusReply), &rep);

+    return Success;

+}

+

+/**

+ * Server-side protocol handling for GrabPointer request.

+ *

+ * Sets an active grab on the client's ClientPointer and returns success

+ * status to client.

+ */

+int

+ProcGrabPointer(ClientPtr client)

+{

+    xGrabPointerReply rep;

+    DeviceIntPtr device = PickPointer(client);

+    GrabPtr grab;

+    GrabMask mask;

+    WindowPtr confineTo;

+    CursorPtr oldCursor;

+    REQUEST(xGrabPointerReq);

+    TimeStamp time;

+    int rc;

+

+    REQUEST_SIZE_MATCH(xGrabPointerReq);

+    UpdateCurrentTime();

+

+    if (stuff->eventMask & ~PointerGrabMask)

+    {

+	client->errorValue = stuff->eventMask;

+        return BadValue;

+    }

+

+    if (stuff->confineTo == None)

+	confineTo = NullWindow;

+    else

+    {

+	rc = dixLookupWindow(&confineTo, stuff->confineTo, client,

+			     DixSetAttrAccess);

+	if (rc != Success)

+	    return rc;

+    }

+

+    memset(&rep, 0, sizeof(xGrabPointerReply));

+    oldCursor = NullCursor;

+    grab = device->deviceGrab.grab;

+

+    if (grab)

+    {

+        if (grab->confineTo && !confineTo)

+            ConfineCursorToWindow(device, GetCurrentRootWindow(device), FALSE,

+                                  FALSE);

+        oldCursor = grab->cursor;

+    }

+

+    mask.core = stuff->eventMask;

+

+    rc = GrabDevice(client, device, stuff->pointerMode, stuff->keyboardMode,

+                    stuff->grabWindow, stuff->ownerEvents, stuff->time,

+                    &mask, GRABTYPE_CORE, stuff->cursor,

+                    stuff->confineTo, &rep.status);

+    if (rc != Success)

+        return rc;

+

+    if (oldCursor && rep.status == GrabSuccess)

+        FreeCursor (oldCursor, (Cursor)0);

+

+    time = ClientTimeToServerTime(stuff->time);

+    rep.type = X_Reply;

+    rep.sequenceNumber = client->sequence;

+    rep.length = 0;

+    WriteReplyToClient(client, sizeof(xGrabPointerReply), &rep);

+    return Success;

+}

+

+/**

+ * Server-side protocol handling for ChangeActivePointerGrab request.

+ *

+ * Changes properties of the grab hold by the client. If the client does not

+ * hold an active grab on the device, nothing happens.

+ */

+int

+ProcChangeActivePointerGrab(ClientPtr client)

+{

+    DeviceIntPtr device;

+    GrabPtr      grab;

+    CursorPtr newCursor, oldCursor;

+    REQUEST(xChangeActivePointerGrabReq);

+    TimeStamp time;

+

+    REQUEST_SIZE_MATCH(xChangeActivePointerGrabReq);

+    if (stuff->eventMask & ~PointerGrabMask)

+    {

+	client->errorValue = stuff->eventMask;

+        return BadValue;

+    }

+    if (stuff->cursor == None)

+	newCursor = NullCursor;

+    else

+    {

+	int rc = dixLookupResourceByType((pointer *)&newCursor, stuff->cursor,

+					 RT_CURSOR, client, DixUseAccess);

+	if (rc != Success)

+	{

+	    client->errorValue = stuff->cursor;

+	    return rc;

+	}

+    }

+

+    device = PickPointer(client);

+    grab = device->deviceGrab.grab;

+

+    if (!grab)

+	return Success;

+    if (!SameClient(grab, client))

+	return Success;

+    time = ClientTimeToServerTime(stuff->time);

+    if ((CompareTimeStamps(time, currentTime) == LATER) ||

+	     (CompareTimeStamps(time, device->deviceGrab.grabTime) == EARLIER))

+	return Success;

+    oldCursor = grab->cursor;

+    grab->cursor = newCursor;

+    if (newCursor)

+	newCursor->refcnt++;

+    PostNewCursor(device);

+    if (oldCursor)

+	FreeCursor(oldCursor, (Cursor)0);

+    grab->eventMask = stuff->eventMask;

+    return Success;

+}

+

+/**

+ * Server-side protocol handling for UngrabPointer request.

+ *

+ * Deletes a pointer grab on a device the client has grabbed.

+ */

+int

+ProcUngrabPointer(ClientPtr client)

+{

+    DeviceIntPtr device = PickPointer(client);

+    GrabPtr grab;

+    TimeStamp time;

+    REQUEST(xResourceReq);

+

+    REQUEST_SIZE_MATCH(xResourceReq);

+    UpdateCurrentTime();

+    grab = device->deviceGrab.grab;

+

+    time = ClientTimeToServerTime(stuff->id);

+    if ((CompareTimeStamps(time, currentTime) != LATER) &&

+	    (CompareTimeStamps(time, device->deviceGrab.grabTime) != EARLIER) &&

+	    (grab) && SameClient(grab, client))

+	(*device->deviceGrab.DeactivateGrab)(device);

+    return Success;

+}

+

+/**

+ * Sets a grab on the given device.

+ *

+ * Called from ProcGrabKeyboard to work on the client's keyboard.

+ * Called from ProcXGrabDevice to work on the device specified by the client.

+ *

+ * The parameters this_mode and other_mode represent the keyboard_mode and

+ * pointer_mode parameters of XGrabKeyboard().

+ * See man page for details on all the parameters

+ *

+ * @param client Client that owns the grab.

+ * @param dev The device to grab.

+ * @param this_mode GrabModeSync or GrabModeAsync

+ * @param other_mode GrabModeSync or GrabModeAsync

+ * @param status Return code to be returned to the caller.

+ *

+ * @returns Success or BadValue.

+ */

+int

+GrabDevice(ClientPtr client, DeviceIntPtr dev,

+           unsigned pointer_mode, unsigned keyboard_mode, Window grabWindow,

+           unsigned ownerEvents, Time ctime, GrabMask *mask,

+           int grabtype, Cursor curs, Window confineToWin, CARD8 *status)

+{

+    WindowPtr pWin, confineTo;

+    GrabPtr grab;

+    TimeStamp time;

+    Mask access_mode = DixGrabAccess;

+    int rc;

+    GrabInfoPtr grabInfo = &dev->deviceGrab;

+    CursorPtr cursor;

+

+    UpdateCurrentTime();

+    if ((keyboard_mode != GrabModeSync) && (keyboard_mode != GrabModeAsync))

+    {

+	client->errorValue = keyboard_mode;

+        return BadValue;

+    }

+    if ((pointer_mode != GrabModeSync) && (pointer_mode != GrabModeAsync))

+    {

+	client->errorValue = pointer_mode;

+        return BadValue;

+    }

+    if ((ownerEvents != xFalse) && (ownerEvents != xTrue))

+    {

+	client->errorValue = ownerEvents;

+        return BadValue;

+    }

+

+    rc = dixLookupWindow(&pWin, grabWindow, client, DixSetAttrAccess);

+    if (rc != Success)

+	return rc;

+

+    if (confineToWin == None)

+	confineTo = NullWindow;

+    else

+    {

+	rc = dixLookupWindow(&confineTo, confineToWin, client,

+			     DixSetAttrAccess);

+	if (rc != Success)

+	    return rc;

+    }

+

+    if (curs == None)

+	cursor = NullCursor;

+    else

+    {

+	rc = dixLookupResourceByType((pointer *)&cursor, curs, RT_CURSOR,

+			       client, DixUseAccess);

+	if (rc != Success)

+	{

+	    client->errorValue = curs;

+	    return rc;

+	}

+	access_mode |= DixForceAccess;

+    }

+

+    if (keyboard_mode == GrabModeSync || pointer_mode == GrabModeSync)

+	access_mode |= DixFreezeAccess;

+    rc = XaceHook(XACE_DEVICE_ACCESS, client, dev, access_mode);

+    if (rc != Success)

+	return rc;

+

+    time = ClientTimeToServerTime(ctime);

+    grab = grabInfo->grab;

+    if (grab && grab->grabtype != grabtype)

+        *status = AlreadyGrabbed;

+    if (grab && !SameClient(grab, client))

+	*status = AlreadyGrabbed;

+    else if ((!pWin->realized) ||

+             (confineTo &&

+                !(confineTo->realized

+                    && BorderSizeNotEmpty(dev, confineTo))))

+	*status = GrabNotViewable;

+    else if ((CompareTimeStamps(time, currentTime) == LATER) ||

+	     (CompareTimeStamps(time, grabInfo->grabTime) == EARLIER))

+	*status = GrabInvalidTime;

+    else if (grabInfo->sync.frozen &&

+	     grabInfo->sync.other && !SameClient(grabInfo->sync.other, client))

+	*status = GrabFrozen;

+    else

+    {

+	GrabRec tempGrab;

+

+        /* Otherwise segfaults happen on grabbed MPX devices */

+        memset(&tempGrab, 0, sizeof(GrabRec));

+

+        tempGrab.next = NULL;

+	tempGrab.window = pWin;

+	tempGrab.resource = client->clientAsMask;

+	tempGrab.ownerEvents = ownerEvents;

+	tempGrab.keyboardMode = keyboard_mode;

+	tempGrab.pointerMode = pointer_mode;

+	if (grabtype == GRABTYPE_CORE)

+	    tempGrab.eventMask = mask->core;

+	else if (grabtype == GRABTYPE_XI)

+	    tempGrab.eventMask = mask->xi;

+	else

+	    memcpy(tempGrab.xi2mask, mask->xi2mask, sizeof(tempGrab.xi2mask));

+	tempGrab.device = dev;

+	tempGrab.cursor = cursor;

+	tempGrab.confineTo = confineTo;

+	tempGrab.grabtype = grabtype;

+	(*grabInfo->ActivateGrab)(dev, &tempGrab, time, FALSE);

+	*status = GrabSuccess;

+    }

+    return Success;

+}

+

+/**

+ * Server-side protocol handling for GrabKeyboard request.

+ *

+ * Grabs the client's keyboard and returns success status to client.

+ */

+int

+ProcGrabKeyboard(ClientPtr client)

+{

+    xGrabKeyboardReply rep;

+    REQUEST(xGrabKeyboardReq);

+    int result;

+    DeviceIntPtr keyboard = PickKeyboard(client);

+    GrabMask mask;

+

+    REQUEST_SIZE_MATCH(xGrabKeyboardReq);

+

+    memset(&rep, 0, sizeof(xGrabKeyboardReply));

+    mask.core = KeyPressMask | KeyReleaseMask;

+

+    result = GrabDevice(client, keyboard, stuff->pointerMode,

+            stuff->keyboardMode, stuff->grabWindow, stuff->ownerEvents,

+            stuff->time, &mask, GRABTYPE_CORE, None, None,

+            &rep.status);

+

+    if (result != Success)

+	return result;

+    rep.type = X_Reply;

+    rep.sequenceNumber = client->sequence;

+    rep.length = 0;

+    WriteReplyToClient(client, sizeof(xGrabKeyboardReply), &rep);

+    return Success;

+}

+

+/**

+ * Server-side protocol handling for UngrabKeyboard request.

+ *

+ * Deletes a possible grab on the client's keyboard.

+ */

+int

+ProcUngrabKeyboard(ClientPtr client)

+{

+    DeviceIntPtr device = PickKeyboard(client);

+    GrabPtr grab;

+    TimeStamp time;

+    REQUEST(xResourceReq);

+

+    REQUEST_SIZE_MATCH(xResourceReq);

+    UpdateCurrentTime();

+

+    grab = device->deviceGrab.grab;

+

+    time = ClientTimeToServerTime(stuff->id);

+    if ((CompareTimeStamps(time, currentTime) != LATER) &&

+	(CompareTimeStamps(time, device->deviceGrab.grabTime) != EARLIER) &&

+	(grab) && SameClient(grab, client) && grab->grabtype == GRABTYPE_CORE)

+	(*device->deviceGrab.DeactivateGrab)(device);

+    return Success;

+}

+

+/**

+ * Server-side protocol handling for QueryPointer request.

+ *

+ * Returns the current state and position of the client's ClientPointer to the

+ * client.

+ */

+int

+ProcQueryPointer(ClientPtr client)

+{

+    xQueryPointerReply rep;

+    WindowPtr pWin, t;

+    DeviceIntPtr mouse = PickPointer(client);

+    DeviceIntPtr keyboard;

+    SpritePtr pSprite;

+    int rc;

+    REQUEST(xResourceReq);

+    REQUEST_SIZE_MATCH(xResourceReq);

+

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

+    if (rc != Success)

+	return rc;

+    rc = XaceHook(XACE_DEVICE_ACCESS, client, mouse, DixReadAccess);

+    if (rc != Success && rc != BadAccess)

+	return rc;

+

+    keyboard = GetPairedDevice(mouse);

+

+    pSprite = mouse->spriteInfo->sprite;

+    if (mouse->valuator->motionHintWindow)

+	MaybeStopHint(mouse, client);

+    memset(&rep, 0, sizeof(xQueryPointerReply));

+    rep.type = X_Reply;

+    rep.sequenceNumber = client->sequence;

+    rep.mask = mouse->button ? (mouse->button->state) : 0;

+    rep.mask |= XkbStateFieldFromRec(&keyboard->key->xkbInfo->state);

+    rep.length = 0;

+    rep.root = (GetCurrentRootWindow(mouse))->drawable.id;

+    rep.rootX = pSprite->hot.x;

+    rep.rootY = pSprite->hot.y;

+    rep.child = None;

+    if (pSprite->hot.pScreen == pWin->drawable.pScreen)

+    {

+	rep.sameScreen = xTrue;

+	rep.winX = pSprite->hot.x - pWin->drawable.x;

+	rep.winY = pSprite->hot.y - pWin->drawable.y;

+	for (t = pSprite->win; t; t = t->parent)

+	    if (t->parent == pWin)

+	    {

+		rep.child = t->drawable.id;

+		break;

+	    }

+    }

+    else

+    {

+	rep.sameScreen = xFalse;

+	rep.winX = 0;

+	rep.winY = 0;

+    }

+

+#ifdef PANORAMIX

+    if(!noPanoramiXExtension) {

+	rep.rootX += screenInfo.screens[0]->x;

+	rep.rootY += screenInfo.screens[0]->y;

+	if(stuff->id == rep.root) {

+	    rep.winX += screenInfo.screens[0]->x;

+	    rep.winY += screenInfo.screens[0]->y;

+	}

+    }

+#endif

+

+    if (rc == BadAccess) {

+	rep.mask = 0;

+	rep.child = None;

+	rep.rootX = 0;

+	rep.rootY = 0;

+	rep.winX = 0;

+	rep.winY = 0;

+    }

+

+    WriteReplyToClient(client, sizeof(xQueryPointerReply), &rep);

+

+    return Success;

+}

+

+/**

+ * Initializes the device list and the DIX sprite to sane values. Allocates

+ * trace memory used for quick window traversal.

+ */

+void

+InitEvents(void)

+{

+    int i;

+

+    inputInfo.numDevices = 0;

+    inputInfo.devices = (DeviceIntPtr)NULL;

+    inputInfo.off_devices = (DeviceIntPtr)NULL;

+    inputInfo.keyboard = (DeviceIntPtr)NULL;

+    inputInfo.pointer = (DeviceIntPtr)NULL;

+    /* The mask for pointer motion events may have changed in the last server

+     * generation. See comment above definition of filters. */

+    filters[0][PointerMotionMask] = MotionNotify;

+    for (i = 1; i < MAXDEVICES; i++)

+    {

+        memcpy(&filters[i], filters[0], sizeof(filters[0]));

+    }

+

+    syncEvents.replayDev = (DeviceIntPtr)NULL;

+    syncEvents.replayWin = NullWindow;

+    while (syncEvents.pending)

+    {

+	QdEventPtr next = syncEvents.pending->next;

+	free(syncEvents.pending);

+	syncEvents.pending = next;

+    }

+    syncEvents.pendtail = &syncEvents.pending;

+    syncEvents.playingEvents = FALSE;

+    syncEvents.time.months = 0;

+    syncEvents.time.milliseconds = 0;	/* hardly matters */

+    currentTime.months = 0;

+    currentTime.milliseconds = GetTimeInMillis();

+    lastDeviceEventTime = currentTime;

+    for (i = 0; i < DNPMCOUNT; i++)

+    {

+	DontPropagateMasks[i] = 0;

+	DontPropagateRefCnts[i] = 0;

+    }

+

+    InputEventListLen = GetMaximumEventsNum();

+    InputEventList = InitEventList(InputEventListLen);

+    if (!InputEventList)

+        FatalError("[dix] Failed to allocate input event list.\n");

+}

+

+void

+CloseDownEvents(void)

+{

+    FreeEventList(InputEventList, InputEventListLen);

+    InputEventListLen = 0;

+    InputEventList = NULL;

+}

+

+/**

+ * Server-side protocol handling for SendEvent request.

+ *

+ * Locates the window to send the event to and forwards the event.

+ */

+int

+ProcSendEvent(ClientPtr client)

+{

+    WindowPtr pWin;

+    WindowPtr effectiveFocus = NullWindow; /* only set if dest==InputFocus */

+    DeviceIntPtr dev = PickPointer(client);

+    DeviceIntPtr keybd = GetPairedDevice(dev);

+    SpritePtr pSprite = dev->spriteInfo->sprite;

+    REQUEST(xSendEventReq);

+

+    REQUEST_SIZE_MATCH(xSendEventReq);

+

+    /* The client's event type must be a core event type or one defined by an

+	extension. */

+

+    if ( ! ((stuff->event.u.u.type > X_Reply &&

+	     stuff->event.u.u.type < LASTEvent) ||

+	    (stuff->event.u.u.type >= EXTENSION_EVENT_BASE &&

+	     stuff->event.u.u.type < (unsigned)lastEvent)))

+    {

+	client->errorValue = stuff->event.u.u.type;

+	return BadValue;

+    }

+    if (stuff->event.u.u.type == ClientMessage &&

+	stuff->event.u.u.detail != 8 &&

+	stuff->event.u.u.detail != 16 &&

+	stuff->event.u.u.detail != 32)

+    {

+	client->errorValue = stuff->event.u.u.detail;

+	return BadValue;

+    }

+    if (stuff->eventMask & ~AllEventMasks)

+    {

+	client->errorValue = stuff->eventMask;

+	return BadValue;

+    }

+

+    if (stuff->destination == PointerWindow)

+	pWin = pSprite->win;

+    else if (stuff->destination == InputFocus)

+    {

+	WindowPtr inputFocus = (keybd) ? keybd->focus->win : NoneWin;

+

+	if (inputFocus == NoneWin)

+	    return Success;

+

+	/* If the input focus is PointerRootWin, send the event to where

+	the pointer is if possible, then perhaps propogate up to root. */

+	if (inputFocus == PointerRootWin)

+	    inputFocus = GetCurrentRootWindow(dev);

+

+	if (IsParent(inputFocus, pSprite->win))

+	{

+	    effectiveFocus = inputFocus;

+	    pWin = pSprite->win;

+	}

+	else

+	    effectiveFocus = pWin = inputFocus;

+    }

+    else

+	dixLookupWindow(&pWin, stuff->destination, client, DixSendAccess);

+

+    if (!pWin)

+	return BadWindow;

+    if ((stuff->propagate != xFalse) && (stuff->propagate != xTrue))

+    {

+	client->errorValue = stuff->propagate;

+	return BadValue;

+    }

+    stuff->event.u.u.type |= 0x80;

+    if (stuff->propagate)

+    {

+	for (;pWin; pWin = pWin->parent)

+	{

+	    if (XaceHook(XACE_SEND_ACCESS, client, NULL, pWin,

+			 &stuff->event, 1))

+		return Success;

+            if (DeliverEventsToWindow(dev, pWin,

+                        &stuff->event, 1, stuff->eventMask, NullGrab))

+		return Success;

+	    if (pWin == effectiveFocus)

+		return Success;

+	    stuff->eventMask &= ~wDontPropagateMask(pWin);

+	    if (!stuff->eventMask)

+		break;

+	}

+    }

+    else if (!XaceHook(XACE_SEND_ACCESS, client, NULL, pWin, &stuff->event, 1))

+        DeliverEventsToWindow(dev, pWin, &stuff->event,

+                                    1, stuff->eventMask, NullGrab);

+    return Success;

+}

+

+/**

+ * Server-side protocol handling for UngrabKey request.

+ *

+ * Deletes a passive grab for the given key. Works on the

+ * client's keyboard.

+ */

+int

+ProcUngrabKey(ClientPtr client)

+{

+    REQUEST(xUngrabKeyReq);

+    WindowPtr pWin;

+    GrabRec tempGrab;

+    DeviceIntPtr keybd = PickKeyboard(client);

+    int rc;

+

+    REQUEST_SIZE_MATCH(xUngrabKeyReq);

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

+    if (rc != Success)

+	return rc;

+

+    if (((stuff->key > keybd->key->xkbInfo->desc->max_key_code) ||

+	 (stuff->key < keybd->key->xkbInfo->desc->min_key_code))

+	&& (stuff->key != AnyKey))

+    {

+	client->errorValue = stuff->key;

+        return BadValue;

+    }

+    if ((stuff->modifiers != AnyModifier) &&

+	(stuff->modifiers & ~AllModifiersMask))

+    {

+	client->errorValue = stuff->modifiers;

+	return BadValue;

+    }

+    tempGrab.resource = client->clientAsMask;

+    tempGrab.device = keybd;

+    tempGrab.window = pWin;

+    tempGrab.modifiersDetail.exact = stuff->modifiers;

+    tempGrab.modifiersDetail.pMask = NULL;

+    tempGrab.modifierDevice = GetPairedDevice(keybd);

+    tempGrab.type = KeyPress;

+    tempGrab.grabtype = GRABTYPE_CORE;

+    tempGrab.detail.exact = stuff->key;

+    tempGrab.detail.pMask = NULL;

+    tempGrab.next = NULL;

+

+    if (!DeletePassiveGrabFromList(&tempGrab))

+	return BadAlloc;

+    return Success;

+}

+

+/**

+ * Server-side protocol handling for GrabKey request.

+ *

+ * Creates a grab for the client's keyboard and adds it to the list of passive

+ * grabs.

+ */

+int

+ProcGrabKey(ClientPtr client)

+{

+    WindowPtr pWin;

+    REQUEST(xGrabKeyReq);

+    GrabPtr grab;

+    DeviceIntPtr keybd = PickKeyboard(client);

+    int rc;

+    GrabParameters param;

+    GrabMask mask;

+

+    REQUEST_SIZE_MATCH(xGrabKeyReq);

+

+    memset(&param, 0, sizeof(param));

+    param.grabtype = GRABTYPE_CORE;

+    param.ownerEvents = stuff->ownerEvents;

+    param.this_device_mode = stuff->keyboardMode;

+    param.other_devices_mode = stuff->pointerMode;

+    param.modifiers = stuff->modifiers;

+

+    rc = CheckGrabValues(client, &param);

+    if (rc != Success)

+        return rc;

+

+    if (((stuff->key > keybd->key->xkbInfo->desc->max_key_code) ||

+	 (stuff->key < keybd->key->xkbInfo->desc->min_key_code))

+	&& (stuff->key != AnyKey))

+    {

+	client->errorValue = stuff->key;

+        return BadValue;

+    }

+    rc = dixLookupWindow(&pWin, stuff->grabWindow, client, DixSetAttrAccess);

+    if (rc != Success)

+	return rc;

+

+

+    mask.core = (KeyPressMask | KeyReleaseMask);

+

+    grab = CreateGrab(client->index, keybd, keybd, pWin, GRABTYPE_CORE, &mask,

+                      &param, KeyPress, stuff->key, NullWindow, NullCursor);

+    if (!grab)

+	return BadAlloc;

+    return AddPassiveGrabToList(client, grab);

+}

+

+

+/**

+ * Server-side protocol handling for GrabButton request.

+ *

+ * Creates a grab for the client's ClientPointer and adds it as a passive grab

+ * to the list.

+ */

+int

+ProcGrabButton(ClientPtr client)

+{

+    WindowPtr pWin, confineTo;

+    REQUEST(xGrabButtonReq);

+    CursorPtr cursor;

+    GrabPtr grab;

+    DeviceIntPtr ptr, modifierDevice;

+    Mask access_mode = DixGrabAccess;

+    GrabMask mask;

+    GrabParameters param;

+    int rc;

+

+    REQUEST_SIZE_MATCH(xGrabButtonReq);

+    if ((stuff->pointerMode != GrabModeSync) &&

+	(stuff->pointerMode != GrabModeAsync))

+    {

+	client->errorValue = stuff->pointerMode;

+        return BadValue;

+    }

+    if ((stuff->keyboardMode != GrabModeSync) &&

+	(stuff->keyboardMode != GrabModeAsync))

+    {

+	client->errorValue = stuff->keyboardMode;

+        return BadValue;

+    }

+    if ((stuff->modifiers != AnyModifier) &&

+	(stuff->modifiers & ~AllModifiersMask))

+    {

+	client->errorValue = stuff->modifiers;

+	return BadValue;

+    }

+    if ((stuff->ownerEvents != xFalse) && (stuff->ownerEvents != xTrue))

+    {

+	client->errorValue = stuff->ownerEvents;

+	return BadValue;

+    }

+    if (stuff->eventMask & ~PointerGrabMask)

+    {

+	client->errorValue = stuff->eventMask;

+        return BadValue;

+    }

+    rc = dixLookupWindow(&pWin, stuff->grabWindow, client, DixSetAttrAccess);

+    if (rc != Success)

+	return rc;

+    if (stuff->confineTo == None)

+       confineTo = NullWindow;

+    else {

+	rc = dixLookupWindow(&confineTo, stuff->confineTo, client,

+			     DixSetAttrAccess);

+	if (rc != Success)

+	    return rc;

+    }

+    if (stuff->cursor == None)

+	cursor = NullCursor;

+    else

+    {

+	rc = dixLookupResourceByType((pointer *)&cursor, stuff->cursor, RT_CURSOR,

+			       client, DixUseAccess);

+	if (rc != Success)

+	{

+	    client->errorValue = stuff->cursor;

+	    return rc;

+	}

+	access_mode |= DixForceAccess;

+    }

+

+    ptr = PickPointer(client);

+    modifierDevice = GetPairedDevice(ptr);

+    if (stuff->pointerMode == GrabModeSync ||

+	stuff->keyboardMode == GrabModeSync)

+	access_mode |= DixFreezeAccess;

+    rc = XaceHook(XACE_DEVICE_ACCESS, client, ptr, access_mode);

+    if (rc != Success)

+	return rc;

+

+    memset(&param, 0, sizeof(param));

+    param.grabtype = GRABTYPE_CORE;

+    param.ownerEvents = stuff->ownerEvents;

+    param.this_device_mode = stuff->keyboardMode;

+    param.other_devices_mode = stuff->pointerMode;

+    param.modifiers = stuff->modifiers;

+

+    mask.core = stuff->eventMask;

+

+    grab = CreateGrab(client->index, ptr, modifierDevice, pWin,

+                      GRABTYPE_CORE, &mask, &param, ButtonPress,

+                      stuff->button, confineTo, cursor);

+    if (!grab)

+	return BadAlloc;

+    return AddPassiveGrabToList(client, grab);

+}

+

+/**

+ * Server-side protocol handling for UngrabButton request.

+ *

+ * Deletes a passive grab on the client's ClientPointer from the list.

+ */

+int

+ProcUngrabButton(ClientPtr client)

+{

+    REQUEST(xUngrabButtonReq);

+    WindowPtr pWin;

+    GrabRec tempGrab;

+    int rc;

+    DeviceIntPtr ptr;

+

+    REQUEST_SIZE_MATCH(xUngrabButtonReq);

+    if ((stuff->modifiers != AnyModifier) &&

+	(stuff->modifiers & ~AllModifiersMask))

+    {

+	client->errorValue = stuff->modifiers;

+	return BadValue;

+    }

+    rc = dixLookupWindow(&pWin, stuff->grabWindow, client, DixReadAccess);

+    if (rc != Success)

+	return rc;

+

+    ptr = PickPointer(client);

+

+    tempGrab.resource = client->clientAsMask;

+    tempGrab.device = ptr;

+    tempGrab.window = pWin;

+    tempGrab.modifiersDetail.exact = stuff->modifiers;

+    tempGrab.modifiersDetail.pMask = NULL;

+    tempGrab.modifierDevice = GetPairedDevice(ptr);

+    tempGrab.type = ButtonPress;

+    tempGrab.detail.exact = stuff->button;

+    tempGrab.grabtype = GRABTYPE_CORE;

+    tempGrab.detail.pMask = NULL;

+    tempGrab.next = NULL;

+

+    if (!DeletePassiveGrabFromList(&tempGrab))

+	return BadAlloc;

+    return Success;

+}

+

+/**

+ * Deactivate any grab that may be on the window, remove the focus.

+ * Delete any XInput extension events from the window too. Does not change the

+ * window mask. Use just before the window is deleted.

+ *

+ * If freeResources is set, passive grabs on the window are deleted.

+ *

+ * @param pWin The window to delete events from.

+ * @param freeResources True if resources associated with the window should be

+ * deleted.

+ */

+void

+DeleteWindowFromAnyEvents(WindowPtr pWin, Bool freeResources)

+{

+    WindowPtr		parent;

+    DeviceIntPtr	mouse = inputInfo.pointer;

+    DeviceIntPtr	keybd = inputInfo.keyboard;

+    FocusClassPtr	focus;

+    OtherClientsPtr	oc;

+    GrabPtr		passive;

+    GrabPtr             grab;

+

+

+    /* Deactivate any grabs performed on this window, before making any

+	input focus changes. */

+    grab = mouse->deviceGrab.grab;

+    if (grab &&

+	((grab->window == pWin) || (grab->confineTo == pWin)))

+	(*mouse->deviceGrab.DeactivateGrab)(mouse);

+

+

+    /* Deactivating a keyboard grab should cause focus events. */

+    grab = keybd->deviceGrab.grab;

+    if (grab && (grab->window == pWin))

+	(*keybd->deviceGrab.DeactivateGrab)(keybd);

+

+    /* And now the real devices */

+    for (mouse = inputInfo.devices; mouse; mouse = mouse->next)

+    {

+        grab = mouse->deviceGrab.grab;

+        if (grab && ((grab->window == pWin) || (grab->confineTo == pWin)))

+            (*mouse->deviceGrab.DeactivateGrab)(mouse);

+    }

+

+

+    for (keybd = inputInfo.devices; keybd; keybd = keybd->next)

+    {

+        if (IsKeyboardDevice(keybd))

+        {

+            focus = keybd->focus;

+

+            /* If the focus window is a root window (ie. has no parent) then don't

+               delete the focus from it. */

+

+            if ((pWin == focus->win) && (pWin->parent != NullWindow))

+            {

+                int focusEventMode = NotifyNormal;

+

+                /* If a grab is in progress, then alter the mode of focus events. */

+

+                if (keybd->deviceGrab.grab)

+                    focusEventMode = NotifyWhileGrabbed;

+

+                switch (focus->revert)

+                {

+                    case RevertToNone:

+                        DoFocusEvents(keybd, pWin, NoneWin, focusEventMode);

+                        focus->win = NoneWin;

+                        focus->traceGood = 0;

+                        break;

+                    case RevertToParent:

+                        parent = pWin;

+                        do

+                        {

+                            parent = parent->parent;

+                            focus->traceGood--;

+                        } while (!parent->realized

+                                /* This would be a good protocol change -- windows being reparented

+                                   during SaveSet processing would cause the focus to revert to the

+                                   nearest enclosing window which will survive the death of the exiting

+                                   client, instead of ending up reverting to a dying window and thence

+                                   to None

+                                 */

+#ifdef NOTDEF

+				 || wClient(parent)->clientGone

+#endif

+                                );

+                        if (!ActivateFocusInGrab(keybd, pWin, parent))

+                            DoFocusEvents(keybd, pWin, parent, focusEventMode);

+                        focus->win = parent;

+                        focus->revert = RevertToNone;

+                        break;

+                    case RevertToPointerRoot:

+                        if (!ActivateFocusInGrab(keybd, pWin, PointerRootWin))

+                            DoFocusEvents(keybd, pWin, PointerRootWin, focusEventMode);

+                        focus->win = PointerRootWin;

+                        focus->traceGood = 0;

+                        break;

+                }

+            }

+        }

+

+        if (IsPointerDevice(keybd))

+        {

+            if (keybd->valuator->motionHintWindow == pWin)

+                keybd->valuator->motionHintWindow = NullWindow;

+        }

+    }

+

+    if (freeResources)

+    {

+	if (pWin->dontPropagate)

+	    DontPropagateRefCnts[pWin->dontPropagate]--;

+	while ( (oc = wOtherClients(pWin)) )

+	    FreeResource(oc->resource, RT_NONE);

+	while ( (passive = wPassiveGrabs(pWin)) )

+	    FreeResource(passive->resource, RT_NONE);

+     }

+

+    DeleteWindowFromAnyExtEvents(pWin, freeResources);

+}

+

+/**

+ * Call this whenever some window at or below pWin has changed geometry. If

+ * there is a grab on the window, the cursor will be re-confined into the

+ * window.

+ */

+void

+CheckCursorConfinement(WindowPtr pWin)

+{

+    GrabPtr grab;

+    WindowPtr confineTo;

+    DeviceIntPtr pDev;

+

+#ifdef PANORAMIX

+    if(!noPanoramiXExtension && pWin->drawable.pScreen->myNum) return;

+#endif

+

+    for (pDev = inputInfo.devices; pDev; pDev = pDev->next)

+    {

+        if (DevHasCursor(pDev))

+        {

+            grab = pDev->deviceGrab.grab;

+            if (grab && (confineTo = grab->confineTo))

+            {

+                if (!BorderSizeNotEmpty(pDev, confineTo))

+                    (*pDev->deviceGrab.DeactivateGrab)(pDev);

+                else if ((pWin == confineTo) || IsParent(pWin, confineTo))

+                    ConfineCursorToWindow(pDev, confineTo, TRUE, TRUE);

+            }

+        }

+    }

+}

+

+Mask

+EventMaskForClient(WindowPtr pWin, ClientPtr client)

+{

+    OtherClientsPtr	other;

+

+    if (wClient (pWin) == client)

+	return pWin->eventMask;

+    for (other = wOtherClients(pWin); other; other = other->next)

+    {

+	if (SameClient(other, client))

+	    return other->mask;

+    }

+    return 0;

+}

+

+/**

+ * Server-side protocol handling for RecolorCursor request.

+ */

+int

+ProcRecolorCursor(ClientPtr client)

+{

+    CursorPtr pCursor;

+    int		rc, nscr;

+    ScreenPtr	pscr;

+    Bool	displayed;

+    SpritePtr   pSprite = PickPointer(client)->spriteInfo->sprite;

+    REQUEST(xRecolorCursorReq);

+

+    REQUEST_SIZE_MATCH(xRecolorCursorReq);

+    rc = dixLookupResourceByType((pointer *)&pCursor, stuff->cursor, RT_CURSOR,

+			   client, DixWriteAccess);

+    if (rc != Success)

+    {

+	client->errorValue = stuff->cursor;

+	return rc;

+    }

+

+    pCursor->foreRed = stuff->foreRed;

+    pCursor->foreGreen = stuff->foreGreen;

+    pCursor->foreBlue = stuff->foreBlue;

+

+    pCursor->backRed = stuff->backRed;

+    pCursor->backGreen = stuff->backGreen;

+    pCursor->backBlue = stuff->backBlue;

+

+    for (nscr = 0; nscr < screenInfo.numScreens; nscr++)

+    {

+	pscr = screenInfo.screens[nscr];

+#ifdef PANORAMIX

+	if(!noPanoramiXExtension)

+	    displayed = (pscr == pSprite->screen);

+	else

+#endif

+	    displayed = (pscr == pSprite->hotPhys.pScreen);

+	( *pscr->RecolorCursor)(PickPointer(client), pscr, pCursor,

+				(pCursor == pSprite->current) && displayed);

+    }

+    return Success;

+}

+

+/**

+ * Write the given events to a client, swapping the byte order if necessary.

+ * To swap the byte ordering, a callback is called that has to be set up for

+ * the given event type.

+ *

+ * In the case of DeviceMotionNotify trailed by DeviceValuators, the events

+ * can be more than one. Usually it's just one event.

+ *

+ * Do not modify the event structure passed in. See comment below.

+ *

+ * @param pClient Client to send events to.

+ * @param count Number of events.

+ * @param events The event list.

+ */

+void

+WriteEventsToClient(ClientPtr pClient, int count, xEvent *events)

+{

+#ifdef PANORAMIX

+    xEvent    eventCopy;

+#endif

+    xEvent    *eventTo, *eventFrom;

+    int       i,

+              eventlength = sizeof(xEvent);

+

+    if (!pClient || pClient == serverClient || pClient->clientGone)

+	return;

+

+    for (i = 0; i < count; i++)

+	if ((events[i].u.u.type & 0x7f) != KeymapNotify)

+	    events[i].u.u.sequenceNumber = pClient->sequence;

+

+    /* Let XKB rewrite the state, as it depends on client preferences. */

+    XkbFilterEvents(pClient, count, events);

+

+#ifdef PANORAMIX

+    if(!noPanoramiXExtension &&

+       (screenInfo.screens[0]->x || screenInfo.screens[0]->y))

+    {

+	switch(events->u.u.type) {

+	case MotionNotify:

+	case ButtonPress:

+	case ButtonRelease:

+	case KeyPress:

+	case KeyRelease:

+	case EnterNotify:

+	case LeaveNotify:

+	/*

+	   When multiple clients want the same event DeliverEventsToWindow

+	   passes the same event structure multiple times so we can't

+	   modify the one passed to us

+        */

+	    count = 1;  /* should always be 1 */

+	    memcpy(&eventCopy, events, sizeof(xEvent));

+	    eventCopy.u.keyButtonPointer.rootX += screenInfo.screens[0]->x;

+	    eventCopy.u.keyButtonPointer.rootY += screenInfo.screens[0]->y;

+	    if(eventCopy.u.keyButtonPointer.event ==

+	       eventCopy.u.keyButtonPointer.root)

+	    {

+		eventCopy.u.keyButtonPointer.eventX += screenInfo.screens[0]->x;

+		eventCopy.u.keyButtonPointer.eventY += screenInfo.screens[0]->y;

+	    }

+	    events = &eventCopy;

+	    break;

+	default: break;

+	}

+    }

+#endif

+

+    if (EventCallback)

+    {

+	EventInfoRec eventinfo;

+	eventinfo.client = pClient;

+	eventinfo.events = events;

+	eventinfo.count = count;

+	CallCallbacks(&EventCallback, (pointer)&eventinfo);

+    }

+#ifdef XSERVER_DTRACE

+    if (XSERVER_SEND_EVENT_ENABLED()) {

+	for (i = 0; i < count; i++)

+	{

+	    XSERVER_SEND_EVENT(pClient->index, events[i].u.u.type, &events[i]);

+	}

+    }

+#endif

+    /* Just a safety check to make sure we only have one GenericEvent, it just

+     * makes things easier for me right now. (whot) */

+    for (i = 1; i < count; i++)

+    {

+        if (events[i].u.u.type == GenericEvent)

+        {

+            ErrorF("[dix] TryClientEvents: Only one GenericEvent at a time.\n");

+            return;

+        }

+    }

+

+    if (events->u.u.type == GenericEvent)

+    {

+        eventlength += ((xGenericEvent*)events)->length * 4;

+    }

+

+    if(pClient->swapped)

+    {

+        if (eventlength > swapEventLen)

+        {

+            swapEventLen = eventlength;

+            swapEvent = realloc(swapEvent, swapEventLen);

+            if (!swapEvent)

+            {

+                FatalError("WriteEventsToClient: Out of memory.\n");

+                return;

+            }

+        }

+

+	for(i = 0; i < count; i++)

+	{

+	    eventFrom = &events[i];

+            eventTo = swapEvent;

+

+	    /* Remember to strip off the leading bit of type in case

+	       this event was sent with "SendEvent." */

+	    (*EventSwapVector[eventFrom->u.u.type & 0177])

+		(eventFrom, eventTo);

+

+	    WriteToClient(pClient, eventlength, (char *)eventTo);

+	}

+    }

+    else

+    {

+        /* only one GenericEvent, remember? that means either count is 1 and

+         * eventlength is arbitrary or eventlength is 32 and count doesn't

+         * matter. And we're all set. Woohoo. */

+	WriteToClient(pClient, count * eventlength, (char *) events);

+    }

+}

+

+/*

+ * Set the client pointer for the given client.

+ *

+ * A client can have exactly one ClientPointer. Each time a

+ * request/reply/event is processed and the choice of devices is ambiguous

+ * (e.g. QueryPointer request), the server will pick the ClientPointer (see

+ * PickPointer()).

+ * If a keyboard is needed, the first keyboard paired with the CP is used.

+ */

+int

+SetClientPointer(ClientPtr client, DeviceIntPtr device)

+{

+    int rc = XaceHook(XACE_DEVICE_ACCESS, client, device, DixUseAccess);

+    if (rc != Success)

+	return rc;

+

+    if (!IsMaster(device))

+    {

+        ErrorF("[dix] Need master device for ClientPointer. This is a bug.\n");

+        return BadDevice;

+    } else if (!device->spriteInfo->spriteOwner)

+    {

+        ErrorF("[dix] Device %d does not have a sprite. "

+                "Cannot be ClientPointer\n", device->id);

+        return BadDevice;

+    }

+    client->clientPtr = device;

+    return Success;

+}

+

+/* PickPointer will pick an appropriate pointer for the given client.

+ *

+ * An "appropriate device" is (in order of priority):

+ *  1) A device the given client has a core grab on.

+ *  2) A device set as ClientPointer for the given client.

+ *  3) The first master device.

+ */

+DeviceIntPtr

+PickPointer(ClientPtr client)

+{

+    DeviceIntPtr it = inputInfo.devices;

+

+    /* First, check if the client currently has a grab on a device. Even

+     * keyboards count. */

+    for(it = inputInfo.devices; it; it = it->next)

+    {

+        GrabPtr grab = it->deviceGrab.grab;

+        if (grab && grab->grabtype == GRABTYPE_CORE && SameClient(grab, client))

+        {

+            it = GetMaster(it, MASTER_POINTER);

+            return it; /* Always return a core grabbed device */

+        }

+    }

+

+    if (!client->clientPtr)

+    {

+        DeviceIntPtr it = inputInfo.devices;

+        while (it)

+        {

+            if (IsMaster(it) && it->spriteInfo->spriteOwner)

+            {

+                client->clientPtr = it;

+                break;

+            }

+            it = it->next;

+        }

+    }

+    return client->clientPtr;

+}

+

+/* PickKeyboard will pick an appropriate keyboard for the given client by

+ * searching the list of devices for the keyboard device that is paired with

+ * the client's pointer.

+ */

+DeviceIntPtr

+PickKeyboard(ClientPtr client)

+{

+    DeviceIntPtr ptr = PickPointer(client);

+    DeviceIntPtr kbd = GetMaster(ptr, MASTER_KEYBOARD);

+

+    if (!kbd)

+    {

+        ErrorF("[dix] ClientPointer not paired with a keyboard. This "

+                "is a bug.\n");

+    }

+

+    return kbd;

+}

+

+/* A client that has one or more core grabs does not get core events from

+ * devices it does not have a grab on. Legacy applications behave bad

+ * otherwise because they are not used to it and the events interfere.

+ * Only applies for core events.

+ *

+ * Return true if a core event from the device would interfere and should not

+ * be delivered.

+ */

+Bool

+IsInterferingGrab(ClientPtr client, DeviceIntPtr dev, xEvent* event)

+{

+    DeviceIntPtr it = inputInfo.devices;

+

+    switch(event->u.u.type)

+    {

+        case KeyPress:

+        case KeyRelease:

+        case ButtonPress:

+        case ButtonRelease:

+        case MotionNotify:

+        case EnterNotify:

+        case LeaveNotify:

+            break;

+        default:

+            return FALSE;

+    }

+

+    if (dev->deviceGrab.grab && SameClient(dev->deviceGrab.grab, client))

+        return FALSE;

+

+    while(it)

+    {

+        if (it != dev)

+        {

+            if (it->deviceGrab.grab && SameClient(it->deviceGrab.grab, client)

+                        && !it->deviceGrab.fromPassiveGrab)

+            {

+                if ((IsPointerDevice(it) && IsPointerDevice(dev)) ||

+                        (IsKeyboardDevice(it) && IsKeyboardDevice(dev)))

+                    return TRUE;

+            }

+        }

+        it = it->next;

+    }

+

+    return FALSE;

+}

+

diff --git a/xorg-server/dix/getevents.c b/xorg-server/dix/getevents.c
index f58c41df2..73fb2370f 100644
--- a/xorg-server/dix/getevents.c
+++ b/xorg-server/dix/getevents.c
@@ -1,1338 +1,1339 @@
-/*
- * Copyright © 2006 Nokia Corporation
- * Copyright © 2006-2007 Daniel Stone
- * Copyright © 2008 Red Hat, Inc.
- *
- * 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 (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 NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors: Daniel Stone <daniel@fooishbar.org>
- *          Peter Hutterer <peter.hutterer@who-t.net>
- */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include <X11/X.h>
-#include <X11/keysym.h>
-#include <X11/Xproto.h>
-#include <math.h>
-
-#include "misc.h"
-#include "resource.h"
-#include "inputstr.h"
-#include "scrnintstr.h"
-#include "cursorstr.h"
-#include "dixstruct.h"
-#include "globals.h"
-#include "dixevents.h"
-#include "mipointer.h"
-#include "eventstr.h"
-#include "eventconvert.h"
-#include "inpututils.h"
-
-#include <X11/extensions/XKBproto.h>
-#include "xkbsrv.h"
-
-#ifdef PANORAMIX
-#include "panoramiX.h"
-#include "panoramiXsrv.h"
-#endif
-
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
-#include <pixman.h>
-#include "exglobals.h"
-#include "exevents.h"
-#include "exglobals.h"
-#include "extnsionst.h"
-#include "listdev.h" /* for sizing up DeviceClassesChangedEvent */
-
-#ifdef _MSC_VER
-#include <math.h>
-
-float roundf(float f)
-{
-  return ((f<0.0f) ? ceil(f-.5)  : floor (f+.5));
-}
-double roundd(double f)
-{
-  return ((f<0.0) ? ceil(f-.5)  : floor (f+.5));
-}
-#define lroundf(val)   ((int)roundf(val))
-#define lround(val)   ((int)roundd(val))
-#endif
-
-/* Number of motion history events to store. */
-#define MOTION_HISTORY_SIZE 256
-
-/* InputEventList is the container list for all input events generated by the
- * DDX. The DDX is expected to call GetEventList() and then pass the list into
- * Get{Pointer|Keyboard}Events.
- */
-EventListPtr InputEventList = NULL;
-int InputEventListLen = 0;
-
-int
-GetEventList(EventListPtr* list)
-{
-    *list = InputEventList;
-    return InputEventListLen;
-}
-
-/**
- * Pick some arbitrary size for Xi motion history.
- */
-int
-GetMotionHistorySize(void)
-{
-    return MOTION_HISTORY_SIZE;
-}
-
-void
-set_button_down(DeviceIntPtr pDev, int button, int type)
-{
-    if (type == BUTTON_PROCESSED)
-        SetBit(pDev->button->down, button);
-    else
-        SetBit(pDev->button->postdown, button);
-}
-
-void
-set_button_up(DeviceIntPtr pDev, int button, int type)
-{
-    if (type == BUTTON_PROCESSED)
-        ClearBit(pDev->button->down, button);
-    else
-        ClearBit(pDev->button->postdown, button);
-}
-
-Bool
-button_is_down(DeviceIntPtr pDev, int button, int type)
-{
-    Bool ret = FALSE;
-
-    if (type & BUTTON_PROCESSED)
-        ret = ret || BitIsOn(pDev->button->down, button);
-    if (type & BUTTON_POSTED)
-        ret = ret || BitIsOn(pDev->button->postdown, button);
-
-    return ret;
-}
-
-void
-set_key_down(DeviceIntPtr pDev, int key_code, int type)
-{
-    if (type == KEY_PROCESSED)
-        SetBit(pDev->key->down, key_code);
-    else
-        SetBit(pDev->key->postdown, key_code);
-}
-
-void
-set_key_up(DeviceIntPtr pDev, int key_code, int type)
-{
-    if (type == KEY_PROCESSED)
-        ClearBit(pDev->key->down, key_code);
-    else
-        ClearBit(pDev->key->postdown, key_code);
-}
-
-Bool
-key_is_down(DeviceIntPtr pDev, int key_code, int type)
-{
-    Bool ret = FALSE;
-
-    if (type & KEY_PROCESSED)
-        ret = ret || BitIsOn(pDev->key->down, key_code);
-    if (type & KEY_POSTED)
-        ret = ret || BitIsOn(pDev->key->postdown, key_code);
-
-    return ret;
-}
-
-static Bool
-key_autorepeats(DeviceIntPtr pDev, int key_code)
-{
-    return !!(pDev->kbdfeed->ctrl.autoRepeats[key_code >> 3] &
-              (1 << (key_code & 7)));
-}
-
-static void
-init_event(DeviceIntPtr dev, DeviceEvent* event, Time ms)
-{
-    memset(event, 0, sizeof(DeviceEvent));
-    event->header = ET_Internal;
-    event->length = sizeof(DeviceEvent);
-    event->time = ms;
-    event->deviceid = dev->id;
-    event->sourceid = dev->id;
-}
-
-static void
-init_raw(DeviceIntPtr dev, RawDeviceEvent *event, Time ms, int type, int detail)
-{
-    memset(event, 0, sizeof(RawDeviceEvent));
-    event->header = ET_Internal;
-    event->length = sizeof(RawDeviceEvent);
-    event->type = ET_RawKeyPress - ET_KeyPress + type;
-    event->time = ms;
-    event->deviceid = dev->id;
-    event->sourceid = dev->id;
-    event->detail.button = detail;
-}
-
-static void
-set_raw_valuators(RawDeviceEvent *event, ValuatorMask *mask, int32_t* data)
-{
-    int i;
-
-    for (i = 0; i < valuator_mask_size(mask); i++)
-    {
-        if (valuator_mask_isset(mask, i))
-        {
-            SetBit(event->valuators.mask, i);
-            data[i] = valuator_mask_get(mask, i);
-        }
-    }
-}
-
-
-static void
-set_valuators(DeviceIntPtr dev, DeviceEvent* event, ValuatorMask *mask)
-{
-    int i;
-
-    for (i = 0; i < valuator_mask_size(mask); i++)
-    {
-        if (valuator_mask_isset(mask, i))
-        {
-            SetBit(event->valuators.mask, i);
-            if (valuator_get_mode(dev, i) == Absolute)
-                SetBit(event->valuators.mode, i);
-            event->valuators.data[i] = valuator_mask_get(mask, i);
-            event->valuators.data_frac[i] =
-                dev->last.remainder[i] * (1 << 16) * (1 << 16);
-        }
-    }
-}
-
-void
-CreateClassesChangedEvent(EventList* event,
-                          DeviceIntPtr master,
-                          DeviceIntPtr slave,
-                          int type)
-{
-    int i;
-    DeviceChangedEvent *dce;
-    CARD32 ms = GetTimeInMillis();
-
-    dce = (DeviceChangedEvent*)event->event;
-    memset(dce, 0, sizeof(DeviceChangedEvent));
-    dce->deviceid = slave->id;
-    dce->masterid = master->id;
-    dce->header = ET_Internal;
-    dce->length = sizeof(DeviceChangedEvent);
-    dce->type = ET_DeviceChanged;
-    dce->time = ms;
-    dce->flags = type;
-    dce->flags |= DEVCHANGE_SLAVE_SWITCH;
-    dce->sourceid = slave->id;
-
-    if (slave->button)
-    {
-        dce->buttons.num_buttons = slave->button->numButtons;
-        for (i = 0; i < dce->buttons.num_buttons; i++)
-            dce->buttons.names[i] = slave->button->labels[i];
-    }
-    if (slave->valuator)
-    {
-        dce->num_valuators = slave->valuator->numAxes;
-        for (i = 0; i < dce->num_valuators; i++)
-        {
-            dce->valuators[i].min = slave->valuator->axes[i].min_value;
-            dce->valuators[i].max = slave->valuator->axes[i].max_value;
-            dce->valuators[i].resolution = slave->valuator->axes[i].resolution;
-            dce->valuators[i].mode = slave->valuator->axes[i].mode;
-            dce->valuators[i].name = slave->valuator->axes[i].label;
-        }
-    }
-    if (slave->key)
-    {
-        dce->keys.min_keycode = slave->key->xkbInfo->desc->min_key_code;
-        dce->keys.max_keycode = slave->key->xkbInfo->desc->max_key_code;
-    }
-}
-
-/**
- * Rescale the coord between the two axis ranges.
- */
-static int
-rescaleValuatorAxis(int coord, float remainder, float *remainder_return, AxisInfoPtr from, AxisInfoPtr to,
-                    int defmax)
-{
-    int fmin = 0, tmin = 0, fmax = defmax, tmax = defmax, coord_return;
-    float value;
-
-    if(from && from->min_value < from->max_value) {
-        fmin = from->min_value;
-        fmax = from->max_value;
-    }
-    if(to && to->min_value < to->max_value) {
-        tmin = to->min_value;
-        tmax = to->max_value;
-    }
-
-    if(fmin == tmin && fmax == tmax) {
-        if (remainder_return)
-            *remainder_return = remainder;
-        return coord;
-    }
-
-    if(fmax == fmin) { /* avoid division by 0 */
-        if (remainder_return)
-            *remainder_return = 0.0;
-        return 0;
-    }
-
-    value = (coord + remainder - fmin) * (tmax - tmin) / (fmax - fmin) + tmin;
-    coord_return = lroundf(value);
-    if (remainder_return)
-        *remainder_return = value - coord_return;
-    return coord_return;
-}
-
-/**
- * Update all coordinates when changing to a different SD
- * to ensure that relative reporting will work as expected
- * without loss of precision.
- *
- * pDev->last.valuators will be in absolute device coordinates after this
- * function.
- */
-static void
-updateSlaveDeviceCoords(DeviceIntPtr master, DeviceIntPtr pDev)
-{
-    ScreenPtr scr = miPointerGetScreen(pDev);
-    int i;
-    DeviceIntPtr lastSlave;
-
-    /* master->last.valuators[0]/[1] is in screen coords and the actual
-     * position of the pointer */
-    pDev->last.valuators[0] = master->last.valuators[0];
-    pDev->last.valuators[1] = master->last.valuators[1];
-
-    if (!pDev->valuator)
-        return;
-
-    /* scale back to device coordinates */
-    if(pDev->valuator->numAxes > 0)
-        pDev->last.valuators[0] = rescaleValuatorAxis(pDev->last.valuators[0], pDev->last.remainder[0],
-                        &pDev->last.remainder[0], NULL, pDev->valuator->axes + 0, scr->width);
-    if(pDev->valuator->numAxes > 1)
-        pDev->last.valuators[1] = rescaleValuatorAxis(pDev->last.valuators[1], pDev->last.remainder[1],
-                        &pDev->last.remainder[1], NULL, pDev->valuator->axes + 1, scr->height);
-
-    /* calculate the other axis as well based on info from the old
-     * slave-device. If the old slave had less axes than this one,
-     * last.valuators is reset to 0.
-     */
-    if ((lastSlave = master->last.slave) && lastSlave->valuator) {
-        for (i = 2; i < pDev->valuator->numAxes; i++) {
-            if (i >= lastSlave->valuator->numAxes)
-                pDev->last.valuators[i] = 0;
-            else
-                pDev->last.valuators[i] =
-                    rescaleValuatorAxis(pDev->last.valuators[i],
-                            pDev->last.remainder[i],
-                            &pDev->last.remainder[i],
-                            lastSlave->valuator->axes + i,
-                            pDev->valuator->axes + i, 0);
-        }
-    }
-
-}
-
-/**
- * Allocate the motion history buffer.
- */
-void
-AllocateMotionHistory(DeviceIntPtr pDev)
-{
-    int size;
-    free(pDev->valuator->motion);
-
-    if (pDev->valuator->numMotionEvents < 1)
-        return;
-
-    /* An MD must have a motion history size large enough to keep all
-     * potential valuators, plus the respective range of the valuators.
-     * 3 * INT32 for (min_val, max_val, curr_val))
-     */
-    if (IsMaster(pDev))
-        size = sizeof(INT32) * 3 * MAX_VALUATORS;
-    else {
-        ValuatorClassPtr v = pDev->valuator;
-        int numAxes;
-        /* XI1 doesn't understand mixed mode devices */
-        for (numAxes = 0; numAxes < v->numAxes; numAxes++)
-            if (valuator_get_mode(pDev, numAxes) != valuator_get_mode(pDev, 0))
-                break;
-        size = sizeof(INT32) * numAxes;
-    }
-
-    size += sizeof(Time);
-
-    pDev->valuator->motion = calloc(pDev->valuator->numMotionEvents, size);
-    pDev->valuator->first_motion = 0;
-    pDev->valuator->last_motion = 0;
-    if (!pDev->valuator->motion)
-        ErrorF("[dix] %s: Failed to alloc motion history (%d bytes).\n",
-                pDev->name, size * pDev->valuator->numMotionEvents);
-}
-
-/**
- * Dump the motion history between start and stop into the supplied buffer.
- * Only records the event for a given screen in theory, but in practice, we
- * sort of ignore this.
- *
- * If core is set, we only generate x/y, in INT16, scaled to screen coords.
- */
-int
-GetMotionHistory(DeviceIntPtr pDev, xTimecoord **buff, unsigned long start,
-                 unsigned long stop, ScreenPtr pScreen, BOOL core)
-{
-    char *ibuff = NULL, *obuff;
-    int i = 0, ret = 0;
-    int j, coord;
-    Time current;
-    /* The size of a single motion event. */
-    int size;
-    int dflt;
-    AxisInfo from, *to; /* for scaling */
-    INT32 *ocbuf, *icbuf; /* pointer to coordinates for copying */
-    INT16 *corebuf;
-    AxisInfo core_axis = {0};
-
-    if (!pDev->valuator || !pDev->valuator->numMotionEvents)
-        return 0;
-
-    if (core && !pScreen)
-        return 0;
-
-    if (IsMaster(pDev))
-        size = (sizeof(INT32) * 3 * MAX_VALUATORS) + sizeof(Time);
-    else
-        size = (sizeof(INT32) * pDev->valuator->numAxes) + sizeof(Time);
-
-    *buff = malloc(size * pDev->valuator->numMotionEvents);
-    if (!(*buff))
-        return 0;
-    obuff = (char *)*buff;
-
-    for (i = pDev->valuator->first_motion;
-         i != pDev->valuator->last_motion;
-         i = (i + 1) % pDev->valuator->numMotionEvents) {
-        /* We index the input buffer by which element we're accessing, which
-         * is not monotonic, and the output buffer by how many events we've
-         * written so far. */
-        ibuff = (char *) pDev->valuator->motion + (i * size);
-        memcpy(&current, ibuff, sizeof(Time));
-
-        if (current > stop) {
-            return ret;
-        }
-        else if (current >= start) {
-            if (core)
-            {
-                memcpy(obuff, ibuff, sizeof(Time)); /* copy timestamp */
-
-                icbuf = (INT32*)(ibuff + sizeof(Time));
-                corebuf = (INT16*)(obuff + sizeof(Time));
-
-                /* fetch x coordinate + range */
-                memcpy(&from.min_value, icbuf++, sizeof(INT32));
-                memcpy(&from.max_value, icbuf++, sizeof(INT32));
-                memcpy(&coord, icbuf++, sizeof(INT32));
-
-                /* scale to screen coords */
-                to = &core_axis;
-                to->max_value = pScreen->width;
-                coord = rescaleValuatorAxis(coord, 0.0, NULL, &from, to, pScreen->width);
-
-                memcpy(corebuf, &coord, sizeof(INT16));
-                corebuf++;
-
-                /* fetch y coordinate + range */
-                memcpy(&from.min_value, icbuf++, sizeof(INT32));
-                memcpy(&from.max_value, icbuf++, sizeof(INT32));
-                memcpy(&coord, icbuf++, sizeof(INT32));
-
-                to->max_value = pScreen->height;
-                coord = rescaleValuatorAxis(coord, 0.0, NULL, &from, to, pScreen->height);
-                memcpy(corebuf, &coord, sizeof(INT16));
-
-            } else if (IsMaster(pDev))
-            {
-                memcpy(obuff, ibuff, sizeof(Time)); /* copy timestamp */
-
-                ocbuf = (INT32*)(obuff + sizeof(Time));
-                icbuf = (INT32*)(ibuff + sizeof(Time));
-                for (j = 0; j < MAX_VALUATORS; j++)
-                {
-                    if (j >= pDev->valuator->numAxes)
-                        break;
-
-                    /* fetch min/max/coordinate */
-                    memcpy(&from.min_value, icbuf++, sizeof(INT32));
-                    memcpy(&from.max_value, icbuf++, sizeof(INT32));
-                    memcpy(&coord, icbuf++, sizeof(INT32));
-
-                    to = (j < pDev->valuator->numAxes) ? &pDev->valuator->axes[j] : NULL;
-
-                    /* x/y scaled to screen if no range is present */
-                    if (j == 0 && (from.max_value < from.min_value))
-                        from.max_value = pScreen->width;
-                    else if (j == 1 && (from.max_value < from.min_value))
-                        from.max_value = pScreen->height;
-
-                    if (j == 0 && (to->max_value < to->min_value))
-                        dflt = pScreen->width;
-                    else if (j == 1 && (to->max_value < to->min_value))
-                        dflt = pScreen->height;
-                    else
-                        dflt = 0;
-
-                    /* scale from stored range into current range */
-                    coord = rescaleValuatorAxis(coord, 0.0, NULL, &from, to, 0);
-                    memcpy(ocbuf, &coord, sizeof(INT32));
-                    ocbuf++;
-                }
-            } else
-                memcpy(obuff, ibuff, size);
-
-            /* don't advance by size here. size may be different to the
-             * actually written size if the MD has less valuators than MAX */
-            if (core)
-                obuff += sizeof(INT32) + sizeof(Time);
-            else
-                obuff += (sizeof(INT32) * pDev->valuator->numAxes) + sizeof(Time);
-            ret++;
-        }
-    }
-
-    return ret;
-}
-
-
-/**
- * Update the motion history for a specific device, with the list of
- * valuators.
- *
- * Layout of the history buffer:
- *   for SDs: [time] [val0] [val1] ... [valn]
- *   for MDs: [time] [min_val0] [max_val0] [val0] [min_val1] ... [valn]
- *
- * For events that have some valuators unset:
- *      min_val == max_val == val == 0.
- */
-static void
-updateMotionHistory(DeviceIntPtr pDev, CARD32 ms, ValuatorMask *mask,
-                    int *valuators)
-{
-    char *buff = (char *) pDev->valuator->motion;
-    ValuatorClassPtr v;
-    int i;
-
-    if (!pDev->valuator->numMotionEvents)
-        return;
-
-    v = pDev->valuator;
-    if (IsMaster(pDev))
-    {
-        buff += ((sizeof(INT32) * 3 * MAX_VALUATORS) + sizeof(CARD32)) *
-                v->last_motion;
-
-        memcpy(buff, &ms, sizeof(Time));
-        buff += sizeof(Time);
-
-        memset(buff, 0, sizeof(INT32) * 3 * MAX_VALUATORS);
-
-        for (i = 0; i < v->numAxes; i++)
-        {
-            /* XI1 doesn't support mixed mode devices */
-            if (valuator_get_mode(pDev, i) != valuator_get_mode(pDev, 0))
-                break;
-            if (valuator_mask_size(mask) <= i || !valuator_mask_isset(mask, i))
-            {
-                buff += 3 * sizeof(INT32);
-                continue;
-            }
-            memcpy(buff, &v->axes[i].min_value, sizeof(INT32));
-            buff += sizeof(INT32);
-            memcpy(buff, &v->axes[i].max_value, sizeof(INT32));
-            buff += sizeof(INT32);
-            memcpy(buff, &valuators[i], sizeof(INT32));
-            buff += sizeof(INT32);
-        }
-    } else
-    {
-
-        buff += ((sizeof(INT32) * pDev->valuator->numAxes) + sizeof(CARD32)) *
-            pDev->valuator->last_motion;
-
-        memcpy(buff, &ms, sizeof(Time));
-        buff += sizeof(Time);
-
-        memset(buff, 0, sizeof(INT32) * pDev->valuator->numAxes);
-
-        for (i = 0; i < MAX_VALUATORS; i++)
-        {
-            if (valuator_mask_size(mask) <= i || !valuator_mask_isset(mask, i))
-            {
-                buff += sizeof(INT32);
-                continue;
-            }
-            memcpy(buff, &valuators[i], sizeof(INT32));
-            buff += sizeof(INT32);
-        }
-    }
-
-    pDev->valuator->last_motion = (pDev->valuator->last_motion + 1) %
-        pDev->valuator->numMotionEvents;
-    /* If we're wrapping around, just keep the circular buffer going. */
-    if (pDev->valuator->first_motion == pDev->valuator->last_motion)
-        pDev->valuator->first_motion = (pDev->valuator->first_motion + 1) %
-                                       pDev->valuator->numMotionEvents;
-
-    return;
-}
-
-
-/**
- * Returns the maximum number of events GetKeyboardEvents,
- * GetKeyboardValuatorEvents, and GetPointerEvents will ever return.
- *
- * This MUST be absolutely constant, from init until exit.
- */
-int
-GetMaximumEventsNum(void) {
-    /* One raw event
-     * One device event
-     * One possible device changed event
-     */
-    return 3;
-}
-
-
-/**
- * Clip an axis to its bounds, which are declared in the call to
- * InitValuatorAxisClassStruct.
- */
-static void
-clipAxis(DeviceIntPtr pDev, int axisNum, int *val)
-{
-    AxisInfoPtr axis;
-
-    if (axisNum >= pDev->valuator->numAxes)
-        return;
-
-    axis = pDev->valuator->axes + axisNum;
-
-    /* If a value range is defined, clip. If not, do nothing */
-    if (axis->max_value <= axis->min_value)
-        return;
-
-    if (*val < axis->min_value)
-        *val = axis->min_value;
-    if (*val > axis->max_value)
-        *val = axis->max_value;
-}
-
-/**
- * Clip every axis in the list of valuators to its bounds.
- */
-static void
-clipValuators(DeviceIntPtr pDev, ValuatorMask *mask)
-{
-    int i;
-
-    for (i = 0; i < valuator_mask_size(mask); i++)
-        if (valuator_mask_isset(mask, i))
-        {
-            int val = valuator_mask_get(mask, i);
-            clipAxis(pDev, i, &val);
-            valuator_mask_set(mask, i, val);
-        }
-}
-
-/**
- * Create the DCCE event (does not update the master's device state yet, this
- * is done in the event processing).
- * Pull in the coordinates from the MD if necessary.
- *
- * @param events Pointer to a pre-allocated event list.
- * @param dev The slave device that generated an event.
- * @param type Either DEVCHANGE_POINTER_EVENT and/or DEVCHANGE_KEYBOARD_EVENT
- * @param num_events The current number of events, returns the number of
- *        events if a DCCE was generated.
- * @return The updated @events pointer.
- */
-EventListPtr
-UpdateFromMaster(EventListPtr events, DeviceIntPtr dev, int type, int *num_events)
-{
-    DeviceIntPtr master;
-
-    master = GetMaster(dev, (type & DEVCHANGE_POINTER_EVENT) ?  MASTER_POINTER : MASTER_KEYBOARD);
-
-    if (master && master->last.slave != dev)
-    {
-        CreateClassesChangedEvent(events, master, dev, type);
-        if (IsPointerDevice(master))
-        {
-            updateSlaveDeviceCoords(master, dev);
-            master->last.numValuators = dev->last.numValuators;
-        }
-        master->last.slave = dev;
-        (*num_events)++;
-        events++;
-    }
-    return events;
-}
-
-/**
- * Move the device's pointer to the position given in the valuators.
- *
- * @param dev The device which's pointer is to be moved.
- * @param x Returns the x position of the pointer after the move.
- * @param y Returns the y position of the pointer after the move.
- * @param mask Bit mask of valid valuators.
- * @param valuators Valuator data for each axis between @first and
- *        @first+@num.
- */
-static void
-moveAbsolute(DeviceIntPtr dev, int *x, int *y, ValuatorMask *mask)
-{
-    int i;
-
-    if (valuator_mask_isset(mask, 0))
-        *x = valuator_mask_get(mask, 0);
-    else
-        *x = dev->last.valuators[0];
-
-    if (valuator_mask_isset(mask, 1))
-        *y = valuator_mask_get(mask, 1);
-    else
-        *y = dev->last.valuators[1];
-
-    clipAxis(dev, 0, x);
-    clipAxis(dev, 1, y);
-
-    for (i = 2; i < valuator_mask_size(mask); i++)
-    {
-        if (valuator_mask_isset(mask, i))
-        {
-            dev->last.valuators[i] = valuator_mask_get(mask, i);
-            clipAxis(dev, i, &dev->last.valuators[i]);
-        }
-    }
-}
-
-/**
- * Move the device's pointer by the values given in @valuators.
- *
- * @param dev The device which's pointer is to be moved.
- * @param x Returns the x position of the pointer after the move.
- * @param y Returns the y position of the pointer after the move.
- * @param mask Bit mask of valid valuators.
- * @param valuators Valuator data for each axis between @first and
- *        @first+@num.
- */
-static void
-moveRelative(DeviceIntPtr dev, int *x, int *y, ValuatorMask *mask)
-{
-    int i;
-
-    *x = dev->last.valuators[0];
-    *y = dev->last.valuators[1];
-
-    if (valuator_mask_isset(mask, 0))
-        *x += valuator_mask_get(mask, 0);
-
-    if (valuator_mask_isset(mask, 1))
-        *y += valuator_mask_get(mask, 1);
-
-    /* if attached, clip both x and y to the defined limits (usually
-     * co-ord space limit). If it is attached, we need x/y to go over the
-     * limits to be able to change screens. */
-    if(dev->u.master && dev->valuator) {
-        if (valuator_get_mode(dev, 0) == Absolute)
-            clipAxis(dev, 0, x);
-        if (valuator_get_mode(dev, 1) == Absolute)
-            clipAxis(dev, 1, y);
-    }
-
-    /* calc other axes, clip, drop back into valuators */
-    for (i = 2; i < valuator_mask_size(mask); i++)
-    {
-        if (valuator_mask_isset(mask, i))
-        {
-            dev->last.valuators[i] += valuator_mask_get(mask, i);
-            if (valuator_get_mode(dev, i) == Absolute)
-                clipAxis(dev, i, &dev->last.valuators[i]);
-            valuator_mask_set(mask, i, dev->last.valuators[i]);
-        }
-    }
-}
-
-/**
- * Accelerate the data in valuators based on the device's acceleration scheme.
- *
- * @param dev The device which's pointer is to be moved.
- * @param first The first valuator in @valuators
- * @param num Total number of valuators in @valuators.
- * @param valuators Valuator data for each axis between @first and
- *        @first+@num.
- * @param ms Current time.
- */
-static void
-accelPointer(DeviceIntPtr dev, int first, int num, int *valuators, CARD32 ms)
-{
-    if (dev->valuator->accelScheme.AccelSchemeProc)
-        dev->valuator->accelScheme.AccelSchemeProc(dev, first, num, valuators, ms);
-}
-
-/**
- * If we have HW cursors, this actually moves the visible sprite. If not, we
- * just do all the screen crossing, etc.
- *
- * We scale from device to screen coordinates here, call
- * miPointerSetPosition() and then scale back into device coordinates (if
- * needed). miPSP will change x/y if the screen was crossed.
- *
- * @param dev The device to be moved.
- * @param x Pointer to current x-axis value, may be modified.
- * @param y Pointer to current y-axis value, may be modified.
- * @param x_frac Fractional part of current x-axis value, may be modified.
- * @param y_frac Fractional part of current y-axis value, may be modified.
- * @param scr Screen the device's sprite is currently on.
- * @param screenx Screen x coordinate the sprite is on after the update.
- * @param screeny Screen y coordinate the sprite is on after the update.
- * @param screenx_frac Fractional part of screen x coordinate, as above.
- * @param screeny_frac Fractional part of screen y coordinate, as above.
- */
-static void
-positionSprite(DeviceIntPtr dev, int *x, int *y, float x_frac, float y_frac,
-               ScreenPtr scr, int *screenx, int *screeny, float *screenx_frac, float *screeny_frac)
-{
-    int old_screenx, old_screeny;
-
-    /* scale x&y to screen */
-    if (dev->valuator && dev->valuator->numAxes > 0) {
-        *screenx = rescaleValuatorAxis(*x, x_frac, screenx_frac,
-                dev->valuator->axes + 0, NULL, scr->width);
-    } else {
-        *screenx = dev->last.valuators[0];
-        *screenx_frac = dev->last.remainder[0];
-    }
-
-    if (dev->valuator && dev->valuator->numAxes > 1) {
-        *screeny = rescaleValuatorAxis(*y, y_frac, screeny_frac,
-                dev->valuator->axes + 1, NULL, scr->height);
-    } else {
-        *screeny = dev->last.valuators[1];
-        *screeny_frac = dev->last.remainder[1];
-    }
-
-    /* Hit the left screen edge? */
-    if (*screenx <= 0 && *screenx_frac < 0.0f)
-    {
-        *screenx_frac = 0.0f;
-        x_frac = 0.0f;
-    }
-    if (*screeny <= 0 && *screeny_frac < 0.0f)
-    {
-        *screeny_frac = 0.0f;
-        y_frac = 0.0f;
-    }
-
-
-    old_screenx = *screenx;
-    old_screeny = *screeny;
-    /* This takes care of crossing screens for us, as well as clipping
-     * to the current screen. */
-    miPointerSetPosition(dev, screenx, screeny);
-
-    if (dev->u.master) {
-        dev->u.master->last.valuators[0] = *screenx;
-        dev->u.master->last.valuators[1] = *screeny;
-        dev->u.master->last.remainder[0] = *screenx_frac;
-        dev->u.master->last.remainder[1] = *screeny_frac;
-    }
-
-    if (dev->valuator)
-    {
-        /* Crossed screen? Scale back to device coordiantes */
-        if(*screenx != old_screenx)
-        {
-            scr = miPointerGetScreen(dev);
-            *x = rescaleValuatorAxis(*screenx, *screenx_frac, &x_frac, NULL,
-                                    dev->valuator->axes + 0, scr->width);
-        }
-        if(*screeny != old_screeny)
-        {
-            scr = miPointerGetScreen(dev);
-            *y = rescaleValuatorAxis(*screeny, *screeny_frac, &y_frac, NULL,
-                                     dev->valuator->axes + 1, scr->height);
-        }
-    }
-
-    /* dropy x/y (device coordinates) back into valuators for next event */
-    dev->last.valuators[0] = *x;
-    dev->last.valuators[1] = *y;
-    dev->last.remainder[0] = x_frac;
-    dev->last.remainder[1] = y_frac;
-}
-
-/**
- * Update the motion history for the device and (if appropriate) for its
- * master device.
- * @param dev Slave device to update.
- * @param mask Bit mask of valid valuators to append to history.
- * @param num Total number of valuators to append to history.
- * @param ms Current time
- */
-static void
-updateHistory(DeviceIntPtr dev, ValuatorMask *mask, CARD32 ms)
-{
-    if (!dev->valuator)
-        return;
-
-    updateMotionHistory(dev, ms, mask, dev->last.valuators);
-    if (dev->u.master)
-    {
-        DeviceIntPtr master = GetMaster(dev, MASTER_POINTER);
-        updateMotionHistory(master, ms, mask, dev->last.valuators);
-    }
-}
-
-/**
- * Convenience wrapper around GetKeyboardValuatorEvents, that takes no
- * valuators.
- */
-int
-GetKeyboardEvents(EventList *events, DeviceIntPtr pDev, int type, int key_code) {
-    ValuatorMask mask;
-
-    valuator_mask_zero(&mask);
-    return GetKeyboardValuatorEvents(events, pDev, type, key_code, &mask);
-}
-
-
-/**
- * Returns a set of InternalEvents for KeyPress/KeyRelease, optionally
- * also with valuator events.
- *
- * events is not NULL-terminated; the return value is the number of events.
- * The DDX is responsible for allocating the event structure in the first
- * place via GetMaximumEventsNum(), and for freeing it.
- */
-int
-GetKeyboardValuatorEvents(EventList *events, DeviceIntPtr pDev, int type,
-                          int key_code, const ValuatorMask *mask_in) {
-    int num_events = 0;
-    CARD32 ms = 0;
-    DeviceEvent *event;
-    RawDeviceEvent *raw;
-    ValuatorMask mask;
-
-    /* refuse events from disabled devices */
-    if (!pDev || !pDev->enabled)
-        return 0;
-
-    if (!events ||!pDev->key || !pDev->focus || !pDev->kbdfeed ||
-       (type != KeyPress && type != KeyRelease) ||
-       (key_code < 8 || key_code > 255))
-        return 0;
-
-    num_events = 1;
-
-    events = UpdateFromMaster(events, pDev, DEVCHANGE_KEYBOARD_EVENT, &num_events);
-
-    /* Handle core repeating, via press/release/press/release. */
-    if (type == KeyPress && key_is_down(pDev, key_code, KEY_POSTED)) {
-        /* If autorepeating is disabled either globally or just for that key,
-         * or we have a modifier, don't generate a repeat event. */
-        if (!pDev->kbdfeed->ctrl.autoRepeat ||
-            !key_autorepeats(pDev, key_code) ||
-            pDev->key->xkbInfo->desc->map->modmap[key_code])
-            return 0;
-    }
-
-    ms = GetTimeInMillis();
-
-    raw = (RawDeviceEvent*)events->event;
-    events++;
-    num_events++;
-
-    valuator_mask_copy(&mask, mask_in);
-
-    init_raw(pDev, raw, ms, type, key_code);
-    set_raw_valuators(raw, &mask, raw->valuators.data_raw);
-
-    clipValuators(pDev, &mask);
-
-    set_raw_valuators(raw, &mask, raw->valuators.data);
-
-    event = (DeviceEvent*) events->event;
-    init_event(pDev, event, ms);
-    event->detail.key = key_code;
-
-    if (type == KeyPress) {
-        event->type = ET_KeyPress;
-	set_key_down(pDev, key_code, KEY_POSTED);
-    }
-    else if (type == KeyRelease) {
-        event->type = ET_KeyRelease;
-	set_key_up(pDev, key_code, KEY_POSTED);
-    }
-
-    clipValuators(pDev, &mask);
-
-    set_valuators(pDev, event, &mask);
-
-    return num_events;
-}
-
-/**
- * Initialize an event list and fill with 32 byte sized events.
- * This event list is to be passed into GetPointerEvents() and
- * GetKeyboardEvents().
- *
- * @param num_events Number of elements in list.
- */
-EventListPtr
-InitEventList(int num_events)
-{
-    EventListPtr events;
-    int i;
-
-    events = (EventListPtr)calloc(num_events, sizeof(EventList));
-    if (!events)
-        return NULL;
-
-    for (i = 0; i < num_events; i++)
-    {
-        events[i].evlen = sizeof(InternalEvent);
-        events[i].event = calloc(1, sizeof(InternalEvent));
-        if (!events[i].event)
-        {
-            /* rollback */
-            while(i--)
-                free(events[i].event);
-            free(events);
-            events = NULL;
-            break;
-        }
-    }
-
-    return events;
-}
-
-/**
- * Free an event list.
- *
- * @param list The list to be freed.
- * @param num_events Number of elements in list.
- */
-void
-FreeEventList(EventListPtr list, int num_events)
-{
-    if (!list)
-        return;
-    while(num_events--)
-        free(list[num_events].event);
-    free(list);
-}
-
-static void
-transformAbsolute(DeviceIntPtr dev, ValuatorMask *mask)
-{
-    struct pixman_f_vector p;
-
-    /* p' = M * p in homogeneous coordinates */
-    p.v[0] = (valuator_mask_isset(mask, 0) ? valuator_mask_get(mask, 0) :
-              dev->last.valuators[0]);
-    p.v[1] = (valuator_mask_isset(mask, 1) ? valuator_mask_get(mask, 1) :
-              dev->last.valuators[1]);
-    p.v[2] = 1.0;
-
-    pixman_f_transform_point(&dev->transform, &p);
-
-    if (lround(p.v[0]) != dev->last.valuators[0])
-        valuator_mask_set(mask, 0, lround(p.v[0]));
-    if (lround(p.v[1]) != dev->last.valuators[1])
-        valuator_mask_set(mask, 1, lround(p.v[1]));
-}
-
-/**
- * Generate a series of InternalEvents (filled into the EventList)
- * representing pointer motion, or button presses.
- *
- * events is not NULL-terminated; the return value is the number of events.
- * The DDX is responsible for allocating the event structure in the first
- * place via InitEventList() and GetMaximumEventsNum(), and for freeing it.
- *
- * In the generated events rootX/Y will be in absolute screen coords and
- * the valuator information in the absolute or relative device coords.
- *
- * last.valuators[x] of the device is always in absolute device coords.
- * last.valuators[x] of the master device is in absolute screen coords.
- *
- * master->last.valuators[x] for x > 2 is undefined.
- */
-int
-GetPointerEvents(EventList *events, DeviceIntPtr pDev, int type, int buttons,
-                 int flags, const ValuatorMask *mask_in) {
-    int num_events = 1;
-    CARD32 ms;
-    DeviceEvent *event;
-    RawDeviceEvent    *raw;
-    int x = 0, y = 0, /* device coords */
-        cx, cy; /* only screen coordinates */
-    float x_frac = 0.0, y_frac = 0.0, cx_frac, cy_frac;
-    ScreenPtr scr = miPointerGetScreen(pDev);
-    ValuatorMask mask;
-
-    /* refuse events from disabled devices */
-    if (!pDev->enabled)
-        return 0;
-
-    if (!scr)
-        return 0;
-
-    switch (type)
-    {
-        case MotionNotify:
-            if (!mask_in || valuator_mask_num_valuators(mask_in) <= 0)
-                return 0;
-            break;
-        case ButtonPress:
-        case ButtonRelease:
-            if (!pDev->button || !buttons)
-                return 0;
-            break;
-        default:
-            return 0;
-    }
-
-    ms = GetTimeInMillis(); /* before pointer update to help precision */
-
-    events = UpdateFromMaster(events, pDev, DEVCHANGE_POINTER_EVENT, &num_events);
-
-    raw = (RawDeviceEvent*)events->event;
-    events++;
-    num_events++;
-
-    valuator_mask_copy(&mask, mask_in);
-
-    init_raw(pDev, raw, ms, type, buttons);
-    set_raw_valuators(raw, &mask, raw->valuators.data_raw);
-
-    if (flags & POINTER_ABSOLUTE)
-    {
-        if (flags & POINTER_SCREEN) /* valuators are in screen coords */
-        {
-            int scaled;
-
-            if (valuator_mask_isset(&mask, 0))
-            {
-                scaled = rescaleValuatorAxis(valuator_mask_get(&mask, 0),
-                                             0.0, &x_frac, NULL,
-                                             pDev->valuator->axes + 0,
-                                             scr->width);
-                valuator_mask_set(&mask, 0, scaled);
-            }
-            if (valuator_mask_isset(&mask, 1))
-            {
-                scaled = rescaleValuatorAxis(valuator_mask_get(&mask, 1),
-                                             0.0, &y_frac, NULL,
-                                             pDev->valuator->axes + 1,
-                                             scr->height);
-                valuator_mask_set(&mask, 1, scaled);
-            }
-        }
-
-        transformAbsolute(pDev, &mask);
-        moveAbsolute(pDev, &x, &y, &mask);
-    } else {
-        if (flags & POINTER_ACCELERATE) {
-            /* FIXME: Pointer acceleration only requires X and Y values. This
-             * should be converted to masked valuators. */
-            int vals[2];
-            vals[0] = valuator_mask_isset(&mask, 0) ?
-                      valuator_mask_get(&mask, 0) : 0;
-            vals[1] = valuator_mask_isset(&mask, 1) ?
-                      valuator_mask_get(&mask, 1) : 0;
-            accelPointer(pDev, 0, 2, vals, ms);
-
-            if (valuator_mask_isset(&mask, 0))
-                valuator_mask_set(&mask, 0, vals[0]);
-            if (valuator_mask_isset(&mask, 1))
-                valuator_mask_set(&mask, 1, vals[1]);
-
-            /* The pointer acceleration code modifies the fractional part
-             * in-place, so we need to extract this information first */
-            x_frac = pDev->last.remainder[0];
-            y_frac = pDev->last.remainder[1];
-        }
-        moveRelative(pDev, &x, &y, &mask);
-    }
-
-    set_raw_valuators(raw, &mask, raw->valuators.data);
-
-    positionSprite(pDev, &x, &y, x_frac, y_frac, scr, &cx, &cy, &cx_frac, &cy_frac);
-    updateHistory(pDev, &mask, ms);
-
-    /* Update the valuators with the true value sent to the client*/
-    if (valuator_mask_isset(&mask, 0))
-        valuator_mask_set(&mask, 0, x);
-    if (valuator_mask_isset(&mask, 1))
-        valuator_mask_set(&mask, 1, y);
-
-    clipValuators(pDev, &mask);
-
-    event = (DeviceEvent*) events->event;
-    init_event(pDev, event, ms);
-
-    if (type == MotionNotify) {
-        event->type = ET_Motion;
-        event->detail.button = 0;
-    }
-    else {
-        if (type == ButtonPress) {
-            event->type = ET_ButtonPress;
-            set_button_down(pDev, buttons, BUTTON_POSTED);
-        }
-        else if (type == ButtonRelease) {
-            event->type = ET_ButtonRelease;
-            set_button_up(pDev, buttons, BUTTON_POSTED);
-        }
-        event->detail.button = buttons;
-    }
-
-    event->root_x = cx; /* root_x/y always in screen coords */
-    event->root_y = cy;
-    event->root_x_frac = cx_frac;
-    event->root_y_frac = cy_frac;
-
-    set_valuators(pDev, event, &mask);
-
-    return num_events;
-}
-
-
-/**
- * Generate ProximityIn/ProximityOut InternalEvents, accompanied by
- * valuators.
- *
- * events is not NULL-terminated; the return value is the number of events.
- * The DDX is responsible for allocating the event structure in the first
- * place via GetMaximumEventsNum(), and for freeing it.
- */
-int
-GetProximityEvents(EventList *events, DeviceIntPtr pDev, int type, const ValuatorMask *mask_in)
-{
-    int num_events = 1, i;
-    DeviceEvent *event;
-    ValuatorMask mask;
-
-    /* refuse events from disabled devices */
-    if (!pDev->enabled)
-        return 0;
-
-    /* Sanity checks. */
-    if ((type != ProximityIn && type != ProximityOut) || !mask_in)
-        return 0;
-    if (!pDev->valuator)
-        return 0;
-
-    valuator_mask_copy(&mask, mask_in);
-
-    /* ignore relative axes for proximity. */
-    for (i = 0; i < valuator_mask_size(&mask); i++)
-    {
-        if (valuator_mask_isset(&mask, i) &&
-            valuator_get_mode(pDev, i) == Relative)
-            valuator_mask_unset(&mask, i);
-    }
-
-    /* FIXME: posting proximity events with relative valuators only results
-     * in an empty event, EventToXI() will fail to convert → no event sent
-     * to client. */
-
-    events = UpdateFromMaster(events, pDev, DEVCHANGE_POINTER_EVENT, &num_events);
-
-    event = (DeviceEvent *) events->event;
-    init_event(pDev, event, GetTimeInMillis());
-    event->type = (type == ProximityIn) ? ET_ProximityIn : ET_ProximityOut;
-
-    clipValuators(pDev, &mask);
-
-    set_valuators(pDev, event, &mask);
-
-    return num_events;
-}
-
-/**
- * Synthesize a single motion event for the core pointer.
- *
- * Used in cursor functions, e.g. when cursor confinement changes, and we need
- * to shift the pointer to get it inside the new bounds.
- */
-void
-PostSyntheticMotion(DeviceIntPtr pDev,
-                    int x,
-                    int y,
-                    int screen,
-                    unsigned long time)
-{
-    DeviceEvent ev;
-
-#ifdef PANORAMIX
-    /* Translate back to the sprite screen since processInputProc
-       will translate from sprite screen to screen 0 upon reentry
-       to the DIX layer. */
-    if (!noPanoramiXExtension) {
-        x += screenInfo.screens[0]->x - screenInfo.screens[screen]->x;
-        y += screenInfo.screens[0]->y - screenInfo.screens[screen]->y;
-    }
-#endif
-
-    memset(&ev, 0, sizeof(DeviceEvent));
-    init_event(pDev, &ev, time);
-    ev.root_x = x;
-    ev.root_y = y;
-    ev.type = ET_Motion;
-    ev.time = time;
-
-    /* FIXME: MD/SD considerations? */
-    (*pDev->public.processInputProc)((InternalEvent*)&ev, pDev);
-}
+/*

+ * Copyright © 2006 Nokia Corporation

+ * Copyright © 2006-2007 Daniel Stone

+ * Copyright © 2008 Red Hat, Inc.

+ *

+ * 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 (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 NONINFRINGEMENT.  IN NO EVENT SHALL

+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

+ * DEALINGS IN THE SOFTWARE.

+ *

+ * Authors: Daniel Stone <daniel@fooishbar.org>

+ *          Peter Hutterer <peter.hutterer@who-t.net>

+ */

+

+#ifdef HAVE_DIX_CONFIG_H

+#include <dix-config.h>

+#endif

+

+#include <X11/X.h>

+#include <X11/keysym.h>

+#include <X11/Xproto.h>

+#include <math.h>

+

+#include "misc.h"

+#include "resource.h"

+#include "inputstr.h"

+#include "scrnintstr.h"

+#include "cursorstr.h"

+#include "dixstruct.h"

+#include "globals.h"

+#include "dixevents.h"

+#include "mipointer.h"

+#include "eventstr.h"

+#include "eventconvert.h"

+#include "inpututils.h"

+

+#include <X11/extensions/XKBproto.h>

+#include "xkbsrv.h"

+

+#ifdef PANORAMIX

+#include "panoramiX.h"

+#include "panoramiXsrv.h"

+#endif

+

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

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

+#include <pixman.h>

+#include "exglobals.h"

+#include "exevents.h"

+#include "exglobals.h"

+#include "extnsionst.h"

+#include "listdev.h" /* for sizing up DeviceClassesChangedEvent */

+

+#ifdef _MSC_VER

+#include <math.h>

+

+float roundf(float f)

+{

+  return ((f<0.0f) ? ceil(f-.5)  : floor (f+.5));

+}

+double roundd(double f)

+{

+  return ((f<0.0) ? ceil(f-.5)  : floor (f+.5));

+}

+#define lroundf(val)   ((int)roundf(val))

+#define lround(val)   ((int)roundd(val))

+#endif

+

+/* Number of motion history events to store. */

+#define MOTION_HISTORY_SIZE 256

+

+/* InputEventList is the container list for all input events generated by the

+ * DDX. The DDX is expected to call GetEventList() and then pass the list into

+ * Get{Pointer|Keyboard}Events.

+ */

+EventListPtr InputEventList = NULL;

+int InputEventListLen = 0;

+

+int

+GetEventList(EventListPtr* list)

+{

+    *list = InputEventList;

+    return InputEventListLen;

+}

+

+/**

+ * Pick some arbitrary size for Xi motion history.

+ */

+int

+GetMotionHistorySize(void)

+{

+    return MOTION_HISTORY_SIZE;

+}

+

+void

+set_button_down(DeviceIntPtr pDev, int button, int type)

+{

+    if (type == BUTTON_PROCESSED)

+        SetBit(pDev->button->down, button);

+    else

+        SetBit(pDev->button->postdown, button);

+}

+

+void

+set_button_up(DeviceIntPtr pDev, int button, int type)

+{

+    if (type == BUTTON_PROCESSED)

+        ClearBit(pDev->button->down, button);

+    else

+        ClearBit(pDev->button->postdown, button);

+}

+

+Bool

+button_is_down(DeviceIntPtr pDev, int button, int type)

+{

+    Bool ret = FALSE;

+

+    if (type & BUTTON_PROCESSED)

+        ret = ret || BitIsOn(pDev->button->down, button);

+    if (type & BUTTON_POSTED)

+        ret = ret || BitIsOn(pDev->button->postdown, button);

+

+    return ret;

+}

+

+void

+set_key_down(DeviceIntPtr pDev, int key_code, int type)

+{

+    if (type == KEY_PROCESSED)

+        SetBit(pDev->key->down, key_code);

+    else

+        SetBit(pDev->key->postdown, key_code);

+}

+

+void

+set_key_up(DeviceIntPtr pDev, int key_code, int type)

+{

+    if (type == KEY_PROCESSED)

+        ClearBit(pDev->key->down, key_code);

+    else

+        ClearBit(pDev->key->postdown, key_code);

+}

+

+Bool

+key_is_down(DeviceIntPtr pDev, int key_code, int type)

+{

+    Bool ret = FALSE;

+

+    if (type & KEY_PROCESSED)

+        ret = ret || BitIsOn(pDev->key->down, key_code);

+    if (type & KEY_POSTED)

+        ret = ret || BitIsOn(pDev->key->postdown, key_code);

+

+    return ret;

+}

+

+static Bool

+key_autorepeats(DeviceIntPtr pDev, int key_code)

+{

+    return !!(pDev->kbdfeed->ctrl.autoRepeats[key_code >> 3] &

+              (1 << (key_code & 7)));

+}

+

+static void

+init_event(DeviceIntPtr dev, DeviceEvent* event, Time ms)

+{

+    memset(event, 0, sizeof(DeviceEvent));

+    event->header = ET_Internal;

+    event->length = sizeof(DeviceEvent);

+    event->time = ms;

+    event->deviceid = dev->id;

+    event->sourceid = dev->id;

+}

+

+static void

+init_raw(DeviceIntPtr dev, RawDeviceEvent *event, Time ms, int type, int detail)

+{

+    memset(event, 0, sizeof(RawDeviceEvent));

+    event->header = ET_Internal;

+    event->length = sizeof(RawDeviceEvent);

+    event->type = ET_RawKeyPress - ET_KeyPress + type;

+    event->time = ms;

+    event->deviceid = dev->id;

+    event->sourceid = dev->id;

+    event->detail.button = detail;

+}

+

+static void

+set_raw_valuators(RawDeviceEvent *event, ValuatorMask *mask, int32_t* data)

+{

+    int i;

+

+    for (i = 0; i < valuator_mask_size(mask); i++)

+    {

+        if (valuator_mask_isset(mask, i))

+        {

+            SetBit(event->valuators.mask, i);

+            data[i] = valuator_mask_get(mask, i);

+        }

+    }

+}

+

+

+static void

+set_valuators(DeviceIntPtr dev, DeviceEvent* event, ValuatorMask *mask)

+{

+    int i;

+

+    for (i = 0; i < valuator_mask_size(mask); i++)

+    {

+        if (valuator_mask_isset(mask, i))

+        {

+            SetBit(event->valuators.mask, i);

+            if (valuator_get_mode(dev, i) == Absolute)

+                SetBit(event->valuators.mode, i);

+            event->valuators.data[i] = valuator_mask_get(mask, i);

+            event->valuators.data_frac[i] =

+                dev->last.remainder[i] * (1 << 16) * (1 << 16);

+        }

+    }

+}

+

+void

+CreateClassesChangedEvent(EventList* event,

+                          DeviceIntPtr master,

+                          DeviceIntPtr slave,

+                          int type)

+{

+    int i;

+    DeviceChangedEvent *dce;

+    CARD32 ms = GetTimeInMillis();

+

+    dce = (DeviceChangedEvent*)event->event;

+    memset(dce, 0, sizeof(DeviceChangedEvent));

+    dce->deviceid = slave->id;

+    dce->masterid = master->id;

+    dce->header = ET_Internal;

+    dce->length = sizeof(DeviceChangedEvent);

+    dce->type = ET_DeviceChanged;

+    dce->time = ms;

+    dce->flags = type;

+    dce->flags |= DEVCHANGE_SLAVE_SWITCH;

+    dce->sourceid = slave->id;

+

+    if (slave->button)

+    {

+        dce->buttons.num_buttons = slave->button->numButtons;

+        for (i = 0; i < dce->buttons.num_buttons; i++)

+            dce->buttons.names[i] = slave->button->labels[i];

+    }

+    if (slave->valuator)

+    {

+        dce->num_valuators = slave->valuator->numAxes;

+        for (i = 0; i < dce->num_valuators; i++)

+        {

+            dce->valuators[i].min = slave->valuator->axes[i].min_value;

+            dce->valuators[i].max = slave->valuator->axes[i].max_value;

+            dce->valuators[i].resolution = slave->valuator->axes[i].resolution;

+            dce->valuators[i].mode = slave->valuator->axes[i].mode;

+            dce->valuators[i].name = slave->valuator->axes[i].label;

+        }

+    }

+    if (slave->key)

+    {

+        dce->keys.min_keycode = slave->key->xkbInfo->desc->min_key_code;

+        dce->keys.max_keycode = slave->key->xkbInfo->desc->max_key_code;

+    }

+}

+

+/**

+ * Rescale the coord between the two axis ranges.

+ */

+static int

+rescaleValuatorAxis(int coord, float remainder, float *remainder_return, AxisInfoPtr from, AxisInfoPtr to,

+                    int defmax)

+{

+    int fmin = 0, tmin = 0, fmax = defmax, tmax = defmax, coord_return;

+    float value;

+

+    if(from && from->min_value < from->max_value) {

+        fmin = from->min_value;

+        fmax = from->max_value;

+    }

+    if(to && to->min_value < to->max_value) {

+        tmin = to->min_value;

+        tmax = to->max_value;

+    }

+

+    if(fmin == tmin && fmax == tmax) {

+        if (remainder_return)

+            *remainder_return = remainder;

+        return coord;

+    }

+

+    if(fmax == fmin) { /* avoid division by 0 */

+        if (remainder_return)

+            *remainder_return = 0.0;

+        return 0;

+    }

+

+    value = (coord + remainder - fmin) * (tmax - tmin) / (fmax - fmin) + tmin;

+    coord_return = lroundf(value);

+    if (remainder_return)

+        *remainder_return = value - coord_return;

+    return coord_return;

+}

+

+/**

+ * Update all coordinates when changing to a different SD

+ * to ensure that relative reporting will work as expected

+ * without loss of precision.

+ *

+ * pDev->last.valuators will be in absolute device coordinates after this

+ * function.

+ */

+static void

+updateSlaveDeviceCoords(DeviceIntPtr master, DeviceIntPtr pDev)

+{

+    ScreenPtr scr = miPointerGetScreen(pDev);

+    int i;

+    DeviceIntPtr lastSlave;

+

+    /* master->last.valuators[0]/[1] is in screen coords and the actual

+     * position of the pointer */

+    pDev->last.valuators[0] = master->last.valuators[0];

+    pDev->last.valuators[1] = master->last.valuators[1];

+

+    if (!pDev->valuator)

+        return;

+

+    /* scale back to device coordinates */

+    if(pDev->valuator->numAxes > 0)

+        pDev->last.valuators[0] = rescaleValuatorAxis(pDev->last.valuators[0], pDev->last.remainder[0],

+                        &pDev->last.remainder[0], NULL, pDev->valuator->axes + 0, scr->width);

+    if(pDev->valuator->numAxes > 1)

+        pDev->last.valuators[1] = rescaleValuatorAxis(pDev->last.valuators[1], pDev->last.remainder[1],

+                        &pDev->last.remainder[1], NULL, pDev->valuator->axes + 1, scr->height);

+

+    /* calculate the other axis as well based on info from the old

+     * slave-device. If the old slave had less axes than this one,

+     * last.valuators is reset to 0.

+     */

+    if ((lastSlave = master->last.slave) && lastSlave->valuator) {

+        for (i = 2; i < pDev->valuator->numAxes; i++) {

+            if (i >= lastSlave->valuator->numAxes)

+                pDev->last.valuators[i] = 0;

+            else

+                pDev->last.valuators[i] =

+                    rescaleValuatorAxis(pDev->last.valuators[i],

+                            pDev->last.remainder[i],

+                            &pDev->last.remainder[i],

+                            lastSlave->valuator->axes + i,

+                            pDev->valuator->axes + i, 0);

+        }

+    }

+

+}

+

+/**

+ * Allocate the motion history buffer.

+ */

+void

+AllocateMotionHistory(DeviceIntPtr pDev)

+{

+    int size;

+    free(pDev->valuator->motion);

+

+    if (pDev->valuator->numMotionEvents < 1)

+        return;

+

+    /* An MD must have a motion history size large enough to keep all

+     * potential valuators, plus the respective range of the valuators.

+     * 3 * INT32 for (min_val, max_val, curr_val))

+     */

+    if (IsMaster(pDev))

+        size = sizeof(INT32) * 3 * MAX_VALUATORS;

+    else {

+        ValuatorClassPtr v = pDev->valuator;

+        int numAxes;

+        /* XI1 doesn't understand mixed mode devices */

+        for (numAxes = 0; numAxes < v->numAxes; numAxes++)

+            if (valuator_get_mode(pDev, numAxes) != valuator_get_mode(pDev, 0))

+                break;

+        size = sizeof(INT32) * numAxes;

+    }

+

+    size += sizeof(Time);

+

+    pDev->valuator->motion = calloc(pDev->valuator->numMotionEvents, size);

+    pDev->valuator->first_motion = 0;

+    pDev->valuator->last_motion = 0;

+    if (!pDev->valuator->motion)

+        ErrorF("[dix] %s: Failed to alloc motion history (%d bytes).\n",

+                pDev->name, size * pDev->valuator->numMotionEvents);

+}

+

+/**

+ * Dump the motion history between start and stop into the supplied buffer.

+ * Only records the event for a given screen in theory, but in practice, we

+ * sort of ignore this.

+ *

+ * If core is set, we only generate x/y, in INT16, scaled to screen coords.

+ */

+int

+GetMotionHistory(DeviceIntPtr pDev, xTimecoord **buff, unsigned long start,

+                 unsigned long stop, ScreenPtr pScreen, BOOL core)

+{

+    char *ibuff = NULL, *obuff;

+    int i = 0, ret = 0;

+    int j, coord;

+    Time current;

+    /* The size of a single motion event. */

+    int size;

+    int dflt;

+    AxisInfo from, *to; /* for scaling */

+    INT32 *ocbuf, *icbuf; /* pointer to coordinates for copying */

+    INT16 *corebuf;

+    AxisInfo core_axis = {0};

+

+    if (!pDev->valuator || !pDev->valuator->numMotionEvents)

+        return 0;

+

+    if (core && !pScreen)

+        return 0;

+

+    if (IsMaster(pDev))

+        size = (sizeof(INT32) * 3 * MAX_VALUATORS) + sizeof(Time);

+    else

+        size = (sizeof(INT32) * pDev->valuator->numAxes) + sizeof(Time);

+

+    *buff = malloc(size * pDev->valuator->numMotionEvents);

+    if (!(*buff))

+        return 0;

+    obuff = (char *)*buff;

+

+    for (i = pDev->valuator->first_motion;

+         i != pDev->valuator->last_motion;

+         i = (i + 1) % pDev->valuator->numMotionEvents) {

+        /* We index the input buffer by which element we're accessing, which

+         * is not monotonic, and the output buffer by how many events we've

+         * written so far. */

+        ibuff = (char *) pDev->valuator->motion + (i * size);

+        memcpy(&current, ibuff, sizeof(Time));

+

+        if (current > stop) {

+            return ret;

+        }

+        else if (current >= start) {

+            if (core)

+            {

+                memcpy(obuff, ibuff, sizeof(Time)); /* copy timestamp */

+

+                icbuf = (INT32*)(ibuff + sizeof(Time));

+                corebuf = (INT16*)(obuff + sizeof(Time));

+

+                /* fetch x coordinate + range */

+                memcpy(&from.min_value, icbuf++, sizeof(INT32));

+                memcpy(&from.max_value, icbuf++, sizeof(INT32));

+                memcpy(&coord, icbuf++, sizeof(INT32));

+

+                /* scale to screen coords */

+                to = &core_axis;

+                to->max_value = pScreen->width;

+                coord = rescaleValuatorAxis(coord, 0.0, NULL, &from, to, pScreen->width);

+

+                memcpy(corebuf, &coord, sizeof(INT16));

+                corebuf++;

+

+                /* fetch y coordinate + range */

+                memcpy(&from.min_value, icbuf++, sizeof(INT32));

+                memcpy(&from.max_value, icbuf++, sizeof(INT32));

+                memcpy(&coord, icbuf++, sizeof(INT32));

+

+                to->max_value = pScreen->height;

+                coord = rescaleValuatorAxis(coord, 0.0, NULL, &from, to, pScreen->height);

+                memcpy(corebuf, &coord, sizeof(INT16));

+

+            } else if (IsMaster(pDev))

+            {

+                memcpy(obuff, ibuff, sizeof(Time)); /* copy timestamp */

+

+                ocbuf = (INT32*)(obuff + sizeof(Time));

+                icbuf = (INT32*)(ibuff + sizeof(Time));

+                for (j = 0; j < MAX_VALUATORS; j++)

+                {

+                    if (j >= pDev->valuator->numAxes)

+                        break;

+

+                    /* fetch min/max/coordinate */

+                    memcpy(&from.min_value, icbuf++, sizeof(INT32));

+                    memcpy(&from.max_value, icbuf++, sizeof(INT32));

+                    memcpy(&coord, icbuf++, sizeof(INT32));

+

+                    to = (j < pDev->valuator->numAxes) ? &pDev->valuator->axes[j] : NULL;

+

+                    /* x/y scaled to screen if no range is present */

+                    if (j == 0 && (from.max_value < from.min_value))

+                        from.max_value = pScreen->width;

+                    else if (j == 1 && (from.max_value < from.min_value))

+                        from.max_value = pScreen->height;

+

+                    if (j == 0 && (to->max_value < to->min_value))

+                        dflt = pScreen->width;

+                    else if (j == 1 && (to->max_value < to->min_value))

+                        dflt = pScreen->height;

+                    else

+                        dflt = 0;

+

+                    /* scale from stored range into current range */

+                    coord = rescaleValuatorAxis(coord, 0.0, NULL, &from, to, 0);

+                    memcpy(ocbuf, &coord, sizeof(INT32));

+                    ocbuf++;

+                }

+            } else

+                memcpy(obuff, ibuff, size);

+

+            /* don't advance by size here. size may be different to the

+             * actually written size if the MD has less valuators than MAX */

+            if (core)

+                obuff += sizeof(INT32) + sizeof(Time);

+            else

+                obuff += (sizeof(INT32) * pDev->valuator->numAxes) + sizeof(Time);

+            ret++;

+        }

+    }

+

+    return ret;

+}

+

+

+/**

+ * Update the motion history for a specific device, with the list of

+ * valuators.

+ *

+ * Layout of the history buffer:

+ *   for SDs: [time] [val0] [val1] ... [valn]

+ *   for MDs: [time] [min_val0] [max_val0] [val0] [min_val1] ... [valn]

+ *

+ * For events that have some valuators unset:

+ *      min_val == max_val == val == 0.

+ */

+static void

+updateMotionHistory(DeviceIntPtr pDev, CARD32 ms, ValuatorMask *mask,

+                    int *valuators)

+{

+    char *buff = (char *) pDev->valuator->motion;

+    ValuatorClassPtr v;

+    int i;

+

+    if (!pDev->valuator->numMotionEvents)

+        return;

+

+    v = pDev->valuator;

+    if (IsMaster(pDev))

+    {

+        buff += ((sizeof(INT32) * 3 * MAX_VALUATORS) + sizeof(CARD32)) *

+                v->last_motion;

+

+        memcpy(buff, &ms, sizeof(Time));

+        buff += sizeof(Time);

+

+        memset(buff, 0, sizeof(INT32) * 3 * MAX_VALUATORS);

+

+        for (i = 0; i < v->numAxes; i++)

+        {

+            /* XI1 doesn't support mixed mode devices */

+            if (valuator_get_mode(pDev, i) != valuator_get_mode(pDev, 0))

+                break;

+            if (valuator_mask_size(mask) <= i || !valuator_mask_isset(mask, i))

+            {

+                buff += 3 * sizeof(INT32);

+                continue;

+            }

+            memcpy(buff, &v->axes[i].min_value, sizeof(INT32));

+            buff += sizeof(INT32);

+            memcpy(buff, &v->axes[i].max_value, sizeof(INT32));

+            buff += sizeof(INT32);

+            memcpy(buff, &valuators[i], sizeof(INT32));

+            buff += sizeof(INT32);

+        }

+    } else

+    {

+

+        buff += ((sizeof(INT32) * pDev->valuator->numAxes) + sizeof(CARD32)) *

+            pDev->valuator->last_motion;

+

+        memcpy(buff, &ms, sizeof(Time));

+        buff += sizeof(Time);

+

+        memset(buff, 0, sizeof(INT32) * pDev->valuator->numAxes);

+

+        for (i = 0; i < MAX_VALUATORS; i++)

+        {

+            if (valuator_mask_size(mask) <= i || !valuator_mask_isset(mask, i))

+            {

+                buff += sizeof(INT32);

+                continue;

+            }

+            memcpy(buff, &valuators[i], sizeof(INT32));

+            buff += sizeof(INT32);

+        }

+    }

+

+    pDev->valuator->last_motion = (pDev->valuator->last_motion + 1) %

+        pDev->valuator->numMotionEvents;

+    /* If we're wrapping around, just keep the circular buffer going. */

+    if (pDev->valuator->first_motion == pDev->valuator->last_motion)

+        pDev->valuator->first_motion = (pDev->valuator->first_motion + 1) %

+                                       pDev->valuator->numMotionEvents;

+

+    return;

+}

+

+

+/**

+ * Returns the maximum number of events GetKeyboardEvents,

+ * GetKeyboardValuatorEvents, and GetPointerEvents will ever return.

+ *

+ * This MUST be absolutely constant, from init until exit.

+ */

+int

+GetMaximumEventsNum(void) {

+    /* One raw event

+     * One device event

+     * One possible device changed event

+     */

+    return 3;

+}

+

+

+/**

+ * Clip an axis to its bounds, which are declared in the call to

+ * InitValuatorAxisClassStruct.

+ */

+static void

+clipAxis(DeviceIntPtr pDev, int axisNum, int *val)

+{

+    AxisInfoPtr axis;

+

+    if (axisNum >= pDev->valuator->numAxes)

+        return;

+

+    axis = pDev->valuator->axes + axisNum;

+

+    /* If a value range is defined, clip. If not, do nothing */

+    if (axis->max_value <= axis->min_value)

+        return;

+

+    if (*val < axis->min_value)

+        *val = axis->min_value;

+    if (*val > axis->max_value)

+        *val = axis->max_value;

+}

+

+/**

+ * Clip every axis in the list of valuators to its bounds.

+ */

+static void

+clipValuators(DeviceIntPtr pDev, ValuatorMask *mask)

+{

+    int i;

+

+    for (i = 0; i < valuator_mask_size(mask); i++)

+        if (valuator_mask_isset(mask, i))

+        {

+            int val = valuator_mask_get(mask, i);

+            clipAxis(pDev, i, &val);

+            valuator_mask_set(mask, i, val);

+        }

+}

+

+/**

+ * Create the DCCE event (does not update the master's device state yet, this

+ * is done in the event processing).

+ * Pull in the coordinates from the MD if necessary.

+ *

+ * @param events Pointer to a pre-allocated event list.

+ * @param dev The slave device that generated an event.

+ * @param type Either DEVCHANGE_POINTER_EVENT and/or DEVCHANGE_KEYBOARD_EVENT

+ * @param num_events The current number of events, returns the number of

+ *        events if a DCCE was generated.

+ * @return The updated @events pointer.

+ */

+EventListPtr

+UpdateFromMaster(EventListPtr events, DeviceIntPtr dev, int type, int *num_events)

+{

+    DeviceIntPtr master;

+

+    master = GetMaster(dev, (type & DEVCHANGE_POINTER_EVENT) ?  MASTER_POINTER : MASTER_KEYBOARD);

+

+    if (master && master->last.slave != dev)

+    {

+        CreateClassesChangedEvent(events, master, dev, type);

+        if (IsPointerDevice(master))

+        {

+            updateSlaveDeviceCoords(master, dev);

+            master->last.numValuators = dev->last.numValuators;

+        }

+        master->last.slave = dev;

+        (*num_events)++;

+        events++;

+    }

+    return events;

+}

+

+/**

+ * Move the device's pointer to the position given in the valuators.

+ *

+ * @param dev The device which's pointer is to be moved.

+ * @param x Returns the x position of the pointer after the move.

+ * @param y Returns the y position of the pointer after the move.

+ * @param mask Bit mask of valid valuators.

+ * @param valuators Valuator data for each axis between @first and

+ *        @first+@num.

+ */

+static void

+moveAbsolute(DeviceIntPtr dev, int *x, int *y, ValuatorMask *mask)

+{

+    int i;

+

+    if (valuator_mask_isset(mask, 0))

+        *x = valuator_mask_get(mask, 0);

+    else

+        *x = dev->last.valuators[0];

+

+    if (valuator_mask_isset(mask, 1))

+        *y = valuator_mask_get(mask, 1);

+    else

+        *y = dev->last.valuators[1];

+

+    clipAxis(dev, 0, x);

+    clipAxis(dev, 1, y);

+

+    for (i = 2; i < valuator_mask_size(mask); i++)

+    {

+        if (valuator_mask_isset(mask, i))

+        {

+            dev->last.valuators[i] = valuator_mask_get(mask, i);

+            clipAxis(dev, i, &dev->last.valuators[i]);

+        }

+    }

+}

+

+/**

+ * Move the device's pointer by the values given in @valuators.

+ *

+ * @param dev The device which's pointer is to be moved.

+ * @param x Returns the x position of the pointer after the move.

+ * @param y Returns the y position of the pointer after the move.

+ * @param mask Bit mask of valid valuators.

+ * @param valuators Valuator data for each axis between @first and

+ *        @first+@num.

+ */

+static void

+moveRelative(DeviceIntPtr dev, int *x, int *y, ValuatorMask *mask)

+{

+    int i;

+

+    *x = dev->last.valuators[0];

+    *y = dev->last.valuators[1];

+

+    if (valuator_mask_isset(mask, 0))

+        *x += valuator_mask_get(mask, 0);

+

+    if (valuator_mask_isset(mask, 1))

+        *y += valuator_mask_get(mask, 1);

+

+    /* if attached, clip both x and y to the defined limits (usually

+     * co-ord space limit). If it is attached, we need x/y to go over the

+     * limits to be able to change screens. */

+    if(dev->valuator && IsMaster(dev) || !IsFloating(dev)) {

+        if (valuator_get_mode(dev, 0) == Absolute)

+            clipAxis(dev, 0, x);

+        if (valuator_get_mode(dev, 1) == Absolute)

+            clipAxis(dev, 1, y);

+    }

+

+    /* calc other axes, clip, drop back into valuators */

+    for (i = 2; i < valuator_mask_size(mask); i++)

+    {

+        if (valuator_mask_isset(mask, i))

+        {

+            dev->last.valuators[i] += valuator_mask_get(mask, i);

+            if (valuator_get_mode(dev, i) == Absolute)

+                clipAxis(dev, i, &dev->last.valuators[i]);

+            valuator_mask_set(mask, i, dev->last.valuators[i]);

+        }

+    }

+}

+

+/**

+ * Accelerate the data in valuators based on the device's acceleration scheme.

+ *

+ * @param dev The device which's pointer is to be moved.

+ * @param first The first valuator in @valuators

+ * @param num Total number of valuators in @valuators.

+ * @param valuators Valuator data for each axis between @first and

+ *        @first+@num.

+ * @param ms Current time.

+ */

+static void

+accelPointer(DeviceIntPtr dev, int first, int num, int *valuators, CARD32 ms)

+{

+    if (dev->valuator->accelScheme.AccelSchemeProc)

+        dev->valuator->accelScheme.AccelSchemeProc(dev, first, num, valuators, ms);

+}

+

+/**

+ * If we have HW cursors, this actually moves the visible sprite. If not, we

+ * just do all the screen crossing, etc.

+ *

+ * We scale from device to screen coordinates here, call

+ * miPointerSetPosition() and then scale back into device coordinates (if

+ * needed). miPSP will change x/y if the screen was crossed.

+ *

+ * @param dev The device to be moved.

+ * @param x Pointer to current x-axis value, may be modified.

+ * @param y Pointer to current y-axis value, may be modified.

+ * @param x_frac Fractional part of current x-axis value, may be modified.

+ * @param y_frac Fractional part of current y-axis value, may be modified.

+ * @param scr Screen the device's sprite is currently on.

+ * @param screenx Screen x coordinate the sprite is on after the update.

+ * @param screeny Screen y coordinate the sprite is on after the update.

+ * @param screenx_frac Fractional part of screen x coordinate, as above.

+ * @param screeny_frac Fractional part of screen y coordinate, as above.

+ */

+static void

+positionSprite(DeviceIntPtr dev, int *x, int *y, float x_frac, float y_frac,

+               ScreenPtr scr, int *screenx, int *screeny, float *screenx_frac, float *screeny_frac)

+{

+    int old_screenx, old_screeny;

+

+    /* scale x&y to screen */

+    if (dev->valuator && dev->valuator->numAxes > 0) {

+        *screenx = rescaleValuatorAxis(*x, x_frac, screenx_frac,

+                dev->valuator->axes + 0, NULL, scr->width);

+    } else {

+        *screenx = dev->last.valuators[0];

+        *screenx_frac = dev->last.remainder[0];

+    }

+

+    if (dev->valuator && dev->valuator->numAxes > 1) {

+        *screeny = rescaleValuatorAxis(*y, y_frac, screeny_frac,

+                dev->valuator->axes + 1, NULL, scr->height);

+    } else {

+        *screeny = dev->last.valuators[1];

+        *screeny_frac = dev->last.remainder[1];

+    }

+

+    /* Hit the left screen edge? */

+    if (*screenx <= 0 && *screenx_frac < 0.0f)

+    {

+        *screenx_frac = 0.0f;

+        x_frac = 0.0f;

+    }

+    if (*screeny <= 0 && *screeny_frac < 0.0f)

+    {

+        *screeny_frac = 0.0f;

+        y_frac = 0.0f;

+    }

+

+

+    old_screenx = *screenx;

+    old_screeny = *screeny;

+    /* This takes care of crossing screens for us, as well as clipping

+     * to the current screen. */

+    miPointerSetPosition(dev, screenx, screeny);

+

+    if(!IsMaster(dev) || !IsFloating(dev)) {

+        DeviceIntPtr master = GetMaster(dev, MASTER_POINTER);

+        master->last.valuators[0] = *screenx;

+        master->last.valuators[1] = *screeny;

+        master->last.remainder[0] = *screenx_frac;

+        master->last.remainder[1] = *screeny_frac;

+    }

+

+    if (dev->valuator)

+    {

+        /* Crossed screen? Scale back to device coordiantes */

+        if(*screenx != old_screenx)

+        {

+            scr = miPointerGetScreen(dev);

+            *x = rescaleValuatorAxis(*screenx, *screenx_frac, &x_frac, NULL,

+                                    dev->valuator->axes + 0, scr->width);

+        }

+        if(*screeny != old_screeny)

+        {

+            scr = miPointerGetScreen(dev);

+            *y = rescaleValuatorAxis(*screeny, *screeny_frac, &y_frac, NULL,

+                                     dev->valuator->axes + 1, scr->height);

+        }

+    }

+

+    /* dropy x/y (device coordinates) back into valuators for next event */

+    dev->last.valuators[0] = *x;

+    dev->last.valuators[1] = *y;

+    dev->last.remainder[0] = x_frac;

+    dev->last.remainder[1] = y_frac;

+}

+

+/**

+ * Update the motion history for the device and (if appropriate) for its

+ * master device.

+ * @param dev Slave device to update.

+ * @param mask Bit mask of valid valuators to append to history.

+ * @param num Total number of valuators to append to history.

+ * @param ms Current time

+ */

+static void

+updateHistory(DeviceIntPtr dev, ValuatorMask *mask, CARD32 ms)

+{

+    if (!dev->valuator)

+        return;

+

+    updateMotionHistory(dev, ms, mask, dev->last.valuators);

+    if(!IsMaster(dev) || !IsFloating(dev))

+    {

+        DeviceIntPtr master = GetMaster(dev, MASTER_POINTER);

+        updateMotionHistory(master, ms, mask, dev->last.valuators);

+    }

+}

+

+/**

+ * Convenience wrapper around GetKeyboardValuatorEvents, that takes no

+ * valuators.

+ */

+int

+GetKeyboardEvents(EventList *events, DeviceIntPtr pDev, int type, int key_code) {

+    ValuatorMask mask;

+

+    valuator_mask_zero(&mask);

+    return GetKeyboardValuatorEvents(events, pDev, type, key_code, &mask);

+}

+

+

+/**

+ * Returns a set of InternalEvents for KeyPress/KeyRelease, optionally

+ * also with valuator events.

+ *

+ * events is not NULL-terminated; the return value is the number of events.

+ * The DDX is responsible for allocating the event structure in the first

+ * place via GetMaximumEventsNum(), and for freeing it.

+ */

+int

+GetKeyboardValuatorEvents(EventList *events, DeviceIntPtr pDev, int type,

+                          int key_code, const ValuatorMask *mask_in) {

+    int num_events = 0;

+    CARD32 ms = 0;

+    DeviceEvent *event;

+    RawDeviceEvent *raw;

+    ValuatorMask mask;

+

+    /* refuse events from disabled devices */

+    if (!pDev || !pDev->enabled)

+        return 0;

+

+    if (!events ||!pDev->key || !pDev->focus || !pDev->kbdfeed ||

+       (type != KeyPress && type != KeyRelease) ||

+       (key_code < 8 || key_code > 255))

+        return 0;

+

+    num_events = 1;

+

+    events = UpdateFromMaster(events, pDev, DEVCHANGE_KEYBOARD_EVENT, &num_events);

+

+    /* Handle core repeating, via press/release/press/release. */

+    if (type == KeyPress && key_is_down(pDev, key_code, KEY_POSTED)) {

+        /* If autorepeating is disabled either globally or just for that key,

+         * or we have a modifier, don't generate a repeat event. */

+        if (!pDev->kbdfeed->ctrl.autoRepeat ||

+            !key_autorepeats(pDev, key_code) ||

+            pDev->key->xkbInfo->desc->map->modmap[key_code])

+            return 0;

+    }

+

+    ms = GetTimeInMillis();

+

+    raw = (RawDeviceEvent*)events->event;

+    events++;

+    num_events++;

+

+    valuator_mask_copy(&mask, mask_in);

+

+    init_raw(pDev, raw, ms, type, key_code);

+    set_raw_valuators(raw, &mask, raw->valuators.data_raw);

+

+    clipValuators(pDev, &mask);

+

+    set_raw_valuators(raw, &mask, raw->valuators.data);

+

+    event = (DeviceEvent*) events->event;

+    init_event(pDev, event, ms);

+    event->detail.key = key_code;

+

+    if (type == KeyPress) {

+        event->type = ET_KeyPress;

+	set_key_down(pDev, key_code, KEY_POSTED);

+    }

+    else if (type == KeyRelease) {

+        event->type = ET_KeyRelease;

+	set_key_up(pDev, key_code, KEY_POSTED);

+    }

+

+    clipValuators(pDev, &mask);

+

+    set_valuators(pDev, event, &mask);

+

+    return num_events;

+}

+

+/**

+ * Initialize an event list and fill with 32 byte sized events.

+ * This event list is to be passed into GetPointerEvents() and

+ * GetKeyboardEvents().

+ *

+ * @param num_events Number of elements in list.

+ */

+EventListPtr

+InitEventList(int num_events)

+{

+    EventListPtr events;

+    int i;

+

+    events = (EventListPtr)calloc(num_events, sizeof(EventList));

+    if (!events)

+        return NULL;

+

+    for (i = 0; i < num_events; i++)

+    {

+        events[i].evlen = sizeof(InternalEvent);

+        events[i].event = calloc(1, sizeof(InternalEvent));

+        if (!events[i].event)

+        {

+            /* rollback */

+            while(i--)

+                free(events[i].event);

+            free(events);

+            events = NULL;

+            break;

+        }

+    }

+

+    return events;

+}

+

+/**

+ * Free an event list.

+ *

+ * @param list The list to be freed.

+ * @param num_events Number of elements in list.

+ */

+void

+FreeEventList(EventListPtr list, int num_events)

+{

+    if (!list)

+        return;

+    while(num_events--)

+        free(list[num_events].event);

+    free(list);

+}

+

+static void

+transformAbsolute(DeviceIntPtr dev, ValuatorMask *mask)

+{

+    struct pixman_f_vector p;

+

+    /* p' = M * p in homogeneous coordinates */

+    p.v[0] = (valuator_mask_isset(mask, 0) ? valuator_mask_get(mask, 0) :

+              dev->last.valuators[0]);

+    p.v[1] = (valuator_mask_isset(mask, 1) ? valuator_mask_get(mask, 1) :

+              dev->last.valuators[1]);

+    p.v[2] = 1.0;

+

+    pixman_f_transform_point(&dev->transform, &p);

+

+    if (lround(p.v[0]) != dev->last.valuators[0])

+        valuator_mask_set(mask, 0, lround(p.v[0]));

+    if (lround(p.v[1]) != dev->last.valuators[1])

+        valuator_mask_set(mask, 1, lround(p.v[1]));

+}

+

+/**

+ * Generate a series of InternalEvents (filled into the EventList)

+ * representing pointer motion, or button presses.

+ *

+ * events is not NULL-terminated; the return value is the number of events.

+ * The DDX is responsible for allocating the event structure in the first

+ * place via InitEventList() and GetMaximumEventsNum(), and for freeing it.

+ *

+ * In the generated events rootX/Y will be in absolute screen coords and

+ * the valuator information in the absolute or relative device coords.

+ *

+ * last.valuators[x] of the device is always in absolute device coords.

+ * last.valuators[x] of the master device is in absolute screen coords.

+ *

+ * master->last.valuators[x] for x > 2 is undefined.

+ */

+int

+GetPointerEvents(EventList *events, DeviceIntPtr pDev, int type, int buttons,

+                 int flags, const ValuatorMask *mask_in) {

+    int num_events = 1;

+    CARD32 ms;

+    DeviceEvent *event;

+    RawDeviceEvent    *raw;

+    int x = 0, y = 0, /* device coords */

+        cx, cy; /* only screen coordinates */

+    float x_frac = 0.0, y_frac = 0.0, cx_frac, cy_frac;

+    ScreenPtr scr = miPointerGetScreen(pDev);

+    ValuatorMask mask;

+

+    /* refuse events from disabled devices */

+    if (!pDev->enabled)

+        return 0;

+

+    if (!scr)

+        return 0;

+

+    switch (type)

+    {

+        case MotionNotify:

+            if (!mask_in || valuator_mask_num_valuators(mask_in) <= 0)

+                return 0;

+            break;

+        case ButtonPress:

+        case ButtonRelease:

+            if (!pDev->button || !buttons)

+                return 0;

+            break;

+        default:

+            return 0;

+    }

+

+    ms = GetTimeInMillis(); /* before pointer update to help precision */

+

+    events = UpdateFromMaster(events, pDev, DEVCHANGE_POINTER_EVENT, &num_events);

+

+    raw = (RawDeviceEvent*)events->event;

+    events++;

+    num_events++;

+

+    valuator_mask_copy(&mask, mask_in);

+

+    init_raw(pDev, raw, ms, type, buttons);

+    set_raw_valuators(raw, &mask, raw->valuators.data_raw);

+

+    if (flags & POINTER_ABSOLUTE)

+    {

+        if (flags & POINTER_SCREEN) /* valuators are in screen coords */

+        {

+            int scaled;

+

+            if (valuator_mask_isset(&mask, 0))

+            {

+                scaled = rescaleValuatorAxis(valuator_mask_get(&mask, 0),

+                                             0.0, &x_frac, NULL,

+                                             pDev->valuator->axes + 0,

+                                             scr->width);

+                valuator_mask_set(&mask, 0, scaled);

+            }

+            if (valuator_mask_isset(&mask, 1))

+            {

+                scaled = rescaleValuatorAxis(valuator_mask_get(&mask, 1),

+                                             0.0, &y_frac, NULL,

+                                             pDev->valuator->axes + 1,

+                                             scr->height);

+                valuator_mask_set(&mask, 1, scaled);

+            }

+        }

+

+        transformAbsolute(pDev, &mask);

+        moveAbsolute(pDev, &x, &y, &mask);

+    } else {

+        if (flags & POINTER_ACCELERATE) {

+            /* FIXME: Pointer acceleration only requires X and Y values. This

+             * should be converted to masked valuators. */

+            int vals[2];

+            vals[0] = valuator_mask_isset(&mask, 0) ?

+                      valuator_mask_get(&mask, 0) : 0;

+            vals[1] = valuator_mask_isset(&mask, 1) ?

+                      valuator_mask_get(&mask, 1) : 0;

+            accelPointer(pDev, 0, 2, vals, ms);

+

+            if (valuator_mask_isset(&mask, 0))

+                valuator_mask_set(&mask, 0, vals[0]);

+            if (valuator_mask_isset(&mask, 1))

+                valuator_mask_set(&mask, 1, vals[1]);

+

+            /* The pointer acceleration code modifies the fractional part

+             * in-place, so we need to extract this information first */

+            x_frac = pDev->last.remainder[0];

+            y_frac = pDev->last.remainder[1];

+        }

+        moveRelative(pDev, &x, &y, &mask);

+    }

+

+    set_raw_valuators(raw, &mask, raw->valuators.data);

+

+    positionSprite(pDev, &x, &y, x_frac, y_frac, scr, &cx, &cy, &cx_frac, &cy_frac);

+    updateHistory(pDev, &mask, ms);

+

+    /* Update the valuators with the true value sent to the client*/

+    if (valuator_mask_isset(&mask, 0))

+        valuator_mask_set(&mask, 0, x);

+    if (valuator_mask_isset(&mask, 1))

+        valuator_mask_set(&mask, 1, y);

+

+    clipValuators(pDev, &mask);

+

+    event = (DeviceEvent*) events->event;

+    init_event(pDev, event, ms);

+

+    if (type == MotionNotify) {

+        event->type = ET_Motion;

+        event->detail.button = 0;

+    }

+    else {

+        if (type == ButtonPress) {

+            event->type = ET_ButtonPress;

+            set_button_down(pDev, buttons, BUTTON_POSTED);

+        }

+        else if (type == ButtonRelease) {

+            event->type = ET_ButtonRelease;

+            set_button_up(pDev, buttons, BUTTON_POSTED);

+        }

+        event->detail.button = buttons;

+    }

+

+    event->root_x = cx; /* root_x/y always in screen coords */

+    event->root_y = cy;

+    event->root_x_frac = cx_frac;

+    event->root_y_frac = cy_frac;

+

+    set_valuators(pDev, event, &mask);

+

+    return num_events;

+}

+

+

+/**

+ * Generate ProximityIn/ProximityOut InternalEvents, accompanied by

+ * valuators.

+ *

+ * events is not NULL-terminated; the return value is the number of events.

+ * The DDX is responsible for allocating the event structure in the first

+ * place via GetMaximumEventsNum(), and for freeing it.

+ */

+int

+GetProximityEvents(EventList *events, DeviceIntPtr pDev, int type, const ValuatorMask *mask_in)

+{

+    int num_events = 1, i;

+    DeviceEvent *event;

+    ValuatorMask mask;

+

+    /* refuse events from disabled devices */

+    if (!pDev->enabled)

+        return 0;

+

+    /* Sanity checks. */

+    if ((type != ProximityIn && type != ProximityOut) || !mask_in)

+        return 0;

+    if (!pDev->valuator)

+        return 0;

+

+    valuator_mask_copy(&mask, mask_in);

+

+    /* ignore relative axes for proximity. */

+    for (i = 0; i < valuator_mask_size(&mask); i++)

+    {

+        if (valuator_mask_isset(&mask, i) &&

+            valuator_get_mode(pDev, i) == Relative)

+            valuator_mask_unset(&mask, i);

+    }

+

+    /* FIXME: posting proximity events with relative valuators only results

+     * in an empty event, EventToXI() will fail to convert → no event sent

+     * to client. */

+

+    events = UpdateFromMaster(events, pDev, DEVCHANGE_POINTER_EVENT, &num_events);

+

+    event = (DeviceEvent *) events->event;

+    init_event(pDev, event, GetTimeInMillis());

+    event->type = (type == ProximityIn) ? ET_ProximityIn : ET_ProximityOut;

+

+    clipValuators(pDev, &mask);

+

+    set_valuators(pDev, event, &mask);

+

+    return num_events;

+}

+

+/**

+ * Synthesize a single motion event for the core pointer.

+ *

+ * Used in cursor functions, e.g. when cursor confinement changes, and we need

+ * to shift the pointer to get it inside the new bounds.

+ */

+void

+PostSyntheticMotion(DeviceIntPtr pDev,

+                    int x,

+                    int y,

+                    int screen,

+                    unsigned long time)

+{

+    DeviceEvent ev;

+

+#ifdef PANORAMIX

+    /* Translate back to the sprite screen since processInputProc

+       will translate from sprite screen to screen 0 upon reentry

+       to the DIX layer. */

+    if (!noPanoramiXExtension) {

+        x += screenInfo.screens[0]->x - screenInfo.screens[screen]->x;

+        y += screenInfo.screens[0]->y - screenInfo.screens[screen]->y;

+    }

+#endif

+

+    memset(&ev, 0, sizeof(DeviceEvent));

+    init_event(pDev, &ev, time);

+    ev.root_x = x;

+    ev.root_y = y;

+    ev.type = ET_Motion;

+    ev.time = time;

+

+    /* FIXME: MD/SD considerations? */

+    (*pDev->public.processInputProc)((InternalEvent*)&ev, pDev);

+}

diff --git a/xorg-server/dix/inpututils.c b/xorg-server/dix/inpututils.c
index 4c6112b7f..b61cf4831 100644
--- a/xorg-server/dix/inpututils.c
+++ b/xorg-server/dix/inpututils.c
@@ -1,558 +1,558 @@
-/*
- * Copyright © 2008 Daniel Stone
- *
- * 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 (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 NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS 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.
- *
- * Author: Daniel Stone <daniel@fooishbar.org>
- */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include "dix-config.h"
-#endif
-
-#include "exevents.h"
-#include "exglobals.h"
-#include "misc.h"
-#include "input.h"
-#include "inputstr.h"
-#include "xace.h"
-#include "xkbsrv.h"
-#include "xkbstr.h"
-#include "inpututils.h"
-
-/* Check if a button map change is okay with the device.
- * Returns -1 for BadValue, as it collides with MappingBusy. */
-static int
-check_butmap_change(DeviceIntPtr dev, CARD8 *map, int len, CARD32 *errval_out,
-                    ClientPtr client)
-{
-    int i, ret;
-
-    if (!dev || !dev->button)
-    {
-        client->errorValue = (dev) ? dev->id : 0;
-        return BadDevice;
-    }
-
-    ret = XaceHook(XACE_DEVICE_ACCESS, client, dev, DixManageAccess);
-    if (ret != Success)
-    {
-        client->errorValue = dev->id;
-        return ret;
-    }
-
-    for (i = 0; i < len; i++) {
-        if (dev->button->map[i + 1] != map[i] && dev->button->down[i + 1])
-            return MappingBusy;
-    }
-
-    return Success;
-}
-
-static void
-do_butmap_change(DeviceIntPtr dev, CARD8 *map, int len, ClientPtr client)
-{
-    int i;
-    xEvent core_mn;
-    deviceMappingNotify xi_mn;
-
-    /* The map in ButtonClassRec refers to button numbers, whereas the
-     * protocol is zero-indexed.  Sigh. */
-    memcpy(&(dev->button->map[1]), map, len);
-
-    core_mn.u.u.type = MappingNotify;
-    core_mn.u.mappingNotify.request = MappingPointer;
-
-    /* 0 is the server client. */
-    for (i = 1; i < currentMaxClients; i++) {
-        /* Don't send irrelevant events to naïve clients. */
-        if (!clients[i] || clients[i]->clientState != ClientStateRunning)
-            continue;
-
-        if (!XIShouldNotify(clients[i], dev))
-            continue;
-
-        WriteEventsToClient(clients[i], 1, &core_mn);
-    }
-
-    xi_mn.type = DeviceMappingNotify;
-    xi_mn.request = MappingPointer;
-    xi_mn.deviceid = dev->id;
-    xi_mn.time = GetTimeInMillis();
-
-    SendEventToAllWindows(dev, DeviceMappingNotifyMask, (xEvent *) &xi_mn, 1);
-}
-
-/*
- * Does what it says on the box, both for core and Xi.
- *
- * Faithfully reports any errors encountered while trying to apply the map
- * to the requested device, faithfully ignores any errors encountered while
- * trying to apply the map to its master/slaves.
- */
-int
-ApplyPointerMapping(DeviceIntPtr dev, CARD8 *map, int len, ClientPtr client)
-{
-    int ret;
-
-    /* If we can't perform the change on the requested device, bail out. */
-    ret = check_butmap_change(dev, map, len, &client->errorValue, client);
-    if (ret != Success)
-        return ret;
-    do_butmap_change(dev, map, len, client);
-
-    return Success;
-}
-
-/* Check if a modifier map change is okay with the device.
- * Returns -1 for BadValue, as it collides with MappingBusy; this particular
- * caveat can be removed with LegalModifier, as we have no other reason to
- * set MappingFailed.  Sigh. */
-static int
-check_modmap_change(ClientPtr client, DeviceIntPtr dev, KeyCode *modmap)
-{
-    int ret, i;
-    XkbDescPtr xkb;
-
-    ret = XaceHook(XACE_DEVICE_ACCESS, client, dev, DixManageAccess);
-    if (ret != Success)
-        return ret;
-
-    if (!dev->key)
-        return BadMatch;
-    xkb = dev->key->xkbInfo->desc;
-
-    for (i = 0; i < MAP_LENGTH; i++) {
-        if (!modmap[i])
-            continue;
-
-        /* Check that all the new modifiers fall within the advertised
-         * keycode range. */
-        if (i < xkb->min_key_code || i > xkb->max_key_code) {
-            client->errorValue = i;
-            return -1;
-        }
-
-        /* Make sure the mapping is okay with the DDX. */
-        if (!LegalModifier(i, dev)) {
-            client->errorValue = i;
-            return MappingFailed;
-        }
-
-        /* None of the new modifiers may be down while we change the
-         * map. */
-        if (key_is_down(dev, i, KEY_POSTED | KEY_PROCESSED)) {
-            client->errorValue = i;
-            return MappingBusy;
-        }
-    }
-
-    /* None of the old modifiers may be down while we change the map,
-     * either. */
-    for (i = xkb->min_key_code; i < xkb->max_key_code; i++) {
-        if (!xkb->map->modmap[i])
-            continue;
-        if (key_is_down(dev, i, KEY_POSTED | KEY_PROCESSED)) {
-            client->errorValue = i;
-            return MappingBusy;
-        }
-    }
-
-    return Success;
-}
-
-static int
-check_modmap_change_slave(ClientPtr client, DeviceIntPtr master,
-                          DeviceIntPtr slave, CARD8 *modmap)
-{
-    XkbDescPtr master_xkb, slave_xkb;
-    int i, j;
-
-    if (!slave->key || !master->key)
-        return 0;
-
-    master_xkb = master->key->xkbInfo->desc;
-    slave_xkb = slave->key->xkbInfo->desc;
-
-    /* Ignore devices with a clearly different keymap. */
-    if (slave_xkb->min_key_code != master_xkb->min_key_code ||
-        slave_xkb->max_key_code != master_xkb->max_key_code)
-        return 0;
-
-    for (i = 0; i < MAP_LENGTH; i++) {
-        if (!modmap[i])
-            continue;
-
-        /* If we have different symbols for any modifier on an
-         * extended keyboard, ignore the whole remap request. */
-        for (j = 0;
-             j < XkbKeyNumSyms(slave_xkb, i) &&
-              j < XkbKeyNumSyms(master_xkb, i);
-             j++)
-            if (XkbKeySymsPtr(slave_xkb, i)[j] != XkbKeySymsPtr(master_xkb, i)[j])
-                return 0;
-    }
-
-    if (check_modmap_change(client, slave, modmap) != Success)
-        return 0;
-
-    return 1;
-}
-
-/* Actually change the modifier map, and send notifications.  Cannot fail. */
-static void
-do_modmap_change(ClientPtr client, DeviceIntPtr dev, CARD8 *modmap)
-{
-    XkbApplyMappingChange(dev, NULL, 0, 0, modmap, serverClient);
-}
-
-/* Rebuild modmap (key -> mod) from map (mod -> key). */
-static int build_modmap_from_modkeymap(CARD8 *modmap, KeyCode *modkeymap,
-                                       int max_keys_per_mod)
-{
-    int i, len = max_keys_per_mod * 8;
-
-    memset(modmap, 0, MAP_LENGTH);
-
-    for (i = 0; i < len; i++) {
-        if (!modkeymap[i])
-            continue;
-
-        if (modkeymap[i] >= MAP_LENGTH)
-            return BadValue;
-
-        //if (modmap[modkeymap[i]])  It looks like it needlessly gives errors back
-        //    return BadValue;
-
-        modmap[modkeymap[i]] |= 1 << (i / max_keys_per_mod); // Now or it because of previous line removal
-    }
-
-    return Success;
-}
-
-int
-change_modmap(ClientPtr client, DeviceIntPtr dev, KeyCode *modkeymap,
-              int max_keys_per_mod)
-{
-    int ret;
-    CARD8 modmap[MAP_LENGTH];
-    DeviceIntPtr tmp;
-
-    ret = build_modmap_from_modkeymap(modmap, modkeymap, max_keys_per_mod);
-    if (ret != Success)
-        return ret;
-
-    /* If we can't perform the change on the requested device, bail out. */
-    ret = check_modmap_change(client, dev, modmap);
-    if (ret != Success)
-        return ret;
-    do_modmap_change(client, dev, modmap);
-
-    /* Change any attached masters/slaves. */
-    if (IsMaster(dev)) {
-        for (tmp = inputInfo.devices; tmp; tmp = tmp->next) {
-            if (!IsMaster(tmp) && tmp->u.master == dev)
-                if (check_modmap_change_slave(client, dev, tmp, modmap))
-                    do_modmap_change(client, tmp, modmap);
-        }
-    }
-    else if (dev->u.master && dev->u.master->u.lastSlave == dev) {
-        /* If this fails, expect the results to be weird. */
-        if (check_modmap_change(client, dev->u.master, modmap))
-            do_modmap_change(client, dev->u.master, modmap);
-    }
-
-    return Success;
-}
-
-int generate_modkeymap(ClientPtr client, DeviceIntPtr dev,
-                       KeyCode **modkeymap_out, int *max_keys_per_mod_out)
-{
-    CARD8 keys_per_mod[8];
-    int max_keys_per_mod;
-    KeyCode *modkeymap = NULL;
-    int i, j, ret;
-
-    ret = XaceHook(XACE_DEVICE_ACCESS, client, dev, DixGetAttrAccess);
-    if (ret != Success)
-        return ret;
-
-    if (!dev->key)
-        return BadMatch;
-
-    /* Count the number of keys per modifier to determine how wide we
-     * should make the map. */
-    max_keys_per_mod = 0;
-    for (i = 0; i < 8; i++)
-        keys_per_mod[i] = 0;
-    for (i = 8; i < MAP_LENGTH; i++) {
-        for (j = 0; j < 8; j++) {
-            if (dev->key->xkbInfo->desc->map->modmap[i] & (1 << j)) {
-                if (++keys_per_mod[j] > max_keys_per_mod)
-                    max_keys_per_mod = keys_per_mod[j];
-            }
-        }
-    }
-
-    if (max_keys_per_mod != 0) {
-        modkeymap = calloc(max_keys_per_mod * 8, sizeof(KeyCode));
-        if (!modkeymap)
-            return BadAlloc;
-
-        for (i = 0; i < 8; i++)
-            keys_per_mod[i] = 0;
-
-        for (i = 8; i < MAP_LENGTH; i++) {
-            for (j = 0; j < 8; j++) {
-                if (dev->key->xkbInfo->desc->map->modmap[i] & (1 << j)) {
-                    modkeymap[(j * max_keys_per_mod) + keys_per_mod[j]] = i;
-                    keys_per_mod[j]++;
-                }
-            }
-        }
-    }
-
-    *max_keys_per_mod_out = max_keys_per_mod;
-    *modkeymap_out = modkeymap;
-
-    return Success;
-}
-
-/**
- * Duplicate the InputAttributes in the most obvious way.
- * No special memory handling is used to give drivers the maximum
- * flexibility with the data. Drivers should be able to call realloc on the
- * product string if needed and perform similar operations.
- */
-InputAttributes*
-DuplicateInputAttributes(InputAttributes *attrs)
-{
-    InputAttributes *new_attr;
-    int ntags = 0;
-    char **tags, **new_tags;
-
-    if (!attrs)
-        return NULL;
-
-    if (!(new_attr = calloc(1, sizeof(InputAttributes))))
-        goto unwind;
-
-    if (attrs->product && !(new_attr->product = strdup(attrs->product)))
-        goto unwind;
-    if (attrs->vendor && !(new_attr->vendor = strdup(attrs->vendor)))
-        goto unwind;
-    if (attrs->device && !(new_attr->device = strdup(attrs->device)))
-        goto unwind;
-    if (attrs->pnp_id && !(new_attr->pnp_id = strdup(attrs->pnp_id)))
-        goto unwind;
-    if (attrs->usb_id && !(new_attr->usb_id = strdup(attrs->usb_id)))
-        goto unwind;
-
-    new_attr->flags = attrs->flags;
-
-    if ((tags = attrs->tags))
-    {
-        while(*tags++)
-            ntags++;
-
-        new_attr->tags = calloc(ntags + 1, sizeof(char*));
-        if (!new_attr->tags)
-            goto unwind;
-
-        tags = attrs->tags;
-        new_tags = new_attr->tags;
-
-        while(*tags)
-        {
-            *new_tags = strdup(*tags);
-            if (!*new_tags)
-                goto unwind;
-
-            tags++;
-            new_tags++;
-        }
-    }
-
-    return new_attr;
-
-unwind:
-    FreeInputAttributes(new_attr);
-    return NULL;
-}
-
-void
-FreeInputAttributes(InputAttributes *attrs)
-{
-    char **tags;
-
-    if (!attrs)
-        return;
-
-    free(attrs->product);
-    free(attrs->vendor);
-    free(attrs->device);
-    free(attrs->pnp_id);
-    free(attrs->usb_id);
-
-    if ((tags = attrs->tags))
-        while(*tags)
-            free(*tags++);
-
-    free(attrs->tags);
-    free(attrs);
-}
-
-/**
- * Alloc a valuator mask large enough for num_valuators.
- */
-ValuatorMask*
-valuator_mask_new(int num_valuators)
-{
-    /* alloc a fixed size mask for now and ignore num_valuators. in the
-     * flying-car future, when we can dynamically alloc the masks and are
-     * not constrained by signals, we can start using num_valuators */
-    ValuatorMask *mask = calloc(1, sizeof(ValuatorMask));
-    mask->last_bit = -1;
-    return mask;
-}
-
-void
-valuator_mask_free(ValuatorMask **mask)
-{
-    free(*mask);
-    *mask = NULL;
-}
-
-
-/**
- * Sets a range of valuators between first_valuator and num_valuators with
- * the data in the valuators array. All other values are set to 0.
- */
-void
-valuator_mask_set_range(ValuatorMask *mask, int first_valuator, int num_valuators,
-                        const int* valuators)
-{
-    int i;
-
-    valuator_mask_zero(mask);
-
-    for (i = first_valuator; i < min(first_valuator + num_valuators, MAX_VALUATORS); i++)
-        valuator_mask_set(mask, i, valuators[i - first_valuator]);
-}
-
-/**
- * Reset mask to zero.
- */
-void
-valuator_mask_zero(ValuatorMask *mask)
-{
-    memset(mask, 0, sizeof(*mask));
-    mask->last_bit = -1;
-}
-
-/**
- * Returns the current size of the mask (i.e. the highest number of
- * valuators currently set + 1).
- */
-int
-valuator_mask_size(const ValuatorMask *mask)
-{
-    return mask->last_bit + 1;
-}
-
-/**
- * Returns the number of valuators set in the given mask.
- */
-int
-valuator_mask_num_valuators(const ValuatorMask *mask)
-{
-    return CountBits(mask->mask, min(mask->last_bit + 1, MAX_VALUATORS));
-}
-
-/**
- * Return true if the valuator is set in the mask, or false otherwise.
- */
-int
-valuator_mask_isset(const ValuatorMask *mask, int valuator)
-{
-    return mask->last_bit >= valuator && BitIsOn(mask->mask, valuator);
-}
-
-/**
- * Set the valuator to the given data.
- */
-void
-valuator_mask_set(ValuatorMask *mask, int valuator, int data)
-{
-    mask->last_bit = max(valuator, mask->last_bit);
-    SetBit(mask->mask, valuator);
-    mask->valuators[valuator] = data;
-}
-
-/**
- * Return the requested valuator value. If the mask bit is not set for the
- * given valuator, the returned value is undefined.
- */
-int
-valuator_mask_get(const ValuatorMask *mask, int valuator)
-{
-    return mask->valuators[valuator];
-}
-
-/**
- * Remove the valuator from the mask.
- */
-void
-valuator_mask_unset(ValuatorMask *mask, int valuator)
-{
-    if (mask->last_bit >= valuator) {
-        int i, lastbit = -1;
-
-        ClearBit(mask->mask, valuator);
-        mask->valuators[valuator] = 0;
-
-        for (i = 0; i <= mask->last_bit; i++)
-            if (valuator_mask_isset(mask, i))
-                lastbit = max(lastbit, i);
-        mask->last_bit = lastbit;
-    }
-}
-
-void
-valuator_mask_copy(ValuatorMask *dest, const ValuatorMask *src)
-{
-    if (src)
-        memcpy(dest, src, sizeof(*dest));
-    else
-        valuator_mask_zero(dest);
-}
-
-int
-CountBits(const uint8_t *mask, int len)
-{
-    int i;
-    int ret = 0;
-
-    for (i = 0; i < len; i++)
-        if (BitIsOn(mask, i))
-            ret++;
-
-    return ret;
-}
+/*

+ * Copyright © 2008 Daniel Stone

+ *

+ * 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 (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 NONINFRINGEMENT.  IN NO EVENT SHALL

+ * THE AUTHORS OR COPYRIGHT HOLDERS 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.

+ *

+ * Author: Daniel Stone <daniel@fooishbar.org>

+ */

+

+#ifdef HAVE_DIX_CONFIG_H

+#include "dix-config.h"

+#endif

+

+#include "exevents.h"

+#include "exglobals.h"

+#include "misc.h"

+#include "input.h"

+#include "inputstr.h"

+#include "xace.h"

+#include "xkbsrv.h"

+#include "xkbstr.h"

+#include "inpututils.h"

+

+/* Check if a button map change is okay with the device.

+ * Returns -1 for BadValue, as it collides with MappingBusy. */

+static int

+check_butmap_change(DeviceIntPtr dev, CARD8 *map, int len, CARD32 *errval_out,

+                    ClientPtr client)

+{

+    int i, ret;

+

+    if (!dev || !dev->button)

+    {

+        client->errorValue = (dev) ? dev->id : 0;

+        return BadDevice;

+    }

+

+    ret = XaceHook(XACE_DEVICE_ACCESS, client, dev, DixManageAccess);

+    if (ret != Success)

+    {

+        client->errorValue = dev->id;

+        return ret;

+    }

+

+    for (i = 0; i < len; i++) {

+        if (dev->button->map[i + 1] != map[i] && dev->button->down[i + 1])

+            return MappingBusy;

+    }

+

+    return Success;

+}

+

+static void

+do_butmap_change(DeviceIntPtr dev, CARD8 *map, int len, ClientPtr client)

+{

+    int i;

+    xEvent core_mn;

+    deviceMappingNotify xi_mn;

+

+    /* The map in ButtonClassRec refers to button numbers, whereas the

+     * protocol is zero-indexed.  Sigh. */

+    memcpy(&(dev->button->map[1]), map, len);

+

+    core_mn.u.u.type = MappingNotify;

+    core_mn.u.mappingNotify.request = MappingPointer;

+

+    /* 0 is the server client. */

+    for (i = 1; i < currentMaxClients; i++) {

+        /* Don't send irrelevant events to naïve clients. */

+        if (!clients[i] || clients[i]->clientState != ClientStateRunning)

+            continue;

+

+        if (!XIShouldNotify(clients[i], dev))

+            continue;

+

+        WriteEventsToClient(clients[i], 1, &core_mn);

+    }

+

+    xi_mn.type = DeviceMappingNotify;

+    xi_mn.request = MappingPointer;

+    xi_mn.deviceid = dev->id;

+    xi_mn.time = GetTimeInMillis();

+

+    SendEventToAllWindows(dev, DeviceMappingNotifyMask, (xEvent *) &xi_mn, 1);

+}

+

+/*

+ * Does what it says on the box, both for core and Xi.

+ *

+ * Faithfully reports any errors encountered while trying to apply the map

+ * to the requested device, faithfully ignores any errors encountered while

+ * trying to apply the map to its master/slaves.

+ */

+int

+ApplyPointerMapping(DeviceIntPtr dev, CARD8 *map, int len, ClientPtr client)

+{

+    int ret;

+

+    /* If we can't perform the change on the requested device, bail out. */

+    ret = check_butmap_change(dev, map, len, &client->errorValue, client);

+    if (ret != Success)

+        return ret;

+    do_butmap_change(dev, map, len, client);

+

+    return Success;

+}

+

+/* Check if a modifier map change is okay with the device.

+ * Returns -1 for BadValue, as it collides with MappingBusy; this particular

+ * caveat can be removed with LegalModifier, as we have no other reason to

+ * set MappingFailed.  Sigh. */

+static int

+check_modmap_change(ClientPtr client, DeviceIntPtr dev, KeyCode *modmap)

+{

+    int ret, i;

+    XkbDescPtr xkb;

+

+    ret = XaceHook(XACE_DEVICE_ACCESS, client, dev, DixManageAccess);

+    if (ret != Success)

+        return ret;

+

+    if (!dev->key)

+        return BadMatch;

+    xkb = dev->key->xkbInfo->desc;

+

+    for (i = 0; i < MAP_LENGTH; i++) {

+        if (!modmap[i])

+            continue;

+

+        /* Check that all the new modifiers fall within the advertised

+         * keycode range. */

+        if (i < xkb->min_key_code || i > xkb->max_key_code) {

+            client->errorValue = i;

+            return -1;

+        }

+

+        /* Make sure the mapping is okay with the DDX. */

+        if (!LegalModifier(i, dev)) {

+            client->errorValue = i;

+            return MappingFailed;

+        }

+

+        /* None of the new modifiers may be down while we change the

+         * map. */

+        if (key_is_down(dev, i, KEY_POSTED | KEY_PROCESSED)) {

+            client->errorValue = i;

+            return MappingBusy;

+        }

+    }

+

+    /* None of the old modifiers may be down while we change the map,

+     * either. */

+    for (i = xkb->min_key_code; i < xkb->max_key_code; i++) {

+        if (!xkb->map->modmap[i])

+            continue;

+        if (key_is_down(dev, i, KEY_POSTED | KEY_PROCESSED)) {

+            client->errorValue = i;

+            return MappingBusy;

+        }

+    }

+

+    return Success;

+}

+

+static int

+check_modmap_change_slave(ClientPtr client, DeviceIntPtr master,

+                          DeviceIntPtr slave, CARD8 *modmap)

+{

+    XkbDescPtr master_xkb, slave_xkb;

+    int i, j;

+

+    if (!slave->key || !master->key)

+        return 0;

+

+    master_xkb = master->key->xkbInfo->desc;

+    slave_xkb = slave->key->xkbInfo->desc;

+

+    /* Ignore devices with a clearly different keymap. */

+    if (slave_xkb->min_key_code != master_xkb->min_key_code ||

+        slave_xkb->max_key_code != master_xkb->max_key_code)

+        return 0;

+

+    for (i = 0; i < MAP_LENGTH; i++) {

+        if (!modmap[i])

+            continue;

+

+        /* If we have different symbols for any modifier on an

+         * extended keyboard, ignore the whole remap request. */

+        for (j = 0;

+             j < XkbKeyNumSyms(slave_xkb, i) &&

+              j < XkbKeyNumSyms(master_xkb, i);

+             j++)

+            if (XkbKeySymsPtr(slave_xkb, i)[j] != XkbKeySymsPtr(master_xkb, i)[j])

+                return 0;

+    }

+

+    if (check_modmap_change(client, slave, modmap) != Success)

+        return 0;

+

+    return 1;

+}

+

+/* Actually change the modifier map, and send notifications.  Cannot fail. */

+static void

+do_modmap_change(ClientPtr client, DeviceIntPtr dev, CARD8 *modmap)

+{

+    XkbApplyMappingChange(dev, NULL, 0, 0, modmap, serverClient);

+}

+

+/* Rebuild modmap (key -> mod) from map (mod -> key). */

+static int build_modmap_from_modkeymap(CARD8 *modmap, KeyCode *modkeymap,

+                                       int max_keys_per_mod)

+{

+    int i, len = max_keys_per_mod * 8;

+

+    memset(modmap, 0, MAP_LENGTH);

+

+    for (i = 0; i < len; i++) {

+        if (!modkeymap[i])

+            continue;

+

+        if (modkeymap[i] >= MAP_LENGTH)

+            return BadValue;

+

+        //if (modmap[modkeymap[i]])  It looks like it needlessly gives errors back

+        //    return BadValue;

+

+        modmap[modkeymap[i]] |= 1 << (i / max_keys_per_mod); // Now or it because of previous line removal

+    }

+

+    return Success;

+}

+

+int

+change_modmap(ClientPtr client, DeviceIntPtr dev, KeyCode *modkeymap,

+              int max_keys_per_mod)

+{

+    int ret;

+    CARD8 modmap[MAP_LENGTH];

+    DeviceIntPtr tmp;

+

+    ret = build_modmap_from_modkeymap(modmap, modkeymap, max_keys_per_mod);

+    if (ret != Success)

+        return ret;

+

+    /* If we can't perform the change on the requested device, bail out. */

+    ret = check_modmap_change(client, dev, modmap);

+    if (ret != Success)

+        return ret;

+    do_modmap_change(client, dev, modmap);

+

+    /* Change any attached masters/slaves. */

+    if (IsMaster(dev)) {

+        for (tmp = inputInfo.devices; tmp; tmp = tmp->next) {

+            if (!IsMaster(tmp) && GetMaster(tmp, MASTER_KEYBOARD) == dev)

+                if (check_modmap_change_slave(client, dev, tmp, modmap))

+                    do_modmap_change(client, tmp, modmap);

+        }

+    }

+    else if (!IsFloating(dev) && GetMaster(dev, MASTER_KEYBOARD)->lastSlave == dev) {

+        /* If this fails, expect the results to be weird. */

+        if (check_modmap_change(client, dev->master, modmap))

+            do_modmap_change(client, dev->master, modmap);

+    }

+

+    return Success;

+}

+

+int generate_modkeymap(ClientPtr client, DeviceIntPtr dev,

+                       KeyCode **modkeymap_out, int *max_keys_per_mod_out)

+{

+    CARD8 keys_per_mod[8];

+    int max_keys_per_mod;

+    KeyCode *modkeymap = NULL;

+    int i, j, ret;

+

+    ret = XaceHook(XACE_DEVICE_ACCESS, client, dev, DixGetAttrAccess);

+    if (ret != Success)

+        return ret;

+

+    if (!dev->key)

+        return BadMatch;

+

+    /* Count the number of keys per modifier to determine how wide we

+     * should make the map. */

+    max_keys_per_mod = 0;

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

+        keys_per_mod[i] = 0;

+    for (i = 8; i < MAP_LENGTH; i++) {

+        for (j = 0; j < 8; j++) {

+            if (dev->key->xkbInfo->desc->map->modmap[i] & (1 << j)) {

+                if (++keys_per_mod[j] > max_keys_per_mod)

+                    max_keys_per_mod = keys_per_mod[j];

+            }

+        }

+    }

+

+    if (max_keys_per_mod != 0) {

+        modkeymap = calloc(max_keys_per_mod * 8, sizeof(KeyCode));

+        if (!modkeymap)

+            return BadAlloc;

+

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

+            keys_per_mod[i] = 0;

+

+        for (i = 8; i < MAP_LENGTH; i++) {

+            for (j = 0; j < 8; j++) {

+                if (dev->key->xkbInfo->desc->map->modmap[i] & (1 << j)) {

+                    modkeymap[(j * max_keys_per_mod) + keys_per_mod[j]] = i;

+                    keys_per_mod[j]++;

+                }

+            }

+        }

+    }

+

+    *max_keys_per_mod_out = max_keys_per_mod;

+    *modkeymap_out = modkeymap;

+

+    return Success;

+}

+

+/**

+ * Duplicate the InputAttributes in the most obvious way.

+ * No special memory handling is used to give drivers the maximum

+ * flexibility with the data. Drivers should be able to call realloc on the

+ * product string if needed and perform similar operations.

+ */

+InputAttributes*

+DuplicateInputAttributes(InputAttributes *attrs)

+{

+    InputAttributes *new_attr;

+    int ntags = 0;

+    char **tags, **new_tags;

+

+    if (!attrs)

+        return NULL;

+

+    if (!(new_attr = calloc(1, sizeof(InputAttributes))))

+        goto unwind;

+

+    if (attrs->product && !(new_attr->product = strdup(attrs->product)))

+        goto unwind;

+    if (attrs->vendor && !(new_attr->vendor = strdup(attrs->vendor)))

+        goto unwind;

+    if (attrs->device && !(new_attr->device = strdup(attrs->device)))

+        goto unwind;

+    if (attrs->pnp_id && !(new_attr->pnp_id = strdup(attrs->pnp_id)))

+        goto unwind;

+    if (attrs->usb_id && !(new_attr->usb_id = strdup(attrs->usb_id)))

+        goto unwind;

+

+    new_attr->flags = attrs->flags;

+

+    if ((tags = attrs->tags))

+    {

+        while(*tags++)

+            ntags++;

+

+        new_attr->tags = calloc(ntags + 1, sizeof(char*));

+        if (!new_attr->tags)

+            goto unwind;

+

+        tags = attrs->tags;

+        new_tags = new_attr->tags;

+

+        while(*tags)

+        {

+            *new_tags = strdup(*tags);

+            if (!*new_tags)

+                goto unwind;

+

+            tags++;

+            new_tags++;

+        }

+    }

+

+    return new_attr;

+

+unwind:

+    FreeInputAttributes(new_attr);

+    return NULL;

+}

+

+void

+FreeInputAttributes(InputAttributes *attrs)

+{

+    char **tags;

+

+    if (!attrs)

+        return;

+

+    free(attrs->product);

+    free(attrs->vendor);

+    free(attrs->device);

+    free(attrs->pnp_id);

+    free(attrs->usb_id);

+

+    if ((tags = attrs->tags))

+        while(*tags)

+            free(*tags++);

+

+    free(attrs->tags);

+    free(attrs);

+}

+

+/**

+ * Alloc a valuator mask large enough for num_valuators.

+ */

+ValuatorMask*

+valuator_mask_new(int num_valuators)

+{

+    /* alloc a fixed size mask for now and ignore num_valuators. in the

+     * flying-car future, when we can dynamically alloc the masks and are

+     * not constrained by signals, we can start using num_valuators */

+    ValuatorMask *mask = calloc(1, sizeof(ValuatorMask));

+    mask->last_bit = -1;

+    return mask;

+}

+

+void

+valuator_mask_free(ValuatorMask **mask)

+{

+    free(*mask);

+    *mask = NULL;

+}

+

+

+/**

+ * Sets a range of valuators between first_valuator and num_valuators with

+ * the data in the valuators array. All other values are set to 0.

+ */

+void

+valuator_mask_set_range(ValuatorMask *mask, int first_valuator, int num_valuators,

+                        const int* valuators)

+{

+    int i;

+

+    valuator_mask_zero(mask);

+

+    for (i = first_valuator; i < min(first_valuator + num_valuators, MAX_VALUATORS); i++)

+        valuator_mask_set(mask, i, valuators[i - first_valuator]);

+}

+

+/**

+ * Reset mask to zero.

+ */

+void

+valuator_mask_zero(ValuatorMask *mask)

+{

+    memset(mask, 0, sizeof(*mask));

+    mask->last_bit = -1;

+}

+

+/**

+ * Returns the current size of the mask (i.e. the highest number of

+ * valuators currently set + 1).

+ */

+int

+valuator_mask_size(const ValuatorMask *mask)

+{

+    return mask->last_bit + 1;

+}

+

+/**

+ * Returns the number of valuators set in the given mask.

+ */

+int

+valuator_mask_num_valuators(const ValuatorMask *mask)

+{

+    return CountBits(mask->mask, min(mask->last_bit + 1, MAX_VALUATORS));

+}

+

+/**

+ * Return true if the valuator is set in the mask, or false otherwise.

+ */

+int

+valuator_mask_isset(const ValuatorMask *mask, int valuator)

+{

+    return mask->last_bit >= valuator && BitIsOn(mask->mask, valuator);

+}

+

+/**

+ * Set the valuator to the given data.

+ */

+void

+valuator_mask_set(ValuatorMask *mask, int valuator, int data)

+{

+    mask->last_bit = max(valuator, mask->last_bit);

+    SetBit(mask->mask, valuator);

+    mask->valuators[valuator] = data;

+}

+

+/**

+ * Return the requested valuator value. If the mask bit is not set for the

+ * given valuator, the returned value is undefined.

+ */

+int

+valuator_mask_get(const ValuatorMask *mask, int valuator)

+{

+    return mask->valuators[valuator];

+}

+

+/**

+ * Remove the valuator from the mask.

+ */

+void

+valuator_mask_unset(ValuatorMask *mask, int valuator)

+{

+    if (mask->last_bit >= valuator) {

+        int i, lastbit = -1;

+

+        ClearBit(mask->mask, valuator);

+        mask->valuators[valuator] = 0;

+

+        for (i = 0; i <= mask->last_bit; i++)

+            if (valuator_mask_isset(mask, i))

+                lastbit = max(lastbit, i);

+        mask->last_bit = lastbit;

+    }

+}

+

+void

+valuator_mask_copy(ValuatorMask *dest, const ValuatorMask *src)

+{

+    if (src)

+        memcpy(dest, src, sizeof(*dest));

+    else

+        valuator_mask_zero(dest);

+}

+

+int

+CountBits(const uint8_t *mask, int len)

+{

+    int i;

+    int ret = 0;

+

+    for (i = 0; i < len; i++)

+        if (BitIsOn(mask, i))

+            ret++;

+

+    return ret;

+}

diff --git a/xorg-server/dix/main.c b/xorg-server/dix/main.c
index 169147112..0c9eb7708 100644
--- a/xorg-server/dix/main.c
+++ b/xorg-server/dix/main.c
@@ -104,6 +104,7 @@ Equipment Corporation.
 #include "extnsionst.h"

 #include "privates.h"

 #include "registry.h"

+#include "client.h"

 #ifdef PANORAMIX

 #include "panoramiXsrv.h"

 #else

@@ -302,6 +303,7 @@ int main(int argc, char *argv[], char *envp[])
         InitCoreDevices();

 	InitInput(argc, argv);

 	InitAndStartDevices();

+	ReserveClientIds(serverClient);

 

 	dixSaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);

 

@@ -367,6 +369,7 @@ int main(int argc, char *argv[], char *envp[])
 	    screenInfo.numScreens = i;

 	}

 

+	ReleaseClientIds(serverClient);

 	dixFreePrivates(serverClient->devPrivates, PRIVATE_CLIENT);

 	serverClient->devPrivates = NULL;

 

diff --git a/xorg-server/dix/ptrveloc.c b/xorg-server/dix/ptrveloc.c
index 74a3d3a90..1170e767d 100644
--- a/xorg-server/dix/ptrveloc.c
+++ b/xorg-server/dix/ptrveloc.c
@@ -76,6 +76,10 @@ SimpleSmoothProfile(DeviceIntPtr dev, DeviceVelocityPtr vel, float velocity,
                     float threshold, float acc);

 static PointerAccelerationProfileFunc

 GetAccelerationProfile(DeviceVelocityPtr vel, int profile_num);

+static BOOL

+InitializePredictableAccelerationProperties(DeviceIntPtr dev);

+static BOOL

+DeletePredictableAccelerationProperties(DeviceIntPtr dev);

 

 /*#define PTRACCEL_DEBUGGING*/

 

@@ -94,7 +98,7 @@ GetAccelerationProfile(DeviceVelocityPtr vel, int profile_num);
 

 

 /**

- * Init struct so it should match the average case

+ * Init DeviceVelocity struct so it should match the average case

  */

 void

 InitVelocityData(DeviceVelocityPtr vel)

@@ -116,7 +120,7 @@ InitVelocityData(DeviceVelocityPtr vel)
 

 

 /**

- * Clean up

+ * Clean up DeviceVelocityRec

  */

 void

 FreeVelocityData(DeviceVelocityPtr vel){

@@ -125,8 +129,28 @@ FreeVelocityData(DeviceVelocityPtr vel){
 }

 

 

-/*

- *  dix uninit helper, called through scheme

+/**

+ * Init predictable scheme

+ */

+Bool

+InitPredictableAccelerationScheme(DeviceIntPtr dev,

+				  ValuatorAccelerationPtr protoScheme) {

+    DeviceVelocityPtr vel;

+    ValuatorAccelerationRec scheme;

+    scheme = *protoScheme;

+    vel = calloc(1, sizeof(DeviceVelocityRec));

+    if (!vel)

+	return FALSE;

+    InitVelocityData(vel);

+    scheme.accelData = vel;

+    dev->valuator->accelScheme = scheme;

+    InitializePredictableAccelerationProperties(dev);

+    return TRUE;

+}

+

+

+/**

+ *  Uninit scheme

  */

 void

 AccelerationDefaultCleanup(DeviceIntPtr dev)

@@ -1033,12 +1057,10 @@ acceleratePointerPredictable(
     int *valuators,

     int evtime)

 {

-    float mult = 0.0;

+    float fdx, fdy, tmp, mult; /* no need to init */

     int dx = 0, dy = 0;

     int *px = NULL, *py = NULL;

-    DeviceVelocityPtr velocitydata =

-	(DeviceVelocityPtr) dev->valuator->accelScheme.accelData;

-    float fdx, fdy, tmp; /* no need to init */

+    DeviceVelocityPtr velocitydata = GetDevicePredictableAccelData(dev);

     Bool soften = TRUE;

 

     if (!num_valuators || !valuators || !velocitydata)

@@ -1071,11 +1093,11 @@ acceleratePointerPredictable(
 					(float)dev->ptrfeed->ctrl.num /

 					(float)dev->ptrfeed->ctrl.den);

 

-            if(mult != 1.0 || velocitydata->const_acceleration != 1.0) {

+            if(mult != 1.0f || velocitydata->const_acceleration != 1.0f) {

                 ApplySofteningAndConstantDeceleration( velocitydata,

 						       dx, dy,

 						       &fdx, &fdy,

-						       (mult > 1.0) && soften);

+						       (mult > 1.0f) && soften);

 

                 if (dx) {

                     tmp = mult * fdx + dev->last.remainder[0];

diff --git a/xorg-server/dix/region.c b/xorg-server/dix/region.c
index c0add6ca9..e5f14c1f7 100644
--- a/xorg-server/dix/region.c
+++ b/xorg-server/dix/region.c
@@ -1423,237 +1423,3 @@ RegionFromRects(int nrects, xRectangle *prect, int ctype)
     }

     return pRgn;

 }

-

-#define ExchangeSpans(a, b)				    \

-{							    \

-    DDXPointRec	tpt;				    	    \

-    int    	tw;					    \

-							    \

-    tpt = spans[a]; spans[a] = spans[b]; spans[b] = tpt;    \

-    tw = widths[a]; widths[a] = widths[b]; widths[b] = tw;  \

-}

-

-/* ||| I should apply the merge sort code to rectangle sorting above, and see

-   if mapping time can be improved.  But right now I've been at work 12 hours,

-   so forget it.

-*/

-

-static void QuickSortSpans(

-    DDXPointRec spans[],

-    int	    	widths[],

-    int	    	numSpans)

-{

-    int	    y;

-    int	    i, j, m;

-    DDXPointPtr    r;

-

-    /* Always called with numSpans > 1 */

-    /* Sorts only by y, doesn't bother to sort by x */

-

-    do

-    {

-	if (numSpans < 9)

-	{

-	    /* Do insertion sort */

-	    int yprev;

-

-	    yprev = spans[0].y;

-	    i = 1;

-	    do

-	    { /* while i != numSpans */

-		y = spans[i].y;

-		if (yprev > y)

-		{

-		    /* spans[i] is out of order.  Move into proper location. */

-		    DDXPointRec tpt;

-		    int	    tw, k;

-

-		    for (j = 0; y >= spans[j].y; j++) {}

-		    tpt = spans[i];

-		    tw  = widths[i];

-		    for (k = i; k != j; k--)

-		    {

-			spans[k] = spans[k-1];

-			widths[k] = widths[k-1];

-		    }

-		    spans[j] = tpt;

-		    widths[j] = tw;

-		    y = spans[i].y;

-		} /* if out of order */

-		yprev = y;

-		i++;

-	    } while (i != numSpans);

-	    return;

-	}

-

-	/* Choose partition element, stick in location 0 */

-	m = numSpans / 2;

-	if (spans[m].y > spans[0].y)		ExchangeSpans(m, 0);

-	if (spans[m].y > spans[numSpans-1].y)   ExchangeSpans(m, numSpans-1);

-	if (spans[m].y > spans[0].y)		ExchangeSpans(m, 0);

-	y = spans[0].y;

-

-        /* Partition array */

-        i = 0;

-        j = numSpans;

-        do

-	{

-	    r = &(spans[i]);

-	    do

-	    {

-		r++;

-		i++;

-            } while (i != numSpans && r->y < y);

-	    r = &(spans[j]);

-	    do

-	    {

-		r--;

-		j--;

-            } while (y < r->y);

-            if (i < j)

-		ExchangeSpans(i, j);

-        } while (i < j);

-

-        /* Move partition element back to middle */

-        ExchangeSpans(0, j);

-

-	/* Recurse */

-        if (numSpans-j-1 > 1)

-	    QuickSortSpans(&spans[j+1], &widths[j+1], numSpans-j-1);

-        numSpans = j;

-    } while (numSpans > 1);

-}

-

-#define NextBand()						    \

-{								    \

-    clipy1 = pboxBandStart->y1;					    \

-    clipy2 = pboxBandStart->y2;					    \

-    pboxBandEnd = pboxBandStart + 1;				    \

-    while (pboxBandEnd != pboxLast && pboxBandEnd->y1 == clipy1) {  \

-	pboxBandEnd++;						    \

-    }								    \

-    for (; ppt != pptLast && ppt->y < clipy1; ppt++, pwidth++) {} \

-}

-

-/*

-    Clip a list of scanlines to a region.  The caller has allocated the

-    space.  FSorted is non-zero if the scanline origins are in ascending

-    order.

-    returns the number of new, clipped scanlines.

-*/

-

-int

-RegionClipSpans(

-    RegionPtr	prgnDst,

-    DDXPointPtr ppt,

-    int	    	*pwidth,

-    int		nspans,

-    DDXPointPtr	pptNew,

-    int		*pwidthNew,

-    int		fSorted)

-{

-    DDXPointPtr pptLast;

-    int	*pwidthNewStart;	/* the vengeance of Xerox! */

-    int	y, x1, x2;

-    int	numRects;

-

-    good(prgnDst);

-    pptLast = ppt + nspans;

-    pwidthNewStart = pwidthNew;

-

-    if (!prgnDst->data)

-    {

-	/* Do special fast code with clip boundaries in registers(?) */

-	/* It doesn't pay much to make use of fSorted in this case, 

-	   so we lump everything together. */

-

-	int clipx1, clipx2, clipy1, clipy2;

-

-	clipx1 = prgnDst->extents.x1;

-	clipy1 = prgnDst->extents.y1;

-	clipx2 = prgnDst->extents.x2;

-	clipy2 = prgnDst->extents.y2;

-	    

-	for (; ppt != pptLast; ppt++, pwidth++)

-	{

-	    y = ppt->y;

-	    x1 = ppt->x;

-	    if (clipy1 <= y && y < clipy2)

-	    {

-		x2 = x1 + *pwidth;

-		if (x1 < clipx1)    x1 = clipx1;

-		if (x2 > clipx2)    x2 = clipx2;

-		if (x1 < x2)

-		{

-		    /* part of span in clip rectangle */

-		    pptNew->x = x1;

-		    pptNew->y = y;

-		    *pwidthNew = x2 - x1;

-		    pptNew++;

-		    pwidthNew++;

-		}

-	    }

-	} /* end for */

-

-    }

-    else if ((numRects = prgnDst->data->numRects))

-    {

-	/* Have to clip against many boxes */

-	BoxPtr pboxBandStart, pboxBandEnd;

-	BoxPtr pbox;

-	BoxPtr pboxLast;

-	int clipy1, clipy2;

-

-	/* In this case, taking advantage of sorted spans gains more than

-	   the sorting costs. */

-	if ((! fSorted) && (nspans > 1))

-	    QuickSortSpans(ppt, pwidth, nspans);

-

-	pboxBandStart = RegionBoxptr(prgnDst);

-	pboxLast = pboxBandStart + numRects;

-    

-	NextBand();

-

-	for (; ppt != pptLast; )

-	{

-	    y = ppt->y;

-	    if (y < clipy2)

-	    {

-		/* span is in the current band */

-		pbox = pboxBandStart;

-		x1 = ppt->x;

-		x2 = x1 + *pwidth;

-		do

-		{ /* For each box in band */

-		    int newx1, newx2;

-

-		    newx1 = x1;

-		    newx2 = x2;

-		    if (newx1 < pbox->x1)   newx1 = pbox->x1;

-		    if (newx2 > pbox->x2)   newx2 = pbox->x2;

-		    if (newx1 < newx2)

-		    {

-			/* Part of span in clip rectangle */

-			pptNew->x = newx1;

-			pptNew->y = y;

-			*pwidthNew = newx2 - newx1;

-			pptNew++;

-			pwidthNew++;

-		    }

-		    pbox++;

-		} while (pbox != pboxBandEnd);

-		ppt++;

-		pwidth++;

-	    }

-	    else

-	    {

-		/* Move to next band, adjust ppt as needed */

-		pboxBandStart = pboxBandEnd;

-		if (pboxBandStart == pboxLast)

-		    break; /* We're completely done */

-		NextBand();

-	    }

-	}

-    }

-    return pwidthNew - pwidthNewStart;

-}

diff --git a/xorg-server/fb/fbpict.c b/xorg-server/fb/fbpict.c
index c27fb4e20..6e72c0516 100644
--- a/xorg-server/fb/fbpict.c
+++ b/xorg-server/fb/fbpict.c
@@ -364,8 +364,10 @@ fbPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats)
     ps->Glyphs = miGlyphs;

     ps->CompositeRects = miCompositeRects;

     ps->RasterizeTrapezoid = fbRasterizeTrapezoid;

+    ps->Trapezoids = fbTrapezoids;

     ps->AddTraps = fbAddTraps;

     ps->AddTriangles = fbAddTriangles;

+    ps->Triangles = fbTriangles;

 

     return TRUE;

 }

diff --git a/xorg-server/fb/fbpict.h b/xorg-server/fb/fbpict.h
index e7daaa245..859dd7ac1 100644
--- a/xorg-server/fb/fbpict.h
+++ b/xorg-server/fb/fbpict.h
@@ -65,4 +65,24 @@ fbAddTriangles (PicturePtr  pPicture,
 		int	    ntri,

 		xTriangle   *tris);

 

+extern _X_EXPORT void

+fbTrapezoids (CARD8	    op,

+	      PicturePtr    pSrc,

+	      PicturePtr    pDst,

+	      PictFormatPtr maskFormat,

+	      INT16	    xSrc,

+	      INT16	    ySrc,

+	      int	    ntrap,

+	      xTrapezoid    *traps);

+

+extern _X_EXPORT void

+fbTriangles (CARD8	    op,

+	     PicturePtr     pSrc,

+	     PicturePtr     pDst,

+	     PictFormatPtr  maskFormat,

+	     INT16	    xSrc,

+	     INT16	    ySrc,

+	     int	    ntris,

+	     xTriangle     *tris);

+

 #endif /* _FBPICT_H_ */

diff --git a/xorg-server/fb/fbtrap.c b/xorg-server/fb/fbtrap.c
index e52f84cd7..2f23d8564 100644
--- a/xorg-server/fb/fbtrap.c
+++ b/xorg-server/fb/fbtrap.c
@@ -65,32 +65,6 @@ fbRasterizeTrapezoid (PicturePtr    pPicture,
     free_pixman_pict (pPicture, image);

 }

 

-static int

-_GreaterY (xPointFixed *a, xPointFixed *b)

-{

-    if (a->y == b->y)

-	return a->x > b->x;

-    return a->y > b->y;

-}

-

-/*

- * Note that the definition of this function is a bit odd because

- * of the X coordinate space (y increasing downwards).

- */

-static int

-_Clockwise (xPointFixed *ref, xPointFixed *a, xPointFixed *b)

-{

-    xPointFixed	ad, bd;

-

-    ad.x = a->x - ref->x;

-    ad.y = a->y - ref->y;

-    bd.x = b->x - ref->x;

-    bd.y = b->y - ref->y;

-

-    return ((xFixed_32_32) bd.y * ad.x - (xFixed_32_32) ad.y * bd.x) < 0;

-}

-

-/* FIXME -- this could be made more efficient */

 void

 fbAddTriangles (PicturePtr  pPicture,

 		INT16	    x_off,

@@ -98,62 +72,139 @@ fbAddTriangles (PicturePtr  pPicture,
 		int	    ntri,

 		xTriangle *tris)

 {

-    xPointFixed	  *top, *left, *right, *tmp;

-    xTrapezoid	    trap;

+    int image_xoff, image_yoff;

+    pixman_image_t *image =

+	image_from_pict (pPicture, FALSE, &image_xoff, &image_yoff);

+

+    if (!image)

+	return;

+    

+    pixman_add_triangles (image, x_off, y_off, ntri, (pixman_triangle_t *)tris);

+

+    free_pixman_pict (pPicture, image);

+}

+

+typedef void (* CompositeShapesFunc) (pixman_op_t op,

+				      pixman_image_t *src,

+				      pixman_image_t *dst,

+				      pixman_format_code_t mask_format,

+				      int x_src, int y_src,

+				      int x_dst, int y_dst,

+				      int n_shapes, const uint8_t *shapes);

+

+static void

+fbShapes (CompositeShapesFunc	composite,

+	  pixman_op_t		op,

+	  PicturePtr		pSrc,

+	  PicturePtr		pDst,

+	  PictFormatPtr		maskFormat,

+	  int16_t		xSrc,

+	  int16_t		ySrc,

+	  int16_t		xDst,

+	  int16_t		yDst,

+	  int			nshapes,

+	  int			shape_size,

+	  const uint8_t *	shapes)

+{

+    pixman_image_t *src, *dst;

+    int src_xoff, src_yoff;

+    int dst_xoff, dst_yoff;

+

+    src = image_from_pict (pSrc, FALSE, &src_xoff, &src_yoff);

+    dst = image_from_pict (pDst, TRUE, &dst_xoff, &dst_yoff);

 

-    for (; ntri; ntri--, tris++)

+    if (src && dst)

     {

-	top = &tris->p1;

-	left = &tris->p2;

-	right = &tris->p3;

-	if (_GreaterY (top, left)) {

-	    tmp = left; left = top; top = tmp;

-	}

-	if (_GreaterY (top, right)) {

-	    tmp = right; right = top; top = tmp;

-	}

-	if (_Clockwise (top, right, left)) {

-	    tmp = right; right = left; left = tmp;

-	}

-	

-	/*

-	 * Two cases:

-	 *

-	 *		+		+

-	 *	       / \             / \

-	 *	      /   \           /   \

-	 *	     /     +         +     \

-	 *      /    --           --    \

-	 *     /   --               --   \

-	 *    / ---                   --- \

-	 *	 +--                         --+

-	 */

-	

-	trap.top = top->y;

-	trap.left.p1 = *top;

-	trap.left.p2 = *left;

-	trap.right.p1 = *top;

-	trap.right.p2 = *right;

-	if (right->y < left->y)

-	    trap.bottom = right->y;

-	else

-	    trap.bottom = left->y;

-	fbRasterizeTrapezoid (pPicture, &trap, x_off, y_off);

-	if (right->y < left->y)

+	pixman_format_code_t format;

+

+	if (!maskFormat)

 	{

-	    trap.top = right->y;

-	    trap.bottom = left->y;

-	    trap.right.p1 = *right;

-	    trap.right.p2 = *left;

+	    int i;

+

+	    if (pDst->polyEdge == PolyEdgeSharp)

+		format = PIXMAN_a1;

+	    else

+		format = PIXMAN_a8;

+

+	    for (i = 0; i < nshapes; ++i)

+	    {

+		composite (op, src, dst, format,

+			   xSrc + src_xoff,

+			   ySrc + src_yoff,

+			   xDst + dst_xoff,

+			   yDst + dst_yoff,

+			   1, shapes + i * shape_size);

+	    }

 	}

 	else

 	{

-	    trap.top = left->y;

-	    trap.bottom = right->y;

-	    trap.left.p1 = *left;

-	    trap.left.p2 = *right;

+	    switch (PICT_FORMAT_A (maskFormat->format))

+	    {

+	    case 1:

+		format = PIXMAN_a1;

+		break;

+

+	    case 4:

+		format = PIXMAN_a4;

+		break;

+

+	    default:

+	    case 8:

+		format = PIXMAN_a8;

+		break;

+	    }

+	    

+	    composite (op, src, dst, format,

+		       xSrc + src_xoff,

+		       ySrc + src_yoff,

+		       xDst + dst_xoff,

+		       yDst + dst_yoff,

+		       nshapes, shapes);

 	}

-	fbRasterizeTrapezoid (pPicture, &trap, x_off, y_off);

     }

+

+    free_pixman_pict (pSrc, src);

+    free_pixman_pict (pDst, dst);

 }

 

+void

+fbTrapezoids (CARD8	    op,

+	      PicturePtr    pSrc,

+	      PicturePtr    pDst,

+	      PictFormatPtr maskFormat,

+	      INT16	    xSrc,

+	      INT16	    ySrc,

+	      int	    ntrap,

+	      xTrapezoid    *traps)

+{

+    int xDst, yDst;

+

+    xDst = traps[0].left.p1.x >> 16;

+    yDst = traps[0].left.p1.y >> 16;

+    

+    fbShapes ((CompositeShapesFunc)pixman_composite_trapezoids,

+	      op, pSrc, pDst, maskFormat,

+	      xSrc, ySrc, xDst, yDst,

+	      ntrap, sizeof (xTrapezoid), (const uint8_t *)traps);

+}

+

+void

+fbTriangles (CARD8	    op,

+	     PicturePtr    pSrc,

+	     PicturePtr    pDst,

+	     PictFormatPtr maskFormat,

+	     INT16	    xSrc,

+	     INT16	    ySrc,

+	     int	    ntris,

+	     xTriangle    *tris)

+{ 

+    int xDst, yDst;

+

+    xDst = tris[0].p1.x >> 16;

+    yDst = tris[0].p1.y >> 16;

+    

+    fbShapes ((CompositeShapesFunc)pixman_composite_triangles,

+	      op, pSrc, pDst, maskFormat,

+	      xSrc, ySrc, xDst, yDst,

+	      ntris, sizeof (xTriangle), (const uint8_t *)tris);

+}

diff --git a/xorg-server/hw/xfree86/common/xf86Config.c b/xorg-server/hw/xfree86/common/xf86Config.c
index 4246f6d71..1dea47feb 100644
--- a/xorg-server/hw/xfree86/common/xf86Config.c
+++ b/xorg-server/hw/xfree86/common/xf86Config.c
@@ -1224,7 +1224,8 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
             devs[count - 1] = xnfalloc(sizeof(InputInfoRec));

 	    *devs[count - 1] = Pointer;

 	    devs[count - 1]->options =

-				xf86addNewOption(NULL, xnfstrdup("CorePointer"), NULL);

+				xf86addNewOption(devs[count -1]->options,

+				    xnfstrdup("CorePointer"), NULL);

 	    devs[count] = NULL;

 	    servlayoutp->inputs = devs;

 	}

@@ -1364,7 +1365,8 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
             devs[count - 1] = xnfalloc(sizeof(InputInfoRec));

 	    *devs[count - 1] = Keyboard;

 	    devs[count - 1]->options =

-				xf86addNewOption(NULL, xnfstrdup("CoreKeyboard"), NULL);

+				xf86addNewOption(devs[count - 1]->options,

+				    xnfstrdup("CoreKeyboard"), NULL);

 	    devs[count] = NULL;

 	    servlayoutp->inputs = devs;

 	}

diff --git a/xorg-server/hw/xfree86/common/xf86Option.c b/xorg-server/hw/xfree86/common/xf86Option.c
index 16c27e5ee..08f143347 100644
--- a/xorg-server/hw/xfree86/common/xf86Option.c
+++ b/xorg-server/hw/xfree86/common/xf86Option.c
@@ -1,895 +1,916 @@
-/*
- * Copyright (c) 1998-2003 by The XFree86 Project, Inc.
- *
- * 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 COPYRIGHT HOLDER(S) OR AUTHOR(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 of the copyright holder(s)
- * and author(s) 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 copyright holder(s) and author(s).
- */
-
-/*
- * Author: David Dawes <dawes@xfree86.org>
- *
- * This file includes public option handling functions.
- */
-
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include <stdlib.h>
-#include <ctype.h>
-#include <X11/X.h>
-#include "os.h"
-#include "xf86.h"
-#include "xf86Xinput.h"
-#include "xf86Optrec.h"
-#include "xf86Parser.h"
-
-static Bool ParseOptionValue(int scrnIndex, pointer options, OptionInfoPtr p,
-			     Bool markUsed);
-
-/*
- * xf86CollectOptions collects the options from each of the config file
- * sections used by the screen and puts the combined list in pScrn->options.
- * This function requires that the following have been initialised:
- *
- *	pScrn->confScreen
- *	pScrn->Entities[i]->device
- *	pScrn->display
- *	pScrn->monitor
- *
- * The extraOpts parameter may optionally contain a list of additional options
- * to include.
- *
- * The order of precedence for options is:
- *
- *   extraOpts, display, confScreen, monitor, device
- */
-
-void
-xf86CollectOptions(ScrnInfoPtr pScrn, pointer extraOpts)
-{
-    XF86OptionPtr tmp;
-    XF86OptionPtr extras = (XF86OptionPtr)extraOpts;
-    GDevPtr device;
-    
-    int i;
-
-    pScrn->options = NULL;
-
-    for (i=pScrn->numEntities - 1; i >= 0; i--) {
-	device = xf86GetDevFromEntity(pScrn->entityList[i],
-					pScrn->entityInstanceList[i]);
-	if (device && device->options) {
-	    tmp = xf86optionListDup(device->options);
-	    if (pScrn->options)
-		xf86optionListMerge(pScrn->options,tmp);
-	    else
-		pScrn->options = tmp;
-	}
-    }
-    if (pScrn->monitor->options) {
-	tmp = xf86optionListDup(pScrn->monitor->options);
-	if (pScrn->options)
-	    pScrn->options = xf86optionListMerge(pScrn->options, tmp);
-	else
-	    pScrn->options = tmp;
-    }
-    if (pScrn->confScreen->options) {
-	tmp = xf86optionListDup(pScrn->confScreen->options);
-	if (pScrn->options)
-	    pScrn->options = xf86optionListMerge(pScrn->options, tmp);
-	else
-	    pScrn->options = tmp;
-    }
-    if (pScrn->display->options) {
-	tmp = xf86optionListDup(pScrn->display->options);
-	if (pScrn->options)
-	    pScrn->options = xf86optionListMerge(pScrn->options, tmp);
-	else
-	    pScrn->options = tmp;
-    }
-    if (extras) {
-	tmp = xf86optionListDup(extras);
-	if (pScrn->options)
-	    pScrn->options = xf86optionListMerge(pScrn->options, tmp);
-	else
-	    pScrn->options = tmp;
-    }
-}
-
-/*
- * xf86CollectInputOptions collects extra options for an InputDevice (other
- * than those added by the config backend).
- * The options are merged into the existing ones and thus take precedence
- * over the others.
- */
-
-void
-xf86CollectInputOptions(InputInfoPtr pInfo, const char **defaultOpts)
-{
-    if (defaultOpts) {
-	XF86OptionPtr tmp =xf86optionListCreate(defaultOpts, -1, 0);
-	if (pInfo->options)
-	    pInfo->options = xf86optionListMerge(tmp, pInfo->options);
-	else
-	    pInfo->options = tmp;
-    }
-}
-
-/**
- * Duplicate the option list passed in. The returned pointer will be a newly
- * allocated option list and must be freed by the caller.
- */
-pointer
-xf86OptionListDuplicate(pointer options)
-{
-    pointer o = NULL;
-
-    while (options)
-    {
-        o = xf86AddNewOption(o, xf86OptionName(options), xf86OptionValue(options));
-        options = xf86nextOption(options);
-    }
-
-    return o;
-}
-
-
-/* Created for new XInput stuff -- essentially extensions to the parser	*/
-
-static int
-LookupIntOption(pointer optlist, const char *name, int deflt, Bool markUsed)
-{
-    OptionInfoRec o;
-
-    o.name = name;
-    o.type = OPTV_INTEGER;
-    if (ParseOptionValue(-1, optlist, &o, markUsed))
-	deflt = o.value.num;
-    return deflt;
-}
-
-
-static double
-LookupRealOption(pointer optlist, const char *name, double deflt,
-		 Bool markUsed)
-{
-    OptionInfoRec o;
-
-    o.name = name;
-    o.type = OPTV_REAL;
-    if (ParseOptionValue(-1, optlist, &o, markUsed))
-	deflt = o.value.realnum;
-    return deflt;
-}
-
-
-static char *
-LookupStrOption(pointer optlist, const char *name, char *deflt, Bool markUsed)
-{
-    OptionInfoRec o;
-
-    o.name = name;
-    o.type = OPTV_STRING;
-    if (ParseOptionValue(-1, optlist, &o, markUsed))
-        deflt = o.value.str;
-    if (deflt)
-	return strdup(deflt);
-    else
-	return NULL;
-}
-
-
-static int
-LookupBoolOption(pointer optlist, const char *name, int deflt, Bool markUsed)
-{
-    OptionInfoRec o;
-
-    o.name = name;
-    o.type = OPTV_BOOLEAN;
-    if (ParseOptionValue(-1, optlist, &o, markUsed))
-	deflt = o.value.bool;
-    return deflt;
-}
-
-static int
-LookupPercentOption(pointer optlist, const char *name, double deflt, Bool markUsed)
-{
-    OptionInfoRec o;
-
-    o.name = name;
-    o.type = OPTV_PERCENT;
-    if (ParseOptionValue(-1, optlist, &o, markUsed))
-	deflt = o.value.realnum;
-    return deflt;
-}
-
-/* These xf86Set* functions are intended for use by non-screen specific code */
-
-int
-xf86SetIntOption(pointer optlist, const char *name, int deflt)
-{
-    return LookupIntOption(optlist, name, deflt, TRUE);
-}
-
-
-double
-xf86SetRealOption(pointer optlist, const char *name, double deflt)
-{
-    return LookupRealOption(optlist, name, deflt, TRUE);
-}
-
-
-char *
-xf86SetStrOption(pointer optlist, const char *name, char *deflt)
-{
-    return LookupStrOption(optlist, name, deflt, TRUE);
-}
-
-
-int
-xf86SetBoolOption(pointer optlist, const char *name, int deflt)
-{
-    return LookupBoolOption(optlist, name, deflt, TRUE);
-}
-
-double
-xf86SetPercentOption(pointer optlist, const char *name, double deflt)
-{
-    return LookupPercentOption(optlist, name, deflt, TRUE);
-}
-
-/*
- * These are like the Set*Option functions, but they don't mark the options
- * as used.
- */
-int
-xf86CheckIntOption(pointer optlist, const char *name, int deflt)
-{
-    return LookupIntOption(optlist, name, deflt, FALSE);
-}
-
-
-double
-xf86CheckRealOption(pointer optlist, const char *name, double deflt)
-{
-    return LookupRealOption(optlist, name, deflt, FALSE);
-}
-
-
-char *
-xf86CheckStrOption(pointer optlist, const char *name, char *deflt)
-{
-    return LookupStrOption(optlist, name, deflt, FALSE);
-}
-
-
-int
-xf86CheckBoolOption(pointer optlist, const char *name, int deflt)
-{
-    return LookupBoolOption(optlist, name, deflt, FALSE);
-}
-
-
-double
-xf86CheckPercentOption(pointer optlist, const char *name, double deflt)
-{
-    return LookupPercentOption(optlist, name, deflt, FALSE);
-}
-/*
- * addNewOption() has the required property of replacing the option value
- * if the option is already present.
- */
-pointer
-xf86ReplaceIntOption(pointer optlist, const char *name, const int val)
-{
-    char tmp[16];
-    sprintf(tmp,"%i",val);
-    return xf86AddNewOption(optlist,name,tmp);
-}
-
-pointer
-xf86ReplaceRealOption(pointer optlist, const char *name, const double val)
-{
-    char tmp[32];
-    snprintf(tmp,32,"%f",val);
-    return xf86AddNewOption(optlist,name,tmp);
-}
-
-pointer
-xf86ReplaceBoolOption(pointer optlist, const char *name, const Bool val)
-{
-    return xf86AddNewOption(optlist,name,val?"True":"False");
-}
-
-pointer
-xf86ReplacePercentOption(pointer optlist, const char *name, const double val)
-{
-    char tmp[16];
-    sprintf(tmp, "%lf%%", val);
-    return xf86AddNewOption(optlist,name,tmp);
-}
-
-pointer
-xf86ReplaceStrOption(pointer optlist, const char *name, const char* val)
-{
-      return xf86AddNewOption(optlist,name,val);
-}
-
-pointer
-xf86AddNewOption(pointer head, const char *name, const char *val)
-{
-    /* XXX These should actually be allocated in the parser library. */
-    char *tmp = strdup(val);
-    char *tmp_name = strdup(name);
-
-    return xf86addNewOption(head, tmp_name, tmp);
-}
-
-
-pointer
-xf86NewOption(char *name, char *value)
-{
-    return xf86newOption(name, value);
-}
-
-
-pointer
-xf86NextOption(pointer list)
-{
-    return xf86nextOption(list);
-}
-
-pointer
-xf86OptionListCreate(const char **options, int count, int used)
-{
-	return xf86optionListCreate(options, count, used);
-}
-
-pointer
-xf86OptionListMerge(pointer head, pointer tail)
-{
-	return xf86optionListMerge(head, tail);
-}
-
-void
-xf86OptionListFree(pointer opt)
-{
-	xf86optionListFree(opt);
-}
-
-char *
-xf86OptionName(pointer opt)
-{
-	return xf86optionName(opt);
-}
-
-char *
-xf86OptionValue(pointer opt)
-{
-	return xf86optionValue(opt);
-}
-
-void
-xf86OptionListReport(pointer parm)
-{
-    XF86OptionPtr opts = parm;
-
-    while(opts) {
-	if (xf86optionValue(opts))
-	    xf86ErrorFVerb(5, "\tOption \"%s\" \"%s\"\n",
-			    xf86optionName(opts), xf86optionValue(opts));
-	else
-	    xf86ErrorFVerb( 5, "\tOption \"%s\"\n", xf86optionName(opts));
-	opts = xf86nextOption(opts);
-    }
-}
-
-/* End of XInput-caused section	*/
-
-pointer
-xf86FindOption(pointer options, const char *name)
-{
-    return xf86findOption(options, name);
-}
-
-
-char *
-xf86FindOptionValue(pointer options, const char *name)
-{
-    return xf86findOptionValue(options, name);
-}
-
-
-void
-xf86MarkOptionUsed(pointer option)
-{
-    if (option != NULL)
-	((XF86OptionPtr)option)->opt_used = TRUE;
-}
-
-
-void
-xf86MarkOptionUsedByName(pointer options, const char *name)
-{
-    XF86OptionPtr opt;
-
-    opt = xf86findOption(options, name);
-    if (opt != NULL)
-	opt->opt_used = TRUE;
-}
-
-Bool
-xf86CheckIfOptionUsed(pointer option)
-{
-    if (option != NULL)
-	return ((XF86OptionPtr)option)->opt_used;
-    else
-	return FALSE;
-}
-
-Bool
-xf86CheckIfOptionUsedByName(pointer options, const char *name)
-{
-    XF86OptionPtr opt;
-
-    opt = xf86findOption(options, name);
-    if (opt != NULL)
-	return opt->opt_used;
-    else
-	return FALSE;
-}
-
-void
-xf86ShowUnusedOptions(int scrnIndex, pointer options)
-{
-    XF86OptionPtr opt = options;
-
-    while (opt) {
-	if (opt->opt_name && !opt->opt_used) {
-	    xf86DrvMsg(scrnIndex, X_WARNING, "Option \"%s\" is not used\n",
-			opt->opt_name);
-	}
-	opt = opt->list.next;
-    }
-}
-
-
-static Bool
-GetBoolValue(OptionInfoPtr p, const char *s)
-{
-    return xf86getBoolValue(&p->value.bool, s);
-}
-
-static Bool
-ParseOptionValue(int scrnIndex, pointer options, OptionInfoPtr p,
-		 Bool markUsed)
-{
-    char *s, *end;
-    Bool wasUsed = FALSE;
-
-    if ((s = xf86findOptionValue(options, p->name)) != NULL) {
-	if (markUsed) {
-	    wasUsed = xf86CheckIfOptionUsedByName(options, p->name);
-	    xf86MarkOptionUsedByName(options, p->name);
-	}
-	switch (p->type) {
-	case OPTV_INTEGER:
-	    if (*s == '\0') {
-		xf86DrvMsg(scrnIndex, X_WARNING,
-			   "Option \"%s\" requires an integer value\n",
-			   p->name);
-		p->found = FALSE;
-	    } else {
-		p->value.num = strtoul(s, &end, 0);
-		if (*end == '\0') {
-		    p->found = TRUE;
-		} else {
-		    xf86DrvMsg(scrnIndex, X_WARNING,
-			       "Option \"%s\" requires an integer value\n",
-			        p->name);
-		    p->found = FALSE;
-		}
-	    }
-	    break;
-	case OPTV_STRING:
-	    if (*s == '\0') {
-		xf86DrvMsg(scrnIndex, X_WARNING,
-			   "Option \"%s\" requires an string value\n",
-			   p->name);
-		p->found = FALSE;
-	    } else {
-		p->value.str = s;
-		p->found = TRUE;
-	    }
-	    break;
-	case OPTV_ANYSTR:
-	    p->value.str = s;
-	    p->found = TRUE;
-	    break;
-	case OPTV_REAL:	
-	    if (*s == '\0') {
-		xf86DrvMsg(scrnIndex, X_WARNING,
-			   "Option \"%s\" requires a floating point value\n",
-			   p->name);
-		p->found = FALSE;
-	    } else {
-		p->value.realnum = strtod(s, &end);
-		if (*end == '\0') {
-		    p->found = TRUE;
-		} else {
-		    xf86DrvMsg(scrnIndex, X_WARNING,
-			    "Option \"%s\" requires a floating point value\n",
-			    p->name);
-		    p->found = FALSE;
-		}
-	    }
-	    break;
-	case OPTV_BOOLEAN:
-	    if (GetBoolValue(p, s)) {
-		p->found = TRUE;
-	    } else {
-		xf86DrvMsg(scrnIndex, X_WARNING,
-			   "Option \"%s\" requires a boolean value\n", p->name);
-		p->found = FALSE;
-	    }
-	    break;
-	case OPTV_PERCENT:
-	    {
-		char tmp = 0;
-		/* awkward match, but %% doesn't increase the match counter,
-		 * hence 100 looks the same as 100% to the caller of sccanf
-		 */
-		if (sscanf(s, "%lf%c", &p->value.realnum, &tmp) != 2 || tmp != '%') {
-		    xf86DrvMsg(scrnIndex, X_WARNING,
-			       "Option \"%s\" requires a percent value\n", p->name);
-		    p->found = FALSE;
-		} else {
-		    p->found = TRUE;
-		}
-	    }
-	    break;
-	case OPTV_FREQ:	
-	    if (*s == '\0') {
-		xf86DrvMsg(scrnIndex, X_WARNING,
-			   "Option \"%s\" requires a frequency value\n",
-			   p->name);
-		p->found = FALSE;
-	    } else {
-		double freq = strtod(s, &end);
-		int    units = 0;
-
-		if (end != s) {
-		    p->found = TRUE;
-		    if (!xf86NameCmp(end, "Hz"))
-			units = 1;
-		    else if (!xf86NameCmp(end, "kHz") ||
-			     !xf86NameCmp(end, "k"))
-			units = 1000;
-		    else if (!xf86NameCmp(end, "MHz") ||
-			     !xf86NameCmp(end, "M"))
-			units = 1000000;
-		    else {
-			xf86DrvMsg(scrnIndex, X_WARNING,
-			    "Option \"%s\" requires a frequency value\n",
-			    p->name);
-			p->found = FALSE;
-		    }
-		    if (p->found)
-			freq *= (double)units;
-		} else {
-		    xf86DrvMsg(scrnIndex, X_WARNING,
-			    "Option \"%s\" requires a frequency value\n",
-			    p->name);
-		    p->found = FALSE;
-		}
-		if (p->found) {
-		    p->value.freq.freq = freq;
-		    p->value.freq.units = units;
-		}
-	    }
-	    break;
-	case OPTV_NONE:
-	    /* Should never get here */
-	    p->found = FALSE;
-	    break;
-	}
-	if (p->found && markUsed) {
-	    int verb = 2;
-	    if (wasUsed)
-		verb = 4;
-	    xf86DrvMsgVerb(scrnIndex, X_CONFIG, verb, "Option \"%s\"", p->name);
-	    if (!(p->type == OPTV_BOOLEAN && *s == 0)) {
-		xf86ErrorFVerb(verb, " \"%s\"", s);
-	    }
-	    xf86ErrorFVerb(verb, "\n");
-	}
-    } else if (p->type == OPTV_BOOLEAN) {
-	/* Look for matches with options with or without a "No" prefix. */
-	char *n, *newn;
-	OptionInfoRec opt;
-
-	n = xf86NormalizeName(p->name);
-	if (!n) {
-	    p->found = FALSE;
-	    return FALSE;
-	}
-	if (strncmp(n, "no", 2) == 0) {
-	    newn = n + 2;
-	} else {
-	    free(n);
-	    if (asprintf(&n, "No%s", p->name) == -1) {
-		p->found = FALSE;
-		return FALSE;
-	    }
-	    newn = n;
-	}
-	if ((s = xf86findOptionValue(options, newn)) != NULL) {
-	    if (markUsed)
-		xf86MarkOptionUsedByName(options, newn);
-	    if (GetBoolValue(&opt, s)) {
-		p->value.bool = !opt.value.bool;
-		p->found = TRUE;
-	    } else {
-		xf86DrvMsg(scrnIndex, X_WARNING,
-			   "Option \"%s\" requires a boolean value\n", newn);
-		p->found = FALSE;
-	    }
-	} else {
-	    p->found = FALSE;
-	}
-	if (p->found && markUsed) {
-	    xf86DrvMsgVerb(scrnIndex, X_CONFIG, 2, "Option \"%s\"", newn);
-	    if (*s != 0) {
-		xf86ErrorFVerb(2, " \"%s\"", s);
-	    }
-	    xf86ErrorFVerb(2, "\n");
-	}
-	free(n);
-    } else {
-	p->found = FALSE;
-    }
-    return p->found;
-}
-
-
-void
-xf86ProcessOptions(int scrnIndex, pointer options, OptionInfoPtr optinfo)
-{
-    OptionInfoPtr p;
-
-    for (p = optinfo; p->name != NULL; p++) {
-	ParseOptionValue(scrnIndex, options, p, TRUE);
-    }
-}
-
-
-OptionInfoPtr
-xf86TokenToOptinfo(const OptionInfoRec *table, int token)
-{
-    const OptionInfoRec *p, *match = NULL, *set = NULL;
-
-    if (!table) {
-	ErrorF("xf86TokenToOptinfo: table is NULL\n");
-	return NULL;
-    }
-
-    for (p = table; p->token >= 0; p++) {
-	if (p->token == token) {
-	    match = p;
-	    if (p->found)
-		set = p;
-	}
-    }
-
-    if (set)
-	return (OptionInfoPtr)set;
-    else if (match)
-	return (OptionInfoPtr)match;
-    else
-	return NULL;
-}
-
-
-const char *
-xf86TokenToOptName(const OptionInfoRec *table, int token)
-{
-    const OptionInfoRec *p;
-
-    p = xf86TokenToOptinfo(table, token);
-    return p->name;
-}
-
-
-Bool
-xf86IsOptionSet(const OptionInfoRec *table, int token)
-{
-    OptionInfoPtr p;
-
-    p = xf86TokenToOptinfo(table, token);
-    return p && p->found;
-}
-
-
-char *
-xf86GetOptValString(const OptionInfoRec *table, int token)
-{
-    OptionInfoPtr p;
-
-    p = xf86TokenToOptinfo(table, token);
-    if (p && p->found)
-	return p->value.str;
-    else
-	return NULL;
-}
-
-
-Bool
-xf86GetOptValInteger(const OptionInfoRec *table, int token, int *value)
-{
-    OptionInfoPtr p;
-
-    p = xf86TokenToOptinfo(table, token);
-    if (p && p->found) {
-	*value = p->value.num;
-	return TRUE;
-    } else
-	return FALSE;
-}
-
-
-Bool
-xf86GetOptValULong(const OptionInfoRec *table, int token, unsigned long *value)
-{
-    OptionInfoPtr p;
-
-    p = xf86TokenToOptinfo(table, token);
-    if (p && p->found) {
-	*value = p->value.num;
-	return TRUE;
-    } else
-	return FALSE;
-}
-
-
-Bool
-xf86GetOptValReal(const OptionInfoRec *table, int token, double *value)
-{
-    OptionInfoPtr p;
-
-    p = xf86TokenToOptinfo(table, token);
-    if (p && p->found) {
-	*value = p->value.realnum;
-	return TRUE;
-    } else
-	return FALSE;
-}
-
-
-Bool
-xf86GetOptValFreq(const OptionInfoRec *table, int token,
-		  OptFreqUnits expectedUnits, double *value)
-{
-    OptionInfoPtr p;
-
-    p = xf86TokenToOptinfo(table, token);
-    if (p && p->found) {
-	if (p->value.freq.units > 0) {
-	    /* Units give, so the scaling is known. */
-	    switch (expectedUnits) {
-	    case OPTUNITS_HZ:
-		*value = p->value.freq.freq;
-		break;
-	    case OPTUNITS_KHZ:
-		*value = p->value.freq.freq / 1000.0;
-		break;
-	    case OPTUNITS_MHZ:
-		*value = p->value.freq.freq / 1000000.0;
-		break;
-	    }
-	} else {
-	    /* No units given, so try to guess the scaling. */
-	    switch (expectedUnits) {
-	    case OPTUNITS_HZ:
-		*value = p->value.freq.freq;
-		break;
-	    case OPTUNITS_KHZ:
-		if (p->value.freq.freq > 1000.0)
-		    *value = p->value.freq.freq / 1000.0;
-		else
-		    *value = p->value.freq.freq;
-		break;
-	    case OPTUNITS_MHZ:
-		if (p->value.freq.freq > 1000000.0)
-		    *value = p->value.freq.freq / 1000000.0;
-		else if (p->value.freq.freq > 1000.0)
-		    *value = p->value.freq.freq / 1000.0;
-		else
-		    *value = p->value.freq.freq;
-	    }
-	}
-	return TRUE;
-    } else
-	return FALSE;
-}
-
-
-Bool
-xf86GetOptValBool(const OptionInfoRec *table, int token, Bool *value)
-{
-    OptionInfoPtr p;
-
-    p = xf86TokenToOptinfo(table, token);
-    if (p && p->found) {
-	*value = p->value.bool;
-	return TRUE;
-    } else
-	return FALSE;
-}
-
-
-Bool
-xf86ReturnOptValBool(const OptionInfoRec *table, int token, Bool def)
-{
-    OptionInfoPtr p;
-
-    p = xf86TokenToOptinfo(table, token);
-    if (p && p->found) {
-	return p->value.bool;
-    } else
-	return def;
-}
-
-
-int
-xf86NameCmp(const char *s1, const char *s2)
-{
-    return xf86nameCompare(s1, s2);
-}
-
-char *
-xf86NormalizeName(const char *s)
-{
-    char *ret, *q;
-    const char *p;
-
-    if (s == NULL)
-	return NULL;
-
-    ret = malloc(strlen(s) + 1);
-    for (p = s, q = ret; *p != 0; p++) {
-	switch (*p) {
-	case '_':
-	case ' ':
-	case '\t':
-	    continue;
-	default:
-	    if (isupper(*p))
-		*q++ = tolower(*p);
-	    else
-		*q++ = *p;
-	}
-    }
-    *q = '\0';
-    return ret;
-}
+/*

+ * Copyright (c) 1998-2003 by The XFree86 Project, Inc.

+ *

+ * 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 COPYRIGHT HOLDER(S) OR AUTHOR(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 of the copyright holder(s)

+ * and author(s) 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 copyright holder(s) and author(s).

+ */

+

+/*

+ * Author: David Dawes <dawes@xfree86.org>

+ *

+ * This file includes public option handling functions.

+ */

+

+#ifdef HAVE_XORG_CONFIG_H

+#include <xorg-config.h>

+#endif

+

+#include <stdlib.h>

+#include <ctype.h>

+#include <X11/X.h>

+#include "os.h"

+#include "xf86.h"

+#include "xf86Xinput.h"

+#include "xf86Optrec.h"

+#include "xf86Parser.h"

+

+static Bool ParseOptionValue(int scrnIndex, pointer options, OptionInfoPtr p,

+			     Bool markUsed);

+

+/*

+ * xf86CollectOptions collects the options from each of the config file

+ * sections used by the screen and puts the combined list in pScrn->options.

+ * This function requires that the following have been initialised:

+ *

+ *	pScrn->confScreen

+ *	pScrn->Entities[i]->device

+ *	pScrn->display

+ *	pScrn->monitor

+ *

+ * The extraOpts parameter may optionally contain a list of additional options

+ * to include.

+ *

+ * The order of precedence for options is:

+ *

+ *   extraOpts, display, confScreen, monitor, device

+ */

+

+void

+xf86CollectOptions(ScrnInfoPtr pScrn, pointer extraOpts)

+{

+    XF86OptionPtr tmp;

+    XF86OptionPtr extras = (XF86OptionPtr)extraOpts;

+    GDevPtr device;

+    

+    int i;

+

+    pScrn->options = NULL;

+

+    for (i=pScrn->numEntities - 1; i >= 0; i--) {

+	device = xf86GetDevFromEntity(pScrn->entityList[i],

+					pScrn->entityInstanceList[i]);

+	if (device && device->options) {

+	    tmp = xf86optionListDup(device->options);

+	    if (pScrn->options)

+		xf86optionListMerge(pScrn->options,tmp);

+	    else

+		pScrn->options = tmp;

+	}

+    }

+    if (pScrn->monitor->options) {

+	tmp = xf86optionListDup(pScrn->monitor->options);

+	if (pScrn->options)

+	    pScrn->options = xf86optionListMerge(pScrn->options, tmp);

+	else

+	    pScrn->options = tmp;

+    }

+    if (pScrn->confScreen->options) {

+	tmp = xf86optionListDup(pScrn->confScreen->options);

+	if (pScrn->options)

+	    pScrn->options = xf86optionListMerge(pScrn->options, tmp);

+	else

+	    pScrn->options = tmp;

+    }

+    if (pScrn->display->options) {

+	tmp = xf86optionListDup(pScrn->display->options);

+	if (pScrn->options)

+	    pScrn->options = xf86optionListMerge(pScrn->options, tmp);

+	else

+	    pScrn->options = tmp;

+    }

+    if (extras) {

+	tmp = xf86optionListDup(extras);

+	if (pScrn->options)

+	    pScrn->options = xf86optionListMerge(pScrn->options, tmp);

+	else

+	    pScrn->options = tmp;

+    }

+}

+

+/*

+ * xf86CollectInputOptions collects extra options for an InputDevice (other

+ * than those added by the config backend).

+ * The options are merged into the existing ones and thus take precedence

+ * over the others.

+ */

+

+void

+xf86CollectInputOptions(InputInfoPtr pInfo, const char **defaultOpts)

+{

+    if (defaultOpts) {

+	XF86OptionPtr tmp =xf86optionListCreate(defaultOpts, -1, 0);

+	if (pInfo->options)

+	    pInfo->options = xf86optionListMerge(tmp, pInfo->options);

+	else

+	    pInfo->options = tmp;

+    }

+}

+

+/**

+ * Duplicate the option list passed in. The returned pointer will be a newly

+ * allocated option list and must be freed by the caller.

+ */

+pointer

+xf86OptionListDuplicate(pointer options)

+{

+    pointer o = NULL;

+

+    while (options)

+    {

+        o = xf86AddNewOption(o, xf86OptionName(options), xf86OptionValue(options));

+        options = xf86nextOption(options);

+    }

+

+    return o;

+}

+

+

+/* Created for new XInput stuff -- essentially extensions to the parser	*/

+

+static int

+LookupIntOption(pointer optlist, const char *name, int deflt, Bool markUsed)

+{

+    OptionInfoRec o;

+

+    o.name = name;

+    o.type = OPTV_INTEGER;

+    if (ParseOptionValue(-1, optlist, &o, markUsed))

+	deflt = o.value.num;

+    return deflt;

+}

+

+

+static double

+LookupRealOption(pointer optlist, const char *name, double deflt,

+		 Bool markUsed)

+{

+    OptionInfoRec o;

+

+    o.name = name;

+    o.type = OPTV_REAL;

+    if (ParseOptionValue(-1, optlist, &o, markUsed))

+	deflt = o.value.realnum;

+    return deflt;

+}

+

+

+static char *

+LookupStrOption(pointer optlist, const char *name, char *deflt, Bool markUsed)

+{

+    OptionInfoRec o;

+

+    o.name = name;

+    o.type = OPTV_STRING;

+    if (ParseOptionValue(-1, optlist, &o, markUsed))

+        deflt = o.value.str;

+    if (deflt)

+	return strdup(deflt);

+    else

+	return NULL;

+}

+

+

+static int

+LookupBoolOption(pointer optlist, const char *name, int deflt, Bool markUsed)

+{

+    OptionInfoRec o;

+

+    o.name = name;

+    o.type = OPTV_BOOLEAN;

+    if (ParseOptionValue(-1, optlist, &o, markUsed))

+	deflt = o.value.bool;

+    return deflt;

+}

+

+static double

+LookupPercentOption(pointer optlist, const char *name, double deflt, Bool markUsed)

+{

+    OptionInfoRec o;

+

+    o.name = name;

+    o.type = OPTV_PERCENT;

+    if (ParseOptionValue(-1, optlist, &o, markUsed))

+	deflt = o.value.realnum;

+    return deflt;

+}

+

+/* These xf86Set* functions are intended for use by non-screen specific code */

+

+int

+xf86SetIntOption(pointer optlist, const char *name, int deflt)

+{

+    return LookupIntOption(optlist, name, deflt, TRUE);

+}

+

+

+double

+xf86SetRealOption(pointer optlist, const char *name, double deflt)

+{

+    return LookupRealOption(optlist, name, deflt, TRUE);

+}

+

+

+char *

+xf86SetStrOption(pointer optlist, const char *name, char *deflt)

+{

+    return LookupStrOption(optlist, name, deflt, TRUE);

+}

+

+

+int

+xf86SetBoolOption(pointer optlist, const char *name, int deflt)

+{

+    return LookupBoolOption(optlist, name, deflt, TRUE);

+}

+

+double

+xf86SetPercentOption(pointer optlist, const char *name, double deflt)

+{

+    return LookupPercentOption(optlist, name, deflt, TRUE);

+}

+

+/*

+ * These are like the Set*Option functions, but they don't mark the options

+ * as used.

+ */

+int

+xf86CheckIntOption(pointer optlist, const char *name, int deflt)

+{

+    return LookupIntOption(optlist, name, deflt, FALSE);

+}

+

+

+double

+xf86CheckRealOption(pointer optlist, const char *name, double deflt)

+{

+    return LookupRealOption(optlist, name, deflt, FALSE);

+}

+

+

+char *

+xf86CheckStrOption(pointer optlist, const char *name, char *deflt)

+{

+    return LookupStrOption(optlist, name, deflt, FALSE);

+}

+

+

+int

+xf86CheckBoolOption(pointer optlist, const char *name, int deflt)

+{

+    return LookupBoolOption(optlist, name, deflt, FALSE);

+}

+

+

+double

+xf86CheckPercentOption(pointer optlist, const char *name, double deflt)

+{

+    return LookupPercentOption(optlist, name, deflt, FALSE);

+}

+/*

+ * addNewOption() has the required property of replacing the option value

+ * if the option is already present.

+ */

+pointer

+xf86ReplaceIntOption(pointer optlist, const char *name, const int val)

+{

+    char tmp[16];

+    sprintf(tmp,"%i",val);

+    return xf86AddNewOption(optlist,name,tmp);

+}

+

+pointer

+xf86ReplaceRealOption(pointer optlist, const char *name, const double val)

+{

+    char tmp[32];

+    snprintf(tmp,32,"%f",val);

+    return xf86AddNewOption(optlist,name,tmp);

+}

+

+pointer

+xf86ReplaceBoolOption(pointer optlist, const char *name, const Bool val)

+{

+    return xf86AddNewOption(optlist,name,val?"True":"False");

+}

+

+pointer

+xf86ReplacePercentOption(pointer optlist, const char *name, const double val)

+{

+    char tmp[16];

+    sprintf(tmp, "%lf%%", val);

+    return xf86AddNewOption(optlist,name,tmp);

+}

+

+pointer

+xf86ReplaceStrOption(pointer optlist, const char *name, const char* val)

+{

+      return xf86AddNewOption(optlist,name,val);

+}

+

+pointer

+xf86AddNewOption(pointer head, const char *name, const char *val)

+{

+    /* XXX These should actually be allocated in the parser library. */

+    char *tmp = strdup(val);

+    char *tmp_name = strdup(name);

+

+    return xf86addNewOption(head, tmp_name, tmp);

+}

+

+

+pointer

+xf86NewOption(char *name, char *value)

+{

+    return xf86newOption(name, value);

+}

+

+

+pointer

+xf86NextOption(pointer list)

+{

+    return xf86nextOption(list);

+}

+

+pointer

+xf86OptionListCreate(const char **options, int count, int used)

+{

+	return xf86optionListCreate(options, count, used);

+}

+

+pointer

+xf86OptionListMerge(pointer head, pointer tail)

+{

+	return xf86optionListMerge(head, tail);

+}

+

+void

+xf86OptionListFree(pointer opt)

+{

+	xf86optionListFree(opt);

+}

+

+char *

+xf86OptionName(pointer opt)

+{

+	return xf86optionName(opt);

+}

+

+char *

+xf86OptionValue(pointer opt)

+{

+	return xf86optionValue(opt);

+}

+

+void

+xf86OptionListReport(pointer parm)

+{

+    XF86OptionPtr opts = parm;

+

+    while(opts) {

+	if (xf86optionValue(opts))

+	    xf86ErrorFVerb(5, "\tOption \"%s\" \"%s\"\n",

+			    xf86optionName(opts), xf86optionValue(opts));

+	else

+	    xf86ErrorFVerb( 5, "\tOption \"%s\"\n", xf86optionName(opts));

+	opts = xf86nextOption(opts);

+    }

+}

+

+/* End of XInput-caused section	*/

+

+pointer

+xf86FindOption(pointer options, const char *name)

+{

+    return xf86findOption(options, name);

+}

+

+

+char *

+xf86FindOptionValue(pointer options, const char *name)

+{

+    return xf86findOptionValue(options, name);

+}

+

+

+void

+xf86MarkOptionUsed(pointer option)

+{

+    if (option != NULL)

+	((XF86OptionPtr)option)->opt_used = TRUE;

+}

+

+

+void

+xf86MarkOptionUsedByName(pointer options, const char *name)

+{

+    XF86OptionPtr opt;

+

+    opt = xf86findOption(options, name);

+    if (opt != NULL)

+	opt->opt_used = TRUE;

+}

+

+Bool

+xf86CheckIfOptionUsed(pointer option)

+{

+    if (option != NULL)

+	return ((XF86OptionPtr)option)->opt_used;

+    else

+	return FALSE;

+}

+

+Bool

+xf86CheckIfOptionUsedByName(pointer options, const char *name)

+{

+    XF86OptionPtr opt;

+

+    opt = xf86findOption(options, name);

+    if (opt != NULL)

+	return opt->opt_used;

+    else

+	return FALSE;

+}

+

+void

+xf86ShowUnusedOptions(int scrnIndex, pointer options)

+{

+    XF86OptionPtr opt = options;

+

+    while (opt) {

+	if (opt->opt_name && !opt->opt_used) {

+	    xf86DrvMsg(scrnIndex, X_WARNING, "Option \"%s\" is not used\n",

+			opt->opt_name);

+	}

+	opt = opt->list.next;

+    }

+}

+

+

+static Bool

+GetBoolValue(OptionInfoPtr p, const char *s)

+{

+    return xf86getBoolValue(&p->value.bool, s);

+}

+

+static Bool

+ParseOptionValue(int scrnIndex, pointer options, OptionInfoPtr p,

+		 Bool markUsed)

+{

+    char *s, *end;

+    Bool wasUsed = FALSE;

+

+    if ((s = xf86findOptionValue(options, p->name)) != NULL) {

+	if (markUsed) {

+	    wasUsed = xf86CheckIfOptionUsedByName(options, p->name);

+	    xf86MarkOptionUsedByName(options, p->name);

+	}

+	switch (p->type) {

+	case OPTV_INTEGER:

+	    if (*s == '\0') {

+		if (markUsed) {

+		    xf86DrvMsg(scrnIndex, X_WARNING,

+			       "Option \"%s\" requires an integer value\n",

+			       p->name);

+		}

+		p->found = FALSE;

+	    } else {

+		p->value.num = strtoul(s, &end, 0);

+		if (*end == '\0') {

+		    p->found = TRUE;

+		} else {

+		    if (markUsed) {

+			xf86DrvMsg(scrnIndex, X_WARNING,

+				   "Option \"%s\" requires an integer value\n",

+				    p->name);

+		    }

+		    p->found = FALSE;

+		}

+	    }

+	    break;

+	case OPTV_STRING:

+	    if (*s == '\0') {

+		if (markUsed) {

+		    xf86DrvMsg(scrnIndex, X_WARNING,

+			       "Option \"%s\" requires an string value\n",

+			       p->name);

+		}

+		p->found = FALSE;

+	    } else {

+		p->value.str = s;

+		p->found = TRUE;

+	    }

+	    break;

+	case OPTV_ANYSTR:

+	    p->value.str = s;

+	    p->found = TRUE;

+	    break;

+	case OPTV_REAL:	

+	    if (*s == '\0') {

+		if (markUsed) {

+		    xf86DrvMsg(scrnIndex, X_WARNING,

+			       "Option \"%s\" requires a floating point "

+			       "value\n", p->name);

+		}

+		p->found = FALSE;

+	    } else {

+		p->value.realnum = strtod(s, &end);

+		if (*end == '\0') {

+		    p->found = TRUE;

+		} else {

+		    if (markUsed) {

+			xf86DrvMsg(scrnIndex, X_WARNING,

+				"Option \"%s\" requires a floating point "

+				"value\n", p->name);

+		    }

+		    p->found = FALSE;

+		}

+	    }

+	    break;

+	case OPTV_BOOLEAN:

+	    if (GetBoolValue(p, s)) {

+		p->found = TRUE;

+	    } else {

+		if (markUsed) {

+		    xf86DrvMsg(scrnIndex, X_WARNING,

+			       "Option \"%s\" requires a boolean value\n",

+			       p->name);

+		}

+		p->found = FALSE;

+	    }

+	    break;

+	case OPTV_PERCENT:

+	    {

+		char tmp = 0;

+		/* awkward match, but %% doesn't increase the match counter,

+		 * hence 100 looks the same as 100% to the caller of sccanf

+		 */

+		if (sscanf(s, "%lf%c", &p->value.realnum, &tmp) != 2 || tmp != '%') {

+		    if (markUsed) {

+			xf86DrvMsg(scrnIndex, X_WARNING,

+			       "Option \"%s\" requires a percent value\n", p->name);

+		    }

+		    p->found = FALSE;

+		} else {

+		    p->found = TRUE;

+		}

+	    }

+	    break;

+	case OPTV_FREQ:	

+	    if (*s == '\0') {

+		if (markUsed) {

+		    xf86DrvMsg(scrnIndex, X_WARNING,

+			       "Option \"%s\" requires a frequency value\n",

+			       p->name);

+		}

+		p->found = FALSE;

+	    } else {

+		double freq = strtod(s, &end);

+		int    units = 0;

+

+		if (end != s) {

+		    p->found = TRUE;

+		    if (!xf86NameCmp(end, "Hz"))

+			units = 1;

+		    else if (!xf86NameCmp(end, "kHz") ||

+			     !xf86NameCmp(end, "k"))

+			units = 1000;

+		    else if (!xf86NameCmp(end, "MHz") ||

+			     !xf86NameCmp(end, "M"))

+			units = 1000000;

+		    else {

+			if (markUsed) {

+			    xf86DrvMsg(scrnIndex, X_WARNING,

+				"Option \"%s\" requires a frequency value\n",

+				p->name);

+			}

+			p->found = FALSE;

+		    }

+		    if (p->found)

+			freq *= (double)units;

+		} else {

+		    if (markUsed) {

+			xf86DrvMsg(scrnIndex, X_WARNING,

+				"Option \"%s\" requires a frequency value\n",

+				p->name);

+		    }

+		    p->found = FALSE;

+		}

+		if (p->found) {

+		    p->value.freq.freq = freq;

+		    p->value.freq.units = units;

+		}

+	    }

+	    break;

+	case OPTV_NONE:

+	    /* Should never get here */

+	    p->found = FALSE;

+	    break;

+	}

+	if (p->found && markUsed) {

+	    int verb = 2;

+	    if (wasUsed)

+		verb = 4;

+	    xf86DrvMsgVerb(scrnIndex, X_CONFIG, verb, "Option \"%s\"", p->name);

+	    if (!(p->type == OPTV_BOOLEAN && *s == 0)) {

+		xf86ErrorFVerb(verb, " \"%s\"", s);

+	    }

+	    xf86ErrorFVerb(verb, "\n");

+	}

+    } else if (p->type == OPTV_BOOLEAN) {

+	/* Look for matches with options with or without a "No" prefix. */

+	char *n, *newn;

+	OptionInfoRec opt;

+

+	n = xf86NormalizeName(p->name);

+	if (!n) {

+	    p->found = FALSE;

+	    return FALSE;

+	}

+	if (strncmp(n, "no", 2) == 0) {

+	    newn = n + 2;

+	} else {

+	    free(n);

+	    if (asprintf(&n, "No%s", p->name) == -1) {

+		p->found = FALSE;

+		return FALSE;

+	    }

+	    newn = n;

+	}

+	if ((s = xf86findOptionValue(options, newn)) != NULL) {

+	    if (markUsed)

+		xf86MarkOptionUsedByName(options, newn);

+	    if (GetBoolValue(&opt, s)) {

+		p->value.bool = !opt.value.bool;

+		p->found = TRUE;

+	    } else {

+		xf86DrvMsg(scrnIndex, X_WARNING,

+			   "Option \"%s\" requires a boolean value\n", newn);

+		p->found = FALSE;

+	    }

+	} else {

+	    p->found = FALSE;

+	}

+	if (p->found && markUsed) {

+	    xf86DrvMsgVerb(scrnIndex, X_CONFIG, 2, "Option \"%s\"", newn);

+	    if (*s != 0) {

+		xf86ErrorFVerb(2, " \"%s\"", s);

+	    }

+	    xf86ErrorFVerb(2, "\n");

+	}

+	free(n);

+    } else {

+	p->found = FALSE;

+    }

+    return p->found;

+}

+

+

+void

+xf86ProcessOptions(int scrnIndex, pointer options, OptionInfoPtr optinfo)

+{

+    OptionInfoPtr p;

+

+    for (p = optinfo; p->name != NULL; p++) {

+	ParseOptionValue(scrnIndex, options, p, TRUE);

+    }

+}

+

+

+OptionInfoPtr

+xf86TokenToOptinfo(const OptionInfoRec *table, int token)

+{

+    const OptionInfoRec *p, *match = NULL, *set = NULL;

+

+    if (!table) {

+	ErrorF("xf86TokenToOptinfo: table is NULL\n");

+	return NULL;

+    }

+

+    for (p = table; p->token >= 0; p++) {

+	if (p->token == token) {

+	    match = p;

+	    if (p->found)

+		set = p;

+	}

+    }

+

+    if (set)

+	return (OptionInfoPtr)set;

+    else if (match)

+	return (OptionInfoPtr)match;

+    else

+	return NULL;

+}

+

+

+const char *

+xf86TokenToOptName(const OptionInfoRec *table, int token)

+{

+    const OptionInfoRec *p;

+

+    p = xf86TokenToOptinfo(table, token);

+    return p->name;

+}

+

+

+Bool

+xf86IsOptionSet(const OptionInfoRec *table, int token)

+{

+    OptionInfoPtr p;

+

+    p = xf86TokenToOptinfo(table, token);

+    return p && p->found;

+}

+

+

+char *

+xf86GetOptValString(const OptionInfoRec *table, int token)

+{

+    OptionInfoPtr p;

+

+    p = xf86TokenToOptinfo(table, token);

+    if (p && p->found)

+	return p->value.str;

+    else

+	return NULL;

+}

+

+

+Bool

+xf86GetOptValInteger(const OptionInfoRec *table, int token, int *value)

+{

+    OptionInfoPtr p;

+

+    p = xf86TokenToOptinfo(table, token);

+    if (p && p->found) {

+	*value = p->value.num;

+	return TRUE;

+    } else

+	return FALSE;

+}

+

+

+Bool

+xf86GetOptValULong(const OptionInfoRec *table, int token, unsigned long *value)

+{

+    OptionInfoPtr p;

+

+    p = xf86TokenToOptinfo(table, token);

+    if (p && p->found) {

+	*value = p->value.num;

+	return TRUE;

+    } else

+	return FALSE;

+}

+

+

+Bool

+xf86GetOptValReal(const OptionInfoRec *table, int token, double *value)

+{

+    OptionInfoPtr p;

+

+    p = xf86TokenToOptinfo(table, token);

+    if (p && p->found) {

+	*value = p->value.realnum;

+	return TRUE;

+    } else

+	return FALSE;

+}

+

+

+Bool

+xf86GetOptValFreq(const OptionInfoRec *table, int token,

+		  OptFreqUnits expectedUnits, double *value)

+{

+    OptionInfoPtr p;

+

+    p = xf86TokenToOptinfo(table, token);

+    if (p && p->found) {

+	if (p->value.freq.units > 0) {

+	    /* Units give, so the scaling is known. */

+	    switch (expectedUnits) {

+	    case OPTUNITS_HZ:

+		*value = p->value.freq.freq;

+		break;

+	    case OPTUNITS_KHZ:

+		*value = p->value.freq.freq / 1000.0;

+		break;

+	    case OPTUNITS_MHZ:

+		*value = p->value.freq.freq / 1000000.0;

+		break;

+	    }

+	} else {

+	    /* No units given, so try to guess the scaling. */

+	    switch (expectedUnits) {

+	    case OPTUNITS_HZ:

+		*value = p->value.freq.freq;

+		break;

+	    case OPTUNITS_KHZ:

+		if (p->value.freq.freq > 1000.0)

+		    *value = p->value.freq.freq / 1000.0;

+		else

+		    *value = p->value.freq.freq;

+		break;

+	    case OPTUNITS_MHZ:

+		if (p->value.freq.freq > 1000000.0)

+		    *value = p->value.freq.freq / 1000000.0;

+		else if (p->value.freq.freq > 1000.0)

+		    *value = p->value.freq.freq / 1000.0;

+		else

+		    *value = p->value.freq.freq;

+	    }

+	}

+	return TRUE;

+    } else

+	return FALSE;

+}

+

+

+Bool

+xf86GetOptValBool(const OptionInfoRec *table, int token, Bool *value)

+{

+    OptionInfoPtr p;

+

+    p = xf86TokenToOptinfo(table, token);

+    if (p && p->found) {

+	*value = p->value.bool;

+	return TRUE;

+    } else

+	return FALSE;

+}

+

+

+Bool

+xf86ReturnOptValBool(const OptionInfoRec *table, int token, Bool def)

+{

+    OptionInfoPtr p;

+

+    p = xf86TokenToOptinfo(table, token);

+    if (p && p->found) {

+	return p->value.bool;

+    } else

+	return def;

+}

+

+

+int

+xf86NameCmp(const char *s1, const char *s2)

+{

+    return xf86nameCompare(s1, s2);

+}

+

+char *

+xf86NormalizeName(const char *s)

+{

+    char *ret, *q;

+    const char *p;

+

+    if (s == NULL)

+	return NULL;

+

+    ret = malloc(strlen(s) + 1);

+    for (p = s, q = ret; *p != 0; p++) {

+	switch (*p) {

+	case '_':

+	case ' ':

+	case '\t':

+	    continue;

+	default:

+	    if (isupper(*p))

+		*q++ = tolower(*p);

+	    else

+		*q++ = *p;

+	}

+    }

+    *q = '\0';

+    return ret;

+}

diff --git a/xorg-server/hw/xfree86/common/xf86RandR.c b/xorg-server/hw/xfree86/common/xf86RandR.c
index 3bd15e059..e8e5a3696 100644
--- a/xorg-server/hw/xfree86/common/xf86RandR.c
+++ b/xorg-server/hw/xfree86/common/xf86RandR.c
@@ -242,11 +242,20 @@ xf86RandRSetConfig (ScreenPtr		pScreen,
     ScrnInfoPtr		    scrp = XF86SCRNINFO(pScreen);

     XF86RandRInfoPtr	    randrp = XF86RANDRINFO(pScreen);

     DisplayModePtr	    mode;

-    int			    px, py;

+    int			    pos[MAXDEVICES][2];

     Bool		    useVirtual = FALSE;

     Rotation		    oldRotation = randrp->rotation;

+    DeviceIntPtr	    dev;

+    Bool		    view_adjusted = FALSE;

+

+    for (dev = inputInfo.devices; dev; dev = dev->next)

+    {

+	if (!IsMaster(dev) && !IsFloating(dev))

+		continue;

+

+	miPointerGetPosition(dev, &pos[dev->id][0], &pos[dev->id][1]);

+    }

 

-    miPointerGetPosition(inputInfo.pointer, &px, &py);

     for (mode = scrp->modes; ; mode = mode->next)

     {

 	if (mode->HDisplay == pSize->width &&

@@ -303,17 +312,31 @@ xf86RandRSetConfig (ScreenPtr		pScreen,
 	}

 	return FALSE;

     }

+

     /*

      * Move the cursor back where it belongs; SwitchMode repositions it

+     * FIXME: duplicated code, see modes/xf86RandR12.c

      */

-    if (pScreen == miPointerCurrentScreen ())

+    for (dev = inputInfo.devices; dev; dev = dev->next)

     {

-	px = (px >= pScreen->width ? (pScreen->width - 1) : px);

-	py = (py >= pScreen->height ? (pScreen->height - 1) : py);

+	if (!IsMaster(dev) && !IsFloating(dev))

+		continue;

 

-        xf86SetViewport(pScreen, px, py);

+	if (pScreen == miPointerGetScreen(dev)) {

+	    int px = pos[dev->id][0];

+	    int py = pos[dev->id][1];

 

-        (*pScreen->SetCursorPosition) (inputInfo.pointer, pScreen, px, py, FALSE);

+	    px = (px >= pScreen->width ? (pScreen->width - 1) : px);

+	    py = (py >= pScreen->height ? (pScreen->height - 1) : py);

+

+	    /* Setting the viewpoint makes only sense on one device */

+	    if (!view_adjusted && IsMaster(dev)) {

+		xf86SetViewport(pScreen, px, py);

+		view_adjusted = TRUE;

+	    }

+

+	    (*pScreen->SetCursorPosition) (dev, pScreen, px, py, FALSE);

+	}

     }

 

     return TRUE;

diff --git a/xorg-server/hw/xfree86/loader/Makefile.am b/xorg-server/hw/xfree86/loader/Makefile.am
index 8045885b1..9cb27a2bd 100644
--- a/xorg-server/hw/xfree86/loader/Makefile.am
+++ b/xorg-server/hw/xfree86/loader/Makefile.am
@@ -12,18 +12,21 @@ EXTRA_DIST = \
 	loaderProcs.h \

 	sdksyms.sh

 

+nodist_libloader_la_SOURCES = \

+	sdksyms.c

+

 libloader_la_SOURCES = \

 	loader.c \

 	loaderProcs.h \

 	loadext.c \

         loadmod.c \

-	os.c \

-	sdksyms.c

+	os.c

+

 libloader_la_LIBADD = $(DLOPEN_LIBS)

 

 CLEANFILES = sdksyms.c sdksyms.dep

 

-sdksyms.dep sdksyms.c: sdksyms.sh

+sdksyms.dep sdksyms.c: sdksyms.sh $(top_builddir)/include/do-not-use-config.h

 	CPP='$(CPP)' AWK='$(AWK)' $(srcdir)/sdksyms.sh $(top_srcdir) $(AM_CFLAGS) $(CFLAGS) $(INCLUDES)

 

 SDKSYMS_DEP = sdksyms.dep

diff --git a/xorg-server/hw/xfree86/loader/sdksyms.sh b/xorg-server/hw/xfree86/loader/sdksyms.sh
index f60b8ed74..6f5082ae5 100644
--- a/xorg-server/hw/xfree86/loader/sdksyms.sh
+++ b/xorg-server/hw/xfree86/loader/sdksyms.sh
@@ -1,424 +1,425 @@
-#!/bin/sh
-
-cat > sdksyms.c << EOF
-/* This file is automatically generated by sdksyms.sh. */
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-
-/* These must be included first */
-#include "misc.h"
-#include "miscstruct.h"
-
-
-/* render/Makefile.am */
-#include "picture.h"
-#include "mipict.h"
-#include "glyphstr.h"
-#include "picturestr.h"
-
-
-/* fb/Makefile.am -- module */
-/*
-#include "fb.h"
-#include "fbrop.h"
-#include "fboverlay.h"
-#include "wfbrename.h"
-#include "fbpict.h"
- */
-
-
-/* miext/shadow/Makefile.am -- module */
-/*
-#include "shadow.h"
- */
-
-
-/* miext/damage/Makefile.am */
-#include "damage.h"
-#include "damagestr.h"
-
-/* miext/sync/Makefile.am */
-#include "misync.h"
-#include "misyncstr.h"
-
-/* Xext/Makefile.am -- half is module, half is builtin */
-/*
-#include "xvdix.h"
-#include "xvmcext.h"
- */
-#include "geext.h"
-#include "geint.h"
-#include "shmint.h"
-#include "syncsdk.h"
-#if XINERAMA
-# include "panoramiXsrv.h"
-# include "panoramiX.h"
-#endif
-
-
-/* hw/xfree86/int10/Makefile.am -- module */
-/*
-#include "xf86int10.h"
- */
-
-
-/* hw/xfree86/i2c/Makefile.am -- "mostly" modules */
-#include "xf86i2c.h"
-/*
-#include "bt829.h"
-#include "fi1236.h"
-#include "msp3430.h"
-#include "tda8425.h"
-#include "tda9850.h"
-#include "tda9885.h"
-#include "uda1380.h"
-#include "i2c_def.h"
- */
-
-
-/* hw/xfree86/modes/Makefile.am */
-#include "xf86Crtc.h"
-#include "xf86Modes.h"
-#include "xf86RandR12.h"
-/* #include "xf86Rename.h" */
-
-
-/* hw/xfree86/ddc/Makefile.am */
-#include "edid.h"
-#include "xf86DDC.h"
-
-
-/* hw/xfree86/dri2/Makefile.am -- module */
-/*
-#if DRI2
-# include "dri2.h"
-#endif
- */
-
-
-/* hw/xfree86/vgahw/Makefile.am -- module */
-/*
-#include "vgaHW.h"
- */
-
-
-/* hw/xfree86/fbdevhw/Makefile.am -- module */
-/*
-#include "fbdevhw.h"
- */
-
-
-/* hw/xfree86/common/Makefile.am */
-#include "compiler.h"
-#include "fourcc.h"
-#include "xf86.h"
-#include "xf86Module.h"
-#include "xf86Opt.h"
-#include "xf86PciInfo.h"
-#include "xf86Priv.h"
-#include "xf86Privstr.h"
-#include "xf86cmap.h"
-#include "xf86fbman.h"
-#include "xf86str.h"
-#include "xf86Xinput.h"
-#include "xf86VGAarbiter.h"
-#include "xisb.h"
-#if XV
-# include "xf86xv.h"
-# include "xf86xvmc.h"
-# include "xf86xvpriv.h"
-#endif
-/* XF86VidMode code is in libextmod module */
-/*
-#if XF86VIDMODE
-# include "vidmodeproc.h"
-#endif
- */
-#include "xorgVersion.h"
-#if defined(__sparc__) || defined(__sparc)
-# include "xf86sbusBus.h"
-#endif
-
-
-/* hw/xfree86/ramdac/Makefile.am */
-#include "BT.h"
-#include "IBM.h"
-#include "TI.h"
-#include "xf86Cursor.h"
-#include "xf86RamDac.h"
-
-
-/* hw/xfree86/shadowfb/Makefile.am -- module */
-/*
-#include "shadowfb.h"
- */
-
-
-/* hw/xfree86/os-support/solaris/Makefile.am */
-#if defined(sun386)
-# include "agpgart.h"
-#endif
-
-
-/* hw/xfree86/os-support/Makefile.am */
-#include "xf86_OSproc.h"
-#include "xf86_OSlib.h"
-
-
-/* hw/xfree86/os-support/bus/Makefile.am */
-#include "xf86Pci.h"
-#if defined(__sparc__) || defined(__sparc)
-# include "xf86Sbus.h"
-#endif
-
-
-/* hw/xfree86/xaa/Makefile.am -- module */
-/*
-#include "xaa.h"
-#include "xaalocal.h"
-#include "xaarop.h"
- */
-
-
-/* hw/xfree86/dixmods/extmod/Makefile.am -- module */
-/*
-#include "dgaproc.h"
- */
-
-
-/* hw/xfree86/parser/Makefile.am */
-#include "xf86Parser.h"
-#include "xf86Optrec.h"
-
-
-/* hw/xfree86/vbe/Makefile.am -- module */
-/*
-#include "vbe.h"
-#include "vbeModes.h"
- */
-
-
-/* hw/xfree86/dri/Makefile.am -- module */
-/*
-#if XF86DRI
-# include "dri.h"
-# include "sarea.h"
-# include "dristruct.h"
-#endif
- */
-
-
-/* mi/Makefile.am */
-#include "micmap.h"
-#include "miline.h"
-#include "mipointer.h"
-#include "mi.h"
-#include "mibstore.h"
-#include "migc.h"
-#include "mipointrst.h"
-#include "mizerarc.h"
-#include "micoord.h"
-#include "mifillarc.h"
-#include "mispans.h"
-#include "miwideline.h"
-#include "mistruct.h"
-#include "mifpoly.h"
-#include "mioverlay.h"
-
-
-/* randr/Makefile.am */
-#include "randrstr.h"
-#include "rrtransform.h"
-
-
-/* dbe/Makefile.am -- module */
-/*
-#include "dbestruct.h"
- */
-
-
-/* exa/Makefile.am -- module */
-/*
-#include "exa.h"
- */
-
-
-/* xfixes/Makefile.am */
-#include "xfixes.h"
-
-
-/* include/Makefile.am */
-#include "XIstubs.h"
-#include "Xprintf.h"
-#include "closestr.h"
-#include "closure.h"
-#include "colormap.h"
-#include "colormapst.h"
-#include "hotplug.h"
-#include "cursor.h"
-#include "cursorstr.h"
-#include "dix.h"
-#include "dixaccess.h"
-#include "dixevents.h"
-#include "dixfont.h"
-#include "dixfontstr.h"
-#include "dixgrabs.h"
-#include "dixstruct.h"
-#include "exevents.h"
-#include "extension.h"
-#include "extinit.h"
-#include "extnsionst.h"
-#include "gc.h"
-#include "gcstruct.h"
-#include "globals.h"
-#include "input.h"
-#include "inputstr.h"
-/* already included */
-/*
-#include "misc.h"
-#include "miscstruct.h"
- */
-#include "opaque.h"
-#include "os.h"
-#include "pixmap.h"
-#include "pixmapstr.h"
-#include "privates.h"
-#include "property.h"
-#include "propertyst.h"
-#include "ptrveloc.h"
-#include "region.h"
-#include "regionstr.h"
-#include "registry.h"
-#include "resource.h"
-#include "rgb.h"
-#include "screenint.h"
-#include "scrnintstr.h"
-#include "selection.h"
-#include "servermd.h"
-#include "site.h"
-#include "swaprep.h"
-#include "swapreq.h"
-#include "validate.h"
-#include "window.h"
-#include "windowstr.h"
-#include "xace.h"
-#include "xkbfile.h"
-#include "xkbsrv.h"
-#include "xkbstr.h"
-#include "xkbrules.h"
-#include "xserver-properties.h"
-
-EOF
-
-topdir=$1
-shift
-LC_ALL=C
-export LC_ALL
-${CPP:-cpp} "$@" -DXorgLoader sdksyms.c | ${AWK:-awk} -v topdir=$topdir '
-BEGIN {
-    sdk = 0;
-    print("/*");
-    print(" * These symbols are referenced to ensure they");
-    print(" * will be available in the X Server binary.");
-    print(" */");
-    printf("/* topdir=%s */\n", topdir);
-    print("_X_HIDDEN void *xorg_symbols[] = {");
-
-    printf("sdksyms.c:") > "sdksyms.dep";
-}
-/^# [0-9]+ "/ {
-    #   Process text after a include in a relative path or when the
-    # processed file has a basename matching $top_srcdir.
-    #   Note that indexing starts at 1; 0 means no match, and there
-    # is a starting ".
-    sdk = $3 !~ /^"\// || index($3, topdir) == 2;
-
-    if (sdk && $3 ~ /\.h"$/) {
-	# remove quotes
-	gsub(/"/, "", $3);
-	line = $2;
-	header = $3;
-	if (! headers[$3]) {
-	    printf(" \\\n  %s", $3) >> "sdksyms.dep";
-	    headers[$3] = 1;
-	}
-    }
-    next;
-}
-
-/^extern[ 	]/  {
-    if (sdk) {
-	n = 3;
-
-	# skip attribute, if any
-	while ($n ~ /^(__attribute__|__global)/ ||
-	    # skip modifiers, if any
-	    $n ~ /^\*?(unsigned|const|volatile|struct)$/ ||
-	    # skip pointer
-	    $n ~ /^[a-zA-Z0-9_]*\*$/)
-	    n++;
-
-	# type specifier may not be set, as in
-	#   extern _X_EXPORT unsigned name(...)
-	if ($n !~ /[^a-zA-Z0-9_]/)
-	    n++;
-
-	# go back if we are at the parameter list already
-	if ($n ~ /^[(]([^*].*)?$/)
-	    n--;
-
-	# match
-	#    extern _X_EXPORT type (* name[])(...)
-	if ($n ~ /^[^a-zA-Z0-9_]+$/)
-	    n++;
-
-	# match
-	#	extern _X_EXPORT const name *const ...
-	if ($n ~ /^([^a-zA-Z0-9_]+)?const$/)
-	    n++;
-
-	# actual name may be in the next line, as in
-	#   extern _X_EXPORT type
-	# possibly ending with a *
-	#   name(...)
-	if ($n == "" || $n ~ /^\*+$/) {
-	    getline;
-	    n = 1;
-	}
-
-	# dont modify $0 or $n
-	symbol = $n;
-
-	# remove starting non word chars
-	sub(/^[^a-zA-Z0-9_]+/, "",symbol);
-
-	# remove from first non word to end of line
-	sub(/[^a-zA-Z0-9_].*/, "", symbol);
-
-	#print;
-	printf("    (void *) &%-50s /* %s:%s */\n", symbol ",", header, line);
-    }
-}
-
-{
-    line++;
-}
-
-END {
-    print("};");
-
-    print("") >> "sdksyms.dep";
-}' > _sdksyms.c
-
-STATUS=$?
-
-cat _sdksyms.c >> sdksyms.c
-rm _sdksyms.c
-
-[ $? != 0 ] && exit $?
-
-exit $STATUS
+#!/bin/sh

+

+cat > sdksyms.c << EOF

+/* This file is automatically generated by sdksyms.sh. */

+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"

+

+#ifdef HAVE_XORG_CONFIG_H

+#include <xorg-config.h>

+#endif

+

+

+/* These must be included first */

+#include "misc.h"

+#include "miscstruct.h"

+

+

+/* render/Makefile.am */

+#include "picture.h"

+#include "mipict.h"

+#include "glyphstr.h"

+#include "picturestr.h"

+

+

+/* fb/Makefile.am -- module */

+/*

+#include "fb.h"

+#include "fbrop.h"

+#include "fboverlay.h"

+#include "wfbrename.h"

+#include "fbpict.h"

+ */

+

+

+/* miext/shadow/Makefile.am -- module */

+/*

+#include "shadow.h"

+ */

+

+

+/* miext/damage/Makefile.am */

+#include "damage.h"

+#include "damagestr.h"

+

+/* miext/sync/Makefile.am */

+#include "misync.h"

+#include "misyncstr.h"

+

+/* Xext/Makefile.am -- half is module, half is builtin */

+/*

+#include "xvdix.h"

+#include "xvmcext.h"

+ */

+#include "geext.h"

+#include "geint.h"

+#include "shmint.h"

+#include "syncsdk.h"

+#if XINERAMA

+# include "panoramiXsrv.h"

+# include "panoramiX.h"

+#endif

+

+

+/* hw/xfree86/int10/Makefile.am -- module */

+/*

+#include "xf86int10.h"

+ */

+

+

+/* hw/xfree86/i2c/Makefile.am -- "mostly" modules */

+#include "xf86i2c.h"

+/*

+#include "bt829.h"

+#include "fi1236.h"

+#include "msp3430.h"

+#include "tda8425.h"

+#include "tda9850.h"

+#include "tda9885.h"

+#include "uda1380.h"

+#include "i2c_def.h"

+ */

+

+

+/* hw/xfree86/modes/Makefile.am */

+#include "xf86Crtc.h"

+#include "xf86Modes.h"

+#include "xf86RandR12.h"

+/* #include "xf86Rename.h" */

+

+

+/* hw/xfree86/ddc/Makefile.am */

+#include "edid.h"

+#include "xf86DDC.h"

+

+

+/* hw/xfree86/dri2/Makefile.am -- module */

+/*

+#if DRI2

+# include "dri2.h"

+#endif

+ */

+

+

+/* hw/xfree86/vgahw/Makefile.am -- module */

+/*

+#include "vgaHW.h"

+ */

+

+

+/* hw/xfree86/fbdevhw/Makefile.am -- module */

+/*

+#include "fbdevhw.h"

+ */

+

+

+/* hw/xfree86/common/Makefile.am */

+#include "compiler.h"

+#include "fourcc.h"

+#include "xf86.h"

+#include "xf86Module.h"

+#include "xf86Opt.h"

+#include "xf86PciInfo.h"

+#include "xf86Priv.h"

+#include "xf86Privstr.h"

+#include "xf86cmap.h"

+#include "xf86fbman.h"

+#include "xf86str.h"

+#include "xf86Xinput.h"

+#include "xf86VGAarbiter.h"

+#include "xisb.h"

+#if XV

+# include "xf86xv.h"

+# include "xf86xvmc.h"

+# include "xf86xvpriv.h"

+#endif

+/* XF86VidMode code is in libextmod module */

+/*

+#if XF86VIDMODE

+# include "vidmodeproc.h"

+#endif

+ */

+#include "xorgVersion.h"

+#if defined(__sparc__) || defined(__sparc)

+# include "xf86sbusBus.h"

+#endif

+

+

+/* hw/xfree86/ramdac/Makefile.am */

+#include "BT.h"

+#include "IBM.h"

+#include "TI.h"

+#include "xf86Cursor.h"

+#include "xf86RamDac.h"

+

+

+/* hw/xfree86/shadowfb/Makefile.am -- module */

+/*

+#include "shadowfb.h"

+ */

+

+

+/* hw/xfree86/os-support/solaris/Makefile.am */

+#if defined(sun386)

+# include "agpgart.h"

+#endif

+

+

+/* hw/xfree86/os-support/Makefile.am */

+#include "xf86_OSproc.h"

+#include "xf86_OSlib.h"

+

+

+/* hw/xfree86/os-support/bus/Makefile.am */

+#include "xf86Pci.h"

+#if defined(__sparc__) || defined(__sparc)

+# include "xf86Sbus.h"

+#endif

+

+

+/* hw/xfree86/xaa/Makefile.am -- module */

+/*

+#include "xaa.h"

+#include "xaalocal.h"

+#include "xaarop.h"

+ */

+

+

+/* hw/xfree86/dixmods/extmod/Makefile.am -- module */

+/*

+#include "dgaproc.h"

+ */

+

+

+/* hw/xfree86/parser/Makefile.am */

+#include "xf86Parser.h"

+#include "xf86Optrec.h"

+

+

+/* hw/xfree86/vbe/Makefile.am -- module */

+/*

+#include "vbe.h"

+#include "vbeModes.h"

+ */

+

+

+/* hw/xfree86/dri/Makefile.am -- module */

+/*

+#if XF86DRI

+# include "dri.h"

+# include "sarea.h"

+# include "dristruct.h"

+#endif

+ */

+

+

+/* mi/Makefile.am */

+#include "micmap.h"

+#include "miline.h"

+#include "mipointer.h"

+#include "mi.h"

+#include "mibstore.h"

+#include "migc.h"

+#include "mipointrst.h"

+#include "mizerarc.h"

+#include "micoord.h"

+#include "mifillarc.h"

+#include "mispans.h"

+#include "miwideline.h"

+#include "mistruct.h"

+#include "mifpoly.h"

+#include "mioverlay.h"

+

+

+/* randr/Makefile.am */

+#include "randrstr.h"

+#include "rrtransform.h"

+

+

+/* dbe/Makefile.am -- module */

+/*

+#include "dbestruct.h"

+ */

+

+

+/* exa/Makefile.am -- module */

+/*

+#include "exa.h"

+ */

+

+

+/* xfixes/Makefile.am */

+#include "xfixes.h"

+

+

+/* include/Makefile.am */

+#include "XIstubs.h"

+#include "Xprintf.h"

+#include "closestr.h"

+#include "closure.h"

+#include "colormap.h"

+#include "colormapst.h"

+#include "hotplug.h"

+#include "client.h"

+#include "cursor.h"

+#include "cursorstr.h"

+#include "dix.h"

+#include "dixaccess.h"

+#include "dixevents.h"

+#include "dixfont.h"

+#include "dixfontstr.h"

+#include "dixgrabs.h"

+#include "dixstruct.h"

+#include "exevents.h"

+#include "extension.h"

+#include "extinit.h"

+#include "extnsionst.h"

+#include "gc.h"

+#include "gcstruct.h"

+#include "globals.h"

+#include "input.h"

+#include "inputstr.h"

+/* already included */

+/*

+#include "misc.h"

+#include "miscstruct.h"

+ */

+#include "opaque.h"

+#include "os.h"

+#include "pixmap.h"

+#include "pixmapstr.h"

+#include "privates.h"

+#include "property.h"

+#include "propertyst.h"

+#include "ptrveloc.h"

+#include "region.h"

+#include "regionstr.h"

+#include "registry.h"

+#include "resource.h"

+#include "rgb.h"

+#include "screenint.h"

+#include "scrnintstr.h"

+#include "selection.h"

+#include "servermd.h"

+#include "site.h"

+#include "swaprep.h"

+#include "swapreq.h"

+#include "validate.h"

+#include "window.h"

+#include "windowstr.h"

+#include "xace.h"

+#include "xkbfile.h"

+#include "xkbsrv.h"

+#include "xkbstr.h"

+#include "xkbrules.h"

+#include "xserver-properties.h"

+

+EOF

+

+topdir=$1

+shift

+LC_ALL=C

+export LC_ALL

+${CPP:-cpp} "$@" -DXorgLoader sdksyms.c | ${AWK:-awk} -v topdir=$topdir '

+BEGIN {

+    sdk = 0;

+    print("/*");

+    print(" * These symbols are referenced to ensure they");

+    print(" * will be available in the X Server binary.");

+    print(" */");

+    printf("/* topdir=%s */\n", topdir);

+    print("_X_HIDDEN void *xorg_symbols[] = {");

+

+    printf("sdksyms.c:") > "sdksyms.dep";

+}

+/^# [0-9]+ "/ {

+    #   Process text after a include in a relative path or when the

+    # processed file has a basename matching $top_srcdir.

+    #   Note that indexing starts at 1; 0 means no match, and there

+    # is a starting ".

+    sdk = $3 !~ /^"\// || index($3, topdir) == 2;

+

+    if (sdk && $3 ~ /\.h"$/) {

+	# remove quotes

+	gsub(/"/, "", $3);

+	line = $2;

+	header = $3;

+	if (! headers[$3]) {

+	    printf(" \\\n  %s", $3) >> "sdksyms.dep";

+	    headers[$3] = 1;

+	}

+    }

+    next;

+}

+

+/^extern[ 	]/  {

+    if (sdk) {

+	n = 3;

+

+	# skip attribute, if any

+	while ($n ~ /^(__attribute__|__global)/ ||

+	    # skip modifiers, if any

+	    $n ~ /^\*?(unsigned|const|volatile|struct)$/ ||

+	    # skip pointer

+	    $n ~ /^[a-zA-Z0-9_]*\*$/)

+	    n++;

+

+	# type specifier may not be set, as in

+	#   extern _X_EXPORT unsigned name(...)

+	if ($n !~ /[^a-zA-Z0-9_]/)

+	    n++;

+

+	# go back if we are at the parameter list already

+	if ($n ~ /^[(]([^*].*)?$/)

+	    n--;

+

+	# match

+	#    extern _X_EXPORT type (* name[])(...)

+	if ($n ~ /^[^a-zA-Z0-9_]+$/)

+	    n++;

+

+	# match

+	#	extern _X_EXPORT const name *const ...

+	if ($n ~ /^([^a-zA-Z0-9_]+)?const$/)

+	    n++;

+

+	# actual name may be in the next line, as in

+	#   extern _X_EXPORT type

+	# possibly ending with a *

+	#   name(...)

+	if ($n == "" || $n ~ /^\*+$/) {

+	    getline;

+	    n = 1;

+	}

+

+	# dont modify $0 or $n

+	symbol = $n;

+

+	# remove starting non word chars

+	sub(/^[^a-zA-Z0-9_]+/, "",symbol);

+

+	# remove from first non word to end of line

+	sub(/[^a-zA-Z0-9_].*/, "", symbol);

+

+	#print;

+	printf("    (void *) &%-50s /* %s:%s */\n", symbol ",", header, line);

+    }

+}

+

+{

+    line++;

+}

+

+END {

+    print("};");

+

+    print("") >> "sdksyms.dep";

+}' > _sdksyms.c

+

+STATUS=$?

+

+cat _sdksyms.c >> sdksyms.c

+rm _sdksyms.c

+

+[ $? != 0 ] && exit $?

+

+exit $STATUS

diff --git a/xorg-server/hw/xfree86/modes/xf86RandR12.c b/xorg-server/hw/xfree86/modes/xf86RandR12.c
index 2b19d82ad..7880a41af 100644
--- a/xorg-server/hw/xfree86/modes/xf86RandR12.c
+++ b/xorg-server/hw/xfree86/modes/xf86RandR12.c
@@ -584,10 +584,12 @@ xf86RandR12SetConfig (ScreenPtr		pScreen,
     ScrnInfoPtr		scrp = XF86SCRNINFO(pScreen);

     XF86RandRInfoPtr	randrp = XF86RANDRINFO(pScreen);

     DisplayModePtr	mode;

-    int			px, py;

+    int			pos[MAXDEVICES][2];

     Bool		useVirtual = FALSE;

     int			maxX = 0, maxY = 0;

     Rotation		oldRotation = randrp->rotation;

+    DeviceIntPtr	dev;

+    Bool		view_adjusted = FALSE;

 

     randrp->rotation = rotation;

 

@@ -597,7 +599,14 @@ xf86RandR12SetConfig (ScreenPtr		pScreen,
 	randrp->virtualY = scrp->virtualY;

     }

 

-    miPointerGetPosition (inputInfo.pointer, &px, &py);

+    for (dev = inputInfo.devices; dev; dev = dev->next)

+    {

+	if (!IsMaster(dev) && !IsFloating(dev))

+		continue;

+

+	miPointerGetPosition(dev, &pos[dev->id][0], &pos[dev->id][1]);

+    }

+

     for (mode = scrp->modes; ; mode = mode->next)

     {

 	if (randrp->maxX == 0 || randrp->maxY == 0)

@@ -643,15 +652,28 @@ xf86RandR12SetConfig (ScreenPtr		pScreen,
 

     /*

      * Move the cursor back where it belongs; SwitchMode repositions it

+     * FIXME: duplicated code, see modes/xf86RandR12.c

      */

-    if (pScreen == miPointerGetScreen(inputInfo.pointer))

+    for (dev = inputInfo.devices; dev; dev = dev->next)

     {

-        px = (px >= pScreen->width ? (pScreen->width - 1) : px);

-        py = (py >= pScreen->height ? (pScreen->height - 1) : py);

+	if (!IsMaster(dev) && !IsFloating(dev))

+		continue;

 

-	xf86SetViewport(pScreen, px, py);

+	if (pScreen == miPointerGetScreen(dev)) {

+	    int px = pos[dev->id][0];

+	    int py = pos[dev->id][1];

 

-	(*pScreen->SetCursorPosition) (inputInfo.pointer, pScreen, px, py, FALSE);

+	    px = (px >= pScreen->width ? (pScreen->width - 1) : px);

+	    py = (py >= pScreen->height ? (pScreen->height - 1) : py);

+

+	    /* Setting the viewpoint makes only sense on one device */

+	    if (!view_adjusted && IsMaster(dev)) {

+		xf86SetViewport(pScreen, px, py);

+		view_adjusted = TRUE;

+	    }

+

+	    (*pScreen->SetCursorPosition) (dev, pScreen, px, py, FALSE);

+	}

     }

 

     return TRUE;

diff --git a/xorg-server/hw/xfree86/ramdac/xf86Cursor.c b/xorg-server/hw/xfree86/ramdac/xf86Cursor.c
index 0e648ff49..6eab1a3dd 100644
--- a/xorg-server/hw/xfree86/ramdac/xf86Cursor.c
+++ b/xorg-server/hw/xfree86/ramdac/xf86Cursor.c
@@ -317,8 +317,7 @@ xf86CursorSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCurs,
 

     /* only update for VCP, otherwise we get cursor jumps when removing a

        sprite. The second cursor is never HW rendered anyway. */

-    if (pDev == inputInfo.pointer ||

-        (!IsMaster(pDev) && pDev->u.master == inputInfo.pointer))

+    if (GetMaster(pDev, MASTER_POINTER) == inputInfo.pointer)

     {

 	pCurs->refcnt++;

 	if (ScreenPriv->CurrentCursor)

@@ -386,8 +385,7 @@ xf86CursorMoveCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
 

     /* only update coordinate state for first sprite, otherwise we get jumps

        when removing a sprite. The second sprite is never HW rendered anyway */

-    if (pDev == inputInfo.pointer ||

-	(!IsMaster(pDev) && pDev->u.master == inputInfo.pointer))

+    if (GetMaster(pDev, MASTER_POINTER) == inputInfo.pointer)

     {

 	ScreenPriv->x = x;

 	ScreenPriv->y = y;

diff --git a/xorg-server/hw/xquartz/X11Application.h b/xorg-server/hw/xquartz/X11Application.h
index b3ad19b53..b7fb0a8ec 100644
--- a/xorg-server/hw/xquartz/X11Application.h
+++ b/xorg-server/hw/xquartz/X11Application.h
@@ -1,109 +1,112 @@
-/* X11Application.h -- subclass of NSApplication to multiplex events
-
-   Copyright (c) 2002-2007 Apple Inc. All rights reserved.
-
-   Permission is hereby granted, free of charge, to any person
-   obtaining a copy of this software and associated documentation files
-   (the "Software"), to deal in the Software without restriction,
-   including without limitation the rights to use, copy, modify, merge,
-   publish, distribute, sublicense, and/or sell copies of the Software,
-   and to permit persons to whom the Software is furnished to do so,
-   subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be
-   included in all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-   NONINFRINGEMENT.  IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT
-   HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-   DEALINGS IN THE SOFTWARE.
-
-   Except as contained in this notice, the name(s) of the above
-   copyright holders shall not be used in advertising or otherwise to
-   promote the sale, use or other dealings in this Software without
-   prior written authorization. */
-
-#ifndef X11APPLICATION_H
-#define X11APPLICATION_H 1
-
-#if __OBJC__
-
-#import "X11Controller.h"
-
-@interface X11Application : NSApplication {
-    X11Controller *_controller;
-
-    unsigned int _x_active :1;
-}
-
-- (void) set_controller:controller;
-- (void) set_window_menu:(NSArray *)list;
-
-- (int) prefs_get_integer:(NSString *)key default:(int)def;
-- (const char *) prefs_get_string:(NSString *)key default:(const char *)def;
-- (float) prefs_get_float:(NSString *)key default:(float)def;
-- (int) prefs_get_boolean:(NSString *)key default:(int)def;
-- (NSURL *) prefs_copy_url:(NSString *)key default:(NSURL *)def;
-- (NSArray *) prefs_get_array:(NSString *)key;
-- (void) prefs_set_integer:(NSString *)key value:(int)value;
-- (void) prefs_set_float:(NSString *)key value:(float)value;
-- (void) prefs_set_boolean:(NSString *)key value:(int)value;
-- (void) prefs_set_array:(NSString *)key value:(NSArray *)value;
-- (void) prefs_set_string:(NSString *)key value:(NSString *)value;
-- (void) prefs_synchronize;
-
-- (X11Controller *) controller;
-- (OSX_BOOL) x_active;
-@end
-
-extern X11Application *X11App;
-
-#endif /* __OBJC__ */
-
-void X11ApplicationSetWindowMenu (int nitems, const char **items,
-					 const char *shortcuts);
-void X11ApplicationSetWindowMenuCheck (int idx);
-void X11ApplicationSetFrontProcess (void);
-void X11ApplicationSetCanQuit (int state);
-void X11ApplicationServerReady (void);
-void X11ApplicationShowHideMenubar (int state);
-void X11ApplicationLaunchClient (const char *cmd);
-
-void X11ApplicationMain(int argc, char **argv, char **envp);
-
-#define PREFS_APPSMENU              "apps_menu"
-#define PREFS_FAKEBUTTONS           "enable_fake_buttons"
-#define PREFS_KEYEQUIVS             "enable_key_equivalents"
-#define PREFS_FULLSCREEN_HOTKEYS    "fullscreen_hotkeys"
-#define PREFS_FULLSCREEN_MENU       "fullscreen_menu"
-#define PREFS_SYNC_KEYMAP           "sync_keymap"
-#define PREFS_DEPTH                 "depth"
-#define PREFS_NO_AUTH               "no_auth"
-#define PREFS_NO_TCP                "nolisten_tcp"
-#define PREFS_DONE_XINIT_CHECK      "done_xinit_check"
-#define PREFS_NO_QUIT_ALERT         "no_quit_alert"
-#define PREFS_OPTION_SENDS_ALT      "option_sends_alt"
-#define PREFS_FAKE_BUTTON2          "fake_button2"
-#define PREFS_FAKE_BUTTON3          "fake_button3"
-#define PREFS_APPKIT_MODIFIERS      "appkit_modifiers"
-#define PREFS_WINDOW_ITEM_MODIFIERS "window_item_modifiers"
-#define PREFS_ROOTLESS              "rootless"
-#define PREFS_TEST_EXTENSIONS       "enable_test_extensions"
-#define PREFS_XP_OPTIONS            "xp_options"
-#define PREFS_LOGIN_SHELL           "login_shell"
-#define PREFS_UPDATE_FEED           "update_feed"
-#define PREFS_CLICK_THROUGH         "wm_click_through"
-#define PREFS_FFM                   "wm_ffm"
-#define PREFS_FOCUS_ON_NEW_WINDOW   "wm_focus_on_new_window"
-
-#define PREFS_SYNC_PB                "sync_pasteboard"
-#define PREFS_SYNC_PB_TO_CLIPBOARD   "sync_pasteboard_to_clipboard"
-#define PREFS_SYNC_PB_TO_PRIMARY     "sync_pasteboard_to_primary"
-#define PREFS_SYNC_CLIPBOARD_TO_PB   "sync_clipboard_to_pasteboard"
-#define PREFS_SYNC_PRIMARY_ON_SELECT "sync_primary_on_select"
-
-#endif /* X11APPLICATION_H */
+/* X11Application.h -- subclass of NSApplication to multiplex events

+

+   Copyright (c) 2002-2007 Apple Inc. All rights reserved.

+

+   Permission is hereby granted, free of charge, to any person

+   obtaining a copy of this software and associated documentation files

+   (the "Software"), to deal in the Software without restriction,

+   including without limitation the rights to use, copy, modify, merge,

+   publish, distribute, sublicense, and/or sell copies of the Software,

+   and to permit persons to whom the Software is furnished to do so,

+   subject to the following conditions:

+

+   The above copyright notice and this permission notice shall be

+   included in all copies or substantial portions of the Software.

+

+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

+   NONINFRINGEMENT.  IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT

+   HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

+   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

+   DEALINGS IN THE SOFTWARE.

+

+   Except as contained in this notice, the name(s) of the above

+   copyright holders shall not be used in advertising or otherwise to

+   promote the sale, use or other dealings in this Software without

+   prior written authorization. */

+

+#ifndef X11APPLICATION_H

+#define X11APPLICATION_H 1

+

+#if __OBJC__

+

+#import "X11Controller.h"

+

+@interface X11Application : NSApplication {

+    X11Controller *_controller;

+

+    unsigned int _x_active :1;

+}

+

+- (void) set_controller:controller;

+- (void) set_window_menu:(NSArray *)list;

+

+- (int) prefs_get_integer:(NSString *)key default:(int)def;

+- (const char *) prefs_get_string:(NSString *)key default:(const char *)def;

+- (float) prefs_get_float:(NSString *)key default:(float)def;

+- (int) prefs_get_boolean:(NSString *)key default:(int)def;

+- (NSURL *) prefs_copy_url:(NSString *)key default:(NSURL *)def;

+- (NSArray *) prefs_get_array:(NSString *)key;

+- (void) prefs_set_integer:(NSString *)key value:(int)value;

+- (void) prefs_set_float:(NSString *)key value:(float)value;

+- (void) prefs_set_boolean:(NSString *)key value:(int)value;

+- (void) prefs_set_array:(NSString *)key value:(NSArray *)value;

+- (void) prefs_set_string:(NSString *)key value:(NSString *)value;

+- (void) prefs_synchronize;

+

+- (X11Controller *) controller;

+- (OSX_BOOL) x_active;

+@end

+

+extern X11Application *X11App;

+

+#endif /* __OBJC__ */

+

+void X11ApplicationSetWindowMenu (int nitems, const char **items,

+					 const char *shortcuts);

+void X11ApplicationSetWindowMenuCheck (int idx);

+void X11ApplicationSetFrontProcess (void);

+void X11ApplicationSetCanQuit (int state);

+void X11ApplicationServerReady (void);

+void X11ApplicationShowHideMenubar (int state);

+void X11ApplicationLaunchClient (const char *cmd);

+

+Bool X11ApplicationCanEnterRandR (void);

+

+void X11ApplicationMain(int argc, char **argv, char **envp);

+

+#define PREFS_APPSMENU              "apps_menu"

+#define PREFS_FAKEBUTTONS           "enable_fake_buttons"

+#define PREFS_KEYEQUIVS             "enable_key_equivalents"

+#define PREFS_FULLSCREEN_HOTKEYS    "fullscreen_hotkeys"

+#define PREFS_FULLSCREEN_MENU       "fullscreen_menu"

+#define PREFS_SYNC_KEYMAP           "sync_keymap"

+#define PREFS_DEPTH                 "depth"

+#define PREFS_NO_AUTH               "no_auth"

+#define PREFS_NO_TCP                "nolisten_tcp"

+#define PREFS_DONE_XINIT_CHECK      "done_xinit_check"

+#define PREFS_NO_QUIT_ALERT         "no_quit_alert"

+#define PREFS_NO_RANDR_ALERT        "no_randr_alert"

+#define PREFS_OPTION_SENDS_ALT      "option_sends_alt"

+#define PREFS_FAKE_BUTTON2          "fake_button2"

+#define PREFS_FAKE_BUTTON3          "fake_button3"

+#define PREFS_APPKIT_MODIFIERS      "appkit_modifiers"

+#define PREFS_WINDOW_ITEM_MODIFIERS "window_item_modifiers"

+#define PREFS_ROOTLESS              "rootless"

+#define PREFS_TEST_EXTENSIONS       "enable_test_extensions"

+#define PREFS_XP_OPTIONS            "xp_options"

+#define PREFS_LOGIN_SHELL           "login_shell"

+#define PREFS_UPDATE_FEED           "update_feed"

+#define PREFS_CLICK_THROUGH         "wm_click_through"

+#define PREFS_FFM                   "wm_ffm"

+#define PREFS_FOCUS_ON_NEW_WINDOW   "wm_focus_on_new_window"

+

+#define PREFS_SYNC_PB                "sync_pasteboard"

+#define PREFS_SYNC_PB_TO_CLIPBOARD   "sync_pasteboard_to_clipboard"

+#define PREFS_SYNC_PB_TO_PRIMARY     "sync_pasteboard_to_primary"

+#define PREFS_SYNC_CLIPBOARD_TO_PB   "sync_clipboard_to_pasteboard"

+#define PREFS_SYNC_PRIMARY_ON_SELECT "sync_primary_on_select"

+

+#endif /* X11APPLICATION_H */

diff --git a/xorg-server/hw/xquartz/X11Application.m b/xorg-server/hw/xquartz/X11Application.m
index b855c8358..2dd3bd36c 100644
--- a/xorg-server/hw/xquartz/X11Application.m
+++ b/xorg-server/hw/xquartz/X11Application.m
@@ -1,1320 +1,1349 @@
-/* X11Application.m -- subclass of NSApplication to multiplex events
- 
- Copyright (c) 2002-2008 Apple Inc.
- 
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation files
- (the "Software"), to deal in the Software without restriction,
- including without limitation the rights to use, copy, modify, merge,
- publish, distribute, sublicense, and/or sell copies of the Software,
- and to permit persons to whom the Software is furnished to do so,
- subject to the following conditions:
- 
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
- 
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT.  IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT
- HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
- 
- Except as contained in this notice, the name(s) of the above
- copyright holders shall not be used in advertising or otherwise to
- promote the sale, use or other dealings in this Software without
- prior written authorization. */
-
-#include "sanitizedCarbon.h"
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include "quartzCommon.h"
-
-#import "X11Application.h"
-
-#include "darwin.h"
-#include "quartz.h"
-#include "darwinEvents.h"
-#include "quartzKeyboard.h"
-#include "quartz.h"
-#include <X11/extensions/applewmconst.h>
-#include "micmap.h"
-#include "exglobals.h"
-
-#include <mach/mach.h>
-#include <unistd.h>
-#include <AvailabilityMacros.h>
-
-#include <Xplugin.h>
-
-// pbproxy/pbproxy.h
-extern int xpbproxy_run (void);
-
-#define DEFAULTS_FILE X11LIBDIR"/X11/xserver/Xquartz.plist"
-
-#ifndef XSERVER_VERSION
-#define XSERVER_VERSION "?"
-#endif
-
-/* Stuck modifier / button state... force release when we context switch */
-static NSEventType keyState[NUM_KEYCODES];
-
-extern Bool noTestExtensions;
-
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
-static TISInputSourceRef last_key_layout;
-#else
-static KeyboardLayoutRef last_key_layout;
-#endif
-
-extern int darwinFakeButtons;
-
-/* Store the mouse location while in the background, and update X11's pointer
- * location when we become the foreground application
- */
-static NSPoint bgMouseLocation;
-static BOOL bgMouseLocationUpdated = FALSE;
-
-X11Application *X11App;
-
-CFStringRef app_prefs_domain_cfstr = NULL;
-
-#define ALL_KEY_MASKS (NSShiftKeyMask | NSControlKeyMask | NSAlternateKeyMask | NSCommandKeyMask)
-
-@interface X11Application (Private)
-- (void) sendX11NSEvent:(NSEvent *)e;
-@end
-
-@implementation X11Application
-
-typedef struct message_struct message;
-struct message_struct {
-    mach_msg_header_t hdr;
-    SEL selector;
-    NSObject *arg;
-};
-
-static mach_port_t _port;
-
-/* Quartz mode initialization routine. This is often dynamically loaded
-   but is statically linked into this X server. */
-Bool QuartzModeBundleInit(void);
-
-static void init_ports (void) {
-    kern_return_t r;
-    NSPort *p;
-	
-    if (_port != MACH_PORT_NULL) return;
-	
-    r = mach_port_allocate (mach_task_self (), MACH_PORT_RIGHT_RECEIVE, &_port);
-    if (r != KERN_SUCCESS) return;
-	
-    p = [NSMachPort portWithMachPort:_port];
-    [p setDelegate:NSApp];
-    [p scheduleInRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode];
-}
-
-static void message_kit_thread (SEL selector, NSObject *arg) {
-    message msg;
-    kern_return_t r;
-	
-    msg.hdr.msgh_bits = MACH_MSGH_BITS (MACH_MSG_TYPE_MAKE_SEND, 0);
-    msg.hdr.msgh_size = sizeof (msg);
-    msg.hdr.msgh_remote_port = _port;
-    msg.hdr.msgh_local_port = MACH_PORT_NULL;
-    msg.hdr.msgh_reserved = 0;
-    msg.hdr.msgh_id = 0;
-	
-    msg.selector = selector;
-    msg.arg = [arg retain];
-	
-    r = mach_msg (&msg.hdr, MACH_SEND_MSG, msg.hdr.msgh_size,
-		  0, MACH_PORT_NULL, 0, MACH_PORT_NULL);
-    if (r != KERN_SUCCESS)
-		ErrorF("%s: mach_msg failed: %x\n", __FUNCTION__, r);
-}
-
-- (void) handleMachMessage:(void *)_msg {
-    message *msg = _msg;
-	
-    [self performSelector:msg->selector withObject:msg->arg];
-    [msg->arg release];
-}
-
-- (void) set_controller:obj {
-    if (_controller == nil) _controller = [obj retain];
-}
-
-- (void) dealloc {
-    if (_controller != nil) [_controller release];
-	
-    if (_port != MACH_PORT_NULL)
-		mach_port_deallocate (mach_task_self (), _port);
-	
-    [super dealloc];
-}
-
-- (void) orderFrontStandardAboutPanel: (id) sender {
-    NSMutableDictionary *dict;
-    NSDictionary *infoDict;
-    NSString *tem;
-    
-    dict = [NSMutableDictionary dictionaryWithCapacity:3];
-    infoDict = [[NSBundle mainBundle] infoDictionary];
-    
-    [dict setObject: NSLocalizedString (@"The X Window System", @"About panel")
-          forKey:@"ApplicationName"];
-    
-    tem = [infoDict objectForKey:@"CFBundleShortVersionString"];
-    
-    [dict setObject:[NSString stringWithFormat:@"XQuartz %@", tem]
-          forKey:@"ApplicationVersion"];
-
-    [dict setObject:[NSString stringWithFormat:@"xorg-server %s", XSERVER_VERSION]
-          forKey:@"Version"];
-    
-    [self orderFrontStandardAboutPanelWithOptions: dict];
-}
-
-- (void) activateX:(OSX_BOOL)state {
-    size_t i;
-    DEBUG_LOG("state=%d, _x_active=%d, \n", state, _x_active)
-    if (state) {
-        if(bgMouseLocationUpdated) {
-            DarwinSendPointerEvents(darwinPointer, MotionNotify, 0, bgMouseLocation.x, bgMouseLocation.y, 0.0, 0.0, 0.0);
-            bgMouseLocationUpdated = FALSE;
-        }
-        DarwinSendDDXEvent(kXquartzActivate, 0);
-    } else {
-
-        if(darwin_all_modifier_flags)
-            DarwinUpdateModKeys(0);
-        for(i=0; i < NUM_KEYCODES; i++) {
-            if(keyState[i] == NSKeyDown) {
-                DarwinSendKeyboardEvents(KeyRelease, i);
-                keyState[i] = NSKeyUp;
-            }
-        }
-        
-        DarwinSendDDXEvent(kXquartzDeactivate, 0);
-    }
-
-    _x_active = state;
-}
-
-- (void) became_key:(NSWindow *)win {
-	[self activateX:NO];
-}
-
-- (void) sendEvent:(NSEvent *)e {
-    OSX_BOOL for_appkit, for_x;
-    
-    /* By default pass down the responder chain and to X. */
-    for_appkit = YES;
-    for_x = YES;
-    
-    switch ([e type]) {
-        case NSLeftMouseDown: case NSRightMouseDown: case NSOtherMouseDown:
-        case NSLeftMouseUp: case NSRightMouseUp: case NSOtherMouseUp:
-            if ([e window] != nil) {
-                /* Pointer event has an (AppKit) window. Probably something for the kit. */
-                for_x = NO;
-                if (_x_active) [self activateX:NO];
-            } else if ([self modalWindow] == nil) {
-                /* Must be an X window. Tell appkit it doesn't have focus. */
-                for_appkit = NO;
-                
-                if ([self isActive]) {
-                    [self deactivate];
-                    if (!_x_active && quartzProcs->IsX11Window([e window],
-                                                               [e windowNumber]))
-                        [self activateX:YES];
-                }
-            }
-
-            /* We want to force sending to appkit if we're over the menu bar */
-            if(!for_appkit) {
-                NSPoint NSlocation = [e locationInWindow];
-                NSWindow *window = [e window];
-                NSRect NSframe, NSvisibleFrame;
-                CGRect CGframe, CGvisibleFrame;
-                CGPoint CGlocation;
-
-                if (window != nil)	{
-                    NSRect frame = [window frame];
-                    NSlocation.x += frame.origin.x;
-                    NSlocation.y += frame.origin.y;
-                }
-
-                NSframe = [[NSScreen mainScreen] frame];
-                NSvisibleFrame = [[NSScreen mainScreen] visibleFrame];
-                
-                CGframe = CGRectMake(NSframe.origin.x, NSframe.origin.y,
-                                            NSframe.size.width, NSframe.size.height);
-                CGvisibleFrame = CGRectMake(NSvisibleFrame.origin.x,
-                                                   NSvisibleFrame.origin.y,
-                                                   NSvisibleFrame.size.width,
-                                                   NSvisibleFrame.size.height);
-                CGlocation = CGPointMake(NSlocation.x, NSlocation.y);
-                
-                if(CGRectContainsPoint(CGframe, CGlocation) &&
-                   !CGRectContainsPoint(CGvisibleFrame, CGlocation))
-                    for_appkit = YES;
-            }
-            
-            break;
-            
-        case NSKeyDown: case NSKeyUp:
-            
-            if(_x_active) {
-                static BOOL do_swallow = NO;
-                static int swallow_keycode;
-                
-                if([e type] == NSKeyDown) {
-                    /* Before that though, see if there are any global
-                     * shortcuts bound to it. */
-
-                    if(darwinAppKitModMask & [e modifierFlags]) {
-                        /* Override to force sending to Appkit */
-                        swallow_keycode = [e keyCode];
-                        do_swallow = YES;
-                        for_x = NO;
-#if XPLUGIN_VERSION >= 1
-                    } else if(XQuartzEnableKeyEquivalents &&
-                             xp_is_symbolic_hotkey_event([e eventRef])) {
-                        swallow_keycode = [e keyCode];
-                        do_swallow = YES;
-                        for_x = NO;
-#endif
-                    } else if(XQuartzEnableKeyEquivalents &&
-                              [[self mainMenu] performKeyEquivalent:e]) {
-                        swallow_keycode = [e keyCode];
-                        do_swallow = YES;
-                        for_appkit = NO;
-                        for_x = NO;
-                    } else if(!XQuartzIsRootless
-                              && ([e modifierFlags] & ALL_KEY_MASKS) == (NSCommandKeyMask | NSAlternateKeyMask)
-                              && ([e keyCode] == 0 /*a*/ || [e keyCode] == 53 /*Esc*/)) {
-                        /* We have this here to force processing fullscreen 
-                         * toggle even if XQuartzEnableKeyEquivalents is disabled */
-                        swallow_keycode = [e keyCode];
-                        do_swallow = YES;
-                        for_x = NO;
-                        for_appkit = NO;
-                        DarwinSendDDXEvent(kXquartzToggleFullscreen, 0);
-                    } else {
-                        /* No kit window is focused, so send it to X. */
-                        for_appkit = NO;
-                    }
-                } else { /* KeyUp */
-                    /* If we saw a key equivalent on the down, don't pass
-                     * the up through to X. */
-                    if (do_swallow && [e keyCode] == swallow_keycode) {
-                        do_swallow = NO;
-                        for_x = NO;
-                    }
-                }
-            } else { /* !_x_active */
-                for_x = NO;
-            }
-            break;
-            
-        case NSFlagsChanged:
-            /* Don't tell X11 about modifiers changing while it's not active */
-            if (!_x_active)
-                for_x = NO;
-            break;
-            
-        case NSAppKitDefined:
-            switch ([e subtype]) {
-                case NSApplicationActivatedEventType:
-                    for_x = NO;
-                    if ([self modalWindow] == nil) {
-                        BOOL order_all_windows = YES, workspaces, ok;
-                        for_appkit = NO;
-                        
-                        /* FIXME: hack to avoid having to pass the event to appkit,
-                         which would cause it to raise one of its windows. */
-                        _appFlags._active = YES;
-                        
-                        [self activateX:YES];
-                        
-                        /* Get the Spaces preference for SwitchOnActivate */
-                        (void)CFPreferencesAppSynchronize(CFSTR("com.apple.dock"));
-                        workspaces = CFPreferencesGetAppBooleanValue(CFSTR("workspaces"), CFSTR("com.apple.dock"), &ok);
-                        if (!ok)
-                            workspaces = NO;
-
-                        if (workspaces) {
-                            (void)CFPreferencesAppSynchronize(CFSTR(".GlobalPreferences"));
-                            order_all_windows = CFPreferencesGetAppBooleanValue(CFSTR("AppleSpacesSwitchOnActivate"), CFSTR(".GlobalPreferences"), &ok);
-                            if (!ok)
-                                order_all_windows = YES;
-                        }
-                        
-                        /* TODO: In the workspaces && !AppleSpacesSwitchOnActivate case, the windows are ordered
-                         *       correctly, but we need to activate the top window on this space if there is
-                         *       none active.
-                         *
-                         *       If there are no active windows, and there are minimized windows, we should
-                         *       be restoring one of them.
-                         */
-                        if ([e data2] & 0x10) // 0x10 is set when we use cmd-tab or the dock icon
-                            DarwinSendDDXEvent(kXquartzBringAllToFront, 1, order_all_windows);
-                    }
-                    break;
-                    
-                case 18: /* ApplicationDidReactivate */
-                    if (XQuartzFullscreenVisible) for_appkit = NO;
-                    break;
-                    
-                case NSApplicationDeactivatedEventType:
-                    for_x = NO;
-                    [self activateX:NO];
-                    break;
-            }
-            break;
-            
-        default: break; /* for gcc */
-    }
-    
-    if (for_appkit) [super sendEvent:e];
-    
-    if (for_x) [self sendX11NSEvent:e];
-}
-
-- (void) set_window_menu:(NSArray *)list {
-	[_controller set_window_menu:list];
-}
-
-- (void) set_window_menu_check:(NSNumber *)n {
-	[_controller set_window_menu_check:n];
-}
-
-- (void) set_apps_menu:(NSArray *)list {
-	[_controller set_apps_menu:list];
-}
-
-- (void) set_front_process:unused {
-	[NSApp activateIgnoringOtherApps:YES];
-
-	if ([self modalWindow] == nil)
-		[self activateX:YES];
-}
-
-- (void) set_can_quit:(NSNumber *)state {
-	[_controller set_can_quit:[state boolValue]];
-}
-
-- (void) server_ready:unused {
-	[_controller server_ready];
-}
-
-- (void) show_hide_menubar:(NSNumber *)state {
-    /* Also shows/hides the dock */
-    if ([state boolValue])
-        SetSystemUIMode(kUIModeNormal, 0); 
-    else
-        SetSystemUIMode(kUIModeAllHidden, XQuartzFullscreenMenu ? kUIOptionAutoShowMenuBar : 0); // kUIModeAllSuppressed or kUIOptionAutoShowMenuBar can be used to allow "mouse-activation"
-}
-
-- (void) launch_client:(NSString *)cmd {
-    (void)[_controller application:self openFile:cmd];
-}
-
-/* user preferences */
-
-/* Note that these functions only work for arrays whose elements
- can be toll-free-bridged between NS and CF worlds. */
-
-static const void *cfretain (CFAllocatorRef a, const void *b) {
-    return CFRetain (b);
-}
-
-static void cfrelease (CFAllocatorRef a, const void *b) {
-    CFRelease (b);
-}
-
-static CFMutableArrayRef nsarray_to_cfarray (NSArray *in) {
-	CFMutableArrayRef out;
-	CFArrayCallBacks cb;
-	NSObject *ns;
-	const CFTypeRef *cf;
-	int i, count;
-
-	memset (&cb, 0, sizeof (cb));
-	cb.version = 0;
-	cb.retain = cfretain;
-	cb.release = cfrelease;
-
-	count = [in count];
-	out = CFArrayCreateMutable (NULL, count, &cb);
-
-	for (i = 0; i < count; i++) {
-		ns = [in objectAtIndex:i];
-
-		if ([ns isKindOfClass:[NSArray class]])
-			cf = (CFTypeRef) nsarray_to_cfarray ((NSArray *) ns);
-		else
-			cf = CFRetain ((CFTypeRef) ns);
-
-		CFArrayAppendValue (out, cf);
-		CFRelease (cf);
-	}
-
-	return out;
-}
-
-static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {
-	NSMutableArray *out;
-	const CFTypeRef *cf;
-	NSObject *ns;
-	int i, count;
-
-	count = CFArrayGetCount (in);
-	out = [[NSMutableArray alloc] initWithCapacity:count];
-
-	for (i = 0; i < count; i++) {
-		cf = CFArrayGetValueAtIndex (in, i);
-
-		if (CFGetTypeID (cf) == CFArrayGetTypeID ())
-			ns = cfarray_to_nsarray ((CFArrayRef) cf);
-		else
-			ns = [(id)cf retain];
-
-		[out addObject:ns];
-		[ns release];
-	}
-
-	return out;
-}
-
-- (CFPropertyListRef) prefs_get_copy:(NSString *)key {
-    CFPropertyListRef value;
-	
-    value = CFPreferencesCopyAppValue ((CFStringRef) key, app_prefs_domain_cfstr);
-	
-    if (value == NULL) {
-      static CFDictionaryRef defaults;
-      
-      if (defaults == NULL) {
-	CFStringRef error = NULL;
-	CFDataRef data;
-	CFURLRef url;
-	SInt32 error_code;
-	
-	url = (CFURLCreateFromFileSystemRepresentation
-	       (NULL, (unsigned char *)DEFAULTS_FILE, strlen (DEFAULTS_FILE), false));
-	if (CFURLCreateDataAndPropertiesFromResource (NULL, url, &data,
-						      NULL, NULL, &error_code)) {
-	  defaults = (CFPropertyListCreateFromXMLData
-		      (NULL, data, kCFPropertyListMutableContainersAndLeaves, &error));
-	  if (error != NULL) CFRelease (error);
-	  CFRelease (data);
-	}
-	CFRelease (url);
-			
-	if (defaults != NULL) {
-	  NSMutableArray *apps, *elt;
-	  int count, i;
-	  NSString *name, *nname;
-	  
-	  /* Localize the names in the default apps menu. */
-	  
-	  apps = [(NSDictionary *)defaults objectForKey:@PREFS_APPSMENU];
-	  if (apps != nil) {
-	    count = [apps count];
-	    for (i = 0; i < count; i++)	{
-	      elt = [apps objectAtIndex:i];
-	      if (elt != nil && [elt isKindOfClass:[NSArray class]]) {
-		name = [elt objectAtIndex:0];
-		if (name != nil) {
-		  nname = NSLocalizedString (name, nil);
-		  if (nname != nil && nname != name)
-		    [elt replaceObjectAtIndex:0 withObject:nname];
-		}
-	      }
-	    }
-	  }
-	}
-      }
-		
-      if (defaults != NULL) value = CFDictionaryGetValue (defaults, key);
-      if (value != NULL) CFRetain (value);
-    }
-	
-    return value;
-}
-
-- (int) prefs_get_integer:(NSString *)key default:(int)def {
-  CFPropertyListRef value;
-  int ret;
-  
-  value = [self prefs_get_copy:key];
-  
-  if (value != NULL && CFGetTypeID (value) == CFNumberGetTypeID ())
-    CFNumberGetValue (value, kCFNumberIntType, &ret);
-  else if (value != NULL && CFGetTypeID (value) == CFStringGetTypeID ())
-    ret = CFStringGetIntValue (value);
-  else
-    ret = def;
-  
-  if (value != NULL) CFRelease (value);
-  
-  return ret;
-}
-
-- (const char *) prefs_get_string:(NSString *)key default:(const char *)def {
-  CFPropertyListRef value;
-  const char *ret = NULL;
-  
-  value = [self prefs_get_copy:key];
-  
-  if (value != NULL && CFGetTypeID (value) == CFStringGetTypeID ()) {
-    NSString *s = (NSString *) value;
-    
-    ret = [s UTF8String];
-  }
-  
-  if (value != NULL) CFRelease (value);
-  
-  return ret != NULL ? ret : def;
-}
-
-- (NSURL *) prefs_copy_url:(NSString *)key default:(NSURL *)def {
-    CFPropertyListRef value;
-    NSURL *ret = NULL;
-    
-    value = [self prefs_get_copy:key];
-    
-    if (value != NULL && CFGetTypeID (value) == CFStringGetTypeID ()) {
-        NSString *s = (NSString *) value;
-
-        ret = [NSURL URLWithString:s];
-        [ret retain];
-    }
-    
-    if (value != NULL) CFRelease (value);
-    
-    return ret != NULL ? ret : def;
-}
-
-- (float) prefs_get_float:(NSString *)key default:(float)def {
-  CFPropertyListRef value;
-  float ret = def;
-  
-  value = [self prefs_get_copy:key];
-  
-  if (value != NULL
-      && CFGetTypeID (value) == CFNumberGetTypeID ()
-      && CFNumberIsFloatType (value))
-    CFNumberGetValue (value, kCFNumberFloatType, &ret);
-  else if (value != NULL && CFGetTypeID (value) == CFStringGetTypeID ())
-    ret = CFStringGetDoubleValue (value);
-	
-  if (value != NULL) CFRelease (value);
-  
-  return ret;
-}
-
-- (int) prefs_get_boolean:(NSString *)key default:(int)def {
-  CFPropertyListRef value;
-  int ret = def;
-  
-  value = [self prefs_get_copy:key];
-  
-  if (value != NULL) {
-    if (CFGetTypeID (value) == CFNumberGetTypeID ())
-      CFNumberGetValue (value, kCFNumberIntType, &ret);
-    else if (CFGetTypeID (value) == CFBooleanGetTypeID ())
-      ret = CFBooleanGetValue (value);
-    else if (CFGetTypeID (value) == CFStringGetTypeID ()) {
-      const char *tem = [(NSString *) value UTF8String];
-      if (strcasecmp (tem, "true") == 0 || strcasecmp (tem, "yes") == 0)
-	ret = YES;
-      else
-	ret = NO;
-    }
-    
-    CFRelease (value);
-  }
-  return ret;
-}
-
-- (NSArray *) prefs_get_array:(NSString *)key {
-  NSArray *ret = nil;
-  CFPropertyListRef value;
-  
-  value = [self prefs_get_copy:key];
-  
-  if (value != NULL) {
-    if (CFGetTypeID (value) == CFArrayGetTypeID ())
-      ret = [cfarray_to_nsarray (value) autorelease];
-    
-    CFRelease (value);
-  }
-  
-  return ret;
-}
-
-- (void) prefs_set_integer:(NSString *)key value:(int)value {
-    CFNumberRef x;
-	
-    x = CFNumberCreate (NULL, kCFNumberIntType, &value);
-	
-    CFPreferencesSetValue ((CFStringRef) key, (CFTypeRef) x, app_prefs_domain_cfstr,
-			   kCFPreferencesCurrentUser, kCFPreferencesAnyHost);
-	
-    CFRelease (x);
-}
-
-- (void) prefs_set_float:(NSString *)key value:(float)value {
-    CFNumberRef x;
-	
-    x = CFNumberCreate (NULL, kCFNumberFloatType, &value);
-	
-    CFPreferencesSetValue ((CFStringRef) key, (CFTypeRef) x, app_prefs_domain_cfstr,
-			   kCFPreferencesCurrentUser, kCFPreferencesAnyHost);
-	
-    CFRelease (x);
-}
-
-- (void) prefs_set_boolean:(NSString *)key value:(int)value {
-  CFPreferencesSetValue ((CFStringRef) key,
-			 (CFTypeRef) (value ? kCFBooleanTrue
-			 : kCFBooleanFalse), app_prefs_domain_cfstr,
-			 kCFPreferencesCurrentUser, kCFPreferencesAnyHost);
-  
-}
-
-- (void) prefs_set_array:(NSString *)key value:(NSArray *)value {
-  CFArrayRef cfarray;
-  
-  cfarray = nsarray_to_cfarray (value);
-  CFPreferencesSetValue ((CFStringRef) key,
-			 (CFTypeRef) cfarray,
-			 app_prefs_domain_cfstr,
-			 kCFPreferencesCurrentUser, kCFPreferencesAnyHost);
-  CFRelease (cfarray);
-}
-
-- (void) prefs_set_string:(NSString *)key value:(NSString *)value {
-  CFPreferencesSetValue ((CFStringRef) key, (CFTypeRef) value,
-			 app_prefs_domain_cfstr, kCFPreferencesCurrentUser,
-			 kCFPreferencesAnyHost);
-}
-
-- (void) prefs_synchronize {
-    CFPreferencesAppSynchronize (kCFPreferencesCurrentApplication);
-}
-
-- (void) read_defaults
-{
-    NSString *nsstr;
-    const char *tem;
-	
-    XQuartzRootlessDefault = [self prefs_get_boolean:@PREFS_ROOTLESS
-                                           default:XQuartzRootlessDefault];
-    XQuartzFullscreenMenu = [self prefs_get_boolean:@PREFS_FULLSCREEN_MENU
-                                           default:XQuartzFullscreenMenu];
-    XQuartzFullscreenDisableHotkeys = ![self prefs_get_boolean:@PREFS_FULLSCREEN_HOTKEYS
-                                                      default:!XQuartzFullscreenDisableHotkeys];
-    darwinFakeButtons = [self prefs_get_boolean:@PREFS_FAKEBUTTONS
-                                        default:darwinFakeButtons];
-    XQuartzOptionSendsAlt = [self prefs_get_boolean:@PREFS_OPTION_SENDS_ALT
-                                           default:XQuartzOptionSendsAlt];
-
-    if (darwinFakeButtons) {
-        const char *fake2, *fake3;
-
-        fake2 = [self prefs_get_string:@PREFS_FAKE_BUTTON2 default:NULL];
-        fake3 = [self prefs_get_string:@PREFS_FAKE_BUTTON3 default:NULL];
-
-        if (fake2 != NULL) darwinFakeMouse2Mask = DarwinParseModifierList(fake2, TRUE);
-        if (fake3 != NULL) darwinFakeMouse3Mask = DarwinParseModifierList(fake3, TRUE);
-    }
-
-    tem = [self prefs_get_string:@PREFS_APPKIT_MODIFIERS default:NULL];
-    if (tem != NULL) darwinAppKitModMask = DarwinParseModifierList(tem, TRUE);
-	
-    tem = [self prefs_get_string:@PREFS_WINDOW_ITEM_MODIFIERS default:NULL];
-    if (tem != NULL) {
-        windowItemModMask = DarwinParseModifierList(tem, FALSE);
-    } else {
-        nsstr = NSLocalizedString (@"window item modifiers", @"window item modifiers");
-        if(nsstr != NULL) {
-            tem = [nsstr UTF8String];
-            if((tem != NULL) && strcmp(tem, "window item modifiers")) {
-                windowItemModMask = DarwinParseModifierList(tem, FALSE);
-            }
-        }
-    }
-
-    XQuartzEnableKeyEquivalents = [self prefs_get_boolean:@PREFS_KEYEQUIVS
-                                              default:XQuartzEnableKeyEquivalents];
-	
-    darwinSyncKeymap = [self prefs_get_boolean:@PREFS_SYNC_KEYMAP
-                                       default:darwinSyncKeymap];
-		
-    darwinDesiredDepth = [self prefs_get_integer:@PREFS_DEPTH
-                                         default:darwinDesiredDepth];
-    
-    noTestExtensions = ![self prefs_get_boolean:@PREFS_TEST_EXTENSIONS
-                                        default:FALSE];
-
-#if XQUARTZ_SPARKLE
-    NSURL *url =  [self prefs_copy_url:@PREFS_UPDATE_FEED default:nil];
-    if(url) {
-        [[SUUpdater sharedUpdater] setFeedURL:url];
-        [url release];
-    }
-#endif
-}
-
-/* This will end up at the end of the responder chain. */
-- (void) copy:sender {
-  DarwinSendDDXEvent(kXquartzPasteboardNotify, 1,
-			     AppleWMCopyToPasteboard);
-}
-
-- (X11Controller *) controller {
-    return _controller;
-}
-
-- (OSX_BOOL) x_active {
-    return _x_active;
-}
-
-@end
-
-static NSArray *
-array_with_strings_and_numbers (int nitems, const char **items,
-				const char *numbers) {
-  NSMutableArray *array, *subarray;
-  NSString *string, *number;
-  int i;
-	
-  /* (Can't autorelease on the X server thread) */
-  
-  array = [[NSMutableArray alloc] initWithCapacity:nitems];
-  
-  for (i = 0; i < nitems; i++) {
-    subarray = [[NSMutableArray alloc] initWithCapacity:2];
-    
-    string = [[NSString alloc] initWithUTF8String:items[i]];
-    [subarray addObject:string];
-    [string release];
-    
-    if (numbers[i] != 0) {
-      number = [[NSString alloc] initWithFormat:@"%d", numbers[i]];
-      [subarray addObject:number];
-      [number release];
-    } else
-      [subarray addObject:@""];
-    
-    [array addObject:subarray];
-    [subarray release];
-  }
-  
-  return array;
-}
-
-void X11ApplicationSetWindowMenu (int nitems, const char **items,
-				  const char *shortcuts) {
-  NSArray *array;
-  array = array_with_strings_and_numbers (nitems, items, shortcuts);
-  
-  /* Send the array of strings over to the appkit thread */
-  
-  message_kit_thread (@selector (set_window_menu:), array);
-  [array release];
-}
-
-void X11ApplicationSetWindowMenuCheck (int idx) {
-  NSNumber *n;
-  
-  n = [[NSNumber alloc] initWithInt:idx];
-  
-  message_kit_thread (@selector (set_window_menu_check:), n);
-  
-  [n release];
-}
-
-void X11ApplicationSetFrontProcess (void) {
-    message_kit_thread (@selector (set_front_process:), nil);
-}
-
-void X11ApplicationSetCanQuit (int state) {
-    NSNumber *n;
-	
-    n = [[NSNumber alloc] initWithBool:state];
-	
-    message_kit_thread (@selector (set_can_quit:), n);
-	
-    [n release];
-}
-
-void X11ApplicationServerReady (void) {
-    message_kit_thread (@selector (server_ready:), nil);
-}
-
-void X11ApplicationShowHideMenubar (int state) {
-    NSNumber *n;
-	
-    n = [[NSNumber alloc] initWithBool:state];
-	
-    message_kit_thread (@selector (show_hide_menubar:), n);
-	
-    [n release];
-}
-
-void X11ApplicationLaunchClient (const char *cmd) {
-    NSString *string;
-    
-    string = [[NSString alloc] initWithUTF8String:cmd];
-	
-    message_kit_thread (@selector (launch_client:), string);
-	
-    [string release];
-}
-
-static void check_xinitrc (void) {
-    char *tem, buf[1024];
-    NSString *msg;
-	
-    if ([X11App prefs_get_boolean:@PREFS_DONE_XINIT_CHECK default:NO])
-		return;
-	
-    tem = getenv ("HOME");
-    if (tem == NULL) goto done;
-	
-    snprintf (buf, sizeof (buf), "%s/.xinitrc", tem);
-    if (access (buf, F_OK) != 0)
-		goto done;
-	
-    msg = NSLocalizedString (@"You have an existing ~/.xinitrc file.\n\n\
-Windows displayed by X11 applications may not have titlebars, or may look \
-different to windows displayed by native applications.\n\n\
-Would you like to move aside the existing file and use the standard X11 \
-environment the next time you start X11?", @"Startup xinitrc dialog");
-
-    if(NSAlertDefaultReturn == NSRunAlertPanel (nil, msg, NSLocalizedString (@"Yes", @""),
-                                                NSLocalizedString (@"No", @""), nil)) {
-        char buf2[1024];
-        int i = -1;
-      
-        snprintf (buf2, sizeof (buf2), "%s.old", buf);
-      
-        for(i = 1; access (buf2, F_OK) == 0; i++)
-            snprintf (buf2, sizeof (buf2), "%s.old.%d", buf, i);
-
-        rename (buf, buf2);
-    }
-    
- done:
-    [X11App prefs_set_boolean:@PREFS_DONE_XINIT_CHECK value:YES];
-    [X11App prefs_synchronize];
-}
-
-static inline pthread_t create_thread(void *func, void *arg) {
-    pthread_attr_t attr;
-    pthread_t tid;
-    
-    pthread_attr_init(&attr);
-    pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM);
-    pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
-    pthread_create(&tid, &attr, func, arg);
-    pthread_attr_destroy(&attr);
-    
-    return tid;
-}
-
-static void *xpbproxy_x_thread(void *args) {
-    xpbproxy_run();
-
-    fprintf(stderr, "xpbproxy thread is terminating unexpectedly.\n");
-    return NULL;
-}
-
-void X11ApplicationMain (int argc, char **argv, char **envp) {
-    NSAutoreleasePool *pool;
-
-#ifdef DEBUG
-    while (access ("/tmp/x11-block", F_OK) == 0) sleep (1);
-#endif
-  
-    pool = [[NSAutoreleasePool alloc] init];
-    X11App = (X11Application *) [X11Application sharedApplication];
-    init_ports ();
-    
-    app_prefs_domain_cfstr = (CFStringRef)[[NSBundle mainBundle] bundleIdentifier];
-
-    [NSApp read_defaults];
-    [NSBundle loadNibNamed:@"main" owner:NSApp];
-    [[NSNotificationCenter defaultCenter] addObserver:NSApp
-					selector:@selector (became_key:)
-					name:NSWindowDidBecomeKeyNotification object:nil];
-
-    /*
-     * The xpr Quartz mode is statically linked into this server.
-     * Initialize all the Quartz functions.
-     */
-    QuartzModeBundleInit();
-
-    /* Calculate the height of the menubar so we can avoid it. */
-    aquaMenuBarHeight = NSHeight([[NSScreen mainScreen] frame]) -
-    NSMaxY([[NSScreen mainScreen] visibleFrame]);
-
-    /* Set the key layout seed before we start the server */
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
-    last_key_layout = TISCopyCurrentKeyboardLayoutInputSource();    
-
-    if(!last_key_layout)
-        fprintf(stderr, "X11ApplicationMain: Unable to determine TISCopyCurrentKeyboardLayoutInputSource() at startup.\n");
-#else
-    KLGetCurrentKeyboardLayout(&last_key_layout);
-    if(!last_key_layout)
-        fprintf(stderr, "X11ApplicationMain: Unable to determine KLGetCurrentKeyboardLayout() at startup.\n");
-#endif
-
-    if (!QuartsResyncKeymap(FALSE)) {
-        fprintf(stderr, "X11ApplicationMain: Could not build a valid keymap.\n");
-    }
-
-    /* Tell the server thread that it can proceed */
-    QuartzInitServer(argc, argv, envp);
-    
-    /* This must be done after QuartzInitServer because it can result in
-     * an mieqEnqueue() - <rdar://problem/6300249>
-     */
-    check_xinitrc();
-    
-    create_thread(xpbproxy_x_thread, NULL);
-
-#if XQUARTZ_SPARKLE
-    [[X11App controller] setup_sparkle];
-    [[SUUpdater sharedUpdater] resetUpdateCycle];
-//    [[SUUpdater sharedUpdater] checkForUpdates:X11App];
-#endif
-
-    [pool release];
-    [NSApp run];
-    /* not reached */
-}
-
-@implementation X11Application (Private)
-
-#ifdef NX_DEVICELCMDKEYMASK
-/* This is to workaround a bug in the VNC server where we sometimes see the L
- * modifier and sometimes see no "side"
- */
-static inline int ensure_flag(int flags, int device_independent, int device_dependents, int device_dependent_default) {
-    if( (flags & device_independent) &&
-       !(flags & device_dependents))
-        flags |= device_dependent_default;
-    return flags;
-}
-#endif
-
-#ifdef DEBUG_UNTRUSTED_POINTER_DELTA
-static const char *untrusted_str(NSEvent *e) {
-    switch([e type]) {
-        case NSScrollWheel:
-            return "NSScrollWheel";
-        case NSTabletPoint:
-            return "NSTabletPoint";
-        case NSOtherMouseDown:
-            return "NSOtherMouseDown";
-        case NSOtherMouseUp:
-            return "NSOtherMouseUp";
-        case NSLeftMouseDown:
-            return "NSLeftMouseDown";
-        case NSLeftMouseUp:
-            return "NSLeftMouseUp";
-        default:
-            switch([e subtype]) {
-                case NSTabletPointEventSubtype:
-                    return "NSTabletPointEventSubtype";
-                case NSTabletProximityEventSubtype:
-                    return "NSTabletProximityEventSubtype";
-                default:
-                    return "Other";
-            }
-    }
-}
-#endif
-
-- (void) sendX11NSEvent:(NSEvent *)e {
-    NSPoint location = NSZeroPoint, tilt = NSZeroPoint;
-    int ev_button, ev_type;
-    float pressure = 0.0;
-    DeviceIntPtr pDev;
-    int modifierFlags;
-    BOOL isMouseOrTabletEvent, isTabletEvent;
-
-    isMouseOrTabletEvent =  [e type] == NSLeftMouseDown    ||  [e type] == NSOtherMouseDown    ||  [e type] == NSRightMouseDown    ||
-                            [e type] == NSLeftMouseUp      ||  [e type] == NSOtherMouseUp      ||  [e type] == NSRightMouseUp      ||
-                            [e type] == NSLeftMouseDragged ||  [e type] == NSOtherMouseDragged ||  [e type] == NSRightMouseDragged ||
-                            [e type] == NSMouseMoved       ||  [e type] == NSTabletPoint       ||  [e type] == NSScrollWheel;
-
-    isTabletEvent = ([e type] == NSTabletPoint) ||
-                    (isMouseOrTabletEvent && ([e subtype] == NSTabletPointEventSubtype || [e subtype] == NSTabletProximityEventSubtype));
-
-    if(isMouseOrTabletEvent) {
-        static NSPoint lastpt;
-        NSWindow *window = [e window];
-        NSRect screen = [[[NSScreen screens] objectAtIndex:0] frame];
-	    BOOL hasUntrustedPointerDelta;
-        
-        // NSEvents for tablets are not consistent wrt deltaXY between events, so we cannot rely on that
-        // Thus tablets will be subject to the warp-pointer bug worked around by the delta, but tablets
-        // are not normally used in cases where that bug would present itself, so this is a fair tradeoff
-        // <rdar://problem/7111003> deltaX and deltaY are incorrect for NSMouseMoved, NSTabletPointEventSubtype
-        // http://xquartz.macosforge.org/trac/ticket/288
-        hasUntrustedPointerDelta = isTabletEvent;
-        
-        // The deltaXY for middle click events also appear erroneous after fast user switching
-        // <rdar://problem/7979468> deltaX and deltaY are incorrect for NSOtherMouseDown and NSOtherMouseUp after FUS
-        // http://xquartz.macosforge.org/trac/ticket/389
-        hasUntrustedPointerDelta = hasUntrustedPointerDelta || [e type] == NSOtherMouseDown || [e type] == NSOtherMouseUp;
-
-        // The deltaXY for scroll events correspond to the scroll delta, not the pointer delta
-        // <rdar://problem/7989690> deltaXY for wheel events are being sent as mouse movement
-        hasUntrustedPointerDelta = hasUntrustedPointerDelta || [e type] == NSScrollWheel;
-
-#ifdef DEBUG_UNTRUSTED_POINTER_DELTA
-        hasUntrustedPointerDelta = hasUntrustedPointerDelta || [e type] == NSLeftMouseDown || [e type] == NSLeftMouseUp;
-#endif
-        
-        if (window != nil)	{
-            NSRect frame = [window frame];
-            location = [e locationInWindow];
-            location.x += frame.origin.x;
-            location.y += frame.origin.y;
-            lastpt = location;
-        } else if(hasUntrustedPointerDelta) {
-#ifdef DEBUG_UNTRUSTED_POINTER_DELTA
-            ErrorF("--- Begin Event Debug ---\n");
-            ErrorF("Event type: %s\n", untrusted_str(e));
-            ErrorF("old lastpt: (%0.2f, %0.2f)\n", lastpt.x, lastpt.y);
-            ErrorF("     delta: (%0.2f, %0.2f)\n", [e deltaX], -[e deltaY]);
-            ErrorF("  location: (%0.2f, %0.2f)\n", lastpt.x + [e deltaX], lastpt.y - [e deltaY]);
-            ErrorF("workaround: (%0.2f, %0.2f)\n", [e locationInWindow].x, [e locationInWindow].y);
-            ErrorF("--- End Event Debug ---\n");
-
-            location.x = lastpt.x + [e deltaX];
-            location.y = lastpt.y - [e deltaY];
-            lastpt = [e locationInWindow];
-#else
-            location = [e locationInWindow];
-            lastpt = location;
-#endif
-        } else {
-            location.x = lastpt.x + [e deltaX];
-            location.y = lastpt.y - [e deltaY];
-            lastpt = [e locationInWindow];
-        }
-        
-        /* Convert coordinate system */
-        location.y = (screen.origin.y + screen.size.height) - location.y;
-    }
-    
-    modifierFlags = [e modifierFlags];
-    
-#ifdef NX_DEVICELCMDKEYMASK
-    /* This is to workaround a bug in the VNC server where we sometimes see the L
-     * modifier and sometimes see no "side"
-     */
-    modifierFlags = ensure_flag(modifierFlags, NX_CONTROLMASK,   NX_DEVICELCTLKEYMASK   | NX_DEVICERCTLKEYMASK,     NX_DEVICELCTLKEYMASK);
-    modifierFlags = ensure_flag(modifierFlags, NX_SHIFTMASK,     NX_DEVICELSHIFTKEYMASK | NX_DEVICERSHIFTKEYMASK,   NX_DEVICELSHIFTKEYMASK);
-    modifierFlags = ensure_flag(modifierFlags, NX_COMMANDMASK,   NX_DEVICELCMDKEYMASK   | NX_DEVICERCMDKEYMASK,     NX_DEVICELCMDKEYMASK);
-    modifierFlags = ensure_flag(modifierFlags, NX_ALTERNATEMASK, NX_DEVICELALTKEYMASK   | NX_DEVICERALTKEYMASK,     NX_DEVICELALTKEYMASK);
-#endif
-
-    modifierFlags &= darwin_all_modifier_mask;
-
-    /* We don't receive modifier key events while out of focus, and 3button
-     * emulation mucks this up, so we need to check our modifier flag state
-     * on every event... ugg
-     */
-    
-    if(darwin_all_modifier_flags != modifierFlags)
-        DarwinUpdateModKeys(modifierFlags);
-    
-	switch ([e type]) {
-		case NSLeftMouseDown:     ev_button=1; ev_type=ButtonPress;   goto handle_mouse;
-		case NSOtherMouseDown:    ev_button=2; ev_type=ButtonPress;   goto handle_mouse;
-		case NSRightMouseDown:    ev_button=3; ev_type=ButtonPress;   goto handle_mouse;
-		case NSLeftMouseUp:       ev_button=1; ev_type=ButtonRelease; goto handle_mouse;
-		case NSOtherMouseUp:      ev_button=2; ev_type=ButtonRelease; goto handle_mouse;
-		case NSRightMouseUp:      ev_button=3; ev_type=ButtonRelease; goto handle_mouse;
-		case NSLeftMouseDragged:  ev_button=1; ev_type=MotionNotify;  goto handle_mouse;
-		case NSOtherMouseDragged: ev_button=2; ev_type=MotionNotify;  goto handle_mouse;
-		case NSRightMouseDragged: ev_button=3; ev_type=MotionNotify;  goto handle_mouse;
-		case NSMouseMoved:        ev_button=0; ev_type=MotionNotify;  goto handle_mouse;
-        case NSTabletPoint:       ev_button=0; ev_type=MotionNotify;  goto handle_mouse;
-            
-        handle_mouse:
-            pDev = darwinPointer;
-
-            /* NSTabletPoint can have no subtype */
-            if([e type] != NSTabletPoint &&
-               [e subtype] == NSTabletProximityEventSubtype) {
-                switch([e pointingDeviceType]) {
-                    case NSEraserPointingDevice:
-                        darwinTabletCurrent=darwinTabletEraser;
-                        break;
-                    case NSPenPointingDevice:
-                        darwinTabletCurrent=darwinTabletStylus;
-                        break;
-                    case NSCursorPointingDevice:
-                    case NSUnknownPointingDevice:
-                    default:
-                        darwinTabletCurrent=darwinTabletCursor;
-                        break;
-                }
-                
-                /* NSTabletProximityEventSubtype doesn't encode pressure ant tilt
-                 * So we just pretend the motion was caused by the mouse.  Hopefully
-                 * we'll have a better solution for this in the future (like maybe
-                 * NSTabletProximityEventSubtype will come from NSTabletPoint
-                 * rather than NSMouseMoved.
-                pressure = [e pressure];
-                tilt     = [e tilt];
-                pDev = darwinTabletCurrent;                
-                 */
-
-                DarwinSendProximityEvents([e isEnteringProximity] ? ProximityIn : ProximityOut,
-                                          location.x, location.y);
-            }
-
-			if ([e type] == NSTabletPoint || [e subtype] == NSTabletPointEventSubtype) {
-                pressure = [e pressure];
-                tilt     = [e tilt];
-                
-                pDev = darwinTabletCurrent;
-            }
-
-            if(!XQuartzServerVisible && noTestExtensions) {
-#if defined(XPLUGIN_VERSION) && XPLUGIN_VERSION > 0
-/* Older libXplugin (Tiger/"Stock" Leopard) aren't thread safe, so we can't call xp_find_window from the Appkit thread */
-                xp_window_id wid = 0;
-                xp_error e;
-
-                /* Sigh. Need to check that we're really over one of
-                 * our windows. (We need to receive pointer events while
-                 * not in the foreground, but we don't want to receive them
-                 * when another window is over us or we might show a tooltip)
-                 */
-
-                e = xp_find_window(location.x, location.y, 0, &wid);
-
-                if (e != XP_Success || (e == XP_Success && wid == 0))
-#endif
-                {
-                    bgMouseLocation = location;
-                    bgMouseLocationUpdated = TRUE;
-                    return;
-                }
-            }
-            
-            if(bgMouseLocationUpdated) {
-                if(!(ev_type == MotionNotify && ev_button == 0)) {
-                    DarwinSendPointerEvents(pDev, MotionNotify, 0, location.x,
-                                            location.y, pressure, tilt.x, tilt.y);
-                }
-                bgMouseLocationUpdated = FALSE;
-            }
-
-            DarwinSendPointerEvents(pDev, ev_type, ev_button, location.x, location.y,
-                                    pressure, tilt.x, tilt.y);
-            
-            break;
-            
-		case NSTabletProximity:
-            switch([e pointingDeviceType]) {
-                case NSEraserPointingDevice:
-                    darwinTabletCurrent=darwinTabletEraser;
-                    break;
-                case NSPenPointingDevice:
-                    darwinTabletCurrent=darwinTabletStylus;
-                    break;
-                case NSCursorPointingDevice:
-                case NSUnknownPointingDevice:
-                default:
-                    darwinTabletCurrent=darwinTabletCursor;
-                    break;
-            }
-            
-			DarwinSendProximityEvents([e isEnteringProximity] ? ProximityIn : ProximityOut,
-                                      location.x, location.y);
-            break;
-            
-		case NSScrollWheel:
-#if !defined(XPLUGIN_VERSION) || XPLUGIN_VERSION == 0
-            /* If we're in the background, we need to send a MotionNotify event
-             * first, since we aren't getting them on background mouse motion
-             */
-            if(!XQuartzServerVisible && noTestExtensions) {
-                bgMouseLocationUpdated = FALSE;
-                DarwinSendPointerEvents(darwinPointer, MotionNotify, 0, location.x,
-                                        location.y, pressure, tilt.x, tilt.y);
-            }
-#endif
-			DarwinSendScrollEvents([e deltaX], [e deltaY], location.x, location.y,
-                                   pressure, tilt.x, tilt.y);
-            break;
-            
-        case NSKeyDown: case NSKeyUp:
-            {
-                /* XKB clobbers our keymap at startup, so we need to force it on the first keypress.
-                 * TODO: Make this less of a kludge.
-                 */
-                static int force_resync_keymap = YES;
-                if(force_resync_keymap) {
-                    DarwinSendDDXEvent(kXquartzReloadKeymap, 0);
-                    force_resync_keymap = NO;
-                }
-            }
-
-            if(darwinSyncKeymap) {
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
-                TISInputSourceRef key_layout = TISCopyCurrentKeyboardLayoutInputSource();
-                TISInputSourceRef clear;
-                if (CFEqual(key_layout, last_key_layout)) {
-                    CFRelease(key_layout);
-                } else {
-                    /* Swap/free thread-safely */
-                    clear = last_key_layout;
-                    last_key_layout = key_layout;
-                    CFRelease(clear);
-#else
-                KeyboardLayoutRef key_layout;
-                KLGetCurrentKeyboardLayout(&key_layout);
-                if(key_layout != last_key_layout) {
-                    last_key_layout = key_layout;
-#endif
-                    /* Update keyInfo */
-                    if (!QuartsResyncKeymap(TRUE)) {
-                        fprintf(stderr, "sendX11NSEvent: Could not build a valid keymap.\n");
-                    }
-                }
-            }
-
-            /* Avoid stuck keys on context switch */
-            if(keyState[[e keyCode]] == [e type])
-                return;
-            keyState[[e keyCode]] = [e type];
-
-            DarwinSendKeyboardEvents(([e type] == NSKeyDown) ? KeyPress : KeyRelease, [e keyCode]);
-            break;
-            
-        default: break; /* for gcc */
-	}	
-}
-@end
+/* X11Application.m -- subclass of NSApplication to multiplex events

+ 

+ Copyright (c) 2002-2008 Apple Inc.

+ 

+ Permission is hereby granted, free of charge, to any person

+ obtaining a copy of this software and associated documentation files

+ (the "Software"), to deal in the Software without restriction,

+ including without limitation the rights to use, copy, modify, merge,

+ publish, distribute, sublicense, and/or sell copies of the Software,

+ and to permit persons to whom the Software is furnished to do so,

+ subject to the following conditions:

+ 

+ The above copyright notice and this permission notice shall be

+ included in all copies or substantial portions of the Software.

+ 

+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

+ NONINFRINGEMENT.  IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT

+ HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

+ DEALINGS IN THE SOFTWARE.

+ 

+ Except as contained in this notice, the name(s) of the above

+ copyright holders shall not be used in advertising or otherwise to

+ promote the sale, use or other dealings in this Software without

+ prior written authorization. */

+

+#include "sanitizedCarbon.h"

+

+#ifdef HAVE_DIX_CONFIG_H

+#include <dix-config.h>

+#endif

+

+#include "quartzCommon.h"

+

+#import "X11Application.h"

+

+#include "darwin.h"

+#include "quartz.h"

+#include "darwinEvents.h"

+#include "quartzKeyboard.h"

+#include "quartz.h"

+#include <X11/extensions/applewmconst.h>

+#include "micmap.h"

+#include "exglobals.h"

+

+#include <mach/mach.h>

+#include <unistd.h>

+#include <AvailabilityMacros.h>

+

+#include <Xplugin.h>

+

+// pbproxy/pbproxy.h

+extern int xpbproxy_run (void);

+

+#define DEFAULTS_FILE X11LIBDIR"/X11/xserver/Xquartz.plist"

+

+#ifndef XSERVER_VERSION

+#define XSERVER_VERSION "?"

+#endif

+

+/* Stuck modifier / button state... force release when we context switch */

+static NSEventType keyState[NUM_KEYCODES];

+

+extern Bool noTestExtensions;

+

+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050

+static TISInputSourceRef last_key_layout;

+#else

+static KeyboardLayoutRef last_key_layout;

+#endif

+

+extern int darwinFakeButtons;

+

+/* Store the mouse location while in the background, and update X11's pointer

+ * location when we become the foreground application

+ */

+static NSPoint bgMouseLocation;

+static BOOL bgMouseLocationUpdated = FALSE;

+

+X11Application *X11App;

+

+CFStringRef app_prefs_domain_cfstr = NULL;

+

+#define ALL_KEY_MASKS (NSShiftKeyMask | NSControlKeyMask | NSAlternateKeyMask | NSCommandKeyMask)

+

+@interface X11Application (Private)

+- (void) sendX11NSEvent:(NSEvent *)e;

+@end

+

+@implementation X11Application

+

+typedef struct message_struct message;

+struct message_struct {

+    mach_msg_header_t hdr;

+    SEL selector;

+    NSObject *arg;

+};

+

+static mach_port_t _port;

+

+/* Quartz mode initialization routine. This is often dynamically loaded

+   but is statically linked into this X server. */

+Bool QuartzModeBundleInit(void);

+

+static void init_ports (void) {

+    kern_return_t r;

+    NSPort *p;

+	

+    if (_port != MACH_PORT_NULL) return;

+	

+    r = mach_port_allocate (mach_task_self (), MACH_PORT_RIGHT_RECEIVE, &_port);

+    if (r != KERN_SUCCESS) return;

+	

+    p = [NSMachPort portWithMachPort:_port];

+    [p setDelegate:NSApp];

+    [p scheduleInRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode];

+}

+

+static void message_kit_thread (SEL selector, NSObject *arg) {

+    message msg;

+    kern_return_t r;

+	

+    msg.hdr.msgh_bits = MACH_MSGH_BITS (MACH_MSG_TYPE_MAKE_SEND, 0);

+    msg.hdr.msgh_size = sizeof (msg);

+    msg.hdr.msgh_remote_port = _port;

+    msg.hdr.msgh_local_port = MACH_PORT_NULL;

+    msg.hdr.msgh_reserved = 0;

+    msg.hdr.msgh_id = 0;

+	

+    msg.selector = selector;

+    msg.arg = [arg retain];

+	

+    r = mach_msg (&msg.hdr, MACH_SEND_MSG, msg.hdr.msgh_size,

+		  0, MACH_PORT_NULL, 0, MACH_PORT_NULL);

+    if (r != KERN_SUCCESS)

+		ErrorF("%s: mach_msg failed: %x\n", __FUNCTION__, r);

+}

+

+- (void) handleMachMessage:(void *)_msg {

+    message *msg = _msg;

+	

+    [self performSelector:msg->selector withObject:msg->arg];

+    [msg->arg release];

+}

+

+- (void) set_controller:obj {

+    if (_controller == nil) _controller = [obj retain];

+}

+

+- (void) dealloc {

+    if (_controller != nil) [_controller release];

+	

+    if (_port != MACH_PORT_NULL)

+		mach_port_deallocate (mach_task_self (), _port);

+	

+    [super dealloc];

+}

+

+- (void) orderFrontStandardAboutPanel: (id) sender {

+    NSMutableDictionary *dict;

+    NSDictionary *infoDict;

+    NSString *tem;

+    

+    dict = [NSMutableDictionary dictionaryWithCapacity:3];

+    infoDict = [[NSBundle mainBundle] infoDictionary];

+    

+    [dict setObject: NSLocalizedString (@"The X Window System", @"About panel")

+          forKey:@"ApplicationName"];

+    

+    tem = [infoDict objectForKey:@"CFBundleShortVersionString"];

+    

+    [dict setObject:[NSString stringWithFormat:@"XQuartz %@", tem]

+          forKey:@"ApplicationVersion"];

+

+    [dict setObject:[NSString stringWithFormat:@"xorg-server %s", XSERVER_VERSION]

+          forKey:@"Version"];

+    

+    [self orderFrontStandardAboutPanelWithOptions: dict];

+}

+

+- (void) activateX:(OSX_BOOL)state {

+    size_t i;

+    DEBUG_LOG("state=%d, _x_active=%d, \n", state, _x_active)

+    if (state) {

+        if(bgMouseLocationUpdated) {

+            DarwinSendPointerEvents(darwinPointer, MotionNotify, 0, bgMouseLocation.x, bgMouseLocation.y, 0.0, 0.0, 0.0);

+            bgMouseLocationUpdated = FALSE;

+        }

+        DarwinSendDDXEvent(kXquartzActivate, 0);

+    } else {

+

+        if(darwin_all_modifier_flags)

+            DarwinUpdateModKeys(0);

+        for(i=0; i < NUM_KEYCODES; i++) {

+            if(keyState[i] == NSKeyDown) {

+                DarwinSendKeyboardEvents(KeyRelease, i);

+                keyState[i] = NSKeyUp;

+            }

+        }

+        

+        DarwinSendDDXEvent(kXquartzDeactivate, 0);

+    }

+

+    _x_active = state;

+}

+

+- (void) became_key:(NSWindow *)win {

+	[self activateX:NO];

+}

+

+- (void) sendEvent:(NSEvent *)e {

+    OSX_BOOL for_appkit, for_x;

+    

+    /* By default pass down the responder chain and to X. */

+    for_appkit = YES;

+    for_x = YES;

+    

+    switch ([e type]) {

+        case NSLeftMouseDown: case NSRightMouseDown: case NSOtherMouseDown:

+        case NSLeftMouseUp: case NSRightMouseUp: case NSOtherMouseUp:

+            if ([e window] != nil) {

+                /* Pointer event has an (AppKit) window. Probably something for the kit. */

+                for_x = NO;

+                if (_x_active) [self activateX:NO];

+            } else if ([self modalWindow] == nil) {

+                /* Must be an X window. Tell appkit it doesn't have focus. */

+                for_appkit = NO;

+                

+                if ([self isActive]) {

+                    [self deactivate];

+                    if (!_x_active && quartzProcs->IsX11Window([e window],

+                                                               [e windowNumber]))

+                        [self activateX:YES];

+                }

+            }

+

+            /* We want to force sending to appkit if we're over the menu bar */

+            if(!for_appkit) {

+                NSPoint NSlocation = [e locationInWindow];

+                NSWindow *window = [e window];

+                NSRect NSframe, NSvisibleFrame;

+                CGRect CGframe, CGvisibleFrame;

+                CGPoint CGlocation;

+

+                if (window != nil)	{

+                    NSRect frame = [window frame];

+                    NSlocation.x += frame.origin.x;

+                    NSlocation.y += frame.origin.y;

+                }

+

+                NSframe = [[NSScreen mainScreen] frame];

+                NSvisibleFrame = [[NSScreen mainScreen] visibleFrame];

+                

+                CGframe = CGRectMake(NSframe.origin.x, NSframe.origin.y,

+                                            NSframe.size.width, NSframe.size.height);

+                CGvisibleFrame = CGRectMake(NSvisibleFrame.origin.x,

+                                                   NSvisibleFrame.origin.y,

+                                                   NSvisibleFrame.size.width,

+                                                   NSvisibleFrame.size.height);

+                CGlocation = CGPointMake(NSlocation.x, NSlocation.y);

+                

+                if(CGRectContainsPoint(CGframe, CGlocation) &&

+                   !CGRectContainsPoint(CGvisibleFrame, CGlocation))

+                    for_appkit = YES;

+            }

+            

+            break;

+            

+        case NSKeyDown: case NSKeyUp:

+            

+            if(_x_active) {

+                static BOOL do_swallow = NO;

+                static int swallow_keycode;

+                

+                if([e type] == NSKeyDown) {

+                    /* Before that though, see if there are any global

+                     * shortcuts bound to it. */

+

+                    if(darwinAppKitModMask & [e modifierFlags]) {

+                        /* Override to force sending to Appkit */

+                        swallow_keycode = [e keyCode];

+                        do_swallow = YES;

+                        for_x = NO;

+#if XPLUGIN_VERSION >= 1

+                    } else if(XQuartzEnableKeyEquivalents &&

+                             xp_is_symbolic_hotkey_event([e eventRef])) {

+                        swallow_keycode = [e keyCode];

+                        do_swallow = YES;

+                        for_x = NO;

+#endif

+                    } else if(XQuartzEnableKeyEquivalents &&

+                              [[self mainMenu] performKeyEquivalent:e]) {

+                        swallow_keycode = [e keyCode];

+                        do_swallow = YES;

+                        for_appkit = NO;

+                        for_x = NO;

+                    } else if(!XQuartzIsRootless

+                              && ([e modifierFlags] & ALL_KEY_MASKS) == (NSCommandKeyMask | NSAlternateKeyMask)

+                              && ([e keyCode] == 0 /*a*/ || [e keyCode] == 53 /*Esc*/)) {

+                        /* We have this here to force processing fullscreen 

+                         * toggle even if XQuartzEnableKeyEquivalents is disabled */

+                        swallow_keycode = [e keyCode];

+                        do_swallow = YES;

+                        for_x = NO;

+                        for_appkit = NO;

+                        DarwinSendDDXEvent(kXquartzToggleFullscreen, 0);

+                    } else {

+                        /* No kit window is focused, so send it to X. */

+                        for_appkit = NO;

+                    }

+                } else { /* KeyUp */

+                    /* If we saw a key equivalent on the down, don't pass

+                     * the up through to X. */

+                    if (do_swallow && [e keyCode] == swallow_keycode) {

+                        do_swallow = NO;

+                        for_x = NO;

+                    }

+                }

+            } else { /* !_x_active */

+                for_x = NO;

+            }

+            break;

+            

+        case NSFlagsChanged:

+            /* Don't tell X11 about modifiers changing while it's not active */

+            if (!_x_active)

+                for_x = NO;

+            break;

+            

+        case NSAppKitDefined:

+            switch ([e subtype]) {

+                case NSApplicationActivatedEventType:

+                    for_x = NO;

+                    if ([self modalWindow] == nil) {

+                        BOOL order_all_windows = YES, workspaces, ok;

+                        for_appkit = NO;

+                        

+                        /* FIXME: hack to avoid having to pass the event to appkit,

+                         which would cause it to raise one of its windows. */

+                        _appFlags._active = YES;

+                        

+                        [self activateX:YES];

+                        

+                        /* Get the Spaces preference for SwitchOnActivate */

+                        (void)CFPreferencesAppSynchronize(CFSTR("com.apple.dock"));

+                        workspaces = CFPreferencesGetAppBooleanValue(CFSTR("workspaces"), CFSTR("com.apple.dock"), &ok);

+                        if (!ok)

+                            workspaces = NO;

+

+                        if (workspaces) {

+                            (void)CFPreferencesAppSynchronize(CFSTR(".GlobalPreferences"));

+                            order_all_windows = CFPreferencesGetAppBooleanValue(CFSTR("AppleSpacesSwitchOnActivate"), CFSTR(".GlobalPreferences"), &ok);

+                            if (!ok)

+                                order_all_windows = YES;

+                        }

+                        

+                        /* TODO: In the workspaces && !AppleSpacesSwitchOnActivate case, the windows are ordered

+                         *       correctly, but we need to activate the top window on this space if there is

+                         *       none active.

+                         *

+                         *       If there are no active windows, and there are minimized windows, we should

+                         *       be restoring one of them.

+                         */

+                        if ([e data2] & 0x10) // 0x10 is set when we use cmd-tab or the dock icon

+                            DarwinSendDDXEvent(kXquartzBringAllToFront, 1, order_all_windows);

+                    }

+                    break;

+                    

+                case 18: /* ApplicationDidReactivate */

+                    if (XQuartzFullscreenVisible) for_appkit = NO;

+                    break;

+                    

+                case NSApplicationDeactivatedEventType:

+                    for_x = NO;

+                    [self activateX:NO];

+                    break;

+            }

+            break;

+            

+        default: break; /* for gcc */

+    }

+    

+    if (for_appkit) [super sendEvent:e];

+    

+    if (for_x) [self sendX11NSEvent:e];

+}

+

+- (void) set_window_menu:(NSArray *)list {

+	[_controller set_window_menu:list];

+}

+

+- (void) set_window_menu_check:(NSNumber *)n {

+	[_controller set_window_menu_check:n];

+}

+

+- (void) set_apps_menu:(NSArray *)list {

+	[_controller set_apps_menu:list];

+}

+

+- (void) set_front_process:unused {

+	[NSApp activateIgnoringOtherApps:YES];

+

+	if ([self modalWindow] == nil)

+		[self activateX:YES];

+}

+

+- (void) set_can_quit:(NSNumber *)state {

+	[_controller set_can_quit:[state boolValue]];

+}

+

+- (void) server_ready:unused {

+	[_controller server_ready];

+}

+

+- (void) show_hide_menubar:(NSNumber *)state {

+    /* Also shows/hides the dock */

+    if ([state boolValue])

+        SetSystemUIMode(kUIModeNormal, 0); 

+    else

+        SetSystemUIMode(kUIModeAllHidden, XQuartzFullscreenMenu ? kUIOptionAutoShowMenuBar : 0); // kUIModeAllSuppressed or kUIOptionAutoShowMenuBar can be used to allow "mouse-activation"

+}

+

+- (void) launch_client:(NSString *)cmd {

+    (void)[_controller application:self openFile:cmd];

+}

+

+/* user preferences */

+

+/* Note that these functions only work for arrays whose elements

+ can be toll-free-bridged between NS and CF worlds. */

+

+static const void *cfretain (CFAllocatorRef a, const void *b) {

+    return CFRetain (b);

+}

+

+static void cfrelease (CFAllocatorRef a, const void *b) {

+    CFRelease (b);

+}

+

+static CFMutableArrayRef nsarray_to_cfarray (NSArray *in) {

+	CFMutableArrayRef out;

+	CFArrayCallBacks cb;

+	NSObject *ns;

+	const CFTypeRef *cf;

+	int i, count;

+

+	memset (&cb, 0, sizeof (cb));

+	cb.version = 0;

+	cb.retain = cfretain;

+	cb.release = cfrelease;

+

+	count = [in count];

+	out = CFArrayCreateMutable (NULL, count, &cb);

+

+	for (i = 0; i < count; i++) {

+		ns = [in objectAtIndex:i];

+

+		if ([ns isKindOfClass:[NSArray class]])

+			cf = (CFTypeRef) nsarray_to_cfarray ((NSArray *) ns);

+		else

+			cf = CFRetain ((CFTypeRef) ns);

+

+		CFArrayAppendValue (out, cf);

+		CFRelease (cf);

+	}

+

+	return out;

+}

+

+static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {

+	NSMutableArray *out;

+	const CFTypeRef *cf;

+	NSObject *ns;

+	int i, count;

+

+	count = CFArrayGetCount (in);

+	out = [[NSMutableArray alloc] initWithCapacity:count];

+

+	for (i = 0; i < count; i++) {

+		cf = CFArrayGetValueAtIndex (in, i);

+

+		if (CFGetTypeID (cf) == CFArrayGetTypeID ())

+			ns = cfarray_to_nsarray ((CFArrayRef) cf);

+		else

+			ns = [(id)cf retain];

+

+		[out addObject:ns];

+		[ns release];

+	}

+

+	return out;

+}

+

+- (CFPropertyListRef) prefs_get_copy:(NSString *)key {

+    CFPropertyListRef value;

+	

+    value = CFPreferencesCopyAppValue ((CFStringRef) key, app_prefs_domain_cfstr);

+	

+    if (value == NULL) {

+      static CFDictionaryRef defaults;

+      

+      if (defaults == NULL) {

+	CFStringRef error = NULL;

+	CFDataRef data;

+	CFURLRef url;

+	SInt32 error_code;

+	

+	url = (CFURLCreateFromFileSystemRepresentation

+	       (NULL, (unsigned char *)DEFAULTS_FILE, strlen (DEFAULTS_FILE), false));

+	if (CFURLCreateDataAndPropertiesFromResource (NULL, url, &data,

+						      NULL, NULL, &error_code)) {

+	  defaults = (CFPropertyListCreateFromXMLData

+		      (NULL, data, kCFPropertyListMutableContainersAndLeaves, &error));

+	  if (error != NULL) CFRelease (error);

+	  CFRelease (data);

+	}

+	CFRelease (url);

+			

+	if (defaults != NULL) {

+	  NSMutableArray *apps, *elt;

+	  int count, i;

+	  NSString *name, *nname;

+	  

+	  /* Localize the names in the default apps menu. */

+	  

+	  apps = [(NSDictionary *)defaults objectForKey:@PREFS_APPSMENU];

+	  if (apps != nil) {

+	    count = [apps count];

+	    for (i = 0; i < count; i++)	{

+	      elt = [apps objectAtIndex:i];

+	      if (elt != nil && [elt isKindOfClass:[NSArray class]]) {

+		name = [elt objectAtIndex:0];

+		if (name != nil) {

+		  nname = NSLocalizedString (name, nil);

+		  if (nname != nil && nname != name)

+		    [elt replaceObjectAtIndex:0 withObject:nname];

+		}

+	      }

+	    }

+	  }

+	}

+      }

+		

+      if (defaults != NULL) value = CFDictionaryGetValue (defaults, key);

+      if (value != NULL) CFRetain (value);

+    }

+	

+    return value;

+}

+

+- (int) prefs_get_integer:(NSString *)key default:(int)def {

+  CFPropertyListRef value;

+  int ret;

+  

+  value = [self prefs_get_copy:key];

+  

+  if (value != NULL && CFGetTypeID (value) == CFNumberGetTypeID ())

+    CFNumberGetValue (value, kCFNumberIntType, &ret);

+  else if (value != NULL && CFGetTypeID (value) == CFStringGetTypeID ())

+    ret = CFStringGetIntValue (value);

+  else

+    ret = def;

+  

+  if (value != NULL) CFRelease (value);

+  

+  return ret;

+}

+

+- (const char *) prefs_get_string:(NSString *)key default:(const char *)def {

+  CFPropertyListRef value;

+  const char *ret = NULL;

+  

+  value = [self prefs_get_copy:key];

+  

+  if (value != NULL && CFGetTypeID (value) == CFStringGetTypeID ()) {

+    NSString *s = (NSString *) value;

+    

+    ret = [s UTF8String];

+  }

+  

+  if (value != NULL) CFRelease (value);

+  

+  return ret != NULL ? ret : def;

+}

+

+- (NSURL *) prefs_copy_url:(NSString *)key default:(NSURL *)def {

+    CFPropertyListRef value;

+    NSURL *ret = NULL;

+    

+    value = [self prefs_get_copy:key];

+    

+    if (value != NULL && CFGetTypeID (value) == CFStringGetTypeID ()) {

+        NSString *s = (NSString *) value;

+

+        ret = [NSURL URLWithString:s];

+        [ret retain];

+    }

+    

+    if (value != NULL) CFRelease (value);

+    

+    return ret != NULL ? ret : def;

+}

+

+- (float) prefs_get_float:(NSString *)key default:(float)def {

+  CFPropertyListRef value;

+  float ret = def;

+  

+  value = [self prefs_get_copy:key];

+  

+  if (value != NULL

+      && CFGetTypeID (value) == CFNumberGetTypeID ()

+      && CFNumberIsFloatType (value))

+    CFNumberGetValue (value, kCFNumberFloatType, &ret);

+  else if (value != NULL && CFGetTypeID (value) == CFStringGetTypeID ())

+    ret = CFStringGetDoubleValue (value);

+	

+  if (value != NULL) CFRelease (value);

+  

+  return ret;

+}

+

+- (int) prefs_get_boolean:(NSString *)key default:(int)def {

+  CFPropertyListRef value;

+  int ret = def;

+  

+  value = [self prefs_get_copy:key];

+  

+  if (value != NULL) {

+    if (CFGetTypeID (value) == CFNumberGetTypeID ())

+      CFNumberGetValue (value, kCFNumberIntType, &ret);

+    else if (CFGetTypeID (value) == CFBooleanGetTypeID ())

+      ret = CFBooleanGetValue (value);

+    else if (CFGetTypeID (value) == CFStringGetTypeID ()) {

+      const char *tem = [(NSString *) value UTF8String];

+      if (strcasecmp (tem, "true") == 0 || strcasecmp (tem, "yes") == 0)

+	ret = YES;

+      else

+	ret = NO;

+    }

+    

+    CFRelease (value);

+  }

+  return ret;

+}

+

+- (NSArray *) prefs_get_array:(NSString *)key {

+  NSArray *ret = nil;

+  CFPropertyListRef value;

+  

+  value = [self prefs_get_copy:key];

+  

+  if (value != NULL) {

+    if (CFGetTypeID (value) == CFArrayGetTypeID ())

+      ret = [cfarray_to_nsarray (value) autorelease];

+    

+    CFRelease (value);

+  }

+  

+  return ret;

+}

+

+- (void) prefs_set_integer:(NSString *)key value:(int)value {

+    CFNumberRef x;

+	

+    x = CFNumberCreate (NULL, kCFNumberIntType, &value);

+	

+    CFPreferencesSetValue ((CFStringRef) key, (CFTypeRef) x, app_prefs_domain_cfstr,

+			   kCFPreferencesCurrentUser, kCFPreferencesAnyHost);

+	

+    CFRelease (x);

+}

+

+- (void) prefs_set_float:(NSString *)key value:(float)value {

+    CFNumberRef x;

+	

+    x = CFNumberCreate (NULL, kCFNumberFloatType, &value);

+	

+    CFPreferencesSetValue ((CFStringRef) key, (CFTypeRef) x, app_prefs_domain_cfstr,

+			   kCFPreferencesCurrentUser, kCFPreferencesAnyHost);

+	

+    CFRelease (x);

+}

+

+- (void) prefs_set_boolean:(NSString *)key value:(int)value {

+  CFPreferencesSetValue ((CFStringRef) key,

+			 (CFTypeRef) (value ? kCFBooleanTrue

+			 : kCFBooleanFalse), app_prefs_domain_cfstr,

+			 kCFPreferencesCurrentUser, kCFPreferencesAnyHost);

+  

+}

+

+- (void) prefs_set_array:(NSString *)key value:(NSArray *)value {

+  CFArrayRef cfarray;

+  

+  cfarray = nsarray_to_cfarray (value);

+  CFPreferencesSetValue ((CFStringRef) key,

+			 (CFTypeRef) cfarray,

+			 app_prefs_domain_cfstr,

+			 kCFPreferencesCurrentUser, kCFPreferencesAnyHost);

+  CFRelease (cfarray);

+}

+

+- (void) prefs_set_string:(NSString *)key value:(NSString *)value {

+  CFPreferencesSetValue ((CFStringRef) key, (CFTypeRef) value,

+			 app_prefs_domain_cfstr, kCFPreferencesCurrentUser,

+			 kCFPreferencesAnyHost);

+}

+

+- (void) prefs_synchronize {

+    CFPreferencesAppSynchronize (kCFPreferencesCurrentApplication);

+}

+

+- (void) read_defaults

+{

+    NSString *nsstr;

+    const char *tem;

+	

+    XQuartzRootlessDefault = [self prefs_get_boolean:@PREFS_ROOTLESS

+                                           default:XQuartzRootlessDefault];

+    XQuartzFullscreenMenu = [self prefs_get_boolean:@PREFS_FULLSCREEN_MENU

+                                           default:XQuartzFullscreenMenu];

+    XQuartzFullscreenDisableHotkeys = ![self prefs_get_boolean:@PREFS_FULLSCREEN_HOTKEYS

+                                                      default:!XQuartzFullscreenDisableHotkeys];

+    darwinFakeButtons = [self prefs_get_boolean:@PREFS_FAKEBUTTONS

+                                        default:darwinFakeButtons];

+    XQuartzOptionSendsAlt = [self prefs_get_boolean:@PREFS_OPTION_SENDS_ALT

+                                           default:XQuartzOptionSendsAlt];

+

+    if (darwinFakeButtons) {

+        const char *fake2, *fake3;

+

+        fake2 = [self prefs_get_string:@PREFS_FAKE_BUTTON2 default:NULL];

+        fake3 = [self prefs_get_string:@PREFS_FAKE_BUTTON3 default:NULL];

+

+        if (fake2 != NULL) darwinFakeMouse2Mask = DarwinParseModifierList(fake2, TRUE);

+        if (fake3 != NULL) darwinFakeMouse3Mask = DarwinParseModifierList(fake3, TRUE);

+    }

+

+    tem = [self prefs_get_string:@PREFS_APPKIT_MODIFIERS default:NULL];

+    if (tem != NULL) darwinAppKitModMask = DarwinParseModifierList(tem, TRUE);

+	

+    tem = [self prefs_get_string:@PREFS_WINDOW_ITEM_MODIFIERS default:NULL];

+    if (tem != NULL) {

+        windowItemModMask = DarwinParseModifierList(tem, FALSE);

+    } else {

+        nsstr = NSLocalizedString (@"window item modifiers", @"window item modifiers");

+        if(nsstr != NULL) {

+            tem = [nsstr UTF8String];

+            if((tem != NULL) && strcmp(tem, "window item modifiers")) {

+                windowItemModMask = DarwinParseModifierList(tem, FALSE);

+            }

+        }

+    }

+

+    XQuartzEnableKeyEquivalents = [self prefs_get_boolean:@PREFS_KEYEQUIVS

+                                              default:XQuartzEnableKeyEquivalents];

+	

+    darwinSyncKeymap = [self prefs_get_boolean:@PREFS_SYNC_KEYMAP

+                                       default:darwinSyncKeymap];

+		

+    darwinDesiredDepth = [self prefs_get_integer:@PREFS_DEPTH

+                                         default:darwinDesiredDepth];

+    

+    noTestExtensions = ![self prefs_get_boolean:@PREFS_TEST_EXTENSIONS

+                                        default:FALSE];

+

+#if XQUARTZ_SPARKLE

+    NSURL *url =  [self prefs_copy_url:@PREFS_UPDATE_FEED default:nil];

+    if(url) {

+        [[SUUpdater sharedUpdater] setFeedURL:url];

+        [url release];

+    }

+#endif

+}

+

+/* This will end up at the end of the responder chain. */

+- (void) copy:sender {

+  DarwinSendDDXEvent(kXquartzPasteboardNotify, 1,

+			     AppleWMCopyToPasteboard);

+}

+

+- (X11Controller *) controller {

+    return _controller;

+}

+

+- (OSX_BOOL) x_active {

+    return _x_active;

+}

+

+@end

+

+static NSArray *

+array_with_strings_and_numbers (int nitems, const char **items,

+				const char *numbers) {

+  NSMutableArray *array, *subarray;

+  NSString *string, *number;

+  int i;

+	

+  /* (Can't autorelease on the X server thread) */

+  

+  array = [[NSMutableArray alloc] initWithCapacity:nitems];

+  

+  for (i = 0; i < nitems; i++) {

+    subarray = [[NSMutableArray alloc] initWithCapacity:2];

+    

+    string = [[NSString alloc] initWithUTF8String:items[i]];

+    [subarray addObject:string];

+    [string release];

+    

+    if (numbers[i] != 0) {

+      number = [[NSString alloc] initWithFormat:@"%d", numbers[i]];

+      [subarray addObject:number];

+      [number release];

+    } else

+      [subarray addObject:@""];

+    

+    [array addObject:subarray];

+    [subarray release];

+  }

+  

+  return array;

+}

+

+void X11ApplicationSetWindowMenu (int nitems, const char **items,

+				  const char *shortcuts) {

+  NSArray *array;

+  array = array_with_strings_and_numbers (nitems, items, shortcuts);

+  

+  /* Send the array of strings over to the appkit thread */

+  

+  message_kit_thread (@selector (set_window_menu:), array);

+  [array release];

+}

+

+void X11ApplicationSetWindowMenuCheck (int idx) {

+  NSNumber *n;

+  

+  n = [[NSNumber alloc] initWithInt:idx];

+  

+  message_kit_thread (@selector (set_window_menu_check:), n);

+  

+  [n release];

+}

+

+void X11ApplicationSetFrontProcess (void) {

+    message_kit_thread (@selector (set_front_process:), nil);

+}

+

+void X11ApplicationSetCanQuit (int state) {

+    NSNumber *n;

+	

+    n = [[NSNumber alloc] initWithBool:state];

+	

+    message_kit_thread (@selector (set_can_quit:), n);

+	

+    [n release];

+}

+

+void X11ApplicationServerReady (void) {

+    message_kit_thread (@selector (server_ready:), nil);

+}

+

+void X11ApplicationShowHideMenubar (int state) {

+    NSNumber *n;

+	

+    n = [[NSNumber alloc] initWithBool:state];

+	

+    message_kit_thread (@selector (show_hide_menubar:), n);

+	

+    [n release];

+}

+

+void X11ApplicationLaunchClient (const char *cmd) {

+    NSString *string;

+    

+    string = [[NSString alloc] initWithUTF8String:cmd];

+	

+    message_kit_thread (@selector (launch_client:), string);

+	

+    [string release];

+}

+

+/* This is a special function in that it is run from the *SERVER* thread and

+ * not the AppKit thread.  We want to block entering a screen-capturing RandR

+ * mode until we notify the user about how to get out if the X11 client crashes.

+ */

+Bool X11ApplicationCanEnterRandR(void) {

+    NSString *title, *msg;

+    

+    if([X11App prefs_get_boolean:@PREFS_NO_RANDR_ALERT default:NO] || XQuartzShieldingWindowLevel != 0)

+        return TRUE;

+    

+    title = NSLocalizedString(@"Enter RandR mode?", @"Dialog title when switching to RandR");

+    msg = NSLocalizedString(@"An application has requested X11 to change the resolution of your display.  X11 will restore the display to its previous state when the requesting application requests to return to the previous state.  Alternatively, you can use the ⌥⌘A key sequence to force X11 to return to the previous state.",

+                            @"Dialog when switching to RandR");

+

+    if(!XQuartzIsRootless)

+        QuartzShowFullscreen(FALSE);

+    

+    switch(NSRunAlertPanel(title, msg, NSLocalizedString(@"Allow", @""), NSLocalizedString (@"Cancel", @""), NSLocalizedString (@"Always Allow", @""))) {

+        case NSAlertOtherReturn:

+            [X11App prefs_set_boolean:@PREFS_NO_RANDR_ALERT value:YES];

+            [X11App prefs_synchronize];

+        case NSAlertDefaultReturn:

+            return YES;

+

+        default:

+            return NO;

+    }

+}

+

+static void check_xinitrc (void) {

+    char *tem, buf[1024];

+    NSString *msg;

+	

+    if ([X11App prefs_get_boolean:@PREFS_DONE_XINIT_CHECK default:NO])

+		return;

+	

+    tem = getenv ("HOME");

+    if (tem == NULL) goto done;

+	

+    snprintf (buf, sizeof (buf), "%s/.xinitrc", tem);

+    if (access (buf, F_OK) != 0)

+		goto done;

+	

+    msg = NSLocalizedString (@"You have an existing ~/.xinitrc file.\n\n\

+Windows displayed by X11 applications may not have titlebars, or may look \

+different to windows displayed by native applications.\n\n\

+Would you like to move aside the existing file and use the standard X11 \

+environment the next time you start X11?", @"Startup xinitrc dialog");

+

+    if(NSAlertDefaultReturn == NSRunAlertPanel (nil, msg, NSLocalizedString (@"Yes", @""),

+                                                NSLocalizedString (@"No", @""), nil)) {

+        char buf2[1024];

+        int i = -1;

+      

+        snprintf (buf2, sizeof (buf2), "%s.old", buf);

+      

+        for(i = 1; access (buf2, F_OK) == 0; i++)

+            snprintf (buf2, sizeof (buf2), "%s.old.%d", buf, i);

+

+        rename (buf, buf2);

+    }

+    

+ done:

+    [X11App prefs_set_boolean:@PREFS_DONE_XINIT_CHECK value:YES];

+    [X11App prefs_synchronize];

+}

+

+static inline pthread_t create_thread(void *func, void *arg) {

+    pthread_attr_t attr;

+    pthread_t tid;

+    

+    pthread_attr_init(&attr);

+    pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM);

+    pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);

+    pthread_create(&tid, &attr, func, arg);

+    pthread_attr_destroy(&attr);

+    

+    return tid;

+}

+

+static void *xpbproxy_x_thread(void *args) {

+    xpbproxy_run();

+

+    fprintf(stderr, "xpbproxy thread is terminating unexpectedly.\n");

+    return NULL;

+}

+

+void X11ApplicationMain (int argc, char **argv, char **envp) {

+    NSAutoreleasePool *pool;

+

+#ifdef DEBUG

+    while (access ("/tmp/x11-block", F_OK) == 0) sleep (1);

+#endif

+  

+    pool = [[NSAutoreleasePool alloc] init];

+    X11App = (X11Application *) [X11Application sharedApplication];

+    init_ports ();

+    

+    app_prefs_domain_cfstr = (CFStringRef)[[NSBundle mainBundle] bundleIdentifier];

+

+    [NSApp read_defaults];

+    [NSBundle loadNibNamed:@"main" owner:NSApp];

+    [[NSNotificationCenter defaultCenter] addObserver:NSApp

+					selector:@selector (became_key:)

+					name:NSWindowDidBecomeKeyNotification object:nil];

+

+    /*

+     * The xpr Quartz mode is statically linked into this server.

+     * Initialize all the Quartz functions.

+     */

+    QuartzModeBundleInit();

+

+    /* Calculate the height of the menubar so we can avoid it. */

+    aquaMenuBarHeight = NSHeight([[NSScreen mainScreen] frame]) -

+    NSMaxY([[NSScreen mainScreen] visibleFrame]);

+

+    /* Set the key layout seed before we start the server */

+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050

+    last_key_layout = TISCopyCurrentKeyboardLayoutInputSource();    

+

+    if(!last_key_layout)

+        fprintf(stderr, "X11ApplicationMain: Unable to determine TISCopyCurrentKeyboardLayoutInputSource() at startup.\n");

+#else

+    KLGetCurrentKeyboardLayout(&last_key_layout);

+    if(!last_key_layout)

+        fprintf(stderr, "X11ApplicationMain: Unable to determine KLGetCurrentKeyboardLayout() at startup.\n");

+#endif

+

+    if (!QuartsResyncKeymap(FALSE)) {

+        fprintf(stderr, "X11ApplicationMain: Could not build a valid keymap.\n");

+    }

+

+    /* Tell the server thread that it can proceed */

+    QuartzInitServer(argc, argv, envp);

+    

+    /* This must be done after QuartzInitServer because it can result in

+     * an mieqEnqueue() - <rdar://problem/6300249>

+     */

+    check_xinitrc();

+    

+    create_thread(xpbproxy_x_thread, NULL);

+

+#if XQUARTZ_SPARKLE

+    [[X11App controller] setup_sparkle];

+    [[SUUpdater sharedUpdater] resetUpdateCycle];

+//    [[SUUpdater sharedUpdater] checkForUpdates:X11App];

+#endif

+

+    [pool release];

+    [NSApp run];

+    /* not reached */

+}

+

+@implementation X11Application (Private)

+

+#ifdef NX_DEVICELCMDKEYMASK

+/* This is to workaround a bug in the VNC server where we sometimes see the L

+ * modifier and sometimes see no "side"

+ */

+static inline int ensure_flag(int flags, int device_independent, int device_dependents, int device_dependent_default) {

+    if( (flags & device_independent) &&

+       !(flags & device_dependents))

+        flags |= device_dependent_default;

+    return flags;

+}

+#endif

+

+#ifdef DEBUG_UNTRUSTED_POINTER_DELTA

+static const char *untrusted_str(NSEvent *e) {

+    switch([e type]) {

+        case NSScrollWheel:

+            return "NSScrollWheel";

+        case NSTabletPoint:

+            return "NSTabletPoint";

+        case NSOtherMouseDown:

+            return "NSOtherMouseDown";

+        case NSOtherMouseUp:

+            return "NSOtherMouseUp";

+        case NSLeftMouseDown:

+            return "NSLeftMouseDown";

+        case NSLeftMouseUp:

+            return "NSLeftMouseUp";

+        default:

+            switch([e subtype]) {

+                case NSTabletPointEventSubtype:

+                    return "NSTabletPointEventSubtype";

+                case NSTabletProximityEventSubtype:

+                    return "NSTabletProximityEventSubtype";

+                default:

+                    return "Other";

+            }

+    }

+}

+#endif

+

+- (void) sendX11NSEvent:(NSEvent *)e {

+    NSPoint location = NSZeroPoint, tilt = NSZeroPoint;

+    int ev_button, ev_type;

+    float pressure = 0.0;

+    DeviceIntPtr pDev;

+    int modifierFlags;

+    BOOL isMouseOrTabletEvent, isTabletEvent;

+

+    isMouseOrTabletEvent =  [e type] == NSLeftMouseDown    ||  [e type] == NSOtherMouseDown    ||  [e type] == NSRightMouseDown    ||

+                            [e type] == NSLeftMouseUp      ||  [e type] == NSOtherMouseUp      ||  [e type] == NSRightMouseUp      ||

+                            [e type] == NSLeftMouseDragged ||  [e type] == NSOtherMouseDragged ||  [e type] == NSRightMouseDragged ||

+                            [e type] == NSMouseMoved       ||  [e type] == NSTabletPoint       ||  [e type] == NSScrollWheel;

+

+    isTabletEvent = ([e type] == NSTabletPoint) ||

+                    (isMouseOrTabletEvent && ([e subtype] == NSTabletPointEventSubtype || [e subtype] == NSTabletProximityEventSubtype));

+

+    if(isMouseOrTabletEvent) {

+        static NSPoint lastpt;

+        NSWindow *window = [e window];

+        NSRect screen = [[[NSScreen screens] objectAtIndex:0] frame];

+	    BOOL hasUntrustedPointerDelta;

+        

+        // NSEvents for tablets are not consistent wrt deltaXY between events, so we cannot rely on that

+        // Thus tablets will be subject to the warp-pointer bug worked around by the delta, but tablets

+        // are not normally used in cases where that bug would present itself, so this is a fair tradeoff

+        // <rdar://problem/7111003> deltaX and deltaY are incorrect for NSMouseMoved, NSTabletPointEventSubtype

+        // http://xquartz.macosforge.org/trac/ticket/288

+        hasUntrustedPointerDelta = isTabletEvent;

+        

+        // The deltaXY for middle click events also appear erroneous after fast user switching

+        // <rdar://problem/7979468> deltaX and deltaY are incorrect for NSOtherMouseDown and NSOtherMouseUp after FUS

+        // http://xquartz.macosforge.org/trac/ticket/389

+        hasUntrustedPointerDelta = hasUntrustedPointerDelta || [e type] == NSOtherMouseDown || [e type] == NSOtherMouseUp;

+

+        // The deltaXY for scroll events correspond to the scroll delta, not the pointer delta

+        // <rdar://problem/7989690> deltaXY for wheel events are being sent as mouse movement

+        hasUntrustedPointerDelta = hasUntrustedPointerDelta || [e type] == NSScrollWheel;

+

+#ifdef DEBUG_UNTRUSTED_POINTER_DELTA

+        hasUntrustedPointerDelta = hasUntrustedPointerDelta || [e type] == NSLeftMouseDown || [e type] == NSLeftMouseUp;

+#endif

+        

+        if (window != nil)	{

+            NSRect frame = [window frame];

+            location = [e locationInWindow];

+            location.x += frame.origin.x;

+            location.y += frame.origin.y;

+            lastpt = location;

+        } else if(hasUntrustedPointerDelta) {

+#ifdef DEBUG_UNTRUSTED_POINTER_DELTA

+            ErrorF("--- Begin Event Debug ---\n");

+            ErrorF("Event type: %s\n", untrusted_str(e));

+            ErrorF("old lastpt: (%0.2f, %0.2f)\n", lastpt.x, lastpt.y);

+            ErrorF("     delta: (%0.2f, %0.2f)\n", [e deltaX], -[e deltaY]);

+            ErrorF("  location: (%0.2f, %0.2f)\n", lastpt.x + [e deltaX], lastpt.y - [e deltaY]);

+            ErrorF("workaround: (%0.2f, %0.2f)\n", [e locationInWindow].x, [e locationInWindow].y);

+            ErrorF("--- End Event Debug ---\n");

+

+            location.x = lastpt.x + [e deltaX];

+            location.y = lastpt.y - [e deltaY];

+            lastpt = [e locationInWindow];

+#else

+            location = [e locationInWindow];

+            lastpt = location;

+#endif

+        } else {

+            location.x = lastpt.x + [e deltaX];

+            location.y = lastpt.y - [e deltaY];

+            lastpt = [e locationInWindow];

+        }

+        

+        /* Convert coordinate system */

+        location.y = (screen.origin.y + screen.size.height) - location.y;

+    }

+    

+    modifierFlags = [e modifierFlags];

+    

+#ifdef NX_DEVICELCMDKEYMASK

+    /* This is to workaround a bug in the VNC server where we sometimes see the L

+     * modifier and sometimes see no "side"

+     */

+    modifierFlags = ensure_flag(modifierFlags, NX_CONTROLMASK,   NX_DEVICELCTLKEYMASK   | NX_DEVICERCTLKEYMASK,     NX_DEVICELCTLKEYMASK);

+    modifierFlags = ensure_flag(modifierFlags, NX_SHIFTMASK,     NX_DEVICELSHIFTKEYMASK | NX_DEVICERSHIFTKEYMASK,   NX_DEVICELSHIFTKEYMASK);

+    modifierFlags = ensure_flag(modifierFlags, NX_COMMANDMASK,   NX_DEVICELCMDKEYMASK   | NX_DEVICERCMDKEYMASK,     NX_DEVICELCMDKEYMASK);

+    modifierFlags = ensure_flag(modifierFlags, NX_ALTERNATEMASK, NX_DEVICELALTKEYMASK   | NX_DEVICERALTKEYMASK,     NX_DEVICELALTKEYMASK);

+#endif

+

+    modifierFlags &= darwin_all_modifier_mask;

+

+    /* We don't receive modifier key events while out of focus, and 3button

+     * emulation mucks this up, so we need to check our modifier flag state

+     * on every event... ugg

+     */

+    

+    if(darwin_all_modifier_flags != modifierFlags)

+        DarwinUpdateModKeys(modifierFlags);

+    

+	switch ([e type]) {

+		case NSLeftMouseDown:     ev_button=1; ev_type=ButtonPress;   goto handle_mouse;

+		case NSOtherMouseDown:    ev_button=2; ev_type=ButtonPress;   goto handle_mouse;

+		case NSRightMouseDown:    ev_button=3; ev_type=ButtonPress;   goto handle_mouse;

+		case NSLeftMouseUp:       ev_button=1; ev_type=ButtonRelease; goto handle_mouse;

+		case NSOtherMouseUp:      ev_button=2; ev_type=ButtonRelease; goto handle_mouse;

+		case NSRightMouseUp:      ev_button=3; ev_type=ButtonRelease; goto handle_mouse;

+		case NSLeftMouseDragged:  ev_button=1; ev_type=MotionNotify;  goto handle_mouse;

+		case NSOtherMouseDragged: ev_button=2; ev_type=MotionNotify;  goto handle_mouse;

+		case NSRightMouseDragged: ev_button=3; ev_type=MotionNotify;  goto handle_mouse;

+		case NSMouseMoved:        ev_button=0; ev_type=MotionNotify;  goto handle_mouse;

+        case NSTabletPoint:       ev_button=0; ev_type=MotionNotify;  goto handle_mouse;

+            

+        handle_mouse:

+            pDev = darwinPointer;

+

+            /* NSTabletPoint can have no subtype */

+            if([e type] != NSTabletPoint &&

+               [e subtype] == NSTabletProximityEventSubtype) {

+                switch([e pointingDeviceType]) {

+                    case NSEraserPointingDevice:

+                        darwinTabletCurrent=darwinTabletEraser;

+                        break;

+                    case NSPenPointingDevice:

+                        darwinTabletCurrent=darwinTabletStylus;

+                        break;

+                    case NSCursorPointingDevice:

+                    case NSUnknownPointingDevice:

+                    default:

+                        darwinTabletCurrent=darwinTabletCursor;

+                        break;

+                }

+                

+                /* NSTabletProximityEventSubtype doesn't encode pressure ant tilt

+                 * So we just pretend the motion was caused by the mouse.  Hopefully

+                 * we'll have a better solution for this in the future (like maybe

+                 * NSTabletProximityEventSubtype will come from NSTabletPoint

+                 * rather than NSMouseMoved.

+                pressure = [e pressure];

+                tilt     = [e tilt];

+                pDev = darwinTabletCurrent;                

+                 */

+

+                DarwinSendProximityEvents([e isEnteringProximity] ? ProximityIn : ProximityOut,

+                                          location.x, location.y);

+            }

+

+			if ([e type] == NSTabletPoint || [e subtype] == NSTabletPointEventSubtype) {

+                pressure = [e pressure];

+                tilt     = [e tilt];

+                

+                pDev = darwinTabletCurrent;

+            }

+

+            if(!XQuartzServerVisible && noTestExtensions) {

+#if defined(XPLUGIN_VERSION) && XPLUGIN_VERSION > 0

+/* Older libXplugin (Tiger/"Stock" Leopard) aren't thread safe, so we can't call xp_find_window from the Appkit thread */

+                xp_window_id wid = 0;

+                xp_error e;

+

+                /* Sigh. Need to check that we're really over one of

+                 * our windows. (We need to receive pointer events while

+                 * not in the foreground, but we don't want to receive them

+                 * when another window is over us or we might show a tooltip)

+                 */

+

+                e = xp_find_window(location.x, location.y, 0, &wid);

+

+                if (e != XP_Success || (e == XP_Success && wid == 0))

+#endif

+                {

+                    bgMouseLocation = location;

+                    bgMouseLocationUpdated = TRUE;

+                    return;

+                }

+            }

+            

+            if(bgMouseLocationUpdated) {

+                if(!(ev_type == MotionNotify && ev_button == 0)) {

+                    DarwinSendPointerEvents(pDev, MotionNotify, 0, location.x,

+                                            location.y, pressure, tilt.x, tilt.y);

+                }

+                bgMouseLocationUpdated = FALSE;

+            }

+

+            DarwinSendPointerEvents(pDev, ev_type, ev_button, location.x, location.y,

+                                    pressure, tilt.x, tilt.y);

+            

+            break;

+            

+		case NSTabletProximity:

+            switch([e pointingDeviceType]) {

+                case NSEraserPointingDevice:

+                    darwinTabletCurrent=darwinTabletEraser;

+                    break;

+                case NSPenPointingDevice:

+                    darwinTabletCurrent=darwinTabletStylus;

+                    break;

+                case NSCursorPointingDevice:

+                case NSUnknownPointingDevice:

+                default:

+                    darwinTabletCurrent=darwinTabletCursor;

+                    break;

+            }

+            

+			DarwinSendProximityEvents([e isEnteringProximity] ? ProximityIn : ProximityOut,

+                                      location.x, location.y);

+            break;

+            

+		case NSScrollWheel:

+#if !defined(XPLUGIN_VERSION) || XPLUGIN_VERSION == 0

+            /* If we're in the background, we need to send a MotionNotify event

+             * first, since we aren't getting them on background mouse motion

+             */

+            if(!XQuartzServerVisible && noTestExtensions) {

+                bgMouseLocationUpdated = FALSE;

+                DarwinSendPointerEvents(darwinPointer, MotionNotify, 0, location.x,

+                                        location.y, pressure, tilt.x, tilt.y);

+            }

+#endif

+			DarwinSendScrollEvents([e deltaX], [e deltaY], location.x, location.y,

+                                   pressure, tilt.x, tilt.y);

+            break;

+            

+        case NSKeyDown: case NSKeyUp:

+            {

+                /* XKB clobbers our keymap at startup, so we need to force it on the first keypress.

+                 * TODO: Make this less of a kludge.

+                 */

+                static int force_resync_keymap = YES;

+                if(force_resync_keymap) {

+                    DarwinSendDDXEvent(kXquartzReloadKeymap, 0);

+                    force_resync_keymap = NO;

+                }

+            }

+

+            if(darwinSyncKeymap) {

+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050

+                TISInputSourceRef key_layout = TISCopyCurrentKeyboardLayoutInputSource();

+                TISInputSourceRef clear;

+                if (CFEqual(key_layout, last_key_layout)) {

+                    CFRelease(key_layout);

+                } else {

+                    /* Swap/free thread-safely */

+                    clear = last_key_layout;

+                    last_key_layout = key_layout;

+                    CFRelease(clear);

+#else

+                KeyboardLayoutRef key_layout;

+                KLGetCurrentKeyboardLayout(&key_layout);

+                if(key_layout != last_key_layout) {

+                    last_key_layout = key_layout;

+#endif

+                    /* Update keyInfo */

+                    if (!QuartsResyncKeymap(TRUE)) {

+                        fprintf(stderr, "sendX11NSEvent: Could not build a valid keymap.\n");

+                    }

+                }

+            }

+

+            /* Avoid stuck keys on context switch */

+            if(keyState[[e keyCode]] == [e type])

+                return;

+            keyState[[e keyCode]] = [e type];

+

+            DarwinSendKeyboardEvents(([e type] == NSKeyDown) ? KeyPress : KeyRelease, [e keyCode]);

+            break;

+            

+        default: break; /* for gcc */

+	}	

+}

+@end

diff --git a/xorg-server/hw/xquartz/bundle/Resources/English.lproj/Localizable.strings b/xorg-server/hw/xquartz/bundle/Resources/English.lproj/Localizable.strings
index 03415026e..bf2089ca1 100644
--- a/xorg-server/hw/xquartz/bundle/Resources/English.lproj/Localizable.strings
+++ b/xorg-server/hw/xquartz/bundle/Resources/English.lproj/Localizable.strings
diff --git a/xorg-server/hw/xquartz/pbproxy/x-selection.h b/xorg-server/hw/xquartz/pbproxy/x-selection.h
index 614c8b091..b31d7515e 100644
--- a/xorg-server/hw/xquartz/pbproxy/x-selection.h
+++ b/xorg-server/hw/xquartz/pbproxy/x-selection.h
@@ -1,108 +1,110 @@
-/* x-selection.h -- proxies between NSPasteboard and X11 selections
-
-   Copyright (c) 2002, 2008 Apple Computer, Inc. All rights reserved.
-
-   Permission is hereby granted, free of charge, to any person
-   obtaining a copy of this software and associated documentation files
-   (the "Software"), to deal in the Software without restriction,
-   including without limitation the rights to use, copy, modify, merge,
-   publish, distribute, sublicense, and/or sell copies of the Software,
-   and to permit persons to whom the Software is furnished to do so,
-   subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be
-   included in all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-   NONINFRINGEMENT.  IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT
-   HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-   DEALINGS IN THE SOFTWARE.
-
-   Except as contained in this notice, the name(s) of the above
-   copyright holders shall not be used in advertising or otherwise to
-   promote the sale, use or other dealings in this Software without
-   prior written authorization.
-*/
-
-#ifndef X_SELECTION_H
-#define X_SELECTION_H 1
-
-#include "pbproxy.h"
-
-#include <X11/extensions/Xfixes.h>
-
-#include <AppKit/NSPasteboard.h>
-
-/* This stores image data or text. */
-struct propdata {
-	unsigned char *data;
-	size_t length;
-	int format;
-};
-
-struct atom_list {
-    Atom primary, clipboard, text, utf8_string, string, targets, multiple,
-        cstring, image_png, image_jpeg, incr, atom, clipboard_manager,
-        compound_text, atom_pair;
-};
-
-
-@interface x_selection : NSObject
-{
-@private
-
-    /* The unmapped window we use for fetching selections. */
-    Window _selection_window;
-
-    Atom request_atom;
-    
-    struct {
-        struct propdata propdata;
-        Window requestor;
-        Atom selection;
-    } pending;
-
-    /* 
-     * This is the number of times the user has requested a copy.
-     * Once the copy is completed, we --pending_copy, and if the 
-     * pending_copy is > 0 we do it again.
-     */
-    int pending_copy;
-    /* 
-     * This is used for the same purpose as pending_copy, but for the 
-     * CLIPBOARD.  It also prevents a race with INCR transfers.
-     */
-    int pending_clipboard; 
-    
-    struct atom_list atoms[1];
-}
-
-- (void) x_active:(Time)timestamp;
-- (void) x_inactive:(Time)timestamp;
-
-- (void) x_copy:(Time)timestamp;
-
-- (void) clear_event:(XSelectionClearEvent *)e;
-- (void) request_event:(XSelectionRequestEvent *)e;
-- (void) notify_event:(XSelectionEvent *)e;
-- (void) property_event:(XPropertyEvent *)e;
-- (void) xfixes_selection_notify:(XFixesSelectionNotifyEvent *)e;
-- (void) handle_selection:(Atom)selection type:(Atom)type propdata:(struct propdata *)pdata;
-- (void) claim_clipboard;
-- (BOOL) set_clipboard_manager_status:(BOOL)value;
-- (void) own_clipboard;
-- (void) copy_completed:(Atom)selection;
-
-- (void) reload_preferences;
-- (BOOL) is_active;
-- (void) send_none:(XSelectionRequestEvent *)e;
-@end
-
-/* main.m */
-extern x_selection *_selection_object;
-
-#endif /* X_SELECTION_H */
+/* x-selection.h -- proxies between NSPasteboard and X11 selections

+

+   Copyright (c) 2002, 2008 Apple Computer, Inc. All rights reserved.

+

+   Permission is hereby granted, free of charge, to any person

+   obtaining a copy of this software and associated documentation files

+   (the "Software"), to deal in the Software without restriction,

+   including without limitation the rights to use, copy, modify, merge,

+   publish, distribute, sublicense, and/or sell copies of the Software,

+   and to permit persons to whom the Software is furnished to do so,

+   subject to the following conditions:

+

+   The above copyright notice and this permission notice shall be

+   included in all copies or substantial portions of the Software.

+

+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

+   NONINFRINGEMENT.  IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT

+   HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

+   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

+   DEALINGS IN THE SOFTWARE.

+

+   Except as contained in this notice, the name(s) of the above

+   copyright holders shall not be used in advertising or otherwise to

+   promote the sale, use or other dealings in this Software without

+   prior written authorization.

+*/

+

+#ifndef X_SELECTION_H

+#define X_SELECTION_H 1

+

+#include "pbproxy.h"

+

+#define  Cursor X_Cursor

+#include <X11/extensions/Xfixes.h>

+#undef Cursor

+

+#include <AppKit/NSPasteboard.h>

+

+/* This stores image data or text. */

+struct propdata {

+	unsigned char *data;

+	size_t length;

+	int format;

+};

+

+struct atom_list {

+    Atom primary, clipboard, text, utf8_string, string, targets, multiple,

+        cstring, image_png, image_jpeg, incr, atom, clipboard_manager,

+        compound_text, atom_pair;

+};

+

+

+@interface x_selection : NSObject

+{

+@private

+

+    /* The unmapped window we use for fetching selections. */

+    Window _selection_window;

+

+    Atom request_atom;

+    

+    struct {

+        struct propdata propdata;

+        Window requestor;

+        Atom selection;

+    } pending;

+

+    /* 

+     * This is the number of times the user has requested a copy.

+     * Once the copy is completed, we --pending_copy, and if the 

+     * pending_copy is > 0 we do it again.

+     */

+    int pending_copy;

+    /* 

+     * This is used for the same purpose as pending_copy, but for the 

+     * CLIPBOARD.  It also prevents a race with INCR transfers.

+     */

+    int pending_clipboard; 

+    

+    struct atom_list atoms[1];

+}

+

+- (void) x_active:(Time)timestamp;

+- (void) x_inactive:(Time)timestamp;

+

+- (void) x_copy:(Time)timestamp;

+

+- (void) clear_event:(XSelectionClearEvent *)e;

+- (void) request_event:(XSelectionRequestEvent *)e;

+- (void) notify_event:(XSelectionEvent *)e;

+- (void) property_event:(XPropertyEvent *)e;

+- (void) xfixes_selection_notify:(XFixesSelectionNotifyEvent *)e;

+- (void) handle_selection:(Atom)selection type:(Atom)type propdata:(struct propdata *)pdata;

+- (void) claim_clipboard;

+- (BOOL) set_clipboard_manager_status:(BOOL)value;

+- (void) own_clipboard;

+- (void) copy_completed:(Atom)selection;

+

+- (void) reload_preferences;

+- (BOOL) is_active;

+- (void) send_none:(XSelectionRequestEvent *)e;

+@end

+

+/* main.m */

+extern x_selection *_selection_object;

+

+#endif /* X_SELECTION_H */

diff --git a/xorg-server/hw/xquartz/quartz.c b/xorg-server/hw/xquartz/quartz.c
index 222a5eab0..9e9f6be14 100644
--- a/xorg-server/hw/xquartz/quartz.c
+++ b/xorg-server/hw/xquartz/quartz.c
@@ -1,481 +1,483 @@
-/*
- *
- * Quartz-specific support for the Darwin X Server
- *
- * Copyright (c) 2001-2004 Greg Parker and 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.
- */
-
-#include "sanitizedCarbon.h"
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include "quartzCommon.h"
-#include "quartzRandR.h"
-#include "inputstr.h"
-#include "quartz.h"
-#include "darwin.h"
-#include "darwinEvents.h"
-#include "pseudoramiX.h"
-#define _APPLEWM_SERVER_
-#include "applewmExt.h"
-
-#include "X11Application.h"
-
-#include <X11/extensions/applewmconst.h>
-
-// X headers
-#include "scrnintstr.h"
-#include "windowstr.h"
-#include "colormapst.h"
-#include "globals.h"
-#include "mi.h"
-
-// System headers
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <IOKit/pwr_mgt/IOPMLib.h>
-#include <pthread.h>
-#include <signal.h>
-
-#include <rootlessCommon.h>
-#include <Xplugin.h>
-
-DevPrivateKeyRec        quartzScreenKeyRec;
-int                     aquaMenuBarHeight = 0;
-QuartzModeProcsPtr      quartzProcs = NULL;
-const char             *quartzOpenGLBundle = NULL;
-
-Bool XQuartzFullscreenDisableHotkeys = TRUE;
-Bool XQuartzOptionSendsAlt = FALSE;
-Bool XQuartzEnableKeyEquivalents = TRUE;
-Bool XQuartzFullscreenVisible = FALSE;
-Bool XQuartzRootlessDefault = TRUE;
-Bool XQuartzIsRootless = TRUE;
-Bool XQuartzServerVisible = FALSE;
-Bool XQuartzFullscreenMenu = FALSE;
-
-/*
-===========================================================================
-
- Screen functions
-
-===========================================================================
-*/
-
-/*
- * QuartzAddScreen
- *  Do mode dependent initialization of each screen for Quartz.
- */
-Bool QuartzAddScreen(
-    int index,
-    ScreenPtr pScreen)
-{
-    // allocate space for private per screen Quartz specific storage
-    QuartzScreenPtr displayInfo = calloc(sizeof(QuartzScreenRec), 1);
-
-    // QUARTZ_PRIV(pScreen) = displayInfo;
-    dixSetPrivate(&pScreen->devPrivates, quartzScreenKey, displayInfo);
-
-    // do Quartz mode specific initialization
-    return quartzProcs->AddScreen(index, pScreen);
-}
-
-
-/*
- * QuartzSetupScreen
- *  Finalize mode specific setup of each screen.
- */
-Bool QuartzSetupScreen(
-    int index,
-    ScreenPtr pScreen)
-{
-    // do Quartz mode specific setup
-    if (! quartzProcs->SetupScreen(index, pScreen))
-        return FALSE;
-
-    // setup cursor support
-    if (! quartzProcs->InitCursor(pScreen))
-        return FALSE;
-
-#if defined(RANDR)
-    if(!QuartzRandRInit(pScreen)) {
-        DEBUG_LOG("Failed to init RandR extension.\n");
-        return FALSE;
-    }
-#endif
-
-    return TRUE;
-}
-
-
-/*
- * QuartzInitOutput
- *  Quartz display initialization.
- */
-void QuartzInitOutput(
-    int argc,
-    char **argv )
-{
-    /* For XQuartz, we want to just use the default signal handler to work better with CrashTracer */
-    signal(SIGSEGV, SIG_DFL);
-    signal(SIGILL, SIG_DFL);
-#ifdef SIGEMT
-    signal(SIGEMT, SIG_DFL);
-#endif
-    signal(SIGFPE, SIG_DFL);
-#ifdef SIGBUS
-    signal(SIGBUS, SIG_DFL);
-#endif
-#ifdef SIGSYS
-    signal(SIGSYS, SIG_DFL);
-#endif
-#ifdef SIGXCPU
-    signal(SIGXCPU, SIG_DFL);
-#endif
-#ifdef SIGXFSZ
-    signal(SIGXFSZ, SIG_DFL);
-#endif
-
-    if (!RegisterBlockAndWakeupHandlers(QuartzBlockHandler,
-                                        QuartzWakeupHandler,
-                                        NULL))
-    {
-        FatalError("Could not register block and wakeup handlers.");
-    }
-
-    if (!dixRegisterPrivateKey(&quartzScreenKeyRec, PRIVATE_SCREEN, 0))
-	FatalError("Failed to alloc quartz screen private.\n");
-
-    // Do display mode specific initialization
-    quartzProcs->DisplayInit();
-}
-
-
-/*
- * QuartzInitInput
- *  Inform the main thread the X server is ready to handle events.
- */
-void QuartzInitInput(
-    int argc,
-    char **argv )
-{
-    X11ApplicationSetCanQuit(0);
-    X11ApplicationServerReady();
-    // Do final display mode specific initialization before handling events
-    if (quartzProcs->InitInput)
-        quartzProcs->InitInput(argc, argv);
-}
-
-
-void QuartzUpdateScreens(void) {
-    ScreenPtr pScreen;
-    WindowPtr pRoot;
-    int x, y, width, height, sx, sy;
-    xEvent e;
-    BoxRec bounds;
-    
-    if (noPseudoramiXExtension || screenInfo.numScreens != 1)
-    {
-        /* FIXME: if not using Xinerama, we have multiple screens, and
-         to do this properly may need to add or remove screens. Which
-         isn't possible. So don't do anything. Another reason why
-         we default to running with Xinerama. */
-        
-        return;
-    }
-    
-    pScreen = screenInfo.screens[0];
-    
-    PseudoramiXResetScreens();
-    quartzProcs->AddPseudoramiXScreens(&x, &y, &width, &height, pScreen);
-    
-    pScreen->x = x;
-    pScreen->y = y;
-    pScreen->mmWidth = pScreen->mmWidth * ((double) width / pScreen->width);
-    pScreen->mmHeight = pScreen->mmHeight * ((double) height / pScreen->height);
-    pScreen->width = width;
-    pScreen->height = height;
-    
-    DarwinAdjustScreenOrigins(&screenInfo);
-    
-    /* DarwinAdjustScreenOrigins or UpdateScreen may change pScreen->x/y,
-     * so use it rather than x/y
-     */
-    sx = pScreen->x + darwinMainScreenX;
-    sy = pScreen->y + darwinMainScreenY;
-    
-    /* Adjust the root window. */
-    pRoot = pScreen->root;
-    AppleWMSetScreenOrigin(pRoot);
-    pScreen->ResizeWindow(pRoot, x - sx, y - sy, width, height, NULL);
-
-    miPaintWindow(pRoot, &pRoot->borderClip,  PW_BACKGROUND);
-
-    /* <rdar://problem/7770779> pointer events are clipped to old display region after display reconfiguration
-     * http://xquartz.macosforge.org/trac/ticket/346
-     */
-    bounds.x1 = 0;
-    bounds.x2 = width;
-    bounds.y1 = 0;
-    bounds.y2 = height;
-    pScreen->ConstrainCursor(inputInfo.pointer, pScreen, &bounds);
-    inputInfo.pointer->spriteInfo->sprite->physLimits = bounds;
-    inputInfo.pointer->spriteInfo->sprite->hotLimits = bounds;
-
-    DEBUG_LOG("Root Window: %dx%d @ (%d, %d) darwinMainScreen (%d, %d) xy (%d, %d) dixScreenOrigins (%d, %d)\n", width, height, x - sx, y - sy, darwinMainScreenX, darwinMainScreenY, x, y, pScreen->x, pScreen->y);
-
-    /* Send an event for the root reconfigure */
-    e.u.u.type = ConfigureNotify;
-    e.u.configureNotify.window = pRoot->drawable.id;
-    e.u.configureNotify.aboveSibling = None;
-    e.u.configureNotify.x = x - sx;
-    e.u.configureNotify.y = y - sy;
-    e.u.configureNotify.width = width;
-    e.u.configureNotify.height = height;
-    e.u.configureNotify.borderWidth = wBorderWidth(pRoot);
-    e.u.configureNotify.override = pRoot->overrideRedirect;
-    DeliverEvents(pRoot, &e, 1, NullWindow);
-
-    quartzProcs->UpdateScreen(pScreen);
-
-    /* Tell RandR about the new size, so new connections get the correct info */
-    RRScreenSizeNotify(pScreen);
-}
-
-static void pokeActivityCallback(CFRunLoopTimerRef timer, void *info) {
-    UpdateSystemActivity(OverallAct);
-}
-
-static void QuartzScreenSaver(int state) {
-    static CFRunLoopTimerRef pokeActivityTimer = NULL;
-    static CFRunLoopTimerContext pokeActivityContext = { 0, NULL, NULL, NULL, NULL };
-    static pthread_mutex_t pokeActivityMutex = PTHREAD_MUTEX_INITIALIZER;
-
-    pthread_mutex_lock(&pokeActivityMutex);
-    
-    if(state) {
-        if(pokeActivityTimer == NULL)
-            goto QuartzScreenSaverEnd;
-
-        CFRunLoopTimerInvalidate(pokeActivityTimer);
-        CFRelease(pokeActivityTimer);
-        pokeActivityTimer = NULL;
-    } else {
-        if(pokeActivityTimer != NULL)
-            goto QuartzScreenSaverEnd;
-        
-        pokeActivityTimer = CFRunLoopTimerCreate(NULL, CFAbsoluteTimeGetCurrent(), 30, 0, 0, pokeActivityCallback, &pokeActivityContext);
-        if(pokeActivityTimer == NULL) {
-            ErrorF("Unable to create pokeActivityTimer.\n");
-            goto QuartzScreenSaverEnd;
-        }
-
-        CFRunLoopAddTimer(CFRunLoopGetMain(), pokeActivityTimer, kCFRunLoopCommonModes);
-    }
-QuartzScreenSaverEnd:
-    pthread_mutex_unlock(&pokeActivityMutex);
-}
-
-void QuartzShowFullscreen(int state) {
-    int i;
-    
-    DEBUG_LOG("QuartzShowFullscreen: state=%d\n", state);
-    
-    if(XQuartzIsRootless) {
-        ErrorF("QuartzShowFullscreen called while in rootless mode.\n");
-        return;
-    }
-    
-    QuartzScreenSaver(!state);
-    
-    if(XQuartzFullscreenVisible == state)
-        return;
-    
-    XQuartzFullscreenVisible = state;
-    
-    xp_disable_update ();
-    
-    if (!XQuartzFullscreenVisible)
-        RootlessHideAllWindows();
-    
-    RootlessUpdateRooted(XQuartzFullscreenVisible);
-    
-    if (XQuartzFullscreenVisible) {
-        RootlessShowAllWindows ();
-        for (i=0; i < screenInfo.numScreens; i++) {
-            ScreenPtr pScreen = screenInfo.screens[i];        
-            RootlessRepositionWindows(pScreen);
-            // JH: I don't think this is necessary, but keeping it here as a reminder
-            //RootlessUpdateScreenPixmap(pScreen);
-        }
-    }
-
-    /* Somehow the menubar manages to interfere with our event stream
-     * in fullscreen mode, even though it's not visible. 
-     */
-    X11ApplicationShowHideMenubar(!XQuartzFullscreenVisible);
-    
-    xp_reenable_update ();
-    
-    if (XQuartzFullscreenDisableHotkeys)
-        xp_disable_hot_keys(XQuartzFullscreenVisible);
-}
-
-void QuartzSetRootless(Bool state) {    
-    DEBUG_LOG("QuartzSetRootless state=%d\n", state);
-    
-    if(XQuartzIsRootless == state)
-        return;
-    
-    if(state)
-        QuartzShowFullscreen(FALSE);
-    
-    XQuartzIsRootless = state;
-
-    xp_disable_update();
-
-    /* When in rootless, the menubar is not part of the screen, so we need to update our screens on toggle */    
-    QuartzUpdateScreens();
-
-    if(XQuartzIsRootless) {
-        RootlessShowAllWindows();
-    } else {
-        RootlessHideAllWindows();
-    }
-
-    X11ApplicationShowHideMenubar(TRUE);
-
-    xp_reenable_update();
-
-    xp_disable_hot_keys(FALSE);
-}
-
-/*
- * QuartzShow
- *  Show the X server on screen. Does nothing if already shown.
- *  Calls mode specific screen resume to restore the X clip regions
- *  (if needed) and the X server cursor state.
- */
-void QuartzShow(void) {
-    int i;
-
-    if (XQuartzServerVisible)
-        return;
-    
-    XQuartzServerVisible = TRUE;
-    for (i = 0; i < screenInfo.numScreens; i++) {
-        if (screenInfo.screens[i]) {
-            quartzProcs->ResumeScreen(screenInfo.screens[i]);
-        }
-    }
-    
-    if (!XQuartzIsRootless)
-        QuartzShowFullscreen(TRUE);
-}
-
-
-/*
- * QuartzHide
- *  Remove the X server display from the screen. Does nothing if already
- *  hidden. Calls mode specific screen suspend to set X clip regions to
- *  prevent drawing (if needed) and restore the Aqua cursor.
- */
-void QuartzHide(void)
-{
-    int i;
-
-    if (XQuartzServerVisible) {
-        for (i = 0; i < screenInfo.numScreens; i++) {
-            if (screenInfo.screens[i]) {
-                quartzProcs->SuspendScreen(screenInfo.screens[i]);
-            }
-        }
-    }
-
-    if(!XQuartzIsRootless)
-        QuartzShowFullscreen(FALSE);
-    XQuartzServerVisible = FALSE;
-}
-
-
-/*
- * QuartzSetRootClip
- *  Enable or disable rendering to the X screen.
- */
-void QuartzSetRootClip(
-    BOOL enable)
-{
-    int i;
-
-    if (!XQuartzServerVisible)
-        return;
-
-    for (i = 0; i < screenInfo.numScreens; i++) {
-        if (screenInfo.screens[i]) {
-            xf86SetRootClip(screenInfo.screens[i], enable);
-        }
-    }
-}
-
-/* 
- * QuartzSpaceChanged
- *  Unmap offscreen windows, map onscreen windows
- */
-void QuartzSpaceChanged(uint32_t space_id) {
-    /* Do something special here, so we don't depend on quartz-wm for spaces to work... */
-    DEBUG_LOG("Space Changed (%u) ... do something interesting...\n", space_id);
-}
-
-/*
- * QuartzCopyDisplayIDs
- *  Associate an X11 screen with one or more CoreGraphics display IDs by copying
- *  the list into a private array. Free the previously copied array, if present.
- */
-void QuartzCopyDisplayIDs(ScreenPtr pScreen,
-                          int displayCount, CGDirectDisplayID *displayIDs) {
-    QuartzScreenPtr pQuartzScreen = QUARTZ_PRIV(pScreen);
-    int size = displayCount * sizeof(CGDirectDisplayID);
-
-    free(pQuartzScreen->displayIDs);
-    pQuartzScreen->displayIDs = malloc(size);
-    memcpy(pQuartzScreen->displayIDs, displayIDs, size);
-    pQuartzScreen->displayCount = displayCount;
-}
-
-void NSBeep(void);
-void DDXRingBell(
-    int volume,         // volume is % of max
-    int pitch,          // pitch is Hz
-    int duration)       // duration is milliseconds
-{
-    if (volume)
-        NSBeep();
-}
+/*

+ *

+ * Quartz-specific support for the Darwin X Server

+ *

+ * Copyright (c) 2001-2004 Greg Parker and 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.

+ */

+

+#include "sanitizedCarbon.h"

+

+#ifdef HAVE_DIX_CONFIG_H

+#include <dix-config.h>

+#endif

+

+#include "quartzCommon.h"

+#include "quartzRandR.h"

+#include "inputstr.h"

+#include "quartz.h"

+#include "darwin.h"

+#include "darwinEvents.h"

+#include "pseudoramiX.h"

+#define _APPLEWM_SERVER_

+#include "applewmExt.h"

+

+#include "X11Application.h"

+

+#include <X11/extensions/applewmconst.h>

+

+// X headers

+#include "scrnintstr.h"

+#include "windowstr.h"

+#include "colormapst.h"

+#include "globals.h"

+#include "mi.h"

+

+// System headers

+#include <stdlib.h>

+#include <string.h>

+#include <sys/types.h>

+#include <sys/stat.h>

+#include <fcntl.h>

+#include <IOKit/pwr_mgt/IOPMLib.h>

+#include <pthread.h>

+#include <signal.h>

+

+#include <rootlessCommon.h>

+#include <Xplugin.h>

+

+DevPrivateKeyRec        quartzScreenKeyRec;

+int                     aquaMenuBarHeight = 0;

+QuartzModeProcsPtr      quartzProcs = NULL;

+const char             *quartzOpenGLBundle = NULL;

+

+Bool XQuartzFullscreenDisableHotkeys = TRUE;

+Bool XQuartzOptionSendsAlt = FALSE;

+Bool XQuartzEnableKeyEquivalents = TRUE;

+Bool XQuartzFullscreenVisible = FALSE;

+Bool XQuartzRootlessDefault = TRUE;

+Bool XQuartzIsRootless = TRUE;

+Bool XQuartzServerVisible = FALSE;

+Bool XQuartzFullscreenMenu = FALSE;

+

+int32_t XQuartzShieldingWindowLevel = 0;

+

+/*

+===========================================================================

+

+ Screen functions

+

+===========================================================================

+*/

+

+/*

+ * QuartzAddScreen

+ *  Do mode dependent initialization of each screen for Quartz.

+ */

+Bool QuartzAddScreen(

+    int index,

+    ScreenPtr pScreen)

+{

+    // allocate space for private per screen Quartz specific storage

+    QuartzScreenPtr displayInfo = calloc(sizeof(QuartzScreenRec), 1);

+

+    // QUARTZ_PRIV(pScreen) = displayInfo;

+    dixSetPrivate(&pScreen->devPrivates, quartzScreenKey, displayInfo);

+

+    // do Quartz mode specific initialization

+    return quartzProcs->AddScreen(index, pScreen);

+}

+

+

+/*

+ * QuartzSetupScreen

+ *  Finalize mode specific setup of each screen.

+ */

+Bool QuartzSetupScreen(

+    int index,

+    ScreenPtr pScreen)

+{

+    // do Quartz mode specific setup

+    if (! quartzProcs->SetupScreen(index, pScreen))

+        return FALSE;

+

+    // setup cursor support

+    if (! quartzProcs->InitCursor(pScreen))

+        return FALSE;

+

+#if defined(RANDR)

+    if(!QuartzRandRInit(pScreen)) {

+        DEBUG_LOG("Failed to init RandR extension.\n");

+        return FALSE;

+    }

+#endif

+

+    return TRUE;

+}

+

+

+/*

+ * QuartzInitOutput

+ *  Quartz display initialization.

+ */

+void QuartzInitOutput(

+    int argc,

+    char **argv )

+{

+    /* For XQuartz, we want to just use the default signal handler to work better with CrashTracer */

+    signal(SIGSEGV, SIG_DFL);

+    signal(SIGILL, SIG_DFL);

+#ifdef SIGEMT

+    signal(SIGEMT, SIG_DFL);

+#endif

+    signal(SIGFPE, SIG_DFL);

+#ifdef SIGBUS

+    signal(SIGBUS, SIG_DFL);

+#endif

+#ifdef SIGSYS

+    signal(SIGSYS, SIG_DFL);

+#endif

+#ifdef SIGXCPU

+    signal(SIGXCPU, SIG_DFL);

+#endif

+#ifdef SIGXFSZ

+    signal(SIGXFSZ, SIG_DFL);

+#endif

+

+    if (!RegisterBlockAndWakeupHandlers(QuartzBlockHandler,

+                                        QuartzWakeupHandler,

+                                        NULL))

+    {

+        FatalError("Could not register block and wakeup handlers.");

+    }

+

+    if (!dixRegisterPrivateKey(&quartzScreenKeyRec, PRIVATE_SCREEN, 0))

+	FatalError("Failed to alloc quartz screen private.\n");

+

+    // Do display mode specific initialization

+    quartzProcs->DisplayInit();

+}

+

+

+/*

+ * QuartzInitInput

+ *  Inform the main thread the X server is ready to handle events.

+ */

+void QuartzInitInput(

+    int argc,

+    char **argv )

+{

+    X11ApplicationSetCanQuit(0);

+    X11ApplicationServerReady();

+    // Do final display mode specific initialization before handling events

+    if (quartzProcs->InitInput)

+        quartzProcs->InitInput(argc, argv);

+}

+

+

+void QuartzUpdateScreens(void) {

+    ScreenPtr pScreen;

+    WindowPtr pRoot;

+    int x, y, width, height, sx, sy;

+    xEvent e;

+    BoxRec bounds;

+    

+    if (noPseudoramiXExtension || screenInfo.numScreens != 1)

+    {

+        /* FIXME: if not using Xinerama, we have multiple screens, and

+         to do this properly may need to add or remove screens. Which

+         isn't possible. So don't do anything. Another reason why

+         we default to running with Xinerama. */

+        

+        return;

+    }

+    

+    pScreen = screenInfo.screens[0];

+    

+    PseudoramiXResetScreens();

+    quartzProcs->AddPseudoramiXScreens(&x, &y, &width, &height, pScreen);

+    

+    pScreen->x = x;

+    pScreen->y = y;

+    pScreen->mmWidth = pScreen->mmWidth * ((double) width / pScreen->width);

+    pScreen->mmHeight = pScreen->mmHeight * ((double) height / pScreen->height);

+    pScreen->width = width;

+    pScreen->height = height;

+    

+    DarwinAdjustScreenOrigins(&screenInfo);

+    

+    /* DarwinAdjustScreenOrigins or UpdateScreen may change pScreen->x/y,

+     * so use it rather than x/y

+     */

+    sx = pScreen->x + darwinMainScreenX;

+    sy = pScreen->y + darwinMainScreenY;

+    

+    /* Adjust the root window. */

+    pRoot = pScreen->root;

+    AppleWMSetScreenOrigin(pRoot);

+    pScreen->ResizeWindow(pRoot, x - sx, y - sy, width, height, NULL);

+

+    miPaintWindow(pRoot, &pRoot->borderClip,  PW_BACKGROUND);

+

+    /* <rdar://problem/7770779> pointer events are clipped to old display region after display reconfiguration

+     * http://xquartz.macosforge.org/trac/ticket/346

+     */

+    bounds.x1 = 0;

+    bounds.x2 = width;

+    bounds.y1 = 0;

+    bounds.y2 = height;

+    pScreen->ConstrainCursor(inputInfo.pointer, pScreen, &bounds);

+    inputInfo.pointer->spriteInfo->sprite->physLimits = bounds;

+    inputInfo.pointer->spriteInfo->sprite->hotLimits = bounds;

+

+    DEBUG_LOG("Root Window: %dx%d @ (%d, %d) darwinMainScreen (%d, %d) xy (%d, %d) dixScreenOrigins (%d, %d)\n", width, height, x - sx, y - sy, darwinMainScreenX, darwinMainScreenY, x, y, pScreen->x, pScreen->y);

+

+    /* Send an event for the root reconfigure */

+    e.u.u.type = ConfigureNotify;

+    e.u.configureNotify.window = pRoot->drawable.id;

+    e.u.configureNotify.aboveSibling = None;

+    e.u.configureNotify.x = x - sx;

+    e.u.configureNotify.y = y - sy;

+    e.u.configureNotify.width = width;

+    e.u.configureNotify.height = height;

+    e.u.configureNotify.borderWidth = wBorderWidth(pRoot);

+    e.u.configureNotify.override = pRoot->overrideRedirect;

+    DeliverEvents(pRoot, &e, 1, NullWindow);

+

+    quartzProcs->UpdateScreen(pScreen);

+

+    /* Tell RandR about the new size, so new connections get the correct info */

+    RRScreenSizeNotify(pScreen);

+}

+

+static void pokeActivityCallback(CFRunLoopTimerRef timer, void *info) {

+    UpdateSystemActivity(OverallAct);

+}

+

+static void QuartzScreenSaver(int state) {

+    static CFRunLoopTimerRef pokeActivityTimer = NULL;

+    static CFRunLoopTimerContext pokeActivityContext = { 0, NULL, NULL, NULL, NULL };

+    static pthread_mutex_t pokeActivityMutex = PTHREAD_MUTEX_INITIALIZER;

+

+    pthread_mutex_lock(&pokeActivityMutex);

+    

+    if(state) {

+        if(pokeActivityTimer == NULL)

+            goto QuartzScreenSaverEnd;

+

+        CFRunLoopTimerInvalidate(pokeActivityTimer);

+        CFRelease(pokeActivityTimer);

+        pokeActivityTimer = NULL;

+    } else {

+        if(pokeActivityTimer != NULL)

+            goto QuartzScreenSaverEnd;

+        

+        pokeActivityTimer = CFRunLoopTimerCreate(NULL, CFAbsoluteTimeGetCurrent(), 30, 0, 0, pokeActivityCallback, &pokeActivityContext);

+        if(pokeActivityTimer == NULL) {

+            ErrorF("Unable to create pokeActivityTimer.\n");

+            goto QuartzScreenSaverEnd;

+        }

+

+        CFRunLoopAddTimer(CFRunLoopGetMain(), pokeActivityTimer, kCFRunLoopCommonModes);

+    }

+QuartzScreenSaverEnd:

+    pthread_mutex_unlock(&pokeActivityMutex);

+}

+

+void QuartzShowFullscreen(int state) {

+    int i;

+    

+    DEBUG_LOG("QuartzShowFullscreen: state=%d\n", state);

+    

+    if(XQuartzIsRootless) {

+        ErrorF("QuartzShowFullscreen called while in rootless mode.\n");

+        return;

+    }

+    

+    QuartzScreenSaver(!state);

+    

+    if(XQuartzFullscreenVisible == state)

+        return;

+    

+    XQuartzFullscreenVisible = state;

+    

+    xp_disable_update ();

+    

+    if (!XQuartzFullscreenVisible)

+        RootlessHideAllWindows();

+    

+    RootlessUpdateRooted(XQuartzFullscreenVisible);

+    

+    if (XQuartzFullscreenVisible) {

+        RootlessShowAllWindows ();

+        for (i=0; i < screenInfo.numScreens; i++) {

+            ScreenPtr pScreen = screenInfo.screens[i];        

+            RootlessRepositionWindows(pScreen);

+            // JH: I don't think this is necessary, but keeping it here as a reminder

+            //RootlessUpdateScreenPixmap(pScreen);

+        }

+    }

+

+    /* Somehow the menubar manages to interfere with our event stream

+     * in fullscreen mode, even though it's not visible. 

+     */

+    X11ApplicationShowHideMenubar(!XQuartzFullscreenVisible);

+    

+    xp_reenable_update ();

+    

+    if (XQuartzFullscreenDisableHotkeys)

+        xp_disable_hot_keys(XQuartzFullscreenVisible);

+}

+

+void QuartzSetRootless(Bool state) {    

+    DEBUG_LOG("QuartzSetRootless state=%d\n", state);

+    

+    if(XQuartzIsRootless == state)

+        return;

+    

+    if(state)

+        QuartzShowFullscreen(FALSE);

+    

+    XQuartzIsRootless = state;

+

+    xp_disable_update();

+

+    /* When in rootless, the menubar is not part of the screen, so we need to update our screens on toggle */    

+    QuartzUpdateScreens();

+

+    if(XQuartzIsRootless) {

+        RootlessShowAllWindows();

+    } else {

+        RootlessHideAllWindows();

+    }

+

+    X11ApplicationShowHideMenubar(TRUE);

+

+    xp_reenable_update();

+

+    xp_disable_hot_keys(FALSE);

+}

+

+/*

+ * QuartzShow

+ *  Show the X server on screen. Does nothing if already shown.

+ *  Calls mode specific screen resume to restore the X clip regions

+ *  (if needed) and the X server cursor state.

+ */

+void QuartzShow(void) {

+    int i;

+

+    if (XQuartzServerVisible)

+        return;

+    

+    XQuartzServerVisible = TRUE;

+    for (i = 0; i < screenInfo.numScreens; i++) {

+        if (screenInfo.screens[i]) {

+            quartzProcs->ResumeScreen(screenInfo.screens[i]);

+        }

+    }

+    

+    if (!XQuartzIsRootless)

+        QuartzShowFullscreen(TRUE);

+}

+

+

+/*

+ * QuartzHide

+ *  Remove the X server display from the screen. Does nothing if already

+ *  hidden. Calls mode specific screen suspend to set X clip regions to

+ *  prevent drawing (if needed) and restore the Aqua cursor.

+ */

+void QuartzHide(void)

+{

+    int i;

+

+    if (XQuartzServerVisible) {

+        for (i = 0; i < screenInfo.numScreens; i++) {

+            if (screenInfo.screens[i]) {

+                quartzProcs->SuspendScreen(screenInfo.screens[i]);

+            }

+        }

+    }

+

+    if(!XQuartzIsRootless)

+        QuartzShowFullscreen(FALSE);

+    XQuartzServerVisible = FALSE;

+}

+

+

+/*

+ * QuartzSetRootClip

+ *  Enable or disable rendering to the X screen.

+ */

+void QuartzSetRootClip(

+    BOOL enable)

+{

+    int i;

+

+    if (!XQuartzServerVisible)

+        return;

+

+    for (i = 0; i < screenInfo.numScreens; i++) {

+        if (screenInfo.screens[i]) {

+            xf86SetRootClip(screenInfo.screens[i], enable);

+        }

+    }

+}

+

+/* 

+ * QuartzSpaceChanged

+ *  Unmap offscreen windows, map onscreen windows

+ */

+void QuartzSpaceChanged(uint32_t space_id) {

+    /* Do something special here, so we don't depend on quartz-wm for spaces to work... */

+    DEBUG_LOG("Space Changed (%u) ... do something interesting...\n", space_id);

+}

+

+/*

+ * QuartzCopyDisplayIDs

+ *  Associate an X11 screen with one or more CoreGraphics display IDs by copying

+ *  the list into a private array. Free the previously copied array, if present.

+ */

+void QuartzCopyDisplayIDs(ScreenPtr pScreen,

+                          int displayCount, CGDirectDisplayID *displayIDs) {

+    QuartzScreenPtr pQuartzScreen = QUARTZ_PRIV(pScreen);

+    int size = displayCount * sizeof(CGDirectDisplayID);

+

+    free(pQuartzScreen->displayIDs);

+    pQuartzScreen->displayIDs = malloc(size);

+    memcpy(pQuartzScreen->displayIDs, displayIDs, size);

+    pQuartzScreen->displayCount = displayCount;

+}

+

+void NSBeep(void);

+void DDXRingBell(

+    int volume,         // volume is % of max

+    int pitch,          // pitch is Hz

+    int duration)       // duration is milliseconds

+{

+    if (volume)

+        NSBeep();

+}

diff --git a/xorg-server/hw/xquartz/quartz.h b/xorg-server/hw/xquartz/quartz.h
index b83391db9..d520c1dcb 100644
--- a/xorg-server/hw/xquartz/quartz.h
+++ b/xorg-server/hw/xquartz/quartz.h
@@ -1,145 +1,147 @@
-/*
- * quartz.h
- *
- * External interface of the Quartz display modes seen by the generic, mode
- * independent parts of the Darwin X server.
- *
- * Copyright (c) 2001-2003 Greg Parker and 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 _QUARTZ_H
-#define _QUARTZ_H
-
-#include "screenint.h"
-#include "window.h"
-#include "pixmap.h"
-
-/*------------------------------------------
-   Quartz display mode function types
-  ------------------------------------------*/
-
-/*
- * Display mode initialization
- */
-typedef void (*DisplayInitProc)(void);
-typedef Bool (*AddScreenProc)(int index, ScreenPtr pScreen);
-typedef Bool (*SetupScreenProc)(int index, ScreenPtr pScreen);
-typedef void (*InitInputProc)(int argc, char **argv);
-
-/*
- * Cursor functions
- */
-typedef Bool (*InitCursorProc)(ScreenPtr pScreen);
-
-/*
- * Suspend and resume X11 activity
- */
-typedef void (*SuspendScreenProc)(ScreenPtr pScreen);
-typedef void (*ResumeScreenProc)(ScreenPtr pScreen);
-
-/*
- * Screen state change support
- */
-typedef void (*AddPseudoramiXScreensProc)
-    (int *x, int *y, int *width, int *height, ScreenPtr pScreen);
-typedef void (*UpdateScreenProc)(ScreenPtr pScreen);
-
-/*
- * Rootless helper functions
- */
-typedef Bool (*IsX11WindowProc)(void *nsWindow, int windowNumber);
-typedef void (*HideWindowsProc)(Bool hide);
-
-/*
- * Rootless functions for optional export to GLX layer
- */
-typedef void * (*FrameForWindowProc)(WindowPtr pWin, Bool create);
-typedef WindowPtr (*TopLevelParentProc)(WindowPtr pWindow);
-typedef Bool (*CreateSurfaceProc)
-    (ScreenPtr pScreen, Drawable id, DrawablePtr pDrawable,
-     unsigned int client_id, unsigned int *surface_id,
-     unsigned int key[2], void (*notify) (void *arg, void *data),
-     void *notify_data);
-typedef Bool (*DestroySurfaceProc)
-    (ScreenPtr pScreen, Drawable id, DrawablePtr pDrawable,
-     void (*notify) (void *arg, void *data), void *notify_data);
-
-/*
- * Quartz display mode function list
- */
-typedef struct _QuartzModeProcs {
-    DisplayInitProc DisplayInit;
-    AddScreenProc AddScreen;
-    SetupScreenProc SetupScreen;
-    InitInputProc InitInput;
-
-    InitCursorProc InitCursor;
-
-    SuspendScreenProc SuspendScreen;
-    ResumeScreenProc ResumeScreen;
-
-    AddPseudoramiXScreensProc AddPseudoramiXScreens;
-    UpdateScreenProc UpdateScreen;
-
-    IsX11WindowProc IsX11Window;
-    HideWindowsProc HideWindows;
-
-    FrameForWindowProc FrameForWindow;
-    TopLevelParentProc TopLevelParent;
-    CreateSurfaceProc CreateSurface;
-    DestroySurfaceProc DestroySurface;
-} QuartzModeProcsRec, *QuartzModeProcsPtr;
-
-extern QuartzModeProcsPtr quartzProcs;
-
-extern Bool XQuartzFullscreenVisible; /* Are the windows visible (predicated on !rootless) */
-extern Bool XQuartzServerVisible;     /* Is the server visible ... TODO: Refactor to "active" */
-extern Bool XQuartzEnableKeyEquivalents;
-extern Bool XQuartzRootlessDefault;  /* Is our default mode rootless? */
-extern Bool XQuartzIsRootless;       /* Is our current mode rootless (or FS)? */
-extern Bool XQuartzFullscreenMenu;   /* Show the menu bar (autohide) while in FS */
-extern Bool XQuartzFullscreenDisableHotkeys;
-extern Bool XQuartzOptionSendsAlt;   /* Alt or Mode_switch? */
-
-Bool QuartzAddScreen(int index, ScreenPtr pScreen);
-Bool QuartzSetupScreen(int index, ScreenPtr pScreen);
-void QuartzInitOutput(int argc,char **argv);
-void QuartzInitInput(int argc, char **argv);
-void QuartzInitServer(int argc, char **argv, char **envp);
-void QuartzGiveUp(void);
-void QuartzProcessEvent(xEvent *xe);
-void QuartzUpdateScreens(void);
-
-void QuartzShow(void);
-void QuartzHide(void);
-void QuartzSetRootClip(BOOL enable);
-void QuartzSpaceChanged(uint32_t space_id);
-
-void QuartzSetRootless(Bool state);
-void QuartzShowFullscreen(Bool state);
-
-int server_main(int argc, char **argv, char **envp);
-#endif
+/*

+ * quartz.h

+ *

+ * External interface of the Quartz display modes seen by the generic, mode

+ * independent parts of the Darwin X server.

+ *

+ * Copyright (c) 2001-2003 Greg Parker and 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 _QUARTZ_H

+#define _QUARTZ_H

+

+#include "screenint.h"

+#include "window.h"

+#include "pixmap.h"

+

+/*------------------------------------------

+   Quartz display mode function types

+  ------------------------------------------*/

+

+/*

+ * Display mode initialization

+ */

+typedef void (*DisplayInitProc)(void);

+typedef Bool (*AddScreenProc)(int index, ScreenPtr pScreen);

+typedef Bool (*SetupScreenProc)(int index, ScreenPtr pScreen);

+typedef void (*InitInputProc)(int argc, char **argv);

+

+/*

+ * Cursor functions

+ */

+typedef Bool (*InitCursorProc)(ScreenPtr pScreen);

+

+/*

+ * Suspend and resume X11 activity

+ */

+typedef void (*SuspendScreenProc)(ScreenPtr pScreen);

+typedef void (*ResumeScreenProc)(ScreenPtr pScreen);

+

+/*

+ * Screen state change support

+ */

+typedef void (*AddPseudoramiXScreensProc)

+    (int *x, int *y, int *width, int *height, ScreenPtr pScreen);

+typedef void (*UpdateScreenProc)(ScreenPtr pScreen);

+

+/*

+ * Rootless helper functions

+ */

+typedef Bool (*IsX11WindowProc)(void *nsWindow, int windowNumber);

+typedef void (*HideWindowsProc)(Bool hide);

+

+/*

+ * Rootless functions for optional export to GLX layer

+ */

+typedef void * (*FrameForWindowProc)(WindowPtr pWin, Bool create);

+typedef WindowPtr (*TopLevelParentProc)(WindowPtr pWindow);

+typedef Bool (*CreateSurfaceProc)

+    (ScreenPtr pScreen, Drawable id, DrawablePtr pDrawable,

+     unsigned int client_id, unsigned int *surface_id,

+     unsigned int key[2], void (*notify) (void *arg, void *data),

+     void *notify_data);

+typedef Bool (*DestroySurfaceProc)

+    (ScreenPtr pScreen, Drawable id, DrawablePtr pDrawable,

+     void (*notify) (void *arg, void *data), void *notify_data);

+

+/*

+ * Quartz display mode function list

+ */

+typedef struct _QuartzModeProcs {

+    DisplayInitProc DisplayInit;

+    AddScreenProc AddScreen;

+    SetupScreenProc SetupScreen;

+    InitInputProc InitInput;

+

+    InitCursorProc InitCursor;

+

+    SuspendScreenProc SuspendScreen;

+    ResumeScreenProc ResumeScreen;

+

+    AddPseudoramiXScreensProc AddPseudoramiXScreens;

+    UpdateScreenProc UpdateScreen;

+

+    IsX11WindowProc IsX11Window;

+    HideWindowsProc HideWindows;

+

+    FrameForWindowProc FrameForWindow;

+    TopLevelParentProc TopLevelParent;

+    CreateSurfaceProc CreateSurface;

+    DestroySurfaceProc DestroySurface;

+} QuartzModeProcsRec, *QuartzModeProcsPtr;

+

+extern QuartzModeProcsPtr quartzProcs;

+

+extern Bool XQuartzFullscreenVisible; /* Are the windows visible (predicated on !rootless) */

+extern Bool XQuartzServerVisible;     /* Is the server visible ... TODO: Refactor to "active" */

+extern Bool XQuartzEnableKeyEquivalents;

+extern Bool XQuartzRootlessDefault;  /* Is our default mode rootless? */

+extern Bool XQuartzIsRootless;       /* Is our current mode rootless (or FS)? */

+extern Bool XQuartzFullscreenMenu;   /* Show the menu bar (autohide) while in FS */

+extern Bool XQuartzFullscreenDisableHotkeys;

+extern Bool XQuartzOptionSendsAlt;   /* Alt or Mode_switch? */

+

+extern int32_t XQuartzShieldingWindowLevel; /* CGShieldingWindowLevel() or 0 */

+

+Bool QuartzAddScreen(int index, ScreenPtr pScreen);

+Bool QuartzSetupScreen(int index, ScreenPtr pScreen);

+void QuartzInitOutput(int argc,char **argv);

+void QuartzInitInput(int argc, char **argv);

+void QuartzInitServer(int argc, char **argv, char **envp);

+void QuartzGiveUp(void);

+void QuartzProcessEvent(xEvent *xe);

+void QuartzUpdateScreens(void);

+

+void QuartzShow(void);

+void QuartzHide(void);

+void QuartzSetRootClip(BOOL enable);

+void QuartzSpaceChanged(uint32_t space_id);

+

+void QuartzSetRootless(Bool state);

+void QuartzShowFullscreen(Bool state);

+

+int server_main(int argc, char **argv, char **envp);

+#endif

diff --git a/xorg-server/hw/xquartz/quartzRandR.c b/xorg-server/hw/xquartz/quartzRandR.c
index 64ad72d84..54e099c06 100644
--- a/xorg-server/hw/xquartz/quartzRandR.c
+++ b/xorg-server/hw/xquartz/quartzRandR.c
@@ -40,6 +40,8 @@
 #include "quartz.h"

 #include "darwin.h"

 

+#include "X11Application.h"

+

 #include <AvailabilityMacros.h>

 

 #include <X11/extensions/randr.h>

@@ -346,6 +348,16 @@ static int QuartzRandRRegisterModeCallback (ScreenPtr pScreen,
 static Bool QuartzRandRSetMode(ScreenPtr pScreen, QuartzModeInfoPtr pMode, BOOL doRegister) {

     QuartzScreenPtr pQuartzScreen = QUARTZ_PRIV(pScreen);

     CGDirectDisplayID screenId = pQuartzScreen->displayIDs[0];

+    Bool captureDisplay = (pMode->refresh != FAKE_REFRESH_FULLSCREEN && pMode->refresh != FAKE_REFRESH_ROOTLESS);

+

+    if(XQuartzShieldingWindowLevel == 0 && captureDisplay) {

+        if(!X11ApplicationCanEnterRandR())

+            return FALSE;

+        CGCaptureAllDisplays();

+        XQuartzShieldingWindowLevel = CGShieldingWindowLevel(); // 2147483630

+        DEBUG_LOG("Display captured.  ShieldWindowID: %u, Shield level: %d\n",

+                  CGShieldingWindowID(screenId), XQuartzShieldingWindowLevel);

+    }

 

     if (pQuartzScreen->currentMode.ref && CFEqual(pMode->ref, pQuartzScreen->currentMode.ref)) {

         DEBUG_LOG("Requested RandR resolution matches current CG mode\n");

@@ -369,6 +381,11 @@ static Bool QuartzRandRSetMode(ScreenPtr pScreen, QuartzModeInfoPtr pMode, BOOL
     pQuartzScreen->currentMode = *pMode;

     CFRetain(pQuartzScreen->currentMode.ref);

     

+    if(XQuartzShieldingWindowLevel != 0 && !captureDisplay) {

+        CGReleaseAllDisplays();

+        XQuartzShieldingWindowLevel = 0;

+    }

+

     return TRUE;

 }

 

@@ -396,16 +413,6 @@ static Bool QuartzRandRGetInfo (ScreenPtr pScreen, Rotation *rotations) {
     if (pQuartzScreen->displayCount == 0)

         return FALSE;

 

-    if (pQuartzScreen->displayCount > 1) {

-        /* RandR operations are not well-defined for an X11 screen spanning

-           multiple CG displays. Create two entries for the current virtual

-           resolution including/excluding the menu bar. */

-

-        QuartzRandRRegisterMode(pScreen, &pQuartzScreen->rootlessMode);

-        QuartzRandRRegisterMode(pScreen, &pQuartzScreen->fullscreenMode);

-        return TRUE;

-    }

-

     return QuartzRandREnumerateModes(pScreen, QuartzRandRRegisterModeCallback, NULL);

 }

 

diff --git a/xorg-server/hw/xquartz/xpr/xprAppleWM.c b/xorg-server/hw/xquartz/xpr/xprAppleWM.c
index 59ce6375e..1e99a07dc 100644
--- a/xorg-server/hw/xquartz/xpr/xprAppleWM.c
+++ b/xorg-server/hw/xquartz/xpr/xprAppleWM.c
@@ -69,6 +69,8 @@ static int xprSetWindowLevel(
     

     if(XQuartzIsRootless)

         wc.window_level = normal_window_levels[level];

+    else if(XQuartzShieldingWindowLevel)

+        wc.window_level = XQuartzShieldingWindowLevel + 1;

     else

         wc.window_level = rooted_window_levels[level];

     

diff --git a/xorg-server/hw/xquartz/xpr/xprFrame.c b/xorg-server/hw/xquartz/xpr/xprFrame.c
index fecae5a1b..cddec5ce2 100644
--- a/xorg-server/hw/xquartz/xpr/xprFrame.c
+++ b/xorg-server/hw/xquartz/xpr/xprFrame.c
@@ -173,6 +173,8 @@ xprCreateFrame(RootlessWindowPtr pFrame, ScreenPtr pScreen,
 

     if(XQuartzIsRootless)

         wc.window_level = normal_window_levels[pFrame->level];

+    else if(XQuartzShieldingWindowLevel)

+        wc.window_level = XQuartzShieldingWindowLevel + 1;

     else

         wc.window_level = rooted_window_levels[pFrame->level];

     mask |= XP_WINDOW_LEVEL;

@@ -287,6 +289,8 @@ static void xprRestackFrame(RootlessFrameID wid, RootlessFrameID nextWid) {
         if(winRec) {

             if(XQuartzIsRootless)

                 wc.window_level = normal_window_levels[winRec->level];

+            else if(XQuartzShieldingWindowLevel)

+                wc.window_level = XQuartzShieldingWindowLevel + 1;

             else

                 wc.window_level = rooted_window_levels[winRec->level];

             mask |= XP_WINDOW_LEVEL;

diff --git a/xorg-server/hw/xquartz/xpr/xprScreen.c b/xorg-server/hw/xquartz/xpr/xprScreen.c
index bd877d97c..338440a39 100644
--- a/xorg-server/hw/xquartz/xpr/xprScreen.c
+++ b/xorg-server/hw/xquartz/xpr/xprScreen.c
@@ -196,6 +196,13 @@ xprAddPseudoramiXScreens(int *x, int *y, int *width, int *height, ScreenPtr pScr
         return;

     }

 

+    /* If the displays are captured, we are in a RandR game mode

+     * on the primary display, so we only want to include the first

+     * display.  The others are covered by the shield window.

+     */

+    if (CGDisplayIsCaptured(kCGDirectMainDisplay))

+        displayCount = 1;

+

     displayList = malloc(displayCount * sizeof(CGDirectDisplayID));

     if(!displayList)

         FatalError("Unable to allocate memory for list of displays.\n");

@@ -292,9 +299,34 @@ xprAddScreen(int index, ScreenPtr pScreen)
     DEBUG_LOG("index=%d depth=%d\n", index, depth);

     

     if(depth == -1) {

+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060

         depth = CGDisplaySamplesPerPixel(kCGDirectMainDisplay) * CGDisplayBitsPerSample(kCGDirectMainDisplay);

+#else

+        CGDisplayModeRef modeRef;

+        CFStringRef encStrRef;

+        

+        modeRef = CGDisplayCopyDisplayMode(kCGDirectMainDisplay);

+        if(!modeRef)

+            goto have_depth;

+

+        encStrRef = CGDisplayModeCopyPixelEncoding(modeRef);

+        CFRelease(modeRef);

+        if(!encStrRef)

+            goto have_depth;

+        

+        if(CFStringCompare(encStrRef, CFSTR(IO32BitDirectPixels), kCFCompareCaseInsensitive) == kCFCompareEqualTo) {

+            depth = 24;

+        } else if(CFStringCompare(encStrRef, CFSTR(IO16BitDirectPixels), kCFCompareCaseInsensitive) == kCFCompareEqualTo) {

+            depth = 15;

+        } else if(CFStringCompare(encStrRef, CFSTR(IO8BitIndexedPixels), kCFCompareCaseInsensitive) == kCFCompareEqualTo) {

+            depth = 8;

+        }

+

+        CFRelease(encStrRef);

+#endif

     }

     

+have_depth:

     switch(depth) {

         case 8: // pseudo-working

             dfb->visuals = PseudoColorMask;

@@ -319,7 +351,7 @@ xprAddScreen(int index, ScreenPtr pScreen)
 //        case 24:

         default:

             if(depth != 24)

-                ErrorF("Unsupported color depth requested.  Defaulting to 24bit. (depth=%d darwinDesiredDepth=%d CGDisplaySamplesPerPixel=%d CGDisplayBitsPerSample=%d)\n",  darwinDesiredDepth, depth, (int)CGDisplaySamplesPerPixel(kCGDirectMainDisplay), (int)CGDisplayBitsPerSample(kCGDirectMainDisplay));

+                ErrorF("Unsupported color depth requested.  Defaulting to 24bit. (depth=%d darwinDesiredDepth=%d)\n", depth, darwinDesiredDepth);

             dfb->visuals = TrueColorMask; //LARGE_VISUALS;

             dfb->preferredCVC = TrueColor;

             dfb->depth = 24;

diff --git a/xorg-server/include/Makefile.am b/xorg-server/include/Makefile.am
index 2b5ee4ddb..5b2e4cc58 100644
--- a/xorg-server/include/Makefile.am
+++ b/xorg-server/include/Makefile.am
@@ -3,6 +3,7 @@ sdk_HEADERS =		\
 	XIstubs.h	\

 	Xprintf.h	\

 	callback.h	\

+	client.h	\

 	closestr.h	\

 	closure.h	\

 	colormap.h	\

diff --git a/xorg-server/include/client.h b/xorg-server/include/client.h
new file mode 100644
index 000000000..aaafc7da6
--- /dev/null
+++ b/xorg-server/include/client.h
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 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
+ * AUTHORS OR COPYRIGHT HOLDERS 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.
+ */
+
+/* Author: Rami Ylimäki <rami.ylimaki@vincit.fi> */
+
+#ifndef CLIENT_H
+#define CLIENT_H
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif /* HAVE_DIX_CONFIG_H */
+#include <X11/Xfuncproto.h>
+#include <sys/types.h>
+
+/* Client IDs. Use GetClientPid, GetClientCmdName and GetClientCmdArgs
+ * instead of accessing the fields directly. */
+typedef struct {
+    pid_t pid;           /* process ID, -1 if not available */
+    const char *cmdname; /* process name, NULL if not available */
+    const char *cmdargs; /* process arguments, NULL if not available */
+} ClientIdRec, *ClientIdPtr;
+
+struct _Client;
+
+/* Initialize and clean up. */
+void ReserveClientIds(struct _Client *client);
+void ReleaseClientIds(struct _Client *client);
+
+/* Determine client IDs for caching. Exported on purpose for
+ * extensions such as SELinux. */
+extern _X_EXPORT pid_t DetermineClientPid(struct _Client *client);
+extern _X_EXPORT void DetermineClientCmd(pid_t, const char **cmdname, const char **cmdargs);
+
+/* Query cached client IDs. Exported on purpose for drivers. */
+extern _X_EXPORT pid_t GetClientPid(struct _Client *client);
+extern _X_EXPORT const char *GetClientCmdName(struct _Client *client);
+extern _X_EXPORT const char *GetClientCmdArgs(struct _Client *client);
+
+#endif /* CLIENT_H */
diff --git a/xorg-server/include/dix-config.h.in b/xorg-server/include/dix-config.h.in
index 64eb296c8..174e64a99 100644
--- a/xorg-server/include/dix-config.h.in
+++ b/xorg-server/include/dix-config.h.in
@@ -279,6 +279,9 @@
 /* Support X resource extension */

 #undef RES

 

+/* Support client ID tracking in X resource extension */

+#undef CLIENTIDS

+

 /* Support MIT-SCREEN-SAVER extension */

 #undef SCREENSAVER

 

diff --git a/xorg-server/include/dix.h b/xorg-server/include/dix.h
index 12e4b5977..6bba40aef 100644
--- a/xorg-server/include/dix.h
+++ b/xorg-server/include/dix.h
@@ -1,609 +1,610 @@
-/***********************************************************
-
-Copyright 1987, 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 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        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 Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL 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.
-
-******************************************************************/
-
-#ifndef DIX_H
-#define DIX_H
-
-#include "callback.h"
-#include "gc.h"
-#include "window.h"
-#include "input.h"
-#include "cursor.h"
-#include "geext.h"
-#include "events.h"
-#include <X11/extensions/XI.h>
-
-#define EARLIER -1
-#define SAMETIME 0
-#define LATER 1
-
-#define NullClient ((ClientPtr) 0)
-#define REQUEST(type) \
-	type *stuff = (type *)client->requestBuffer
-
-
-#define REQUEST_SIZE_MATCH(req)\
-    if ((sizeof(req) >> 2) != client->req_len)\
-         return(BadLength)
-
-#define REQUEST_AT_LEAST_SIZE(req) \
-    if ((sizeof(req) >> 2) > client->req_len )\
-         return(BadLength)
-
-#define REQUEST_FIXED_SIZE(req, n)\
-    if (((sizeof(req) >> 2) > client->req_len) || \
-        (((sizeof(req) + (n) + 3) >> 2) != client->req_len)) \
-         return(BadLength)
-
-#define LEGAL_NEW_RESOURCE(id,client)\
-    if (!LegalNewID(id,client)) \
-    {\
-	client->errorValue = id;\
-        return BadIDChoice;\
-    }
-
-#define VALIDATE_DRAWABLE_AND_GC(drawID, pDraw, mode)\
-    {\
-	int rc = dixLookupDrawable(&(pDraw), drawID, client, M_ANY, mode);\
-	if (rc != Success)\
-	    return rc;\
-	rc = dixLookupGC(&(pGC), stuff->gc, client, DixUseAccess);\
-	if (rc != Success)\
-	    return rc;\
-	if ((pGC->depth != pDraw->depth) || (pGC->pScreen != pDraw->pScreen))\
-	    return BadMatch;\
-    }\
-    if (pGC->serialNumber != pDraw->serialNumber)\
-	ValidateGC(pDraw, pGC);
-
-
-#define WriteReplyToClient(pClient, size, pReply) { \
-   if ((pClient)->swapped) \
-      (*ReplySwapVector[((xReq *)(pClient)->requestBuffer)->reqType]) \
-           (pClient, (int)(size), pReply); \
-      else (void) WriteToClient(pClient, (int)(size), (char *)(pReply)); }
-
-#define WriteSwappedDataToClient(pClient, size, pbuf) \
-   if ((pClient)->swapped) \
-      (*(pClient)->pSwapReplyFunc)(pClient, (int)(size), pbuf); \
-   else (void) WriteToClient (pClient, (int)(size), (char *)(pbuf));
-
-typedef struct _TimeStamp *TimeStampPtr;
-
-#ifndef _XTYPEDEF_CLIENTPTR
-typedef struct _Client *ClientPtr; /* also in misc.h */
-#define _XTYPEDEF_CLIENTPTR
-#endif
-
-typedef struct _WorkQueue	*WorkQueuePtr;
-
-extern _X_EXPORT ClientPtr clients[MAXCLIENTS];
-extern _X_EXPORT ClientPtr serverClient;
-extern _X_EXPORT int currentMaxClients;
-extern _X_EXPORT char dispatchExceptionAtReset;
-
-typedef int HWEventQueueType;
-typedef HWEventQueueType* HWEventQueuePtr;
-
-extern _X_EXPORT HWEventQueuePtr checkForInput[2];
-
-typedef struct _TimeStamp {
-    CARD32 months;	/* really ~49.7 days */
-    CARD32 milliseconds;
-}           TimeStamp;
-
-/* dispatch.c */
-
-extern _X_EXPORT void SetInputCheck(
-    HWEventQueuePtr /*c0*/,
-    HWEventQueuePtr /*c1*/);
-
-extern _X_EXPORT void CloseDownClient(
-    ClientPtr /*client*/);
-
-extern _X_EXPORT void UpdateCurrentTime(void);
-
-extern _X_EXPORT void UpdateCurrentTimeIf(void);
-
-extern _X_EXPORT int dixDestroyPixmap(
-    pointer /*value*/,
-    XID /*pid*/);
-
-extern _X_EXPORT void InitClient(
-    ClientPtr /*client*/,
-    int /*i*/,
-    pointer /*ospriv*/);
-
-extern _X_EXPORT ClientPtr NextAvailableClient(
-    pointer /*ospriv*/);
-
-extern _X_EXPORT void SendErrorToClient(
-    ClientPtr /*client*/,
-    unsigned int /*majorCode*/,
-    unsigned int /*minorCode*/,
-    XID /*resId*/,
-    int /*errorCode*/);
-
-extern _X_EXPORT void MarkClientException(
-    ClientPtr /*client*/);
-
-extern _X_HIDDEN Bool CreateConnectionBlock(void);
-/* dixutils.c */
-
-extern _X_EXPORT int CompareISOLatin1Lowered(
-    unsigned char * /*a*/,
-    int alen,
-    unsigned char * /*b*/,
-    int blen);
-
-extern _X_EXPORT int dixLookupWindow(
-    WindowPtr *result,
-    XID id,
-    ClientPtr client,
-    Mask access_mode);
-
-extern _X_EXPORT int dixLookupDrawable(
-    DrawablePtr *result,
-    XID id,
-    ClientPtr client,
-    Mask type_mask,
-    Mask access_mode);
-
-extern _X_EXPORT int dixLookupGC(
-    GCPtr *result,
-    XID id,
-    ClientPtr client,
-    Mask access_mode);
-
-extern _X_EXPORT int dixLookupFontable(
-    FontPtr *result,
-    XID id,
-    ClientPtr client,
-    Mask access_mode);
-
-extern _X_EXPORT int dixLookupClient(
-    ClientPtr *result,
-    XID id,
-    ClientPtr client,
-    Mask access_mode);
-
-extern _X_EXPORT void NoopDDA(void);
-
-extern _X_EXPORT int AlterSaveSetForClient(
-    ClientPtr /*client*/,
-    WindowPtr /*pWin*/,
-    unsigned /*mode*/,
-    Bool /*toRoot*/,
-    Bool /*map*/);
-  
-extern _X_EXPORT void DeleteWindowFromAnySaveSet(
-    WindowPtr /*pWin*/);
-
-extern _X_EXPORT void BlockHandler(
-    pointer /*pTimeout*/,
-    pointer /*pReadmask*/);
-
-extern _X_EXPORT void WakeupHandler(
-    int /*result*/,
-    pointer /*pReadmask*/);
-
-void
-EnableLimitedSchedulingLatency(void);
-
-void
-DisableLimitedSchedulingLatency(void);
-
-typedef void (* WakeupHandlerProcPtr)(
-    pointer /* blockData */,
-    int /* result */,
-    pointer /* pReadmask */);
-
-extern _X_EXPORT Bool RegisterBlockAndWakeupHandlers(
-    BlockHandlerProcPtr /*blockHandler*/,
-    WakeupHandlerProcPtr /*wakeupHandler*/,
-    pointer /*blockData*/);
-
-extern _X_EXPORT void RemoveBlockAndWakeupHandlers(
-    BlockHandlerProcPtr /*blockHandler*/,
-    WakeupHandlerProcPtr /*wakeupHandler*/,
-    pointer /*blockData*/);
-
-extern _X_EXPORT void InitBlockAndWakeupHandlers(void);
-
-extern _X_EXPORT void ProcessWorkQueue(void);
-
-extern _X_EXPORT void ProcessWorkQueueZombies(void);
-
-extern _X_EXPORT Bool QueueWorkProc(
-    Bool (* /*function*/)(
-        ClientPtr /*clientUnused*/,
-        pointer /*closure*/),
-    ClientPtr /*client*/,
-    pointer /*closure*/
-);
-
-typedef Bool (* ClientSleepProcPtr)(
-    ClientPtr /*client*/,
-    pointer /*closure*/);
-
-extern _X_EXPORT Bool ClientSleep(
-    ClientPtr /*client*/,
-    ClientSleepProcPtr /* function */,
-    pointer /*closure*/);
-
-#ifndef ___CLIENTSIGNAL_DEFINED___
-#define ___CLIENTSIGNAL_DEFINED___
-extern _X_EXPORT Bool ClientSignal(
-    ClientPtr /*client*/);
-#endif /* ___CLIENTSIGNAL_DEFINED___ */
-
-extern _X_EXPORT void ClientWakeup(
-    ClientPtr /*client*/);
-
-extern _X_EXPORT Bool ClientIsAsleep(
-    ClientPtr /*client*/);
-
-/* atom.c */
-
-extern _X_EXPORT Atom MakeAtom(
-    const char * /*string*/,
-    unsigned /*len*/,
-    Bool /*makeit*/);
-
-extern _X_EXPORT Bool ValidAtom(
-    Atom /*atom*/);
-
-extern _X_EXPORT const char *NameForAtom(
-    Atom /*atom*/);
-
-extern _X_EXPORT void AtomError(void) _X_NORETURN;
-
-extern _X_EXPORT void FreeAllAtoms(void);
-
-extern _X_EXPORT void InitAtoms(void);
-
-/* main.c */
-
-extern _X_EXPORT void SetVendorRelease(int release);
-
-extern _X_EXPORT void SetVendorString(char *string);
-
-/* events.c */
-
-extern void SetMaskForEvent(
-    int /* deviceid */,
-    Mask /* mask */,
-    int /* event */);
-
-extern _X_EXPORT void ConfineToShape(
-    DeviceIntPtr /* pDev */, 
-    RegionPtr /* shape */, 
-    int*      /* px */,
-    int*      /* py */);
-
-extern _X_EXPORT Bool IsParent(
-    WindowPtr /* maybeparent */,
-    WindowPtr /* child */);
-
-extern _X_EXPORT WindowPtr GetCurrentRootWindow(DeviceIntPtr pDev);
-
-extern _X_EXPORT WindowPtr GetSpriteWindow(DeviceIntPtr pDev);
-
-
-extern _X_EXPORT void NoticeEventTime(InternalEvent *ev);
-
-extern void EnqueueEvent(
-    InternalEvent * /* ev */,
-    DeviceIntPtr  /* device */);
-
-extern void ActivatePointerGrab(
-    DeviceIntPtr /* mouse */,
-    GrabPtr /* grab */,
-    TimeStamp /* time */,
-    Bool /* autoGrab */);
-
-extern void DeactivatePointerGrab(
-    DeviceIntPtr /* mouse */);
-
-extern void ActivateKeyboardGrab(
-    DeviceIntPtr /* keybd */,
-    GrabPtr /* grab */,
-    TimeStamp /* time */,
-    Bool /* passive */);
-
-extern void DeactivateKeyboardGrab(
-    DeviceIntPtr /* keybd */);
-
-extern BOOL ActivateFocusInGrab(
-    DeviceIntPtr /* dev */,
-    WindowPtr /* old */,
-    WindowPtr /* win */);
-
-extern void AllowSome(
-    ClientPtr	/* client */,
-    TimeStamp /* time */,
-    DeviceIntPtr /* thisDev */,
-    int /* newState */);
-
-extern void ReleaseActiveGrabs(
-    ClientPtr client);
-
-extern GrabPtr CheckPassiveGrabsOnWindow(
-    WindowPtr /* pWin */,
-    DeviceIntPtr /* device */,
-    DeviceEvent * /* event */,
-    BOOL /* checkCore */,
-    BOOL /* activate */);
-
-extern _X_EXPORT int DeliverEventsToWindow(
-    DeviceIntPtr /* pWin */,
-    WindowPtr /* pWin */,
-    xEventPtr /* pEvents */,
-    int /* count */,
-    Mask /* filter */,
-    GrabPtr /* grab */);
-
-extern int DeliverDeviceEvents(
-    WindowPtr /* pWin */,
-    InternalEvent* /* event */,
-    GrabPtr /* grab */,
-    WindowPtr /* stopAt */,
-    DeviceIntPtr /* dev */);
-
-extern void InitializeSprite(
-    DeviceIntPtr /* pDev */,
-    WindowPtr    /* pWin */);
-
-extern void UpdateSpriteForScreen(
-    DeviceIntPtr /* pDev */,
-    ScreenPtr /* pScreen */);
-
-extern _X_EXPORT void WindowHasNewCursor(
-    WindowPtr /* pWin */);
-
-extern Bool CheckDeviceGrabs(
-    DeviceIntPtr /* device */,
-    DeviceEvent* /* event */,
-    WindowPtr /* ancestor */);
-
-extern void DeliverFocusedEvent(
-    DeviceIntPtr /* keybd */,
-    InternalEvent* /* event */,
-    WindowPtr /* window */);
-
-extern void DeliverGrabbedEvent(
-    InternalEvent* /* event */,
-    DeviceIntPtr /* thisDev */,
-    Bool /* deactivateGrab */);
-
-extern void FixKeyState(
-    DeviceEvent* /* event */,
-    DeviceIntPtr /* keybd */);
-
-extern void RecalculateDeliverableEvents(
-    WindowPtr /* pWin */);
-
-extern _X_EXPORT int OtherClientGone(
-    pointer /* value */,
-    XID /* id */);
-
-extern void DoFocusEvents(
-    DeviceIntPtr /* dev */,
-    WindowPtr /* fromWin */,
-    WindowPtr /* toWin */,
-    int /* mode */);
-
-extern int SetInputFocus(
-    ClientPtr /* client */,
-    DeviceIntPtr /* dev */,
-    Window /* focusID */,
-    CARD8 /* revertTo */,
-    Time /* ctime */,
-    Bool /* followOK */);
-
-extern int GrabDevice(
-    ClientPtr /* client */,
-    DeviceIntPtr /* dev */,
-    unsigned /* this_mode */,
-    unsigned /* other_mode */,
-    Window /* grabWindow */,
-    unsigned /* ownerEvents */,
-    Time /* ctime */,
-    GrabMask* /* mask */,
-    int /* grabtype */,
-    Cursor /* curs */,
-    Window /* confineToWin */,
-    CARD8 * /* status */);
-
-extern void InitEvents(void);
-
-extern void CloseDownEvents(void);
-
-extern void DeleteWindowFromAnyEvents(
-    WindowPtr	/* pWin */,
-    Bool /* freeResources */);
-
-
-extern Mask EventMaskForClient(
-    WindowPtr /* pWin */,
-    ClientPtr /* client */);
-
-
-
-extern _X_EXPORT int DeliverEvents(
-    WindowPtr /*pWin*/,
-    xEventPtr /*xE*/,
-    int /*count*/,
-    WindowPtr /*otherParent*/);
-
-extern Bool CheckMotion(
-    DeviceEvent* /* ev */,
-    DeviceIntPtr /* pDev */);
-
-extern _X_EXPORT void WriteEventsToClient(
-    ClientPtr /*pClient*/,
-    int	     /*count*/,
-    xEventPtr /*events*/);
-
-extern _X_EXPORT int TryClientEvents(
-    ClientPtr /*client*/,
-    DeviceIntPtr /* device */,
-    xEventPtr /*pEvents*/,
-    int /*count*/,
-    Mask /*mask*/,
-    Mask /*filter*/,
-    GrabPtr /*grab*/);
-
-extern _X_EXPORT void WindowsRestructured(void);
-
-extern int SetClientPointer(
-        ClientPtr /* client */,
-        DeviceIntPtr /* device */);
-
-extern _X_EXPORT DeviceIntPtr PickPointer(
-    ClientPtr /* client */);
-
-extern _X_EXPORT DeviceIntPtr PickKeyboard(
-    ClientPtr /* client */);
-
-extern Bool IsInterferingGrab(
-        ClientPtr /* client */,
-        DeviceIntPtr /* dev */,
-        xEvent* /* events */);
-
-#ifdef PANORAMIX
-extern _X_EXPORT void ReinitializeRootWindow(WindowPtr win, int xoff, int yoff);
-#endif
-
-#ifdef RANDR
-extern _X_EXPORT void
-ScreenRestructured (ScreenPtr pScreen);
-#endif
-
-extern _X_EXPORT int ffs(int i);
-
-
-/*
- *  ServerGrabCallback stuff
- */
-
-extern _X_EXPORT CallbackListPtr ServerGrabCallback;
-
-typedef enum {SERVER_GRABBED, SERVER_UNGRABBED,
-	      CLIENT_PERVIOUS, CLIENT_IMPERVIOUS } ServerGrabState;
-
-typedef struct {
-    ClientPtr client;
-    ServerGrabState grabstate;
-} ServerGrabInfoRec;
-
-/*
- *  EventCallback stuff
- */
-
-extern _X_EXPORT CallbackListPtr EventCallback;
-
-typedef struct {
-    ClientPtr client;
-    xEventPtr events;
-    int count;
-} EventInfoRec;
-
-/*
- *  DeviceEventCallback stuff
- */
-
-extern _X_EXPORT CallbackListPtr DeviceEventCallback;
-
-typedef struct {
-    InternalEvent *event;
-    DeviceIntPtr device;
-} DeviceEventInfoRec;
-
-extern int XItoCoreType(int xi_type);
-extern Bool DevHasCursor(DeviceIntPtr pDev);
-extern Bool _X_EXPORT IsPointerDevice( DeviceIntPtr dev);
-extern Bool _X_EXPORT IsKeyboardDevice(DeviceIntPtr dev);
-extern Bool IsPointerEvent(InternalEvent *event);
-extern _X_EXPORT Bool IsMaster(DeviceIntPtr dev);
-
-extern _X_HIDDEN void CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master);
-extern _X_HIDDEN int CorePointerProc(DeviceIntPtr dev, int what);
-extern _X_HIDDEN int CoreKeyboardProc(DeviceIntPtr dev, int what);
-
-
-/*
- * These are deprecated compatibility functions and will be removed soon!
- * Please use the noted replacements instead.
- */
-/* replaced by dixLookupWindow */
-extern _X_EXPORT WindowPtr SecurityLookupWindow(
-    XID id,
-    ClientPtr client,
-    Mask access_mode);
-/* replaced by dixLookupWindow */
-extern _X_EXPORT WindowPtr LookupWindow(
-    XID id,
-    ClientPtr client);
-
-/* replaced by dixLookupDrawable */
-extern _X_EXPORT pointer SecurityLookupDrawable(
-    XID id,
-    ClientPtr client,
-    Mask access_mode);
-
-/* replaced by dixLookupDrawable */
-extern _X_EXPORT pointer LookupDrawable(
-    XID id,
-    ClientPtr client);
-
-/* replaced by dixLookupClient */
-extern _X_EXPORT ClientPtr LookupClient(
-    XID id,
-    ClientPtr client);
-
-#endif /* DIX_H */
+/***********************************************************

+

+Copyright 1987, 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 1987 by Digital Equipment Corporation, Maynard, Massachusetts.

+

+                        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 Digital not be

+used in advertising or publicity pertaining to distribution of the

+software without specific, written prior permission.  

+

+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING

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

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

+

+******************************************************************/

+

+#ifndef DIX_H

+#define DIX_H

+

+#include "callback.h"

+#include "gc.h"

+#include "window.h"

+#include "input.h"

+#include "cursor.h"

+#include "geext.h"

+#include "events.h"

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

+

+#define EARLIER -1

+#define SAMETIME 0

+#define LATER 1

+

+#define NullClient ((ClientPtr) 0)

+#define REQUEST(type) \

+	type *stuff = (type *)client->requestBuffer

+

+

+#define REQUEST_SIZE_MATCH(req)\

+    if ((sizeof(req) >> 2) != client->req_len)\

+         return(BadLength)

+

+#define REQUEST_AT_LEAST_SIZE(req) \

+    if ((sizeof(req) >> 2) > client->req_len )\

+         return(BadLength)

+

+#define REQUEST_FIXED_SIZE(req, n)\

+    if (((sizeof(req) >> 2) > client->req_len) || \

+        (((sizeof(req) + (n) + 3) >> 2) != client->req_len)) \

+         return(BadLength)

+

+#define LEGAL_NEW_RESOURCE(id,client)\

+    if (!LegalNewID(id,client)) \

+    {\

+	client->errorValue = id;\

+        return BadIDChoice;\

+    }

+

+#define VALIDATE_DRAWABLE_AND_GC(drawID, pDraw, mode)\

+    {\

+	int rc = dixLookupDrawable(&(pDraw), drawID, client, M_ANY, mode);\

+	if (rc != Success)\

+	    return rc;\

+	rc = dixLookupGC(&(pGC), stuff->gc, client, DixUseAccess);\

+	if (rc != Success)\

+	    return rc;\

+	if ((pGC->depth != pDraw->depth) || (pGC->pScreen != pDraw->pScreen))\

+	    return BadMatch;\

+    }\

+    if (pGC->serialNumber != pDraw->serialNumber)\

+	ValidateGC(pDraw, pGC);

+

+

+#define WriteReplyToClient(pClient, size, pReply) { \

+   if ((pClient)->swapped) \

+      (*ReplySwapVector[((xReq *)(pClient)->requestBuffer)->reqType]) \

+           (pClient, (int)(size), pReply); \

+      else (void) WriteToClient(pClient, (int)(size), (char *)(pReply)); }

+

+#define WriteSwappedDataToClient(pClient, size, pbuf) \

+   if ((pClient)->swapped) \

+      (*(pClient)->pSwapReplyFunc)(pClient, (int)(size), pbuf); \

+   else (void) WriteToClient (pClient, (int)(size), (char *)(pbuf));

+

+typedef struct _TimeStamp *TimeStampPtr;

+

+#ifndef _XTYPEDEF_CLIENTPTR

+typedef struct _Client *ClientPtr; /* also in misc.h */

+#define _XTYPEDEF_CLIENTPTR

+#endif

+

+typedef struct _WorkQueue	*WorkQueuePtr;

+

+extern _X_EXPORT ClientPtr clients[MAXCLIENTS];

+extern _X_EXPORT ClientPtr serverClient;

+extern _X_EXPORT int currentMaxClients;

+extern _X_EXPORT char dispatchExceptionAtReset;

+

+typedef int HWEventQueueType;

+typedef HWEventQueueType* HWEventQueuePtr;

+

+extern _X_EXPORT HWEventQueuePtr checkForInput[2];

+

+typedef struct _TimeStamp {

+    CARD32 months;	/* really ~49.7 days */

+    CARD32 milliseconds;

+}           TimeStamp;

+

+/* dispatch.c */

+

+extern _X_EXPORT void SetInputCheck(

+    HWEventQueuePtr /*c0*/,

+    HWEventQueuePtr /*c1*/);

+

+extern _X_EXPORT void CloseDownClient(

+    ClientPtr /*client*/);

+

+extern _X_EXPORT void UpdateCurrentTime(void);

+

+extern _X_EXPORT void UpdateCurrentTimeIf(void);

+

+extern _X_EXPORT int dixDestroyPixmap(

+    pointer /*value*/,

+    XID /*pid*/);

+

+extern _X_EXPORT void InitClient(

+    ClientPtr /*client*/,

+    int /*i*/,

+    pointer /*ospriv*/);

+

+extern _X_EXPORT ClientPtr NextAvailableClient(

+    pointer /*ospriv*/);

+

+extern _X_EXPORT void SendErrorToClient(

+    ClientPtr /*client*/,

+    unsigned int /*majorCode*/,

+    unsigned int /*minorCode*/,

+    XID /*resId*/,

+    int /*errorCode*/);

+

+extern _X_EXPORT void MarkClientException(

+    ClientPtr /*client*/);

+

+extern _X_HIDDEN Bool CreateConnectionBlock(void);

+/* dixutils.c */

+

+extern _X_EXPORT int CompareISOLatin1Lowered(

+    unsigned char * /*a*/,

+    int alen,

+    unsigned char * /*b*/,

+    int blen);

+

+extern _X_EXPORT int dixLookupWindow(

+    WindowPtr *result,

+    XID id,

+    ClientPtr client,

+    Mask access_mode);

+

+extern _X_EXPORT int dixLookupDrawable(

+    DrawablePtr *result,

+    XID id,

+    ClientPtr client,

+    Mask type_mask,

+    Mask access_mode);

+

+extern _X_EXPORT int dixLookupGC(

+    GCPtr *result,

+    XID id,

+    ClientPtr client,

+    Mask access_mode);

+

+extern _X_EXPORT int dixLookupFontable(

+    FontPtr *result,

+    XID id,

+    ClientPtr client,

+    Mask access_mode);

+

+extern _X_EXPORT int dixLookupClient(

+    ClientPtr *result,

+    XID id,

+    ClientPtr client,

+    Mask access_mode);

+

+extern _X_EXPORT void NoopDDA(void);

+

+extern _X_EXPORT int AlterSaveSetForClient(

+    ClientPtr /*client*/,

+    WindowPtr /*pWin*/,

+    unsigned /*mode*/,

+    Bool /*toRoot*/,

+    Bool /*map*/);

+  

+extern _X_EXPORT void DeleteWindowFromAnySaveSet(

+    WindowPtr /*pWin*/);

+

+extern _X_EXPORT void BlockHandler(

+    pointer /*pTimeout*/,

+    pointer /*pReadmask*/);

+

+extern _X_EXPORT void WakeupHandler(

+    int /*result*/,

+    pointer /*pReadmask*/);

+

+void

+EnableLimitedSchedulingLatency(void);

+

+void

+DisableLimitedSchedulingLatency(void);

+

+typedef void (* WakeupHandlerProcPtr)(

+    pointer /* blockData */,

+    int /* result */,

+    pointer /* pReadmask */);

+

+extern _X_EXPORT Bool RegisterBlockAndWakeupHandlers(

+    BlockHandlerProcPtr /*blockHandler*/,

+    WakeupHandlerProcPtr /*wakeupHandler*/,

+    pointer /*blockData*/);

+

+extern _X_EXPORT void RemoveBlockAndWakeupHandlers(

+    BlockHandlerProcPtr /*blockHandler*/,

+    WakeupHandlerProcPtr /*wakeupHandler*/,

+    pointer /*blockData*/);

+

+extern _X_EXPORT void InitBlockAndWakeupHandlers(void);

+

+extern _X_EXPORT void ProcessWorkQueue(void);

+

+extern _X_EXPORT void ProcessWorkQueueZombies(void);

+

+extern _X_EXPORT Bool QueueWorkProc(

+    Bool (* /*function*/)(

+        ClientPtr /*clientUnused*/,

+        pointer /*closure*/),

+    ClientPtr /*client*/,

+    pointer /*closure*/

+);

+

+typedef Bool (* ClientSleepProcPtr)(

+    ClientPtr /*client*/,

+    pointer /*closure*/);

+

+extern _X_EXPORT Bool ClientSleep(

+    ClientPtr /*client*/,

+    ClientSleepProcPtr /* function */,

+    pointer /*closure*/);

+

+#ifndef ___CLIENTSIGNAL_DEFINED___

+#define ___CLIENTSIGNAL_DEFINED___

+extern _X_EXPORT Bool ClientSignal(

+    ClientPtr /*client*/);

+#endif /* ___CLIENTSIGNAL_DEFINED___ */

+

+extern _X_EXPORT void ClientWakeup(

+    ClientPtr /*client*/);

+

+extern _X_EXPORT Bool ClientIsAsleep(

+    ClientPtr /*client*/);

+

+/* atom.c */

+

+extern _X_EXPORT Atom MakeAtom(

+    const char * /*string*/,

+    unsigned /*len*/,

+    Bool /*makeit*/);

+

+extern _X_EXPORT Bool ValidAtom(

+    Atom /*atom*/);

+

+extern _X_EXPORT const char *NameForAtom(

+    Atom /*atom*/);

+

+extern _X_EXPORT void AtomError(void) _X_NORETURN;

+

+extern _X_EXPORT void FreeAllAtoms(void);

+

+extern _X_EXPORT void InitAtoms(void);

+

+/* main.c */

+

+extern _X_EXPORT void SetVendorRelease(int release);

+

+extern _X_EXPORT void SetVendorString(char *string);

+

+/* events.c */

+

+extern void SetMaskForEvent(

+    int /* deviceid */,

+    Mask /* mask */,

+    int /* event */);

+

+extern _X_EXPORT void ConfineToShape(

+    DeviceIntPtr /* pDev */, 

+    RegionPtr /* shape */, 

+    int*      /* px */,

+    int*      /* py */);

+

+extern _X_EXPORT Bool IsParent(

+    WindowPtr /* maybeparent */,

+    WindowPtr /* child */);

+

+extern _X_EXPORT WindowPtr GetCurrentRootWindow(DeviceIntPtr pDev);

+

+extern _X_EXPORT WindowPtr GetSpriteWindow(DeviceIntPtr pDev);

+

+

+extern _X_EXPORT void NoticeEventTime(InternalEvent *ev);

+

+extern void EnqueueEvent(

+    InternalEvent * /* ev */,

+    DeviceIntPtr  /* device */);

+

+extern void ActivatePointerGrab(

+    DeviceIntPtr /* mouse */,

+    GrabPtr /* grab */,

+    TimeStamp /* time */,

+    Bool /* autoGrab */);

+

+extern void DeactivatePointerGrab(

+    DeviceIntPtr /* mouse */);

+

+extern void ActivateKeyboardGrab(

+    DeviceIntPtr /* keybd */,

+    GrabPtr /* grab */,

+    TimeStamp /* time */,

+    Bool /* passive */);

+

+extern void DeactivateKeyboardGrab(

+    DeviceIntPtr /* keybd */);

+

+extern BOOL ActivateFocusInGrab(

+    DeviceIntPtr /* dev */,

+    WindowPtr /* old */,

+    WindowPtr /* win */);

+

+extern void AllowSome(

+    ClientPtr	/* client */,

+    TimeStamp /* time */,

+    DeviceIntPtr /* thisDev */,

+    int /* newState */);

+

+extern void ReleaseActiveGrabs(

+    ClientPtr client);

+

+extern GrabPtr CheckPassiveGrabsOnWindow(

+    WindowPtr /* pWin */,

+    DeviceIntPtr /* device */,

+    DeviceEvent * /* event */,

+    BOOL /* checkCore */,

+    BOOL /* activate */);

+

+extern _X_EXPORT int DeliverEventsToWindow(

+    DeviceIntPtr /* pWin */,

+    WindowPtr /* pWin */,

+    xEventPtr /* pEvents */,

+    int /* count */,

+    Mask /* filter */,

+    GrabPtr /* grab */);

+

+extern int DeliverDeviceEvents(

+    WindowPtr /* pWin */,

+    InternalEvent* /* event */,

+    GrabPtr /* grab */,

+    WindowPtr /* stopAt */,

+    DeviceIntPtr /* dev */);

+

+extern void InitializeSprite(

+    DeviceIntPtr /* pDev */,

+    WindowPtr    /* pWin */);

+

+extern void UpdateSpriteForScreen(

+    DeviceIntPtr /* pDev */,

+    ScreenPtr /* pScreen */);

+

+extern _X_EXPORT void WindowHasNewCursor(

+    WindowPtr /* pWin */);

+

+extern Bool CheckDeviceGrabs(

+    DeviceIntPtr /* device */,

+    DeviceEvent* /* event */,

+    WindowPtr /* ancestor */);

+

+extern void DeliverFocusedEvent(

+    DeviceIntPtr /* keybd */,

+    InternalEvent* /* event */,

+    WindowPtr /* window */);

+

+extern void DeliverGrabbedEvent(

+    InternalEvent* /* event */,

+    DeviceIntPtr /* thisDev */,

+    Bool /* deactivateGrab */);

+

+extern void FixKeyState(

+    DeviceEvent* /* event */,

+    DeviceIntPtr /* keybd */);

+

+extern void RecalculateDeliverableEvents(

+    WindowPtr /* pWin */);

+

+extern _X_EXPORT int OtherClientGone(

+    pointer /* value */,

+    XID /* id */);

+

+extern void DoFocusEvents(

+    DeviceIntPtr /* dev */,

+    WindowPtr /* fromWin */,

+    WindowPtr /* toWin */,

+    int /* mode */);

+

+extern int SetInputFocus(

+    ClientPtr /* client */,

+    DeviceIntPtr /* dev */,

+    Window /* focusID */,

+    CARD8 /* revertTo */,

+    Time /* ctime */,

+    Bool /* followOK */);

+

+extern int GrabDevice(

+    ClientPtr /* client */,

+    DeviceIntPtr /* dev */,

+    unsigned /* this_mode */,

+    unsigned /* other_mode */,

+    Window /* grabWindow */,

+    unsigned /* ownerEvents */,

+    Time /* ctime */,

+    GrabMask* /* mask */,

+    int /* grabtype */,

+    Cursor /* curs */,

+    Window /* confineToWin */,

+    CARD8 * /* status */);

+

+extern void InitEvents(void);

+

+extern void CloseDownEvents(void);

+

+extern void DeleteWindowFromAnyEvents(

+    WindowPtr	/* pWin */,

+    Bool /* freeResources */);

+

+

+extern Mask EventMaskForClient(

+    WindowPtr /* pWin */,

+    ClientPtr /* client */);

+

+

+

+extern _X_EXPORT int DeliverEvents(

+    WindowPtr /*pWin*/,

+    xEventPtr /*xE*/,

+    int /*count*/,

+    WindowPtr /*otherParent*/);

+

+extern Bool CheckMotion(

+    DeviceEvent* /* ev */,

+    DeviceIntPtr /* pDev */);

+

+extern _X_EXPORT void WriteEventsToClient(

+    ClientPtr /*pClient*/,

+    int	     /*count*/,

+    xEventPtr /*events*/);

+

+extern _X_EXPORT int TryClientEvents(

+    ClientPtr /*client*/,

+    DeviceIntPtr /* device */,

+    xEventPtr /*pEvents*/,

+    int /*count*/,

+    Mask /*mask*/,

+    Mask /*filter*/,

+    GrabPtr /*grab*/);

+

+extern _X_EXPORT void WindowsRestructured(void);

+

+extern int SetClientPointer(

+        ClientPtr /* client */,

+        DeviceIntPtr /* device */);

+

+extern _X_EXPORT DeviceIntPtr PickPointer(

+    ClientPtr /* client */);

+

+extern _X_EXPORT DeviceIntPtr PickKeyboard(

+    ClientPtr /* client */);

+

+extern Bool IsInterferingGrab(

+        ClientPtr /* client */,

+        DeviceIntPtr /* dev */,

+        xEvent* /* events */);

+

+#ifdef PANORAMIX

+extern _X_EXPORT void ReinitializeRootWindow(WindowPtr win, int xoff, int yoff);

+#endif

+

+#ifdef RANDR

+extern _X_EXPORT void

+ScreenRestructured (ScreenPtr pScreen);

+#endif

+

+extern _X_EXPORT int ffs(int i);

+

+

+/*

+ *  ServerGrabCallback stuff

+ */

+

+extern _X_EXPORT CallbackListPtr ServerGrabCallback;

+

+typedef enum {SERVER_GRABBED, SERVER_UNGRABBED,

+	      CLIENT_PERVIOUS, CLIENT_IMPERVIOUS } ServerGrabState;

+

+typedef struct {

+    ClientPtr client;

+    ServerGrabState grabstate;

+} ServerGrabInfoRec;

+

+/*

+ *  EventCallback stuff

+ */

+

+extern _X_EXPORT CallbackListPtr EventCallback;

+

+typedef struct {

+    ClientPtr client;

+    xEventPtr events;

+    int count;

+} EventInfoRec;

+

+/*

+ *  DeviceEventCallback stuff

+ */

+

+extern _X_EXPORT CallbackListPtr DeviceEventCallback;

+

+typedef struct {

+    InternalEvent *event;

+    DeviceIntPtr device;

+} DeviceEventInfoRec;

+

+extern int XItoCoreType(int xi_type);

+extern Bool DevHasCursor(DeviceIntPtr pDev);

+extern Bool _X_EXPORT IsPointerDevice( DeviceIntPtr dev);

+extern Bool _X_EXPORT IsKeyboardDevice(DeviceIntPtr dev);

+extern Bool IsPointerEvent(InternalEvent *event);

+extern _X_EXPORT Bool IsMaster(DeviceIntPtr dev);

+extern _X_EXPORT Bool IsFloating(DeviceIntPtr dev);

+

+extern _X_HIDDEN void CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master);

+extern _X_HIDDEN int CorePointerProc(DeviceIntPtr dev, int what);

+extern _X_HIDDEN int CoreKeyboardProc(DeviceIntPtr dev, int what);

+

+

+/*

+ * These are deprecated compatibility functions and will be removed soon!

+ * Please use the noted replacements instead.

+ */

+/* replaced by dixLookupWindow */

+extern _X_EXPORT WindowPtr SecurityLookupWindow(

+    XID id,

+    ClientPtr client,

+    Mask access_mode);

+/* replaced by dixLookupWindow */

+extern _X_EXPORT WindowPtr LookupWindow(

+    XID id,

+    ClientPtr client);

+

+/* replaced by dixLookupDrawable */

+extern _X_EXPORT pointer SecurityLookupDrawable(

+    XID id,

+    ClientPtr client,

+    Mask access_mode);

+

+/* replaced by dixLookupDrawable */

+extern _X_EXPORT pointer LookupDrawable(

+    XID id,

+    ClientPtr client);

+

+/* replaced by dixLookupClient */

+extern _X_EXPORT ClientPtr LookupClient(

+    XID id,

+    ClientPtr client);

+

+#endif /* DIX_H */

diff --git a/xorg-server/include/dixstruct.h b/xorg-server/include/dixstruct.h
index fab9635d1..50430c81a 100644
--- a/xorg-server/include/dixstruct.h
+++ b/xorg-server/include/dixstruct.h
@@ -24,6 +24,7 @@ SOFTWARE.
 #ifndef DIXSTRUCT_H

 #define DIXSTRUCT_H

 

+#include "client.h"

 #include "dix.h"

 #include "resource.h"

 #include "cursor.h"

@@ -121,6 +122,7 @@ typedef struct _Client {
     long    smart_check_tick;

     

     DeviceIntPtr clientPtr;

+    ClientIdPtr  clientIds;

 }           ClientRec;

 

 /*

diff --git a/xorg-server/include/eventconvert.h b/xorg-server/include/eventconvert.h
index b1196a00e..9e63b46be 100644
--- a/xorg-server/include/eventconvert.h
+++ b/xorg-server/include/eventconvert.h
@@ -1,40 +1,40 @@
-/*
- * Copyright © 2009 Red Hat, Inc.
- *
- * 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 (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 NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS 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.
- *
- */
-
-#ifndef _EVENTCONVERT_H_
-#include <X11/X.h>
-#include <X11/extensions/XIproto.h>
-#include "input.h"
-#include "events.h"
-
-#define FP1616(integral, frac) ((integral) * (1 << 16) + (frac) * (1 << 16))
-
-_X_EXPORT int EventToCore(InternalEvent *event, xEvent *core);
-_X_EXPORT int EventToXI(InternalEvent *ev, xEvent **xi, int *count);
-_X_EXPORT int EventToXI2(InternalEvent *ev, xEvent **xi);
-_X_INTERNAL int GetCoreType(InternalEvent* ev);
-_X_INTERNAL int GetXIType(InternalEvent* ev);
-_X_INTERNAL int GetXI2Type(InternalEvent* ev);
-
-#endif /* _EVENTCONVERT_H_ */
+/*

+ * Copyright © 2009 Red Hat, Inc.

+ *

+ * 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 (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 NONINFRINGEMENT.  IN NO EVENT SHALL

+ * THE AUTHORS OR COPYRIGHT HOLDERS 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.

+ *

+ */

+

+#ifndef _EVENTCONVERT_H_

+#include <X11/X.h>

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

+#include "input.h"

+#include "events.h"

+

+#define FP1616(integral, frac) ((integral) * (1 << 16) + (frac) * (1 << 16))

+

+_X_EXPORT int EventToCore(InternalEvent *event, xEvent **core, int *count);

+_X_EXPORT int EventToXI(InternalEvent *ev, xEvent **xi, int *count);

+_X_EXPORT int EventToXI2(InternalEvent *ev, xEvent **xi);

+_X_INTERNAL int GetCoreType(InternalEvent* ev);

+_X_INTERNAL int GetXIType(InternalEvent* ev);

+_X_INTERNAL int GetXI2Type(InternalEvent* ev);

+

+#endif /* _EVENTCONVERT_H_ */

diff --git a/xorg-server/include/input.h b/xorg-server/include/input.h
index f96a0a988..2bf38d31d 100644
--- a/xorg-server/include/input.h
+++ b/xorg-server/include/input.h
@@ -1,589 +1,595 @@
-/************************************************************
-
-Copyright 1987, 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 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        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 Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL 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.
-
-********************************************************/
-
-#ifndef INPUT_H
-#define INPUT_H
-
-#include "misc.h"
-#include "screenint.h"
-#include <X11/Xmd.h>
-#include <X11/Xproto.h>
-#include <stdint.h>
-#include "window.h"     /* for WindowPtr */
-#include "xkbrules.h"
-#include "events.h"
-
-#define DEVICE_INIT	0
-#define DEVICE_ON	1
-#define DEVICE_OFF	2
-#define DEVICE_CLOSE	3
-
-#define POINTER_RELATIVE (1 << 1)
-#define POINTER_ABSOLUTE (1 << 2)
-#define POINTER_ACCELERATE (1 << 3)
-#define POINTER_SCREEN (1 << 4) /* Data in screen coordinates */
-
-/*int constants for pointer acceleration schemes*/
-#define PtrAccelNoOp            0
-#define PtrAccelPredictable     1
-#define PtrAccelLightweight     2
-#define PtrAccelDefault         PtrAccelPredictable
-
-#define MAX_VALUATORS 36
-/* Maximum number of valuators, divided by six, rounded up, to get number
- * of events. */
-#define MAX_VALUATOR_EVENTS 6
-#define MAX_BUTTONS 256 /* completely arbitrarily chosen */
-
-#define NO_AXIS_LIMITS -1
-
-#define MAP_LENGTH	256
-#define DOWN_LENGTH	32	/* 256/8 => number of bytes to hold 256 bits */
-#define NullGrab ((GrabPtr)NULL)
-#define PointerRootWin ((WindowPtr)PointerRoot)
-#define NoneWin ((WindowPtr)None)
-#define NullDevice ((DevicePtr)NULL)
-
-#ifndef FollowKeyboard
-#define FollowKeyboard 		3
-#endif
-#ifndef FollowKeyboardWin
-#define FollowKeyboardWin  ((WindowPtr) FollowKeyboard)
-#endif
-#ifndef RevertToFollowKeyboard
-#define RevertToFollowKeyboard	3
-#endif
-
-typedef unsigned long Leds;
-typedef struct _OtherClients *OtherClientsPtr;
-typedef struct _InputClients *InputClientsPtr;
-typedef struct _DeviceIntRec *DeviceIntPtr;
-typedef struct _ClassesRec *ClassesPtr;
-typedef struct _SpriteRec *SpritePtr;
-typedef union _GrabMask GrabMask;
-
-typedef struct _EventList {
-    xEvent* event;
-    int evlen; /* length of allocated memory for event in bytes.  This is not
-                  the actual length of the event. The event's actual length is
-                  32 for standard events or 32 +
-                  ((xGenericEvent*)event)->length * 4 for GenericEvents.
-                  For events in the EQ, the length is
-                  ((InternalEvent*)event)->u.any.length */
-} EventList, *EventListPtr;
-
-/* The DIX stores incoming input events in this list */
-extern EventListPtr InputEventList;
-extern int InputEventListLen;
-
-typedef int (*DeviceProc)(
-    DeviceIntPtr /*device*/,
-    int /*what*/);
-
-typedef void (*ProcessInputProc)(
-    InternalEvent * /*event*/,
-    DeviceIntPtr /*device*/);
-
-typedef Bool (*DeviceHandleProc)(
-    DeviceIntPtr /*device*/,
-    void* /*data*/
-    );
-
-typedef void (*DeviceUnwrapProc)(
-    DeviceIntPtr /*device*/,
-    DeviceHandleProc /*proc*/,
-    void* /*data*/
-    );
-
-/* pointer acceleration handling */
-typedef void (*PointerAccelSchemeProc)(
-    DeviceIntPtr /*pDev*/,
-    int /*first_valuator*/,
-    int /*num_valuators*/,
-    int* /*valuators*/,
-    int /*evtime*/);
-
-typedef void (*DeviceCallbackProc)(
-              DeviceIntPtr /*pDev*/);
-
-typedef struct _DeviceRec {
-    pointer	devicePrivate;
-    ProcessInputProc processInputProc;	/* current */
-    ProcessInputProc realInputProc;	/* deliver */
-    ProcessInputProc enqueueInputProc;	/* enqueue */
-    Bool	on;			/* used by DDX to keep state */
-} DeviceRec, *DevicePtr;
-
-typedef struct _ValuatorMask ValuatorMask;
-
-typedef struct {
-    int			click, bell, bell_pitch, bell_duration;
-    Bool		autoRepeat;
-    unsigned char	autoRepeats[32];
-    Leds		leds;
-    unsigned char	id;
-} KeybdCtrl;
-
-typedef struct {
-    KeySym  *map;
-    KeyCode minKeyCode,
-	    maxKeyCode;
-    int     mapWidth;
-} KeySymsRec, *KeySymsPtr;
-
-typedef struct {
-    int		num, den, threshold;
-    unsigned char id;
-} PtrCtrl;
-
-typedef struct {
-    int         resolution, min_value, max_value;
-    int         integer_displayed;
-    unsigned char id;
-} IntegerCtrl;
-
-typedef struct {
-    int         max_symbols, num_symbols_supported;
-    int         num_symbols_displayed;
-    KeySym      *symbols_supported;
-    KeySym      *symbols_displayed;
-    unsigned char id;
-} StringCtrl;
-
-typedef struct {
-    int         percent, pitch, duration;
-    unsigned char id;
-} BellCtrl;
-
-typedef struct {
-    Leds        led_values;
-    Mask        led_mask;
-    unsigned char id;
-} LedCtrl;
-
-extern _X_EXPORT KeybdCtrl	defaultKeyboardControl;
-extern _X_EXPORT PtrCtrl	defaultPointerControl;
-
-typedef struct _InputOption {
-    char                *key;
-    char                *value;
-    struct _InputOption *next;
-} InputOption;
-
-typedef struct _InputAttributes {
-    char                *product;
-    char                *vendor;
-    char                *device;
-    char                *pnp_id;
-    char                *usb_id;
-    char                **tags; /* null-terminated */
-    uint32_t            flags;
-} InputAttributes;
-
-#define ATTR_KEYBOARD (1<<0)
-#define ATTR_POINTER (1<<1)
-#define ATTR_JOYSTICK (1<<2)
-#define ATTR_TABLET (1<<3)
-#define ATTR_TOUCHPAD (1<<4)
-#define ATTR_TOUCHSCREEN (1<<5)
-
-/* Key/Button has been run through all input processing and events sent to clients. */
-#define KEY_PROCESSED 1
-#define BUTTON_PROCESSED 1
-/* Key/Button has not been fully processed, no events have been sent. */
-#define KEY_POSTED 2
-#define BUTTON_POSTED 2
-
-extern void set_key_down(DeviceIntPtr pDev, int key_code, int type);
-extern void set_key_up(DeviceIntPtr pDev, int key_code, int type);
-extern int key_is_down(DeviceIntPtr pDev, int key_code, int type);
-extern void set_button_down(DeviceIntPtr pDev, int button, int type);
-extern void set_button_up(DeviceIntPtr pDev, int button, int type);
-extern int button_is_down(DeviceIntPtr pDev, int button, int type);
-
-extern void InitCoreDevices(void);
-extern void InitXTestDevices(void);
-
-extern _X_EXPORT DeviceIntPtr AddInputDevice(
-    ClientPtr /*client*/,
-    DeviceProc /*deviceProc*/,
-    Bool /*autoStart*/);
-
-extern _X_EXPORT Bool EnableDevice(
-    DeviceIntPtr /*device*/,
-    BOOL /* sendevent */);
-
-extern _X_EXPORT Bool ActivateDevice(
-    DeviceIntPtr /*device*/,
-    BOOL /* sendevent */);
-
-extern _X_EXPORT Bool DisableDevice(
-    DeviceIntPtr /*device*/,
-    BOOL /* sendevent */);
-
-extern int InitAndStartDevices(void);
-
-extern void CloseDownDevices(void);
-
-extern void UndisplayDevices(void);
-
-extern _X_EXPORT int RemoveDevice(
-    DeviceIntPtr /*dev*/,
-    BOOL /* sendevent */);
-
-extern _X_EXPORT int NumMotionEvents(void);
-
-extern _X_EXPORT int dixLookupDevice(
-    DeviceIntPtr *         /* dev */,
-    int                    /* id */,
-    ClientPtr              /* client */,
-    Mask                   /* access_mode */);
-
-extern _X_EXPORT void QueryMinMaxKeyCodes(
-    KeyCode* /*minCode*/,
-    KeyCode* /*maxCode*/);
-
-extern _X_EXPORT Bool SetKeySymsMap(
-    KeySymsPtr /*dst*/,
-    KeySymsPtr /*src*/);
-
-extern _X_EXPORT Bool InitButtonClassDeviceStruct(
-    DeviceIntPtr /*device*/,
-    int /*numButtons*/,
-    Atom* /* labels */,
-    CARD8* /*map*/);
-
-extern _X_EXPORT Bool InitValuatorClassDeviceStruct(
-    DeviceIntPtr /*device*/,
-    int /*numAxes*/,
-    Atom* /* labels */,
-    int /*numMotionEvents*/,
-    int /*mode*/);
-
-extern _X_EXPORT Bool InitPointerAccelerationScheme(
-    DeviceIntPtr /*dev*/,
-    int /*scheme*/);
-
-extern _X_EXPORT Bool InitAbsoluteClassDeviceStruct(
-    DeviceIntPtr /*device*/);
-
-extern _X_EXPORT Bool InitFocusClassDeviceStruct(
-    DeviceIntPtr /*device*/);
-
-typedef void (*BellProcPtr)(
-    int /*percent*/,
-    DeviceIntPtr /*device*/,
-    pointer /*ctrl*/,
-    int);
-
-typedef void (*KbdCtrlProcPtr)(
-    DeviceIntPtr /*device*/,
-    KeybdCtrl * /*ctrl*/);
-
-typedef void (*PtrCtrlProcPtr)(
-    DeviceIntPtr /*device*/,
-    PtrCtrl * /*ctrl*/);
-
-extern _X_EXPORT Bool InitPtrFeedbackClassDeviceStruct(
-    DeviceIntPtr /*device*/,
-    PtrCtrlProcPtr /*controlProc*/);
-
-typedef void (*StringCtrlProcPtr)(
-    DeviceIntPtr /*device*/,
-    StringCtrl * /*ctrl*/);
-
-extern _X_EXPORT Bool InitStringFeedbackClassDeviceStruct(
-    DeviceIntPtr /*device*/,
-    StringCtrlProcPtr /*controlProc*/,
-    int /*max_symbols*/,
-    int /*num_symbols_supported*/,
-    KeySym* /*symbols*/);
-
-typedef void (*BellCtrlProcPtr)(
-    DeviceIntPtr /*device*/,
-    BellCtrl * /*ctrl*/);
-
-extern _X_EXPORT Bool InitBellFeedbackClassDeviceStruct(
-    DeviceIntPtr /*device*/,
-    BellProcPtr /*bellProc*/,
-    BellCtrlProcPtr /*controlProc*/);
-
-typedef void (*LedCtrlProcPtr)(
-    DeviceIntPtr /*device*/,
-    LedCtrl * /*ctrl*/);
-
-extern _X_EXPORT Bool InitLedFeedbackClassDeviceStruct(
-    DeviceIntPtr /*device*/,
-    LedCtrlProcPtr /*controlProc*/);
-
-typedef void (*IntegerCtrlProcPtr)(
-    DeviceIntPtr /*device*/,
-    IntegerCtrl * /*ctrl*/);
-
-
-extern _X_EXPORT Bool InitIntegerFeedbackClassDeviceStruct(
-    DeviceIntPtr /*device*/,
-    IntegerCtrlProcPtr /*controlProc*/);
-
-extern _X_EXPORT Bool InitPointerDeviceStruct(
-    DevicePtr /*device*/,
-    CARD8* /*map*/,
-    int /*numButtons*/,
-    Atom* /* btn_labels */,
-    PtrCtrlProcPtr /*controlProc*/,
-    int /*numMotionEvents*/,
-    int /*numAxes*/,
-    Atom* /* axes_labels */);
-
-extern _X_EXPORT Bool InitKeyboardDeviceStruct(
-    DeviceIntPtr /*device*/,
-    XkbRMLVOSet * /*rmlvo*/,
-    BellProcPtr /*bellProc*/,
-    KbdCtrlProcPtr /*controlProc*/);
-
-extern int ApplyPointerMapping(
-    DeviceIntPtr /* pDev */,
-    CARD8 *      /* map */,
-    int          /* len */,
-    ClientPtr	/* client */);
-
-extern Bool BadDeviceMap(
-    BYTE* /*buff*/,
-    int /*length*/,
-    unsigned /*low*/,
-    unsigned /*high*/,
-    XID* /*errval*/);
-
-extern void NoteLedState(
-    DeviceIntPtr /*keybd*/,
-    int /*led*/,
-    Bool /*on*/);
-
-extern void MaybeStopHint(
-    DeviceIntPtr /*device*/,
-    ClientPtr /*client*/);
-
-extern void ProcessPointerEvent(
-    InternalEvent* /* ev */,
-    DeviceIntPtr /*mouse*/);
-
-extern void ProcessKeyboardEvent(
-    InternalEvent* /*ev*/,
-    DeviceIntPtr   /*keybd*/);
-
-extern Bool LegalModifier(
-    unsigned int /*key*/, 
-    DeviceIntPtr /*pDev*/);
-
-extern _X_EXPORT void ProcessInputEvents(void);
-
-extern _X_EXPORT void InitInput(
-    int  /*argc*/,
-    char ** /*argv*/);
-extern _X_EXPORT void CloseInput(void);
-
-extern _X_EXPORT int GetMaximumEventsNum(void);
-
-extern _X_EXPORT int GetEventList(EventListPtr* list);
-extern _X_EXPORT EventListPtr InitEventList(int num_events);
-extern _X_EXPORT void FreeEventList(EventListPtr list, int num_events);
-
-extern void CreateClassesChangedEvent(EventListPtr event,
-                                      DeviceIntPtr master,
-                                      DeviceIntPtr slave,
-                                      int type);
-extern EventListPtr UpdateFromMaster(
-    EventListPtr events,
-    DeviceIntPtr pDev,
-    int type,
-    int *num_events);
-
-extern _X_EXPORT int GetPointerEvents(
-    EventListPtr events,
-    DeviceIntPtr pDev,
-    int type,
-    int buttons,
-    int flags,
-    const ValuatorMask *mask);
-
-extern _X_EXPORT int GetKeyboardEvents(
-    EventListPtr events,
-    DeviceIntPtr pDev,
-    int type,
-    int key_code);
-
-extern int GetKeyboardValuatorEvents(
-    EventListPtr events,
-    DeviceIntPtr pDev,
-    int type,
-    int key_code,
-    const ValuatorMask *mask);
-
-extern int GetProximityEvents(
-    EventListPtr events,
-    DeviceIntPtr pDev,
-    int type,
-    const ValuatorMask *mask);
-
-extern void PostSyntheticMotion(
-    DeviceIntPtr pDev,
-    int x,
-    int y,
-    int screen,
-    unsigned long time);
-
-extern _X_EXPORT int GetMotionHistorySize(
-    void);
-
-extern _X_EXPORT void AllocateMotionHistory(
-    DeviceIntPtr pDev);
-
-extern _X_EXPORT int GetMotionHistory(
-    DeviceIntPtr pDev,
-    xTimecoord **buff,
-    unsigned long start,
-    unsigned long stop,
-    ScreenPtr pScreen,
-    BOOL core);
-
-extern int AttachDevice(ClientPtr client,
-                        DeviceIntPtr slave,
-                        DeviceIntPtr master);
-
-extern _X_EXPORT DeviceIntPtr GetPairedDevice(DeviceIntPtr kbd);
-extern DeviceIntPtr GetMaster(DeviceIntPtr dev, int type);
-
-extern _X_EXPORT int AllocDevicePair(ClientPtr client,
-                             char* name,
-                             DeviceIntPtr* ptr,
-                             DeviceIntPtr* keybd,
-                             DeviceProc ptr_proc,
-                             DeviceProc keybd_proc,
-                             Bool master);
-extern void DeepCopyDeviceClasses(DeviceIntPtr from,
-                                  DeviceIntPtr to,
-                                  DeviceChangedEvent *dce);
-
-/* Helper functions. */
-extern _X_EXPORT int generate_modkeymap(ClientPtr client, DeviceIntPtr dev,
-                              KeyCode **modkeymap, int *max_keys_per_mod);
-extern int change_modmap(ClientPtr client, DeviceIntPtr dev, KeyCode *map,
-                         int max_keys_per_mod);
-extern int AllocXTestDevice(ClientPtr client,
-                             char* name,
-                             DeviceIntPtr* ptr,
-                             DeviceIntPtr* keybd,
-                             DeviceIntPtr master_ptr,
-                             DeviceIntPtr master_keybd);
-extern BOOL IsXTestDevice(DeviceIntPtr dev, DeviceIntPtr master);
-extern DeviceIntPtr GetXTestDevice(DeviceIntPtr master);
-extern void SendDevicePresenceEvent(int deviceid, int type);
-extern _X_EXPORT InputAttributes *DuplicateInputAttributes(InputAttributes *attrs);
-extern _X_EXPORT void FreeInputAttributes(InputAttributes *attrs);
-
-/* misc event helpers */
-extern Mask GetEventMask(DeviceIntPtr dev, xEvent* ev, InputClientsPtr clients);
-extern Mask GetEventFilter(DeviceIntPtr dev, xEvent *event);
-extern Mask GetWindowXI2Mask(DeviceIntPtr dev, WindowPtr win, xEvent* ev);
-void FixUpEventFromWindow(SpritePtr pSprite,
-                          xEvent *xE,
-                          WindowPtr pWin,
-                          Window child,
-                          Bool calcChild);
-extern WindowPtr XYToWindow(SpritePtr pSprite, int x, int y);
-extern int EventIsDeliverable(DeviceIntPtr dev, InternalEvent* event,
-                              WindowPtr win);
-/**
- * Return masks for EventIsDeliverable.
- * @defgroup EventIsDeliverable return flags
- * @{
- */
-#define XI_MASK                 (1 << 0) /**< XI mask set on window */
-#define CORE_MASK               (1 << 1) /**< Core mask set on window */
-#define DONT_PROPAGATE_MASK     (1 << 2) /**< DontPropagate mask set on window */
-#define XI2_MASK                (1 << 3) /**< XI2 mask set on window */
-/* @} */
-
-/* Implemented by the DDX. */
-extern _X_EXPORT int NewInputDeviceRequest(
-    InputOption *options,
-    InputAttributes *attrs,
-    DeviceIntPtr *dev);
-extern  _X_EXPORT void DeleteInputDeviceRequest(
-    DeviceIntPtr dev);
-
-extern _X_EXPORT void DDXRingBell(
-    int volume,
-    int pitch,
-    int duration);
-
-#define VALUATOR_MODE_ALL_AXES -1
-extern _X_HIDDEN int valuator_get_mode(DeviceIntPtr dev, int axis);
-extern _X_HIDDEN void valuator_set_mode(DeviceIntPtr dev, int axis, int mode);
-
-/* Set to TRUE by default - os/utils.c sets it to FALSE on user request,
-   xfixes/cursor.c uses it to determine if the cursor is enabled */
-extern Bool EnableCursor;
-
-extern _X_EXPORT ValuatorMask  *valuator_mask_new(int num_valuators);
-extern _X_EXPORT void valuator_mask_free(ValuatorMask **mask);
-extern _X_EXPORT void valuator_mask_set_range(ValuatorMask *mask,
-                                       int first_valuator, int num_valuators,
-                                       const int* valuators);
-extern _X_EXPORT void valuator_mask_set(ValuatorMask *mask,
-                                        int valuator,
-                                        int data);
-extern _X_EXPORT void valuator_mask_zero(ValuatorMask *mask);
-extern _X_EXPORT int valuator_mask_size(const ValuatorMask *mask);
-extern _X_EXPORT int valuator_mask_isset(const ValuatorMask *mask, int bit);
-extern _X_EXPORT void valuator_mask_unset(ValuatorMask *mask, int bit);
-extern _X_EXPORT int valuator_mask_num_valuators(const ValuatorMask *mask);
-extern _X_EXPORT void valuator_mask_copy(ValuatorMask *dest,
-                                         const ValuatorMask *src);
-extern _X_EXPORT int valuator_mask_get(const ValuatorMask *mask, int valnum);
-
-#endif /* INPUT_H */
+/************************************************************

+

+Copyright 1987, 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 1987 by Digital Equipment Corporation, Maynard, Massachusetts.

+

+                        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 Digital not be

+used in advertising or publicity pertaining to distribution of the

+software without specific, written prior permission.  

+

+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING

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

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

+

+********************************************************/

+

+#ifndef INPUT_H

+#define INPUT_H

+

+#include "misc.h"

+#include "screenint.h"

+#include <X11/Xmd.h>

+#include <X11/Xproto.h>

+#include <stdint.h>

+#include "window.h"     /* for WindowPtr */

+#include "xkbrules.h"

+#include "events.h"

+

+#define DEVICE_INIT	0

+#define DEVICE_ON	1

+#define DEVICE_OFF	2

+#define DEVICE_CLOSE	3

+

+#define POINTER_RELATIVE (1 << 1)

+#define POINTER_ABSOLUTE (1 << 2)

+#define POINTER_ACCELERATE (1 << 3)

+#define POINTER_SCREEN (1 << 4) /* Data in screen coordinates */

+

+/*int constants for pointer acceleration schemes*/

+#define PtrAccelNoOp            0

+#define PtrAccelPredictable     1

+#define PtrAccelLightweight     2

+#define PtrAccelDefault         PtrAccelPredictable

+

+#define MAX_VALUATORS 36

+/* Maximum number of valuators, divided by six, rounded up, to get number

+ * of events. */

+#define MAX_VALUATOR_EVENTS 6

+#define MAX_BUTTONS 256 /* completely arbitrarily chosen */

+

+#define NO_AXIS_LIMITS -1

+

+#define MAP_LENGTH	256

+#define DOWN_LENGTH	32	/* 256/8 => number of bytes to hold 256 bits */

+#define NullGrab ((GrabPtr)NULL)

+#define PointerRootWin ((WindowPtr)PointerRoot)

+#define NoneWin ((WindowPtr)None)

+#define NullDevice ((DevicePtr)NULL)

+

+#ifndef FollowKeyboard

+#define FollowKeyboard 		3

+#endif

+#ifndef FollowKeyboardWin

+#define FollowKeyboardWin  ((WindowPtr) FollowKeyboard)

+#endif

+#ifndef RevertToFollowKeyboard

+#define RevertToFollowKeyboard	3

+#endif

+

+typedef unsigned long Leds;

+typedef struct _OtherClients *OtherClientsPtr;

+typedef struct _InputClients *InputClientsPtr;

+typedef struct _DeviceIntRec *DeviceIntPtr;

+typedef struct _ClassesRec *ClassesPtr;

+typedef struct _SpriteRec *SpritePtr;

+typedef union _GrabMask GrabMask;

+

+typedef struct _EventList {

+    xEvent* event;

+    int evlen; /* length of allocated memory for event in bytes.  This is not

+                  the actual length of the event. The event's actual length is

+                  32 for standard events or 32 +

+                  ((xGenericEvent*)event)->length * 4 for GenericEvents.

+                  For events in the EQ, the length is

+                  ((InternalEvent*)event)->u.any.length */

+} EventList, *EventListPtr;

+

+/* The DIX stores incoming input events in this list */

+extern EventListPtr InputEventList;

+extern int InputEventListLen;

+

+typedef int (*DeviceProc)(

+    DeviceIntPtr /*device*/,

+    int /*what*/);

+

+typedef void (*ProcessInputProc)(

+    InternalEvent * /*event*/,

+    DeviceIntPtr /*device*/);

+

+typedef Bool (*DeviceHandleProc)(

+    DeviceIntPtr /*device*/,

+    void* /*data*/

+    );

+

+typedef void (*DeviceUnwrapProc)(

+    DeviceIntPtr /*device*/,

+    DeviceHandleProc /*proc*/,

+    void* /*data*/

+    );

+

+/* pointer acceleration handling */

+typedef void (*PointerAccelSchemeProc)(

+    DeviceIntPtr /*pDev*/,

+    int /*first_valuator*/,

+    int /*num_valuators*/,

+    int* /*valuators*/,

+    int /*evtime*/);

+

+typedef void (*DeviceCallbackProc)(

+              DeviceIntPtr /*pDev*/);

+

+struct _ValuatorAccelerationRec;

+typedef Bool (*PointerAccelSchemeInitProc)(

+              DeviceIntPtr /*dev*/,

+              struct _ValuatorAccelerationRec* /*protoScheme*/);

+

+typedef struct _DeviceRec {

+    pointer	devicePrivate;

+    ProcessInputProc processInputProc;	/* current */

+    ProcessInputProc realInputProc;	/* deliver */

+    ProcessInputProc enqueueInputProc;	/* enqueue */

+    Bool	on;			/* used by DDX to keep state */

+} DeviceRec, *DevicePtr;

+

+typedef struct _ValuatorMask ValuatorMask;

+

+typedef struct {

+    int			click, bell, bell_pitch, bell_duration;

+    Bool		autoRepeat;

+    unsigned char	autoRepeats[32];

+    Leds		leds;

+    unsigned char	id;

+} KeybdCtrl;

+

+typedef struct {

+    KeySym  *map;

+    KeyCode minKeyCode,

+	    maxKeyCode;

+    int     mapWidth;

+} KeySymsRec, *KeySymsPtr;

+

+typedef struct {

+    int		num, den, threshold;

+    unsigned char id;

+} PtrCtrl;

+

+typedef struct {

+    int         resolution, min_value, max_value;

+    int         integer_displayed;

+    unsigned char id;

+} IntegerCtrl;

+

+typedef struct {

+    int         max_symbols, num_symbols_supported;

+    int         num_symbols_displayed;

+    KeySym      *symbols_supported;

+    KeySym      *symbols_displayed;

+    unsigned char id;

+} StringCtrl;

+

+typedef struct {

+    int         percent, pitch, duration;

+    unsigned char id;

+} BellCtrl;

+

+typedef struct {

+    Leds        led_values;

+    Mask        led_mask;

+    unsigned char id;

+} LedCtrl;

+

+extern _X_EXPORT KeybdCtrl	defaultKeyboardControl;

+extern _X_EXPORT PtrCtrl	defaultPointerControl;

+

+typedef struct _InputOption {

+    char                *key;

+    char                *value;

+    struct _InputOption *next;

+} InputOption;

+

+typedef struct _InputAttributes {

+    char                *product;

+    char                *vendor;

+    char                *device;

+    char                *pnp_id;

+    char                *usb_id;

+    char                **tags; /* null-terminated */

+    uint32_t            flags;

+} InputAttributes;

+

+#define ATTR_KEYBOARD (1<<0)

+#define ATTR_POINTER (1<<1)

+#define ATTR_JOYSTICK (1<<2)

+#define ATTR_TABLET (1<<3)

+#define ATTR_TOUCHPAD (1<<4)

+#define ATTR_TOUCHSCREEN (1<<5)

+

+/* Key/Button has been run through all input processing and events sent to clients. */

+#define KEY_PROCESSED 1

+#define BUTTON_PROCESSED 1

+/* Key/Button has not been fully processed, no events have been sent. */

+#define KEY_POSTED 2

+#define BUTTON_POSTED 2

+

+extern void set_key_down(DeviceIntPtr pDev, int key_code, int type);

+extern void set_key_up(DeviceIntPtr pDev, int key_code, int type);

+extern int key_is_down(DeviceIntPtr pDev, int key_code, int type);

+extern void set_button_down(DeviceIntPtr pDev, int button, int type);

+extern void set_button_up(DeviceIntPtr pDev, int button, int type);

+extern int button_is_down(DeviceIntPtr pDev, int button, int type);

+

+extern void InitCoreDevices(void);

+extern void InitXTestDevices(void);

+

+extern _X_EXPORT DeviceIntPtr AddInputDevice(

+    ClientPtr /*client*/,

+    DeviceProc /*deviceProc*/,

+    Bool /*autoStart*/);

+

+extern _X_EXPORT Bool EnableDevice(

+    DeviceIntPtr /*device*/,

+    BOOL /* sendevent */);

+

+extern _X_EXPORT Bool ActivateDevice(

+    DeviceIntPtr /*device*/,

+    BOOL /* sendevent */);

+

+extern _X_EXPORT Bool DisableDevice(

+    DeviceIntPtr /*device*/,

+    BOOL /* sendevent */);

+

+extern int InitAndStartDevices(void);

+

+extern void CloseDownDevices(void);

+

+extern void UndisplayDevices(void);

+

+extern _X_EXPORT int RemoveDevice(

+    DeviceIntPtr /*dev*/,

+    BOOL /* sendevent */);

+

+extern _X_EXPORT int NumMotionEvents(void);

+

+extern _X_EXPORT int dixLookupDevice(

+    DeviceIntPtr *         /* dev */,

+    int                    /* id */,

+    ClientPtr              /* client */,

+    Mask                   /* access_mode */);

+

+extern _X_EXPORT void QueryMinMaxKeyCodes(

+    KeyCode* /*minCode*/,

+    KeyCode* /*maxCode*/);

+

+extern _X_EXPORT Bool SetKeySymsMap(

+    KeySymsPtr /*dst*/,

+    KeySymsPtr /*src*/);

+

+extern _X_EXPORT Bool InitButtonClassDeviceStruct(

+    DeviceIntPtr /*device*/,

+    int /*numButtons*/,

+    Atom* /* labels */,

+    CARD8* /*map*/);

+

+extern _X_EXPORT Bool InitValuatorClassDeviceStruct(

+    DeviceIntPtr /*device*/,

+    int /*numAxes*/,

+    Atom* /* labels */,

+    int /*numMotionEvents*/,

+    int /*mode*/);

+

+extern _X_EXPORT Bool InitPointerAccelerationScheme(

+    DeviceIntPtr /*dev*/,

+    int /*scheme*/);

+

+extern _X_EXPORT Bool InitAbsoluteClassDeviceStruct(

+    DeviceIntPtr /*device*/);

+

+extern _X_EXPORT Bool InitFocusClassDeviceStruct(

+    DeviceIntPtr /*device*/);

+

+typedef void (*BellProcPtr)(

+    int /*percent*/,

+    DeviceIntPtr /*device*/,

+    pointer /*ctrl*/,

+    int);

+

+typedef void (*KbdCtrlProcPtr)(

+    DeviceIntPtr /*device*/,

+    KeybdCtrl * /*ctrl*/);

+

+typedef void (*PtrCtrlProcPtr)(

+    DeviceIntPtr /*device*/,

+    PtrCtrl * /*ctrl*/);

+

+extern _X_EXPORT Bool InitPtrFeedbackClassDeviceStruct(

+    DeviceIntPtr /*device*/,

+    PtrCtrlProcPtr /*controlProc*/);

+

+typedef void (*StringCtrlProcPtr)(

+    DeviceIntPtr /*device*/,

+    StringCtrl * /*ctrl*/);

+

+extern _X_EXPORT Bool InitStringFeedbackClassDeviceStruct(

+    DeviceIntPtr /*device*/,

+    StringCtrlProcPtr /*controlProc*/,

+    int /*max_symbols*/,

+    int /*num_symbols_supported*/,

+    KeySym* /*symbols*/);

+

+typedef void (*BellCtrlProcPtr)(

+    DeviceIntPtr /*device*/,

+    BellCtrl * /*ctrl*/);

+

+extern _X_EXPORT Bool InitBellFeedbackClassDeviceStruct(

+    DeviceIntPtr /*device*/,

+    BellProcPtr /*bellProc*/,

+    BellCtrlProcPtr /*controlProc*/);

+

+typedef void (*LedCtrlProcPtr)(

+    DeviceIntPtr /*device*/,

+    LedCtrl * /*ctrl*/);

+

+extern _X_EXPORT Bool InitLedFeedbackClassDeviceStruct(

+    DeviceIntPtr /*device*/,

+    LedCtrlProcPtr /*controlProc*/);

+

+typedef void (*IntegerCtrlProcPtr)(

+    DeviceIntPtr /*device*/,

+    IntegerCtrl * /*ctrl*/);

+

+

+extern _X_EXPORT Bool InitIntegerFeedbackClassDeviceStruct(

+    DeviceIntPtr /*device*/,

+    IntegerCtrlProcPtr /*controlProc*/);

+

+extern _X_EXPORT Bool InitPointerDeviceStruct(

+    DevicePtr /*device*/,

+    CARD8* /*map*/,

+    int /*numButtons*/,

+    Atom* /* btn_labels */,

+    PtrCtrlProcPtr /*controlProc*/,

+    int /*numMotionEvents*/,

+    int /*numAxes*/,

+    Atom* /* axes_labels */);

+

+extern _X_EXPORT Bool InitKeyboardDeviceStruct(

+    DeviceIntPtr /*device*/,

+    XkbRMLVOSet * /*rmlvo*/,

+    BellProcPtr /*bellProc*/,

+    KbdCtrlProcPtr /*controlProc*/);

+

+extern int ApplyPointerMapping(

+    DeviceIntPtr /* pDev */,

+    CARD8 *      /* map */,

+    int          /* len */,

+    ClientPtr	/* client */);

+

+extern Bool BadDeviceMap(

+    BYTE* /*buff*/,

+    int /*length*/,

+    unsigned /*low*/,

+    unsigned /*high*/,

+    XID* /*errval*/);

+

+extern void NoteLedState(

+    DeviceIntPtr /*keybd*/,

+    int /*led*/,

+    Bool /*on*/);

+

+extern void MaybeStopHint(

+    DeviceIntPtr /*device*/,

+    ClientPtr /*client*/);

+

+extern void ProcessPointerEvent(

+    InternalEvent* /* ev */,

+    DeviceIntPtr /*mouse*/);

+

+extern void ProcessKeyboardEvent(

+    InternalEvent* /*ev*/,

+    DeviceIntPtr   /*keybd*/);

+

+extern Bool LegalModifier(

+    unsigned int /*key*/, 

+    DeviceIntPtr /*pDev*/);

+

+extern _X_EXPORT void ProcessInputEvents(void);

+

+extern _X_EXPORT void InitInput(

+    int  /*argc*/,

+    char ** /*argv*/);

+extern _X_EXPORT void CloseInput(void);

+

+extern _X_EXPORT int GetMaximumEventsNum(void);

+

+extern _X_EXPORT int GetEventList(EventListPtr* list);

+extern _X_EXPORT EventListPtr InitEventList(int num_events);

+extern _X_EXPORT void FreeEventList(EventListPtr list, int num_events);

+

+extern void CreateClassesChangedEvent(EventListPtr event,

+                                      DeviceIntPtr master,

+                                      DeviceIntPtr slave,

+                                      int type);

+extern EventListPtr UpdateFromMaster(

+    EventListPtr events,

+    DeviceIntPtr pDev,

+    int type,

+    int *num_events);

+

+extern _X_EXPORT int GetPointerEvents(

+    EventListPtr events,

+    DeviceIntPtr pDev,

+    int type,

+    int buttons,

+    int flags,

+    const ValuatorMask *mask);

+

+extern _X_EXPORT int GetKeyboardEvents(

+    EventListPtr events,

+    DeviceIntPtr pDev,

+    int type,

+    int key_code);

+

+extern int GetKeyboardValuatorEvents(

+    EventListPtr events,

+    DeviceIntPtr pDev,

+    int type,

+    int key_code,

+    const ValuatorMask *mask);

+

+extern int GetProximityEvents(

+    EventListPtr events,

+    DeviceIntPtr pDev,

+    int type,

+    const ValuatorMask *mask);

+

+extern void PostSyntheticMotion(

+    DeviceIntPtr pDev,

+    int x,

+    int y,

+    int screen,

+    unsigned long time);

+

+extern _X_EXPORT int GetMotionHistorySize(

+    void);

+

+extern _X_EXPORT void AllocateMotionHistory(

+    DeviceIntPtr pDev);

+

+extern _X_EXPORT int GetMotionHistory(

+    DeviceIntPtr pDev,

+    xTimecoord **buff,

+    unsigned long start,

+    unsigned long stop,

+    ScreenPtr pScreen,

+    BOOL core);

+

+extern int AttachDevice(ClientPtr client,

+                        DeviceIntPtr slave,

+                        DeviceIntPtr master);

+

+extern _X_EXPORT DeviceIntPtr GetPairedDevice(DeviceIntPtr kbd);

+extern DeviceIntPtr GetMaster(DeviceIntPtr dev, int type);

+

+extern _X_EXPORT int AllocDevicePair(ClientPtr client,

+                             char* name,

+                             DeviceIntPtr* ptr,

+                             DeviceIntPtr* keybd,

+                             DeviceProc ptr_proc,

+                             DeviceProc keybd_proc,

+                             Bool master);

+extern void DeepCopyDeviceClasses(DeviceIntPtr from,

+                                  DeviceIntPtr to,

+                                  DeviceChangedEvent *dce);

+

+/* Helper functions. */

+extern _X_EXPORT int generate_modkeymap(ClientPtr client, DeviceIntPtr dev,

+                              KeyCode **modkeymap, int *max_keys_per_mod);

+extern int change_modmap(ClientPtr client, DeviceIntPtr dev, KeyCode *map,

+                         int max_keys_per_mod);

+extern int AllocXTestDevice(ClientPtr client,

+                             char* name,

+                             DeviceIntPtr* ptr,

+                             DeviceIntPtr* keybd,

+                             DeviceIntPtr master_ptr,

+                             DeviceIntPtr master_keybd);

+extern BOOL IsXTestDevice(DeviceIntPtr dev, DeviceIntPtr master);

+extern DeviceIntPtr GetXTestDevice(DeviceIntPtr master);

+extern void SendDevicePresenceEvent(int deviceid, int type);

+extern _X_EXPORT InputAttributes *DuplicateInputAttributes(InputAttributes *attrs);

+extern _X_EXPORT void FreeInputAttributes(InputAttributes *attrs);

+

+/* misc event helpers */

+extern Mask GetEventMask(DeviceIntPtr dev, xEvent* ev, InputClientsPtr clients);

+extern Mask GetEventFilter(DeviceIntPtr dev, xEvent *event);

+extern Mask GetWindowXI2Mask(DeviceIntPtr dev, WindowPtr win, xEvent* ev);

+void FixUpEventFromWindow(SpritePtr pSprite,

+                          xEvent *xE,

+                          WindowPtr pWin,

+                          Window child,

+                          Bool calcChild);

+extern WindowPtr XYToWindow(SpritePtr pSprite, int x, int y);

+extern int EventIsDeliverable(DeviceIntPtr dev, InternalEvent* event,

+                              WindowPtr win);

+/**

+ * Masks specifying the type of event to deliver for an InternalEvent; used

+ * by EventIsDeliverable.

+ * @defgroup EventIsDeliverable return flags

+ * @{

+ */

+#define EVENT_XI1_MASK                (1 << 0) /**< XI1.x event */

+#define EVENT_CORE_MASK               (1 << 1) /**< Core event */

+#define EVENT_DONT_PROPAGATE_MASK     (1 << 2) /**< DontPropagate mask set */

+#define EVENT_XI2_MASK                (1 << 3) /**< XI2 mask set on window */

+/* @} */

+

+/* Implemented by the DDX. */

+extern _X_EXPORT int NewInputDeviceRequest(

+    InputOption *options,

+    InputAttributes *attrs,

+    DeviceIntPtr *dev);

+extern  _X_EXPORT void DeleteInputDeviceRequest(

+    DeviceIntPtr dev);

+

+extern _X_EXPORT void DDXRingBell(

+    int volume,

+    int pitch,

+    int duration);

+

+#define VALUATOR_MODE_ALL_AXES -1

+extern _X_HIDDEN int valuator_get_mode(DeviceIntPtr dev, int axis);

+extern _X_HIDDEN void valuator_set_mode(DeviceIntPtr dev, int axis, int mode);

+

+/* Set to TRUE by default - os/utils.c sets it to FALSE on user request,

+   xfixes/cursor.c uses it to determine if the cursor is enabled */

+extern Bool EnableCursor;

+

+extern _X_EXPORT ValuatorMask  *valuator_mask_new(int num_valuators);

+extern _X_EXPORT void valuator_mask_free(ValuatorMask **mask);

+extern _X_EXPORT void valuator_mask_set_range(ValuatorMask *mask,

+                                       int first_valuator, int num_valuators,

+                                       const int* valuators);

+extern _X_EXPORT void valuator_mask_set(ValuatorMask *mask,

+                                        int valuator,

+                                        int data);

+extern _X_EXPORT void valuator_mask_zero(ValuatorMask *mask);

+extern _X_EXPORT int valuator_mask_size(const ValuatorMask *mask);

+extern _X_EXPORT int valuator_mask_isset(const ValuatorMask *mask, int bit);

+extern _X_EXPORT void valuator_mask_unset(ValuatorMask *mask, int bit);

+extern _X_EXPORT int valuator_mask_num_valuators(const ValuatorMask *mask);

+extern _X_EXPORT void valuator_mask_copy(ValuatorMask *dest,

+                                         const ValuatorMask *src);

+extern _X_EXPORT int valuator_mask_get(const ValuatorMask *mask, int valnum);

+

+#endif /* INPUT_H */

diff --git a/xorg-server/include/inputstr.h b/xorg-server/include/inputstr.h
index b74ee0454..02c30d33e 100644
--- a/xorg-server/include/inputstr.h
+++ b/xorg-server/include/inputstr.h
@@ -1,615 +1,615 @@
-/************************************************************
-
-Copyright 1987, 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 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        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 Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL 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.
-
-********************************************************/
-
-
-#ifndef INPUTSTRUCT_H
-#define INPUTSTRUCT_H
-
-#include <pixman.h>
-#include "input.h"
-#include "window.h"
-#include "dixstruct.h"
-#include "cursorstr.h"
-#include "geext.h"
-#include "privates.h"
-
-#define BitIsOn(ptr, bit) (!!(((BYTE *) (ptr))[(bit)>>3] & (1 << ((bit) & 7))))
-#define SetBit(ptr, bit)  (((BYTE *) (ptr))[(bit)>>3] |= (1 << ((bit) & 7)))
-#define ClearBit(ptr, bit) (((BYTE *)(ptr))[(bit)>>3] &= ~(1 << ((bit) & 7)))
-extern _X_EXPORT int CountBits(const uint8_t *mask, int len);
-
-#define SameClient(obj,client) \
-	(CLIENT_BITS((obj)->resource) == (client)->clientAsMask)
-
-#define EMASKSIZE	MAXDEVICES + 2
-
-/* This is the last XI2 event supported by the server. If you add
- * events to the protocol, the server will not support these events until
- * this number here is bumped.
- */
-#define XI2LASTEVENT    17 /* XI_RawMotion */
-#define XI2MASKSIZE     ((XI2LASTEVENT + 7)/8) /* no of bits for masks */
-
-/**
- * This struct stores the core event mask for each client except the client
- * that created the window.
- *
- * Each window that has events selected from other clients has at least one of
- * these masks. If multiple clients selected for events on the same window,
- * these masks are in a linked list.
- *
- * The event mask for the client that created the window is stored in
- * win->eventMask instead.
- *
- * The resource id is simply a fake client ID to associate this mask with a
- * client.
- *
- * Kludge: OtherClients and InputClients must be compatible, see code.
- */
-typedef struct _OtherClients {
-    OtherClientsPtr	next; /**< Pointer to the next mask */
-    XID			resource; /**< id for putting into resource manager */
-    Mask		mask; /**< Core event mask */
-} OtherClients;
-
-/**
- * This struct stores the XI event mask for each client.
- *
- * Each window that has events selected has at least one of these masks. If
- * multiple client selected for events on the same window, these masks are in
- * a linked list.
- */
-typedef struct _InputClients {
-    InputClientsPtr	next; /**< Pointer to the next mask */
-    XID			resource; /**< id for putting into resource manager */
-    Mask		mask[EMASKSIZE]; /**< Actual XI event mask, deviceid is index */
-    /** XI2 event masks. One per device, each bit is a mask of (1 << type) */
-    unsigned char       xi2mask[EMASKSIZE][XI2MASKSIZE];
-} InputClients;
-
-/**
- * Combined XI event masks from all devices.
- *
- * This is the XI equivalent of the deliverableEvents, eventMask and
- * dontPropagate mask of the WindowRec (or WindowOptRec).
- *
- * A window that has an XI client selecting for events has exactly one
- * OtherInputMasks struct and exactly one InputClients struct hanging off
- * inputClients. Each further client appends to the inputClients list.
- * Each Mask field is per-device, with the device id as the index.
- * Exception: for non-device events (Presence events), the MAXDEVICES
- * deviceid is used.
- */
-typedef struct _OtherInputMasks {
-    /**
-     * Bitwise OR of all masks by all clients and the window's parent's masks.
-     */
-    Mask		deliverableEvents[EMASKSIZE];
-    /**
-     * Bitwise OR of all masks by all clients on this window.
-     */
-    Mask		inputEvents[EMASKSIZE];
-    /** The do-not-propagate masks for each device. */
-    Mask		dontPropagateMask[EMASKSIZE];
-    /** The clients that selected for events */
-    InputClientsPtr	inputClients;
-    /* XI2 event masks. One per device, each bit is a mask of (1 << type) */
-    unsigned char       xi2mask[EMASKSIZE][XI2MASKSIZE];
-} OtherInputMasks;
-
-/*
- * The following structure gets used for both active and passive grabs. For
- * active grabs some of the fields (e.g. modifiers) are not used. However,
- * that is not much waste since there aren't many active grabs (one per
- * keyboard/pointer device) going at once in the server.
- */
-
-#define MasksPerDetailMask 8		/* 256 keycodes and 256 possible
-                                           modifier combinations, but only	
-                                           3 buttons. */
-
-typedef struct _DetailRec {		/* Grab details may be bit masks */
-    unsigned int        exact;
-    Mask                *pMask;
-} DetailRec;
-
-typedef enum {
-    GRABTYPE_CORE,
-    GRABTYPE_XI,
-    GRABTYPE_XI2
-} GrabType;
-
-union _GrabMask {
-    Mask core;
-    Mask xi;
-    char xi2mask[EMASKSIZE][XI2MASKSIZE];
-};
-
-/**
- * Central struct for device grabs. 
- * The same struct is used for both core grabs and device grabs, with
- * different fields being set. 
- * If the grab is a core grab (GrabPointer/GrabKeyboard), then the eventMask
- * is a combination of standard event masks (i.e. PointerMotionMask |
- * ButtonPressMask).
- * If the grab is a device grab (GrabDevice), then the eventMask is a
- * combination of event masks for a given XI event type (see SetEventInfo).
- *
- * If the grab is a result of a ButtonPress, then eventMask is the core mask
- * and deviceMask is set to the XI event mask for the grab.
- */
-typedef struct _GrabRec {
-    GrabPtr		next;		/* for chain of passive grabs */
-    XID			resource;
-    DeviceIntPtr	device;
-    WindowPtr		window;
-    unsigned		ownerEvents:1;
-    unsigned		keyboardMode:1;
-    unsigned		pointerMode:1;
-    GrabType		grabtype;
-    CARD8		type;		/* event type */
-    DetailRec		modifiersDetail;
-    DeviceIntPtr	modifierDevice;
-    DetailRec		detail;		/* key or button */
-    WindowPtr		confineTo;	/* always NULL for keyboards */
-    CursorPtr		cursor;		/* always NULL for keyboards */
-    Mask		eventMask;
-    Mask                deviceMask;     
-    /* XI2 event masks. One per device, each bit is a mask of (1 << type) */
-    unsigned char       xi2mask[EMASKSIZE][XI2MASKSIZE];
-} GrabRec;
-
-/**
- * Sprite information for a device.
- */
-typedef struct _SpriteRec {
-    CursorPtr	current;
-    BoxRec	hotLimits;	/* logical constraints of hot spot */
-    Bool	confined;	/* confined to screen */
-    RegionPtr	hotShape;	/* additional logical shape constraint */
-    BoxRec	physLimits;	/* physical constraints of hot spot */
-    WindowPtr	win;		/* window of logical position */
-    HotSpot	hot;		/* logical pointer position */
-    HotSpot	hotPhys;	/* physical pointer position */
-#ifdef PANORAMIX
-    ScreenPtr	screen;		/* all others are in Screen 0 coordinates */
-    RegionRec   Reg1;	        /* Region 1 for confining motion */
-    RegionRec   Reg2;		/* Region 2 for confining virtual motion */
-    WindowPtr   windows[MAXSCREENS];
-    WindowPtr	confineWin;	/* confine window */
-#endif
-    /* The window trace information is used at dix/events.c to avoid having
-     * to compute all the windows between the root and the current pointer
-     * window each time a button or key goes down. The grabs on each of those
-     * windows must be checked.
-     * spriteTraces should only be used at dix/events.c! */
-    WindowPtr *spriteTrace;
-    int spriteTraceSize;
-    int spriteTraceGood;
-
-    /* Due to delays between event generation and event processing, it is
-     * possible that the pointer has crossed screen boundaries between the
-     * time in which it begins generating events and the time when
-     * those events are processed.
-     *
-     * pEnqueueScreen: screen the pointer was on when the event was generated
-     * pDequeueScreen: screen the pointer was on when the event is processed
-     */
-    ScreenPtr pEnqueueScreen;
-    ScreenPtr pDequeueScreen;
-
-} SpriteRec;
-
-typedef struct _KeyClassRec {
-    int			sourceid;
-    CARD8		down[DOWN_LENGTH];
-    CARD8		postdown[DOWN_LENGTH];
-    int                 modifierKeyCount[8];
-    struct _XkbSrvInfo *xkbInfo;
-} KeyClassRec, *KeyClassPtr;
-
-typedef struct _AxisInfo {
-    int		resolution;
-    int		min_resolution;
-    int		max_resolution;
-    int		min_value;
-    int		max_value;
-    Atom	label;
-    CARD8	mode;
-} AxisInfo, *AxisInfoPtr;
-
-typedef struct _ValuatorAccelerationRec {
-    int                         number;
-    PointerAccelSchemeProc      AccelSchemeProc;
-    void                       *accelData; /* at disposal of AccelScheme */
-    DeviceCallbackProc          AccelCleanupProc;
-} ValuatorAccelerationRec, *ValuatorAccelerationPtr;
-
-typedef struct _ValuatorClassRec {
-    int                   sourceid;
-    int		 	  numMotionEvents;
-    int                   first_motion;
-    int                   last_motion;
-    void                  *motion; /* motion history buffer. Different layout
-                                      for MDs and SDs!*/
-    WindowPtr             motionHintWindow;
-
-    AxisInfoPtr 	  axes;
-    unsigned short	  numAxes;
-    double		  *axisVal; /* always absolute, but device-coord system */
-    ValuatorAccelerationRec	accelScheme;
-} ValuatorClassRec, *ValuatorClassPtr;
-
-typedef struct _ButtonClassRec {
-    int			sourceid;
-    CARD8		numButtons;
-    CARD8		buttonsDown;	/* number of buttons currently down
-                                           This counts logical buttons, not
-					   physical ones, i.e if some buttons
-					   are mapped to 0, they're not counted
-					   here */
-    unsigned short	state;
-    Mask		motionMask;
-    CARD8		down[DOWN_LENGTH];
-    CARD8		postdown[DOWN_LENGTH];
-    CARD8		map[MAP_LENGTH];
-    union _XkbAction    *xkb_acts;
-    Atom		labels[MAX_BUTTONS];
-} ButtonClassRec, *ButtonClassPtr;
-
-typedef struct _FocusClassRec {
-    int		sourceid;
-    WindowPtr	win; /* May be set to a int constant (e.g. PointerRootWin)! */
-    int		revert;
-    TimeStamp	time;
-    WindowPtr	*trace;
-    int		traceSize;
-    int		traceGood;
-} FocusClassRec, *FocusClassPtr;
-
-typedef struct _ProximityClassRec {
-    int		sourceid;
-    char	in_proximity;
-} ProximityClassRec, *ProximityClassPtr;
-
-typedef struct _AbsoluteClassRec {
-    int         sourceid;
-    /* Calibration. */
-    int         min_x;
-    int         max_x;
-    int         min_y;
-    int         max_y;
-    int         flip_x;
-    int         flip_y;
-    int		rotation;
-    int         button_threshold;
-
-    /* Area. */
-    int         offset_x;
-    int         offset_y;
-    int         width;
-    int         height;
-    int         screen;
-    XID		following;
-} AbsoluteClassRec, *AbsoluteClassPtr;
-
-typedef struct _KbdFeedbackClassRec *KbdFeedbackPtr;
-typedef struct _PtrFeedbackClassRec *PtrFeedbackPtr;
-typedef struct _IntegerFeedbackClassRec *IntegerFeedbackPtr;
-typedef struct _StringFeedbackClassRec *StringFeedbackPtr;
-typedef struct _BellFeedbackClassRec *BellFeedbackPtr;
-typedef struct _LedFeedbackClassRec *LedFeedbackPtr;
-
-typedef struct _KbdFeedbackClassRec {
-    BellProcPtr		BellProc;
-    KbdCtrlProcPtr	CtrlProc;
-    KeybdCtrl	 	ctrl;
-    KbdFeedbackPtr	next;
-    struct _XkbSrvLedInfo *xkb_sli;
-} KbdFeedbackClassRec;
-
-typedef struct _PtrFeedbackClassRec {
-    PtrCtrlProcPtr	CtrlProc;
-    PtrCtrl		ctrl;
-    PtrFeedbackPtr	next;
-} PtrFeedbackClassRec;
-
-typedef struct _IntegerFeedbackClassRec {
-    IntegerCtrlProcPtr	CtrlProc;
-    IntegerCtrl	 	ctrl;
-    IntegerFeedbackPtr	next;
-} IntegerFeedbackClassRec;
-
-typedef struct _StringFeedbackClassRec {
-    StringCtrlProcPtr	CtrlProc;
-    StringCtrl	 	ctrl;
-    StringFeedbackPtr	next;
-} StringFeedbackClassRec;
-
-typedef struct _BellFeedbackClassRec {
-    BellProcPtr		BellProc;
-    BellCtrlProcPtr	CtrlProc;
-    BellCtrl	 	ctrl;
-    BellFeedbackPtr	next;
-} BellFeedbackClassRec;
-
-typedef struct _LedFeedbackClassRec {
-    LedCtrlProcPtr	CtrlProc;
-    LedCtrl	 	ctrl;
-    LedFeedbackPtr	next;
-    struct _XkbSrvLedInfo *xkb_sli;
-} LedFeedbackClassRec;
-
-
-typedef struct _ClassesRec {
-    KeyClassPtr		key;
-    ValuatorClassPtr	valuator;
-    ButtonClassPtr	button;
-    FocusClassPtr	focus;
-    ProximityClassPtr	proximity;
-    AbsoluteClassPtr    absolute;
-    KbdFeedbackPtr	kbdfeed;
-    PtrFeedbackPtr	ptrfeed;
-    IntegerFeedbackPtr	intfeed;
-    StringFeedbackPtr	stringfeed;
-    BellFeedbackPtr	bell;
-    LedFeedbackPtr	leds;
-} ClassesRec;
-
-
-/* Device properties */
-typedef struct _XIPropertyValue
-{
-    Atom                type;           /* ignored by server */
-    short               format;         /* format of data for swapping - 8,16,32 */
-    long                size;           /* size of data in (format/8) bytes */
-    pointer             data;           /* private to client */
-} XIPropertyValueRec;
-
-typedef struct _XIProperty
-{
-    struct _XIProperty   *next;
-    Atom                  propertyName;
-    BOOL                  deletable;    /* clients can delete this prop? */
-    XIPropertyValueRec    value;
-} XIPropertyRec;
-
-typedef XIPropertyRec      *XIPropertyPtr;
-typedef XIPropertyValueRec *XIPropertyValuePtr;
-
-
-typedef struct _XIPropertyHandler
-{
-    struct _XIPropertyHandler* next;
-    long id;
-    int (*SetProperty) (DeviceIntPtr dev,
-                        Atom property,
-                        XIPropertyValuePtr prop,
-                        BOOL checkonly);
-    int (*GetProperty) (DeviceIntPtr dev,
-                        Atom property);
-    int (*DeleteProperty) (DeviceIntPtr dev,
-                           Atom property);
-} XIPropertyHandler, *XIPropertyHandlerPtr;
-
-/* states for devices */
-
-#define NOT_GRABBED		0
-#define THAWED			1
-#define THAWED_BOTH		2	/* not a real state */
-#define FREEZE_NEXT_EVENT	3
-#define FREEZE_BOTH_NEXT_EVENT	4
-#define FROZEN			5	/* any state >= has device frozen */
-#define FROZEN_NO_EVENT		5
-#define FROZEN_WITH_EVENT	6
-#define THAW_OTHERS		7
-
-
-typedef struct _GrabInfoRec {
-    TimeStamp	    grabTime;
-    Bool            fromPassiveGrab;    /* true if from passive grab */
-    Bool            implicitGrab;       /* implicit from ButtonPress */
-    GrabRec         activeGrab;
-    GrabPtr         grab;
-    CARD8           activatingKey;
-    void	    (*ActivateGrab) (
-                    DeviceIntPtr /*device*/,
-                    GrabPtr /*grab*/,
-                    TimeStamp /*time*/,
-                    Bool /*autoGrab*/);
-    void	    (*DeactivateGrab)(
-                    DeviceIntPtr /*device*/);
-    struct {
-	Bool		frozen;
-	int		state;
-	GrabPtr		other;		/* if other grab has this frozen */
-	DeviceEvent	*event;		/* saved to be replayed */
-    } sync;
-} GrabInfoRec, *GrabInfoPtr;
-
-typedef struct _SpriteInfoRec {
-    /* sprite must always point to a valid sprite. For devices sharing the
-     * sprite, let sprite point to a paired spriteOwner's sprite. */
-    SpritePtr           sprite;      /* sprite information */
-    Bool                spriteOwner; /* True if device owns the sprite */
-    DeviceIntPtr        paired;      /* The paired device. Keyboard if
-                                        spriteOwner is TRUE, otherwise the
-                                        pointer that owns the sprite. */ 
-
-    /* keep states for animated cursor */
-    struct {
-        CursorPtr       pCursor;
-        ScreenPtr       pScreen;
-        int             elt;
-        CARD32          time;
-    } anim;
-} SpriteInfoRec, *SpriteInfoPtr;
-
-/* device types */
-#define MASTER_POINTER          1
-#define MASTER_KEYBOARD         2
-#define SLAVE                   3
-
-typedef struct _DeviceIntRec {
-    DeviceRec	public;
-    DeviceIntPtr next;
-    Bool	startup;		/* true if needs to be turned on at
-				          server intialization time */
-    DeviceProc	deviceProc;		/* proc(DevicePtr, DEVICE_xx). It is
-					  used to initialize, turn on, or
-					  turn off the device */
-    Bool	inited;			/* TRUE if INIT returns Success */
-    Bool        enabled;                /* TRUE if ON returns Success */
-    Bool        coreEvents;             /* TRUE if device also sends core */
-    GrabInfoRec deviceGrab;             /* grab on the device */
-    int         type;                   /* MASTER_POINTER, MASTER_KEYBOARD, SLAVE */
-    Atom		xinput_type;
-    char		*name;
-    int			id;
-    KeyClassPtr		key;
-    ValuatorClassPtr	valuator;
-    ButtonClassPtr	button;
-    FocusClassPtr	focus;
-    ProximityClassPtr	proximity;
-    AbsoluteClassPtr    absolute;
-    KbdFeedbackPtr	kbdfeed;
-    PtrFeedbackPtr	ptrfeed;
-    IntegerFeedbackPtr	intfeed;
-    StringFeedbackPtr	stringfeed;
-    BellFeedbackPtr	bell;
-    LedFeedbackPtr	leds;
-    struct _XkbInterest *xkb_interest;
-    char                *config_info; /* used by the hotplug layer */
-    ClassesPtr		unused_classes; /* for master devices */
-    int			saved_master_id;	/* for slaves while grabbed */
-    PrivateRec		*devPrivates;
-    DeviceUnwrapProc    unwrapProc;
-    SpriteInfoPtr       spriteInfo;
-    union {
-        DeviceIntPtr        master;     /* master device */
-        DeviceIntPtr        lastSlave;  /* last slave device used */
-    } u;
-
-    /* last valuator values recorded, not posted to client;
-     * for slave devices, valuators is in device coordinates
-     * for master devices, valuators is in screen coordinates
-     * see dix/getevents.c
-     * remainder supports acceleration
-     */
-    struct {
-        int             valuators[MAX_VALUATORS];
-        float           remainder[MAX_VALUATORS];
-        int             numValuators;
-        DeviceIntPtr    slave;
-    } last;
-
-    /* Input device property handling. */
-    struct {
-        XIPropertyPtr   properties;
-        XIPropertyHandlerPtr handlers; /* NULL-terminated */
-    } properties;
-
-    /* coordinate transformation matrix for absolute input devices */
-    struct pixman_f_transform transform;
-
-    /* XTest related master device id */
-    int xtest_master_id;
-} DeviceIntRec;
-
-typedef struct {
-    int			numDevices;	/* total number of devices */
-    DeviceIntPtr	devices;	/* all devices turned on */
-    DeviceIntPtr	off_devices;	/* all devices turned off */
-    DeviceIntPtr	keyboard;	/* the main one for the server */
-    DeviceIntPtr	pointer;
-    DeviceIntPtr	all_devices;
-    DeviceIntPtr	all_master_devices;
-} InputInfo;
-
-extern _X_EXPORT InputInfo inputInfo;
-
-/* for keeping the events for devices grabbed synchronously */
-typedef struct _QdEvent *QdEventPtr;
-typedef struct _QdEvent {
-    QdEventPtr		next;
-    DeviceIntPtr	device;
-    ScreenPtr		pScreen;	/* what screen the pointer was on */
-    unsigned long	months;		/* milliseconds is in the event */
-    InternalEvent	*event;
-} QdEventRec;
-
-/**
- * syncEvents is the global structure for queued events.
- *
- * Devices can be frozen through GrabModeSync pointer grabs. If this is the
- * case, events from these devices are added to "pending" instead of being
- * processed normally. When the device is unfrozen, events in "pending" are
- * replayed and processed as if they would come from the device directly.
- */
-typedef struct _EventSyncInfo {
-    QdEventPtr          pending, /**<  list of queued events */
-                        *pendtail; /**< last event in list */
-    /** The device to replay events for. Only set in AllowEvents(), in which
-     * case it is set to the device specified in the request. */
-    DeviceIntPtr        replayDev;      /* kludgy rock to put flag for */
-
-    /**
-     * The window the events are supposed to be replayed on.
-     * This window may be set to the grab's window (but only when
-     * Replay{Pointer|Keyboard} is given in the XAllowEvents()
-     * request. */
-    WindowPtr           replayWin;      /*   ComputeFreezes            */
-    /**
-     * Flag to indicate whether we're in the process of
-     * replaying events. Only set in ComputeFreezes(). */
-    Bool                playingEvents;
-    TimeStamp           time;
-} EventSyncInfoRec, *EventSyncInfoPtr;
-
-extern EventSyncInfoRec syncEvents;
-
-#endif /* INPUTSTRUCT_H */
+/************************************************************

+

+Copyright 1987, 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 1987 by Digital Equipment Corporation, Maynard, Massachusetts.

+

+                        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 Digital not be

+used in advertising or publicity pertaining to distribution of the

+software without specific, written prior permission.  

+

+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING

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

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

+

+********************************************************/

+

+

+#ifndef INPUTSTRUCT_H

+#define INPUTSTRUCT_H

+

+#include <pixman.h>

+#include "input.h"

+#include "window.h"

+#include "dixstruct.h"

+#include "cursorstr.h"

+#include "geext.h"

+#include "privates.h"

+

+#define BitIsOn(ptr, bit) (!!(((BYTE *) (ptr))[(bit)>>3] & (1 << ((bit) & 7))))

+#define SetBit(ptr, bit)  (((BYTE *) (ptr))[(bit)>>3] |= (1 << ((bit) & 7)))

+#define ClearBit(ptr, bit) (((BYTE *)(ptr))[(bit)>>3] &= ~(1 << ((bit) & 7)))

+extern _X_EXPORT int CountBits(const uint8_t *mask, int len);

+

+#define SameClient(obj,client) \

+	(CLIENT_BITS((obj)->resource) == (client)->clientAsMask)

+

+#define EMASKSIZE	MAXDEVICES + 2

+

+/* This is the last XI2 event supported by the server. If you add

+ * events to the protocol, the server will not support these events until

+ * this number here is bumped.

+ */

+#define XI2LASTEVENT    17 /* XI_RawMotion */

+#define XI2MASKSIZE     ((XI2LASTEVENT + 7)/8) /* no of bits for masks */

+

+/**

+ * This struct stores the core event mask for each client except the client

+ * that created the window.

+ *

+ * Each window that has events selected from other clients has at least one of

+ * these masks. If multiple clients selected for events on the same window,

+ * these masks are in a linked list.

+ *

+ * The event mask for the client that created the window is stored in

+ * win->eventMask instead.

+ *

+ * The resource id is simply a fake client ID to associate this mask with a

+ * client.

+ *

+ * Kludge: OtherClients and InputClients must be compatible, see code.

+ */

+typedef struct _OtherClients {

+    OtherClientsPtr	next; /**< Pointer to the next mask */

+    XID			resource; /**< id for putting into resource manager */

+    Mask		mask; /**< Core event mask */

+} OtherClients;

+

+/**

+ * This struct stores the XI event mask for each client.

+ *

+ * Each window that has events selected has at least one of these masks. If

+ * multiple client selected for events on the same window, these masks are in

+ * a linked list.

+ */

+typedef struct _InputClients {

+    InputClientsPtr	next; /**< Pointer to the next mask */

+    XID			resource; /**< id for putting into resource manager */

+    Mask		mask[EMASKSIZE]; /**< Actual XI event mask, deviceid is index */

+    /** XI2 event masks. One per device, each bit is a mask of (1 << type) */

+    unsigned char       xi2mask[EMASKSIZE][XI2MASKSIZE];

+} InputClients;

+

+/**

+ * Combined XI event masks from all devices.

+ *

+ * This is the XI equivalent of the deliverableEvents, eventMask and

+ * dontPropagate mask of the WindowRec (or WindowOptRec).

+ *

+ * A window that has an XI client selecting for events has exactly one

+ * OtherInputMasks struct and exactly one InputClients struct hanging off

+ * inputClients. Each further client appends to the inputClients list.

+ * Each Mask field is per-device, with the device id as the index.

+ * Exception: for non-device events (Presence events), the MAXDEVICES

+ * deviceid is used.

+ */

+typedef struct _OtherInputMasks {

+    /**

+     * Bitwise OR of all masks by all clients and the window's parent's masks.

+     */

+    Mask		deliverableEvents[EMASKSIZE];

+    /**

+     * Bitwise OR of all masks by all clients on this window.

+     */

+    Mask		inputEvents[EMASKSIZE];

+    /** The do-not-propagate masks for each device. */

+    Mask		dontPropagateMask[EMASKSIZE];

+    /** The clients that selected for events */

+    InputClientsPtr	inputClients;

+    /* XI2 event masks. One per device, each bit is a mask of (1 << type) */

+    unsigned char       xi2mask[EMASKSIZE][XI2MASKSIZE];

+} OtherInputMasks;

+

+/*

+ * The following structure gets used for both active and passive grabs. For

+ * active grabs some of the fields (e.g. modifiers) are not used. However,

+ * that is not much waste since there aren't many active grabs (one per

+ * keyboard/pointer device) going at once in the server.

+ */

+

+#define MasksPerDetailMask 8		/* 256 keycodes and 256 possible

+                                           modifier combinations, but only	

+                                           3 buttons. */

+

+typedef struct _DetailRec {		/* Grab details may be bit masks */

+    unsigned int        exact;

+    Mask                *pMask;

+} DetailRec;

+

+typedef enum {

+    GRABTYPE_CORE,

+    GRABTYPE_XI,

+    GRABTYPE_XI2

+} GrabType;

+

+union _GrabMask {

+    Mask core;

+    Mask xi;

+    char xi2mask[EMASKSIZE][XI2MASKSIZE];

+};

+

+/**

+ * Central struct for device grabs. 

+ * The same struct is used for both core grabs and device grabs, with

+ * different fields being set. 

+ * If the grab is a core grab (GrabPointer/GrabKeyboard), then the eventMask

+ * is a combination of standard event masks (i.e. PointerMotionMask |

+ * ButtonPressMask).

+ * If the grab is a device grab (GrabDevice), then the eventMask is a

+ * combination of event masks for a given XI event type (see SetEventInfo).

+ *

+ * If the grab is a result of a ButtonPress, then eventMask is the core mask

+ * and deviceMask is set to the XI event mask for the grab.

+ */

+typedef struct _GrabRec {

+    GrabPtr		next;		/* for chain of passive grabs */

+    XID			resource;

+    DeviceIntPtr	device;

+    WindowPtr		window;

+    unsigned		ownerEvents:1;

+    unsigned		keyboardMode:1;

+    unsigned		pointerMode:1;

+    GrabType		grabtype;

+    CARD8		type;		/* event type */

+    DetailRec		modifiersDetail;

+    DeviceIntPtr	modifierDevice;

+    DetailRec		detail;		/* key or button */

+    WindowPtr		confineTo;	/* always NULL for keyboards */

+    CursorPtr		cursor;		/* always NULL for keyboards */

+    Mask		eventMask;

+    Mask                deviceMask;     

+    /* XI2 event masks. One per device, each bit is a mask of (1 << type) */

+    unsigned char       xi2mask[EMASKSIZE][XI2MASKSIZE];

+} GrabRec;

+

+/**

+ * Sprite information for a device.

+ */

+typedef struct _SpriteRec {

+    CursorPtr	current;

+    BoxRec	hotLimits;	/* logical constraints of hot spot */

+    Bool	confined;	/* confined to screen */

+    RegionPtr	hotShape;	/* additional logical shape constraint */

+    BoxRec	physLimits;	/* physical constraints of hot spot */

+    WindowPtr	win;		/* window of logical position */

+    HotSpot	hot;		/* logical pointer position */

+    HotSpot	hotPhys;	/* physical pointer position */

+#ifdef PANORAMIX

+    ScreenPtr	screen;		/* all others are in Screen 0 coordinates */

+    RegionRec   Reg1;	        /* Region 1 for confining motion */

+    RegionRec   Reg2;		/* Region 2 for confining virtual motion */

+    WindowPtr   windows[MAXSCREENS];

+    WindowPtr	confineWin;	/* confine window */

+#endif

+    /* The window trace information is used at dix/events.c to avoid having

+     * to compute all the windows between the root and the current pointer

+     * window each time a button or key goes down. The grabs on each of those

+     * windows must be checked.

+     * spriteTraces should only be used at dix/events.c! */

+    WindowPtr *spriteTrace;

+    int spriteTraceSize;

+    int spriteTraceGood;

+

+    /* Due to delays between event generation and event processing, it is

+     * possible that the pointer has crossed screen boundaries between the

+     * time in which it begins generating events and the time when

+     * those events are processed.

+     *

+     * pEnqueueScreen: screen the pointer was on when the event was generated

+     * pDequeueScreen: screen the pointer was on when the event is processed

+     */

+    ScreenPtr pEnqueueScreen;

+    ScreenPtr pDequeueScreen;

+

+} SpriteRec;

+

+typedef struct _KeyClassRec {

+    int			sourceid;

+    CARD8		down[DOWN_LENGTH];

+    CARD8		postdown[DOWN_LENGTH];

+    int                 modifierKeyCount[8];

+    struct _XkbSrvInfo *xkbInfo;

+} KeyClassRec, *KeyClassPtr;

+

+typedef struct _AxisInfo {

+    int		resolution;

+    int		min_resolution;

+    int		max_resolution;

+    int		min_value;

+    int		max_value;

+    Atom	label;

+    CARD8	mode;

+} AxisInfo, *AxisInfoPtr;

+

+typedef struct _ValuatorAccelerationRec {

+    int                         number;

+    PointerAccelSchemeProc      AccelSchemeProc;

+    void                       *accelData; /* at disposal of AccelScheme */

+    PointerAccelSchemeInitProc  AccelInitProc;

+    DeviceCallbackProc          AccelCleanupProc;

+} ValuatorAccelerationRec, *ValuatorAccelerationPtr;

+

+typedef struct _ValuatorClassRec {

+    int                   sourceid;

+    int		 	  numMotionEvents;

+    int                   first_motion;

+    int                   last_motion;

+    void                  *motion; /* motion history buffer. Different layout

+                                      for MDs and SDs!*/

+    WindowPtr             motionHintWindow;

+

+    AxisInfoPtr 	  axes;

+    unsigned short	  numAxes;

+    double		  *axisVal; /* always absolute, but device-coord system */

+    ValuatorAccelerationRec	accelScheme;

+} ValuatorClassRec, *ValuatorClassPtr;

+

+typedef struct _ButtonClassRec {

+    int			sourceid;

+    CARD8		numButtons;

+    CARD8		buttonsDown;	/* number of buttons currently down

+                                           This counts logical buttons, not

+					   physical ones, i.e if some buttons

+					   are mapped to 0, they're not counted

+					   here */

+    unsigned short	state;

+    Mask		motionMask;

+    CARD8		down[DOWN_LENGTH];

+    CARD8		postdown[DOWN_LENGTH];

+    CARD8		map[MAP_LENGTH];

+    union _XkbAction    *xkb_acts;

+    Atom		labels[MAX_BUTTONS];

+} ButtonClassRec, *ButtonClassPtr;

+

+typedef struct _FocusClassRec {

+    int		sourceid;

+    WindowPtr	win; /* May be set to a int constant (e.g. PointerRootWin)! */

+    int		revert;

+    TimeStamp	time;

+    WindowPtr	*trace;

+    int		traceSize;

+    int		traceGood;

+} FocusClassRec, *FocusClassPtr;

+

+typedef struct _ProximityClassRec {

+    int		sourceid;

+    char	in_proximity;

+} ProximityClassRec, *ProximityClassPtr;

+

+typedef struct _AbsoluteClassRec {

+    int         sourceid;

+    /* Calibration. */

+    int         min_x;

+    int         max_x;

+    int         min_y;

+    int         max_y;

+    int         flip_x;

+    int         flip_y;

+    int		rotation;

+    int         button_threshold;

+

+    /* Area. */

+    int         offset_x;

+    int         offset_y;

+    int         width;

+    int         height;

+    int         screen;

+    XID		following;

+} AbsoluteClassRec, *AbsoluteClassPtr;

+

+typedef struct _KbdFeedbackClassRec *KbdFeedbackPtr;

+typedef struct _PtrFeedbackClassRec *PtrFeedbackPtr;

+typedef struct _IntegerFeedbackClassRec *IntegerFeedbackPtr;

+typedef struct _StringFeedbackClassRec *StringFeedbackPtr;

+typedef struct _BellFeedbackClassRec *BellFeedbackPtr;

+typedef struct _LedFeedbackClassRec *LedFeedbackPtr;

+

+typedef struct _KbdFeedbackClassRec {

+    BellProcPtr		BellProc;

+    KbdCtrlProcPtr	CtrlProc;

+    KeybdCtrl	 	ctrl;

+    KbdFeedbackPtr	next;

+    struct _XkbSrvLedInfo *xkb_sli;

+} KbdFeedbackClassRec;

+

+typedef struct _PtrFeedbackClassRec {

+    PtrCtrlProcPtr	CtrlProc;

+    PtrCtrl		ctrl;

+    PtrFeedbackPtr	next;

+} PtrFeedbackClassRec;

+

+typedef struct _IntegerFeedbackClassRec {

+    IntegerCtrlProcPtr	CtrlProc;

+    IntegerCtrl	 	ctrl;

+    IntegerFeedbackPtr	next;

+} IntegerFeedbackClassRec;

+

+typedef struct _StringFeedbackClassRec {

+    StringCtrlProcPtr	CtrlProc;

+    StringCtrl	 	ctrl;

+    StringFeedbackPtr	next;

+} StringFeedbackClassRec;

+

+typedef struct _BellFeedbackClassRec {

+    BellProcPtr		BellProc;

+    BellCtrlProcPtr	CtrlProc;

+    BellCtrl	 	ctrl;

+    BellFeedbackPtr	next;

+} BellFeedbackClassRec;

+

+typedef struct _LedFeedbackClassRec {

+    LedCtrlProcPtr	CtrlProc;

+    LedCtrl	 	ctrl;

+    LedFeedbackPtr	next;

+    struct _XkbSrvLedInfo *xkb_sli;

+} LedFeedbackClassRec;

+

+

+typedef struct _ClassesRec {

+    KeyClassPtr		key;

+    ValuatorClassPtr	valuator;

+    ButtonClassPtr	button;

+    FocusClassPtr	focus;

+    ProximityClassPtr	proximity;

+    AbsoluteClassPtr    absolute;

+    KbdFeedbackPtr	kbdfeed;

+    PtrFeedbackPtr	ptrfeed;

+    IntegerFeedbackPtr	intfeed;

+    StringFeedbackPtr	stringfeed;

+    BellFeedbackPtr	bell;

+    LedFeedbackPtr	leds;

+} ClassesRec;

+

+

+/* Device properties */

+typedef struct _XIPropertyValue

+{

+    Atom                type;           /* ignored by server */

+    short               format;         /* format of data for swapping - 8,16,32 */

+    long                size;           /* size of data in (format/8) bytes */

+    pointer             data;           /* private to client */

+} XIPropertyValueRec;

+

+typedef struct _XIProperty

+{

+    struct _XIProperty   *next;

+    Atom                  propertyName;

+    BOOL                  deletable;    /* clients can delete this prop? */

+    XIPropertyValueRec    value;

+} XIPropertyRec;

+

+typedef XIPropertyRec      *XIPropertyPtr;

+typedef XIPropertyValueRec *XIPropertyValuePtr;

+

+

+typedef struct _XIPropertyHandler

+{

+    struct _XIPropertyHandler* next;

+    long id;

+    int (*SetProperty) (DeviceIntPtr dev,

+                        Atom property,

+                        XIPropertyValuePtr prop,

+                        BOOL checkonly);

+    int (*GetProperty) (DeviceIntPtr dev,

+                        Atom property);

+    int (*DeleteProperty) (DeviceIntPtr dev,

+                           Atom property);

+} XIPropertyHandler, *XIPropertyHandlerPtr;

+

+/* states for devices */

+

+#define NOT_GRABBED		0

+#define THAWED			1

+#define THAWED_BOTH		2	/* not a real state */

+#define FREEZE_NEXT_EVENT	3

+#define FREEZE_BOTH_NEXT_EVENT	4

+#define FROZEN			5	/* any state >= has device frozen */

+#define FROZEN_NO_EVENT		5

+#define FROZEN_WITH_EVENT	6

+#define THAW_OTHERS		7

+

+

+typedef struct _GrabInfoRec {

+    TimeStamp	    grabTime;

+    Bool            fromPassiveGrab;    /* true if from passive grab */

+    Bool            implicitGrab;       /* implicit from ButtonPress */

+    GrabRec         activeGrab;

+    GrabPtr         grab;

+    CARD8           activatingKey;

+    void	    (*ActivateGrab) (

+                    DeviceIntPtr /*device*/,

+                    GrabPtr /*grab*/,

+                    TimeStamp /*time*/,

+                    Bool /*autoGrab*/);

+    void	    (*DeactivateGrab)(

+                    DeviceIntPtr /*device*/);

+    struct {

+	Bool		frozen;

+	int		state;

+	GrabPtr		other;		/* if other grab has this frozen */

+	DeviceEvent	*event;		/* saved to be replayed */

+    } sync;

+} GrabInfoRec, *GrabInfoPtr;

+

+typedef struct _SpriteInfoRec {

+    /* sprite must always point to a valid sprite. For devices sharing the

+     * sprite, let sprite point to a paired spriteOwner's sprite. */

+    SpritePtr           sprite;      /* sprite information */

+    Bool                spriteOwner; /* True if device owns the sprite */

+    DeviceIntPtr        paired;      /* The paired device. Keyboard if

+                                        spriteOwner is TRUE, otherwise the

+                                        pointer that owns the sprite. */ 

+

+    /* keep states for animated cursor */

+    struct {

+        CursorPtr       pCursor;

+        ScreenPtr       pScreen;

+        int             elt;

+        CARD32          time;

+    } anim;

+} SpriteInfoRec, *SpriteInfoPtr;

+

+/* device types */

+#define MASTER_POINTER          1

+#define MASTER_KEYBOARD         2

+#define SLAVE                   3

+#define MASTER_ATTACHED         4  /* special type for GetMaster */

+

+typedef struct _DeviceIntRec {

+    DeviceRec	public;

+    DeviceIntPtr next;

+    Bool	startup;		/* true if needs to be turned on at

+				          server intialization time */

+    DeviceProc	deviceProc;		/* proc(DevicePtr, DEVICE_xx). It is

+					  used to initialize, turn on, or

+					  turn off the device */

+    Bool	inited;			/* TRUE if INIT returns Success */

+    Bool        enabled;                /* TRUE if ON returns Success */

+    Bool        coreEvents;             /* TRUE if device also sends core */

+    GrabInfoRec deviceGrab;             /* grab on the device */

+    int         type;                   /* MASTER_POINTER, MASTER_KEYBOARD, SLAVE */

+    Atom		xinput_type;

+    char		*name;

+    int			id;

+    KeyClassPtr		key;

+    ValuatorClassPtr	valuator;

+    ButtonClassPtr	button;

+    FocusClassPtr	focus;

+    ProximityClassPtr	proximity;

+    AbsoluteClassPtr    absolute;

+    KbdFeedbackPtr	kbdfeed;

+    PtrFeedbackPtr	ptrfeed;

+    IntegerFeedbackPtr	intfeed;

+    StringFeedbackPtr	stringfeed;

+    BellFeedbackPtr	bell;

+    LedFeedbackPtr	leds;

+    struct _XkbInterest *xkb_interest;

+    char                *config_info; /* used by the hotplug layer */

+    ClassesPtr		unused_classes; /* for master devices */

+    int			saved_master_id;	/* for slaves while grabbed */

+    PrivateRec		*devPrivates;

+    DeviceUnwrapProc    unwrapProc;

+    SpriteInfoPtr       spriteInfo;

+    DeviceIntPtr        master;     /* master device */

+    DeviceIntPtr        lastSlave;  /* last slave device used */

+

+    /* last valuator values recorded, not posted to client;

+     * for slave devices, valuators is in device coordinates

+     * for master devices, valuators is in screen coordinates

+     * see dix/getevents.c

+     * remainder supports acceleration

+     */

+    struct {

+        int             valuators[MAX_VALUATORS];

+        float           remainder[MAX_VALUATORS];

+        int             numValuators;

+        DeviceIntPtr    slave;

+    } last;

+

+    /* Input device property handling. */

+    struct {

+        XIPropertyPtr   properties;

+        XIPropertyHandlerPtr handlers; /* NULL-terminated */

+    } properties;

+

+    /* coordinate transformation matrix for absolute input devices */

+    struct pixman_f_transform transform;

+

+    /* XTest related master device id */

+    int xtest_master_id;

+} DeviceIntRec;

+

+typedef struct {

+    int			numDevices;	/* total number of devices */

+    DeviceIntPtr	devices;	/* all devices turned on */

+    DeviceIntPtr	off_devices;	/* all devices turned off */

+    DeviceIntPtr	keyboard;	/* the main one for the server */

+    DeviceIntPtr	pointer;

+    DeviceIntPtr	all_devices;

+    DeviceIntPtr	all_master_devices;

+} InputInfo;

+

+extern _X_EXPORT InputInfo inputInfo;

+

+/* for keeping the events for devices grabbed synchronously */

+typedef struct _QdEvent *QdEventPtr;

+typedef struct _QdEvent {

+    QdEventPtr		next;

+    DeviceIntPtr	device;

+    ScreenPtr		pScreen;	/* what screen the pointer was on */

+    unsigned long	months;		/* milliseconds is in the event */

+    InternalEvent	*event;

+} QdEventRec;

+

+/**

+ * syncEvents is the global structure for queued events.

+ *

+ * Devices can be frozen through GrabModeSync pointer grabs. If this is the

+ * case, events from these devices are added to "pending" instead of being

+ * processed normally. When the device is unfrozen, events in "pending" are

+ * replayed and processed as if they would come from the device directly.

+ */

+typedef struct _EventSyncInfo {

+    QdEventPtr          pending, /**<  list of queued events */

+                        *pendtail; /**< last event in list */

+    /** The device to replay events for. Only set in AllowEvents(), in which

+     * case it is set to the device specified in the request. */

+    DeviceIntPtr        replayDev;      /* kludgy rock to put flag for */

+

+    /**

+     * The window the events are supposed to be replayed on.

+     * This window may be set to the grab's window (but only when

+     * Replay{Pointer|Keyboard} is given in the XAllowEvents()

+     * request. */

+    WindowPtr           replayWin;      /*   ComputeFreezes            */

+    /**

+     * Flag to indicate whether we're in the process of

+     * replaying events. Only set in ComputeFreezes(). */

+    Bool                playingEvents;

+    TimeStamp           time;

+} EventSyncInfoRec, *EventSyncInfoPtr;

+

+extern EventSyncInfoRec syncEvents;

+

+#endif /* INPUTSTRUCT_H */

diff --git a/xorg-server/include/list.h b/xorg-server/include/list.h
index 9479d2d92..2acf149cc 100644
--- a/xorg-server/include/list.h
+++ b/xorg-server/include/list.h
@@ -26,11 +26,102 @@
 #ifndef _LIST_H_

 #define _LIST_H_

 

-/* classic doubly-link circular list */

+/**

+ * @file Classic doubly-link circular list implementation.

+ *

+ * Example:

+ * We need to keep a list of struct foo in the parent struct bar, i.e. what

+ * we want is something like this.

+ *

+ *     struct bar {

+ *          ...

+ *          struct foo *foos; -----> struct foo {}, struct foo {}, struct foo{}

+ *          ...

+ *     }

+ *

+ * We need one list head in bar and a list element in all foos (both are of

+ * data type 'struct list').

+ *

+ *     struct bar {

+ *          ...

+ *          struct list foos;

+ *          ...

+ *     }

+ *

+ *     struct foo {

+ *          ...

+ *          struct list entry;

+ *          ...

+ *     }

+ *

+ * Now we initialize the list head:

+ *

+ *     struct bar bar;

+ *     ...

+ *     list_init(&bar.foos);

+ *

+ * Then we create the first element and add it to this list:

+ *

+ *     struct foo *foo = malloc(...);

+ *     ....

+ *     list_add(&foo->entry, &bar.foos);

+ *

+ * Repeat the above for each element you want to add to the list. Deleting

+ * works with the element itself.

+ *      list_del(&foo->entry);

+ *      free(foo);

+ *

+ * Note: calling list_del(&bar.foos) will set bar.foos to an empty

+ * list again.

+ *

+ * Looping through the list requires a 'struct foo' as iterator and the

+ * name of the field the subnodes use.

+ *

+ * struct foo *iterator;

+ * list_for_each_entry(iterator, &bar.foos, entry) {

+ *      if (iterator->something == ...)

+ *             ...

+ * }

+ *

+ * Note: You must not call list_del() on the iterator if you continue the

+ * loop. You need to run the safe for-each loop instead:

+ *

+ * struct foo *iterator, *next;

+ * list_for_each_entry_safe(iterator, next, &bar.foos, entry) {

+ *      if (...)

+ *              list_del(&iterator->entry);

+ * }

+ *

+ */

+

+/**

+ * The linkage struct for list nodes. This struct must be part of your

+ * to-be-linked struct.

+ *

+ * Example:

+ * struct foo {

+ *      int a;

+ *      void *b;

+ *      struct list *mylist;

+ * }

+ *

+ * Position and name of the struct list field is irrelevant.

+ * There are no requirements that elements of a list are of the same type.

+ * There are no requirements for a list head, any struct list can be a list

+ * head.

+ */

 struct list {

     struct list *next, *prev;

 };

 

+/**

+ * Initialize the list as an empty list.

+ *

+ * Example:

+ * list_init(&foo->mylist);

+ *

+ * @param The list to initialized.

+ */

 static void

 list_init(struct list *list)

 {

@@ -48,6 +139,20 @@ __list_add(struct list *entry,
     prev->next = entry;

 }

 

+/**

+ * Insert a new element after the given list head.

+ * The list changes from:

+ *      head → some element → ...

+ * to

+ *      head → new element → older element → ...

+ *

+ * Example:

+ * struct foo *newfoo = malloc(...);

+ * list_add(&newfoo->mylist, &foo->mylist);

+ *

+ * @param entry The new element to prepend to the list.

+ * @param head The existing list.

+ */

 static inline void

 list_add(struct list *entry, struct list *head)

 {

@@ -61,6 +166,20 @@ __list_del(struct list *prev, struct list *next)
     prev->next = next;

 }

 

+/**

+ * Remove the element from the list it is in. Using this function will reset

+ * the pointers to/from this element so it is removed from the list. It does

+ * NOT free the element itself or manipulate it otherwise.

+ *

+ * Using list_del on a pure list head (like in the example at the top of

+ * this file) will NOT remove the first element from

+ * the list but rather reset the list as empty list.

+ *

+ * Example:

+ * list_del(&newfoo->mylist);

+ *

+ * @param entry The element to remove.

+ */

 static inline void

 list_del(struct list *entry)

 {

@@ -68,32 +187,91 @@ list_del(struct list *entry)
     list_init(entry);

 }

 

+/**

+ * Check if the list is empty.

+ *

+ * Example:

+ * list_is_empty(&foo->mylist);

+ *

+ * @return True if the list contains one or more elements or False otherwise.

+ */

 static inline Bool

 list_is_empty(struct list *head)

 {

     return head->next == head;

 }

 

+/**

+ * Returns a pointer to the container of this list element.

+ *

+ * Example:

+ * struct foo* f;

+ * f = container_of(&foo->mylist, struct foo, mylist);

+ * assert(f == foo);

+ *

+ * @param ptr Pointer to the struct list.

+ * @param type Data type of the list element.

+ * @param member Member name of the struct list field in the list element.

+ * @return A pointer to the data struct containing the list head.

+ */

 #ifndef container_of

 #define container_of(ptr, type, member) \

     (type *)((char *)(ptr) - (char *) &((type *)0)->member)

 #endif

 

+/**

+ * Alias of container_of

+ */

 #define list_entry(ptr, type, member) \

     container_of(ptr, type, member)

 

+/**

+ * Retrieve the first list entry for the given list pointer.

+ *

+ * Example:

+ * struct foo *first;

+ * first = list_first_entry(&foo->mylist, struct foo, mylist);

+ *

+ * @param ptr The list head

+ * @param type Data type of the list element to retrieve

+ * @param member Member name of the struct list field in the list element.

+ * @return A pointer to the first list element.

+ */

 #define list_first_entry(ptr, type, member) \

     list_entry((ptr)->next, type, member)

 

 #define __container_of(ptr, sample, member)				\

     (void *)((char *)(ptr)						\

 	     - ((char *)&(sample)->member - (char *)(sample)))

-

+/**

+ * Loop through the list given by head and set pos to struct in the list.

+ *

+ * Example:

+ * struct foo *iterator;

+ * list_for_each_entry(iterator, &foo->mylist, mylist) {

+ *      [modify iterator]

+ * }

+ *

+ * This macro is not safe for node deletion. Use list_for_each_entry_safe

+ * instead.

+ *

+ * @param pos Iterator variable of the type of the list elements.

+ * @param head List head

+ * @param member Member name of the struct list in the list elements.

+ *

+ */

 #define list_for_each_entry(pos, head, member)				\

     for (pos = __container_of((head)->next, pos, member);		\

 	 &pos->member != (head);					\

 	 pos = __container_of(pos->member.next, pos, member))

 

+/**

+ * Loop through the list, keeping a backup pointer to the element. This

+ * macro allows for the deletion of a list element while looping through the

+ * list.

+ *

+ * See list_for_each_entry for more details.

+ */

 #define list_for_each_entry_safe(pos, tmp, head, member)		\

     for (pos = __container_of((head)->next, pos, member),		\

 	 tmp = __container_of(pos->member.next, pos, member);		\

diff --git a/xorg-server/include/protocol-versions.h b/xorg-server/include/protocol-versions.h
index 1db1dc409..55d5fa9b5 100644
--- a/xorg-server/include/protocol-versions.h
+++ b/xorg-server/include/protocol-versions.h
@@ -104,10 +104,6 @@
 #define SERVER_WINDOWSWM_MINOR_VERSION		0

 #define SERVER_WINDOWSWM_PATCH_VERSION		0

 

-/* Xcalibrate */

-#define SERVER_XCALIBRATE_MAJOR_VERSION		0

-#define SERVER_XCALIBRATE_MINOR_VERSION		1

-

 /* DGA */

 #define SERVER_XDGA_MAJOR_VERSION		2

 #define SERVER_XDGA_MINOR_VERSION		0

diff --git a/xorg-server/include/ptrveloc.h b/xorg-server/include/ptrveloc.h
index 6f999a88f..520498942 100644
--- a/xorg-server/include/ptrveloc.h
+++ b/xorg-server/include/ptrveloc.h
@@ -1,140 +1,138 @@
-/*
- *
- * Copyright © 2006-2009 Simon Thum             simon dot thum at gmx dot de
- *
- * 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 (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 NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS 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.
- */
-
-#ifndef POINTERVELOCITY_H
-#define POINTERVELOCITY_H
-
-#include <input.h> /* DeviceIntPtr */
-
-/* constants for acceleration profiles */
-
-#define AccelProfileNone -1
-#define AccelProfileClassic  0
-#define AccelProfileDeviceSpecific 1
-#define AccelProfilePolynomial 2
-#define AccelProfileSmoothLinear 3
-#define AccelProfileSimple 4
-#define AccelProfilePower 5
-#define AccelProfileLinear 6
-#define AccelProfileSmoothLimited 7
-#define AccelProfileLAST AccelProfileSmoothLimited
-
-/* fwd */
-struct _DeviceVelocityRec;
-
-/**
- * profile
- * returns actual acceleration depending on velocity, acceleration control,...
- */
-typedef float (*PointerAccelerationProfileFunc)
-              (DeviceIntPtr dev, struct _DeviceVelocityRec* vel,
-               float velocity, float threshold, float accelCoeff);
-
-/**
- * a motion history, with just enough information to
- * calc mean velocity and decide which motion was along
- * a more or less straight line
- */
-typedef struct _MotionTracker {
-    int dx, dy;     /* accumulated delta for each axis */
-    int time;         /* time of creation */
-    int dir;        /* initial direction bitfield */
-} MotionTracker, *MotionTrackerPtr;
-
-/* number of properties for predictable acceleration */
-#define NPROPS_PREDICTABLE_ACCEL 4
-
-/**
- * Contains all data needed to implement mouse ballistics
- */
-typedef struct _DeviceVelocityRec {
-    MotionTrackerPtr tracker;
-    int num_tracker;
-    int cur_tracker;        /* current index */
-    float   velocity;       /* velocity as guessed by algorithm */
-    float   last_velocity;  /* previous velocity estimate */
-    int     last_dx;      /* last time-difference */
-    int     last_dy ;     /* phase of last/current estimate */
-    float   corr_mul;       /* config: multiply this into velocity */
-    float   const_acceleration;  /* config: (recipr.) const deceleration */
-    float   min_acceleration;    /* config: minimum acceleration */
-    short   reset_time;     /* config: reset non-visible state after # ms */
-    short   use_softening;  /* config: use softening of mouse values */
-    float   max_rel_diff;   /* config: max. relative difference */
-    float   max_diff;       /* config: max. difference */
-    int     initial_range;  /* config: max. offset used as initial velocity */
-    Bool    average_accel;  /* config: average acceleration over velocity */
-    PointerAccelerationProfileFunc Profile;
-    PointerAccelerationProfileFunc deviceSpecificProfile;
-    void*   profile_private;/* extended data, see  SetAccelerationProfile() */
-    struct {   /* to be able to query this information */
-        int     profile_number;
-    } statistics;
-    long    prop_handlers[NPROPS_PREDICTABLE_ACCEL];
-} DeviceVelocityRec, *DeviceVelocityPtr;
-
-extern _X_EXPORT void
-InitVelocityData(DeviceVelocityPtr vel);
-
-extern _X_EXPORT void
-InitTrackers(DeviceVelocityPtr vel, int ntracker);
-
-extern _X_EXPORT short
-ProcessVelocityData2D(DeviceVelocityPtr vel, int dx, int dy, int time);
-
-extern _X_EXPORT float
-BasicComputeAcceleration(DeviceIntPtr dev, DeviceVelocityPtr vel,
-    float velocity, float threshold, float acc);
-
-extern _X_EXPORT void
-FreeVelocityData(DeviceVelocityPtr vel);
-
-extern _X_INTERNAL BOOL
-InitializePredictableAccelerationProperties(DeviceIntPtr dev);
-
-extern _X_INTERNAL BOOL
-DeletePredictableAccelerationProperties(DeviceIntPtr dev);
-
-extern _X_EXPORT int
-SetAccelerationProfile(DeviceVelocityPtr vel, int profile_num);
-
-extern _X_EXPORT DeviceVelocityPtr
-GetDevicePredictableAccelData(DeviceIntPtr dev);
-
-extern _X_EXPORT void
-SetDeviceSpecificAccelerationProfile(DeviceVelocityPtr vel,
-                                     PointerAccelerationProfileFunc profile);
-
-extern _X_INTERNAL void
-AccelerationDefaultCleanup(DeviceIntPtr dev);
-
-extern _X_INTERNAL void
-acceleratePointerPredictable(DeviceIntPtr dev, int first_valuator,
-                             int num_valuators, int *valuators, int evtime);
-
-extern _X_INTERNAL void
-acceleratePointerLightweight(DeviceIntPtr dev, int first_valuator,
-                             int num_valuators, int *valuators, int ignored);
-
-#endif  /* POINTERVELOCITY_H */
+/*

+ *

+ * Copyright © 2006-2009 Simon Thum             simon dot thum at gmx dot de

+ *

+ * 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 (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 NONINFRINGEMENT.  IN NO EVENT SHALL

+ * THE AUTHORS OR COPYRIGHT HOLDERS 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.

+ */

+

+#ifndef POINTERVELOCITY_H

+#define POINTERVELOCITY_H

+

+#include <input.h> /* DeviceIntPtr */

+

+/* constants for acceleration profiles */

+

+#define AccelProfileNone -1

+#define AccelProfileClassic  0

+#define AccelProfileDeviceSpecific 1

+#define AccelProfilePolynomial 2

+#define AccelProfileSmoothLinear 3

+#define AccelProfileSimple 4

+#define AccelProfilePower 5

+#define AccelProfileLinear 6

+#define AccelProfileSmoothLimited 7

+#define AccelProfileLAST AccelProfileSmoothLimited

+

+/* fwd */

+struct _DeviceVelocityRec;

+

+/**

+ * profile

+ * returns actual acceleration depending on velocity, acceleration control,...

+ */

+typedef float (*PointerAccelerationProfileFunc)

+              (DeviceIntPtr dev, struct _DeviceVelocityRec* vel,

+               float velocity, float threshold, float accelCoeff);

+

+/**

+ * a motion history, with just enough information to

+ * calc mean velocity and decide which motion was along

+ * a more or less straight line

+ */

+typedef struct _MotionTracker {

+    int dx, dy;     /* accumulated delta for each axis */

+    int time;         /* time of creation */

+    int dir;        /* initial direction bitfield */

+} MotionTracker, *MotionTrackerPtr;

+

+/* number of properties for predictable acceleration */

+#define NPROPS_PREDICTABLE_ACCEL 4

+

+/**

+ * Contains all data needed to implement mouse ballistics

+ */

+typedef struct _DeviceVelocityRec {

+    MotionTrackerPtr tracker;

+    int num_tracker;

+    int cur_tracker;        /* current index */

+    float   velocity;       /* velocity as guessed by algorithm */

+    float   last_velocity;  /* previous velocity estimate */

+    int     last_dx;      /* last time-difference */

+    int     last_dy ;     /* phase of last/current estimate */

+    float   corr_mul;       /* config: multiply this into velocity */

+    float   const_acceleration;  /* config: (recipr.) const deceleration */

+    float   min_acceleration;    /* config: minimum acceleration */

+    short   reset_time;     /* config: reset non-visible state after # ms */

+    short   use_softening;  /* config: use softening of mouse values */

+    float   max_rel_diff;   /* config: max. relative difference */

+    float   max_diff;       /* config: max. difference */

+    int     initial_range;  /* config: max. offset used as initial velocity */

+    Bool    average_accel;  /* config: average acceleration over velocity */

+    PointerAccelerationProfileFunc Profile;

+    PointerAccelerationProfileFunc deviceSpecificProfile;

+    void*   profile_private;/* extended data, see  SetAccelerationProfile() */

+    struct {   /* to be able to query this information */

+        int     profile_number;

+    } statistics;

+    long    prop_handlers[NPROPS_PREDICTABLE_ACCEL];

+} DeviceVelocityRec, *DeviceVelocityPtr;

+

+extern _X_EXPORT void

+InitVelocityData(DeviceVelocityPtr vel);

+

+extern _X_EXPORT void

+InitTrackers(DeviceVelocityPtr vel, int ntracker);

+

+extern _X_EXPORT short

+ProcessVelocityData2D(DeviceVelocityPtr vel, int dx, int dy, int time);

+

+extern _X_EXPORT float

+BasicComputeAcceleration(DeviceIntPtr dev, DeviceVelocityPtr vel,

+    float velocity, float threshold, float acc);

+

+extern _X_EXPORT void

+FreeVelocityData(DeviceVelocityPtr vel);

+

+extern _X_EXPORT int

+SetAccelerationProfile(DeviceVelocityPtr vel, int profile_num);

+

+extern _X_EXPORT DeviceVelocityPtr

+GetDevicePredictableAccelData(DeviceIntPtr dev);

+

+extern _X_EXPORT void

+SetDeviceSpecificAccelerationProfile(DeviceVelocityPtr vel,

+                                     PointerAccelerationProfileFunc profile);

+

+extern _X_INTERNAL void

+AccelerationDefaultCleanup(DeviceIntPtr dev);

+

+extern _X_INTERNAL Bool

+InitPredictableAccelerationScheme(DeviceIntPtr dev,

+				  struct _ValuatorAccelerationRec* protoScheme);

+

+extern _X_INTERNAL void

+acceleratePointerPredictable(DeviceIntPtr dev, int first_valuator,

+                             int num_valuators, int *valuators, int evtime);

+

+extern _X_INTERNAL void

+acceleratePointerLightweight(DeviceIntPtr dev, int first_valuator,

+                             int num_valuators, int *valuators, int ignored);

+

+#endif  /* POINTERVELOCITY_H */

diff --git a/xorg-server/include/regionstr.h b/xorg-server/include/regionstr.h
index 92f4ca9f2..f34ecf319 100644
--- a/xorg-server/include/regionstr.h
+++ b/xorg-server/include/regionstr.h
@@ -318,16 +318,6 @@ extern _X_EXPORT Bool RegionIsValid(
 extern _X_EXPORT void RegionPrint(

     RegionPtr /*pReg*/);

 

-extern _X_EXPORT int RegionClipSpans(

-    RegionPtr /*prgnDst*/,

-    DDXPointPtr /*ppt*/,

-    int * /*pwidth*/,

-    int /*nspans*/,

-    DDXPointPtr /*pptNew*/,

-    int * /*pwidthNew*/,

-    int /*fSorted*/

-);

-

 #define INCLUDE_LEGACY_REGION_DEFINES

 #ifdef INCLUDE_LEGACY_REGION_DEFINES

 

diff --git a/xorg-server/include/xkbsrv.h b/xorg-server/include/xkbsrv.h
index f0b0b25fa..8257c54a6 100644
--- a/xorg-server/include/xkbsrv.h
+++ b/xorg-server/include/xkbsrv.h
@@ -846,10 +846,6 @@ extern _X_EXPORT XkbGeometryPtr XkbLookupNamedGeometry(
 	Bool *			/* shouldFree */

 );

 

-extern _X_EXPORT char *	_XkbDupString(

-	const char *		/* str */

-);

-

 extern _X_EXPORT void	XkbConvertCase(

 	KeySym 			/* sym */,

 	KeySym *		/* lower */,

diff --git a/xorg-server/mi/midispcur.c b/xorg-server/mi/midispcur.c
index ef5c4e29e..3ae157fa3 100644
--- a/xorg-server/mi/midispcur.c
+++ b/xorg-server/mi/midispcur.c
@@ -76,7 +76,7 @@ typedef struct {
 #define miGetDCDevice(dev, screen) \

  ((DevHasCursor(dev)) ? \

   (miDCBufferPtr)dixLookupScreenPrivate(&dev->devPrivates, miDCDeviceKey, screen) : \

-  (miDCBufferPtr)dixLookupScreenPrivate(&dev->u.master->devPrivates, miDCDeviceKey, screen))

+  (miDCBufferPtr)dixLookupScreenPrivate(&GetMaster(dev, MASTER_POINTER)->devPrivates, miDCDeviceKey, screen))

 

 /* 

  * The core pointer buffer will point to the index of the virtual core pointer

diff --git a/xorg-server/mi/mieq.c b/xorg-server/mi/mieq.c
index 66e2806c7..a8daf572b 100644
--- a/xorg-server/mi/mieq.c
+++ b/xorg-server/mi/mieq.c
@@ -321,11 +321,12 @@ CopyGetMasterEvent(DeviceIntPtr sdev,
     DeviceIntPtr mdev;

     int len = original->any.length;

     int type = original->any.type;

+    int mtype; /* which master type? */

 

     CHECKEVENT(original);

 

     /* ET_XQuartz has sdev == NULL */

-    if (!sdev || !sdev->u.master)

+    if (!sdev || IsMaster(sdev) || IsFloating(sdev))

         return NULL;

 

 #if XFreeXDGA

@@ -337,20 +338,21 @@ CopyGetMasterEvent(DeviceIntPtr sdev,
     {

         case ET_KeyPress:

         case ET_KeyRelease:

-            mdev = GetMaster(sdev, MASTER_KEYBOARD);

+            mtype = MASTER_KEYBOARD;

             break;

         case ET_ButtonPress:

         case ET_ButtonRelease:

         case ET_Motion:

         case ET_ProximityIn:

         case ET_ProximityOut:

-            mdev = GetMaster(sdev, MASTER_POINTER);

+            mtype = MASTER_POINTER;

             break;

         default:

-            mdev = sdev->u.master;

+            mtype = MASTER_ATTACHED;

             break;

     }

 

+    mdev = GetMaster(sdev, mtype);

     memcpy(copy, original, len);

     ChangeDeviceID(mdev, copy);

     FixUpEventForMaster(mdev, sdev, original, copy);

@@ -400,7 +402,7 @@ mieqProcessDeviceEvent(DeviceIntPtr dev,
     master = CopyGetMasterEvent(dev, event, &mevent);

 

     if (master)

-        master->u.lastSlave = dev;

+        master->lastSlave = dev;

 

     /* If someone's registered a custom event handler, let them

      * steal it. */

@@ -410,7 +412,7 @@ mieqProcessDeviceEvent(DeviceIntPtr dev,
         handler(screenNum, event, dev);

         /* Check for the SD's master in case the device got detached

          * during event processing */

-        if (master && dev->u.master)

+        if (master && !IsFloating(dev))

             handler(screenNum, &mevent, master);

     } else

     {

@@ -419,7 +421,7 @@ mieqProcessDeviceEvent(DeviceIntPtr dev,
 

         /* Check for the SD's master in case the device got detached

          * during event processing */

-        if (master && dev->u.master)

+        if (master && !IsFloating(dev))

             master->public.processInputProc(&mevent, master);

     }

 }

@@ -467,7 +469,7 @@ mieqProcessInputEvents(void)
         pthread_mutex_unlock(&miEventQueueMutex);

 #endif

 

-        master  = (dev && !IsMaster(dev) && dev->u.master) ? dev->u.master : NULL;

+        master = (dev) ? GetMaster(dev, MASTER_ATTACHED) : NULL;

 

         if (screenIsSaved == SCREEN_SAVER_ON)

             dixSaveScreens (serverClient, SCREEN_SAVER_OFF, ScreenSaverReset);

diff --git a/xorg-server/mi/mipointer.c b/xorg-server/mi/mipointer.c
index f9ca9a70b..bbb32f745 100644
--- a/xorg-server/mi/mipointer.c
+++ b/xorg-server/mi/mipointer.c
@@ -23,6 +23,29 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.

 */

 

+/**

+ * @file

+ * This file contains functions to move the pointer on the screen and/or

+ * restrict its movement. These functions are divided into two sets:

+ * Screen-specific functions that are used as function pointers from other

+ * parts of the server (and end up heavily wrapped by e.g. animcur and

+ * xfixes):

+ *      miPointerConstrainCursor

+ *      miPointerCursorLimits

+ *      miPointerDisplayCursor

+ *      miPointerRealizeCursor

+ *      miPointerUnrealizeCursor

+ *      miPointerSetCursorPosition

+ *      miRecolorCursor

+ *      miPointerDeviceInitialize

+ *      miPointerDeviceCleanup

+ * If wrapped, these are the last element in the wrapping chain. They may

+ * call into sprite-specific code through further function pointers though.

+ *

+ * The second type of functions are those that are directly called by the

+ * DIX, DDX and some drivers.

+ */

+

 #ifdef HAVE_DIX_CONFIG_H

 #include <dix-config.h>

 #endif

@@ -50,7 +73,7 @@ DevPrivateKeyRec miPointerScreenKeyRec;
 DevPrivateKeyRec miPointerPrivKeyRec;

 

 #define MIPOINTER(dev) \

-    ((!IsMaster(dev) && !dev->u.master) ? \

+    (IsFloating(dev) ? \

         (miPointerPtr)dixLookupPrivate(&(dev)->devPrivates, miPointerPrivKey): \

         (miPointerPtr)dixLookupPrivate(&(GetMaster(dev, MASTER_POINTER))->devPrivates, miPointerPrivKey))

 

@@ -126,36 +149,17 @@ miPointerInitialize (ScreenPtr                  pScreen,
     return TRUE;

 }

 

+/**

+ * Destroy screen-specific information.

+ *

+ * @param index Screen index of the screen in screenInfo.screens[]

+ * @param pScreen The actual screen pointer

+ */

 static Bool

 miPointerCloseScreen (int index, ScreenPtr pScreen)

 {

-#if 0

-    miPointerPtr pPointer;

-    DeviceIntPtr pDev;

-#endif

-

     SetupScreen(pScreen);

 

-#if 0

-    for (pDev = inputInfo.devices; pDev; pDev = pDev->next)

-    {

-        if (DevHasCursor(pDev))

-        {

-            pPointer = MIPOINTER(pDev);

-

-            if (pScreen == pPointer->pScreen)

-                pPointer->pScreen = 0;

-            if (pScreen == pPointer->pSpriteScreen)

-                pPointer->pSpriteScreen = 0;

-        }

-    }

-

-    if (MIPOINTER(inputInfo.pointer)->pScreen == pScreen)

-        MIPOINTER(inputInfo.pointer)->pScreen = 0;

-    if (MIPOINTER(inputInfo.pointer)->pSpriteScreen == pScreen)

-        MIPOINTER(inputInfo.pointer)->pSpriteScreen = 0;

-#endif

-

     pScreen->CloseScreen = pScreenPriv->CloseScreen;

     free((pointer) pScreenPriv);

     FreeEventList(events, GetMaximumEventsNum());

@@ -189,8 +193,7 @@ miPointerDisplayCursor (DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
     miPointerPtr pPointer;

 

     /* return for keyboards */

-    if ((IsMaster(pDev) && !DevHasCursor(pDev)) ||

-        (!IsMaster(pDev) && pDev->u.master && !DevHasCursor(pDev->u.master)))

+    if (!IsPointerDevice(pDev))

             return FALSE;

 

     pPointer = MIPOINTER(pDev);

@@ -201,6 +204,15 @@ miPointerDisplayCursor (DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
     return TRUE;

 }

 

+/**

+ * Set up the constraints for the given device. This function does not

+ * actually constrain the cursor but merely copies the given box to the

+ * internal constraint storage.

+ *

+ * @param pDev The device to constrain to the box

+ * @param pBox The rectangle to constrain the cursor to

+ * @param pScreen Used for copying screen confinement

+ */

 static void

 miPointerConstrainCursor (DeviceIntPtr pDev, ScreenPtr pScreen, BoxPtr pBox)

 {

@@ -212,7 +224,17 @@ miPointerConstrainCursor (DeviceIntPtr pDev, ScreenPtr pScreen, BoxPtr pBox)
     pPointer->confined = PointerConfinedToScreen(pDev);

 }

 

-/*ARGSUSED*/

+/**

+ * Should calculate the box for the given cursor, based on screen and the

+ * confinement given. But we assume that whatever box is passed in is valid

+ * anyway.

+ *

+ * @param pDev The device to calculate the cursor limits for

+ * @param pScreen The screen the confinement happens on

+ * @param pCursor The screen the confinement happens on

+ * @param pHotBox The confinement box for the cursor

+ * @param[out] pTopLeftBox The new confinement box, always *pHotBox.

+ */

 static void

 miPointerCursorLimits(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor,

                       BoxPtr pHotBox, BoxPtr pTopLeftBox)

@@ -220,15 +242,36 @@ miPointerCursorLimits(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor,
     *pTopLeftBox = *pHotBox;

 }

 

-static Bool GenerateEvent;

-

+/**

+ * Set the device's cursor position to the x/y position on the given screen.

+ * Generates and event if required.

+ *

+ * This function is called from:

+ *    - sprite init code to place onto initial position

+ *    - the various WarpPointer implementations (core, XI, Xinerama, dmx,…)

+ *    - during the cursor update path in CheckMotion

+ *    - in the Xinerama part of NewCurrentScreen

+ *    - when a RandR/RandR1.2 mode was applied (it may have moved the pointer, so

+ *      it's set back to the original pos)

+ *

+ * @param pDev The device to move

+ * @param pScreen The screen the device is on

+ * @param x The x coordinate in per-screen coordinates

+ * @param y The y coordinate in per-screen coordinates

+ * @param generateEvent True if the pointer movement should generate an

+ * event.

+ *

+ * @return TRUE in all cases

+ */

 static Bool

 miPointerSetCursorPosition(DeviceIntPtr pDev, ScreenPtr pScreen,

                            int x, int y, Bool generateEvent)

 {

     SetupScreen (pScreen);

+    miPointerPtr pPointer = MIPOINTER(pDev);

+

+    pPointer->generateEvent = generateEvent;

 

-    GenerateEvent = generateEvent;

     /* device dependent - must pend signal and call miPointerWarpCursor */

     (*pScreenPriv->screenFuncs->WarpCursor) (pDev, pScreen, x, y);

     if (!generateEvent)

@@ -236,9 +279,13 @@ miPointerSetCursorPosition(DeviceIntPtr pDev, ScreenPtr pScreen,
     return TRUE;

 }

 

-/* Set up sprite information for the device.

-   This function will be called once for each device after it is initialized

-   in the DIX.

+/**

+ * Set up sprite information for the device.

+ * This function will be called once for each device after it is initialized

+ * in the DIX.

+ *

+ * @param pDev The newly created device

+ * @param pScreen The initial sprite scree.

  */

 static Bool

 miPointerDeviceInitialize(DeviceIntPtr pDev, ScreenPtr pScreen)

@@ -261,6 +308,7 @@ miPointerDeviceInitialize(DeviceIntPtr pDev, ScreenPtr pScreen)
     pPointer->confined = FALSE;

     pPointer->x = 0;

     pPointer->y = 0;

+    pPointer->generateEvent = FALSE;

 

     if (!((*pScreenPriv->spriteFuncs->DeviceCursorInitialize)(pDev, pScreen)))

     {

@@ -272,15 +320,19 @@ miPointerDeviceInitialize(DeviceIntPtr pDev, ScreenPtr pScreen)
     return TRUE;

 }

 

-/* Clean up after device.

-   This function will be called once before the device is freed in the DIX

+/**

+ * Clean up after device.

+ * This function will be called once before the device is freed in the DIX

+ *

+ * @param pDev The device to be removed from the server

+ * @param pScreen Current screen of the device

  */

 static void

 miPointerDeviceCleanup(DeviceIntPtr pDev, ScreenPtr pScreen)

 {

     SetupScreen(pScreen);

 

-    if (!IsMaster(pDev) && pDev->u.master)

+    if (!IsMaster(pDev) && !IsFloating(pDev))

         return;

 

     (*pScreenPriv->spriteFuncs->DeviceCursorCleanup)(pDev, pScreen);

@@ -289,7 +341,17 @@ miPointerDeviceCleanup(DeviceIntPtr pDev, ScreenPtr pScreen)
 }

 

 

-/* Once signals are ignored, the WarpCursor function can call this */

+/**

+ * Warp the pointer to the given position on the given screen. May generate

+ * an event, depending on whether we're coming from miPointerSetPosition.

+ *

+ * Once signals are ignored, the WarpCursor function can call this

+ *

+ * @param pDev The device to warp

+ * @param pScreen Screen to warp on

+ * @param x The x coordinate in per-screen coordinates

+ * @param y The y coordinate in per-screen coordinates

+ */

 

 void

 miPointerWarpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)

@@ -306,7 +368,7 @@ miPointerWarpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
         changedScreen = TRUE;

     }

 

-    if (GenerateEvent)

+    if (pPointer->generateEvent)

 	miPointerMove (pDev, pScreen, x, y);

     else

         miPointerMoveNoEvent(pDev, pScreen, x, y);

@@ -322,16 +384,11 @@ miPointerWarpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
         UpdateSpriteForScreen (pDev, pScreen) ;

 }

 

-/*

- * Pointer/CursorDisplay interface routines

- */

-

-/*

- * miPointerUpdateSprite

+/**

+ * Syncronize the sprite with the cursor.

  *

- * Syncronize the sprite with the cursor - called from ProcessInputEvents

+ * @param pDev The device to sync

  */

-

 void

 miPointerUpdateSprite (DeviceIntPtr pDev)

 {

@@ -408,6 +465,14 @@ miPointerUpdateSprite (DeviceIntPtr pDev)
     }

 }

 

+/**

+ * Set the device to the coordinates on the given screen.

+ *

+ * @param pDev The device to move

+ * @param screen_no Index of the screen to move to

+ * @param x The x coordinate in per-screen coordinates

+ * @param y The y coordinate in per-screen coordinates

+ */

 void

 miPointerSetScreen(DeviceIntPtr pDev, int screen_no, int x, int y)

 {

@@ -426,12 +491,18 @@ miPointerSetScreen(DeviceIntPtr pDev, int screen_no, int x, int y)
         pPointer->limits.y2 = pScreen->height;

 }

 

+/**

+ * @return The current screen of the VCP

+ */

 ScreenPtr

 miPointerCurrentScreen (void)

 {

     return miPointerGetScreen(inputInfo.pointer);

 }

 

+/**

+ * @return The current screen of the given device or NULL.

+ */

 ScreenPtr

 miPointerGetScreen(DeviceIntPtr pDev)

 {

@@ -469,7 +540,7 @@ miPointerMoveNoEvent (DeviceIntPtr pDev, ScreenPtr pScreen,
      * VCP, as this may cause a non-HW rendered cursor to be rendered during

      * SIGIO. This again leads to allocs during SIGIO which leads to SIGABRT.

      */

-    if ((pDev == inputInfo.pointer || (!IsMaster(pDev) && pDev->u.master == inputInfo.pointer))

+    if (GetMaster(pDev, MASTER_POINTER) == inputInfo.pointer

         && !pScreenPriv->waitForUpdate && pScreen == pPointer->pSpriteScreen)

     {

 	pPointer->devx = x;

@@ -483,6 +554,18 @@ miPointerMoveNoEvent (DeviceIntPtr pDev, ScreenPtr pScreen,
     pPointer->pScreen = pScreen;

 }

 

+/**

+ * Set the devices' cursor position to the given x/y position.

+ *

+ * This function is called during the pointer update path in

+ * GetPointerEvents and friends (and the same in the xwin DDX).

+ *

+ * @param pDev The device to move

+ * @param[in,out] x The x coordiante in screen coordinates (in regards to total

+ * desktop size)

+ * @param[in,out] y The y coordiante in screen coordinates (in regards to total

+ * desktop size)

+ */

 void

 miPointerSetPosition(DeviceIntPtr pDev, int *x, int *y)

 {

@@ -536,6 +619,12 @@ miPointerSetPosition(DeviceIntPtr pDev, int *x, int *y)
     miPointerMoveNoEvent(pDev, pScreen, *x, *y);

 }

 

+/**

+ * Get the current position of the device in desktop coordinates.

+ *

+ * @param x Return value for the current x coordinate in desktop coordiates.

+ * @param y Return value for the current y coordinate in desktop coordiates.

+ */

 void

 miPointerGetPosition(DeviceIntPtr pDev, int *x, int *y)

 {

@@ -549,6 +638,15 @@ void darwinEvents_lock(void);
 void darwinEvents_unlock(void);

 #endif

 

+/**

+ * Move the device's pointer to the x/y coordinates on the given screen.

+ * This function generates and enqueues pointer events.

+ *

+ * @param pDev The device to move

+ * @param pScreen The screen the device is on

+ * @param x The x coordinate in per-screen coordinates

+ * @param y The y coordinate in per-screen coordinates

+ */

 void

 miPointerMove (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)

 {

diff --git a/xorg-server/mi/mipointrst.h b/xorg-server/mi/mipointrst.h
index bd9c24a00..109a44c88 100644
--- a/xorg-server/mi/mipointrst.h
+++ b/xorg-server/mi/mipointrst.h
@@ -1,56 +1,57 @@
-/*
- * mipointrst.h
- *
- */
-
-
-/*
-
-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.
-*/
-
-#ifndef MIPOINTRST_H
-#define MIPOINTRST_H
-
-#include "mipointer.h"
-#include "scrnintstr.h"
-
-typedef struct {
-    ScreenPtr		    pScreen;    /* current screen */
-    ScreenPtr		    pSpriteScreen;/* screen containing current sprite */
-    CursorPtr		    pCursor;    /* current cursor */
-    CursorPtr		    pSpriteCursor;/* cursor on screen */
-    BoxRec		    limits;	/* current constraints */
-    Bool		    confined;	/* pointer can't change screens */
-    int			    x, y;	/* hot spot location */
-    int			    devx, devy;	/* sprite position */
-} miPointerRec, *miPointerPtr;
-
-typedef struct {
-    miPointerSpriteFuncPtr  spriteFuncs;	/* sprite-specific methods */
-    miPointerScreenFuncPtr  screenFuncs;	/* screen-specific methods */
-    CloseScreenProcPtr	    CloseScreen;
-    Bool		    waitForUpdate;	/* don't move cursor in SIGIO */
-    Bool		    showTransparent;	/* show empty cursors */
-} miPointerScreenRec, *miPointerScreenPtr;
-#endif /* MIPOINTRST_H */
+/*

+ * mipointrst.h

+ *

+ */

+

+

+/*

+

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

+*/

+

+#ifndef MIPOINTRST_H

+#define MIPOINTRST_H

+

+#include "mipointer.h"

+#include "scrnintstr.h"

+

+typedef struct {

+    ScreenPtr		    pScreen;    /* current screen */

+    ScreenPtr		    pSpriteScreen;/* screen containing current sprite */

+    CursorPtr		    pCursor;    /* current cursor */

+    CursorPtr		    pSpriteCursor;/* cursor on screen */

+    BoxRec		    limits;	/* current constraints */

+    Bool		    confined;	/* pointer can't change screens */

+    int			    x, y;	/* hot spot location */

+    int			    devx, devy;	/* sprite position */

+    Bool		    generateEvent; /* generate an event during warping? */

+} miPointerRec, *miPointerPtr;

+

+typedef struct {

+    miPointerSpriteFuncPtr  spriteFuncs;	/* sprite-specific methods */

+    miPointerScreenFuncPtr  screenFuncs;	/* screen-specific methods */

+    CloseScreenProcPtr	    CloseScreen;

+    Bool		    waitForUpdate;	/* don't move cursor in SIGIO */

+    Bool		    showTransparent;	/* show empty cursors */

+} miPointerScreenRec, *miPointerScreenPtr;

+#endif /* MIPOINTRST_H */

diff --git a/xorg-server/mi/misprite.c b/xorg-server/mi/misprite.c
index 0489dd46e..9df6c1fb1 100644
--- a/xorg-server/mi/misprite.c
+++ b/xorg-server/mi/misprite.c
@@ -143,7 +143,7 @@ typedef struct {
 #endif

 

 #define MISPRITE(dev) \

-    ((!IsMaster(dev) && !dev->u.master) ? \

+    (IsFloating(dev) ? \

        (miCursorInfoPtr)dixLookupPrivate(&dev->devPrivates, miSpriteDevPrivatesKey) : \

        (miCursorInfoPtr)dixLookupPrivate(&(GetMaster(dev, MASTER_POINTER))->devPrivates, miSpriteDevPrivatesKey))

 

@@ -769,7 +769,7 @@ miSpriteRealizeCursor (DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
 {

     miCursorInfoPtr pCursorInfo;

 

-    if (!IsMaster(pDev) && !pDev->u.master)

+    if (IsFloating(pDev))

         return FALSE;

 

     pCursorInfo = MISPRITE(pDev);

@@ -793,7 +793,7 @@ miSpriteSetCursor (DeviceIntPtr pDev, ScreenPtr pScreen,
     miCursorInfoPtr     pPointer;

     miSpriteScreenPtr   pScreenPriv;

 

-    if (!IsMaster(pDev) && !pDev->u.master)

+    if (IsFloating(pDev))

         return;

 

     pPointer = MISPRITE(pDev);

@@ -851,7 +851,7 @@ miSpriteMoveCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
 {

     CursorPtr pCursor;

 

-    if (!IsMaster(pDev) && !pDev->u.master)

+    if (IsFloating(pDev))

         return;

 

     pCursor = MISPRITE(pDev)->pCursor;

@@ -908,7 +908,7 @@ miSpriteRemoveCursor (DeviceIntPtr pDev, ScreenPtr pScreen)
     miCursorInfoPtr     pCursorInfo;

 

 

-    if (!IsMaster(pDev) && !pDev->u.master)

+    if (IsFloating(pDev))

         return;

 

     DamageDrawInternal (pScreen, TRUE);

@@ -947,7 +947,7 @@ miSpriteSaveUnderCursor(DeviceIntPtr pDev, ScreenPtr pScreen)
     CursorPtr		pCursor;

     miCursorInfoPtr     pCursorInfo;

 

-    if (!IsMaster(pDev) && !pDev->u.master)

+    if (IsFloating(pDev))

         return;

 

     DamageDrawInternal (pScreen, TRUE);

@@ -988,7 +988,7 @@ miSpriteRestoreCursor (DeviceIntPtr pDev, ScreenPtr pScreen)
     CursorPtr		pCursor;

     miCursorInfoPtr     pCursorInfo;

 

-    if (!IsMaster(pDev) && !pDev->u.master)

+    if (IsFloating(pDev))

         return;

 

     DamageDrawInternal (pScreen, TRUE);

@@ -1028,7 +1028,7 @@ miSpriteComputeSaved (DeviceIntPtr pDev, ScreenPtr pScreen)
     CursorPtr	    pCursor;

     miCursorInfoPtr pCursorInfo;

 

-    if (!IsMaster(pDev) && !pDev->u.master)

+    if (IsFloating(pDev))

         return;

 

     pCursorInfo = MISPRITE(pDev);

diff --git a/xorg-server/miext/damage/damage.c b/xorg-server/miext/damage/damage.c
index 7d58d134b..d7c244e21 100644
--- a/xorg-server/miext/damage/damage.c
+++ b/xorg-server/miext/damage/damage.c
@@ -89,7 +89,11 @@ getDrawableDamageRef (DrawablePtr pDrawable)
 	ScreenPtr   pScreen = pDrawable->pScreen;

 

 	pPixmap = 0;

-	if (pScreen->GetWindowPixmap)

+	if (pScreen->GetWindowPixmap

+#ifdef ROOTLESS_WORKAROUND

+	    && ((WindowPtr)pDrawable)->viewable

+#endif

+	    )

 	    pPixmap = (*pScreen->GetWindowPixmap) ((WindowPtr)pDrawable);

 

 	if (!pPixmap)

diff --git a/xorg-server/os/Makefile.am b/xorg-server/os/Makefile.am
index 3e4f2c591..d06f06ff5 100644
--- a/xorg-server/os/Makefile.am
+++ b/xorg-server/os/Makefile.am
@@ -1,67 +1,61 @@
-noinst_LTLIBRARIES = libos.la liblog.la
-
-AM_CFLAGS = $(DIX_CFLAGS) $(SHA1_CFLAGS)
-
-SECURERPC_SRCS = rpcauth.c
-XDMCP_SRCS = xdmcp.c
-STRLCAT_SRCS = strlcat.c strlcpy.c
-
-# Build a convenience library liblog.la that will be added into
-# libos.la. The split is done so that log.c can be built with
-# different compiler options.
-liblog_la_SOURCES = log.c
-# Add flags needed for proper backtraces of functions marked with GCC
-# __attribute__((noreturn)). Currently those flags are needed for
-# FatalError and AbortServer in log.c.
-liblog_la_CFLAGS = $(AM_CFLAGS) $(ARM_BACKTRACE_CFLAGS)
-
-libos_la_SOURCES = 	\
-	WaitFor.c	\
-	access.c	\
-	auth.c		\
-	backtrace.c	\
-	connection.c	\
-	io.c		\
-	mitauth.c	\
-	oscolor.c	\
-	osdep.h		\
-	osinit.c	\
-	utils.c		\
-	strcasecmp.c	\
-	strcasestr.c	\
-	xdmauth.c	\
-	xsha1.c		\
-	xstrans.c	\
-	xprintf.c
-libos_la_LIBADD = @SHA1_LIBS@ $(DLOPEN_LIBS) liblog.la
-
-if SECURE_RPC
-libos_la_SOURCES += $(SECURERPC_SRCS)
-endif
-
-if XDMCP
-libos_la_SOURCES += $(XDMCP_SRCS)
-endif
-
-if NEED_STRLCAT
-libos_la_SOURCES += $(STRLCAT_SRCS)
-endif
-
-EXTRA_DIST = $(SECURERPC_SRCS) $(INTERNALMALLOC_SRCS) \
-     $(XDMCP_SRCS) $(STRLCAT_SRCS)
-
-if SPECIAL_DTRACE_OBJECTS
-# Generate dtrace object code for probes in libos & libdix
-dtrace.o: $(top_srcdir)/dix/Xserver.d $(am_libos_la_OBJECTS)
-	$(AM_V_GEN)$(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d .libs/*.o ../dix/.libs/*.o
-
-noinst_PROGRAMS = os.O
-
-os.O: dtrace.o $(am_libos_la_OBJECTS)
-	$(AM_V_GEN)ld -r -o $@ dtrace.o .libs/*.o
-endif
-
-os.c:
-	touch $@
-
-CLEANFILES = os.c
+noinst_LTLIBRARIES = libos.la

+

+AM_CFLAGS = $(DIX_CFLAGS) $(SHA1_CFLAGS)

+

+SECURERPC_SRCS = rpcauth.c

+XDMCP_SRCS = xdmcp.c

+STRLCAT_SRCS = strlcat.c strlcpy.c

+XORG_SRCS = log.c

+

+libos_la_SOURCES = 	\

+	WaitFor.c	\

+	access.c	\

+	auth.c		\

+	backtrace.c	\

+	client.c	\

+	connection.c	\

+	io.c		\

+	mitauth.c	\

+	oscolor.c	\

+	osdep.h		\

+	osinit.c	\

+	utils.c		\

+	strcasecmp.c	\

+	strcasestr.c	\

+	xdmauth.c	\

+	xsha1.c		\

+	xstrans.c	\

+	xprintf.c	\

+	$(XORG_SRCS)

+libos_la_LIBADD = @SHA1_LIBS@ $(DLOPEN_LIBS)

+

+if SECURE_RPC

+libos_la_SOURCES += $(SECURERPC_SRCS)

+endif

+

+if XDMCP

+libos_la_SOURCES += $(XDMCP_SRCS)

+endif

+

+if NEED_STRLCAT

+libos_la_SOURCES += $(STRLCAT_SRCS)

+endif

+

+EXTRA_DIST = $(SECURERPC_SRCS) $(INTERNALMALLOC_SRCS) \

+     $(XDMCP_SRCS) $(STRLCAT_SRCS)

+

+if SPECIAL_DTRACE_OBJECTS

+# Generate dtrace object code for probes in libos & libdix

+dtrace.o: $(top_srcdir)/dix/Xserver.d $(am_libos_la_OBJECTS)

+	$(AM_V_GEN)$(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d .libs/*.o ../dix/.libs/*.o

+

+noinst_PROGRAMS = os.O

+

+os.O: dtrace.o $(am_libos_la_OBJECTS)

+	$(AM_V_GEN)ld -r -o $@ dtrace.o .libs/*.o

+endif

+

+os.c:

+	touch $@

+

+CLEANFILES = os.c

diff --git a/xorg-server/os/client.c b/xorg-server/os/client.c
new file mode 100644
index 000000000..1311855d5
--- /dev/null
+++ b/xorg-server/os/client.c
@@ -0,0 +1,310 @@
+/*
+ * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). All
+ * rights reserved.
+ * Copyright (c) 1993, 2010, Oracle and/or its affiliates. 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
+ * AUTHORS OR COPYRIGHT HOLDERS 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.
+ */
+
+/**
+ * @file
+ *
+ * This file contains functionality for identifying clients by various
+ * means. The primary purpose of identification is to simply aid in
+ * finding out which clients are using X server and how they are using
+ * it. For example, it's often necessary to monitor what requests
+ * clients are executing (to spot bad behaviour) and how they are
+ * allocating resources in X server (to spot excessive resource
+ * usage).
+ *
+ * This framework automatically allocates information, that can be
+ * used for client identification, when a client connects to the
+ * server. The information is freed when the client disconnects. The
+ * allocated information is just a collection of various IDs, such as
+ * PID and process name for local clients, that are likely to be
+ * useful in analyzing X server usage.
+ *
+ * Users of the framework can query ID information about clients at
+ * any time. To avoid repeated polling of IDs the users can also
+ * subscribe for notifications about the availability of ID
+ * information. IDs have been allocated before ClientStateCallback is
+ * called with ClientStateInitial state. Similarly the IDs will be
+ * released after ClientStateCallback is called with ClientStateGone
+ * state.
+ *
+ * Author: Rami Ylimäki <rami.ylimaki@vincit.fi>
+ */
+
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+#include "client.h"
+#include "os.h"
+#include "dixstruct.h"
+
+/**
+ * Try to determine a PID for a client from its connection
+ * information. This should be called only once when new client has
+ * connected, use GetClientPid to determine the PID at other times.
+ *
+ * @param[in] client Connection linked to some process.
+ *
+ * @return PID of the client. Error (-1) if PID can't be determined
+ *         for the client.
+ *
+ * @see GetClientPid
+ */
+pid_t DetermineClientPid(struct _Client *client)
+{
+    LocalClientCredRec *lcc = NULL;
+    pid_t pid = -1;
+
+    if (client == NullClient)
+        return pid;
+
+    if (client == serverClient)
+        return getpid();
+
+    if (GetLocalClientCreds(client, &lcc) != -1)
+    {
+        if (lcc->fieldsSet & LCC_PID_SET)
+            pid = lcc->pid;
+        FreeLocalClientCreds(lcc);
+    }
+
+    return pid;
+}
+
+/**
+ * Try to determine a command line string for a client based on its
+ * PID. Note that mapping PID to a command hasn't been implemented for
+ * some operating systems. This should be called only once when a new
+ * client has connected, use GetClientCmdName/Args to determine the
+ * string at other times.
+ *
+ * @param[in]  pid     Process ID of a client.
+
+ * @param[out] cmdname Client process name without arguments. You must
+ *                     release this by calling free. On error NULL is
+ *                     returned. Pass NULL if you aren't interested in
+ *                     this value.
+ * @param[out] cmdargs Arguments to client process. Useful for
+ *                     identifying a client that is executed from a
+ *                     launcher program. You must release this by
+ *                     calling free. On error NULL is returned. Pass
+ *                     NULL if you aren't interested in this value.
+ *
+ * @see GetClientCmdName/Args
+ */
+void DetermineClientCmd(pid_t pid, const char **cmdname, const char **cmdargs)
+{
+    char path[PATH_MAX + 1];
+    int totsize = 0;
+    int cmdsize = 0;
+    int argsize = 0;
+    int fd = 0;
+
+    if (cmdname)
+        *cmdname = NULL;
+    if (cmdargs)
+        *cmdargs = NULL;
+
+    if (pid == -1)
+        return;
+
+    /* Check if /proc/pid/cmdline exists. It's not supported on all
+     * operating systems. */
+    if (snprintf(path, sizeof(path), "/proc/%d/cmdline", pid) < 0)
+        return;
+    fd = open(path, O_RDONLY);
+    if (fd < 0)
+        return;
+
+    /* Read the contents of /proc/pid/cmdline. It should contain the
+     * process name and arguments. */
+    totsize = read(fd, path, sizeof(path));
+    if (totsize <= 0)
+        return;
+    if (close(fd) < 0)
+        return;
+    path[totsize - 1] = '\0';
+
+    /* Contruct the process name without arguments. */
+    cmdsize = strlen(path) + 1;
+    if (cmdname)
+    {
+        char *name = malloc(cmdsize);
+        if (name)
+        {
+            strncpy(name, path, cmdsize);
+            name[cmdsize - 1] = '\0';
+            *cmdname = name;
+        }
+    }
+
+    /* Construct the arguments for client process. */
+    argsize = totsize - cmdsize;
+    if (cmdargs && (argsize > 0))
+    {
+        char *args = malloc(argsize);
+        if (args)
+        {
+            int i = 0;
+            for (i = 0; i < (argsize - 1); ++i)
+            {
+                const char c = path[cmdsize + i];
+                args[i] = (c == '\0') ? ' ' : c;
+            }
+            args[argsize - 1] = '\0';
+            *cmdargs = args;
+        }
+    }
+}
+
+/**
+ * Called when a new client connects. Allocates client ID information.
+ *
+ * @param[in] client Recently connected client.
+ */
+void ReserveClientIds(struct _Client *client)
+{
+#ifdef CLIENTIDS
+    if (client == NullClient)
+        return;
+
+    assert(!client->clientIds);
+    client->clientIds = calloc(1, sizeof(ClientIdRec));
+    if (!client->clientIds)
+        return;
+
+    client->clientIds->pid = DetermineClientPid(client);
+    if (client->clientIds->pid != -1)
+        DetermineClientCmd(client->clientIds->pid, &client->clientIds->cmdname, &client->clientIds->cmdargs);
+
+    DebugF("client(%lx): Reserved pid(%d).\n",
+           client->clientAsMask, client->clientIds->pid);
+    DebugF("client(%lx): Reserved cmdname(%s) and cmdargs(%s).\n",
+           client->clientAsMask,
+           client->clientIds->cmdname ? client->clientIds->cmdname : "NULL",
+           client->clientIds->cmdargs ? client->clientIds->cmdargs : "NULL");
+#endif /* CLIENTIDS */
+}
+
+/**
+ * Called when an existing client disconnects. Frees client ID
+ * information.
+ *
+ * @param[in] client Recently disconnected client.
+ */
+void ReleaseClientIds(struct _Client *client)
+{
+#ifdef CLIENTIDS
+    if (client == NullClient)
+        return;
+
+    if (!client->clientIds)
+        return;
+
+    DebugF("client(%lx): Released pid(%d).\n",
+           client->clientAsMask, client->clientIds->pid);
+    DebugF("client(%lx): Released cmdline(%s) and cmdargs(%s).\n",
+           client->clientAsMask,
+           client->clientIds->cmdname ? client->clientIds->cmdname : "NULL",
+           client->clientIds->cmdargs ? client->clientIds->cmdargs : "NULL");
+
+    free((void *) client->clientIds->cmdname); /* const char * */
+    free((void *) client->clientIds->cmdargs); /* const char * */
+    free(client->clientIds);
+    client->clientIds = NULL;
+#endif /* CLIENTIDS */
+}
+
+/**
+ * Get cached PID of a client.
+ *
+ * param[in] client Client whose PID has been already cached.
+ *
+ * @return Cached client PID. Error (-1) if called:
+ *         - before ClientStateInitial client state notification
+ *         - after ClientStateGone client state notification
+ *         - for remote clients
+ *
+ * @see DetermineClientPid
+ */
+pid_t GetClientPid(struct _Client *client)
+{
+    if (client == NullClient)
+        return -1;
+
+    if (!client->clientIds)
+        return -1;
+
+    return client->clientIds->pid;
+}
+
+/**
+ * Get cached command name string of a client.
+ *
+ * param[in] client Client whose command line string has been already
+ *                  cached.
+ *
+ * @return Cached client command name. Error (NULL) if called:
+ *         - before ClientStateInitial client state notification
+ *         - after ClientStateGone client state notification
+ *         - for remote clients
+ *         - on OS that doesn't support mapping of PID to command line
+ *
+ * @see DetermineClientCmd
+ */
+const char *GetClientCmdName(struct _Client *client)
+{
+    if (client == NullClient)
+        return NULL;
+
+    if (!client->clientIds)
+        return NULL;
+
+    return client->clientIds->cmdname;
+}
+
+/**
+ * Get cached command arguments string of a client.
+ *
+ * param[in] client Client whose command line string has been already
+ *                  cached.
+ *
+ * @return Cached client command arguments. Error (NULL) if called:
+ *         - before ClientStateInitial client state notification
+ *         - after ClientStateGone client state notification
+ *         - for remote clients
+ *         - on OS that doesn't support mapping of PID to command line
+ *
+ * @see DetermineClientCmd
+ */
+const char *GetClientCmdArgs(struct _Client *client)
+{
+    if (client == NullClient)
+        return NULL;
+
+    if (!client->clientIds)
+        return NULL;
+
+    return client->clientIds->cmdargs;
+}
diff --git a/xorg-server/os/makefile b/xorg-server/os/makefile
index e7a286970..779a1c95d 100644
--- a/xorg-server/os/makefile
+++ b/xorg-server/os/makefile
@@ -1,21 +1,28 @@
+LIBRARY=libos

+

 ifeq ($(DEBUG),1)

 DEFINES += XSERVER_DTRACE

 endif

+SECURE_RPC=1

+XDMCP=1

+NEED_STRLCAT=1

 

 SECURERPC_SRCS = rpcauth.c

 XDMCP_SRCS = xdmcp.c

 STRLCAT_SRCS = strlcat.c strlcpy.c

 XORG_SRCS = log.c

 

-CSRCS = 	\

+libos_la_SOURCES = 	\

 	WaitFor.c	\

 	access.c	\

 	auth.c		\

 	backtrace.c	\

+	client.c	\

 	connection.c	\

 	io.c		\

 	mitauth.c	\

 	oscolor.c	\

+	osdep.h		\

 	osinit.c	\

 	utils.c		\

 	strcasecmp.c	\

@@ -26,11 +33,17 @@ CSRCS = 	\
 	xprintf.c	\

 	$(XORG_SRCS)

 

-CSRCS += $(SECURERPC_SRCS)

+if SECURE_RPC

+libos_la_SOURCES += $(SECURERPC_SRCS)

+endif

+if XDMCP

+libos_la_SOURCES += $(XDMCP_SRCS)

+endif

 

-CSRCS += $(XDMCP_SRCS)

+if NEED_STRLCAT

+libos_la_SOURCES += $(STRLCAT_SRCS)

+endif

 

-CSRCS += $(STRLCAT_SRCS)

+CSRCS = $(filter %.c,$(libos_la_SOURCES))

 

-LIBRARY=libos

 

diff --git a/xorg-server/record/record.c b/xorg-server/record/record.c
index 88bf5163e..a3e64f0aa 100644
--- a/xorg-server/record/record.c
+++ b/xorg-server/record/record.c
@@ -807,6 +807,7 @@ RecordADeviceEvent(CallbackListPtr *pcbl, pointer nulldata, pointer calldata)
     RecordContextPtr pContext;

     RecordClientsAndProtocolPtr pRCAP;

     int eci; /* enabled context index */

+    int count;

 

     for (eci = 0; eci < numEnabledContexts; eci++)

     {

@@ -821,9 +822,11 @@ RecordADeviceEvent(CallbackListPtr *pcbl, pointer nulldata, pointer calldata)
 		/* TODO check return values */

 		if (IsMaster(pei->device))

 		{

-		    xEvent xE;

-		    EventToCore(pei->event, &xE);

-		    RecordSendProtocolEvents(pRCAP, pContext, &xE, 1);

+		    xEvent *core_events;

+		    EventToCore(pei->event, &core_events, &count);

+		    RecordSendProtocolEvents(pRCAP, pContext, core_events,

+                                             count);

+		    free(core_events);

 		}

 

 		EventToXI(pei->event, &xi_events, &count);

diff --git a/xorg-server/render/mipict.c b/xorg-server/render/mipict.c
index db8d43641..b5eeb443d 100644
--- a/xorg-server/render/mipict.c
+++ b/xorg-server/render/mipict.c
@@ -631,8 +631,8 @@ miPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats)
     ps->Composite	= 0;			/* requires DDX support */

     ps->Glyphs		= miGlyphs;

     ps->CompositeRects	= miCompositeRects;

-    ps->Trapezoids	= miTrapezoids;

-    ps->Triangles	= miTriangles;

+    ps->Trapezoids	= 0;

+    ps->Triangles	= 0;

     ps->TriStrip	= miTriStrip;

     ps->TriFan		= miTriFan;

     

diff --git a/xorg-server/render/mipict.h b/xorg-server/render/mipict.h
index eb6b6645d..67d239ab7 100644
--- a/xorg-server/render/mipict.h
+++ b/xorg-server/render/mipict.h
@@ -1,215 +1,188 @@
-/*
- *
- * Copyright © 2000 SuSE, Inc.
- *
- * 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, and that the name of SuSE not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission.  SuSE makes no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
- * 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.
- *
- * Author:  Keith Packard, SuSE, Inc.
- */
-
-#ifndef _MIPICT_H_
-#define _MIPICT_H_
-
-#include "picturestr.h"
-
-#define MI_MAX_INDEXED	256 /* XXX depth must be <= 8 */
-
-#if MI_MAX_INDEXED <= 256
-typedef CARD8 miIndexType;
-#endif
-
-typedef struct _miIndexed {
-    Bool	color;
-    CARD32	rgba[MI_MAX_INDEXED];
-    miIndexType	ent[32768];
-} miIndexedRec, *miIndexedPtr;
-
-#define miCvtR8G8B8to15(s) ((((s) >> 3) & 0x001f) | \
-			     (((s) >> 6) & 0x03e0) | \
-			     (((s) >> 9) & 0x7c00))
-#define miIndexToEnt15(mif,rgb15) ((mif)->ent[rgb15])
-#define miIndexToEnt24(mif,rgb24) miIndexToEnt15(mif,miCvtR8G8B8to15(rgb24))
-
-#define miIndexToEntY24(mif,rgb24) ((mif)->ent[CvtR8G8B8toY15(rgb24)])
-
-extern _X_EXPORT int
-miCreatePicture (PicturePtr pPicture);
-
-extern _X_EXPORT void
-miDestroyPicture (PicturePtr pPicture);
-
-extern _X_EXPORT void
-miDestroyPictureClip (PicturePtr pPicture);
-
-extern _X_EXPORT int
-miChangePictureClip (PicturePtr    pPicture,
-		     int	   type,
-		     pointer	   value,
-		     int	   n);
-
-extern _X_EXPORT void
-miChangePicture (PicturePtr pPicture,
-		 Mask       mask);
-
-extern _X_EXPORT void
-miValidatePicture (PicturePtr pPicture,
-		   Mask       mask);
-
-extern _X_EXPORT int
-miChangePictureTransform (PicturePtr	pPicture,
-			  PictTransform *transform);
-
-extern _X_EXPORT int
-miChangePictureFilter (PicturePtr pPicture,
-		       int	  filter,
-		       xFixed     *params,
-		       int	  nparams);
-
-extern _X_EXPORT void
-miCompositeSourceValidate (PicturePtr	pPicture,
-			   INT16	x,
-			   INT16	y,
-			   CARD16	width,
-			   CARD16	height);
-extern _X_EXPORT Bool
-miComputeCompositeRegion (RegionPtr	pRegion,
-			  PicturePtr	pSrc,
-			  PicturePtr	pMask,
-			  PicturePtr	pDst,
-			  INT16		xSrc,
-			  INT16		ySrc,
-			  INT16		xMask,
-			  INT16		yMask,
-			  INT16		xDst,
-			  INT16		yDst,
-			  CARD16	width,
-			  CARD16	height);
-
-extern _X_EXPORT Bool
-miPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats);
-
-extern _X_EXPORT Bool
-miRealizeGlyph (ScreenPtr pScreen,
-		GlyphPtr  glyph);
-
-extern _X_EXPORT void
-miUnrealizeGlyph (ScreenPtr pScreen,
-		  GlyphPtr  glyph);
-
-extern _X_EXPORT void
-miGlyphs (CARD8		op,
-	  PicturePtr	pSrc,
-	  PicturePtr	pDst,
-	  PictFormatPtr	maskFormat,
-	  INT16		xSrc,
-	  INT16		ySrc,
-	  int		nlist,
-	  GlyphListPtr	list,
-	  GlyphPtr	*glyphs);
-
-extern _X_EXPORT void
-miRenderColorToPixel (PictFormatPtr pPict,
-		      xRenderColor  *color,
-		      CARD32	    *pixel);
-
-extern _X_EXPORT void
-miRenderPixelToColor (PictFormatPtr pPict,
-		      CARD32	    pixel,
-		      xRenderColor  *color);
-
-extern _X_EXPORT Bool
-miIsSolidAlpha (PicturePtr pSrc);
-
-extern _X_EXPORT void
-miCompositeRects (CARD8		op,
-		  PicturePtr	pDst,
-		  xRenderColor  *color,
-		  int		nRect,
-		  xRectangle    *rects);
-
-extern _X_EXPORT void
-miTrapezoidBounds (int ntrap, xTrapezoid *traps, BoxPtr box);
-
-extern _X_EXPORT void
-miTrapezoids (CARD8	    op,
-	      PicturePtr    pSrc,
-	      PicturePtr    pDst,
-	      PictFormatPtr maskFormat,
-	      INT16	    xSrc,
-	      INT16	    ySrc,
-	      int	    ntrap,
-	      xTrapezoid    *traps);
-
-extern _X_EXPORT void
-miPointFixedBounds (int npoint, xPointFixed *points, BoxPtr bounds);
-    
-extern _X_EXPORT void
-miTriangleBounds (int ntri, xTriangle *tris, BoxPtr bounds);
-
-extern _X_EXPORT void
-miTriangles (CARD8	    op,
-	     PicturePtr	    pSrc,
-	     PicturePtr	    pDst,
-	     PictFormatPtr  maskFormat,
-	     INT16	    xSrc,
-	     INT16	    ySrc,
-	     int	    ntri,
-	     xTriangle	    *tris);
-
-extern _X_EXPORT void
-miTriStrip (CARD8	    op,
-	    PicturePtr	    pSrc,
-	    PicturePtr	    pDst,
-	    PictFormatPtr   maskFormat,
-	    INT16	    xSrc,
-	    INT16	    ySrc,
-	    int		    npoint,
-	    xPointFixed	    *points);
-
-extern _X_EXPORT void
-miTriFan (CARD8		op,
-	  PicturePtr	pSrc,
-	  PicturePtr	pDst,
-	  PictFormatPtr maskFormat,
-	  INT16		xSrc,
-	  INT16		ySrc,
-	  int		npoint,
-	  xPointFixed	*points);
-
-extern _X_EXPORT PicturePtr
-miCreateAlphaPicture (ScreenPtr	    pScreen, 
-		      PicturePtr    pDst,
-		      PictFormatPtr pPictFormat,
-		      CARD16	    width,
-		      CARD16	    height);
-
-extern _X_EXPORT Bool
-miInitIndexed (ScreenPtr	pScreen,
-	       PictFormatPtr	pFormat);
-
-extern _X_EXPORT void
-miCloseIndexed (ScreenPtr	pScreen,
-		PictFormatPtr	pFormat);
-
-extern _X_EXPORT void
-miUpdateIndexed (ScreenPtr	pScreen,
-		 PictFormatPtr	pFormat,
-		 int		ndef,
-		 xColorItem	*pdef);
-
-#endif /* _MIPICT_H_ */
+/*

+ *

+ * Copyright © 2000 SuSE, Inc.

+ *

+ * 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, and that the name of SuSE not be used in advertising or

+ * publicity pertaining to distribution of the software without specific,

+ * written prior permission.  SuSE makes no representations about the

+ * suitability of this software for any purpose.  It is provided "as is"

+ * without express or implied warranty.

+ *

+ * SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL

+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE

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

+ *

+ * Author:  Keith Packard, SuSE, Inc.

+ */

+

+#ifndef _MIPICT_H_

+#define _MIPICT_H_

+

+#include "picturestr.h"

+

+#define MI_MAX_INDEXED	256 /* XXX depth must be <= 8 */

+

+#if MI_MAX_INDEXED <= 256

+typedef CARD8 miIndexType;

+#endif

+

+typedef struct _miIndexed {

+    Bool	color;

+    CARD32	rgba[MI_MAX_INDEXED];

+    miIndexType	ent[32768];

+} miIndexedRec, *miIndexedPtr;

+

+#define miCvtR8G8B8to15(s) ((((s) >> 3) & 0x001f) | \

+			     (((s) >> 6) & 0x03e0) | \

+			     (((s) >> 9) & 0x7c00))

+#define miIndexToEnt15(mif,rgb15) ((mif)->ent[rgb15])

+#define miIndexToEnt24(mif,rgb24) miIndexToEnt15(mif,miCvtR8G8B8to15(rgb24))

+

+#define miIndexToEntY24(mif,rgb24) ((mif)->ent[CvtR8G8B8toY15(rgb24)])

+

+extern _X_EXPORT int

+miCreatePicture (PicturePtr pPicture);

+

+extern _X_EXPORT void

+miDestroyPicture (PicturePtr pPicture);

+

+extern _X_EXPORT void

+miDestroyPictureClip (PicturePtr pPicture);

+

+extern _X_EXPORT int

+miChangePictureClip (PicturePtr    pPicture,

+		     int	   type,

+		     pointer	   value,

+		     int	   n);

+

+extern _X_EXPORT void

+miChangePicture (PicturePtr pPicture,

+		 Mask       mask);

+

+extern _X_EXPORT void

+miValidatePicture (PicturePtr pPicture,

+		   Mask       mask);

+

+extern _X_EXPORT int

+miChangePictureTransform (PicturePtr	pPicture,

+			  PictTransform *transform);

+

+extern _X_EXPORT int

+miChangePictureFilter (PicturePtr pPicture,

+		       int	  filter,

+		       xFixed     *params,

+		       int	  nparams);

+

+extern _X_EXPORT void

+miCompositeSourceValidate (PicturePtr	pPicture,

+			   INT16	x,

+			   INT16	y,

+			   CARD16	width,

+			   CARD16	height);

+extern _X_EXPORT Bool

+miComputeCompositeRegion (RegionPtr	pRegion,

+			  PicturePtr	pSrc,

+			  PicturePtr	pMask,

+			  PicturePtr	pDst,

+			  INT16		xSrc,

+			  INT16		ySrc,

+			  INT16		xMask,

+			  INT16		yMask,

+			  INT16		xDst,

+			  INT16		yDst,

+			  CARD16	width,

+			  CARD16	height);

+

+extern _X_EXPORT Bool

+miPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats);

+

+extern _X_EXPORT Bool

+miRealizeGlyph (ScreenPtr pScreen,

+		GlyphPtr  glyph);

+

+extern _X_EXPORT void

+miUnrealizeGlyph (ScreenPtr pScreen,

+		  GlyphPtr  glyph);

+

+extern _X_EXPORT void

+miGlyphs (CARD8		op,

+	  PicturePtr	pSrc,

+	  PicturePtr	pDst,

+	  PictFormatPtr	maskFormat,

+	  INT16		xSrc,

+	  INT16		ySrc,

+	  int		nlist,

+	  GlyphListPtr	list,

+	  GlyphPtr	*glyphs);

+

+extern _X_EXPORT void

+miRenderColorToPixel (PictFormatPtr pPict,

+		      xRenderColor  *color,

+		      CARD32	    *pixel);

+

+extern _X_EXPORT void

+miRenderPixelToColor (PictFormatPtr pPict,

+		      CARD32	    pixel,

+		      xRenderColor  *color);

+

+extern _X_EXPORT Bool

+miIsSolidAlpha (PicturePtr pSrc);

+

+extern _X_EXPORT void

+miCompositeRects (CARD8		op,

+		  PicturePtr	pDst,

+		  xRenderColor  *color,

+		  int		nRect,

+		  xRectangle    *rects);

+

+extern _X_EXPORT void

+miTrapezoidBounds (int ntrap, xTrapezoid *traps, BoxPtr box);

+

+extern _X_EXPORT void

+miPointFixedBounds (int npoint, xPointFixed *points, BoxPtr bounds);

+    

+extern _X_EXPORT void

+miTriangleBounds (int ntri, xTriangle *tris, BoxPtr bounds);

+

+extern _X_EXPORT void

+miTriStrip (CARD8	    op,

+	    PicturePtr	    pSrc,

+	    PicturePtr	    pDst,

+	    PictFormatPtr   maskFormat,

+	    INT16	    xSrc,

+	    INT16	    ySrc,

+	    int		    npoint,

+	    xPointFixed	    *points);

+

+extern _X_EXPORT void

+miTriFan (CARD8		op,

+	  PicturePtr	pSrc,

+	  PicturePtr	pDst,

+	  PictFormatPtr maskFormat,

+	  INT16		xSrc,

+	  INT16		ySrc,

+	  int		npoint,

+	  xPointFixed	*points);

+

+extern _X_EXPORT Bool

+miInitIndexed (ScreenPtr	pScreen,

+	       PictFormatPtr	pFormat);

+

+extern _X_EXPORT void

+miCloseIndexed (ScreenPtr	pScreen,

+		PictFormatPtr	pFormat);

+

+extern _X_EXPORT void

+miUpdateIndexed (ScreenPtr	pScreen,

+		 PictFormatPtr	pFormat,

+		 int		ndef,

+		 xColorItem	*pdef);

+

+#endif /* _MIPICT_H_ */

diff --git a/xorg-server/render/mitrap.c b/xorg-server/render/mitrap.c
index 8bdc8a8d0..37d917451 100644
--- a/xorg-server/render/mitrap.c
+++ b/xorg-server/render/mitrap.c
@@ -1,189 +1,79 @@
-/*
- *
- * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
- *
- * 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, and that the name of Keith Packard not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  Keith Packard makes no
- * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.
- *
- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL KEITH 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 "scrnintstr.h"
-#include "gcstruct.h"
-#include "pixmapstr.h"
-#include "windowstr.h"
-#include "servermd.h"
-#include "mi.h"
-#include "picturestr.h"
-#include "mipict.h"
-
-PicturePtr
-miCreateAlphaPicture (ScreenPtr	    pScreen, 
-		      PicturePtr    pDst,
-		      PictFormatPtr pPictFormat,
-		      CARD16	    width,
-		      CARD16	    height)
-{
-    PixmapPtr	    pPixmap;
-    PicturePtr	    pPicture;
-    GCPtr	    pGC;
-    int		    error;
-    xRectangle	    rect;
-
-    if (width > 32767 || height > 32767)
-	return 0;
-
-    if (!pPictFormat)
-    {
-	if (pDst->polyEdge == PolyEdgeSharp)
-	    pPictFormat = PictureMatchFormat (pScreen, 1, PICT_a1);
-	else
-	    pPictFormat = PictureMatchFormat (pScreen, 8, PICT_a8);
-	if (!pPictFormat)
-	    return 0;
-    }
-
-    pPixmap = (*pScreen->CreatePixmap) (pScreen, width, height, 
-					pPictFormat->depth, 0);
-    if (!pPixmap)
-	return 0;
-    pGC = GetScratchGC (pPixmap->drawable.depth, pScreen);
-    if (!pGC)
-    {
-	(*pScreen->DestroyPixmap) (pPixmap);
-	return 0;
-    }
-    ValidateGC (&pPixmap->drawable, pGC);
-    rect.x = 0;
-    rect.y = 0;
-    rect.width = width;
-    rect.height = height;
-    (*pGC->ops->PolyFillRect)(&pPixmap->drawable, pGC, 1, &rect);
-    FreeScratchGC (pGC);
-    pPicture = CreatePicture (0, &pPixmap->drawable, pPictFormat,
-			      0, 0, serverClient, &error);
-    (*pScreen->DestroyPixmap) (pPixmap);
-    return pPicture;
-}
-
-static xFixed
-miLineFixedX (xLineFixed *l, xFixed y, Bool ceil)
-{
-    xFixed	    dx = l->p2.x - l->p1.x;
-    xFixed_32_32    ex = (xFixed_32_32) (y - l->p1.y) * dx;
-    xFixed	    dy = l->p2.y - l->p1.y;
-    if (ceil)
-	ex += (dy - 1);
-    return l->p1.x + (xFixed) (ex / dy);
-}
-
-void
-miTrapezoidBounds (int ntrap, xTrapezoid *traps, BoxPtr box)
-{
-    box->y1 = MAXSHORT;
-    box->y2 = MINSHORT;
-    box->x1 = MAXSHORT;
-    box->x2 = MINSHORT;
-    for (; ntrap; ntrap--, traps++)
-    {
-	INT16 x1, y1, x2, y2;
-
-	if (!xTrapezoidValid(traps))
-	    continue;
-	y1 = xFixedToInt (traps->top);
-	if (y1 < box->y1)
-	    box->y1 = y1;
-	
-	y2 = xFixedToInt (xFixedCeil (traps->bottom));
-	if (y2 > box->y2)
-	    box->y2 = y2;
-	
-	x1 = xFixedToInt (min (miLineFixedX (&traps->left, traps->top, FALSE),
-			       miLineFixedX (&traps->left, traps->bottom, FALSE)));
-	if (x1 < box->x1)
-	    box->x1 = x1;
-	
-	x2 = xFixedToInt (xFixedCeil (max (miLineFixedX (&traps->right, traps->top, TRUE),
-					   miLineFixedX (&traps->right, traps->bottom, TRUE))));
-	if (x2 > box->x2)
-	    box->x2 = x2;
-    }
-}
-
-void
-miTrapezoids (CARD8	    op,
-	      PicturePtr    pSrc,
-	      PicturePtr    pDst,
-	      PictFormatPtr maskFormat,
-	      INT16	    xSrc,
-	      INT16	    ySrc,
-	      int	    ntrap,
-	      xTrapezoid    *traps)
-{
-    ScreenPtr		pScreen = pDst->pDrawable->pScreen;
-    PictureScreenPtr    ps = GetPictureScreen(pScreen);
-
-    /*
-     * Check for solid alpha add
-     */
-    if (op == PictOpAdd && miIsSolidAlpha (pSrc))
-    {
-	for (; ntrap; ntrap--, traps++)
-	    (*ps->RasterizeTrapezoid) (pDst, traps, 0, 0);
-    } 
-    else if (maskFormat)
-    {
-	PicturePtr	pPicture;
-	BoxRec		bounds;
-	INT16		xDst, yDst;
-	INT16		xRel, yRel;
-	
-	xDst = traps[0].left.p1.x >> 16;
-	yDst = traps[0].left.p1.y >> 16;
-
-	miTrapezoidBounds (ntrap, traps, &bounds);
-	if (bounds.y1 >= bounds.y2 || bounds.x1 >= bounds.x2)
-	    return;
-	pPicture = miCreateAlphaPicture (pScreen, pDst, maskFormat,
-					 bounds.x2 - bounds.x1,
-					 bounds.y2 - bounds.y1);
-	if (!pPicture)
-	    return;
-	for (; ntrap; ntrap--, traps++)
-	    (*ps->RasterizeTrapezoid) (pPicture, traps, 
-				       -bounds.x1, -bounds.y1);
-	xRel = bounds.x1 + xSrc - xDst;
-	yRel = bounds.y1 + ySrc - yDst;
-	CompositePicture (op, pSrc, pPicture, pDst,
-			  xRel, yRel, 0, 0, bounds.x1, bounds.y1,
-			  bounds.x2 - bounds.x1,
-			  bounds.y2 - bounds.y1);
-	FreePicture (pPicture, 0);
-    }
-    else
-    {
-	if (pDst->polyEdge == PolyEdgeSharp)
-	    maskFormat = PictureMatchFormat (pScreen, 1, PICT_a1);
-	else
-	    maskFormat = PictureMatchFormat (pScreen, 8, PICT_a8);
-	for (; ntrap; ntrap--, traps++)
-	    miTrapezoids (op, pSrc, pDst, maskFormat, xSrc, ySrc, 1, traps);
-    }
-}
+/*

+ *

+ * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.

+ *

+ * 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, and that the name of Keith Packard not be used in

+ * advertising or publicity pertaining to distribution of the software without

+ * specific, written prior permission.  Keith Packard makes no

+ * representations about the suitability of this software for any purpose.  It

+ * is provided "as is" without express or implied warranty.

+ *

+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+ * EVENT SHALL KEITH 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 "scrnintstr.h"

+#include "gcstruct.h"

+#include "pixmapstr.h"

+#include "windowstr.h"

+#include "servermd.h"

+#include "mi.h"

+#include "picturestr.h"

+#include "mipict.h"

+

+static xFixed

+miLineFixedX (xLineFixed *l, xFixed y, Bool ceil)

+{

+    xFixed	    dx = l->p2.x - l->p1.x;

+    xFixed_32_32    ex = (xFixed_32_32) (y - l->p1.y) * dx;

+    xFixed	    dy = l->p2.y - l->p1.y;

+    if (ceil)

+	ex += (dy - 1);

+    return l->p1.x + (xFixed) (ex / dy);

+}

+

+void

+miTrapezoidBounds (int ntrap, xTrapezoid *traps, BoxPtr box)

+{

+    box->y1 = MAXSHORT;

+    box->y2 = MINSHORT;

+    box->x1 = MAXSHORT;

+    box->x2 = MINSHORT;

+    for (; ntrap; ntrap--, traps++)

+    {

+	INT16 x1, y1, x2, y2;

+

+	if (!xTrapezoidValid(traps))

+	    continue;

+	y1 = xFixedToInt (traps->top);

+	if (y1 < box->y1)

+	    box->y1 = y1;

+	

+	y2 = xFixedToInt (xFixedCeil (traps->bottom));

+	if (y2 > box->y2)

+	    box->y2 = y2;

+	

+	x1 = xFixedToInt (min (miLineFixedX (&traps->left, traps->top, FALSE),

+			       miLineFixedX (&traps->left, traps->bottom, FALSE)));

+	if (x1 < box->x1)

+	    box->x1 = x1;

+	

+	x2 = xFixedToInt (xFixedCeil (max (miLineFixedX (&traps->right, traps->top, TRUE),

+					   miLineFixedX (&traps->right, traps->bottom, TRUE))));

+	if (x2 > box->x2)

+	    box->x2 = x2;

+    }

+}

diff --git a/xorg-server/render/mitri.c b/xorg-server/render/mitri.c
index 3e11cffd9..3ebb1a693 100644
--- a/xorg-server/render/mitri.c
+++ b/xorg-server/render/mitri.c
@@ -68,65 +68,6 @@ miTriangleBounds (int ntri, xTriangle *tris, BoxPtr bounds)
 }

 

 void

-miTriangles (CARD8	    op,

-	     PicturePtr	    pSrc,

-	     PicturePtr	    pDst,

-	     PictFormatPtr  maskFormat,

-	     INT16	    xSrc,

-	     INT16	    ySrc,

-	     int	    ntri,

-	     xTriangle	    *tris)

-{

-    ScreenPtr		pScreen = pDst->pDrawable->pScreen;

-    PictureScreenPtr    ps = GetPictureScreen(pScreen);

-    

-    /*

-     * Check for solid alpha add

-     */

-    if (op == PictOpAdd && miIsSolidAlpha (pSrc))

-    {

-	(*ps->AddTriangles) (pDst, 0, 0, ntri, tris);

-    }

-    else if (maskFormat)

-    {

-	BoxRec		bounds;

-	PicturePtr	pPicture;

-	INT16		xDst, yDst;

-	INT16		xRel, yRel;

-	

-	xDst = tris[0].p1.x >> 16;

-	yDst = tris[0].p1.y >> 16;

-

-	miTriangleBounds (ntri, tris, &bounds);

-	if (bounds.x2 <= bounds.x1 || bounds.y2 <= bounds.y1)

-	    return;

-	pPicture = miCreateAlphaPicture (pScreen, pDst, maskFormat,

-					 bounds.x2 - bounds.x1,

-					 bounds.y2 - bounds.y1);

-	if (!pPicture)

-	    return;

-	(*ps->AddTriangles) (pPicture, -bounds.x1, -bounds.y1, ntri, tris);

-	

-	xRel = bounds.x1 + xSrc - xDst;

-	yRel = bounds.y1 + ySrc - yDst;

-	CompositePicture (op, pSrc, pPicture, pDst,

-			  xRel, yRel, 0, 0, bounds.x1, bounds.y1,

-			  bounds.x2 - bounds.x1, bounds.y2 - bounds.y1);

-	FreePicture (pPicture, 0);

-    }

-    else

-    {

-	if (pDst->polyEdge == PolyEdgeSharp)

-	    maskFormat = PictureMatchFormat (pScreen, 1, PICT_a1);

-	else

-	    maskFormat = PictureMatchFormat (pScreen, 8, PICT_a8);

-	

-	for (; ntri; ntri--, tris++)

-	    miTriangles (op, pSrc, pDst, maskFormat, xSrc, ySrc, 1, tris);

-    }

-}

-

-void

 miTriStrip (CARD8	    op,

 	    PicturePtr	    pSrc,

 	    PicturePtr	    pDst,

diff --git a/xorg-server/test/input.c b/xorg-server/test/input.c
index 3e6619181..9a1ac632e 100644
--- a/xorg-server/test/input.c
+++ b/xorg-server/test/input.c
@@ -149,29 +149,32 @@ static void dix_check_grab_values(void)
 static void dix_event_to_core(int type)

 {

     DeviceEvent ev;

-    xEvent core;

+    xEvent *core;

     int time;

     int x, y;

     int rc;

     int state;

     int detail;

+    int count;

     const int ROOT_WINDOW_ID = 0x100;

 

     /* EventToCore memsets the event to 0 */

 #define test_event() \

     g_assert(rc == Success); \

-    g_assert(core.u.u.type == type); \

-    g_assert(core.u.u.detail == detail); \

-    g_assert(core.u.keyButtonPointer.time == time); \

-    g_assert(core.u.keyButtonPointer.rootX == x); \

-    g_assert(core.u.keyButtonPointer.rootY == y); \

-    g_assert(core.u.keyButtonPointer.state == state); \

-    g_assert(core.u.keyButtonPointer.eventX == 0); \

-    g_assert(core.u.keyButtonPointer.eventY == 0); \

-    g_assert(core.u.keyButtonPointer.root == ROOT_WINDOW_ID); \

-    g_assert(core.u.keyButtonPointer.event == 0); \

-    g_assert(core.u.keyButtonPointer.child == 0); \

-    g_assert(core.u.keyButtonPointer.sameScreen == FALSE);

+    g_assert(core); \

+    g_assert(count == 1); \

+    g_assert(core->u.u.type == type); \

+    g_assert(core->u.u.detail == detail); \

+    g_assert(core->u.keyButtonPointer.time == time); \

+    g_assert(core->u.keyButtonPointer.rootX == x); \

+    g_assert(core->u.keyButtonPointer.rootY == y); \

+    g_assert(core->u.keyButtonPointer.state == state); \

+    g_assert(core->u.keyButtonPointer.eventX == 0); \

+    g_assert(core->u.keyButtonPointer.eventY == 0); \

+    g_assert(core->u.keyButtonPointer.root == ROOT_WINDOW_ID); \

+    g_assert(core->u.keyButtonPointer.event == 0); \

+    g_assert(core->u.keyButtonPointer.child == 0); \

+    g_assert(core->u.keyButtonPointer.sameScreen == FALSE);

 

     x = 0;

     y = 0;

@@ -192,30 +195,33 @@ static void dix_event_to_core(int type)
 

     ev.type = type;

     ev.detail.key = 0;

-    rc = EventToCore((InternalEvent*)&ev, &core);

+    rc = EventToCore((InternalEvent*)&ev, &core, &count);

     test_event();

 

     x = 1;

     y = 2;

     ev.root_x = x;

     ev.root_y = y;

-    rc = EventToCore((InternalEvent*)&ev, &core);

+    rc = EventToCore((InternalEvent*)&ev, &core, &count);

     test_event();

 

     x = 0x7FFF;

     y = 0x7FFF;

     ev.root_x = x;

     ev.root_y = y;

-    rc = EventToCore((InternalEvent*)&ev, &core);

+    rc = EventToCore((InternalEvent*)&ev, &core, &count);

     test_event();

 

     x = 0x8000; /* too high */

     y = 0x8000; /* too high */

     ev.root_x = x;

     ev.root_y = y;

-    rc = EventToCore((InternalEvent*)&ev, &core);

-    g_assert(core.u.keyButtonPointer.rootX != x);

-    g_assert(core.u.keyButtonPointer.rootY != y);

+    rc = EventToCore((InternalEvent*)&ev, &core, &count);

+    g_assert(rc == Success);

+    g_assert(core);

+    g_assert(count == 1);

+    g_assert(core->u.keyButtonPointer.rootX != x);

+    g_assert(core->u.keyButtonPointer.rootY != y);

 

     x = 0x7FFF;

     y = 0x7FFF;

@@ -223,36 +229,39 @@ static void dix_event_to_core(int type)
     ev.root_y = y;

     time = 0;

     ev.time = time;

-    rc = EventToCore((InternalEvent*)&ev, &core);

+    rc = EventToCore((InternalEvent*)&ev, &core, &count);

     test_event();

 

     detail = 1;

     ev.detail.key = detail;

-    rc = EventToCore((InternalEvent*)&ev, &core);

+    rc = EventToCore((InternalEvent*)&ev, &core, &count);

     test_event();

 

     detail = 0xFF; /* highest value */

     ev.detail.key = detail;

-    rc = EventToCore((InternalEvent*)&ev, &core);

+    rc = EventToCore((InternalEvent*)&ev, &core, &count);

     test_event();

 

     detail = 0xFFF; /* too big */

     ev.detail.key = detail;

-    rc = EventToCore((InternalEvent*)&ev, &core);

+    rc = EventToCore((InternalEvent*)&ev, &core, &count);

     g_assert(rc == BadMatch);

 

     detail = 0xFF; /* too big */

     ev.detail.key = detail;

     state = 0xFFFF; /* highest value */

     ev.corestate = state;

-    rc = EventToCore((InternalEvent*)&ev, &core);

+    rc = EventToCore((InternalEvent*)&ev, &core, &count);

     test_event();

 

     state = 0x10000; /* too big */

     ev.corestate = state;

-    rc = EventToCore((InternalEvent*)&ev, &core);

-    g_assert(core.u.keyButtonPointer.state != state);

-    g_assert(core.u.keyButtonPointer.state == (state & 0xFFFF));

+    rc = EventToCore((InternalEvent*)&ev, &core, &count);

+    g_assert(rc == Success);

+    g_assert(core);

+    g_assert(count == 1);

+    g_assert(core->u.keyButtonPointer.state != state);

+    g_assert(core->u.keyButtonPointer.state == (state & 0xFFFF));

 

 #undef test_event

 }

@@ -260,14 +269,15 @@ static void dix_event_to_core(int type)
 static void dix_event_to_core_fail(int evtype, int expected_rc)

 {

     DeviceEvent ev;

-    xEvent core;

+    xEvent *core;

     int rc;

+    int count;

 

     ev.header   = 0xFF;

     ev.length   = sizeof(DeviceEvent);

 

     ev.type     = evtype;

-    rc = EventToCore((InternalEvent*)&ev, &core);

+    rc = EventToCore((InternalEvent*)&ev, &core, &count);

     g_assert(rc == expected_rc);

 }

 

diff --git a/xorg-server/test/xi2/protocol-xiquerypointer.c b/xorg-server/test/xi2/protocol-xiquerypointer.c
index 810c61575..95c8b4bc1 100644
--- a/xorg-server/test/xi2/protocol-xiquerypointer.c
+++ b/xorg-server/test/xi2/protocol-xiquerypointer.c
@@ -1,220 +1,220 @@
-/**
- * Copyright © 2009 Red Hat, Inc.
- *
- *  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 (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 NONINFRINGEMENT.  IN NO EVENT SHALL
- *  THE AUTHORS OR COPYRIGHT HOLDERS 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.
- */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-/*
- * Protocol testing for XIQueryPointer request.
- */
-#include <stdint.h>
-#include <X11/X.h>
-#include <X11/Xproto.h>
-#include <X11/extensions/XI2proto.h>
-#include "inputstr.h"
-#include "windowstr.h"
-#include "scrnintstr.h"
-#include "xiquerypointer.h"
-#include "exevents.h"
-
-#include "protocol-common.h"
-#include <glib.h>
-
-static ClientRec client_request;
-static void reply_XIQueryPointer_data(ClientPtr client, int len,
-                                      char *data, void *userdata);
-
-static struct {
-    DeviceIntPtr dev;
-    WindowPtr win;
-} test_data;
-
-
-/* dixLookupWindow requires a lot of setup not necessary for this test.
- * Simple wrapper that returns either one of the fake root window or the
- * fake client window. If the requested ID is neither of those wanted,
- * return whatever the real dixLookupWindow does.
- */
-int __wrap_dixLookupWindow(WindowPtr *win, XID id, ClientPtr client, Mask access)
-{
-    if (id == root.drawable.id)
-    {
-        *win = &root;
-        return Success;
-    } else if (id == window.drawable.id)
-    {
-        *win = &window;
-        return Success;
-    }
-
-    return __real_dixLookupWindow(win, id, client, access);
-}
-
-static void reply_XIQueryPointer(ClientPtr client, int len, char *data,
-                                 void *userdata)
-{
-    xXIQueryPointerReply *rep = (xXIQueryPointerReply*)data;
-    SpritePtr sprite;
-
-    if (!rep->repType)
-        return;
-
-    if (client->swapped)
-    {
-        char n;
-        swapl(&rep->length, n);
-        swaps(&rep->sequenceNumber, n);
-        swapl(&rep->root, n);
-        swapl(&rep->child, n);
-        swapl(&rep->root_x, n);
-        swapl(&rep->root_y, n);
-        swapl(&rep->win_x, n);
-        swapl(&rep->win_y, n);
-        swaps(&rep->buttons_len, n);
-    }
-
-    reply_check_defaults(rep, len, XIQueryPointer);
-
-    g_assert(rep->root == root.drawable.id);
-    g_assert(rep->same_screen == xTrue);
-
-    sprite = test_data.dev->spriteInfo->sprite;
-    g_assert((rep->root_x >> 16) == sprite->hot.x);
-    g_assert((rep->root_y >> 16) == sprite->hot.y);
-
-    if (test_data.win == &root)
-    {
-        g_assert(rep->root_x == rep->win_x);
-        g_assert(rep->root_y == rep->win_y);
-        g_assert(rep->child == window.drawable.id);
-    } else
-    {
-        int x, y;
-
-        x = sprite->hot.x - window.drawable.x;
-        y = sprite->hot.y - window.drawable.y;
-
-        g_assert((rep->win_x >> 16) == x);
-        g_assert((rep->win_y >> 16) == y);
-        g_assert(rep->child == None);
-    }
-
-
-    g_assert(rep->same_screen == xTrue);
-
-    reply_handler = reply_XIQueryPointer_data;
-}
-
-static void reply_XIQueryPointer_data(ClientPtr client, int len, char *data, void *userdata)
-{
-    reply_handler = reply_XIQueryPointer;
-}
-
-static void request_XIQueryPointer(ClientPtr client, xXIQueryPointerReq* req, int error)
-{
-    char n;
-    int rc;
-
-    rc = ProcXIQueryPointer(&client_request);
-    g_assert(rc == error);
-
-    if (rc == BadDevice)
-        g_assert(client_request.errorValue == req->deviceid);
-
-    client_request.swapped = TRUE;
-    swaps(&req->deviceid, n);
-    swaps(&req->length, n);
-    rc = SProcXIQueryPointer(&client_request);
-    g_assert(rc == error);
-
-    if (rc == BadDevice)
-        g_assert(client_request.errorValue == req->deviceid);
-}
-
-static void test_XIQueryPointer(void)
-{
-    int i;
-    xXIQueryPointerReq request;
-
-    memset(&request, 0, sizeof(request));
-
-    request_init(&request, XIQueryPointer);
-
-    reply_handler = reply_XIQueryPointer;
-
-    client_request = init_client(request.length, &request);
-
-    request.deviceid = XIAllDevices;
-    request_XIQueryPointer(&client_request, &request, BadDevice);
-
-    request.deviceid = XIAllMasterDevices;
-    request_XIQueryPointer(&client_request, &request, BadDevice);
-
-    request.win = root.drawable.id;
-    test_data.win = &root;
-
-    test_data.dev = devices.vcp;
-    request.deviceid = devices.vcp->id;
-    request_XIQueryPointer(&client_request, &request, Success);
-    request.deviceid = devices.vck->id;
-    request_XIQueryPointer(&client_request, &request, BadDevice);
-    request.deviceid = devices.mouse->id;
-    request_XIQueryPointer(&client_request, &request, BadDevice);
-    request.deviceid = devices.kbd->id;
-    request_XIQueryPointer(&client_request, &request, BadDevice);
-
-    test_data.dev = devices.mouse;
-    devices.mouse->u.master = NULL; /* Float, kind-of */
-    request.deviceid = devices.mouse->id;
-    request_XIQueryPointer(&client_request, &request, Success);
-
-    for (i = devices.kbd->id + 1; i <= 0xFFFF; i++)
-    {
-        request.deviceid = i;
-        request_XIQueryPointer(&client_request, &request, BadDevice);
-    }
-
-    request.win = window.drawable.id;
-
-    test_data.dev = devices.vcp;
-    test_data.win = &window;
-    request.deviceid = devices.vcp->id;
-    request_XIQueryPointer(&client_request, &request, Success);
-
-    test_data.dev = devices.mouse;
-    request.deviceid = devices.mouse->id;
-    request_XIQueryPointer(&client_request, &request, Success);
-}
-
-int main(int argc, char** argv)
-{
-    g_test_init(&argc, &argv,NULL);
-    g_test_bug_base("https://bugzilla.freedesktop.org/show_bug.cgi?id=");
-
-    init_simple();
-
-    g_test_add_func("/xi2/protocol/XIQueryPointer", test_XIQueryPointer);
-
-    return g_test_run();
-}
+/**

+ * Copyright © 2009 Red Hat, Inc.

+ *

+ *  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 (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 NONINFRINGEMENT.  IN NO EVENT SHALL

+ *  THE AUTHORS OR COPYRIGHT HOLDERS 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.

+ */

+

+#ifdef HAVE_DIX_CONFIG_H

+#include <dix-config.h>

+#endif

+

+/*

+ * Protocol testing for XIQueryPointer request.

+ */

+#include <stdint.h>

+#include <X11/X.h>

+#include <X11/Xproto.h>

+#include <X11/extensions/XI2proto.h>

+#include "inputstr.h"

+#include "windowstr.h"

+#include "scrnintstr.h"

+#include "xiquerypointer.h"

+#include "exevents.h"

+

+#include "protocol-common.h"

+#include <glib.h>

+

+static ClientRec client_request;

+static void reply_XIQueryPointer_data(ClientPtr client, int len,

+                                      char *data, void *userdata);

+

+static struct {

+    DeviceIntPtr dev;

+    WindowPtr win;

+} test_data;

+

+

+/* dixLookupWindow requires a lot of setup not necessary for this test.

+ * Simple wrapper that returns either one of the fake root window or the

+ * fake client window. If the requested ID is neither of those wanted,

+ * return whatever the real dixLookupWindow does.

+ */

+int __wrap_dixLookupWindow(WindowPtr *win, XID id, ClientPtr client, Mask access)

+{

+    if (id == root.drawable.id)

+    {

+        *win = &root;

+        return Success;

+    } else if (id == window.drawable.id)

+    {

+        *win = &window;

+        return Success;

+    }

+

+    return __real_dixLookupWindow(win, id, client, access);

+}

+

+static void reply_XIQueryPointer(ClientPtr client, int len, char *data,

+                                 void *userdata)

+{

+    xXIQueryPointerReply *rep = (xXIQueryPointerReply*)data;

+    SpritePtr sprite;

+

+    if (!rep->repType)

+        return;

+

+    if (client->swapped)

+    {

+        char n;

+        swapl(&rep->length, n);

+        swaps(&rep->sequenceNumber, n);

+        swapl(&rep->root, n);

+        swapl(&rep->child, n);

+        swapl(&rep->root_x, n);

+        swapl(&rep->root_y, n);

+        swapl(&rep->win_x, n);

+        swapl(&rep->win_y, n);

+        swaps(&rep->buttons_len, n);

+    }

+

+    reply_check_defaults(rep, len, XIQueryPointer);

+

+    g_assert(rep->root == root.drawable.id);

+    g_assert(rep->same_screen == xTrue);

+

+    sprite = test_data.dev->spriteInfo->sprite;

+    g_assert((rep->root_x >> 16) == sprite->hot.x);

+    g_assert((rep->root_y >> 16) == sprite->hot.y);

+

+    if (test_data.win == &root)

+    {

+        g_assert(rep->root_x == rep->win_x);

+        g_assert(rep->root_y == rep->win_y);

+        g_assert(rep->child == window.drawable.id);

+    } else

+    {

+        int x, y;

+

+        x = sprite->hot.x - window.drawable.x;

+        y = sprite->hot.y - window.drawable.y;

+

+        g_assert((rep->win_x >> 16) == x);

+        g_assert((rep->win_y >> 16) == y);

+        g_assert(rep->child == None);

+    }

+

+

+    g_assert(rep->same_screen == xTrue);

+

+    reply_handler = reply_XIQueryPointer_data;

+}

+

+static void reply_XIQueryPointer_data(ClientPtr client, int len, char *data, void *userdata)

+{

+    reply_handler = reply_XIQueryPointer;

+}

+

+static void request_XIQueryPointer(ClientPtr client, xXIQueryPointerReq* req, int error)

+{

+    char n;

+    int rc;

+

+    rc = ProcXIQueryPointer(&client_request);

+    g_assert(rc == error);

+

+    if (rc == BadDevice)

+        g_assert(client_request.errorValue == req->deviceid);

+

+    client_request.swapped = TRUE;

+    swaps(&req->deviceid, n);

+    swaps(&req->length, n);

+    rc = SProcXIQueryPointer(&client_request);

+    g_assert(rc == error);

+

+    if (rc == BadDevice)

+        g_assert(client_request.errorValue == req->deviceid);

+}

+

+static void test_XIQueryPointer(void)

+{

+    int i;

+    xXIQueryPointerReq request;

+

+    memset(&request, 0, sizeof(request));

+

+    request_init(&request, XIQueryPointer);

+

+    reply_handler = reply_XIQueryPointer;

+

+    client_request = init_client(request.length, &request);

+

+    request.deviceid = XIAllDevices;

+    request_XIQueryPointer(&client_request, &request, BadDevice);

+

+    request.deviceid = XIAllMasterDevices;

+    request_XIQueryPointer(&client_request, &request, BadDevice);

+

+    request.win = root.drawable.id;

+    test_data.win = &root;

+

+    test_data.dev = devices.vcp;

+    request.deviceid = devices.vcp->id;

+    request_XIQueryPointer(&client_request, &request, Success);

+    request.deviceid = devices.vck->id;

+    request_XIQueryPointer(&client_request, &request, BadDevice);

+    request.deviceid = devices.mouse->id;

+    request_XIQueryPointer(&client_request, &request, BadDevice);

+    request.deviceid = devices.kbd->id;

+    request_XIQueryPointer(&client_request, &request, BadDevice);

+

+    test_data.dev = devices.mouse;

+    devices.mouse->master = NULL; /* Float, kind-of */

+    request.deviceid = devices.mouse->id;

+    request_XIQueryPointer(&client_request, &request, Success);

+

+    for (i = devices.kbd->id + 1; i <= 0xFFFF; i++)

+    {

+        request.deviceid = i;

+        request_XIQueryPointer(&client_request, &request, BadDevice);

+    }

+

+    request.win = window.drawable.id;

+

+    test_data.dev = devices.vcp;

+    test_data.win = &window;

+    request.deviceid = devices.vcp->id;

+    request_XIQueryPointer(&client_request, &request, Success);

+

+    test_data.dev = devices.mouse;

+    request.deviceid = devices.mouse->id;

+    request_XIQueryPointer(&client_request, &request, Success);

+}

+

+int main(int argc, char** argv)

+{

+    g_test_init(&argc, &argv,NULL);

+    g_test_bug_base("https://bugzilla.freedesktop.org/show_bug.cgi?id=");

+

+    init_simple();

+

+    g_test_add_func("/xi2/protocol/XIQueryPointer", test_XIQueryPointer);

+

+    return g_test_run();

+}

diff --git a/xorg-server/test/xi2/protocol-xiwarppointer.c b/xorg-server/test/xi2/protocol-xiwarppointer.c
index 4f8860ea0..98169b154 100644
--- a/xorg-server/test/xi2/protocol-xiwarppointer.c
+++ b/xorg-server/test/xi2/protocol-xiwarppointer.c
@@ -1,216 +1,216 @@
-/**
- * Copyright © 2009 Red Hat, Inc.
- *
- *  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 (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 NONINFRINGEMENT.  IN NO EVENT SHALL
- *  THE AUTHORS OR COPYRIGHT HOLDERS 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.
- */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-/*
- * Protocol testing for XIWarpPointer request.
- */
-#include <stdint.h>
-#include <X11/X.h>
-#include <X11/Xproto.h>
-#include <X11/extensions/XI2proto.h>
-#include "inputstr.h"
-#include "windowstr.h"
-#include "scrnintstr.h"
-#include "xiwarppointer.h"
-#include "exevents.h"
-
-#include "protocol-common.h"
-#include <glib.h>
-
-static int expected_x = SPRITE_X;
-static int expected_y = SPRITE_Y;
-
-/* dixLookupWindow requires a lot of setup not necessary for this test.
- * Simple wrapper that returns either one of the fake root window or the
- * fake client window. If the requested ID is neither of those wanted,
- * return whatever the real dixLookupWindow does.
- */
-int __wrap_dixLookupWindow(WindowPtr *win, XID id, ClientPtr client, Mask access)
-{
-    if (id == root.drawable.id)
-    {
-        *win = &root;
-        return Success;
-    } else if (id == window.drawable.id)
-    {
-        *win = &window;
-        return Success;
-    }
-
-    return __real_dixLookupWindow(win, id, client, access);
-}
-
-/**
- * This function overrides the one in the screen rec.
- */
-static Bool ScreenSetCursorPosition(DeviceIntPtr dev, ScreenPtr screen,
-                                    int x, int y, Bool generateEvent)
-{
-    g_assert(x == expected_x);
-    g_assert(y == expected_y);
-    return TRUE;
-}
-
-
-static void request_XIWarpPointer(ClientPtr client, xXIWarpPointerReq* req,
-        int error)
-{
-    char n;
-    int rc;
-
-    rc = ProcXIWarpPointer(client);
-    g_assert(rc == error);
-
-    if (rc == BadDevice)
-        g_assert(client->errorValue == req->deviceid);
-    else if (rc == BadWindow)
-        g_assert(client->errorValue == req->dst_win ||
-                 client->errorValue == req->src_win);
-
-
-    client->swapped = TRUE;
-
-    swapl(&req->src_win, n);
-    swapl(&req->dst_win, n);
-    swapl(&req->src_x, n);
-    swapl(&req->src_y, n);
-    swapl(&req->dst_x, n);
-    swapl(&req->dst_y, n);
-    swaps(&req->src_width, n);
-    swaps(&req->src_height, n);
-    swaps(&req->deviceid, n);
-
-    rc = SProcXIWarpPointer(client);
-    g_assert(rc == error);
-
-    if (rc == BadDevice)
-        g_assert(client->errorValue == req->deviceid);
-    else if (rc == BadWindow)
-        g_assert(client->errorValue == req->dst_win ||
-                 client->errorValue == req->src_win);
-
-    client->swapped = FALSE;
-}
-
-static void test_XIWarpPointer(void)
-{
-    int i;
-    ClientRec client_request;
-    xXIWarpPointerReq request;
-
-    memset(&request, 0, sizeof(request));
-
-    request_init(&request, XIWarpPointer);
-
-    client_request = init_client(request.length, &request);
-
-    request.deviceid = XIAllDevices;
-    request_XIWarpPointer(&client_request, &request, BadDevice);
-
-    request.deviceid = XIAllMasterDevices;
-    request_XIWarpPointer(&client_request, &request, BadDevice);
-
-    request.src_win = root.drawable.id;
-    request.dst_win = root.drawable.id;
-    request.deviceid = devices.vcp->id;
-    request_XIWarpPointer(&client_request, &request, Success);
-    request.deviceid = devices.vck->id;
-    request_XIWarpPointer(&client_request, &request, BadDevice);
-    request.deviceid = devices.mouse->id;
-    request_XIWarpPointer(&client_request, &request, BadDevice);
-    request.deviceid = devices.kbd->id;
-    request_XIWarpPointer(&client_request, &request, BadDevice);
-
-    devices.mouse->u.master = NULL; /* Float, kind-of */
-    request.deviceid = devices.mouse->id;
-    request_XIWarpPointer(&client_request, &request, Success);
-
-    for (i = devices.kbd->id + 1; i <= 0xFFFF; i++)
-    {
-        request.deviceid = i;
-        request_XIWarpPointer(&client_request, &request, BadDevice);
-    }
-
-    request.src_win = window.drawable.id;
-    request.deviceid = devices.vcp->id;
-    request_XIWarpPointer(&client_request, &request, Success);
-
-    request.deviceid = devices.mouse->id;
-    request_XIWarpPointer(&client_request, &request, Success);
-
-    request.src_win = root.drawable.id;
-    request.dst_win = 0xFFFF; /* invalid window */
-    request_XIWarpPointer(&client_request, &request, BadWindow);
-
-    request.src_win = 0xFFFF; /* invalid window */
-    request.dst_win = root.drawable.id;
-    request_XIWarpPointer(&client_request, &request, BadWindow);
-
-    request.src_win = None;
-    request.dst_win = None;
-
-    request.dst_y = 0;
-    expected_y = SPRITE_Y;
-
-    request.dst_x = 1 << 16;
-    expected_x = SPRITE_X + 1;
-    request.deviceid = devices.vcp->id;
-    request_XIWarpPointer(&client_request, &request, Success);
-
-    request.dst_x = -1 << 16;
-    expected_x = SPRITE_X - 1;
-    request.deviceid = devices.vcp->id;
-    request_XIWarpPointer(&client_request, &request, Success);
-
-    request.dst_x = 0;
-    expected_x = SPRITE_X;
-
-    request.dst_y = 1 << 16;
-    expected_y = SPRITE_Y + 1;
-    request.deviceid = devices.vcp->id;
-    request_XIWarpPointer(&client_request, &request, Success);
-
-    request.dst_y = -1 << 16;
-    expected_y = SPRITE_Y - 1;
-    request.deviceid = devices.vcp->id;
-    request_XIWarpPointer(&client_request, &request, Success);
-
-    /* FIXME: src_x/y checks */
-}
-
-int main(int argc, char** argv)
-{
-    g_test_init(&argc, &argv,NULL);
-    g_test_bug_base("https://bugzilla.freedesktop.org/show_bug.cgi?id=");
-
-    init_simple();
-    screen.SetCursorPosition = ScreenSetCursorPosition;
-
-    g_test_add_func("/xi2/protocol/XIWarpPointer", test_XIWarpPointer);
-
-    return g_test_run();
-}
+/**

+ * Copyright © 2009 Red Hat, Inc.

+ *

+ *  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 (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 NONINFRINGEMENT.  IN NO EVENT SHALL

+ *  THE AUTHORS OR COPYRIGHT HOLDERS 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.

+ */

+

+#ifdef HAVE_DIX_CONFIG_H

+#include <dix-config.h>

+#endif

+

+/*

+ * Protocol testing for XIWarpPointer request.

+ */

+#include <stdint.h>

+#include <X11/X.h>

+#include <X11/Xproto.h>

+#include <X11/extensions/XI2proto.h>

+#include "inputstr.h"

+#include "windowstr.h"

+#include "scrnintstr.h"

+#include "xiwarppointer.h"

+#include "exevents.h"

+

+#include "protocol-common.h"

+#include <glib.h>

+

+static int expected_x = SPRITE_X;

+static int expected_y = SPRITE_Y;

+

+/* dixLookupWindow requires a lot of setup not necessary for this test.

+ * Simple wrapper that returns either one of the fake root window or the

+ * fake client window. If the requested ID is neither of those wanted,

+ * return whatever the real dixLookupWindow does.

+ */

+int __wrap_dixLookupWindow(WindowPtr *win, XID id, ClientPtr client, Mask access)

+{

+    if (id == root.drawable.id)

+    {

+        *win = &root;

+        return Success;

+    } else if (id == window.drawable.id)

+    {

+        *win = &window;

+        return Success;

+    }

+

+    return __real_dixLookupWindow(win, id, client, access);

+}

+

+/**

+ * This function overrides the one in the screen rec.

+ */

+static Bool ScreenSetCursorPosition(DeviceIntPtr dev, ScreenPtr screen,

+                                    int x, int y, Bool generateEvent)

+{

+    g_assert(x == expected_x);

+    g_assert(y == expected_y);

+    return TRUE;

+}

+

+

+static void request_XIWarpPointer(ClientPtr client, xXIWarpPointerReq* req,

+        int error)

+{

+    char n;

+    int rc;

+

+    rc = ProcXIWarpPointer(client);

+    g_assert(rc == error);

+

+    if (rc == BadDevice)

+        g_assert(client->errorValue == req->deviceid);

+    else if (rc == BadWindow)

+        g_assert(client->errorValue == req->dst_win ||

+                 client->errorValue == req->src_win);

+

+

+    client->swapped = TRUE;

+

+    swapl(&req->src_win, n);

+    swapl(&req->dst_win, n);

+    swapl(&req->src_x, n);

+    swapl(&req->src_y, n);

+    swapl(&req->dst_x, n);

+    swapl(&req->dst_y, n);

+    swaps(&req->src_width, n);

+    swaps(&req->src_height, n);

+    swaps(&req->deviceid, n);

+

+    rc = SProcXIWarpPointer(client);

+    g_assert(rc == error);

+

+    if (rc == BadDevice)

+        g_assert(client->errorValue == req->deviceid);

+    else if (rc == BadWindow)

+        g_assert(client->errorValue == req->dst_win ||

+                 client->errorValue == req->src_win);

+

+    client->swapped = FALSE;

+}

+

+static void test_XIWarpPointer(void)

+{

+    int i;

+    ClientRec client_request;

+    xXIWarpPointerReq request;

+

+    memset(&request, 0, sizeof(request));

+

+    request_init(&request, XIWarpPointer);

+

+    client_request = init_client(request.length, &request);

+

+    request.deviceid = XIAllDevices;

+    request_XIWarpPointer(&client_request, &request, BadDevice);

+

+    request.deviceid = XIAllMasterDevices;

+    request_XIWarpPointer(&client_request, &request, BadDevice);

+

+    request.src_win = root.drawable.id;

+    request.dst_win = root.drawable.id;

+    request.deviceid = devices.vcp->id;

+    request_XIWarpPointer(&client_request, &request, Success);

+    request.deviceid = devices.vck->id;

+    request_XIWarpPointer(&client_request, &request, BadDevice);

+    request.deviceid = devices.mouse->id;

+    request_XIWarpPointer(&client_request, &request, BadDevice);

+    request.deviceid = devices.kbd->id;

+    request_XIWarpPointer(&client_request, &request, BadDevice);

+

+    devices.mouse->master = NULL; /* Float, kind-of */

+    request.deviceid = devices.mouse->id;

+    request_XIWarpPointer(&client_request, &request, Success);

+

+    for (i = devices.kbd->id + 1; i <= 0xFFFF; i++)

+    {

+        request.deviceid = i;

+        request_XIWarpPointer(&client_request, &request, BadDevice);

+    }

+

+    request.src_win = window.drawable.id;

+    request.deviceid = devices.vcp->id;

+    request_XIWarpPointer(&client_request, &request, Success);

+

+    request.deviceid = devices.mouse->id;

+    request_XIWarpPointer(&client_request, &request, Success);

+

+    request.src_win = root.drawable.id;

+    request.dst_win = 0xFFFF; /* invalid window */

+    request_XIWarpPointer(&client_request, &request, BadWindow);

+

+    request.src_win = 0xFFFF; /* invalid window */

+    request.dst_win = root.drawable.id;

+    request_XIWarpPointer(&client_request, &request, BadWindow);

+

+    request.src_win = None;

+    request.dst_win = None;

+

+    request.dst_y = 0;

+    expected_y = SPRITE_Y;

+

+    request.dst_x = 1 << 16;

+    expected_x = SPRITE_X + 1;

+    request.deviceid = devices.vcp->id;

+    request_XIWarpPointer(&client_request, &request, Success);

+

+    request.dst_x = -1 << 16;

+    expected_x = SPRITE_X - 1;

+    request.deviceid = devices.vcp->id;

+    request_XIWarpPointer(&client_request, &request, Success);

+

+    request.dst_x = 0;

+    expected_x = SPRITE_X;

+

+    request.dst_y = 1 << 16;

+    expected_y = SPRITE_Y + 1;

+    request.deviceid = devices.vcp->id;

+    request_XIWarpPointer(&client_request, &request, Success);

+

+    request.dst_y = -1 << 16;

+    expected_y = SPRITE_Y - 1;

+    request.deviceid = devices.vcp->id;

+    request_XIWarpPointer(&client_request, &request, Success);

+

+    /* FIXME: src_x/y checks */

+}

+

+int main(int argc, char** argv)

+{

+    g_test_init(&argc, &argv,NULL);

+    g_test_bug_base("https://bugzilla.freedesktop.org/show_bug.cgi?id=");

+

+    init_simple();

+    screen.SetCursorPosition = ScreenSetCursorPosition;

+

+    g_test_add_func("/xi2/protocol/XIWarpPointer", test_XIWarpPointer);

+

+    return g_test_run();

+}

diff --git a/xorg-server/xkb/XKBGAlloc.c b/xorg-server/xkb/XKBGAlloc.c
index d5e49349e..db32dc8c5 100644
--- a/xorg-server/xkb/XKBGAlloc.c
+++ b/xorg-server/xkb/XKBGAlloc.c
@@ -647,9 +647,7 @@ register XkbPropertyPtr prop;
     for (i=0,prop=geom->properties;i<geom->num_properties;i++,prop++) {

 	if ((prop->name)&&(strcmp(name,prop->name)==0)) {

 	    free(prop->value);

-	    prop->value= malloc(strlen(value)+1);

-	    if (prop->value)

-		strcpy(prop->value,value);

+	    prop->value= strdup(value);

 	    return prop;

 	}    

     }

@@ -658,17 +656,15 @@ register XkbPropertyPtr prop;
 	return NULL;

     }

     prop= &geom->properties[geom->num_properties];

-    prop->name= malloc(strlen(name)+1);

-    if (!name)

+    prop->name= strdup(name);

+    if (!prop->name)

 	return NULL;

-    strcpy(prop->name,name);

-    prop->value= malloc(strlen(value)+1);

-    if (!value) {

+    prop->value= strdup(value);

+    if (!prop->value) {

 	free(prop->name);

 	prop->name= NULL;

 	return NULL;

     }

-    strcpy(prop->value,value);

     geom->num_properties++;

     return prop;

 }

@@ -720,10 +716,9 @@ register XkbColorPtr color;
     }

     color= &geom->colors[geom->num_colors];

     color->pixel= pixel;

-    color->spec= malloc(strlen(spec)+1);

+    color->spec= strdup(spec);

     if (!color->spec)

 	return NULL;

-    strcpy(color->spec,spec);

     geom->num_colors++;

     return color;

 }

diff --git a/xorg-server/xkb/ddxLoad.c b/xorg-server/xkb/ddxLoad.c
index decad1e33..8b3dab56d 100644
--- a/xorg-server/xkb/ddxLoad.c
+++ b/xorg-server/xkb/ddxLoad.c
@@ -307,15 +307,16 @@ FILE *	file;
                 &&(!isalpha(xkm_output_dir[0]) || xkm_output_dir[1]!=':')

 #endif

                 ) {

-	    if (strlen(XkbBaseDirectory)+strlen(xkm_output_dir)

-		     +strlen(mapName)+6 <= PATH_MAX)

-	    {

-	        sprintf(buf,"%s/%s%s.xkm",XkbBaseDirectory,

-					xkm_output_dir,mapName);

-	    }

+            if (snprintf(buf, PATH_MAX, "%s/%s%s.xkm", XkbBaseDirectory,

+                         xkm_output_dir, mapName) >= PATH_MAX)

+                buf[0] = '\0';

+	}

+	else

+	{

+            if (snprintf(buf, PATH_MAX, "%s%s.xkm", xkm_output_dir, mapName)

+                >= PATH_MAX)

+                buf[0] = '\0';

 	}

-	else if (strlen(xkm_output_dir)+strlen(mapName)+5 <= PATH_MAX)

-	    sprintf(buf,"%s%s.xkm",xkm_output_dir,mapName);

 	if (buf[0] != '\0')

 	    file= fopen(buf,"rb");

 	else file= NULL;

@@ -392,11 +393,11 @@ XkbRF_RulesPtr	rules;
     if (!rules_name)

 	return FALSE;

 

-    if (strlen(XkbBaseDirectory) + strlen(rules_name) + 8 > PATH_MAX) {

+    if (snprintf(buf, PATH_MAX, "%s/rules/%s", XkbBaseDirectory, rules_name)

+        >= PATH_MAX) {

         LogMessage(X_ERROR, "XKB: Rules name is too long\n");

         return FALSE;

     }

-    sprintf(buf,"%s/rules/%s", XkbBaseDirectory, rules_name);

 

     file = fopen(buf, "r");

     if (!file) {

diff --git a/xorg-server/xkb/maprules.c b/xorg-server/xkb/maprules.c
index 2a118ae6a..9d49eeb1b 100644
--- a/xorg-server/xkb/maprules.c
+++ b/xorg-server/xkb/maprules.c
@@ -391,8 +391,8 @@ Bool 		append = FALSE;
             }

             if (*words == '\0')

                 return FALSE;

-            group->name = _XkbDupString(gname);

-            group->words = _XkbDupString(words);

+            group->name = Xstrdup(gname);

+            group->words = Xstrdup(words);

             for (i = 1, words = group->words; *words; words++) {

                  if ( *words == ' ') {

                      *words++ = '\0';

@@ -443,16 +443,16 @@ Bool 		append = FALSE;
 	 rule->flags|= XkbRF_Append;

     else

 	 rule->flags|= XkbRF_Normal;

-    rule->model= _XkbDupString(tmp.name[MODEL]);

-    rule->layout= _XkbDupString(tmp.name[LAYOUT]);

-    rule->variant= _XkbDupString(tmp.name[VARIANT]);

-    rule->option= _XkbDupString(tmp.name[OPTION]);

+    rule->model= Xstrdup(tmp.name[MODEL]);

+    rule->layout= Xstrdup(tmp.name[LAYOUT]);

+    rule->variant= Xstrdup(tmp.name[VARIANT]);

+    rule->option= Xstrdup(tmp.name[OPTION]);

 

-    rule->keycodes= _XkbDupString(tmp.name[KEYCODES]);

-    rule->symbols= _XkbDupString(tmp.name[SYMBOLS]);

-    rule->types= _XkbDupString(tmp.name[TYPES]);

-    rule->compat= _XkbDupString(tmp.name[COMPAT]);

-    rule->geometry= _XkbDupString(tmp.name[GEOMETRY]);

+    rule->keycodes= Xstrdup(tmp.name[KEYCODES]);

+    rule->symbols= Xstrdup(tmp.name[SYMBOLS]);

+    rule->types= Xstrdup(tmp.name[TYPES]);

+    rule->compat= Xstrdup(tmp.name[COMPAT]);

+    rule->geometry= Xstrdup(tmp.name[GEOMETRY]);

 

     rule->layout_num = rule->variant_num = 0;

     for (i = 0; i < nread; i++) {

@@ -497,7 +497,7 @@ MakeMultiDefs(XkbRF_MultiDefsPtr mdefs, XkbRF_VarDefsPtr defs)
 

    memset((char *)mdefs, 0, sizeof(XkbRF_MultiDefsRec));

    mdefs->model = defs->model;

-   mdefs->options = _XkbDupString(defs->options);

+   mdefs->options = Xstrdup(defs->options);

    if (mdefs->options) squeeze_spaces(mdefs->options); 

 

    if (defs->layout) {

@@ -506,7 +506,7 @@ MakeMultiDefs(XkbRF_MultiDefsPtr mdefs, XkbRF_VarDefsPtr defs)
        } else {

            char *p;

            int i;

-           mdefs->layout[1] = _XkbDupString(defs->layout);

+           mdefs->layout[1] = Xstrdup(defs->layout);

 	   if (mdefs->layout[1] == NULL)

 	      return FALSE;

            squeeze_spaces(mdefs->layout[1]);

@@ -530,7 +530,7 @@ MakeMultiDefs(XkbRF_MultiDefsPtr mdefs, XkbRF_VarDefsPtr defs)
        } else {

            char *p;

            int i;

-           mdefs->variant[1] = _XkbDupString(defs->variant);

+           mdefs->variant[1] = Xstrdup(defs->variant);

 	   if (mdefs->variant[1] == NULL)

 	      return FALSE;

            squeeze_spaces(mdefs->variant[1]);

@@ -566,7 +566,7 @@ Apply(char *src, char **dst)
 	    *dst= _Concat(*dst, src);

         } else {

             if (*dst == NULL)

-	        *dst= _XkbDupString(src);

+	        *dst= Xstrdup(src);

         }

     }

 }

@@ -945,9 +945,8 @@ Bool		ok;
     if ((!base)||(!rules))

 	return FALSE;

     if (locale) {

-	if (strlen(base)+strlen(locale)+2 > PATH_MAX)

+	if (snprintf(buf, PATH_MAX, "%s-%s", base, locale) >= PATH_MAX)

 	    return FALSE;

-	sprintf(buf,"%s-%s", base, locale);

     }

     else {

 	if (strlen(base)+1 > PATH_MAX)

diff --git a/xorg-server/xkb/xkb.c b/xorg-server/xkb/xkb.c
index 3ce7e690c..9d6c4d4f6 100644
--- a/xorg-server/xkb/xkb.c
+++ b/xorg-server/xkb/xkb.c
@@ -5621,17 +5621,17 @@ ProcXkbGetKbdByName(ClientPtr client)
     else fwant= stuff->want|stuff->need;

     if ((!names.compat)&&

         (fwant&(XkbGBN_CompatMapMask|XkbGBN_IndicatorMapMask))) {

-        names.compat= _XkbDupString("%");

+        names.compat= Xstrdup("%");

     }

     if ((!names.types)&&(fwant&(XkbGBN_TypesMask))) {

-        names.types= _XkbDupString("%");

+        names.types= Xstrdup("%");

     }

     if ((!names.symbols)&&(fwant&XkbGBN_SymbolsMask)) {

-        names.symbols= _XkbDupString("%");

+        names.symbols= Xstrdup("%");

     }

     geom_changed= ((names.geometry!=NULL)&&(strcmp(names.geometry,"%")!=0));

     if ((!names.geometry)&&(fwant&XkbGBN_GeometryMask)) {

-        names.geometry= _XkbDupString("%");

+        names.geometry= Xstrdup("%");

         geom_changed= FALSE;

     }

 

@@ -5885,12 +5885,10 @@ ProcXkbGetKbdByName(ClientPtr client)
 	    nkn.changed|= XkbNKN_GeometryMask;

 	XkbSendNewKeyboardNotify(dev,&nkn);

 

-	if (!IsMaster(dev) && dev->u.master)

-	{

-	    DeviceIntPtr master = dev->u.master;

-	    if (master->u.lastSlave == dev)

-	    {

-		XkbCopyDeviceKeymap(dev->u.master, dev);

+	if (!IsMaster(dev)) {

+	    DeviceIntPtr master = GetMaster(dev, MASTER_KEYBOARD);

+	    if (master && master->lastSlave == dev) {

+		XkbCopyDeviceKeymap(master, dev);

 		XkbSendNewKeyboardNotify(dev,&nkn);

 	    }

 	}

diff --git a/xorg-server/xkb/xkbAccessX.c b/xorg-server/xkb/xkbAccessX.c
index 70b1c6013..7c6f0bed6 100644
--- a/xorg-server/xkb/xkbAccessX.c
+++ b/xorg-server/xkb/xkbAccessX.c
@@ -694,7 +694,7 @@ ProcessInputProc backupproc;
 xkbDeviceInfoPtr xkbPrivPtr = XKBDEVICEINFO(mouse);

 DeviceEvent     *event = &ev->device_event;

 

-    dev = (IsMaster(mouse) || mouse->u.master) ? GetMaster(mouse, MASTER_KEYBOARD) : mouse;

+    dev = IsFloating(mouse) ? mouse : GetMaster(mouse, MASTER_KEYBOARD);

 

     if (dev && dev->key)

     {

diff --git a/xorg-server/xkb/xkbActions.c b/xorg-server/xkb/xkbActions.c
index 83e5eaf41..c9649115e 100644
--- a/xorg-server/xkb/xkbActions.c
+++ b/xorg-server/xkb/xkbActions.c
@@ -1365,9 +1365,9 @@ InjectPointerKeyEvents(DeviceIntPtr dev, int type, int button, int flags, Valuat
 

     if (IsMaster(dev)) {

         mpointer = GetMaster(dev, MASTER_POINTER);

-        lastSlave = mpointer->u.lastSlave;

+        lastSlave = mpointer->lastSlave;

         ptr = GetXTestDevice(mpointer);

-    } else if (!dev->u.master)

+    } else if (IsFloating(dev))

         ptr = dev;

     else

         return;

@@ -1398,7 +1398,7 @@ XkbFakePointerMotion(DeviceIntPtr dev, unsigned flags,int x,int y)
     int                 Point[]={x, y};

 

     /* ignore attached SDs */

-    if (!IsMaster(dev) && GetMaster(dev, MASTER_POINTER) != NULL)

+    if (!IsMaster(dev) && !IsFloating(dev))

         return;

 

     if (flags & XkbSA_MoveAbsoluteX || flags & XkbSA_MoveAbsoluteY)

@@ -1428,7 +1428,7 @@ XkbFakeDeviceButton(DeviceIntPtr dev,Bool press,int button)
     if (IsMaster(dev)) {

         DeviceIntPtr mpointer = GetMaster(dev, MASTER_POINTER);

         ptr = GetXTestDevice(mpointer);

-    } else if (!dev->u.master)

+    } else if (IsFloating(dev))

         ptr = dev;

     else

         return;

diff --git a/xorg-server/xkb/xkbInit.c b/xorg-server/xkb/xkbInit.c
index 74284dd2a..e71032992 100644
--- a/xorg-server/xkb/xkbInit.c
+++ b/xorg-server/xkb/xkbInit.c
@@ -221,15 +221,15 @@ static void
 XkbSetRulesUsed(XkbRMLVOSet *rmlvo)

 {

     free(XkbRulesUsed);

-    XkbRulesUsed= (rmlvo->rules?_XkbDupString(rmlvo->rules):NULL);

+    XkbRulesUsed= (rmlvo->rules?Xstrdup(rmlvo->rules):NULL);

     free(XkbModelUsed);

-    XkbModelUsed= (rmlvo->model?_XkbDupString(rmlvo->model):NULL);

+    XkbModelUsed= (rmlvo->model?Xstrdup(rmlvo->model):NULL);

     free(XkbLayoutUsed);

-    XkbLayoutUsed= (rmlvo->layout?_XkbDupString(rmlvo->layout):NULL);

+    XkbLayoutUsed= (rmlvo->layout?Xstrdup(rmlvo->layout):NULL);

     free(XkbVariantUsed);

-    XkbVariantUsed= (rmlvo->variant?_XkbDupString(rmlvo->variant):NULL);

+    XkbVariantUsed= (rmlvo->variant?Xstrdup(rmlvo->variant):NULL);

     free(XkbOptionsUsed);

-    XkbOptionsUsed= (rmlvo->options?_XkbDupString(rmlvo->options):NULL);

+    XkbOptionsUsed= (rmlvo->options?Xstrdup(rmlvo->options):NULL);

     if (XkbWantRulesProp)

 	QueueWorkProc(XkbWriteRulesProp,NULL,NULL);

     return;

@@ -240,23 +240,23 @@ XkbSetRulesDflts(XkbRMLVOSet *rmlvo)
 {

     if (rmlvo->rules) {

         free(XkbRulesDflt);

-        XkbRulesDflt= _XkbDupString(rmlvo->rules);

+        XkbRulesDflt= Xstrdup(rmlvo->rules);

     }

     if (rmlvo->model) {

 	free(XkbModelDflt);

-	XkbModelDflt= _XkbDupString(rmlvo->model);

+	XkbModelDflt= Xstrdup(rmlvo->model);

     }

     if (rmlvo->layout) {

 	free(XkbLayoutDflt);

-	XkbLayoutDflt= _XkbDupString(rmlvo->layout);

+	XkbLayoutDflt= Xstrdup(rmlvo->layout);

     }

     if (rmlvo->variant) {

 	free(XkbVariantDflt);

-	XkbVariantDflt= _XkbDupString(rmlvo->variant);

+	XkbVariantDflt= Xstrdup(rmlvo->variant);

     }

     if (rmlvo->options) {

 	free(XkbOptionsDflt);

-	XkbOptionsDflt= _XkbDupString(rmlvo->options);

+	XkbOptionsDflt= Xstrdup(rmlvo->options);

     }

     return;

 }

diff --git a/xorg-server/xkb/xkbfmisc.c b/xorg-server/xkb/xkbfmisc.c
index 382b6ebba..42b73012c 100644
--- a/xorg-server/xkb/xkbfmisc.c
+++ b/xorg-server/xkb/xkbfmisc.c
@@ -241,7 +241,7 @@ unsigned	wantNames,wantConfig,wantDflts;
 	if (wantNames&XkmTypesMask) {

 	    if (old_names->types!=None) {

 		tmp= NameForAtom(old_names->types);

-		names->types= _XkbDupString(tmp);

+		names->types= Xstrdup(tmp);

 	    }

 	    else {

 		wantDflts|= XkmTypesMask;

@@ -251,7 +251,7 @@ unsigned	wantNames,wantConfig,wantDflts;
 	if (wantNames&XkmCompatMapMask) {

 	    if (old_names->compat!=None) {

 		tmp= NameForAtom(old_names->compat);

-		names->compat= _XkbDupString(tmp);

+		names->compat= Xstrdup(tmp);

 	    }

 	    else wantDflts|= XkmCompatMapMask;

 	    complete|= XkmCompatMapMask; 

@@ -260,13 +260,13 @@ unsigned	wantNames,wantConfig,wantDflts;
 	    if (old_names->symbols==None)

 		return FALSE;

 	    tmp= NameForAtom(old_names->symbols);

-	    names->symbols= _XkbDupString(tmp);

+	    names->symbols= Xstrdup(tmp);

 	    complete|= XkmSymbolsMask; 

 	}

 	if (wantNames&XkmKeyNamesMask) {

 	   if (old_names->keycodes!=None) {

 		tmp= NameForAtom(old_names->keycodes);

-		names->keycodes= _XkbDupString(tmp);

+		names->keycodes= Xstrdup(tmp);

 	    }

 	    else wantDflts|= XkmKeyNamesMask;

 	    complete|= XkmKeyNamesMask;

@@ -275,7 +275,7 @@ unsigned	wantNames,wantConfig,wantDflts;
 	    if (old_names->geometry==None)

 		return FALSE;

 	    tmp= NameForAtom(old_names->geometry);

-	    names->geometry= _XkbDupString(tmp);

+	    names->geometry= Xstrdup(tmp);

 	    complete|= XkmGeometryMask; 

 	    wantNames&= ~XkmGeometryMask;

 	}

diff --git a/xorg-server/xkb/xkmread.c b/xorg-server/xkb/xkmread.c
index 81f09fe3b..d6693ed84 100644
--- a/xorg-server/xkb/xkmread.c
+++ b/xorg-server/xkb/xkmread.c
@@ -51,19 +51,6 @@ XkbInternAtom(char *str,Bool only_if_exists)
     return MakeAtom(str,strlen(str),!only_if_exists);

 }

 

-char *

-_XkbDupString(const char *str)

-{

-char *new;

-   

-   if (str==NULL)

-	return NULL;

-   new= calloc(strlen(str)+1,sizeof(char));

-   if (new)

-	strcpy(new,str);

-   return new;

-}

-

 /***====================================================================***/

 

 static void *

@@ -845,9 +832,9 @@ int		nRead=0;
 	    doodad->text.height= doodadWire.text.height;

 	    doodad->text.color_ndx= doodadWire.text.color_ndx;

 	    nRead+= XkmGetCountedString(file,buf,100);

-	    doodad->text.text= _XkbDupString(buf);

+	    doodad->text.text= Xstrdup(buf);

 	    nRead+= XkmGetCountedString(file,buf,100);

-	    doodad->text.font= _XkbDupString(buf);

+	    doodad->text.font= Xstrdup(buf);

 	    break;

 	case XkbIndicatorDoodad:

 	    doodad->indicator.shape_ndx= doodadWire.indicator.shape_ndx;

@@ -859,7 +846,7 @@ int		nRead=0;
 	    doodad->logo.color_ndx= doodadWire.logo.color_ndx;

 	    doodad->logo.shape_ndx= doodadWire.logo.shape_ndx;

 	    nRead+= XkmGetCountedString(file,buf,100);

-	    doodad->logo.logo_name= _XkbDupString(buf);

+	    doodad->logo.logo_name= Xstrdup(buf);

 	    break;

 	default:

 	    /* report error? */

@@ -1021,7 +1008,7 @@ XkbGeometrySizesRec	sizes;
     geom->width_mm= wireGeom.width_mm;

     geom->height_mm= wireGeom.height_mm;

     nRead+= XkmGetCountedString(file,buf,100);

-    geom->label_font= _XkbDupString(buf);

+    geom->label_font= Xstrdup(buf);

     if (wireGeom.num_properties>0) {

 	char val[1024];

 	for (i=0;i<wireGeom.num_properties;i++) {

diff --git a/xorg-server/xkeyboard-config/configure.in b/xorg-server/xkeyboard-config/configure.in
index 6da549740..4cb214f1a 100644
--- a/xorg-server/xkeyboard-config/configure.in
+++ b/xorg-server/xkeyboard-config/configure.in
@@ -1,98 +1,96 @@
-AC_INIT(xkeyboard-config, 2.1)
-AC_CONFIG_SRCDIR(rules/base.xml.in)
-AM_INIT_AUTOMAKE([foreign dist-bzip2])
-AM_MAINTAINER_MODE
-
-AC_SUBST(VERSION)
-
-AC_PATH_PROG([XKBCOMP], [xkbcomp], [not_found])
-if test x$XKBCOMP = xnot_found ; then
-        AC_ERROR([xkbcomp is required to install the xkb data files])
-fi
-
-AC_ARG_WITH( xkb_base,
-             [AS_HELP_STRING([--with-xkb-base=DIR],[XKB base path @<:@DATADIR/X11/xkb@:>@])],
-             xkb_base="$withval", 
-             xkb_base="${datadir}/X11/xkb" )
-
-AC_ARG_WITH( xkb_rules_symlink,
-             [  --with-xkb-rules-symlink=NAME1(,NAME2)*        create symlink(s) to "old style" rules files (xfree86 and/or xorg)],
-             xkb_rules_symlink="$withval" )
-
-AC_ARG_ENABLE( compat_rules,
-               [  --enable-compat-rules      create compatibility rules],
-               enable_compat_rules="$enableval",
-               enable_compat_rules="yes" )
-
-AM_CONDITIONAL(CREATE_RULES_SYMLINK, test "x$xkb_rules_symlink" != "x")
-
-AM_CONDITIONAL(USE_COMPAT_RULES, test "x$enable_compat_rules" = "xyes")
-
-# ****
-# i18n
-# ****
-AC_PROG_INTLTOOL(0.30)
-
-GETTEXT_PACKAGE=xkeyboard-config
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package])
-
-AM_GLIB_GNU_GETTEXT
-
-ALL_LINGUAS="af az bg ca crh cs da de el en_GB eo es fi fr gl hu id it ka ko ky lt nb nl pl ro ru rw sk sl sq sr sv tr uk vi zh_CN zh_TW"
-
-AC_SUBST(xkb_base)
-AC_SUBST(xkb_rules_symlink)
-
-AC_OUTPUT([ po/Makefile.in
-Makefile
-compat/Makefile
-geometry/Makefile
-geometry/digital_vndr/Makefile
-geometry/sgi_vndr/Makefile
-keycodes/Makefile
-keycodes/digital_vndr/Makefile
-keycodes/sgi_vndr/Makefile
-keymap/Makefile
-keymap/digital_vndr/Makefile
-keymap/sgi_vndr/Makefile
-keymap/sun_vndr/Makefile
-semantics/Makefile
-rules/Makefile
-rules/bin/Makefile
-rules/compat/Makefile
-rules/extras/Makefile
-symbols/Makefile
-symbols/digital_vndr/Makefile
-symbols/fujitsu_vndr/Makefile
-symbols/hp_vndr/Makefile
-symbols/macintosh_vndr/Makefile
-symbols/nec_vndr/Makefile
-symbols/nokia_vndr/Makefile
-symbols/sgi_vndr/Makefile
-symbols/sony_vndr/Makefile
-symbols/sun_vndr/Makefile
-symbols/xfree68_vndr/Makefile
-symbols/extras/Makefile
-types/Makefile
-xkeyboard-config.pc
-xkeyboard-config.spec
-docs/Makefile
-])
-
-echo '***********************************************************'
-echo "  $PACKAGE_NAME is configured with the following parameters:"
-echo "    XKB base directory: $xkb_base"
-if test -z "$xkb_rules_symlink" ; then
-  echo "    Symbolic link(s) to legacy rules are not created"
-else
-  echo "    Symbolic link(s) to legacy rules: $xkb_rules_symlink"
-fi
-
-if test "$enable_compat_rules" = "yes" ; then
-  echo "    Compatibility rules are included"
-else
-  echo "    Compatibility rules are not included"
-fi
-echo '***********************************************************'
-
+AC_INIT(xkeyboard-config, 2.1)

+AC_CONFIG_SRCDIR(rules/base.xml.in)

+AM_INIT_AUTOMAKE([foreign dist-bzip2])

+AM_MAINTAINER_MODE

+

+AC_SUBST(VERSION)

+

+AC_PATH_PROG([XKBCOMP], [xkbcomp], [not_found])

+if test x$XKBCOMP = xnot_found ; then

+        AC_ERROR([xkbcomp is required to install the xkb data files])

+fi

+

+AC_ARG_WITH( xkb_base,

+             [AS_HELP_STRING([--with-xkb-base=DIR],[XKB base path @<:@DATADIR/X11/xkb@:>@])],

+             xkb_base="$withval", 

+             xkb_base="${datadir}/X11/xkb" )

+

+AC_ARG_WITH( xkb_rules_symlink,

+             [  --with-xkb-rules-symlink=NAME1(,NAME2)*        create symlink(s) to "old style" rules files (xfree86 and/or xorg)],

+             xkb_rules_symlink="$withval" )

+

+AC_ARG_ENABLE( compat_rules,

+               [  --enable-compat-rules      create compatibility rules],

+               enable_compat_rules="$enableval",

+               enable_compat_rules="yes" )

+

+AM_CONDITIONAL(CREATE_RULES_SYMLINK, test "x$xkb_rules_symlink" != "x")

+

+AM_CONDITIONAL(USE_COMPAT_RULES, test "x$enable_compat_rules" = "xyes")

+

+# ****

+# i18n

+# ****

+AC_PROG_INTLTOOL(0.30)

+

+GETTEXT_PACKAGE=xkeyboard-config

+AC_SUBST(GETTEXT_PACKAGE)

+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package])

+

+AM_GLIB_GNU_GETTEXT

+

+ALL_LINGUAS="af az bg ca crh cs da de el en_GB eo es fi fr gl hu id it ka ko ky lt nb nl pl ro ru rw sk sl sq sr sv tr uk vi zh_CN zh_TW"

+

+AC_SUBST(xkb_base)

+AC_SUBST(xkb_rules_symlink)

+

+AC_OUTPUT([ po/Makefile.in

+Makefile

+compat/Makefile

+geometry/Makefile

+geometry/digital_vndr/Makefile

+geometry/sgi_vndr/Makefile

+keycodes/Makefile

+keycodes/digital_vndr/Makefile

+keycodes/sgi_vndr/Makefile

+keymap/Makefile

+keymap/digital_vndr/Makefile

+keymap/sgi_vndr/Makefile

+keymap/sun_vndr/Makefile

+semantics/Makefile

+rules/Makefile

+rules/bin/Makefile

+rules/compat/Makefile

+symbols/Makefile

+symbols/digital_vndr/Makefile

+symbols/fujitsu_vndr/Makefile

+symbols/hp_vndr/Makefile

+symbols/macintosh_vndr/Makefile

+symbols/nec_vndr/Makefile

+symbols/nokia_vndr/Makefile

+symbols/sgi_vndr/Makefile

+symbols/sony_vndr/Makefile

+symbols/sun_vndr/Makefile

+symbols/xfree68_vndr/Makefile

+types/Makefile

+xkeyboard-config.pc

+xkeyboard-config.spec

+docs/Makefile

+])

+

+echo '***********************************************************'

+echo "  $PACKAGE_NAME is configured with the following parameters:"

+echo "    XKB base directory: $xkb_base"

+if test -z "$xkb_rules_symlink" ; then

+  echo "    Symbolic link(s) to legacy rules are not created"

+else

+  echo "    Symbolic link(s) to legacy rules: $xkb_rules_symlink"

+fi

+

+if test "$enable_compat_rules" = "yes" ; then

+  echo "    Compatibility rules are included"

+else

+  echo "    Compatibility rules are not included"

+fi

+echo '***********************************************************'

+

diff --git a/xorg-server/xkeyboard-config/rules/Makefile.am b/xorg-server/xkeyboard-config/rules/Makefile.am
index 6ca04e7fa..dcf9e3d90 100644
--- a/xorg-server/xkeyboard-config/rules/Makefile.am
+++ b/xorg-server/xkeyboard-config/rules/Makefile.am
@@ -1,236 +1,236 @@
-SUBDIRS = bin compat extras
-
-if CREATE_RULES_SYMLINK
-#  extra_rules_file = $(xkb_rules_symlink)
-#  extra_dir_file   = $(extra_rules_file).xml 
-#  extra_lst_file   = $(extra_rules_file).lst
-
-install-data-hook:
-	for file in `echo "$(xkb_rules_symlink)" | sed 's/,/ /'` ; do \
-		extra_rules_file=$$file ; \
-		extra_dir_file=$$extra_rules_file.xml ; \
-		extra_lst_file=$$extra_rules_file.lst ; \
-		ln -sf base     $(DESTDIR)$(rulesdir)/$$extra_rules_file ; \
-		ln -sf base.lst $(DESTDIR)$(rulesdir)/$$extra_lst_file ; \
-		ln -sf base.xml $(DESTDIR)$(rulesdir)/$$extra_dir_file ; \
-	done
-
-else
-install-data-hook:
-
-endif
-
-if USE_COMPAT_RULES
-
-base_parts = base.hdr.part base.lists.part \
-compat/base.lists.part \
-HDR base.m_k.part \
-HDR base.l1_k.part \
-HDR base.l_k.part \
-HDR base.o_k.part \
-HDR base.ml_g.part \
-HDR base.m_g.part \
-HDR compat/base.mlv_s.part   extras/base.mlv_s.part   base.mlv_s.part \
-HDR compat/base.ml_s.part    extras/base.ml_s.part    base.ml_s.part  \
-HDR compat/base.ml1_s.part   extras/base.ml1_s.part   base.ml1_s.part \
-HDR compat/base.ml1v1_s.part extras/base.ml1v1_s.part \
-HDR compat/base.ml2_s.part    extras/base.ml2_s.part    base.ml2_s.part  \
-HDR compat/base.ml3_s.part    extras/base.ml3_s.part    base.ml3_s.part  \
-HDR compat/base.ml4_s.part    extras/base.ml4_s.part    base.ml4_s.part  \
-HDR compat/base.ml2v2_s.part  extras/base.ml2v2_s.part \
-HDR compat/base.ml3v3_s.part  extras/base.ml3v3_s.part \
-HDR compat/base.ml4v4_s.part  extras/base.ml4v4_s.part \
-HDR base.m_s.part \
-HDR compat/base.lv_c.part   \
-HDR compat/base.l1v1_c.part \
-HDR compat/base.l2v2_c.part \
-HDR compat/base.l3v3_c.part \
-HDR compat/base.l4v4_c.part \
-HDR base.ml_c.part \
-HDR base.ml1_c.part \
-HDR base.m_t.part \
-HDR base.lo_s.part \
-HDR base.l1o_s.part \
-HDR base.l2o_s.part \
-HDR base.l3o_s.part \
-HDR base.l4o_s.part \
-HDR compat/base.o_s.part     base.o_s.part \
-HDR base.o_c.part \
-HDR base.o_t.part
-
-evdev_parts = base.hdr.part base.lists.part \
-compat/base.lists.part \
-HDR evdev.m_k.part \
-HDR base.l1_k.part \
-HDR base.l_k.part \
-HDR base.o_k.part \
-HDR base.ml_g.part \
-HDR base.m_g.part \
-HDR compat/base.mlv_s.part   extras/base.mlv_s.part   base.mlv_s.part \
-HDR compat/base.ml_s.part    extras/base.ml_s.part    base.ml_s.part  \
-HDR compat/base.ml1_s.part   extras/base.ml1_s.part   base.ml1_s.part \
-HDR compat/base.ml1v1_s.part extras/base.ml1v1_s.part \
-HDR compat/base.ml2_s.part    extras/base.ml2_s.part    base.ml2_s.part  \
-HDR compat/base.ml3_s.part    extras/base.ml3_s.part    base.ml3_s.part  \
-HDR compat/base.ml4_s.part    extras/base.ml4_s.part    base.ml4_s.part  \
-HDR compat/base.ml2v2_s.part  extras/base.ml2v2_s.part \
-HDR compat/base.ml3v3_s.part  extras/base.ml3v3_s.part \
-HDR compat/base.ml4v4_s.part  extras/base.ml4v4_s.part \
-HDR evdev.m_s.part \
-HDR compat/base.lv_c.part   \
-HDR compat/base.l1v1_c.part \
-HDR compat/base.l2v2_c.part \
-HDR compat/base.l3v3_c.part \
-HDR compat/base.l4v4_c.part \
-HDR base.ml_c.part \
-HDR base.ml1_c.part \
-HDR base.m_t.part \
-HDR base.lo_s.part \
-HDR base.l1o_s.part \
-HDR base.l2o_s.part \
-HDR base.l3o_s.part \
-HDR base.l4o_s.part \
-HDR compat/base.o_s.part     base.o_s.part \
-HDR base.o_c.part \
-HDR base.o_t.part
-
-else
-
-base_parts = base.hdr.part base.lists.part \
-HDR base.m_k.part \
-HDR base.l1_k.part \
-HDR base.l_k.part \
-HDR \
-HDR base.ml_g.part \
-HDR base.m_g.part \
-HDR extras/base.mlv_s.part   base.mlv_s.part \
-HDR extras/base.ml_s.part    base.ml_s.part  \
-HDR extras/base.ml1_s.part   base.ml1_s.part \
-HDR extras/base.ml1v1_s.part \
-HDR extras/base.ml2_s.part    base.ml2_s.part  \
-HDR extras/base.ml3_s.part    base.ml3_s.part  \
-HDR extras/base.ml4_s.part    base.ml4_s.part  \
-HDR extras/base.ml2v2_s.part \
-HDR extras/base.ml3v3_s.part \
-HDR extras/base.ml4v4_s.part \
-HDR base.m_s.part \
-HDR \
-HDR \
-HDR \
-HDR \
-HDR \
-HDR base.ml_c.part \
-HDR base.ml1_c.part \
-HDR base.m_t.part \
-HDR \
-HDR base.l1o_s.part \
-HDR base.l2o_s.part \
-HDR base.l3o_s.part \
-HDR base.l4o_s.part \
-HDR base.o_s.part \
-HDR base.o_c.part \
-HDR base.o_t.part
-
-evdev_parts = base.hdr.part base.lists.part \
-HDR evdev.m_k.part \
-HDR base.l1_k.part \
-HDR base.l_k.part  \
-HDR \
-HDR base.ml_g.part \
-HDR base.m_g.part \
-HDR extras/base.mlv_s.part   base.mlv_s.part \
-HDR extras/base.ml_s.part    base.ml_s.part  \
-HDR extras/base.ml1_s.part   base.ml1_s.part \
-HDR extras/base.ml1v1_s.part \
-HDR extras/base.ml2_s.part    base.ml2_s.part  \
-HDR extras/base.ml3_s.part    base.ml3_s.part  \
-HDR extras/base.ml4_s.part    base.ml4_s.part  \
-HDR extras/base.ml2v2_s.part \
-HDR extras/base.ml3v3_s.part \
-HDR extras/base.ml4v4_s.part \
-HDR evdev.m_s.part \
-HDR \
-HDR \
-HDR \
-HDR \
-HDR \
-HDR base.ml_c.part \
-HDR base.ml1_c.part \
-HDR base.m_t.part \
-HDR \
-HDR base.l1o_s.part \
-HDR base.l2o_s.part \
-HDR base.l3o_s.part \
-HDR base.l4o_s.part \
-HDR base.o_s.part \
-HDR base.o_c.part \
-HDR base.o_t.part
-
-endif
-
-all_parts_dist = HDR base.hdr.part \
-base.lists.part \
-base.m_k.part \
-base.l1_k.part \
-base.l_k.part \
-base.o_k.part \
-base.ml_g.part \
-base.m_g.part \
-base.mlv_s.part \
-base.ml_s.part \
-base.ml1_s.part \
-base.ml2_s.part \
-base.ml3_s.part \
-base.ml4_s.part \
-base.m_s.part \
-base.ml_c.part \
-base.ml1_c.part \
-base.m_t.part \
-base.lo_s.part \
-base.l1o_s.part \
-base.l2o_s.part \
-base.l3o_s.part \
-base.l4o_s.part \
-base.o_s.part \
-base.o_c.part \
-base.o_t.part \
-evdev.m_k.part \
-evdev.m_s.part
-
-rules_files = base evdev xfree98
-
-lst_files = base.lst evdev.lst
-
-%.lst: %.xml
-	perl $(srcdir)/xml2lst.pl < $< > $@
-
-base: $(base_parts)
-	HDR="$(srcdir)/HDR" $(srcdir)/merge.sh $@ $(base_parts)
-
-evdev: $(evdev_parts)
-	HDR="$(srcdir)/HDR" $(srcdir)/merge.sh $@ $(evdev_parts)
-
-dist_files = xkb.dtd README
-
-rules_DATA = $(rules_files) $(lst_files) $(dist_files)
-
-xml_in_files = base.xml.in evdev.xml.in base.extras.xml.in evdev.extras.xml.in
-xml_DATA = $(xml_in_files:.xml.in=.xml) 
-
-$(srcdir)/evdev.xml.in: base.xml.in
-	cp $< $@
-
-$(srcdir)/evdev.extras.xml.in: base.extras.xml.in
-	cp $< $@
-
-EXTRA_DIST= $(xml_in_files) xfree98 \
-            $(all_parts_dist) \
-            xml2lst.pl merge.sh $(dist_files)
-
-CLEANFILES = base base.xml base.lst evdev evdev.xml evdev.lst base.extras.xml evdev.extras.xml
-MAINTAINERCLEANFILES = $(srcdir)/evdev.xml.in $(srcdir)/evdev.extras.xml.in
-
-rulesdir = $(xkb_base)/rules
-xmldir = $(rulesdir)
-
-@INTLTOOL_XML_NOMERGE_RULE@
+SUBDIRS = bin compat

+

+if CREATE_RULES_SYMLINK

+#  extra_rules_file = $(xkb_rules_symlink)

+#  extra_dir_file   = $(extra_rules_file).xml 

+#  extra_lst_file   = $(extra_rules_file).lst

+

+install-data-hook:

+	for file in `echo "$(xkb_rules_symlink)" | sed 's/,/ /'` ; do \

+		extra_rules_file=$$file ; \

+		extra_dir_file=$$extra_rules_file.xml ; \

+		extra_lst_file=$$extra_rules_file.lst ; \

+		ln -sf base     $(DESTDIR)$(rulesdir)/$$extra_rules_file ; \

+		ln -sf base.lst $(DESTDIR)$(rulesdir)/$$extra_lst_file ; \

+		ln -sf base.xml $(DESTDIR)$(rulesdir)/$$extra_dir_file ; \

+	done

+

+else

+install-data-hook:

+

+endif

+

+if USE_COMPAT_RULES

+

+base_parts = base.hdr.part base.lists.part \

+compat/base.lists.part \

+HDR base.m_k.part \

+HDR base.l1_k.part \

+HDR base.l_k.part \

+HDR base.o_k.part \

+HDR base.ml_g.part \

+HDR base.m_g.part \

+HDR compat/base.mlv_s.part   base.mlv_s.part \

+HDR compat/base.ml_s.part    base.ml_s.part  \

+HDR compat/base.ml1_s.part   base.ml1_s.part \

+HDR compat/base.ml1v1_s.part \

+HDR compat/base.ml2_s.part    base.ml2_s.part  \

+HDR compat/base.ml3_s.part    base.ml3_s.part  \

+HDR compat/base.ml4_s.part    base.ml4_s.part  \

+HDR compat/base.ml2v2_s.part  \

+HDR compat/base.ml3v3_s.part  \

+HDR compat/base.ml4v4_s.part  \

+HDR base.m_s.part \

+HDR compat/base.lv_c.part   \

+HDR compat/base.l1v1_c.part \

+HDR compat/base.l2v2_c.part \

+HDR compat/base.l3v3_c.part \

+HDR compat/base.l4v4_c.part \

+HDR base.ml_c.part \

+HDR base.ml1_c.part \

+HDR base.m_t.part \

+HDR base.lo_s.part \

+HDR base.l1o_s.part \

+HDR base.l2o_s.part \

+HDR base.l3o_s.part \

+HDR base.l4o_s.part \

+HDR compat/base.o_s.part     base.o_s.part \

+HDR base.o_c.part \

+HDR base.o_t.part

+

+evdev_parts = base.hdr.part base.lists.part \

+compat/base.lists.part \

+HDR evdev.m_k.part \

+HDR base.l1_k.part \

+HDR base.l_k.part \

+HDR base.o_k.part \

+HDR base.ml_g.part \

+HDR base.m_g.part \

+HDR compat/base.mlv_s.part   base.mlv_s.part \

+HDR compat/base.ml_s.part    base.ml_s.part  \

+HDR compat/base.ml1_s.part   base.ml1_s.part \

+HDR compat/base.ml1v1_s.part \

+HDR compat/base.ml2_s.part    base.ml2_s.part  \

+HDR compat/base.ml3_s.part    base.ml3_s.part  \

+HDR compat/base.ml4_s.part    base.ml4_s.part  \

+HDR compat/base.ml2v2_s.part  \

+HDR compat/base.ml3v3_s.part  \

+HDR compat/base.ml4v4_s.part  \

+HDR evdev.m_s.part \

+HDR compat/base.lv_c.part   \

+HDR compat/base.l1v1_c.part \

+HDR compat/base.l2v2_c.part \

+HDR compat/base.l3v3_c.part \

+HDR compat/base.l4v4_c.part \

+HDR base.ml_c.part \

+HDR base.ml1_c.part \

+HDR base.m_t.part \

+HDR base.lo_s.part \

+HDR base.l1o_s.part \

+HDR base.l2o_s.part \

+HDR base.l3o_s.part \

+HDR base.l4o_s.part \

+HDR compat/base.o_s.part     base.o_s.part \

+HDR base.o_c.part \

+HDR base.o_t.part

+

+else

+

+base_parts = base.hdr.part base.lists.part \

+HDR base.m_k.part \

+HDR base.l1_k.part \

+HDR base.l_k.part \

+HDR \

+HDR base.ml_g.part \

+HDR base.m_g.part \

+HDR base.mlv_s.part \

+HDR base.ml_s.part  \

+HDR base.ml1_s.part \

+HDR \

+HDR base.ml2_s.part  \

+HDR base.ml3_s.part  \

+HDR base.ml4_s.part  \

+HDR \

+HDR \

+HDR \

+HDR base.m_s.part \

+HDR \

+HDR \

+HDR \

+HDR \

+HDR \

+HDR base.ml_c.part \

+HDR base.ml1_c.part \

+HDR base.m_t.part \

+HDR \

+HDR base.l1o_s.part \

+HDR base.l2o_s.part \

+HDR base.l3o_s.part \

+HDR base.l4o_s.part \

+HDR base.o_s.part \

+HDR base.o_c.part \

+HDR base.o_t.part

+

+evdev_parts = base.hdr.part base.lists.part \

+HDR evdev.m_k.part \

+HDR base.l1_k.part \

+HDR base.l_k.part  \

+HDR \

+HDR base.ml_g.part \

+HDR base.m_g.part \

+HDR base.mlv_s.part \

+HDR base.ml_s.part  \

+HDR base.ml1_s.part \

+HDR \

+HDR base.ml2_s.part  \

+HDR base.ml3_s.part  \

+HDR base.ml4_s.part  \

+HDR \

+HDR \

+HDR \

+HDR evdev.m_s.part \

+HDR \

+HDR \

+HDR \

+HDR \

+HDR \

+HDR base.ml_c.part \

+HDR base.ml1_c.part \

+HDR base.m_t.part \

+HDR \

+HDR base.l1o_s.part \

+HDR base.l2o_s.part \

+HDR base.l3o_s.part \

+HDR base.l4o_s.part \

+HDR base.o_s.part \

+HDR base.o_c.part \

+HDR base.o_t.part

+

+endif

+

+all_parts_dist = HDR base.hdr.part \

+base.lists.part \

+base.m_k.part \

+base.l1_k.part \

+base.l_k.part \

+base.o_k.part \

+base.ml_g.part \

+base.m_g.part \

+base.mlv_s.part \

+base.ml_s.part \

+base.ml1_s.part \

+base.ml2_s.part \

+base.ml3_s.part \

+base.ml4_s.part \

+base.m_s.part \

+base.ml_c.part \

+base.ml1_c.part \

+base.m_t.part \

+base.lo_s.part \

+base.l1o_s.part \

+base.l2o_s.part \

+base.l3o_s.part \

+base.l4o_s.part \

+base.o_s.part \

+base.o_c.part \

+base.o_t.part \

+evdev.m_k.part \

+evdev.m_s.part

+

+rules_files = base evdev xfree98

+

+lst_files = base.lst evdev.lst

+

+%.lst: %.xml

+	perl $(srcdir)/xml2lst.pl < $< > $@

+

+base: $(base_parts)

+	HDR="$(srcdir)/HDR" $(srcdir)/merge.sh $@ $(base_parts)

+

+evdev: $(evdev_parts)

+	HDR="$(srcdir)/HDR" $(srcdir)/merge.sh $@ $(evdev_parts)

+

+dist_files = xkb.dtd README

+

+rules_DATA = $(rules_files) $(lst_files) $(dist_files)

+

+xml_in_files = base.xml.in evdev.xml.in base.extras.xml.in evdev.extras.xml.in

+xml_DATA = $(xml_in_files:.xml.in=.xml) 

+

+$(srcdir)/evdev.xml.in: base.xml.in

+	cp $< $@

+

+$(srcdir)/evdev.extras.xml.in: base.extras.xml.in

+	cp $< $@

+

+EXTRA_DIST= $(xml_in_files) xfree98 \

+            $(all_parts_dist) \

+            xml2lst.pl merge.sh $(dist_files)

+

+CLEANFILES = base base.xml base.lst evdev evdev.xml evdev.lst base.extras.xml evdev.extras.xml

+MAINTAINERCLEANFILES = $(srcdir)/evdev.xml.in $(srcdir)/evdev.extras.xml.in

+

+rulesdir = $(xkb_base)/rules

+xmldir = $(rulesdir)

+

+@INTLTOOL_XML_NOMERGE_RULE@

diff --git a/xorg-server/xkeyboard-config/rules/base.extras.xml.in b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
index 107aa6c1c..f72e4cf95 100644
--- a/xorg-server/xkeyboard-config/rules/base.extras.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
@@ -67,6 +67,22 @@
     </layout>

     <layout>

       <configItem>

+        <name>ro</name>

+        <_shortDescription>Rou</_shortDescription>

+        <_description>Romania</_description>

+        <languageList><iso639Id>rum</iso639Id></languageList>

+      </configItem>

+      <variantList>

+        <variant>

+          <configItem>

+            <name>ergonomic</name>

+            <_description>Ergonomic Touchtype</_description>

+          </configItem>

+        </variant>

+      </variantList>

+    </layout>

+    <layout>

+      <configItem>

         <name>rs</name>

         <_shortDescription>SRB</_shortDescription>

         <_description>Serbia</_description>

diff --git a/xorg-server/xkeyboard-config/rules/extras/Makefile.am b/xorg-server/xkeyboard-config/rules/extras/Makefile.am
deleted file mode 100644
index 0387a868c..000000000
--- a/xorg-server/xkeyboard-config/rules/extras/Makefile.am
+++ /dev/null
@@ -1,51 +0,0 @@
-transform_files=layoutsMapping.lst variantsMapping.lst

-

-scripts_dir=$(srcdir)/../bin

-

-scripts= \

-base.ml2_s.part \

-base.ml3_s.part \

-base.ml4_s.part \

-base.ml2v2_s.part \

-base.ml3v3_s.part \

-base.ml4v4_s.part \

-base.ml_s.part \

-base.ml1_s.part \

-base.mlv_s.part \

-base.ml1v1_s.part

-

-noinst_SCRIPTS=$(scripts)

-

-base.ml2_s.part: $(scripts_dir)/mln_s.sh $(transform_files)

-	sh $< 2 $(srcdir)

-

-base.ml3_s.part: $(scripts_dir)/mln_s.sh $(transform_files)

-	sh $< 3 $(srcdir)

-

-base.ml4_s.part: $(scripts_dir)/mln_s.sh $(transform_files)

-	sh $< 4 $(srcdir)

-

-base.ml2v2_s.part: $(scripts_dir)/mlnvn_s.sh $(transform_files)

-	sh $< 2 $(srcdir)

-

-base.ml3v3_s.part: $(scripts_dir)/mlnvn_s.sh $(transform_files)

-	sh $< 3 $(srcdir)

-

-base.ml4v4_s.part: $(scripts_dir)/mlnvn_s.sh $(transform_files)

-	sh $< 4 $(srcdir)

-

-base.ml_s.part: $(scripts_dir)/ml_s.sh $(transform_files)

-	sh $< $(srcdir)

-

-base.ml1_s.part: $(scripts_dir)/ml1_s.sh $(transform_files)

-	sh $< $(srcdir)

-

-base.mlv_s.part: $(scripts_dir)/mlv_s.sh $(transform_files)

-	sh $< $(srcdir)

-

-base.ml1v1_s.part: $(scripts_dir)/ml1v1_s.sh $(transform_files)

-	sh $< $(srcdir)

-

-EXTRA_DIST=$(transform_files)

-

-CLEANFILES=$(scripts)

diff --git a/xorg-server/xkeyboard-config/rules/extras/layoutsMapping.lst b/xorg-server/xkeyboard-config/rules/extras/layoutsMapping.lst
deleted file mode 100644
index d75b4f44d..000000000
--- a/xorg-server/xkeyboard-config/rules/extras/layoutsMapping.lst
+++ /dev/null
@@ -1 +0,0 @@
-apl	extras/apl
diff --git a/xorg-server/xkeyboard-config/rules/extras/makefile b/xorg-server/xkeyboard-config/rules/extras/makefile
deleted file mode 100644
index 5c837dbf1..000000000
--- a/xorg-server/xkeyboard-config/rules/extras/makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-transform_files=layoutsMapping.lst variantsMapping.lst
-
-scripts_dir=..\bin
-
-SCRIPTS= \
-base.ml2_s.part \
-base.ml3_s.part \
-base.ml4_s.part \
-base.ml2v2_s.part \
-base.ml3v3_s.part \
-base.ml4v4_s.part \
-base.ml_s.part \
-base.ml1_s.part \
-base.mlv_s.part \
-base.ml1v1_s.part
-
-SH=cmd /c
-
-base.ml2_s.part: mln_s.bat $(transform_files)
-	$(SH) $< 2
-
-base.ml3_s.part: mln_s.bat $(transform_files)
-	$(SH) $< 3
-
-base.ml4_s.part: mln_s.bat $(transform_files)
-	$(SH) $< 4
-
-base.ml2v2_s.part: mlnvn_s.bat $(transform_files)
-	$(SH) $< 2
-
-base.ml3v3_s.part: mlnvn_s.bat $(transform_files)
-	$(SH) $< 3
-
-base.ml4v4_s.part: mlnvn_s.bat $(transform_files)
-	$(SH) $< 4
-
-base.ml_s.part: ml_s.bat $(transform_files)
-	$(SH) $<
-
-base.ml1_s.part: ml1_s.bat $(transform_files)
-	$(SH) $<
-
-base.mlv_s.part: mlv_s.bat $(transform_files)
-	$(SH) $<
-
-base.ml1v1_s.part: ml1v1_s.bat $(transform_files)
-	$(SH) $<
-
-%.bat: $(scripts_dir)\%.sh
-	copy $< $@
-
-all=$(SCRIPTS)
diff --git a/xorg-server/xkeyboard-config/rules/extras/variantsMapping.lst b/xorg-server/xkeyboard-config/rules/extras/variantsMapping.lst
deleted file mode 100644
index fd0add719..000000000
--- a/xorg-server/xkeyboard-config/rules/extras/variantsMapping.lst
+++ /dev/null
@@ -1,6 +0,0 @@
-rs	combiningkeys	extras/rs	combiningkeys

-ru	chu		extras/ru	chu

-ir	ave		extras/ir	ave

-us	alt-intl-unicode	extras/us	alt-intl-unicode

-us	crd		extras/us	crd

-us	intl-unicode	extras/us	intl-unicode

diff --git a/xorg-server/xkeyboard-config/rules/makefile b/xorg-server/xkeyboard-config/rules/makefile
index 6b822c4c9..c8b2f25c2 100644
--- a/xorg-server/xkeyboard-config/rules/makefile
+++ b/xorg-server/xkeyboard-config/rules/makefile
@@ -3,11 +3,14 @@ $(error Please do not specify MAKESERVER=1)
 endif
 
 load_makefile compat\makefile DEBUG=$(DEBUG)
-load_makefile extras\makefile DEBUG=$(DEBUG)
 
 DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\rules
 
-BASE_PARTS_NO_COMPAT = base.hdr.part base.lists.part \
+USE_COMPAT_RULES = 1
+
+if USE_COMPAT_RULES
+
+base_parts = base.hdr.part base.lists.part \
 compat/base.lists.part \
 HDR base.m_k.part \
 HDR base.l1_k.part \
@@ -15,16 +18,16 @@ HDR base.l_k.part \
 HDR base.o_k.part \
 HDR base.ml_g.part \
 HDR base.m_g.part \
-HDR compat/base.mlv_s.part   extras/base.mlv_s.part   base.mlv_s.part \
-HDR compat/base.ml_s.part    extras/base.ml_s.part    base.ml_s.part  \
-HDR compat/base.ml1_s.part   extras/base.ml1_s.part   base.ml1_s.part \
-HDR compat/base.ml1v1_s.part extras/base.ml1v1_s.part \
-HDR compat/base.ml2_s.part    extras/base.ml2_s.part    base.ml2_s.part  \
-HDR compat/base.ml3_s.part    extras/base.ml3_s.part    base.ml3_s.part  \
-HDR compat/base.ml4_s.part    extras/base.ml4_s.part    base.ml4_s.part  \
-HDR compat/base.ml2v2_s.part  extras/base.ml2v2_s.part \
-HDR compat/base.ml3v3_s.part  extras/base.ml3v3_s.part \
-HDR compat/base.ml4v4_s.part  extras/base.ml4v4_s.part \
+HDR compat/base.mlv_s.part   base.mlv_s.part \
+HDR compat/base.ml_s.part    base.ml_s.part  \
+HDR compat/base.ml1_s.part   base.ml1_s.part \
+HDR compat/base.ml1v1_s.part \
+HDR compat/base.ml2_s.part    base.ml2_s.part  \
+HDR compat/base.ml3_s.part    base.ml3_s.part  \
+HDR compat/base.ml4_s.part    base.ml4_s.part  \
+HDR compat/base.ml2v2_s.part  \
+HDR compat/base.ml3v3_s.part  \
+HDR compat/base.ml4v4_s.part  \
 HDR base.m_s.part \
 HDR compat/base.lv_c.part   \
 HDR compat/base.l1v1_c.part \
@@ -43,7 +46,7 @@ HDR compat/base.o_s.part     base.o_s.part \
 HDR base.o_c.part \
 HDR base.o_t.part
 
-EVDEV_PARTS_NO_COMPAT = base.hdr.part base.lists.part \
+evdev_parts = base.hdr.part base.lists.part \
 compat/base.lists.part \
 HDR evdev.m_k.part \
 HDR base.l1_k.part \
@@ -51,16 +54,16 @@ HDR base.l_k.part \
 HDR base.o_k.part \
 HDR base.ml_g.part \
 HDR base.m_g.part \
-HDR compat/base.mlv_s.part   extras/base.mlv_s.part   base.mlv_s.part \
-HDR compat/base.ml_s.part    extras/base.ml_s.part    base.ml_s.part  \
-HDR compat/base.ml1_s.part   extras/base.ml1_s.part   base.ml1_s.part \
-HDR compat/base.ml1v1_s.part extras/base.ml1v1_s.part \
-HDR compat/base.ml2_s.part    extras/base.ml2_s.part    base.ml2_s.part  \
-HDR compat/base.ml3_s.part    extras/base.ml3_s.part    base.ml3_s.part  \
-HDR compat/base.ml4_s.part    extras/base.ml4_s.part    base.ml4_s.part  \
-HDR compat/base.ml2v2_s.part  extras/base.ml2v2_s.part \
-HDR compat/base.ml3v3_s.part  extras/base.ml3v3_s.part \
-HDR compat/base.ml4v4_s.part  extras/base.ml4v4_s.part \
+HDR compat/base.mlv_s.part   base.mlv_s.part \
+HDR compat/base.ml_s.part    base.ml_s.part  \
+HDR compat/base.ml1_s.part   base.ml1_s.part \
+HDR compat/base.ml1v1_s.part \
+HDR compat/base.ml2_s.part    base.ml2_s.part  \
+HDR compat/base.ml3_s.part    base.ml3_s.part  \
+HDR compat/base.ml4_s.part    base.ml4_s.part  \
+HDR compat/base.ml2v2_s.part  \
+HDR compat/base.ml3v3_s.part  \
+HDR compat/base.ml4v4_s.part  \
 HDR evdev.m_s.part \
 HDR compat/base.lv_c.part   \
 HDR compat/base.l1v1_c.part \
@@ -79,23 +82,25 @@ HDR compat/base.o_s.part     base.o_s.part \
 HDR base.o_c.part \
 HDR base.o_t.part
 
-BASE_PARTS = base.hdr.part base.lists.part \
+else
+
+base_parts = base.hdr.part base.lists.part \
 HDR base.m_k.part \
 HDR base.l1_k.part \
 HDR base.l_k.part \
 HDR \
 HDR base.ml_g.part \
 HDR base.m_g.part \
-HDR extras/base.mlv_s.part   base.mlv_s.part \
-HDR extras/base.ml_s.part    base.ml_s.part  \
-HDR extras/base.ml1_s.part   base.ml1_s.part \
-HDR extras/base.ml1v1_s.part \
-HDR extras/base.ml2_s.part    base.ml2_s.part  \
-HDR extras/base.ml3_s.part    base.ml3_s.part  \
-HDR extras/base.ml4_s.part    base.ml4_s.part  \
-HDR extras/base.ml2v2_s.part \
-HDR extras/base.ml3v3_s.part \
-HDR extras/base.ml4v4_s.part \
+HDR base.mlv_s.part \
+HDR base.ml_s.part  \
+HDR base.ml1_s.part \
+HDR \
+HDR base.ml2_s.part  \
+HDR base.ml3_s.part  \
+HDR base.ml4_s.part  \
+HDR \
+HDR \
+HDR \
 HDR base.m_s.part \
 HDR \
 HDR \
@@ -114,23 +119,23 @@ HDR base.o_s.part \
 HDR base.o_c.part \
 HDR base.o_t.part
 
-EVDEV_PARTS = base.hdr.part base.lists.part \
+evdev_parts = base.hdr.part base.lists.part \
 HDR evdev.m_k.part \
 HDR base.l1_k.part \
 HDR base.l_k.part  \
 HDR \
 HDR base.ml_g.part \
 HDR base.m_g.part \
-HDR extras/base.mlv_s.part   base.mlv_s.part \
-HDR extras/base.ml_s.part    base.ml_s.part  \
-HDR extras/base.ml1_s.part   base.ml1_s.part \
-HDR extras/base.ml1v1_s.part \
-HDR extras/base.ml2_s.part    base.ml2_s.part  \
-HDR extras/base.ml3_s.part    base.ml3_s.part  \
-HDR extras/base.ml4_s.part    base.ml4_s.part  \
-HDR extras/base.ml2v2_s.part \
-HDR extras/base.ml3v3_s.part \
-HDR extras/base.ml4v4_s.part \
+HDR base.mlv_s.part \
+HDR base.ml_s.part  \
+HDR base.ml1_s.part \
+HDR \
+HDR base.ml2_s.part  \
+HDR base.ml3_s.part  \
+HDR base.ml4_s.part  \
+HDR \
+HDR \
+HDR \
 HDR evdev.m_s.part \
 HDR \
 HDR \
@@ -149,21 +154,23 @@ HDR base.o_s.part \
 HDR base.o_c.part \
 HDR base.o_t.part
 
-RULES_FILES = base evdev xfree98
+endif
+rules_files = base evdev xfree98
 
-LST_FILES = base.lst evdev.lst
+lst_files = base.lst evdev.lst
 
 $(DESTDIR)\%.lst: $(DESTDIR)\%.xml
 	perl xml2lst.pl < $< > $@
 
-$(DESTDIR)\base: compat\all $(BASE_PARTS_NO_COMPAT)
-	merge $@ $(BASE_PARTS)
+$(DESTDIR)\base: compat\all $(base_parts)
+	merge $@ $(base_parts)
+
+$(DESTDIR)\evdev: compat\all $(evdev_parts)
+	merge $@ $(evdev_parts) 
 
-$(DESTDIR)\evdev: compat\all $(EVDEV_PARTS_NO_COMPAT)
-	merge $@ $(EVDEV_PARTS) 
+dist_files = xkb.dtd README
 
-ALL_RULES_FILES = $(RULES_FILES) $(LST_FILES) \
-xkb.dtd README
+rules_DATA = $(rules_files) $(lst_files) $(dist_files)
 
 COMPATFILES=xorg xorg.xml xorg.lst
 $(DESTDIR)\xorg: $(DESTDIR)\base
@@ -171,9 +178,10 @@ $(DESTDIR)\xorg: $(DESTDIR)\base
 $(DESTDIR)\xorg%: $(DESTDIR)\base%
 	copy $< $@
 
-rules_DATA = $(ALL_RULES_FILES) $(COMPATFILES)
+rules_DATA := $(rules_DATA) $(COMPATFILES)
 
-xml_DATA = base.xml evdev.xml base.extras.xml evdev.extras.xml 
+xml_in_files = base.xml.in evdev.xml.in base.extras.xml.in evdev.extras.xml.in
+xml_DATA = $(xml_in_files:.xml.in=.xml) 
 
 $(DESTDIR)\%.xml: %.xml.in
 	copy $< $@
diff --git a/xorg-server/xkeyboard-config/symbols/Makefile.am b/xorg-server/xkeyboard-config/symbols/Makefile.am
index 79e9ad162..415b95028 100644
--- a/xorg-server/xkeyboard-config/symbols/Makefile.am
+++ b/xorg-server/xkeyboard-config/symbols/Makefile.am
@@ -1,9 +1,10 @@
-SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr nokia_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr extras

+SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr nokia_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr

 

 symbolsdir = $(xkb_base)/symbols

 dist_symbols_DATA = \

 ad af al \

-am ara at az \

+am apl ara \

+at az \

 ba bd be \

 bg br brai \

 bt bw by \

diff --git a/xorg-server/xkeyboard-config/symbols/extras/apl b/xorg-server/xkeyboard-config/symbols/apl
index 57cdb0824..4421cc398 100644
--- a/xorg-server/xkeyboard-config/symbols/extras/apl
+++ b/xorg-server/xkeyboard-config/symbols/apl
@@ -1,294 +1,296 @@
-// APL Keyboard Layouts

-

-// This file supports:

-// -	The Sharp APL for Unix (SAX) layout

-// -	The IBM APL2 layout

-// -	The Manugistics APL*PLUS II (Version 5.1, 1993) keyboard layout

-

-// Unicode APL table: http://aplwiki.com/UnicodeAplTable

-// ...and another: http://publibfp.boulder.ibm.com/epubs/pdf/h2110611.pdf (appendix A)

-// Generic Unicode stuff: http://www.fileformat.info/info/unicode/category/index.htm

-

-// Tim Nelson (this file's creator) says:

-

-// This file doesn't deal with all the combining stuff -- I'm not an APL programmer,

-// and am not quite sure what's needed here.  However, it may be possible to get this

-// working with dead keys and the like.  Patches gratefully accepted.  

-

-// Some of the shift-key assignments may differ from the APL tradition.  If

-// that's not considered acceptable, it should be possible to remap the 

-// shift keys.  I have striven, however, to ensure that the use of shift keys

-// in these maps is at least self-consistent.  

-

-// I'm assuming that this will be used with another keyboard layout (ie. for 

-// your language), with a special shift key to use these maps.  

-

-partial alphanumeric_keys modifier_keys 

-xkb_symbols "common" {

-	name[Group1]= "APL";

-

-	key <AE01> { [	diaeresis	] };

-	key <AE02> { [	U00AF	] }; // ¯ -- Macron

-	key <AE03> { [	less	] };

-	key <AE04> { [	U2264	] }; // ≤ -- Less-than Or Equal To

-	key <AE05> { [	equal	] };

-	key <AE06> { [	U2265	] }; // ≥ -- Greater-than Or Equal To

-	key <AE07> { [	greater	] };

-	key <AE08> { [	U2260	] }; // ≠ -- Not Equal To

-	key <AE09> { [	U2228	] }; // ∨ -- Logical Or

-	key <AE10> { [	U2227	] }; // ∧ -- Logical And

-

-	// Q

-	key <AD01> { [	question	] };

-	// W

-	key <AD02> { [	U2375		] }; // ⍵ -- APL Functional Symbol Omega

-	// E

-	key <AD03> { [	U220A		] }; // ∊ -- Small Element Of

-	// R

-	key <AD04> { [	U2374		] }; // ⍴ -- APL Functional Symbol Rho

-	// T

-	key <AD05> { [	asciitilde		] };

-	// Y

-	key <AD06> { [	U2191		] }; // ↑ -- Upwards Arrow

-	// U

-	key <AD07> { [	U2193		] }; // ↓ -- Downwards Arrow

-	// I

-	key <AD08> { [	U2373	] }; // ⍳ -- APL Functional Symbol Iota

-	// O

-	key <AD09> { [	U25CB	] }; // ○ -- White Circle

-	// P

-	key <AD10> { [	U22C6	] }; // ⋆ -- Should this be a plain asterisk, or the star operator???

-	// [

-	key <AD11> { [	U2190	] }; // ← -- Leftwards Arrow

-

-	// A

-	key <AC01> { [	U237A	] }; // ⍺ -- APL Functional Symbol Alpha

-	// S

-	key <AC02> { [	U2308	] }; // ⌈ -- Left Ceiling

-	// D

-	key <AC03> { [	U230A	] }; // ⌊ -- Left Floor

-	// F

-	key <AC04> { [	underscore	] };

-	// G

-	key <AC05> { [	U2207	] }; // ∇ -- Nabla

-	// H

-	key <AC06> { [	U2206	] }; // ∆ -- Increment

-	// J

-	key <AC07> { [	U2218	] }; // ∘ -- Ring Operator

-	// K

-	key <AC08> { [	apostrophe ] };

-	// L

-	key <AC09> { [	U2395	] }; // ⎕ -- APL Functional Symbol Quad

-

-	// Z

-	key <AB01> { [	U2282	] }; // ⊂ -- Subset Of

-	// X

-	key <AB02> { [	U2283	] }; // ⊃ -- Superset Of

-	// C

-	key <AB03> { [	U2229	] }; // ∩ -- Intersection

-	// V

-	key <AB04> { [	U222A	] }; // ∪ -- Union

-	// B

-	key <AB05> { [	U22A5	] }; // ⊥ -- Up Tack

-	// N

-	key <AB06> { [	U22A4	] }; // ⊤ -- Down Tack

-	// M

-	key <AB07> { [	U007C	] }; // | -- Vertical Line

-};

-

-// Keys common to a number of keyboards that allow normal language usage alongside APL

-partial alphanumeric_keys modifier_keys 

-xkb_symbols "unified" {

-	name[Group1]= "APL Keyboard Symbols: Unified Layout";

-

-	include "apl(common)"

-

-	// `

-	key <TLDE> { [	U22C4	] }; // ⋄ -- Diamond Operator

-	key <AE09> { [	NoSymbol,	U2371	] }; // ⍱ -- APL Functional Symbol Down Caret Tilde

-	key <AE10> { [	NoSymbol,	U2372	] }; // ⍲ -- APL Functional Symbol Up Caret Tilde

-	// -

-	key <AE11> { [	U00D7	] }; // × -- Multiplication Sign

-	// =

-	key <AE12> { [	U00F7,	U2339	] }; // ÷ ⌹ -- Division Sign / APL Functional Symbol Quad Divide

-

-	// ]

-	key <AD12> { [	U2192		] }; // → -- Rightwards Arrow

-};

-

-// Layout: http://www.wickensonline.co.uk/apl-unicomp.html

-default

-partial alphanumeric_keys modifier_keys 

-xkb_symbols "sax" {

-	name[Group1]= "APL Keyboard Symbols: Sharp APL for Unix";

-

-	include "apl(unified)"

-

-	key <AE01> { [	NoSymbol,	U00A1	] }; // ¡ -- Inverted Exclamation Mark

-	key <AE04> { [	NoSymbol,	cent	] };

-	key <AE08> { [	NoSymbol,	U2342	] }; // ⍂ -- APL Functional Symbol Quad Backslash

-	// -

-	key <AE11> { [	NoSymbol,	U2261	] }; // ≡ -- Identical To

-

-	// Q

-	key <AD01> { [	NoSymbol,	U00BF	] }; // ¿ -- Inverted Question Mark

-	// W

-	key <AD02> { [	NoSymbol,	U233D	] }; // ⌽ -- APL Functional Symbol Circle Stile

-	// E

-	key <AD03> { [	NoSymbol,	U2377	] }; // ⍷ -- APL Functional Symbol Epsilon Underbar

-	// T

-	key <AD05> { [	NoSymbol,	U2349	] }; // ⍉ -- APL Functional Symbol Circle Backslash

-	// I

-	key <AD08> { [	NoSymbol,	U2378	] }; // ⍸ -- APL Functional Symbol Iota Underbar

-	// O

-	key <AD09> { [	NoSymbol,	U2365	] }; // ⍥ -- APL Functional Symbol Circle Diaeresis

-	// P

-	key <AD10> { [	NoSymbol,	U235F	] }; // ⍟ -- APL Functional Symbol Circle Star

-

-	// A

-	key <AC01> { [	NoSymbol,	U2296	] }; // ⊖ -- Circled Minus

-	// F

-	key <AC04> { [	NoSymbol,	U236B	] }; // ⍫ -- APL Functional Symbol Del Tilde

-	// G

-	key <AC05> { [	NoSymbol,	U2352	] }; // ∇ ⍒ -- APL Functional Symbol Del Stile

-	// H

-	key <AC06> { [	NoSymbol,	U234B	] }; // ∆ ⍋ -- APL Functional Symbol Delta Stile

-	// J

-	key <AC07> { [	NoSymbol,	U2364	] }; // ⍤ -- APL Functional Symbol Jot Diaeresis

-	// K

-	key <AC08> { [	NoSymbol,	U233B	] }; // ⌻

-	// L

-	key <AC09> { [	NoSymbol,	U235E	] }; // ⍞ -- APL Functional Symbol Quote Quad

-	// ;

-	key <AC10> { [	U22A2	] }; // ⊢ -- Right Tack

-	// '

-	key <AC11> { [	U22A3	] }; // ⊣ -- Left Tack

-

-	// C

-	key <AB03> { [	NoSymbol,	U235D	] }; // ⍝ -- APL Functional Symbol Up Shoe Jot

-	// B

-	key <AB05> { [	NoSymbol,	U234E	] }; // ⍎ -- APL Functional Symbol Down Tack Jot (Unicode got the name wrong; it should have been "Up Tack")

-	// N

-	key <AB06> { [	NoSymbol,	U2355	] }; // ⍕ -- APL Functional Symbol Up Tack Jot (Unicode got the name wrong; it should have been "Down Tack")

-	// M

-	key <AB07> { [	NoSymbol,	U2336	] }; // ⌶ -- APL Functional Symbol I-Beam

-	// ,

-	key <AB08> { [	U235E,	U236A	] }; // ⍞ ⍪ -- APL Functional Symbol Quote Quad / APL Functional Symbol Comma Bar

-	// .

-	key <AB09> { [	U234E,	U2359	] }; // ⍎ ⍙ -- [See B key] / APL Functional Symbol Delta Underbar

-	// /

-	key <AB10> { [	U2355,	U233F	] }; // ⍕ ⌿ -- [See N key] / APL Functional Symbol Slash Bar

-

-	key <BKSL> { [	U235D,	U2340	] }; // ⍝ ⍀ -- APL Functional Symbol Up Shoe Jot / APL Functional Symbol Backslash Bar

-};

-

-// Layout: http://www.wickensonline.co.uk/apl-unicomp.html

-partial alphanumeric_keys modifier_keys 

-xkb_symbols "apl2" {

-	name[Group1]= "APL Keyboard Symbols: IBM APL2";

-

-	include "apl(common)"

-

-	// The first column is NoSymbol because it inherits.  The second is NoSymbol because those keys don't do anything

-

-	// `

-	key <TLDE> { [	NoSymbol,	U233B,	U2342	] }; // ⌻ ⍂ -- 

-	key <AE01> { [	NoSymbol, NoSymbol, U2336	] }; // ⌶ -- APL Functional Symbol I-Beam

-	key <AE02> { [	NoSymbol, NoSymbol,	U236B	] }; // ⍫ -- APL Functional Symbol Del Tilde

-	key <AE03> { [	NoSymbol, NoSymbol,	U2353	] }; // ⍒ -- APL Functional Symbol Del Stile

-	key <AE04> { [	NoSymbol, NoSymbol,	U234B	] }; // ⍋ -- APL Functional Symbol Delta Stile

-	key <AE05> { [	NoSymbol, NoSymbol,	U233D	] }; // ⌽ -- APL Functional Symbol Circle Stile

-	key <AE06> { [	NoSymbol, NoSymbol,	U2349	] }; // ⍉ -- APL Functional Symbol Circle Backslash

-	key <AE07> { [	NoSymbol, NoSymbol,	U2296	] }; // ⊖ -- Circled Minus

-	key <AE08> { [	NoSymbol, NoSymbol,	U235F	] }; // ⍟ -- APL Functional Symbol Circle Star

-	key <AE09> { [	NoSymbol, NoSymbol,	U2371	] }; // ⍱ -- APL Functional Symbol Down Caret Tilde

-	key <AE10> { [	NoSymbol, NoSymbol,	U2372	] }; // ⍲ -- APL Functional Symbol Up Caret Tilde

-	// -

-	key <AE11> { [	plus,	minus,	exclam	] };

-	// =

-	key <AE12> { [	U00D7,	U00F7,	U2339	] }; // × ÷ ⌹ -- Multiplication Sign / Division Sign / APL Functional Symbol Quad Divide

-

-	// [

-	key <AD11> { [	NoSymbol,	U2192,	U235E	] }; // (←) → ⍞ -- Rightwards Arrow / APL Functional Symbol Quote Quad

-	// ]

-	key <AD12> { [	U2337,	U2378,	U2359	] }; // ⌷ ⍸ ⍙ -- APL Functional Symbol Squish Quad / APL Functional Symbol Iota Underbar / APL Functional Symbol Delta Underbar

-

-	// ;

-	key <AC10> { [	bracketleft, parenleft,	U234E	] }; // ⍎ -- [See B key in SAX layout]

-	// '

-	key <AC11> { [	bracketright, parenright, U2355	] }; // ⍕ -- [See N key in SAX layout] 

-

-	// ,

-	key <AB08> { [	comma,	semicolon, U235D ] }; // ⍝ -- APL Functional Symbol Up Shoe Jot

-	// .

-	key <AB09> { [	period,	colon,	U2340	] }; // ⍀ -- APL Functional Symbol Backslash Bar

-	// /

-	key <AB10> { [	slash,	backslash, U233F ] }; // ⌿ -- APL Functional Symbol Slash Bar

-

-	key <BKSL> { [	U2261,	U2377, U2364	] }; // ≡ ⍷ ⍤ -- Identical To / APL Functional Symbol Epsilon Underbar / APL Functional Symbol Jot Diaeresis

-};

-

-partial alphanumeric_keys modifier_keys 

-xkb_symbols "aplplusII" {

-	name[Group1]= "APL Keyboard Symbols: Manugistics APL*PLUS II";

-

-	include "apl(apl2)"

-

-	// `

-	key <TLDE> { [	dollar,	U22C4,	U236A	] }; // ⋄ ⍪ -- Diamond Operator / APL Functional Symbol Comma Bar

-	key <AE01> { [	NoSymbol, NoSymbol, U2261	] }; // ≡ -- Identical To

-

-	// [

-	key <AD11> { [	U2190,	NoSymbol,	U235E	] }; // ← ⍞ -- Leftwards Arrow / APL Functional Symbol Quote Quad

-	// ]

-	key <AD12> { [	U2192,	NoSymbol,	U236C	] }; // → ⍬ -- Rightwards Arrow / APL Functional Symbol Zilde

-

-	// ;

-	key <AC10> { [	bracketleft, parenleft,	U234E	] }; // ⍎ -- [See B key in SAX layout]

-	// '

-	key <AC11> { [	bracketright, parenright, U2355	] }; // ⍕ -- [See N key in SAX layout] 

-

-	key <BKSL> { [	U22A3,	U22A2,	U2359	] }; // ⊣ ⊢ ⍙ -- Left Tack / Right Tack / APL Functional Symbol Delta Underbar

-};

-

-

-// MicroAPL layout: http://aplwiki.com/APLXKeyboardLayouts

-// I didn't do the old-style MicroAPL layout; patches gratefully accepted

-partial alphanumeric_keys modifier_keys 

-xkb_symbols "aplx" {

-	name[Group1]= "APL Keyboard Symbols: APLX Unified APL Layout";

-

-	include "apl(unified)"

-

-	// `

-	key <TLDE> { [	NoSymbol,	U235E	] }; // ⍞ -- APL Functional Symbol Quote Quad

-	key <AE01> { [	NoSymbol,	U2336	] }; // ⌶ -- APL Functional Symbol I-Beam

-	key <AE02> { [	NoSymbol,	U236B	] }; // ⍫ -- APL Functional Symbol Del Tilde

-	key <AE03> { [	NoSymbol,	U2353	] }; // ⍒ -- APL Functional Symbol Del Stile

-	key <AE04> { [	NoSymbol,	U234B	] }; // ⍋ -- APL Functional Symbol Delta Stile

-	key <AE05> { [	NoSymbol,	U233D	] }; // ⌽ -- APL Functional Symbol Circle Stile

-	key <AE06> { [	NoSymbol,	U2349	] }; // ⍉ -- APL Functional Symbol Circle Backslash

-	key <AE07> { [	NoSymbol,	U2296	] }; // ⊖ -- Circled Minus

-	key <AE08> { [	NoSymbol,	U235F	] }; // ⍟ -- APL Functional Symbol Circle Star

-	// -

-	key <AE11> { [	NoSymbol,	exclam ] };

-

-	// [

-	key <AD11> { [	NoSymbol,	U2347	] }; // ⍇ -- Box With Left Arrow

-	// ]

-	key <AD12> { [	NoSymbol,	U2348	] }; // ⍈ -- Box With Right Arrow

-

-	// ;

-	key <AC10> { [	U234E,	U2261	] }; // ⍎ ≡ -- [See B key in SAX layout] / Identical To

-	// '

-	key <AC11> { [	U2355,	U2262	] }; // ⍕ ≢ -- [See N key in SAX layout] / Not Identical To

-

-	// ,

-	key <AB08> { [	U235D,	U236A	] }; // ⍝ ⍪ -- APL Functional Symbol Up Shoe Jot / APL Functional Symbol Comma Bar

-	// .

-	key <AB09> { [	U2340,	U2364	] }; // ⍀ ⍤ -- APL Functional Symbol Backslash Bar / APL Functional Symbol Jot Diaeresis

-	// /

-	key <AB10> { [	U233F ] }; // ⌿ -- APL Functional Symbol Slash Bar

-

-	key <BKSL> { [	U22A3,	U22A3	] }; // ⊣ ⊢ -- Left Tack / Right Tack

-};

+// EXTRAS:
+//
+// APL Keyboard Layouts
+
+// This file supports:
+// -	The Sharp APL for Unix (SAX) layout
+// -	The IBM APL2 layout
+// -	The Manugistics APL*PLUS II (Version 5.1, 1993) keyboard layout
+
+// Unicode APL table: http://aplwiki.com/UnicodeAplTable
+// ...and another: http://publibfp.boulder.ibm.com/epubs/pdf/h2110611.pdf (appendix A)
+// Generic Unicode stuff: http://www.fileformat.info/info/unicode/category/index.htm
+
+// Tim Nelson (this file's creator) says:
+
+// This file doesn't deal with all the combining stuff -- I'm not an APL programmer,
+// and am not quite sure what's needed here.  However, it may be possible to get this
+// working with dead keys and the like.  Patches gratefully accepted.  
+
+// Some of the shift-key assignments may differ from the APL tradition.  If
+// that's not considered acceptable, it should be possible to remap the 
+// shift keys.  I have striven, however, to ensure that the use of shift keys
+// in these maps is at least self-consistent.  
+
+// I'm assuming that this will be used with another keyboard layout (ie. for 
+// your language), with a special shift key to use these maps.  
+
+partial alphanumeric_keys modifier_keys 
+xkb_symbols "common" {
+	name[Group1]= "APL";
+
+	key <AE01> { [	diaeresis	] };
+	key <AE02> { [	U00AF	] }; // ¯ -- Macron
+	key <AE03> { [	less	] };
+	key <AE04> { [	U2264	] }; // ≤ -- Less-than Or Equal To
+	key <AE05> { [	equal	] };
+	key <AE06> { [	U2265	] }; // ≥ -- Greater-than Or Equal To
+	key <AE07> { [	greater	] };
+	key <AE08> { [	U2260	] }; // ≠ -- Not Equal To
+	key <AE09> { [	U2228	] }; // ∨ -- Logical Or
+	key <AE10> { [	U2227	] }; // ∧ -- Logical And
+
+	// Q
+	key <AD01> { [	question	] };
+	// W
+	key <AD02> { [	U2375		] }; // ⍵ -- APL Functional Symbol Omega
+	// E
+	key <AD03> { [	U220A		] }; // ∊ -- Small Element Of
+	// R
+	key <AD04> { [	U2374		] }; // ⍴ -- APL Functional Symbol Rho
+	// T
+	key <AD05> { [	asciitilde		] };
+	// Y
+	key <AD06> { [	U2191		] }; // ↑ -- Upwards Arrow
+	// U
+	key <AD07> { [	U2193		] }; // ↓ -- Downwards Arrow
+	// I
+	key <AD08> { [	U2373	] }; // ⍳ -- APL Functional Symbol Iota
+	// O
+	key <AD09> { [	U25CB	] }; // ○ -- White Circle
+	// P
+	key <AD10> { [	U22C6	] }; // ⋆ -- Should this be a plain asterisk, or the star operator???
+	// [
+	key <AD11> { [	U2190	] }; // ← -- Leftwards Arrow
+
+	// A
+	key <AC01> { [	U237A	] }; // ⍺ -- APL Functional Symbol Alpha
+	// S
+	key <AC02> { [	U2308	] }; // ⌈ -- Left Ceiling
+	// D
+	key <AC03> { [	U230A	] }; // ⌊ -- Left Floor
+	// F
+	key <AC04> { [	underscore	] };
+	// G
+	key <AC05> { [	U2207	] }; // ∇ -- Nabla
+	// H
+	key <AC06> { [	U2206	] }; // ∆ -- Increment
+	// J
+	key <AC07> { [	U2218	] }; // ∘ -- Ring Operator
+	// K
+	key <AC08> { [	apostrophe ] };
+	// L
+	key <AC09> { [	U2395	] }; // ⎕ -- APL Functional Symbol Quad
+
+	// Z
+	key <AB01> { [	U2282	] }; // ⊂ -- Subset Of
+	// X
+	key <AB02> { [	U2283	] }; // ⊃ -- Superset Of
+	// C
+	key <AB03> { [	U2229	] }; // ∩ -- Intersection
+	// V
+	key <AB04> { [	U222A	] }; // ∪ -- Union
+	// B
+	key <AB05> { [	U22A5	] }; // ⊥ -- Up Tack
+	// N
+	key <AB06> { [	U22A4	] }; // ⊤ -- Down Tack
+	// M
+	key <AB07> { [	U007C	] }; // | -- Vertical Line
+};
+
+// Keys common to a number of keyboards that allow normal language usage alongside APL
+partial alphanumeric_keys modifier_keys 
+xkb_symbols "unified" {
+	name[Group1]= "APL Keyboard Symbols: Unified Layout";
+
+	include "apl(common)"
+
+	// `
+	key <TLDE> { [	U22C4	] }; // ⋄ -- Diamond Operator
+	key <AE09> { [	NoSymbol,	U2371	] }; // ⍱ -- APL Functional Symbol Down Caret Tilde
+	key <AE10> { [	NoSymbol,	U2372	] }; // ⍲ -- APL Functional Symbol Up Caret Tilde
+	// -
+	key <AE11> { [	U00D7	] }; // × -- Multiplication Sign
+	// =
+	key <AE12> { [	U00F7,	U2339	] }; // ÷ ⌹ -- Division Sign / APL Functional Symbol Quad Divide
+
+	// ]
+	key <AD12> { [	U2192		] }; // → -- Rightwards Arrow
+};
+
+// Layout: http://www.wickensonline.co.uk/apl-unicomp.html
+default
+partial alphanumeric_keys modifier_keys 
+xkb_symbols "sax" {
+	name[Group1]= "APL Keyboard Symbols: Sharp APL for Unix";
+
+	include "apl(unified)"
+
+	key <AE01> { [	NoSymbol,	U00A1	] }; // ¡ -- Inverted Exclamation Mark
+	key <AE04> { [	NoSymbol,	cent	] };
+	key <AE08> { [	NoSymbol,	U2342	] }; // ⍂ -- APL Functional Symbol Quad Backslash
+	// -
+	key <AE11> { [	NoSymbol,	U2261	] }; // ≡ -- Identical To
+
+	// Q
+	key <AD01> { [	NoSymbol,	U00BF	] }; // ¿ -- Inverted Question Mark
+	// W
+	key <AD02> { [	NoSymbol,	U233D	] }; // ⌽ -- APL Functional Symbol Circle Stile
+	// E
+	key <AD03> { [	NoSymbol,	U2377	] }; // ⍷ -- APL Functional Symbol Epsilon Underbar
+	// T
+	key <AD05> { [	NoSymbol,	U2349	] }; // ⍉ -- APL Functional Symbol Circle Backslash
+	// I
+	key <AD08> { [	NoSymbol,	U2378	] }; // ⍸ -- APL Functional Symbol Iota Underbar
+	// O
+	key <AD09> { [	NoSymbol,	U2365	] }; // ⍥ -- APL Functional Symbol Circle Diaeresis
+	// P
+	key <AD10> { [	NoSymbol,	U235F	] }; // ⍟ -- APL Functional Symbol Circle Star
+
+	// A
+	key <AC01> { [	NoSymbol,	U2296	] }; // ⊖ -- Circled Minus
+	// F
+	key <AC04> { [	NoSymbol,	U236B	] }; // ⍫ -- APL Functional Symbol Del Tilde
+	// G
+	key <AC05> { [	NoSymbol,	U2352	] }; // ∇ ⍒ -- APL Functional Symbol Del Stile
+	// H
+	key <AC06> { [	NoSymbol,	U234B	] }; // ∆ ⍋ -- APL Functional Symbol Delta Stile
+	// J
+	key <AC07> { [	NoSymbol,	U2364	] }; // ⍤ -- APL Functional Symbol Jot Diaeresis
+	// K
+	key <AC08> { [	NoSymbol,	U233B	] }; // ⌻
+	// L
+	key <AC09> { [	NoSymbol,	U235E	] }; // ⍞ -- APL Functional Symbol Quote Quad
+	// ;
+	key <AC10> { [	U22A2	] }; // ⊢ -- Right Tack
+	// '
+	key <AC11> { [	U22A3	] }; // ⊣ -- Left Tack
+
+	// C
+	key <AB03> { [	NoSymbol,	U235D	] }; // ⍝ -- APL Functional Symbol Up Shoe Jot
+	// B
+	key <AB05> { [	NoSymbol,	U234E	] }; // ⍎ -- APL Functional Symbol Down Tack Jot (Unicode got the name wrong; it should have been "Up Tack")
+	// N
+	key <AB06> { [	NoSymbol,	U2355	] }; // ⍕ -- APL Functional Symbol Up Tack Jot (Unicode got the name wrong; it should have been "Down Tack")
+	// M
+	key <AB07> { [	NoSymbol,	U2336	] }; // ⌶ -- APL Functional Symbol I-Beam
+	// ,
+	key <AB08> { [	U235E,	U236A	] }; // ⍞ ⍪ -- APL Functional Symbol Quote Quad / APL Functional Symbol Comma Bar
+	// .
+	key <AB09> { [	U234E,	U2359	] }; // ⍎ ⍙ -- [See B key] / APL Functional Symbol Delta Underbar
+	// /
+	key <AB10> { [	U2355,	U233F	] }; // ⍕ ⌿ -- [See N key] / APL Functional Symbol Slash Bar
+
+	key <BKSL> { [	U235D,	U2340	] }; // ⍝ ⍀ -- APL Functional Symbol Up Shoe Jot / APL Functional Symbol Backslash Bar
+};
+
+// Layout: http://www.wickensonline.co.uk/apl-unicomp.html
+partial alphanumeric_keys modifier_keys 
+xkb_symbols "apl2" {
+	name[Group1]= "APL Keyboard Symbols: IBM APL2";
+
+	include "apl(common)"
+
+	// The first column is NoSymbol because it inherits.  The second is NoSymbol because those keys don't do anything
+
+	// `
+	key <TLDE> { [	NoSymbol,	U233B,	U2342	] }; // ⌻ ⍂ -- 
+	key <AE01> { [	NoSymbol, NoSymbol, U2336	] }; // ⌶ -- APL Functional Symbol I-Beam
+	key <AE02> { [	NoSymbol, NoSymbol,	U236B	] }; // ⍫ -- APL Functional Symbol Del Tilde
+	key <AE03> { [	NoSymbol, NoSymbol,	U2353	] }; // ⍒ -- APL Functional Symbol Del Stile
+	key <AE04> { [	NoSymbol, NoSymbol,	U234B	] }; // ⍋ -- APL Functional Symbol Delta Stile
+	key <AE05> { [	NoSymbol, NoSymbol,	U233D	] }; // ⌽ -- APL Functional Symbol Circle Stile
+	key <AE06> { [	NoSymbol, NoSymbol,	U2349	] }; // ⍉ -- APL Functional Symbol Circle Backslash
+	key <AE07> { [	NoSymbol, NoSymbol,	U2296	] }; // ⊖ -- Circled Minus
+	key <AE08> { [	NoSymbol, NoSymbol,	U235F	] }; // ⍟ -- APL Functional Symbol Circle Star
+	key <AE09> { [	NoSymbol, NoSymbol,	U2371	] }; // ⍱ -- APL Functional Symbol Down Caret Tilde
+	key <AE10> { [	NoSymbol, NoSymbol,	U2372	] }; // ⍲ -- APL Functional Symbol Up Caret Tilde
+	// -
+	key <AE11> { [	plus,	minus,	exclam	] };
+	// =
+	key <AE12> { [	U00D7,	U00F7,	U2339	] }; // × ÷ ⌹ -- Multiplication Sign / Division Sign / APL Functional Symbol Quad Divide
+
+	// [
+	key <AD11> { [	NoSymbol,	U2192,	U235E	] }; // (←) → ⍞ -- Rightwards Arrow / APL Functional Symbol Quote Quad
+	// ]
+	key <AD12> { [	U2337,	U2378,	U2359	] }; // ⌷ ⍸ ⍙ -- APL Functional Symbol Squish Quad / APL Functional Symbol Iota Underbar / APL Functional Symbol Delta Underbar
+
+	// ;
+	key <AC10> { [	bracketleft, parenleft,	U234E	] }; // ⍎ -- [See B key in SAX layout]
+	// '
+	key <AC11> { [	bracketright, parenright, U2355	] }; // ⍕ -- [See N key in SAX layout] 
+
+	// ,
+	key <AB08> { [	comma,	semicolon, U235D ] }; // ⍝ -- APL Functional Symbol Up Shoe Jot
+	// .
+	key <AB09> { [	period,	colon,	U2340	] }; // ⍀ -- APL Functional Symbol Backslash Bar
+	// /
+	key <AB10> { [	slash,	backslash, U233F ] }; // ⌿ -- APL Functional Symbol Slash Bar
+
+	key <BKSL> { [	U2261,	U2377, U2364	] }; // ≡ ⍷ ⍤ -- Identical To / APL Functional Symbol Epsilon Underbar / APL Functional Symbol Jot Diaeresis
+};
+
+partial alphanumeric_keys modifier_keys 
+xkb_symbols "aplplusII" {
+	name[Group1]= "APL Keyboard Symbols: Manugistics APL*PLUS II";
+
+	include "apl(apl2)"
+
+	// `
+	key <TLDE> { [	dollar,	U22C4,	U236A	] }; // ⋄ ⍪ -- Diamond Operator / APL Functional Symbol Comma Bar
+	key <AE01> { [	NoSymbol, NoSymbol, U2261	] }; // ≡ -- Identical To
+
+	// [
+	key <AD11> { [	U2190,	NoSymbol,	U235E	] }; // ← ⍞ -- Leftwards Arrow / APL Functional Symbol Quote Quad
+	// ]
+	key <AD12> { [	U2192,	NoSymbol,	U236C	] }; // → ⍬ -- Rightwards Arrow / APL Functional Symbol Zilde
+
+	// ;
+	key <AC10> { [	bracketleft, parenleft,	U234E	] }; // ⍎ -- [See B key in SAX layout]
+	// '
+	key <AC11> { [	bracketright, parenright, U2355	] }; // ⍕ -- [See N key in SAX layout] 
+
+	key <BKSL> { [	U22A3,	U22A2,	U2359	] }; // ⊣ ⊢ ⍙ -- Left Tack / Right Tack / APL Functional Symbol Delta Underbar
+};
+
+
+// MicroAPL layout: http://aplwiki.com/APLXKeyboardLayouts
+// I didn't do the old-style MicroAPL layout; patches gratefully accepted
+partial alphanumeric_keys modifier_keys 
+xkb_symbols "aplx" {
+	name[Group1]= "APL Keyboard Symbols: APLX Unified APL Layout";
+
+	include "apl(unified)"
+
+	// `
+	key <TLDE> { [	NoSymbol,	U235E	] }; // ⍞ -- APL Functional Symbol Quote Quad
+	key <AE01> { [	NoSymbol,	U2336	] }; // ⌶ -- APL Functional Symbol I-Beam
+	key <AE02> { [	NoSymbol,	U236B	] }; // ⍫ -- APL Functional Symbol Del Tilde
+	key <AE03> { [	NoSymbol,	U2353	] }; // ⍒ -- APL Functional Symbol Del Stile
+	key <AE04> { [	NoSymbol,	U234B	] }; // ⍋ -- APL Functional Symbol Delta Stile
+	key <AE05> { [	NoSymbol,	U233D	] }; // ⌽ -- APL Functional Symbol Circle Stile
+	key <AE06> { [	NoSymbol,	U2349	] }; // ⍉ -- APL Functional Symbol Circle Backslash
+	key <AE07> { [	NoSymbol,	U2296	] }; // ⊖ -- Circled Minus
+	key <AE08> { [	NoSymbol,	U235F	] }; // ⍟ -- APL Functional Symbol Circle Star
+	// -
+	key <AE11> { [	NoSymbol,	exclam ] };
+
+	// [
+	key <AD11> { [	NoSymbol,	U2347	] }; // ⍇ -- Box With Left Arrow
+	// ]
+	key <AD12> { [	NoSymbol,	U2348	] }; // ⍈ -- Box With Right Arrow
+
+	// ;
+	key <AC10> { [	U234E,	U2261	] }; // ⍎ ≡ -- [See B key in SAX layout] / Identical To
+	// '
+	key <AC11> { [	U2355,	U2262	] }; // ⍕ ≢ -- [See N key in SAX layout] / Not Identical To
+
+	// ,
+	key <AB08> { [	U235D,	U236A	] }; // ⍝ ⍪ -- APL Functional Symbol Up Shoe Jot / APL Functional Symbol Comma Bar
+	// .
+	key <AB09> { [	U2340,	U2364	] }; // ⍀ ⍤ -- APL Functional Symbol Backslash Bar / APL Functional Symbol Jot Diaeresis
+	// /
+	key <AB10> { [	U233F ] }; // ⌿ -- APL Functional Symbol Slash Bar
+
+	key <BKSL> { [	U22A3,	U22A3	] }; // ⊣ ⊢ -- Left Tack / Right Tack
+};
diff --git a/xorg-server/xkeyboard-config/symbols/cd b/xorg-server/xkeyboard-config/symbols/cd.in
index 8a12a384e..8a12a384e 100644
--- a/xorg-server/xkeyboard-config/symbols/cd
+++ b/xorg-server/xkeyboard-config/symbols/cd.in
diff --git a/xorg-server/xkeyboard-config/symbols/es b/xorg-server/xkeyboard-config/symbols/es
index 048a9f03a..7f92d8767 100644
--- a/xorg-server/xkeyboard-config/symbols/es
+++ b/xorg-server/xkeyboard-config/symbols/es
@@ -180,7 +180,7 @@ xkb_symbols "olpc" {
 

     key <AC10> { [       ntilde,        Ntilde                  ] };

     key <AC11> { [         plus,       asterisk,      dead_tilde ] };

-    key <BKSL> { [ bracketright,     braceright                  ] };

+    key <BKSL> { [ bracketright,     braceright,      section    ] };

 

     key <AB08> { [        comma,      semicolon                  ] };

     key <AB09> { [       period,          colon                  ] };

@@ -200,3 +200,18 @@ xkb_symbols "deadtilde" {
 

     key <AE04>	{ [         4,     dollar,   dead_tilde,       dollar ]	};

 };

+

+partial alphanumeric_keys

+xkb_symbols "olpc2" {

+

+    // Modified variant of US International layout, specifically for Peru

+    // Contact: Sayamindu Dasgupta <sayamindu@laptop.org>

+

+    include "us(olpc)"

+    name[Group1]="Spain - OLPC2";

+

+    key <AE03> { [  3, numbersign,   dead_grave,  dead_grave] }; // combining grave

+    key <I236>  { [ XF86Start ] };

+

+    include "level3(ralt_switch)"

+};

diff --git a/xorg-server/xkeyboard-config/symbols/extras/Makefile.am b/xorg-server/xkeyboard-config/symbols/extras/Makefile.am
deleted file mode 100644
index 948060441..000000000
--- a/xorg-server/xkeyboard-config/symbols/extras/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-symbolsdir = $(xkb_base)/symbols/extras

-dist_symbols_DATA = apl \

-		    ir \

-		    rs ru \

-		    us

diff --git a/xorg-server/xkeyboard-config/symbols/extras/ir b/xorg-server/xkeyboard-config/symbols/extras/ir
deleted file mode 100644
index 52502bf75..000000000
--- a/xorg-server/xkeyboard-config/symbols/extras/ir
+++ /dev/null
@@ -1,63 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////////

-//

-// Generated keyboard layout file with the Keyboard Layout Editor.

-// For more about the software, see http://code.google.com/p/keyboardlayouteditor

-//

-// Version 0.2, fixed AD09.

-//

-// Layout by Ernst Tremel, http://ubuntuforums.org/showpost.php?p=9365469&postcount=32

-// Creation of this file by Simos Xenitellis.

-

-partial default alphanumeric_keys

-xkb_symbols "ave"

-{

-	name[Group1] = "Iran - Avestan";

-

-	key <AB01> { [ U10B30,         U10B32 ] }; // 𐬰 𐬲 

-	key <AB02> { [ U10B11,         U10B12 ] }; // 𐬑 𐬒 

-	key <AB03> { [ U10B17,          UE102 ] }; // 𐬗  

-	key <AB04> { [ U10B2C,         U10B13 ] }; // 𐬬 𐬓 

-	key <AB05> { [ U10B20,         U10B21 ] }; // 𐬠 𐬡 

-	key <AB06> { [ U10B25,         U10B27 ] }; // 𐬥 𐬧 

-	key <AB07> { [ U10B28,         U10B29 ] }; // 𐬨 𐬩 

-	key <AB08> { [ U10B3C,         U10B39 ] }; // 𐬼 𐬹 

-	key <AB09> { [ U10B3E,         U10B3D ] }; // 𐬾 𐬽 

-	key <AB10> { [ U10B3F, periodcentered ] }; // 𐬿 · 

-

-	key <AC01> { [ U10B00,         U10B01 ] }; // 𐬀 𐬁 

-	key <AC02> { [ U10B2F,         U10B31 ] }; // 𐬯 𐬱 

-	key <AC03> { [ U10B1B,         U10B1C ] }; // 𐬛 𐬜 

-	key <AC04> { [ U10B1F,         U10B16 ] }; // 𐬟 𐬖 

-	key <AC05> { [ U10B14,         U10B15 ] }; // 𐬔 𐬕 

-	key <AC06> { [ U10B35,          UE100 ] }; // 𐬵  

-	key <AC07> { [ U10B18,         U10B24 ] }; // 𐬘 𐬤 

-	key <AC08> { [ U10B10,          UE101 ] }; // 𐬐  

-	key <AC09> { [ U10B2E,          UE103 ] }; // 𐬮  

-	key <AC10> { [ U10B3B,         U10B3A ] }; // 𐬻 𐬺 

-	key <AC11> { [ U10B1D                 ] }; // 𐬝 

-

-	key <AD01> { [ U10B22,         U10B23 ] }; // 𐬢 𐬣 

-	key <AD02> { [ U10B33,         U10B34 ] }; // 𐬳 𐬴 

-	key <AD03> { [ U10B08,         U10B09 ] }; // 𐬈 𐬉 

-	key <AD04> { [ U10B2D,         U10B26 ] }; // 𐬭 𐬦 

-	key <AD05> { [ U10B19,         U10B1A ] }; // 𐬙 𐬚 

-	key <AD06> { [ U10B2B,         U10B2A ] }; // 𐬫 𐬪 

-	key <AD07> { [ U10B0E,         U10B0F ] }; // 𐬎 𐬏 

-	key <AD08> { [ U10B0C,         U10B0D ] }; // 𐬌 𐬍 

-	key <AD09> { [ U10B0A,         U10B0B ] }; // 𐬊 𐬋

-	key <AD10> { [ U10B1E                 ] }; // 𐬞 

-	key <AD11> { [ U10B06,         U10B07 ] }; // 𐬆 𐬇 

-	key <AD12> { [ U10B02,         U10B03 ] }; // 𐬂 𐬃 

-

-	key <AE01> { [ U10B78                 ] }; // 𐭸 

-	key <AE02> { [ U10B79                 ] }; // 𐭹 

-	key <AE03> { [ U10B7A                 ] }; // 𐭺 

-	key <AE04> { [ U10B7B                 ] }; // 𐭻 

-	key <AE05> { [ U10B7C                 ] }; // 𐭼 

-	key <AE06> { [ U10B7D                 ] }; // 𐭽 

-	key <AE07> { [ U10B7E                 ] }; // 𐭾 

-	key <AE08> { [ U10B7F                 ] }; // 𐭿 

-

-	key <BKSL> { [ U10B04,         U10B05 ] }; // 𐬄 𐬅 

-	key <LSGT> { [ U10B04,         U10B05 ] }; // 𐬄 𐬅 

-};

diff --git a/xorg-server/xkeyboard-config/symbols/extras/makefile b/xorg-server/xkeyboard-config/symbols/extras/makefile
deleted file mode 100644
index 0b9fa52aa..000000000
--- a/xorg-server/xkeyboard-config/symbols/extras/makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-ifeq ($(MAKESERVER),1)
-$(error Please do not specify MAKESERVER=1)
-endif
-
-DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\symbols\extras
-
-dist_symbols_DATA = apl \
-		    ir \
-		    rs ru \
-		    us
-
-DATA_FILES=$(dist_symbols_DATA:%=$(DESTDIR)\%)
-
-include ..\..\xkbrules.mak
diff --git a/xorg-server/xkeyboard-config/symbols/extras/rs b/xorg-server/xkeyboard-config/symbols/extras/rs
deleted file mode 100644
index cc6b5fb44..000000000
--- a/xorg-server/xkeyboard-config/symbols/extras/rs
+++ /dev/null
@@ -1,15 +0,0 @@
-xkb_symbols "combiningkeys" {
-  // Raw combining characters instead of dead keys,
-  // especially good for post-accenting texts.
-
-  name[Group1]= "Serbia - Combining accents instead of dead keys";
-
-  include "rs(basic)"
-
-  key <AE03> {   [ any,any,     U0302, dead_circumflex    ]   }; // 3, U0302 = COMBINING CIRCUMFLEX ACCENT
-  key <AE07> {   [ any,any,     U0300, NoSymbol           ]   }; // 7, U0300 = COMBINING GRAVE ACCENT
-  key <AE08> {   [ any,any,     U030F, NoSymbol           ]   }; // 8, U030F = COMBINING DOUBLE GRAVE ACCENT
-  key <AE09> {   [ any,any,     U0301, NoSymbol           ]   }; // 9, U0301 = COMBINING ACUTE ACCENT
-  key <AE10> {   [ any,any,     U0311, NoSymbol           ]   }; // 0, U0311 = COMBINING INVERTED BREVE
-  key <AE11> {   [ any,any,     U0304, NoSymbol           ]   }; // -, U0304 = COMBINING MACRON
-};
diff --git a/xorg-server/xkeyboard-config/symbols/extras/ru b/xorg-server/xkeyboard-config/symbols/extras/ru
deleted file mode 100644
index b872be3d8..000000000
--- a/xorg-server/xkeyboard-config/symbols/extras/ru
+++ /dev/null
@@ -1,58 +0,0 @@
-// Church Slavonic language layout

-// based on

-// russian standard keyboard

-// Aleksandr Andreev and Yuri Shardt 

-// Last Changes 2010/08/01. Contact <aleksandr.andreev@gmail.com>

-

-partial alphanumeric_keys

-xkb_symbols "chu"

-{

-	    name[Group1]= "Russia - Church Slavonic";

-	    key <TLDE> { [ U0457, U0407, U0482, U20DD ] }; // ї Ї ҂ e.g: а⃝ where the last is a combining ten thousands sign

-	    key <AE01> { [ U0461, U0460, U047D, U047C] }; // ѡ Ѡ ѽ Ѽ

-	    key <AE02> { [ U0454, U0404, U0465, U0464] }; // є Є ѥ Ѥ

-	    key <AE03> { [ U046F, U046E, U0469, U0468] }; // ѯ Ѯ ѩ Ѩ

-	    key <AE04> { [ U0471, U0470, U046D, U046C] }; // ѱ Ѱ ѭ Ѭ

-	    key <AE05> { [ U0473, U0472, UA657, UA656] }; // ѳ Ѳ iotified A

-	    key <AE06> { [ U0475, U0474, U0477, U0476] }; // ѵ Ѵ ѷ Ѷ

-	    key <AE07> { [ U047B, U047A, UA64D, UA64C] }; // ѻ Ѻ ꙍ Ꙍ

-	    key <AE08> { [ U047F, U047E, U046B, U046A] }; // ѿ Ѿ ѫ Ѫ

-	    key <AE09> { [ U0455, U0405, parenleft, U002A ] }; // ѕ Ѕ ( *

-	    key <AE10> { [ Cyrillic_u,	Cyrillic_U, parenright, U0488 ] }; // у У ) NB: for diagraph Ouk, use Cyrillic_o + Cyrillic_u

-	    key <AE11> { [ U0483, U0486, U0487, U005F] }; // а҃ а҆ а҇, _ (titlo, psili, pokrytie, underscore)

-	    key <AE12> { [ U0301, U0300, U0484, UA67E] }; //  а̀ а́ а҄ ꙾ (oxia, varia, kamora, kavyka)

-	    key	<AD01> {	[ Cyrillic_shorti, Cyrillic_SHORTI, U0456	]	};

-	    key	<AD02> {	[    Cyrillic_tse,    Cyrillic_TSE, U2DF0	]	};

-	    key	<AD03> {	[   UA64B,  UA64A, U2DF9  	]	}; // Cyrillic monograph Uk (not U)!

-	    key	<AD04> {	[     Cyrillic_ka,     Cyrillic_KA, U2DE6	]	};

-	    key	<AD05> {	[     Cyrillic_ie,     Cyrillic_IE, U2DF7	]	};

-	    key	<AD06> {	[     Cyrillic_en,     Cyrillic_EN, U2DE9	]	};

-	    key	<AD07> {	[    Cyrillic_ghe,    Cyrillic_GHE, U2DE2	]	};

-	    key	<AD08> {	[    Cyrillic_sha,    Cyrillic_SHA, U2DF2	]	};

-	    key	<AD09> {	[  Cyrillic_shcha,  Cyrillic_SHCHA, U2DF3	]	};

-	    key	<AD10> {	[     Cyrillic_ze,     Cyrillic_ZE, U2DE5	]	};

-	    key	<AD11> {	[     Cyrillic_ha,     Cyrillic_HA, U2DEF	]	};

-	    key	<AD12> {	[Cyrillic_hardsign,Cyrillic_HARDSIGN, UA67D	]	}; // Payerok

-	    key <BKSL> { [backslash, slash, colon, question] }; // \ / : ? (note, for Slavonic question use semicolon

-	    key	<AC01> {	[     Cyrillic_ef,     Cyrillic_EF	]	};

-	    key	<AC02> {	[   Cyrillic_yeru,   Cyrillic_YERU	]	};

-	    key	<AC03> {	[     Cyrillic_ve,     Cyrillic_VE, U2DE1	]	};

-	    key	<AC04> {	[      Cyrillic_a,	Cyrillic_A, U2DF6	]	};

-	    key	<AC05> {	[     Cyrillic_pe,     Cyrillic_PE, U2DEB	]	};

-	    key	<AC06> {	[     Cyrillic_er,     Cyrillic_ER, U2DEC	]	};

-	    key	<AC07> {	[      Cyrillic_o,	Cyrillic_O, U2DEA	]	};

-	    key	<AC08> {	[     Cyrillic_el,     Cyrillic_EL, U2DE7	]	};

-	    key	<AC09> {	[     Cyrillic_de,     Cyrillic_DE, U2DE3	]	};

-	    key	<AC10> {	[    Cyrillic_zhe,    Cyrillic_ZHE, U2DE4	]	};

-	    key	<AC11> {	[     U0463,	U0462, U2DFA	]	}; // Yat

-	    key	<AB01> {	[    U0467, U0466, U2DFD 	]	}; // Small Yus

-	    key	<AB02> {	[    Cyrillic_che,    Cyrillic_CHE, U2DF1	]	};

-	    key	<AB03> {	[     Cyrillic_es,     Cyrillic_ES, U2DED	]	};

-	    key	<AB04> {	[     Cyrillic_em,     Cyrillic_EM, U2DE8	]	};

-	    key	<AB05> {	[      Cyrillic_i,	Cyrillic_I	]	};

-	    key	<AB06> {	[     Cyrillic_te,     Cyrillic_TE, U2DEE	]	};

-	    key	<AB07> {	[Cyrillic_softsign,Cyrillic_SOFTSIGN	]	};

-	    key	<AB08> {	[     Cyrillic_be,     Cyrillic_BE, U2DE0	]	};

-	    key	<AB09> {	[     Cyrillic_yu,     Cyrillic_YU, U2DFB	]	};

-	    key <AB10> {        [          period,    comma, semicolon, exclam      ]       };

-};

diff --git a/xorg-server/xkeyboard-config/symbols/extras/us b/xorg-server/xkeyboard-config/symbols/extras/us
deleted file mode 100644
index 45d9954cf..000000000
--- a/xorg-server/xkeyboard-config/symbols/extras/us
+++ /dev/null
@@ -1,146 +0,0 @@
-// XCompose is out! Unicode combining is in!  For those of us who live

-// on the edge: A keymap using Unicode combining characters instead of

-// deadkeys.  This variation does not deviate from the lame MS-style

-// US-intl layout; but it uses AltGr for combining, like altgr-intl.

-//

-// This might break your font layout layout systems (because they

-// suck), caveat emptor.  Also, most of today's software will count

-// individual combining marks for selection, deletion, character

-// counting &c., and won't be smart enough to do canonical equivalence

-// when searching, &c.

-//

-// With Unicode combining you use "handwriting order", not

-// "typewriting order" as with deadkeys.  That is, you first type the

-// base character, then the diacritics/accents/modifiers.  This has

-// the advantage of avoiding hidden states --- each keypress changes

-// something on screen.

-//

-// TODO: as of now, this duplicates all us(intl) functionality with

-// combining.  With care, perhaps we could add more combining marks

-// not present in intl, and support all major languages.

-partial alphanumeric_keys

-xkb_symbols "intl-unicode" {

-

- name[Group1]= "USA - International (AltGr Unicode combining)";

-

- include "us(intl)"

- include "level3(ralt_switch)"

-

- // grave, tilde

- key <TLDE> { [grave, asciitilde, U0300, U0303 ] };

- // double acute

- key <AE02> { [ 2, at, twosuperior, U030B ] };

- // macron

- key <AE03> { [ 3, numbersign, threesuperior, U0304 ] };

- // circumflex

- key <AE06> { [ 6, asciicircum, onequarter, U0302 ] };

- // horn

- key <AE07> { [ 7, ampersand, onehalf, U031B ] };

- // ogonek

- key <AE08> { [ 8, asterisk, threequarters, U0328 ] };

- // breve

- key <AE09> { [	 9, parenleft, leftsinglequotemark, U0306 ] };

- // abovering

- key <AE10> { [	 0, parenright, rightsinglequotemark, U030A ] };

-

- // belowdot

- key <AE11> { [ minus, underscore, yen, U0323 ] };

- // acute, diaeresis

- key <AC11> { [apostrophe, quotedbl, U0301, U0308 ] };

- // abovedot, caron

- key <AB09> { [ period, greater, U0307, U030C ] };

- // hook

- key <AB10> { [ slash, question, questiondown, 0309 ] };

-

- // alt-intl compatibility

- // cedilla, caron

- key <AB08> { [ comma, less,	 U0327, U030C ] };

- // ogonek, diaeresis

- key <AC10> { [ semicolon, colon,	 U0328, U0308 ] };

- // doubleacute, horn

- key <AE12> { [ equal, plus,	 U030B, U031B ] };

-

- // we don't do combining latin letters and combining enclosures

- // because support for those is very rare.

-};

-

-// XCompose is out! Unicode combining is in! For those of us who live

-// on the edge: A keymap using Unicode combining characters instead of

-// deadkeys. This variation does break compatibility with us-intl,

-// whenever I thought it would be more mnemonic or Unicodeish.

-partial alphanumeric_keys

-xkb_symbols "alt-intl-unicode" {

-

- name[Group1]= "USA - International (AltGr Unicode combining, alternative)";

-

- include "extras/us(intl-unicode)"

- include "level3(ralt_switch)"

-

- // easier macron; em-dash.

- // em-dash is available via compose, but I added here since it's such

- // an important typographic character.

- key <AE11> { [ minus, underscore, U0304, U2014 ] };

-

- // belowdot, abovedot (caron at coma/less key, per above)

- key <AB09> { [ period, greater, U0323, U0307 ] };

-

-};

-

-partial alphanumeric_keys  

-xkb_symbols "ats" {

-

-    include "us"

-

-    name[Group1]= "USA - Atsina";

-

-    //Using Dead key to get COMBINING COMMA ABOVE for ejectives on

-    //q, l, t, s, m, g, k, p, w, y, r

-    //XCompose key is used for the other accute and grave.

-

-    key <AD03> { [ e, E, eacute, Eacute  ] };

-    key <AD07> { [ u, U, uacute, Uacute  ] };

-    key <AD08> { [ i, I, iacute, Iacute  ] };

-    key <AD09> { [ o, O, oacute, Oacute  ] };

-    key <AD11> { [ bracketleft,	braceleft, U03B8 ] };

-    key <AD12> { [ bracketright, braceright, U010D, U010C ] };

-    //U+010C (uppercase Č) and U+010D (lowercase č).

-

-    key <AC01> { [ a, A, aacute, Aacute  ] };

-

-

-    //Small letter Open use compose to key get acute accent

-    key <AB03> { [ c,	C, U0254, U0186		  ] };

-    key <AB08> { [ comma,     less, U0313 ] };

-    key <AB10> { [ slash, question, U0294 ] };

-

-    include "level3(ralt_switch)"

-    include "compose(rctrl)"

-};

-

-partial alphanumeric_keys

-xkb_symbols "crd" {

-

-  include "us"

-

-  name[Group1]= "USA - Couer D'alene Salish";

-

-  // Alphanumeric section

-  key <AD02> { [         w,           W, U02B7, U02B7 ] }; 

-  key <AE07> { [         7,   ampersand, U0294        ] }; 

-  key <AD01> { [         q,           Q, U221A        ] }; 

-  key <AB04> { [         v,           V, U0259        ] }; 

-  key <BKSL> { [ backslash,         bar, U026B        ] }; 

-  key <AD03> { [         e,           E, U025B        ] }; 

-  key <AD08> { [         i,           I, U026A        ] }; 

-  key <AC07> { [         j,           J, U01F0        ] }; 

-  key <AE06> { [         6, asciicircum, U0295        ] }; 

-  key <AC02> { [         s,           S, U0161        ] }; 

-  key <AB03> { [         c,           C, U010D        ] }; 

-  key <AD09> { [         o,           O, U0254        ] }; 

-  key <AB09> { [    period,     greater, U0323        ] }; 

-

-  include "level3(ralt_switch)"

-  include "compose(rctrl)"

-

-  // End alphanumeric section

-};

diff --git a/xorg-server/xkeyboard-config/symbols/ir b/xorg-server/xkeyboard-config/symbols/ir
index 6f4618df7..28b8dc17d 100644
--- a/xorg-server/xkeyboard-config/symbols/ir
+++ b/xorg-server/xkeyboard-config/symbols/ir
@@ -238,3 +238,69 @@ xkb_symbols "ku_ara" {
     include "nbsp(zwnj2nb3)"

     include "level3(ralt_switch)"

 };

+

+// EXTRAS:

+

+/////////////////////////////////////////////////////////////////////////////////

+//

+// Generated keyboard layout file with the Keyboard Layout Editor.

+// For more about the software, see http://code.google.com/p/keyboardlayouteditor

+//

+// Version 0.2, fixed AD09.

+//

+// Layout by Ernst Tremel, http://ubuntuforums.org/showpost.php?p=9365469&postcount=32

+// Creation of this file by Simos Xenitellis.

+

+partial default alphanumeric_keys

+xkb_symbols "ave"

+{

+	name[Group1] = "Iran - Avestan";

+

+	key <AB01> { [ U10B30,         U10B32 ] }; // 𐬰 𐬲 

+	key <AB02> { [ U10B11,         U10B12 ] }; // 𐬑 𐬒 

+	key <AB03> { [ U10B17,          UE102 ] }; // 𐬗  

+	key <AB04> { [ U10B2C,         U10B13 ] }; // 𐬬 𐬓 

+	key <AB05> { [ U10B20,         U10B21 ] }; // 𐬠 𐬡 

+	key <AB06> { [ U10B25,         U10B27 ] }; // 𐬥 𐬧 

+	key <AB07> { [ U10B28,         U10B29 ] }; // 𐬨 𐬩 

+	key <AB08> { [ U10B3C,         U10B39 ] }; // 𐬼 𐬹 

+	key <AB09> { [ U10B3E,         U10B3D ] }; // 𐬾 𐬽 

+	key <AB10> { [ U10B3F, periodcentered ] }; // 𐬿 · 

+

+	key <AC01> { [ U10B00,         U10B01 ] }; // 𐬀 𐬁 

+	key <AC02> { [ U10B2F,         U10B31 ] }; // 𐬯 𐬱 

+	key <AC03> { [ U10B1B,         U10B1C ] }; // 𐬛 𐬜 

+	key <AC04> { [ U10B1F,         U10B16 ] }; // 𐬟 𐬖 

+	key <AC05> { [ U10B14,         U10B15 ] }; // 𐬔 𐬕 

+	key <AC06> { [ U10B35,          UE100 ] }; // 𐬵  

+	key <AC07> { [ U10B18,         U10B24 ] }; // 𐬘 𐬤 

+	key <AC08> { [ U10B10,          UE101 ] }; // 𐬐  

+	key <AC09> { [ U10B2E,          UE103 ] }; // 𐬮  

+	key <AC10> { [ U10B3B,         U10B3A ] }; // 𐬻 𐬺 

+	key <AC11> { [ U10B1D                 ] }; // 𐬝 

+

+	key <AD01> { [ U10B22,         U10B23 ] }; // 𐬢 𐬣 

+	key <AD02> { [ U10B33,         U10B34 ] }; // 𐬳 𐬴 

+	key <AD03> { [ U10B08,         U10B09 ] }; // 𐬈 𐬉 

+	key <AD04> { [ U10B2D,         U10B26 ] }; // 𐬭 𐬦 

+	key <AD05> { [ U10B19,         U10B1A ] }; // 𐬙 𐬚 

+	key <AD06> { [ U10B2B,         U10B2A ] }; // 𐬫 𐬪 

+	key <AD07> { [ U10B0E,         U10B0F ] }; // 𐬎 𐬏 

+	key <AD08> { [ U10B0C,         U10B0D ] }; // 𐬌 𐬍 

+	key <AD09> { [ U10B0A,         U10B0B ] }; // 𐬊 𐬋

+	key <AD10> { [ U10B1E                 ] }; // 𐬞 

+	key <AD11> { [ U10B06,         U10B07 ] }; // 𐬆 𐬇 

+	key <AD12> { [ U10B02,         U10B03 ] }; // 𐬂 𐬃 

+

+	key <AE01> { [ U10B78                 ] }; // 𐭸 

+	key <AE02> { [ U10B79                 ] }; // 𐭹 

+	key <AE03> { [ U10B7A                 ] }; // 𐭺 

+	key <AE04> { [ U10B7B                 ] }; // 𐭻 

+	key <AE05> { [ U10B7C                 ] }; // 𐭼 

+	key <AE06> { [ U10B7D                 ] }; // 𐭽 

+	key <AE07> { [ U10B7E                 ] }; // 𐭾 

+	key <AE08> { [ U10B7F                 ] }; // 𐭿 

+

+	key <BKSL> { [ U10B04,         U10B05 ] }; // 𐬄 𐬅 

+	key <LSGT> { [ U10B04,         U10B05 ] }; // 𐬄 𐬅 

+};

diff --git a/xorg-server/xkeyboard-config/symbols/makefile b/xorg-server/xkeyboard-config/symbols/makefile
index acbbdf182..522ea869c 100644
--- a/xorg-server/xkeyboard-config/symbols/makefile
+++ b/xorg-server/xkeyboard-config/symbols/makefile
@@ -1,4 +1,4 @@
-SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr nokia_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr extras
+SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr nokia_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr
 
 ifeq ($(MAKESERVER),1)
 $(error Please do not specify MAKESERVER=1)
@@ -8,9 +8,10 @@ THISDIR=symbols
 
 DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\$(THISDIR)
 
-dist_xkbdata_symbols_DATA = \
+dist_symbols_DATA = \
 ad af al \
-am ara at az \
+am apl ara \
+at az \
 ba bd be \
 bg br brai \
 bt bw by \
@@ -42,10 +43,14 @@ za \
 altwin capslock compose ctrl empty eurosign rupeesign group inet \
 keypad kpdl level3 level5 nbsp olpc shift srvr_ctrl typo
 
-DATA_FILES=$(dist_xkbdata_symbols_DATA:%=$(DESTDIR)\%)
+DATA_FILES=$(dist_symbols_DATA:%=$(DESTDIR)\%)
 
 load_makefile $(SUBDIRS:%=%\makefile MAKESERVER=0 DEBUG=$(DEBUG);)
 
 extrastuff: $(SUBDIRS:%=%\all)
 
 include ..\xkbrules.mak
+
+$(DESTDIR)\cd: cd.in
+	copy $< $@
+
diff --git a/xorg-server/xkeyboard-config/symbols/ro b/xorg-server/xkeyboard-config/symbols/ro
index 9e9663cce..44660ad1e 100644
--- a/xorg-server/xkeyboard-config/symbols/ro
+++ b/xorg-server/xkeyboard-config/symbols/ro
@@ -231,3 +231,25 @@ xkb_symbols "crh_dobruca2" {
     key <AC04>	{ [         f,          F,          iacute,          Iacute ]	};

     key <AC07>	{ [    ibreve,     Ibreve,               j,               J ]	};

 };

+

+// EXTRAS:

+

+partial alphanumeric_keys

+xkb_symbols "ergonomic" {

+    // This layout is optimized for fast touch-typing in Romanian on a

+    // US keyboard, and works by swapping out symbols infrequently used

+    // in written Romanian (q,w,y,k) in favor of native ones, thus reducing

+    // the need to use modifier keys.

+    // Created by Gabriel Somlo, <somlo@cmu.edu> (C) 2011

+

+    include "ro(basic)"

+

+    name[Group1]="Romania - Ergonomic Touchtype";

+

+    key <AD01> { [ abreve,            Abreve,  q,                       Q ] };

+    key <AD02> { [ 0x1000219,      0x1000218,  w,                       W ] };

+    key <AD06> { [ 0x100021b,      0x100021a,  y,                       Y ] };

+    key <AC01> { [ a,                      A,  acircumflex,   Acircumflex ] };

+    key <AC08> { [ icircumflex,  Icircumflex,  k,                       K ] };

+};

+

diff --git a/xorg-server/xkeyboard-config/symbols/rs b/xorg-server/xkeyboard-config/symbols/rs
index 3929ff4ec..1797542d0 100644
--- a/xorg-server/xkeyboard-config/symbols/rs
+++ b/xorg-server/xkeyboard-config/symbols/rs
@@ -325,3 +325,21 @@ xkb_symbols "rue" {
   key <AB08> { [ comma, semicolon ] };

   key <AB09> { [ period, colon ] };

 };

+

+// EXTRAS:

+

+xkb_symbols "combiningkeys" {

+  // Raw combining characters instead of dead keys,

+  // especially good for post-accenting texts.

+

+  name[Group1]= "Serbia - Combining accents instead of dead keys";

+

+  include "rs(basic)"

+

+  key <AE03> {   [ any,any,     U0302, dead_circumflex    ]   }; // 3, U0302 = COMBINING CIRCUMFLEX ACCENT

+  key <AE07> {   [ any,any,     U0300, NoSymbol           ]   }; // 7, U0300 = COMBINING GRAVE ACCENT

+  key <AE08> {   [ any,any,     U030F, NoSymbol           ]   }; // 8, U030F = COMBINING DOUBLE GRAVE ACCENT

+  key <AE09> {   [ any,any,     U0301, NoSymbol           ]   }; // 9, U0301 = COMBINING ACUTE ACCENT

+  key <AE10> {   [ any,any,     U0311, NoSymbol           ]   }; // 0, U0311 = COMBINING INVERTED BREVE

+  key <AE11> {   [ any,any,     U0304, NoSymbol           ]   }; // -, U0304 = COMBINING MACRON

+};

diff --git a/xorg-server/xkeyboard-config/symbols/ru b/xorg-server/xkeyboard-config/symbols/ru
index 9cc7683dd..7d94b4768 100644
--- a/xorg-server/xkeyboard-config/symbols/ru
+++ b/xorg-server/xkeyboard-config/symbols/ru
@@ -525,3 +525,64 @@ xkb_symbols "chm" {
 

     include "level3(ralt_switch)"

 };

+

+// EXTRAS:

+

+// Church Slavonic language layout

+// based on

+// russian standard keyboard

+// Aleksandr Andreev and Yuri Shardt 

+// Last Changes 2010/08/01. Contact <aleksandr.andreev@gmail.com>

+

+partial alphanumeric_keys

+xkb_symbols "chu"

+{

+	    name[Group1]= "Russia - Church Slavonic";

+	    key <TLDE> { [ U0457, U0407, U0482, U20DD ] }; // ї Ї ҂ e.g: а⃝ where the last is a combining ten thousands sign

+	    key <AE01> { [ U0461, U0460, U047D, U047C] }; // ѡ Ѡ ѽ Ѽ

+	    key <AE02> { [ U0454, U0404, U0465, U0464] }; // є Є ѥ Ѥ

+	    key <AE03> { [ U046F, U046E, U0469, U0468] }; // ѯ Ѯ ѩ Ѩ

+	    key <AE04> { [ U0471, U0470, U046D, U046C] }; // ѱ Ѱ ѭ Ѭ

+	    key <AE05> { [ U0473, U0472, UA657, UA656] }; // ѳ Ѳ iotified A

+	    key <AE06> { [ U0475, U0474, U0477, U0476] }; // ѵ Ѵ ѷ Ѷ

+	    key <AE07> { [ U047B, U047A, UA64D, UA64C] }; // ѻ Ѻ ꙍ Ꙍ

+	    key <AE08> { [ U047F, U047E, U046B, U046A] }; // ѿ Ѿ ѫ Ѫ

+	    key <AE09> { [ U0455, U0405, parenleft, U002A ] }; // ѕ Ѕ ( *

+	    key <AE10> { [ Cyrillic_u,	Cyrillic_U, parenright, U0488 ] }; // у У ) NB: for diagraph Ouk, use Cyrillic_o + Cyrillic_u

+	    key <AE11> { [ U0483, U0486, U0487, U005F] }; // а҃ а҆ а҇, _ (titlo, psili, pokrytie, underscore)

+	    key <AE12> { [ U0301, U0300, U0484, UA67E] }; //  а̀ а́ а҄ ꙾ (oxia, varia, kamora, kavyka)

+	    key	<AD01> {	[ Cyrillic_shorti, Cyrillic_SHORTI, U0456	]	};

+	    key	<AD02> {	[    Cyrillic_tse,    Cyrillic_TSE, U2DF0	]	};

+	    key	<AD03> {	[   UA64B,  UA64A, U2DF9  	]	}; // Cyrillic monograph Uk (not U)!

+	    key	<AD04> {	[     Cyrillic_ka,     Cyrillic_KA, U2DE6	]	};

+	    key	<AD05> {	[     Cyrillic_ie,     Cyrillic_IE, U2DF7	]	};

+	    key	<AD06> {	[     Cyrillic_en,     Cyrillic_EN, U2DE9	]	};

+	    key	<AD07> {	[    Cyrillic_ghe,    Cyrillic_GHE, U2DE2	]	};

+	    key	<AD08> {	[    Cyrillic_sha,    Cyrillic_SHA, U2DF2	]	};

+	    key	<AD09> {	[  Cyrillic_shcha,  Cyrillic_SHCHA, U2DF3	]	};

+	    key	<AD10> {	[     Cyrillic_ze,     Cyrillic_ZE, U2DE5	]	};

+	    key	<AD11> {	[     Cyrillic_ha,     Cyrillic_HA, U2DEF	]	};

+	    key	<AD12> {	[Cyrillic_hardsign,Cyrillic_HARDSIGN, UA67D	]	}; // Payerok

+	    key <BKSL> { [backslash, slash, colon, question] }; // \ / : ? (note, for Slavonic question use semicolon

+	    key	<AC01> {	[     Cyrillic_ef,     Cyrillic_EF	]	};

+	    key	<AC02> {	[   Cyrillic_yeru,   Cyrillic_YERU	]	};

+	    key	<AC03> {	[     Cyrillic_ve,     Cyrillic_VE, U2DE1	]	};

+	    key	<AC04> {	[      Cyrillic_a,	Cyrillic_A, U2DF6	]	};

+	    key	<AC05> {	[     Cyrillic_pe,     Cyrillic_PE, U2DEB	]	};

+	    key	<AC06> {	[     Cyrillic_er,     Cyrillic_ER, U2DEC	]	};

+	    key	<AC07> {	[      Cyrillic_o,	Cyrillic_O, U2DEA	]	};

+	    key	<AC08> {	[     Cyrillic_el,     Cyrillic_EL, U2DE7	]	};

+	    key	<AC09> {	[     Cyrillic_de,     Cyrillic_DE, U2DE3	]	};

+	    key	<AC10> {	[    Cyrillic_zhe,    Cyrillic_ZHE, U2DE4	]	};

+	    key	<AC11> {	[     U0463,	U0462, U2DFA	]	}; // Yat

+	    key	<AB01> {	[    U0467, U0466, U2DFD 	]	}; // Small Yus

+	    key	<AB02> {	[    Cyrillic_che,    Cyrillic_CHE, U2DF1	]	};

+	    key	<AB03> {	[     Cyrillic_es,     Cyrillic_ES, U2DED	]	};

+	    key	<AB04> {	[     Cyrillic_em,     Cyrillic_EM, U2DE8	]	};

+	    key	<AB05> {	[      Cyrillic_i,	Cyrillic_I	]	};

+	    key	<AB06> {	[     Cyrillic_te,     Cyrillic_TE, U2DEE	]	};

+	    key	<AB07> {	[Cyrillic_softsign,Cyrillic_SOFTSIGN	]	};

+	    key	<AB08> {	[     Cyrillic_be,     Cyrillic_BE, U2DE0	]	};

+	    key	<AB09> {	[     Cyrillic_yu,     Cyrillic_YU, U2DFB	]	};

+	    key <AB10> {        [          period,    comma, semicolon, exclam      ]       };

+};

diff --git a/xorg-server/xkeyboard-config/symbols/us b/xorg-server/xkeyboard-config/symbols/us
index 8ff7ae537..5258b96ce 100644
--- a/xorg-server/xkeyboard-config/symbols/us
+++ b/xorg-server/xkeyboard-config/symbols/us
@@ -1186,3 +1186,152 @@ xkb_symbols "htcdream" {
 

         include "level3(alt_switch)"

 };

+

+// EXTRAS:

+

+// XCompose is out! Unicode combining is in!  For those of us who live

+// on the edge: A keymap using Unicode combining characters instead of

+// deadkeys.  This variation does not deviate from the lame MS-style

+// US-intl layout; but it uses AltGr for combining, like altgr-intl.

+//

+// This might break your font layout layout systems (because they

+// suck), caveat emptor.  Also, most of today's software will count

+// individual combining marks for selection, deletion, character

+// counting &c., and won't be smart enough to do canonical equivalence

+// when searching, &c.

+//

+// With Unicode combining you use "handwriting order", not

+// "typewriting order" as with deadkeys.  That is, you first type the

+// base character, then the diacritics/accents/modifiers.  This has

+// the advantage of avoiding hidden states --- each keypress changes

+// something on screen.

+//

+// TODO: as of now, this duplicates all us(intl) functionality with

+// combining.  With care, perhaps we could add more combining marks

+// not present in intl, and support all major languages.

+partial alphanumeric_keys

+xkb_symbols "intl-unicode" {

+

+ name[Group1]= "USA - International (AltGr Unicode combining)";

+

+ include "us(intl)"

+ include "level3(ralt_switch)"

+

+ // grave, tilde

+ key <TLDE> { [grave, asciitilde, U0300, U0303 ] };

+ // double acute

+ key <AE02> { [ 2, at, twosuperior, U030B ] };

+ // macron

+ key <AE03> { [ 3, numbersign, threesuperior, U0304 ] };

+ // circumflex

+ key <AE06> { [ 6, asciicircum, onequarter, U0302 ] };

+ // horn

+ key <AE07> { [ 7, ampersand, onehalf, U031B ] };

+ // ogonek

+ key <AE08> { [ 8, asterisk, threequarters, U0328 ] };

+ // breve

+ key <AE09> { [	 9, parenleft, leftsinglequotemark, U0306 ] };

+ // abovering

+ key <AE10> { [	 0, parenright, rightsinglequotemark, U030A ] };

+

+ // belowdot

+ key <AE11> { [ minus, underscore, yen, U0323 ] };

+ // acute, diaeresis

+ key <AC11> { [apostrophe, quotedbl, U0301, U0308 ] };

+ // abovedot, caron

+ key <AB09> { [ period, greater, U0307, U030C ] };

+ // hook

+ key <AB10> { [ slash, question, questiondown, 0309 ] };

+

+ // alt-intl compatibility

+ // cedilla, caron

+ key <AB08> { [ comma, less,	 U0327, U030C ] };

+ // ogonek, diaeresis

+ key <AC10> { [ semicolon, colon,	 U0328, U0308 ] };

+ // doubleacute, horn

+ key <AE12> { [ equal, plus,	 U030B, U031B ] };

+

+ // we don't do combining latin letters and combining enclosures

+ // because support for those is very rare.

+};

+

+// XCompose is out! Unicode combining is in! For those of us who live

+// on the edge: A keymap using Unicode combining characters instead of

+// deadkeys. This variation does break compatibility with us-intl,

+// whenever I thought it would be more mnemonic or Unicodeish.

+partial alphanumeric_keys

+xkb_symbols "alt-intl-unicode" {

+

+ name[Group1]= "USA - International (AltGr Unicode combining, alternative)";

+

+ include "extras/us(intl-unicode)"

+ include "level3(ralt_switch)"

+

+ // easier macron; em-dash.

+ // em-dash is available via compose, but I added here since it's such

+ // an important typographic character.

+ key <AE11> { [ minus, underscore, U0304, U2014 ] };

+

+ // belowdot, abovedot (caron at coma/less key, per above)

+ key <AB09> { [ period, greater, U0323, U0307 ] };

+

+};

+

+partial alphanumeric_keys  

+xkb_symbols "ats" {

+

+    include "us"

+

+    name[Group1]= "USA - Atsina";

+

+    //Using Dead key to get COMBINING COMMA ABOVE for ejectives on

+    //q, l, t, s, m, g, k, p, w, y, r

+    //XCompose key is used for the other accute and grave.

+

+    key <AD03> { [ e, E, eacute, Eacute  ] };

+    key <AD07> { [ u, U, uacute, Uacute  ] };

+    key <AD08> { [ i, I, iacute, Iacute  ] };

+    key <AD09> { [ o, O, oacute, Oacute  ] };

+    key <AD11> { [ bracketleft,	braceleft, U03B8 ] };

+    key <AD12> { [ bracketright, braceright, U010D, U010C ] };

+    //U+010C (uppercase Č) and U+010D (lowercase č).

+

+    key <AC01> { [ a, A, aacute, Aacute  ] };

+

+

+    //Small letter Open use compose to key get acute accent

+    key <AB03> { [ c,	C, U0254, U0186		  ] };

+    key <AB08> { [ comma,     less, U0313 ] };

+    key <AB10> { [ slash, question, U0294 ] };

+

+    include "level3(ralt_switch)"

+    include "compose(rctrl)"

+};

+

+partial alphanumeric_keys

+xkb_symbols "crd" {

+

+  include "us"

+

+  name[Group1]= "USA - Couer D'alene Salish";

+

+  // Alphanumeric section

+  key <AD02> { [         w,           W, U02B7, U02B7 ] }; 

+  key <AE07> { [         7,   ampersand, U0294        ] }; 

+  key <AD01> { [         q,           Q, U221A        ] }; 

+  key <AB04> { [         v,           V, U0259        ] }; 

+  key <BKSL> { [ backslash,         bar, U026B        ] }; 

+  key <AD03> { [         e,           E, U025B        ] }; 

+  key <AD08> { [         i,           I, U026A        ] }; 

+  key <AC07> { [         j,           J, U01F0        ] }; 

+  key <AE06> { [         6, asciicircum, U0295        ] }; 

+  key <AC02> { [         s,           S, U0161        ] }; 

+  key <AB03> { [         c,           C, U010D        ] }; 

+  key <AD09> { [         o,           O, U0254        ] }; 

+  key <AB09> { [    period,     greater, U0323        ] }; 

+

+  include "level3(ralt_switch)"

+  include "compose(rctrl)"

+

+  // End alphanumeric section

+};