svn merge ^/branches/released .

13 files changed, 2243 insertions, 2013 deletions

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 */,