xserver git update 9/5/2010

4 files changed, 2352 insertions, 2346 deletions

diff --git a/xorg-server/include/dix.h b/xorg-server/include/dix.h
index dc86257fb..7fe4407e3 100644
--- a/xorg-server/include/dix.h
+++ b/xorg-server/include/dix.h
@@ -1,596 +1,602 @@
-/***********************************************************
-
-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 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);
-
-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 _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 */,
-    int /* checkFirst */);
-
-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);

+

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

+    int /* checkFirst */);

+

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

diff --git a/xorg-server/include/eventstr.h b/xorg-server/include/eventstr.h
index 79685c1a6..19886d47d 100644
--- a/xorg-server/include/eventstr.h
+++ b/xorg-server/include/eventstr.h
@@ -1,246 +1,246 @@
-/*
- * 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 EVENTSTR_H
-#define EVENTSTR_H
-
-#include <events.h>
-/**
- * @file events.h
- * This file describes the event structures used internally by the X
- * server during event generation and event processing.
- *
- * When are internal events used?
- * Events from input devices are stored as internal events in the EQ and
- * processed as internal events until late in the processing cycle. Only then
- * do they switch to their respective wire events.
- */
-
-/**
- * Event types. Used exclusively internal to the server, not visible on the
- * protocol.
- *
- * Note: Keep KeyPress to Motion aligned with the core events.
- *       Keep ET_Raw* in the same order as KeyPress - Motion
- */
-enum EventType {
-    ET_KeyPress = 2,
-    ET_KeyRelease,
-    ET_ButtonPress,
-    ET_ButtonRelease,
-    ET_Motion,
-    ET_Enter,
-    ET_Leave,
-    ET_FocusIn,
-    ET_FocusOut,
-    ET_ProximityIn,
-    ET_ProximityOut,
-    ET_DeviceChanged,
-    ET_Hierarchy,
-    ET_DGAEvent,
-    ET_RawKeyPress,
-    ET_RawKeyRelease,
-    ET_RawButtonPress,
-    ET_RawButtonRelease,
-    ET_RawMotion,
-    ET_XQuartz,
-    ET_Internal = 0xFF /* First byte */
-};
-
-#define CHECKEVENT(ev) if (ev && ((InternalEvent*)(ev))->any.header != 0xFF) \
-                          FatalError("Wrong event type %d.\n", \
-                                     ((InternalEvent*)(ev))->any.header);
-
-/**
- * Used for ALL input device events internal in the server until
- * copied into the matching protocol event.
- *
- * Note: We only use the device id because the DeviceIntPtr may become invalid while
- * the event is in the EQ.
- */
-struct _DeviceEvent
-{
-    unsigned char header; /**< Always ET_Internal */
-    enum EventType type;  /**< One of EventType */
-    int length;           /**< Length in bytes */
-    Time time;            /**< Time in ms */
-    int deviceid;         /**< Device to post this event for */
-    int sourceid;         /**< The physical source device */
-    union {
-        uint32_t button;  /**< Button number */
-        uint32_t key;     /**< Key code */
-    } detail;
-    uint16_t root_x;      /**< Pos relative to root window in integral data */
-    float root_x_frac;    /**< Pos relative to root window in frac part */
-    uint16_t root_y;      /**< Pos relative to root window in integral part */
-    float root_y_frac;    /**< Pos relative to root window in frac part */
-    uint8_t    buttons[(MAX_BUTTONS + 7)/8]; /**< Button mask */
-    struct {
-        uint8_t  mask[(MAX_VALUATORS + 7)/8]; /**< Valuator mask */
-        uint8_t  mode[(MAX_VALUATORS + 7)/8]; /**< Valuator mode (Abs or Rel)*/
-        uint32_t data[MAX_VALUATORS];         /**< Valuator data */
-        int32_t  data_frac[MAX_VALUATORS];    /**< Fractional part for data */
-    } valuators;
-    struct {
-        uint32_t base;    /**< XKB base modifiers */
-        uint32_t latched; /**< XKB latched modifiers */
-        uint32_t locked;  /**< XKB locked modifiers */
-        uint32_t effective;/**< XKB effective modifiers */
-    } mods;
-    struct {
-        uint8_t base;    /**< XKB base group */
-        uint8_t latched; /**< XKB latched group */
-        uint8_t locked;  /**< XKB locked group */
-        uint8_t effective;/**< XKB effective group */
-    } group;
-    Window      root; /**< Root window of the event */
-    int corestate;    /**< Core key/button state BEFORE the event */
-    int key_repeat;   /**< Internally-generated key repeat event */
-};
-
-
-/* Flags used in DeviceChangedEvent to signal if the slave has changed */
-#define DEVCHANGE_SLAVE_SWITCH 0x2
-/* Flags used in DeviceChangedEvent to signal whether the event was a
- * pointer event or a keyboard event */
-#define DEVCHANGE_POINTER_EVENT 0x4
-#define DEVCHANGE_KEYBOARD_EVENT 0x8
-/* device capabilities changed */
-#define DEVCHANGE_DEVICE_CHANGE 0x10
-
-/**
- * Sent whenever a device's capabilities have changed.
- */
-struct _DeviceChangedEvent
-{
-    unsigned char header; /**< Always ET_Internal */
-    enum EventType type;  /**< ET_DeviceChanged */
-    int length;           /**< Length in bytes */
-    Time time;            /**< Time in ms */
-    int deviceid;         /**< Device whose capabilities have changed */
-    int flags;            /**< Mask of ::HAS_NEW_SLAVE,
-                               ::POINTER_EVENT, ::KEYBOARD_EVENT */
-    int masterid;         /**< MD when event was generated */
-    int sourceid;         /**< The device that caused the change */
-
-    struct {
-        int num_buttons;        /**< Number of buttons */
-        Atom names[MAX_BUTTONS];/**< Button names */
-    } buttons;
-
-    int num_valuators;          /**< Number of axes */
-    struct {
-        uint32_t min;           /**< Minimum value */
-        uint32_t max;           /**< Maximum value */
-        /* FIXME: frac parts of min/max */
-        uint32_t resolution;    /**< Resolution counts/m */
-        uint8_t mode;           /**< Relative or Absolute */
-        Atom name;              /**< Axis name */
-    } valuators[MAX_VALUATORS];
-
-    struct {
-        int min_keycode;
-        int max_keycode;
-    } keys;
-};
-
-#if XFreeXDGA
-/**
- * DGAEvent, used by DGA to intercept and emulate input events.
- */
-struct _DGAEvent
-{
-    unsigned char header; /**<  Always ET_Internal */
-    enum EventType type;  /**<  ET_DGAEvent */
-    int length;           /**<  Length in bytes */
-    Time time;            /**<  Time in ms */
-    int subtype;          /**<  KeyPress, KeyRelease, ButtonPress,
-                                ButtonRelease, MotionNotify */
-    int detail;           /**<  Relative x coordinate */
-    int dx;               /**<  Relative x coordinate */
-    int dy;               /**<  Relative y coordinate */
-    int screen;           /**<  Screen number this event applies to */
-    uint16_t state;       /**<  Core modifier/button state */
-};
-#endif
-
-/**
- * Raw event, contains the data as posted by the device.
- */
-struct _RawDeviceEvent
-{
-    unsigned char header; /**<  Always ET_Internal */
-    enum EventType type;  /**<  ET_Raw */
-    int length;           /**<  Length in bytes */
-    Time time;            /**<  Time in ms */
-    int deviceid;         /**< Device to post this event for */
-    int sourceid;         /**< The physical source device */
-    union {
-        uint32_t button;  /**< Button number */
-        uint32_t key;     /**< Key code */
-    } detail;
-    struct {
-        uint8_t  mask[(MAX_VALUATORS + 7)/8]; /**< Valuator mask */
-        int32_t  data[MAX_VALUATORS];         /**< Valuator data */
-        int32_t  data_frac[MAX_VALUATORS];    /**< Fractional part for data */
-        int32_t  data_raw[MAX_VALUATORS];     /**< Valuator data as posted */
-        int32_t  data_raw_frac[MAX_VALUATORS];/**< Fractional part for data_raw */
-    } valuators;
-};
-
-#ifdef XQUARTZ
-#define XQUARTZ_EVENT_MAXARGS 5
-struct _XQuartzEvent {
-    unsigned char header; /**< Always ET_Internal */
-    enum EventType type;  /**< Always ET_XQuartz */
-    int length;           /**< Length in bytes */
-    Time time;            /**< Time in ms. */
-    int subtype;          /**< Subtype defined by XQuartz DDX */
-    uint32_t data[XQUARTZ_EVENT_MAXARGS]; /**< Up to 5 32bit values passed to handler */
-};
-#endif
-
-/**
- * Event type used inside the X server for input event
- * processing.
- */
-union _InternalEvent {
-        struct {
-            unsigned char header; /**< Always ET_Internal */
-            enum EventType type;  /**< One of ET_* */
-            int length;           /**< Length in bytes */
-            Time time;            /**< Time in ms. */
-        } any;
-        DeviceEvent device_event;
-        DeviceChangedEvent changed_event;
-#if XFreeXDGA
-        DGAEvent dga_event;
-#endif
-        RawDeviceEvent raw_event;
-#ifdef XQUARTZ
-        XQuartzEvent xquartz_event;
-#endif
-};
-
-#endif
+/*

+ * 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 EVENTSTR_H

+#define EVENTSTR_H

+

+#include <events.h>

+/**

+ * @file events.h

+ * This file describes the event structures used internally by the X

+ * server during event generation and event processing.

+ *

+ * When are internal events used?

+ * Events from input devices are stored as internal events in the EQ and

+ * processed as internal events until late in the processing cycle. Only then

+ * do they switch to their respective wire events.

+ */

+

+/**

+ * Event types. Used exclusively internal to the server, not visible on the

+ * protocol.

+ *

+ * Note: Keep KeyPress to Motion aligned with the core events.

+ *       Keep ET_Raw* in the same order as KeyPress - Motion

+ */

+enum EventType {

+    ET_KeyPress = 2,

+    ET_KeyRelease,

+    ET_ButtonPress,

+    ET_ButtonRelease,

+    ET_Motion,

+    ET_Enter,

+    ET_Leave,

+    ET_FocusIn,

+    ET_FocusOut,

+    ET_ProximityIn,

+    ET_ProximityOut,

+    ET_DeviceChanged,

+    ET_Hierarchy,

+    ET_DGAEvent,

+    ET_RawKeyPress,

+    ET_RawKeyRelease,

+    ET_RawButtonPress,

+    ET_RawButtonRelease,

+    ET_RawMotion,

+    ET_XQuartz,

+    ET_Internal = 0xFF /* First byte */

+};

+

+#define CHECKEVENT(ev) if (ev && ((InternalEvent*)(ev))->any.header != 0xFF) \

+                          FatalError("Wrong event type %d.\n", \

+                                     ((InternalEvent*)(ev))->any.header);

+

+/**

+ * Used for ALL input device events internal in the server until

+ * copied into the matching protocol event.

+ *

+ * Note: We only use the device id because the DeviceIntPtr may become invalid while

+ * the event is in the EQ.

+ */

+struct _DeviceEvent

+{

+    unsigned char header; /**< Always ET_Internal */

+    enum EventType type;  /**< One of EventType */

+    int length;           /**< Length in bytes */

+    Time time;            /**< Time in ms */

+    int deviceid;         /**< Device to post this event for */

+    int sourceid;         /**< The physical source device */

+    union {

+        uint32_t button;  /**< Button number */

+        uint32_t key;     /**< Key code */

+    } detail;

+    int16_t root_x;       /**< Pos relative to root window in integral data */

+    float root_x_frac;    /**< Pos relative to root window in frac part */

+    int16_t root_y;       /**< Pos relative to root window in integral part */

+    float root_y_frac;    /**< Pos relative to root window in frac part */

+    uint8_t    buttons[(MAX_BUTTONS + 7)/8]; /**< Button mask */

+    struct {

+        uint8_t  mask[(MAX_VALUATORS + 7)/8]; /**< Valuator mask */

+        uint8_t  mode[(MAX_VALUATORS + 7)/8]; /**< Valuator mode (Abs or Rel)*/

+        uint32_t data[MAX_VALUATORS];         /**< Valuator data */

+        int32_t  data_frac[MAX_VALUATORS];    /**< Fractional part for data */

+    } valuators;

+    struct {

+        uint32_t base;    /**< XKB base modifiers */

+        uint32_t latched; /**< XKB latched modifiers */

+        uint32_t locked;  /**< XKB locked modifiers */

+        uint32_t effective;/**< XKB effective modifiers */

+    } mods;

+    struct {

+        uint8_t base;    /**< XKB base group */

+        uint8_t latched; /**< XKB latched group */

+        uint8_t locked;  /**< XKB locked group */

+        uint8_t effective;/**< XKB effective group */

+    } group;

+    Window      root; /**< Root window of the event */

+    int corestate;    /**< Core key/button state BEFORE the event */

+    int key_repeat;   /**< Internally-generated key repeat event */

+};

+

+

+/* Flags used in DeviceChangedEvent to signal if the slave has changed */

+#define DEVCHANGE_SLAVE_SWITCH 0x2

+/* Flags used in DeviceChangedEvent to signal whether the event was a

+ * pointer event or a keyboard event */

+#define DEVCHANGE_POINTER_EVENT 0x4

+#define DEVCHANGE_KEYBOARD_EVENT 0x8

+/* device capabilities changed */

+#define DEVCHANGE_DEVICE_CHANGE 0x10

+

+/**

+ * Sent whenever a device's capabilities have changed.

+ */

+struct _DeviceChangedEvent

+{

+    unsigned char header; /**< Always ET_Internal */

+    enum EventType type;  /**< ET_DeviceChanged */

+    int length;           /**< Length in bytes */

+    Time time;            /**< Time in ms */

+    int deviceid;         /**< Device whose capabilities have changed */

+    int flags;            /**< Mask of ::HAS_NEW_SLAVE,

+                               ::POINTER_EVENT, ::KEYBOARD_EVENT */

+    int masterid;         /**< MD when event was generated */

+    int sourceid;         /**< The device that caused the change */

+

+    struct {

+        int num_buttons;        /**< Number of buttons */

+        Atom names[MAX_BUTTONS];/**< Button names */

+    } buttons;

+

+    int num_valuators;          /**< Number of axes */

+    struct {

+        uint32_t min;           /**< Minimum value */

+        uint32_t max;           /**< Maximum value */

+        /* FIXME: frac parts of min/max */

+        uint32_t resolution;    /**< Resolution counts/m */

+        uint8_t mode;           /**< Relative or Absolute */

+        Atom name;              /**< Axis name */

+    } valuators[MAX_VALUATORS];

+

+    struct {

+        int min_keycode;

+        int max_keycode;

+    } keys;

+};

+

+#if XFreeXDGA

+/**

+ * DGAEvent, used by DGA to intercept and emulate input events.

+ */

+struct _DGAEvent

+{

+    unsigned char header; /**<  Always ET_Internal */

+    enum EventType type;  /**<  ET_DGAEvent */

+    int length;           /**<  Length in bytes */

+    Time time;            /**<  Time in ms */

+    int subtype;          /**<  KeyPress, KeyRelease, ButtonPress,

+                                ButtonRelease, MotionNotify */

+    int detail;           /**<  Relative x coordinate */

+    int dx;               /**<  Relative x coordinate */

+    int dy;               /**<  Relative y coordinate */

+    int screen;           /**<  Screen number this event applies to */

+    uint16_t state;       /**<  Core modifier/button state */

+};

+#endif

+

+/**

+ * Raw event, contains the data as posted by the device.

+ */

+struct _RawDeviceEvent

+{

+    unsigned char header; /**<  Always ET_Internal */

+    enum EventType type;  /**<  ET_Raw */

+    int length;           /**<  Length in bytes */

+    Time time;            /**<  Time in ms */

+    int deviceid;         /**< Device to post this event for */

+    int sourceid;         /**< The physical source device */

+    union {

+        uint32_t button;  /**< Button number */

+        uint32_t key;     /**< Key code */

+    } detail;

+    struct {

+        uint8_t  mask[(MAX_VALUATORS + 7)/8]; /**< Valuator mask */

+        int32_t  data[MAX_VALUATORS];         /**< Valuator data */

+        int32_t  data_frac[MAX_VALUATORS];    /**< Fractional part for data */

+        int32_t  data_raw[MAX_VALUATORS];     /**< Valuator data as posted */

+        int32_t  data_raw_frac[MAX_VALUATORS];/**< Fractional part for data_raw */

+    } valuators;

+};

+

+#ifdef XQUARTZ

+#define XQUARTZ_EVENT_MAXARGS 5

+struct _XQuartzEvent {

+    unsigned char header; /**< Always ET_Internal */

+    enum EventType type;  /**< Always ET_XQuartz */

+    int length;           /**< Length in bytes */

+    Time time;            /**< Time in ms. */

+    int subtype;          /**< Subtype defined by XQuartz DDX */

+    uint32_t data[XQUARTZ_EVENT_MAXARGS]; /**< Up to 5 32bit values passed to handler */

+};

+#endif

+

+/**

+ * Event type used inside the X server for input event

+ * processing.

+ */

+union _InternalEvent {

+        struct {

+            unsigned char header; /**< Always ET_Internal */

+            enum EventType type;  /**< One of ET_* */

+            int length;           /**< Length in bytes */

+            Time time;            /**< Time in ms. */

+        } any;

+        DeviceEvent device_event;

+        DeviceChangedEvent changed_event;

+#if XFreeXDGA

+        DGAEvent dga_event;

+#endif

+        RawDeviceEvent raw_event;

+#ifdef XQUARTZ

+        XQuartzEvent xquartz_event;

+#endif

+};

+

+#endif

diff --git a/xorg-server/include/os.h b/xorg-server/include/os.h
index 453ab82c7..06dacd326 100644
--- a/xorg-server/include/os.h
+++ b/xorg-server/include/os.h
@@ -1,531 +1,531 @@
-/***********************************************************
-
-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 OS_H
-#define OS_H
-
-#include "misc.h"
-#include <stdarg.h>
-
-#define SCREEN_SAVER_ON   0
-#define SCREEN_SAVER_OFF  1
-#define SCREEN_SAVER_FORCER 2
-#define SCREEN_SAVER_CYCLE  3
-
-#ifndef MAX_REQUEST_SIZE
-#define MAX_REQUEST_SIZE 65535
-#endif
-#ifndef MAX_BIG_REQUEST_SIZE
-#define MAX_BIG_REQUEST_SIZE 4194303
-#endif
-
-typedef struct _FontPathRec *FontPathPtr;
-typedef struct _NewClientRec *NewClientPtr;
-
-#ifndef xalloc
-#define xnfalloc(size) XNFalloc((unsigned long)(size))
-#define xnfcalloc(_num, _size) XNFcalloc((unsigned long)(_num)*(unsigned long)(_size))
-#define xnfrealloc(ptr, size) XNFrealloc((pointer)(ptr), (unsigned long)(size))
-
-#define xalloc(size) Xalloc((unsigned long)(size))
-#define xcalloc(_num, _size) Xcalloc((unsigned long)(_num)*(unsigned long)(_size))
-#define xrealloc(ptr, size) Xrealloc((pointer)(ptr), (unsigned long)(size))
-#define xfree(ptr) Xfree((pointer)(ptr))
-#define xstrdup(s) Xstrdup(s)
-#define xnfstrdup(s) XNFstrdup(s)
-#endif
-
-#include <stdio.h>
-#include <stdarg.h>
-
-#ifdef DDXBEFORERESET
-extern void ddxBeforeReset (void);
-#endif
-
-#ifdef DDXOSVERRORF
-extern _X_EXPORT void (*OsVendorVErrorFProc)(const char *, va_list args);
-#endif
-
-extern _X_EXPORT int WaitForSomething(
-    int* /*pClientsReady*/
-);
-
-extern _X_EXPORT int ReadRequestFromClient(ClientPtr /*client*/);
-
-extern _X_EXPORT Bool InsertFakeRequest(
-    ClientPtr /*client*/, 
-    char* /*data*/, 
-    int /*count*/);
-
-extern _X_EXPORT void ResetCurrentRequest(ClientPtr /*client*/);
-
-extern _X_EXPORT void FlushAllOutput(void);
-
-extern _X_EXPORT void FlushIfCriticalOutputPending(void);
-
-extern _X_EXPORT void SetCriticalOutputPending(void);
-
-extern _X_EXPORT int WriteToClient(ClientPtr /*who*/, int /*count*/, const void* /*buf*/);
-
-extern _X_EXPORT void ResetOsBuffers(void);
-
-extern _X_EXPORT void InitConnectionLimits(void);
-
-extern _X_EXPORT void NotifyParentProcess(void);
-
-extern _X_EXPORT void CreateWellKnownSockets(void);
-
-extern _X_EXPORT void ResetWellKnownSockets(void);
-
-extern _X_EXPORT void CloseWellKnownConnections(void);
-
-extern _X_EXPORT XID AuthorizationIDOfClient(ClientPtr /*client*/);
-
-extern _X_EXPORT char *ClientAuthorized(
-    ClientPtr /*client*/,
-    unsigned int /*proto_n*/,
-    char* /*auth_proto*/,
-    unsigned int /*string_n*/,
-    char* /*auth_string*/);
-
-extern _X_EXPORT Bool EstablishNewConnections(
-    ClientPtr /*clientUnused*/,
-    pointer /*closure*/);
-
-extern _X_EXPORT void CheckConnections(void);
-
-extern _X_EXPORT void CloseDownConnection(ClientPtr /*client*/);
-
-extern _X_EXPORT void AddGeneralSocket(int /*fd*/);
-
-extern _X_EXPORT void RemoveGeneralSocket(int /*fd*/);
-
-extern _X_EXPORT void AddEnabledDevice(int /*fd*/);
-
-extern _X_EXPORT void RemoveEnabledDevice(int /*fd*/);
-
-extern _X_EXPORT int OnlyListenToOneClient(ClientPtr /*client*/);
-
-extern _X_EXPORT void ListenToAllClients(void);
-
-extern _X_EXPORT void IgnoreClient(ClientPtr /*client*/);
-
-extern _X_EXPORT void AttendClient(ClientPtr /*client*/);
-
-extern _X_EXPORT void MakeClientGrabImpervious(ClientPtr /*client*/);
-
-extern _X_EXPORT void MakeClientGrabPervious(ClientPtr /*client*/);
-
-#ifdef XQUARTZ
-extern void ListenOnOpenFD(int /* fd */, int /* noxauth */);
-#endif
-
-extern _X_EXPORT CARD32 GetTimeInMillis(void);
-
-extern _X_EXPORT void AdjustWaitForDelay(
-    pointer /*waitTime*/,
-    unsigned long /*newdelay*/);
-
-typedef	struct _OsTimerRec *OsTimerPtr;
-
-typedef CARD32 (*OsTimerCallback)(
-    OsTimerPtr /* timer */,
-    CARD32 /* time */,
-    pointer /* arg */);
-
-extern _X_EXPORT void TimerInit(void);
-
-extern _X_EXPORT Bool TimerForce(OsTimerPtr /* timer */);
-
-#define TimerAbsolute (1<<0)
-#define TimerForceOld (1<<1)
-
-extern _X_EXPORT OsTimerPtr TimerSet(
-    OsTimerPtr /* timer */,
-    int /* flags */,
-    CARD32 /* millis */,
-    OsTimerCallback /* func */,
-    pointer /* arg */);
-
-extern _X_EXPORT void TimerCheck(void);
-extern _X_EXPORT void TimerCancel(OsTimerPtr /* pTimer */);
-extern _X_EXPORT void TimerFree(OsTimerPtr /* pTimer */);
-
-extern _X_EXPORT void SetScreenSaverTimer(void);
-extern _X_EXPORT void FreeScreenSaverTimer(void);
-
-extern _X_EXPORT void AutoResetServer(int /*sig*/);
-
-extern _X_EXPORT void GiveUp(int /*sig*/);
-
-extern _X_EXPORT void UseMsg(void);
-
-extern _X_EXPORT void ProcessCommandLine(int /*argc*/, char* /*argv*/[]);
-
-extern _X_EXPORT int set_font_authorizations(
-    char ** /* authorizations */, 
-    int * /*authlen */, 
-    pointer /* client */);
-
-#ifndef _HAVE_XALLOC_DECLS
-#define _HAVE_XALLOC_DECLS
-extern _X_EXPORT pointer Xalloc(unsigned long /*amount*/);
-extern _X_EXPORT pointer Xcalloc(unsigned long /*amount*/);
-extern _X_EXPORT pointer Xrealloc(pointer /*ptr*/, unsigned long /*amount*/);
-extern _X_EXPORT void Xfree(pointer /*ptr*/);
-#endif
-
-extern _X_EXPORT pointer XNFalloc(unsigned long /*amount*/);
-extern _X_EXPORT pointer XNFcalloc(unsigned long /*amount*/);
-extern _X_EXPORT pointer XNFrealloc(pointer /*ptr*/, unsigned long /*amount*/);
-
-extern _X_EXPORT char *Xstrdup(const char *s);
-extern _X_EXPORT char *XNFstrdup(const char *s);
-extern _X_EXPORT char *Xprintf(const char *fmt, ...);
-extern _X_EXPORT char *Xvprintf(const char *fmt, va_list va);
-extern _X_EXPORT char *XNFprintf(const char *fmt, ...);
-extern _X_EXPORT char *XNFvprintf(const char *fmt, va_list va);
-
-typedef void (*OsSigHandlerPtr)(int /* sig */);
-typedef int (*OsSigWrapperPtr)(int /* sig */);
-
-extern _X_EXPORT OsSigHandlerPtr OsSignal(int /* sig */, OsSigHandlerPtr /* handler */);
-extern _X_EXPORT OsSigWrapperPtr OsRegisterSigWrapper(OsSigWrapperPtr newWrap);
-
-extern _X_EXPORT int auditTrailLevel;
-
-extern _X_EXPORT void LockServer(void);
-extern _X_EXPORT void UnlockServer(void);
-
-extern _X_EXPORT int OsLookupColor(
-    int	/*screen*/,
-    char * /*name*/,
-    unsigned /*len*/,
-    unsigned short * /*pred*/,
-    unsigned short * /*pgreen*/,
-    unsigned short * /*pblue*/);
-
-extern _X_EXPORT void OsInit(void);
-
-extern _X_EXPORT void OsCleanup(Bool);
-
-extern _X_EXPORT void OsVendorFatalError(void);
-
-extern _X_EXPORT void OsVendorInit(void);
-
-extern _X_EXPORT void OsBlockSignals (void);
-
-extern _X_EXPORT void OsReleaseSignals (void);
-
-extern _X_EXPORT void OsAbort (void);
-
-#if !defined(WIN32)
-extern _X_EXPORT int System(char *);
-extern _X_EXPORT pointer Popen(char *, char *);
-extern _X_EXPORT int Pclose(pointer);
-extern _X_EXPORT pointer Fopen(char *, char *);
-extern _X_EXPORT int Fclose(pointer);
-#else
-#define System(a) system(a)
-#define Popen(a,b) popen(a,b)
-#define Pclose(a) pclose(a)
-#define Fopen(a,b) fopen(a,b)
-#define Fclose(a) fclose(a)
-#endif
-
-extern _X_EXPORT void CheckUserParameters(int argc, char **argv, char **envp);
-extern _X_EXPORT void CheckUserAuthorization(void);
-
-extern _X_EXPORT int AddHost(
-    ClientPtr	/*client*/,
-    int         /*family*/,
-    unsigned    /*length*/,
-    pointer     /*pAddr*/);
-
-extern _X_EXPORT Bool ForEachHostInFamily (
-    int	    /*family*/,
-    Bool    (* /*func*/ )(
-            unsigned char * /* addr */,
-            short           /* len */,
-            pointer         /* closure */),
-    pointer /*closure*/);
-
-extern _X_EXPORT int RemoveHost(
-    ClientPtr	/*client*/,
-    int         /*family*/,
-    unsigned    /*length*/,
-    pointer     /*pAddr*/);
-
-extern _X_EXPORT int GetHosts(
-    pointer * /*data*/,
-    int	    * /*pnHosts*/,
-    int	    * /*pLen*/,
-    BOOL    * /*pEnabled*/);
-
-typedef struct sockaddr * sockaddrPtr;
-
-extern _X_EXPORT int InvalidHost(sockaddrPtr /*saddr*/, int /*len*/, ClientPtr client);
-
-extern _X_EXPORT int LocalClient(ClientPtr /* client */);
-
-extern _X_EXPORT int LocalClientCred(ClientPtr, int *, int *);
-
-#define LCC_UID_SET	(1 << 0)
-#define LCC_GID_SET	(1 << 1)
-#define LCC_PID_SET	(1 << 2)
-#define LCC_ZID_SET	(1 << 3)
-
-typedef struct {
-    int fieldsSet;	/* Bit mask of fields set */
-    int	euid;		/* Effective uid */
-    int egid;		/* Primary effective group id */
-    int nSuppGids;	/* Number of supplementary group ids */
-    int *pSuppGids;	/* Array of supplementary group ids */
-    int pid;		/* Process id */
-    int zoneid;		/* Only set on Solaris 10 & later */
-} LocalClientCredRec;
-
-extern _X_EXPORT int GetLocalClientCreds(ClientPtr, LocalClientCredRec **);
-extern _X_EXPORT void FreeLocalClientCreds(LocalClientCredRec *);
-
-extern _X_EXPORT int ChangeAccessControl(ClientPtr /*client*/, int /*fEnabled*/);
-
-extern _X_EXPORT int GetAccessControl(void);
-
-
-extern _X_EXPORT void AddLocalHosts(void);
-
-extern _X_EXPORT void ResetHosts(char *display);
-
-extern _X_EXPORT void EnableLocalHost(void);
-
-extern _X_EXPORT void DisableLocalHost(void);
-
-extern _X_EXPORT void AccessUsingXdmcp(void);
-
-extern _X_EXPORT void DefineSelf(int /*fd*/);
-
-#if XDMCP
-extern _X_EXPORT void AugmentSelf(pointer /*from*/, int /*len*/);
-
-extern _X_EXPORT void RegisterAuthorizations(void);
-#endif
-
-extern _X_EXPORT void InitAuthorization(char * /*filename*/);
-
-/* extern int LoadAuthorization(void); */
-
-extern _X_EXPORT int AuthorizationFromID (
-	XID 		id,
-	unsigned short	*name_lenp,
-	char		**namep,
-	unsigned short	*data_lenp,
-	char		**datap);
-
-extern _X_EXPORT XID CheckAuthorization(
-    unsigned int /*namelength*/,
-    char * /*name*/,
-    unsigned int /*datalength*/,
-    char * /*data*/,
-    ClientPtr /*client*/,
-    char ** /*reason*/
-);
-
-extern _X_EXPORT void ResetAuthorization(void);
-
-extern _X_EXPORT int RemoveAuthorization (
-    unsigned short	name_length,
-    char		*name,
-    unsigned short	data_length,
-    char		*data);
-
-extern _X_EXPORT int AddAuthorization(
-    unsigned int	/*name_length*/,
-    char *		/*name*/,
-    unsigned int	/*data_length*/,
-    char *		/*data*/);
-
-#ifdef XCSECURITY
-extern _X_EXPORT XID GenerateAuthorization(
-    unsigned int   /* name_length */,
-    char	*  /* name */,
-    unsigned int   /* data_length */,
-    char	*  /* data */,
-    unsigned int * /* data_length_return */,
-    char	** /* data_return */);
-#endif
-
-extern _X_EXPORT int ddxProcessArgument(int /*argc*/, char * /*argv*/ [], int /*i*/);
-
-extern _X_EXPORT void ddxUseMsg(void);
-
-/* int ReqLen(xReq *req, ClientPtr client)
- * Given a pointer to a *complete* request, return its length in bytes.
- * Note that if the request is a big request (as defined in the Big
- * Requests extension), the macro lies by returning 4 less than the
- * length that it actually occupies in the request buffer.  This is so you
- * can blindly compare the length with the various sz_<request> constants
- * in Xproto.h without having to know/care about big requests.
- */
-#define ReqLen(_pxReq, _client) \
- ((_pxReq->length ? \
-     (_client->swapped ? lswaps(_pxReq->length) : _pxReq->length) \
-  : ((_client->swapped ? \
-	lswapl(((CARD32*)_pxReq)[1]) : ((CARD32*)_pxReq)[1])-1) \
-  ) << 2)
-
-/* otherReqTypePtr CastxReq(xReq *req, otherReqTypePtr)
- * Cast the given request to one of type otherReqTypePtr to access
- * fields beyond the length field.
- */
-#define CastxReq(_pxReq, otherReqTypePtr) \
-    (_pxReq->length ? (otherReqTypePtr)_pxReq \
-		    : (otherReqTypePtr)(((CARD32*)_pxReq)+1))
-
-/* stuff for ReplyCallback */
-extern _X_EXPORT CallbackListPtr ReplyCallback;
-typedef struct {
-    ClientPtr client;
-    const void *replyData;
-    unsigned long dataLenBytes;
-    unsigned long bytesRemaining;
-    Bool startOfReply;
-} ReplyInfoRec;
-
-/* stuff for FlushCallback */
-extern _X_EXPORT CallbackListPtr FlushCallback;
-
-extern _X_EXPORT void AbortDDX(void);
-extern _X_EXPORT void ddxGiveUp(void);
-extern _X_EXPORT int TimeSinceLastInputEvent(void);
-
-/* strcasecmp.c */
-#if NEED_STRCASECMP
-#define strcasecmp xstrcasecmp
-extern _X_EXPORT int xstrcasecmp(const char *s1, const char *s2);
-#endif
-
-#if NEED_STRNCASECMP
-#define strncasecmp xstrncasecmp
-extern _X_EXPORT int xstrncasecmp(const char *s1, const char *s2, size_t n);
-#endif
-
-#if NEED_STRCASESTR
-#define strcasestr xstrcasestr
-extern _X_EXPORT char *xstrcasestr(const char *s, const char *find);
-#endif
-
-#ifndef HAS_STRLCPY
-extern _X_EXPORT size_t strlcpy(char *dst, const char *src, size_t siz);
-extern _X_EXPORT size_t strlcat(char *dst, const char *src, size_t siz);
-#endif
-
-/* Logging. */
-typedef enum _LogParameter {
-    XLOG_FLUSH,
-    XLOG_SYNC,
-    XLOG_VERBOSITY,
-    XLOG_FILE_VERBOSITY
-} LogParameter;
-
-/* Flags for log messages. */
-typedef enum {
-    X_PROBED,			/* Value was probed */
-    X_CONFIG,			/* Value was given in the config file */
-    X_DEFAULT,			/* Value is a default */
-    X_CMDLINE,			/* Value was given on the command line */
-    X_NOTICE,			/* Notice */
-    X_ERROR,			/* Error message */
-    X_WARNING,			/* Warning message */
-    X_INFO,			/* Informational message */
-    X_NONE,			/* No prefix */
-    X_NOT_IMPLEMENTED,		/* Not implemented */
-    X_UNKNOWN = -1		/* unknown -- this must always be last */
-} MessageType;
-
-/* XXX Need to check which GCC versions have the format(printf) attribute. */
-#if defined(__GNUC__) && (__GNUC__ > 2)
-#define _printf_attribute(a,b) __attribute((format(__printf__,a,b)))
-#else
-#define _printf_attribute(a,b) /**/
-#endif
-
-extern _X_EXPORT const char *LogInit(const char *fname, const char *backup);
-extern _X_EXPORT void LogClose(void);
-extern _X_EXPORT Bool LogSetParameter(LogParameter param, int value);
-extern _X_EXPORT void LogVWrite(int verb, const char *f, va_list args);
-extern _X_EXPORT void LogWrite(int verb, const char *f, ...) _printf_attribute(2,3);
-extern _X_EXPORT void LogVMessageVerb(MessageType type, int verb, const char *format,
-			    va_list args);
-extern _X_EXPORT void LogMessageVerb(MessageType type, int verb, const char *format,
-			   ...) _printf_attribute(3,4);
-extern _X_EXPORT void LogMessage(MessageType type, const char *format, ...)
-			_printf_attribute(2,3);
-extern _X_EXPORT void FreeAuditTimer(void);
-extern _X_EXPORT void AuditF(const char *f, ...) _printf_attribute(1,2);
-extern _X_EXPORT void VAuditF(const char *f, va_list args);
-extern _X_EXPORT void FatalError(const char *f, ...) _printf_attribute(1,2)
-#if defined(__GNUC__) && (__GNUC__ > 2)
-__attribute((noreturn))
-#endif
-;
-
-#ifdef DEBUG
-#define DebugF ErrorF
-#else
-#define DebugF(...) /* */
-#endif
-
-extern _X_EXPORT void VErrorF(const char *f, va_list args);
-extern _X_EXPORT void ErrorF(const char *f, ...) _printf_attribute(1,2);
-extern _X_EXPORT void Error(char *str);
-extern _X_EXPORT void LogPrintMarkers(void);
-
-extern _X_EXPORT void xorg_backtrace(void);
-
-#endif /* OS_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 OS_H

+#define OS_H

+

+#include "misc.h"

+#include <stdarg.h>

+

+#define SCREEN_SAVER_ON   0

+#define SCREEN_SAVER_OFF  1

+#define SCREEN_SAVER_FORCER 2

+#define SCREEN_SAVER_CYCLE  3

+

+#ifndef MAX_REQUEST_SIZE

+#define MAX_REQUEST_SIZE 65535

+#endif

+#ifndef MAX_BIG_REQUEST_SIZE

+#define MAX_BIG_REQUEST_SIZE 4194303

+#endif

+

+typedef struct _FontPathRec *FontPathPtr;

+typedef struct _NewClientRec *NewClientPtr;

+

+#ifndef xalloc

+#define xnfalloc(size) XNFalloc((unsigned long)(size))

+#define xnfcalloc(_num, _size) XNFcalloc((unsigned long)(_num)*(unsigned long)(_size))

+#define xnfrealloc(ptr, size) XNFrealloc((pointer)(ptr), (unsigned long)(size))

+

+#define xalloc(size) Xalloc((unsigned long)(size))

+#define xcalloc(_num, _size) Xcalloc((unsigned long)(_num)*(unsigned long)(_size))

+#define xrealloc(ptr, size) Xrealloc((pointer)(ptr), (unsigned long)(size))

+#define xfree(ptr) Xfree((pointer)(ptr))

+#define xstrdup(s) Xstrdup(s)

+#define xnfstrdup(s) XNFstrdup(s)

+#endif

+

+#include <stdio.h>

+#include <stdarg.h>

+

+#ifdef DDXBEFORERESET

+extern void ddxBeforeReset (void);

+#endif

+

+#ifdef DDXOSVERRORF

+extern _X_EXPORT void (*OsVendorVErrorFProc)(const char *, va_list args);

+#endif

+

+extern _X_EXPORT int WaitForSomething(

+    int* /*pClientsReady*/

+);

+

+extern _X_EXPORT int ReadRequestFromClient(ClientPtr /*client*/);

+

+extern _X_EXPORT Bool InsertFakeRequest(

+    ClientPtr /*client*/, 

+    char* /*data*/, 

+    int /*count*/);

+

+extern _X_EXPORT void ResetCurrentRequest(ClientPtr /*client*/);

+

+extern _X_EXPORT void FlushAllOutput(void);

+

+extern _X_EXPORT void FlushIfCriticalOutputPending(void);

+

+extern _X_EXPORT void SetCriticalOutputPending(void);

+

+extern _X_EXPORT int WriteToClient(ClientPtr /*who*/, int /*count*/, const void* /*buf*/);

+

+extern _X_EXPORT void ResetOsBuffers(void);

+

+extern _X_EXPORT void InitConnectionLimits(void);

+

+extern _X_EXPORT void NotifyParentProcess(void);

+

+extern _X_EXPORT void CreateWellKnownSockets(void);

+

+extern _X_EXPORT void ResetWellKnownSockets(void);

+

+extern _X_EXPORT void CloseWellKnownConnections(void);

+

+extern _X_EXPORT XID AuthorizationIDOfClient(ClientPtr /*client*/);

+

+extern _X_EXPORT char *ClientAuthorized(

+    ClientPtr /*client*/,

+    unsigned int /*proto_n*/,

+    char* /*auth_proto*/,

+    unsigned int /*string_n*/,

+    char* /*auth_string*/);

+

+extern _X_EXPORT Bool EstablishNewConnections(

+    ClientPtr /*clientUnused*/,

+    pointer /*closure*/);

+

+extern _X_EXPORT void CheckConnections(void);

+

+extern _X_EXPORT void CloseDownConnection(ClientPtr /*client*/);

+

+extern _X_EXPORT void AddGeneralSocket(int /*fd*/);

+

+extern _X_EXPORT void RemoveGeneralSocket(int /*fd*/);

+

+extern _X_EXPORT void AddEnabledDevice(int /*fd*/);

+

+extern _X_EXPORT void RemoveEnabledDevice(int /*fd*/);

+

+extern _X_EXPORT int OnlyListenToOneClient(ClientPtr /*client*/);

+

+extern _X_EXPORT void ListenToAllClients(void);

+

+extern _X_EXPORT void IgnoreClient(ClientPtr /*client*/);

+

+extern _X_EXPORT void AttendClient(ClientPtr /*client*/);

+

+extern _X_EXPORT void MakeClientGrabImpervious(ClientPtr /*client*/);

+

+extern _X_EXPORT void MakeClientGrabPervious(ClientPtr /*client*/);

+

+#ifdef XQUARTZ

+extern void ListenOnOpenFD(int /* fd */, int /* noxauth */);

+#endif

+

+extern _X_EXPORT CARD32 GetTimeInMillis(void);

+

+extern _X_EXPORT void AdjustWaitForDelay(

+    pointer /*waitTime*/,

+    unsigned long /*newdelay*/);

+

+typedef	struct _OsTimerRec *OsTimerPtr;

+

+typedef CARD32 (*OsTimerCallback)(

+    OsTimerPtr /* timer */,

+    CARD32 /* time */,

+    pointer /* arg */);

+

+extern _X_EXPORT void TimerInit(void);

+

+extern _X_EXPORT Bool TimerForce(OsTimerPtr /* timer */);

+

+#define TimerAbsolute (1<<0)

+#define TimerForceOld (1<<1)

+

+extern _X_EXPORT OsTimerPtr TimerSet(

+    OsTimerPtr /* timer */,

+    int /* flags */,

+    CARD32 /* millis */,

+    OsTimerCallback /* func */,

+    pointer /* arg */);

+

+extern _X_EXPORT void TimerCheck(void);

+extern _X_EXPORT void TimerCancel(OsTimerPtr /* pTimer */);

+extern _X_EXPORT void TimerFree(OsTimerPtr /* pTimer */);

+

+extern _X_EXPORT void SetScreenSaverTimer(void);

+extern _X_EXPORT void FreeScreenSaverTimer(void);

+

+extern _X_EXPORT void AutoResetServer(int /*sig*/);

+

+extern _X_EXPORT void GiveUp(int /*sig*/);

+

+extern _X_EXPORT void UseMsg(void);

+

+extern _X_EXPORT void ProcessCommandLine(int /*argc*/, char* /*argv*/[]);

+

+extern _X_EXPORT int set_font_authorizations(

+    char ** /* authorizations */, 

+    int * /*authlen */, 

+    pointer /* client */);

+

+#ifndef _HAVE_XALLOC_DECLS

+#define _HAVE_XALLOC_DECLS

+extern _X_EXPORT pointer Xalloc(unsigned long /*amount*/);

+extern _X_EXPORT pointer Xcalloc(unsigned long /*amount*/);

+extern _X_EXPORT pointer Xrealloc(pointer /*ptr*/, unsigned long /*amount*/);

+extern _X_EXPORT void Xfree(pointer /*ptr*/);

+#endif

+

+extern _X_EXPORT pointer XNFalloc(unsigned long /*amount*/);

+extern _X_EXPORT pointer XNFcalloc(unsigned long /*amount*/);

+extern _X_EXPORT pointer XNFrealloc(pointer /*ptr*/, unsigned long /*amount*/);

+

+extern _X_EXPORT char *Xstrdup(const char *s);

+extern _X_EXPORT char *XNFstrdup(const char *s);

+extern _X_EXPORT char *Xprintf(const char *fmt, ...);

+extern _X_EXPORT char *Xvprintf(const char *fmt, va_list va);

+extern _X_EXPORT char *XNFprintf(const char *fmt, ...);

+extern _X_EXPORT char *XNFvprintf(const char *fmt, va_list va);

+

+typedef void (*OsSigHandlerPtr)(int /* sig */);

+typedef int (*OsSigWrapperPtr)(int /* sig */);

+

+extern _X_EXPORT OsSigHandlerPtr OsSignal(int /* sig */, OsSigHandlerPtr /* handler */);

+extern _X_EXPORT OsSigWrapperPtr OsRegisterSigWrapper(OsSigWrapperPtr newWrap);

+

+extern _X_EXPORT int auditTrailLevel;

+

+extern _X_EXPORT void LockServer(void);

+extern _X_EXPORT void UnlockServer(void);

+

+extern _X_EXPORT int OsLookupColor(

+    int	/*screen*/,

+    char * /*name*/,

+    unsigned /*len*/,

+    unsigned short * /*pred*/,

+    unsigned short * /*pgreen*/,

+    unsigned short * /*pblue*/);

+

+extern _X_EXPORT void OsInit(void);

+

+extern _X_EXPORT void OsCleanup(Bool);

+

+extern _X_EXPORT void OsVendorFatalError(void);

+

+extern _X_EXPORT void OsVendorInit(void);

+

+extern _X_EXPORT void OsBlockSignals (void);

+

+extern _X_EXPORT void OsReleaseSignals (void);

+

+extern _X_EXPORT void OsAbort (void);

+

+#if !defined(WIN32)

+extern _X_EXPORT int System(char *);

+extern _X_EXPORT pointer Popen(char *, char *);

+extern _X_EXPORT int Pclose(pointer);

+extern _X_EXPORT pointer Fopen(char *, char *);

+extern _X_EXPORT int Fclose(pointer);

+#else

+#define System(a) system(a)

+#define Popen(a,b) popen(a,b)

+#define Pclose(a) pclose(a)

+#define Fopen(a,b) fopen(a,b)

+#define Fclose(a) fclose(a)

+#endif

+

+extern _X_EXPORT void CheckUserParameters(int argc, char **argv, char **envp);

+extern _X_EXPORT void CheckUserAuthorization(void);

+

+extern _X_EXPORT int AddHost(

+    ClientPtr	/*client*/,

+    int         /*family*/,

+    unsigned    /*length*/,

+    const void */*pAddr*/);

+

+extern _X_EXPORT Bool ForEachHostInFamily (

+    int	    /*family*/,

+    Bool    (* /*func*/ )(

+            unsigned char * /* addr */,

+            short           /* len */,

+            pointer         /* closure */),

+    pointer /*closure*/);

+

+extern _X_EXPORT int RemoveHost(

+    ClientPtr	/*client*/,

+    int         /*family*/,

+    unsigned    /*length*/,

+    pointer     /*pAddr*/);

+

+extern _X_EXPORT int GetHosts(

+    pointer * /*data*/,

+    int	    * /*pnHosts*/,

+    int	    * /*pLen*/,

+    BOOL    * /*pEnabled*/);

+

+typedef struct sockaddr * sockaddrPtr;

+

+extern _X_EXPORT int InvalidHost(sockaddrPtr /*saddr*/, int /*len*/, ClientPtr client);

+

+extern _X_EXPORT int LocalClient(ClientPtr /* client */);

+

+extern _X_EXPORT int LocalClientCred(ClientPtr, int *, int *);

+

+#define LCC_UID_SET	(1 << 0)

+#define LCC_GID_SET	(1 << 1)

+#define LCC_PID_SET	(1 << 2)

+#define LCC_ZID_SET	(1 << 3)

+

+typedef struct {

+    int fieldsSet;	/* Bit mask of fields set */

+    int	euid;		/* Effective uid */

+    int egid;		/* Primary effective group id */

+    int nSuppGids;	/* Number of supplementary group ids */

+    int *pSuppGids;	/* Array of supplementary group ids */

+    int pid;		/* Process id */

+    int zoneid;		/* Only set on Solaris 10 & later */

+} LocalClientCredRec;

+

+extern _X_EXPORT int GetLocalClientCreds(ClientPtr, LocalClientCredRec **);

+extern _X_EXPORT void FreeLocalClientCreds(LocalClientCredRec *);

+

+extern _X_EXPORT int ChangeAccessControl(ClientPtr /*client*/, int /*fEnabled*/);

+

+extern _X_EXPORT int GetAccessControl(void);

+

+

+extern _X_EXPORT void AddLocalHosts(void);

+

+extern _X_EXPORT void ResetHosts(char *display);

+

+extern _X_EXPORT void EnableLocalHost(void);

+

+extern _X_EXPORT void DisableLocalHost(void);

+

+extern _X_EXPORT void AccessUsingXdmcp(void);

+

+extern _X_EXPORT void DefineSelf(int /*fd*/);

+

+#if XDMCP

+extern _X_EXPORT void AugmentSelf(pointer /*from*/, int /*len*/);

+

+extern _X_EXPORT void RegisterAuthorizations(void);

+#endif

+

+extern _X_EXPORT void InitAuthorization(char * /*filename*/);

+

+/* extern int LoadAuthorization(void); */

+

+extern _X_EXPORT int AuthorizationFromID (

+	XID 		id,

+	unsigned short	*name_lenp,

+	char		**namep,

+	unsigned short	*data_lenp,

+	char		**datap);

+

+extern _X_EXPORT XID CheckAuthorization(

+    unsigned int /*namelength*/,

+    const char * /*name*/,

+    unsigned int /*datalength*/,

+    const char * /*data*/,

+    ClientPtr /*client*/,

+    char ** /*reason*/

+);

+

+extern _X_EXPORT void ResetAuthorization(void);

+

+extern _X_EXPORT int RemoveAuthorization (

+    unsigned short	name_length,

+    const char		*name,

+    unsigned short	data_length,

+    const char		*data);

+

+extern _X_EXPORT int AddAuthorization(

+    unsigned int	/*name_length*/,

+    const char *	/*name*/,

+    unsigned int	/*data_length*/,

+    char *		/*data*/);

+

+#ifdef XCSECURITY

+extern _X_EXPORT XID GenerateAuthorization(

+    unsigned int   /* name_length */,

+    const char	*  /* name */,

+    unsigned int   /* data_length */,

+    const char	*  /* data */,

+    unsigned int * /* data_length_return */,

+    char	** /* data_return */);

+#endif

+

+extern _X_EXPORT int ddxProcessArgument(int /*argc*/, char * /*argv*/ [], int /*i*/);

+

+extern _X_EXPORT void ddxUseMsg(void);

+

+/* int ReqLen(xReq *req, ClientPtr client)

+ * Given a pointer to a *complete* request, return its length in bytes.

+ * Note that if the request is a big request (as defined in the Big

+ * Requests extension), the macro lies by returning 4 less than the

+ * length that it actually occupies in the request buffer.  This is so you

+ * can blindly compare the length with the various sz_<request> constants

+ * in Xproto.h without having to know/care about big requests.

+ */

+#define ReqLen(_pxReq, _client) \

+ ((_pxReq->length ? \

+     (_client->swapped ? lswaps(_pxReq->length) : _pxReq->length) \

+  : ((_client->swapped ? \

+	lswapl(((CARD32*)_pxReq)[1]) : ((CARD32*)_pxReq)[1])-1) \

+  ) << 2)

+

+/* otherReqTypePtr CastxReq(xReq *req, otherReqTypePtr)

+ * Cast the given request to one of type otherReqTypePtr to access

+ * fields beyond the length field.

+ */

+#define CastxReq(_pxReq, otherReqTypePtr) \

+    (_pxReq->length ? (otherReqTypePtr)_pxReq \

+		    : (otherReqTypePtr)(((CARD32*)_pxReq)+1))

+

+/* stuff for ReplyCallback */

+extern _X_EXPORT CallbackListPtr ReplyCallback;

+typedef struct {

+    ClientPtr client;

+    const void *replyData;

+    unsigned long dataLenBytes;

+    unsigned long bytesRemaining;

+    Bool startOfReply;

+} ReplyInfoRec;

+

+/* stuff for FlushCallback */

+extern _X_EXPORT CallbackListPtr FlushCallback;

+

+extern _X_EXPORT void AbortDDX(void);

+extern _X_EXPORT void ddxGiveUp(void);

+extern _X_EXPORT int TimeSinceLastInputEvent(void);

+

+/* strcasecmp.c */

+#if NEED_STRCASECMP

+#define strcasecmp xstrcasecmp

+extern _X_EXPORT int xstrcasecmp(const char *s1, const char *s2);

+#endif

+

+#if NEED_STRNCASECMP

+#define strncasecmp xstrncasecmp

+extern _X_EXPORT int xstrncasecmp(const char *s1, const char *s2, size_t n);

+#endif

+

+#if NEED_STRCASESTR

+#define strcasestr xstrcasestr

+extern _X_EXPORT char *xstrcasestr(const char *s, const char *find);

+#endif

+

+#ifndef HAS_STRLCPY

+extern _X_EXPORT size_t strlcpy(char *dst, const char *src, size_t siz);

+extern _X_EXPORT size_t strlcat(char *dst, const char *src, size_t siz);

+#endif

+

+/* Logging. */

+typedef enum _LogParameter {

+    XLOG_FLUSH,

+    XLOG_SYNC,

+    XLOG_VERBOSITY,

+    XLOG_FILE_VERBOSITY

+} LogParameter;

+

+/* Flags for log messages. */

+typedef enum {

+    X_PROBED,			/* Value was probed */

+    X_CONFIG,			/* Value was given in the config file */

+    X_DEFAULT,			/* Value is a default */

+    X_CMDLINE,			/* Value was given on the command line */

+    X_NOTICE,			/* Notice */

+    X_ERROR,			/* Error message */

+    X_WARNING,			/* Warning message */

+    X_INFO,			/* Informational message */

+    X_NONE,			/* No prefix */

+    X_NOT_IMPLEMENTED,		/* Not implemented */

+    X_UNKNOWN = -1		/* unknown -- this must always be last */

+} MessageType;

+

+/* XXX Need to check which GCC versions have the format(printf) attribute. */

+#if defined(__GNUC__) && (__GNUC__ > 2)

+#define _printf_attribute(a,b) __attribute((format(__printf__,a,b)))

+#else

+#define _printf_attribute(a,b) /**/

+#endif

+

+extern _X_EXPORT const char *LogInit(const char *fname, const char *backup);

+extern _X_EXPORT void LogClose(void);

+extern _X_EXPORT Bool LogSetParameter(LogParameter param, int value);

+extern _X_EXPORT void LogVWrite(int verb, const char *f, va_list args);

+extern _X_EXPORT void LogWrite(int verb, const char *f, ...) _printf_attribute(2,3);

+extern _X_EXPORT void LogVMessageVerb(MessageType type, int verb, const char *format,

+			    va_list args);

+extern _X_EXPORT void LogMessageVerb(MessageType type, int verb, const char *format,

+			   ...) _printf_attribute(3,4);

+extern _X_EXPORT void LogMessage(MessageType type, const char *format, ...)

+			_printf_attribute(2,3);

+extern _X_EXPORT void FreeAuditTimer(void);

+extern _X_EXPORT void AuditF(const char *f, ...) _printf_attribute(1,2);

+extern _X_EXPORT void VAuditF(const char *f, va_list args);

+extern _X_EXPORT void FatalError(const char *f, ...) _printf_attribute(1,2)

+#if defined(__GNUC__) && (__GNUC__ > 2)

+__attribute((noreturn))

+#endif

+;

+

+#ifdef DEBUG

+#define DebugF ErrorF

+#else

+#define DebugF(...) /* */

+#endif

+

+extern _X_EXPORT void VErrorF(const char *f, va_list args);

+extern _X_EXPORT void ErrorF(const char *f, ...) _printf_attribute(1,2);

+extern _X_EXPORT void Error(char *str);

+extern _X_EXPORT void LogPrintMarkers(void);

+

+extern _X_EXPORT void xorg_backtrace(void);

+

+#endif /* OS_H */

diff --git a/xorg-server/include/xkbsrv.h b/xorg-server/include/xkbsrv.h
index a5d25d009..18494d7ae 100644
--- a/xorg-server/include/xkbsrv.h
+++ b/xorg-server/include/xkbsrv.h
@@ -1,973 +1,973 @@
-/************************************************************
-Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
-
-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 Silicon Graphics not be 
-used in advertising or publicity pertaining to distribution 
-of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability 
-of this software for any purpose. It is provided "as is"
-without any express or implied warranty.
-
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
-AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS 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 _XKBSRV_H_
-#define	_XKBSRV_H_
-
-#define XkbAllocClientMap		SrvXkbAllocClientMap
-#define XkbAllocServerMap		SrvXkbAllocServerMap
-#define XkbChangeTypesOfKey		SrvXkbChangeTypesOfKey
-#define XkbCopyKeyTypes			SrvXkbCopyKeyTypes
-#define XkbFreeClientMap		SrvXkbFreeClientMap
-#define XkbFreeServerMap		SrvXkbFreeServerMap
-#define	XkbKeyTypesForCoreSymbols	SrvXkbKeyTypesForCoreSymbols
-#define	XkbApplyCompatMapToKey		SrvXkbApplyCompatMapToKey
-#define XkbResizeKeyActions		SrvXkbResizeKeyActions
-#define XkbResizeKeySyms		SrvXkbResizeKeySyms
-#define XkbResizeKeyType		SrvXkbResizeKeyType
-#define XkbAllocCompatMap		SrvXkbAllocCompatMap
-#define XkbAllocControls		SrvXkbAllocControls
-#define XkbAllocIndicatorMaps		SrvXkbAllocIndicatorMaps
-#define XkbAllocKeyboard		SrvXkbAllocKeyboard
-#define XkbAllocNames			SrvXkbAllocNames
-#define XkbFreeCompatMap		SrvXkbFreeCompatMap
-#define XkbFreeKeyboard			SrvXkbFreeKeyboard
-#define XkbFreeNames			SrvXkbFreeNames
-#define XkbLatchModifiers		SrvXkbLatchModifiers
-#define XkbLatchGroup			SrvXkbLatchGroup
-#define XkbVirtualModsToReal		SrvXkbVirtualModsToReal
-#define	XkbChangeKeycodeRange		SrvXkbChangeKeycodeRange
-#define	XkbApplyVirtualModChanges	SrvXkbApplyVirtualModChanges
-
-#include <X11/extensions/XKBproto.h>
-#include "xkbstr.h"
-#include "xkbrules.h"
-#include "inputstr.h"
-#include "events.h"
-
-typedef struct _XkbInterest {
-	DeviceIntPtr		dev;
-	ClientPtr		client;
-	XID			resource;
-	struct _XkbInterest *	next;
-	CARD16			extDevNotifyMask;
-	CARD16			stateNotifyMask;
-	CARD16			namesNotifyMask;
-	CARD32 			ctrlsNotifyMask;
-	CARD8			compatNotifyMask;
-	BOOL			bellNotifyMask;
-	BOOL			actionMessageMask;
-	CARD16			accessXNotifyMask;
-	CARD32			iStateNotifyMask;
-	CARD32			iMapNotifyMask;
-	CARD16			altSymsNotifyMask;
-	CARD32			autoCtrls;
-	CARD32			autoCtrlValues;
-} XkbInterestRec,*XkbInterestPtr;
-
-typedef struct _XkbRadioGroup {
-	CARD8		flags;
-	CARD8		nMembers;
-	CARD8		dfltDown;
-	CARD8		currentDown;
-	CARD8		members[XkbRGMaxMembers];
-} XkbRadioGroupRec, *XkbRadioGroupPtr;
-
-typedef struct	_XkbEventCause {
-	CARD8		kc;
-	CARD8		event;
-	CARD8		mjr;
-	CARD8		mnr;
-	ClientPtr	client;
-} XkbEventCauseRec,*XkbEventCausePtr;
-#define	XkbSetCauseKey(c,k,e)	{ (c)->kc= (k),(c)->event= (e),\
-				  (c)->mjr= (c)->mnr= 0; \
-				  (c)->client= NULL; }
-#define	XkbSetCauseReq(c,j,n,cl) { (c)->kc= (c)->event= 0,\
-				  (c)->mjr= (j),(c)->mnr= (n);\
-				  (c)->client= (cl); }
-#define	XkbSetCauseCoreReq(c,e,cl) XkbSetCauseReq(c,e,0,cl)
-#define	XkbSetCauseXkbReq(c,e,cl)  XkbSetCauseReq(c,XkbReqCode,e,cl)
-#define	XkbSetCauseUnknown(c)	   XkbSetCauseKey(c,0,0)
-
-#define	_OFF_TIMER		0
-#define	_KRG_WARN_TIMER		1
-#define	_KRG_TIMER		2
-#define	_SK_TIMEOUT_TIMER	3
-#define	_ALL_TIMEOUT_TIMER	4
-
-#define	_BEEP_NONE		0
-#define	_BEEP_FEATURE_ON	1
-#define	_BEEP_FEATURE_OFF	2
-#define	_BEEP_FEATURE_CHANGE	3
-#define	_BEEP_SLOW_WARN		4
-#define	_BEEP_SLOW_PRESS	5
-#define	_BEEP_SLOW_ACCEPT	6
-#define	_BEEP_SLOW_REJECT	7
-#define	_BEEP_SLOW_RELEASE	8
-#define	_BEEP_STICKY_LATCH	9
-#define	_BEEP_STICKY_LOCK	10
-#define	_BEEP_STICKY_UNLOCK	11
-#define	_BEEP_LED_ON		12
-#define	_BEEP_LED_OFF		13
-#define	_BEEP_LED_CHANGE	14
-#define	_BEEP_BOUNCE_REJECT	15
-
-typedef struct _XkbFilter {
-	CARD16			  keycode;
-	CARD8			  what;
-	CARD8			  active;
-	CARD8			  filterOthers;
-	CARD32			  priv;
-	XkbAction		  upAction;
-	int			(*filter)(
-					struct _XkbSrvInfo* 	/* xkbi */,
-					struct _XkbFilter *	/* filter */,
-					unsigned		/* keycode */,
-					XkbAction *		/* action */
-				  );
-	struct _XkbFilter	 *next;
-} XkbFilterRec,*XkbFilterPtr;
-
-typedef struct _XkbSrvInfo {
-	XkbStateRec	 prev_state;
-	XkbStateRec	 state;
-	XkbDescPtr	 desc;
-
-	DeviceIntPtr	 device;
-	KbdCtrlProcPtr	 kbdProc;
-
-	XkbRadioGroupPtr radioGroups;
-	CARD8		 nRadioGroups;
-	CARD8		 clearMods;
-	CARD8		 setMods;
-	INT16		 groupChange;
-
-	CARD16		 dfltPtrDelta;
-
-	double		 mouseKeysCurve;
-	double		 mouseKeysCurveFactor;
-	INT16		 mouseKeysDX;
-	INT16		 mouseKeysDY;
-	CARD8		 mouseKeysFlags;
-	Bool		 mouseKeysAccel;
-	CARD8		 mouseKeysCounter;
-
-	CARD8		 lockedPtrButtons;
-	CARD8		 shiftKeyCount;
-	KeyCode		 mouseKey;
-	KeyCode		 inactiveKey;
-	KeyCode		 slowKey;
-	KeyCode		 repeatKey;
-	CARD8		 krgTimerActive;
-	CARD8		 beepType;
-	CARD8		 beepCount;
-
-	CARD32		 flags;
-	CARD32		 lastPtrEventTime;
-	CARD32		 lastShiftEventTime;
-	OsTimerPtr	 beepTimer;
-	OsTimerPtr	 mouseKeyTimer;
-	OsTimerPtr	 slowKeysTimer;
-	OsTimerPtr	 bounceKeysTimer;
-	OsTimerPtr	 repeatKeyTimer;
-	OsTimerPtr	 krgTimer;
-
-	int		 szFilters;
-	XkbFilterPtr	 filters;
-} XkbSrvInfoRec, *XkbSrvInfoPtr;
-
-#define	XkbSLI_IsDefault	(1L<<0)
-#define	XkbSLI_HasOwnState	(1L<<1)
-
-typedef struct	_XkbSrvLedInfo {
-	CARD16			flags;
-	CARD16			class;
-	CARD16			id;
-	union {
-	    KbdFeedbackPtr	kf;
-	    LedFeedbackPtr	lf;
-	} 			fb;
-
-	CARD32			physIndicators;
-	CARD32			autoState;
-	CARD32			explicitState;
-	CARD32			effectiveState;
-
-	CARD32			mapsPresent;
-	CARD32			namesPresent;
-	XkbIndicatorMapPtr	maps;
-	Atom *			names;
-
-	CARD32			usesBase;
-	CARD32			usesLatched;
-	CARD32			usesLocked;
-	CARD32			usesEffective;
-	CARD32			usesCompat;
-	CARD32			usesControls;
-
-	CARD32			usedComponents;
-} XkbSrvLedInfoRec, *XkbSrvLedInfoPtr;
-
-/*
- * Settings for xkbClientFlags field (used by DIX)
- * These flags _must_ not overlap with XkbPCF_*
- */
-#define	_XkbClientInitialized		(1<<15)
-
-#define	_XkbWantsDetectableAutoRepeat(c)\
-	((c)->xkbClientFlags&XkbPCF_DetectableAutoRepeatMask)
-
-/*
- * Settings for flags field
- */
-#define	_XkbStateNotifyInProgress	(1<<0)
-
-typedef struct
-{
-    ProcessInputProc processInputProc;
-    /* If processInputProc is set to something different than realInputProc,
-     * UNWRAP and COND_WRAP will not touch processInputProc and update only
-     * realInputProc.  This ensures that
-     *   processInputProc == (frozen ? EnqueueEvent : realInputProc)
-     *
-     * WRAP_PROCESS_INPUT_PROC should only be called during initialization,
-     * since it may destroy this invariant.
-     */
-    ProcessInputProc realInputProc;
-    DeviceUnwrapProc unwrapProc;
-} xkbDeviceInfoRec, *xkbDeviceInfoPtr;
-
-#define WRAP_PROCESS_INPUT_PROC(device, oldprocs, proc, unwrapproc) \
-	device->public.processInputProc = proc; \
-	oldprocs->processInputProc = \
-	oldprocs->realInputProc = device->public.realInputProc; \
-	device->public.realInputProc = proc; \
-	oldprocs->unwrapProc = device->unwrapProc; \
-	device->unwrapProc = unwrapproc;
-
-#define COND_WRAP_PROCESS_INPUT_PROC(device, oldprocs, proc, unwrapproc) \
-	if (device->public.processInputProc == device->public.realInputProc)\
-	    device->public.processInputProc = proc; \
-	oldprocs->processInputProc = \
-	oldprocs->realInputProc = device->public.realInputProc; \
-	device->public.realInputProc = proc; \
-	oldprocs->unwrapProc = device->unwrapProc; \
-	device->unwrapProc = unwrapproc;
-
-#define UNWRAP_PROCESS_INPUT_PROC(device, oldprocs, backupproc) \
-        backupproc = device->public.realInputProc; \
-	if (device->public.processInputProc == device->public.realInputProc)\
-	    device->public.processInputProc = oldprocs->realInputProc; \
-	device->public.realInputProc = oldprocs->realInputProc; \
-	device->unwrapProc = oldprocs->unwrapProc;
-
-extern DevPrivateKey xkbDevicePrivateKey;
-#define XKBDEVICEINFO(dev) ((xkbDeviceInfoPtr)dixLookupPrivate(&(dev)->devPrivates, xkbDevicePrivateKey))
-
-extern void xkbUnwrapProc(DeviceIntPtr, DeviceHandleProc, pointer);
-
-/***====================================================================***/
-
-
-/***====================================================================***/
-
-#define XkbAX_KRGMask	 (XkbSlowKeysMask|XkbBounceKeysMask)
-#define	XkbAllFilteredEventsMask \
-	(XkbAccessXKeysMask|XkbRepeatKeysMask|XkbMouseKeysAccelMask|XkbAX_KRGMask)
-
-/***====================================================================***/
-
-extern _X_EXPORT int	XkbReqCode;
-extern _X_EXPORT int	XkbEventBase;
-extern _X_EXPORT int	XkbKeyboardErrorCode;
-extern _X_EXPORT char *	XkbBaseDirectory;
-extern _X_EXPORT char *	XkbBinDirectory;
-
-extern _X_EXPORT CARD32	xkbDebugFlags;
-
-#define	_XkbLibError(c,l,d) /* Epoch fail */
-#define	_XkbErrCode2(a,b) ((XID)((((unsigned int)(a))<<24)|((b)&0xffffff)))
-#define	_XkbErrCode3(a,b,c)	_XkbErrCode2(a,(((unsigned int)(b))<<16)|(c))
-#define	_XkbErrCode4(a,b,c,d) _XkbErrCode3(a,b,((((unsigned int)(c))<<8)|(d)))
-
-extern	_X_EXPORT int	DeviceKeyPress,DeviceKeyRelease,DeviceMotionNotify;
-extern	_X_EXPORT int	DeviceButtonPress,DeviceButtonRelease;
-
-#define	Status		int
-
-extern _X_EXPORT void XkbUseMsg(
-    void
-);
-
-extern _X_EXPORT int XkbProcessArguments(
-    int				/* argc */,
-    char **			/* argv */,
-    int				/* i */
-);
-
-extern _X_EXPORT void	XkbSetExtension(DeviceIntPtr device, ProcessInputProc proc);
-
-extern _X_EXPORT void	XkbFreeCompatMap(
-    XkbDescPtr			/* xkb */,
-    unsigned int		/* which */,
-    Bool			/* freeMap */
-);
-
-extern _X_EXPORT void XkbFreeNames(
-	XkbDescPtr		/* xkb */,
-	unsigned int		/* which */,
-	Bool			/* freeMap */
-);
-
-extern _X_EXPORT int _XkbLookupAnyDevice(
-    DeviceIntPtr *pDev,
-    int id,
-    ClientPtr client,
-    Mask access_mode,
-    int *xkb_err
-);
-
-extern _X_EXPORT int _XkbLookupKeyboard(
-    DeviceIntPtr *pDev,
-    int id,
-    ClientPtr client,
-    Mask access_mode,
-    int *xkb_err
-);
-
-extern _X_EXPORT int _XkbLookupBellDevice(
-    DeviceIntPtr *pDev,
-    int id,
-    ClientPtr client,
-    Mask access_mode,
-    int *xkb_err
-);
-
-extern _X_EXPORT int _XkbLookupLedDevice(
-    DeviceIntPtr *pDev,
-    int id,
-    ClientPtr client,
-    Mask access_mode,
-    int *xkb_err
-);
-
-extern _X_EXPORT int _XkbLookupButtonDevice(
-    DeviceIntPtr *pDev,
-    int id,
-    ClientPtr client,
-    Mask access_mode,
-    int *xkb_err
-);
-
-extern _X_EXPORT XkbDescPtr XkbAllocKeyboard(
-	void
-);
-
-extern _X_EXPORT Status XkbAllocClientMap(
-	XkbDescPtr		/* xkb */,
-	unsigned int		/* which */,
-	unsigned int		/* nTypes */
-);
-
-extern _X_EXPORT Status XkbAllocServerMap(
-	XkbDescPtr		/* xkb */,
-	unsigned int		/* which */,
-	unsigned int		/* nNewActions */
-);
-
-extern _X_EXPORT void	XkbFreeClientMap(
-    XkbDescPtr			/* xkb */,
-    unsigned int		/* what */,
-    Bool			/* freeMap */
-);
-
-extern _X_EXPORT void	XkbFreeServerMap(
-    XkbDescPtr			/* xkb */,
-    unsigned int		/* what */,
-    Bool			/* freeMap */
-);
-
-extern _X_EXPORT Status XkbAllocIndicatorMaps(
-	XkbDescPtr		/* xkb */
-);
-
-extern _X_EXPORT Status	XkbAllocCompatMap(
-    XkbDescPtr			/* xkb */,
-    unsigned int		/* which */,
-    unsigned int		/* nInterpret */
-);
-
-extern _X_EXPORT Status XkbAllocNames(
-	XkbDescPtr		/* xkb */,
-	unsigned int		/* which */,
-	int			/* nTotalRG */,
-	int			/* nTotalAliases */
-);
-
-extern _X_EXPORT Status	XkbAllocControls(
-	XkbDescPtr		/* xkb */,
-	unsigned int		/* which*/
-);
-
-extern _X_EXPORT Status	XkbCopyKeyTypes(
-    XkbKeyTypePtr		/* from */,
-    XkbKeyTypePtr		/* into */,
-    int				/* num_types */
-);
-
-extern _X_EXPORT Status	XkbResizeKeyType(
-    XkbDescPtr		/* xkb */,
-    int			/* type_ndx */,
-    int			/* map_count */,
-    Bool		/* want_preserve */,
-    int			/* new_num_lvls */
-);
-
-extern _X_EXPORT void	XkbFreeKeyboard(
-	XkbDescPtr		/* xkb */,
-	unsigned int		/* which */,
-	Bool			/* freeDesc */
-);
-
-extern _X_EXPORT  void XkbSetActionKeyMods(
-	XkbDescPtr		/* xkb */,
-	XkbAction *		/* act */,
-	unsigned int 		/* mods */
-);
-
-extern _X_EXPORT unsigned int XkbMaskForVMask(
-    XkbDescPtr		/* xkb */,
-    unsigned int	/* vmask */
-);
-
-extern _X_EXPORT Bool XkbVirtualModsToReal(
-	XkbDescPtr	/* xkb */,
-	unsigned int	/* virtua_mask */,
-	unsigned int *	/* mask_rtrn */
-);
-
-extern _X_EXPORT unsigned int	XkbAdjustGroup(
-    int			/* group */,
-    XkbControlsPtr	/* ctrls */
-);
-
-extern _X_EXPORT KeySym *XkbResizeKeySyms(
-    XkbDescPtr		/* xkb */,
-    int 		/* key */,
-    int 		/* needed */
-);
-
-extern _X_EXPORT XkbAction *XkbResizeKeyActions(
-    XkbDescPtr		/* xkb */,
-    int 		/* key */,
-    int 		/* needed */
-);
-
-extern _X_EXPORT void XkbUpdateKeyTypesFromCore(
-    DeviceIntPtr	/* pXDev */,
-    KeySymsPtr          /* syms */,
-    KeyCode 		/* first */,
-    CARD8 		/* num */,
-    XkbChangesPtr	/* pChanges */
-);
-
-extern _X_EXPORT void XkbUpdateDescActions(
-    XkbDescPtr		/* xkb */,
-    KeyCode		/* first */,
-    CARD8		/* num */,
-    XkbChangesPtr	/* changes */
-);
-
-extern _X_EXPORT void XkbUpdateActions(
-    DeviceIntPtr	/* pXDev */,
-    KeyCode 		/* first */,
-    CARD8 		/* num */,
-    XkbChangesPtr  	/* pChanges */,
-    unsigned int *	/* needChecksRtrn */,
-    XkbEventCausePtr	/* cause */
-);
-
-extern _X_EXPORT KeySymsPtr XkbGetCoreMap(
-    DeviceIntPtr        /* keybd */
-);
-
-extern _X_EXPORT void XkbApplyMappingChange(
-    DeviceIntPtr	/* pXDev */,
-    KeySymsPtr          /* map */,
-    KeyCode		/* firstKey */,
-    CARD8		/* num */,
-    CARD8 *             /* modmap */,
-    ClientPtr		/* client */
-);
-
-extern _X_EXPORT void XkbSetIndicators(
-    DeviceIntPtr		/* pXDev */,
-    CARD32			/* affect */,
-    CARD32			/* values */,
-    XkbEventCausePtr		/* cause */
-);
-
-extern _X_EXPORT void XkbUpdateIndicators(
-    DeviceIntPtr		/* keybd */,
-    CARD32		 	/* changed */,
-    Bool			/* check_edevs */,
-    XkbChangesPtr		/* pChanges */,
-    XkbEventCausePtr		/* cause */
-);
-
-extern _X_EXPORT XkbSrvLedInfoPtr XkbAllocSrvLedInfo(
-    DeviceIntPtr		/* dev */,
-    KbdFeedbackPtr		/* kf */,
-    LedFeedbackPtr		/* lf */,
-    unsigned int		/* needed_parts */
-);
-
-extern _X_EXPORT XkbSrvLedInfoPtr XkbCopySrvLedInfo(
-    DeviceIntPtr		/* dev */,
-    XkbSrvLedInfoPtr		/* src */,
-    KbdFeedbackPtr		/* kf */,
-    LedFeedbackPtr		/* lf */
-);
-
-
-extern _X_EXPORT XkbSrvLedInfoPtr XkbFindSrvLedInfo(
-    DeviceIntPtr		/* dev */,
-    unsigned int		/* class */,
-    unsigned int		/* id */,
-    unsigned int		/* needed_parts */
-);
-
-extern _X_EXPORT void XkbApplyLedNameChanges(
-    DeviceIntPtr		/* dev */,
-    XkbSrvLedInfoPtr		/* sli */,
-    unsigned int		/* changed_names */,
-    xkbExtensionDeviceNotify *	/* ed */,
-    XkbChangesPtr		/* changes */,
-    XkbEventCausePtr		/* cause */
-);
-
-extern _X_EXPORT void XkbApplyLedMapChanges(
-    DeviceIntPtr		/* dev */,
-    XkbSrvLedInfoPtr		/* sli */,
-    unsigned int		/* changed_maps */,
-    xkbExtensionDeviceNotify *	/* ed */,
-    XkbChangesPtr		/* changes */,
-    XkbEventCausePtr		/* cause */
-);
-
-extern _X_EXPORT void XkbApplyLedStateChanges(
-    DeviceIntPtr		/* dev */,
-    XkbSrvLedInfoPtr		/* sli */,
-    unsigned int		/* changed_leds */,
-    xkbExtensionDeviceNotify *	/* ed */,
-    XkbChangesPtr		/* changes */,
-    XkbEventCausePtr		/* cause */
-);
-
-extern _X_EXPORT void XkbFlushLedEvents(
-    DeviceIntPtr		/* dev */,
-    DeviceIntPtr		/* kbd */,
-    XkbSrvLedInfoPtr		/* sli */,
-    xkbExtensionDeviceNotify *	/* ed */,
-    XkbChangesPtr		/* changes */,
-    XkbEventCausePtr		/* cause */
-);
-
-extern _X_EXPORT unsigned int XkbIndicatorsToUpdate(
-    DeviceIntPtr		/* dev */,
-    unsigned long		/* state_changes */,
-    Bool			/* enabled_ctrl_changes */
-);
-
-extern _X_EXPORT void XkbComputeDerivedState(
-    XkbSrvInfoPtr		/* xkbi */
-);
-
-extern _X_EXPORT void XkbCheckSecondaryEffects(
-    XkbSrvInfoPtr		/* xkbi */,
-    unsigned int		/* which */,
-    XkbChangesPtr		/* changes */,
-    XkbEventCausePtr		/* cause */
-);
-
-extern _X_EXPORT void XkbCheckIndicatorMaps(
-    DeviceIntPtr		/* dev */,
-    XkbSrvLedInfoPtr		/* sli */,
-    unsigned int		/* which */
-);
-
-extern _X_EXPORT unsigned int XkbStateChangedFlags(
-    XkbStatePtr			/* old */,
-    XkbStatePtr			/* new */
-);
-
-extern _X_EXPORT void XkbSendStateNotify(
-       DeviceIntPtr	/* kbd */,
-       xkbStateNotify *	/* pSN */
-);
-
-extern _X_EXPORT void XkbSendMapNotify(
-       DeviceIntPtr	/* kbd */,
-       xkbMapNotify *	/* ev */
-);
-
-extern _X_EXPORT int  XkbComputeControlsNotify(
-	DeviceIntPtr		/* kbd */,
-	XkbControlsPtr		/* old */,
-	XkbControlsPtr		/* new */,
-	xkbControlsNotify *	/* pCN */,
-	Bool			/* forceCtrlProc */
-);
-
-extern _X_EXPORT void XkbSendControlsNotify(
-       DeviceIntPtr		/* kbd */,
-       xkbControlsNotify *	/* ev */
-);
-
-extern _X_EXPORT void XkbSendCompatMapNotify(
-	DeviceIntPtr		/* kbd */,
-	xkbCompatMapNotify *	/* ev */
-);
-
-extern _X_EXPORT void XkbHandleBell(
-       BOOL		/* force */,
-       BOOL		/* eventOnly */,
-       DeviceIntPtr	/* kbd */,
-       CARD8		/* percent */,
-       pointer 		/* ctrl */,
-       CARD8		/* class */,
-       Atom		/* name */,
-       WindowPtr	/* pWin */,
-       ClientPtr	/* pClient */
-);
-
-extern _X_EXPORT void XkbSendAccessXNotify(
-       DeviceIntPtr		/* kbd */,
-       xkbAccessXNotify *	/* pEv */
-);
-
-extern _X_EXPORT void XkbSendNamesNotify(
-       DeviceIntPtr	/* kbd */,
-       xkbNamesNotify *	/* ev */
-);
-
-extern _X_EXPORT void XkbSendActionMessage(
-       DeviceIntPtr		/* kbd */,
-       xkbActionMessage *	/* ev */
-);
-
-extern _X_EXPORT void XkbSendExtensionDeviceNotify(
-       DeviceIntPtr			/* kbd */,
-       ClientPtr			/* client */,
-       xkbExtensionDeviceNotify *	/* ev */
-);
-
-extern _X_EXPORT void XkbSendNotification(
-    DeviceIntPtr		/* kbd */,
-    XkbChangesPtr		/* pChanges */,
-    XkbEventCausePtr		/* cause */
-);
-
-extern _X_EXPORT void XkbProcessKeyboardEvent(
-    DeviceEvent*		/* event */,
-    DeviceIntPtr		/* keybd */
-);
-
-extern _X_EXPORT void XkbHandleActions(
-    DeviceIntPtr		/* dev */,
-    DeviceIntPtr		/* kbd */,
-    DeviceEvent*		/* event */
-);
-
-extern _X_EXPORT Bool XkbEnableDisableControls(
-    XkbSrvInfoPtr	/* xkbi */,
-    unsigned long	/* change */,
-    unsigned long	/* newValues */,
-    XkbChangesPtr	/* changes */,
-    XkbEventCausePtr	/* cause */
-);
-
-extern _X_EXPORT void AccessXInit(
-    DeviceIntPtr        /* dev */
-);
-
-extern _X_EXPORT Bool AccessXFilterPressEvent(
-    DeviceEvent*	/* event */,
-    DeviceIntPtr	/* keybd */
-);
-
-extern _X_EXPORT Bool AccessXFilterReleaseEvent(
-    DeviceEvent*	/* event */,
-    DeviceIntPtr	/* keybd */
-);
-
-extern _X_EXPORT void AccessXCancelRepeatKey(
-    XkbSrvInfoPtr	/* xkbi */,
-    KeyCode		/* key */
-);
-
-extern _X_EXPORT void AccessXComputeCurveFactor(
-    XkbSrvInfoPtr	/* xkbi */,
-    XkbControlsPtr	/* ctrls */
-);
-
-extern _X_EXPORT XkbInterestPtr XkbFindClientResource(
-       DevicePtr	/* inDev */,
-       ClientPtr	/* client */
-);
-
-extern _X_EXPORT XkbInterestPtr XkbAddClientResource(
-       DevicePtr	/* inDev */,
-       ClientPtr	/* client */,
-       XID		/* id */
-);
-
-extern _X_EXPORT int XkbRemoveResourceClient(
-       DevicePtr	/* inDev */,
-       XID		/* id */
-);
-
-extern _X_EXPORT int XkbDDXAccessXBeep(
-    DeviceIntPtr        /* dev */,
-    unsigned int	/* what */,
-    unsigned int	/* which */
-);
-
-extern _X_EXPORT int XkbDDXUsesSoftRepeat(
-    DeviceIntPtr	/* dev */
-);
-
-extern _X_EXPORT void XkbDDXKeybdCtrlProc(
-	DeviceIntPtr	/* dev */,
-	KeybdCtrl *	/* ctrl */
-);
-
-extern _X_EXPORT void XkbDDXChangeControls(
-	DeviceIntPtr	/* dev */,
-	XkbControlsPtr 	/* old */,
-	XkbControlsPtr 	/* new */
-);
-
-extern _X_EXPORT void XkbDDXUpdateDeviceIndicators(
-	DeviceIntPtr		/* dev */,
-	XkbSrvLedInfoPtr	/* sli */,
-	CARD32			/* newState */
-);
-
-extern _X_EXPORT int XkbDDXTerminateServer(
-	DeviceIntPtr	/* dev */,
-	KeyCode		/* key */,
-	XkbAction *	/* act */
-);
-
-extern _X_EXPORT int XkbDDXSwitchScreen(
-	DeviceIntPtr	/* dev */,
-	KeyCode		/* key */,
-	XkbAction *	/* act */
-);
-
-extern _X_EXPORT int XkbDDXPrivate(
-	DeviceIntPtr	/* dev */,
-	KeyCode		/* key */,
-	XkbAction *	/* act */
-);
-
-extern _X_EXPORT void XkbDisableComputedAutoRepeats(
-	DeviceIntPtr 	/* pXDev */,
-	unsigned int	/* key */
-);
-
-extern _X_EXPORT void XkbSetRepeatKeys(
-	DeviceIntPtr 	/* pXDev */,
-	int		/* key */,
-	int	 	/* onoff */
-);
-
-extern _X_EXPORT int XkbLatchModifiers(
-	DeviceIntPtr 	/* pXDev */,
-	CARD8 		/* mask */,
-	CARD8 		/* latches */
-);
-
-extern _X_EXPORT int XkbLatchGroup(
-	DeviceIntPtr  	/* pXDev */,
-	int	  	/* group */
-);
-
-extern _X_EXPORT void XkbClearAllLatchesAndLocks(
-	DeviceIntPtr		/* dev */,
-	XkbSrvInfoPtr		/* xkbi */,
-	Bool			/* genEv */,
-	XkbEventCausePtr	/* cause */
-);
-
-extern _X_EXPORT void	XkbGetRulesDflts(
-        XkbRMLVOSet *           /* rmlvo */
-);
-
-extern _X_EXPORT void   XkbFreeRMLVOSet(
-        XkbRMLVOSet *           /* rmlvo */,
-        Bool                    /* freeRMLVO */
-);
-
-extern _X_EXPORT void	XkbSetRulesDflts(
-        XkbRMLVOSet *           /* rmlvo */
-);
-
-extern _X_EXPORT void	XkbDeleteRulesDflts(
-	void
-);
-
-extern _X_EXPORT int SProcXkbDispatch(
-	ClientPtr		/* client */
-);
-
-extern _X_EXPORT XkbGeometryPtr XkbLookupNamedGeometry(
-	DeviceIntPtr		/* dev */,
-	Atom			/* name */,
-	Bool *			/* shouldFree */
-);
-
-extern _X_EXPORT char *	_XkbDupString(
-	const char *		/* str */
-);
-
-extern _X_EXPORT void	XkbConvertCase(
-	KeySym 			/* sym */,
-	KeySym *		/* lower */,
-	KeySym *		/* upper */
-);
-
-extern _X_EXPORT Status	 XkbChangeKeycodeRange(
-	XkbDescPtr		/* xkb */,
-	int 			/* minKC */,
-	int 			/* maxKC */,
-	XkbChangesPtr		/* changes */
-);
-
-extern _X_EXPORT void XkbFreeSrvLedInfo(
-	XkbSrvLedInfoPtr	/* sli */
-);
-
-extern _X_EXPORT void XkbFreeInfo(
-	XkbSrvInfoPtr		/* xkbi */
-);
-
-extern _X_EXPORT Status XkbChangeTypesOfKey(
-	XkbDescPtr		/* xkb */,
-	int			/* key */,
-	int			/* nGroups */,
-	unsigned int		/* groups */,
-	int *			/* newTypesIn */,
-	XkbMapChangesPtr	/* changes */
-);
-
-extern _X_EXPORT int XkbKeyTypesForCoreSymbols(
-	XkbDescPtr		/* xkb */,
-	int			/* map_width */,
-	KeySym *		/* core_syms */,
-	unsigned int		/* protected */,
-	int *			/* types_inout */,
-	KeySym *		/* xkb_syms_rtrn */
-);
-
-extern _X_EXPORT Bool XkbApplyCompatMapToKey(
-	XkbDescPtr		/* xkb */,
-	KeyCode			/* key */,
-	XkbChangesPtr		/* changes */
-);
-
-extern _X_EXPORT Bool XkbApplyVirtualModChanges(
-	XkbDescPtr		/* xkb */,
-	unsigned int		/* changed */,
-	XkbChangesPtr		/* changes */
-);
-
-extern _X_EXPORT void XkbSendNewKeyboardNotify(
-	DeviceIntPtr		/* kbd */,
-	xkbNewKeyboardNotify *	/* pNKN */
-);
-
-extern Bool XkbCopyKeymap(
-        XkbDescPtr              /* dst */,
-        XkbDescPtr              /* src */);
-
-extern Bool XkbCopyDeviceKeymap(
-        DeviceIntPtr            /* dst */,
-        DeviceIntPtr            /* src */);
-
-extern void XkbFilterEvents(
-        ClientPtr               /* pClient */,
-        int                     /* nEvents */,
-        xEvent*                 /* xE */);
-
-extern int XkbGetEffectiveGroup(
-        XkbSrvInfoPtr           /* xkbi */,
-        XkbStatePtr             /* xkbstate */,
-        CARD8                   /* keycode */);
-
-#include "xkbfile.h"
-#include "xkbrules.h"
-
-#define	_XkbListKeycodes	0
-#define	_XkbListTypes		1
-#define	_XkbListCompat		2
-#define	_XkbListSymbols		3
-#define	_XkbListGeometry	4
-#define	_XkbListNumComponents	5
-
-typedef struct _XkbSrvListInfo {
-	int		szPool;
-	int		nPool;
-	char *		pool;
-
-	int		maxRtrn;
-	int		nTotal;
-
-	char *		pattern[_XkbListNumComponents];
-	int		nFound[_XkbListNumComponents];
-} XkbSrvListInfoRec,*XkbSrvListInfoPtr;
-
-extern _X_EXPORT Status	XkbDDXList(
-	DeviceIntPtr		/* dev */,
-	XkbSrvListInfoPtr	/* listing */,
-	ClientPtr		/* client */
-);
-
-extern _X_EXPORT unsigned int XkbDDXLoadKeymapByNames(
-	DeviceIntPtr		/* keybd */,
-	XkbComponentNamesPtr	/* names */,
-	unsigned int		/* want */,
-	unsigned int		/* need */,
-	XkbDescPtr *		/* finfoRtrn */,
-	char *			/* keymapNameRtrn */,
-	int 			/* keymapNameRtrnLen */
-);
-
-extern _X_EXPORT Bool XkbDDXNamesFromRules(
-	DeviceIntPtr		/* keybd */,
-	char *			/* rules */,
-	XkbRF_VarDefsPtr	/* defs */,
-	XkbComponentNamesPtr	/* names */
-);
-
-extern _X_EXPORT XkbDescPtr XkbCompileKeymap(
-        DeviceIntPtr    /* dev */,
-        XkbRMLVOSet *   /* rmlvo */
-);
-
-#endif /* _XKBSRV_H_ */
+/************************************************************

+Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.

+

+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 Silicon Graphics not be 

+used in advertising or publicity pertaining to distribution 

+of the software without specific prior written permission.

+Silicon Graphics makes no representation about the suitability 

+of this software for any purpose. It is provided "as is"

+without any express or implied warranty.

+

+SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 

+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 

+AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON

+GRAPHICS 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 _XKBSRV_H_

+#define	_XKBSRV_H_

+

+#define XkbAllocClientMap		SrvXkbAllocClientMap

+#define XkbAllocServerMap		SrvXkbAllocServerMap

+#define XkbChangeTypesOfKey		SrvXkbChangeTypesOfKey

+#define XkbCopyKeyTypes			SrvXkbCopyKeyTypes

+#define XkbFreeClientMap		SrvXkbFreeClientMap

+#define XkbFreeServerMap		SrvXkbFreeServerMap

+#define	XkbKeyTypesForCoreSymbols	SrvXkbKeyTypesForCoreSymbols

+#define	XkbApplyCompatMapToKey		SrvXkbApplyCompatMapToKey

+#define XkbResizeKeyActions		SrvXkbResizeKeyActions

+#define XkbResizeKeySyms		SrvXkbResizeKeySyms

+#define XkbResizeKeyType		SrvXkbResizeKeyType

+#define XkbAllocCompatMap		SrvXkbAllocCompatMap

+#define XkbAllocControls		SrvXkbAllocControls

+#define XkbAllocIndicatorMaps		SrvXkbAllocIndicatorMaps

+#define XkbAllocKeyboard		SrvXkbAllocKeyboard

+#define XkbAllocNames			SrvXkbAllocNames

+#define XkbFreeCompatMap		SrvXkbFreeCompatMap

+#define XkbFreeKeyboard			SrvXkbFreeKeyboard

+#define XkbFreeNames			SrvXkbFreeNames

+#define XkbLatchModifiers		SrvXkbLatchModifiers

+#define XkbLatchGroup			SrvXkbLatchGroup

+#define XkbVirtualModsToReal		SrvXkbVirtualModsToReal

+#define	XkbChangeKeycodeRange		SrvXkbChangeKeycodeRange

+#define	XkbApplyVirtualModChanges	SrvXkbApplyVirtualModChanges

+

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

+#include "xkbstr.h"

+#include "xkbrules.h"

+#include "inputstr.h"

+#include "events.h"

+

+typedef struct _XkbInterest {

+	DeviceIntPtr		dev;

+	ClientPtr		client;

+	XID			resource;

+	struct _XkbInterest *	next;

+	CARD16			extDevNotifyMask;

+	CARD16			stateNotifyMask;

+	CARD16			namesNotifyMask;

+	CARD32 			ctrlsNotifyMask;

+	CARD8			compatNotifyMask;

+	BOOL			bellNotifyMask;

+	BOOL			actionMessageMask;

+	CARD16			accessXNotifyMask;

+	CARD32			iStateNotifyMask;

+	CARD32			iMapNotifyMask;

+	CARD16			altSymsNotifyMask;

+	CARD32			autoCtrls;

+	CARD32			autoCtrlValues;

+} XkbInterestRec,*XkbInterestPtr;

+

+typedef struct _XkbRadioGroup {

+	CARD8		flags;

+	CARD8		nMembers;

+	CARD8		dfltDown;

+	CARD8		currentDown;

+	CARD8		members[XkbRGMaxMembers];

+} XkbRadioGroupRec, *XkbRadioGroupPtr;

+

+typedef struct	_XkbEventCause {

+	CARD8		kc;

+	CARD8		event;

+	CARD8		mjr;

+	CARD8		mnr;

+	ClientPtr	client;

+} XkbEventCauseRec,*XkbEventCausePtr;

+#define	XkbSetCauseKey(c,k,e)	{ (c)->kc= (k),(c)->event= (e),\

+				  (c)->mjr= (c)->mnr= 0; \

+				  (c)->client= NULL; }

+#define	XkbSetCauseReq(c,j,n,cl) { (c)->kc= (c)->event= 0,\

+				  (c)->mjr= (j),(c)->mnr= (n);\

+				  (c)->client= (cl); }

+#define	XkbSetCauseCoreReq(c,e,cl) XkbSetCauseReq(c,e,0,cl)

+#define	XkbSetCauseXkbReq(c,e,cl)  XkbSetCauseReq(c,XkbReqCode,e,cl)

+#define	XkbSetCauseUnknown(c)	   XkbSetCauseKey(c,0,0)

+

+#define	_OFF_TIMER		0

+#define	_KRG_WARN_TIMER		1

+#define	_KRG_TIMER		2

+#define	_SK_TIMEOUT_TIMER	3

+#define	_ALL_TIMEOUT_TIMER	4

+

+#define	_BEEP_NONE		0

+#define	_BEEP_FEATURE_ON	1

+#define	_BEEP_FEATURE_OFF	2

+#define	_BEEP_FEATURE_CHANGE	3

+#define	_BEEP_SLOW_WARN		4

+#define	_BEEP_SLOW_PRESS	5

+#define	_BEEP_SLOW_ACCEPT	6

+#define	_BEEP_SLOW_REJECT	7

+#define	_BEEP_SLOW_RELEASE	8

+#define	_BEEP_STICKY_LATCH	9

+#define	_BEEP_STICKY_LOCK	10

+#define	_BEEP_STICKY_UNLOCK	11

+#define	_BEEP_LED_ON		12

+#define	_BEEP_LED_OFF		13

+#define	_BEEP_LED_CHANGE	14

+#define	_BEEP_BOUNCE_REJECT	15

+

+typedef struct _XkbFilter {

+	CARD16			  keycode;

+	CARD8			  what;

+	CARD8			  active;

+	CARD8			  filterOthers;

+	CARD32			  priv;

+	XkbAction		  upAction;

+	int			(*filter)(

+					struct _XkbSrvInfo* 	/* xkbi */,

+					struct _XkbFilter *	/* filter */,

+					unsigned		/* keycode */,

+					XkbAction *		/* action */

+				  );

+	struct _XkbFilter	 *next;

+} XkbFilterRec,*XkbFilterPtr;

+

+typedef struct _XkbSrvInfo {

+	XkbStateRec	 prev_state;

+	XkbStateRec	 state;

+	XkbDescPtr	 desc;

+

+	DeviceIntPtr	 device;

+	KbdCtrlProcPtr	 kbdProc;

+

+	XkbRadioGroupPtr radioGroups;

+	CARD8		 nRadioGroups;

+	CARD8		 clearMods;

+	CARD8		 setMods;

+	INT16		 groupChange;

+

+	CARD16		 dfltPtrDelta;

+

+	double		 mouseKeysCurve;

+	double		 mouseKeysCurveFactor;

+	INT16		 mouseKeysDX;

+	INT16		 mouseKeysDY;

+	CARD8		 mouseKeysFlags;

+	Bool		 mouseKeysAccel;

+	CARD8		 mouseKeysCounter;

+

+	CARD8		 lockedPtrButtons;

+	CARD8		 shiftKeyCount;

+	KeyCode		 mouseKey;

+	KeyCode		 inactiveKey;

+	KeyCode		 slowKey;

+	KeyCode		 repeatKey;

+	CARD8		 krgTimerActive;

+	CARD8		 beepType;

+	CARD8		 beepCount;

+

+	CARD32		 flags;

+	CARD32		 lastPtrEventTime;

+	CARD32		 lastShiftEventTime;

+	OsTimerPtr	 beepTimer;

+	OsTimerPtr	 mouseKeyTimer;

+	OsTimerPtr	 slowKeysTimer;

+	OsTimerPtr	 bounceKeysTimer;

+	OsTimerPtr	 repeatKeyTimer;

+	OsTimerPtr	 krgTimer;

+

+	int		 szFilters;

+	XkbFilterPtr	 filters;

+} XkbSrvInfoRec, *XkbSrvInfoPtr;

+

+#define	XkbSLI_IsDefault	(1L<<0)

+#define	XkbSLI_HasOwnState	(1L<<1)

+

+typedef struct	_XkbSrvLedInfo {

+	CARD16			flags;

+	CARD16			class;

+	CARD16			id;

+	union {

+	    KbdFeedbackPtr	kf;

+	    LedFeedbackPtr	lf;

+	} 			fb;

+

+	CARD32			physIndicators;

+	CARD32			autoState;

+	CARD32			explicitState;

+	CARD32			effectiveState;

+

+	CARD32			mapsPresent;

+	CARD32			namesPresent;

+	XkbIndicatorMapPtr	maps;

+	Atom *			names;

+

+	CARD32			usesBase;

+	CARD32			usesLatched;

+	CARD32			usesLocked;

+	CARD32			usesEffective;

+	CARD32			usesCompat;

+	CARD32			usesControls;

+

+	CARD32			usedComponents;

+} XkbSrvLedInfoRec, *XkbSrvLedInfoPtr;

+

+/*

+ * Settings for xkbClientFlags field (used by DIX)

+ * These flags _must_ not overlap with XkbPCF_*

+ */

+#define	_XkbClientInitialized		(1<<15)

+

+#define	_XkbWantsDetectableAutoRepeat(c)\

+	((c)->xkbClientFlags&XkbPCF_DetectableAutoRepeatMask)

+

+/*

+ * Settings for flags field

+ */

+#define	_XkbStateNotifyInProgress	(1<<0)

+

+typedef struct

+{

+    ProcessInputProc processInputProc;

+    /* If processInputProc is set to something different than realInputProc,

+     * UNWRAP and COND_WRAP will not touch processInputProc and update only

+     * realInputProc.  This ensures that

+     *   processInputProc == (frozen ? EnqueueEvent : realInputProc)

+     *

+     * WRAP_PROCESS_INPUT_PROC should only be called during initialization,

+     * since it may destroy this invariant.

+     */

+    ProcessInputProc realInputProc;

+    DeviceUnwrapProc unwrapProc;

+} xkbDeviceInfoRec, *xkbDeviceInfoPtr;

+

+#define WRAP_PROCESS_INPUT_PROC(device, oldprocs, proc, unwrapproc) \

+	device->public.processInputProc = proc; \

+	oldprocs->processInputProc = \

+	oldprocs->realInputProc = device->public.realInputProc; \

+	device->public.realInputProc = proc; \

+	oldprocs->unwrapProc = device->unwrapProc; \

+	device->unwrapProc = unwrapproc;

+

+#define COND_WRAP_PROCESS_INPUT_PROC(device, oldprocs, proc, unwrapproc) \

+	if (device->public.processInputProc == device->public.realInputProc)\

+	    device->public.processInputProc = proc; \

+	oldprocs->processInputProc = \

+	oldprocs->realInputProc = device->public.realInputProc; \

+	device->public.realInputProc = proc; \

+	oldprocs->unwrapProc = device->unwrapProc; \

+	device->unwrapProc = unwrapproc;

+

+#define UNWRAP_PROCESS_INPUT_PROC(device, oldprocs, backupproc) \

+        backupproc = device->public.realInputProc; \

+	if (device->public.processInputProc == device->public.realInputProc)\

+	    device->public.processInputProc = oldprocs->realInputProc; \

+	device->public.realInputProc = oldprocs->realInputProc; \

+	device->unwrapProc = oldprocs->unwrapProc;

+

+extern DevPrivateKey xkbDevicePrivateKey;

+#define XKBDEVICEINFO(dev) ((xkbDeviceInfoPtr)dixLookupPrivate(&(dev)->devPrivates, xkbDevicePrivateKey))

+

+extern void xkbUnwrapProc(DeviceIntPtr, DeviceHandleProc, pointer);

+

+/***====================================================================***/

+

+

+/***====================================================================***/

+

+#define XkbAX_KRGMask	 (XkbSlowKeysMask|XkbBounceKeysMask)

+#define	XkbAllFilteredEventsMask \

+	(XkbAccessXKeysMask|XkbRepeatKeysMask|XkbMouseKeysAccelMask|XkbAX_KRGMask)

+

+/***====================================================================***/

+

+extern _X_EXPORT int	XkbReqCode;

+extern _X_EXPORT int	XkbEventBase;

+extern _X_EXPORT int	XkbKeyboardErrorCode;

+extern _X_EXPORT char *	XkbBaseDirectory;

+extern _X_EXPORT char *	XkbBinDirectory;

+

+extern _X_EXPORT CARD32	xkbDebugFlags;

+

+#define	_XkbLibError(c,l,d) /* Epoch fail */

+#define	_XkbErrCode2(a,b) ((XID)((((unsigned int)(a))<<24)|((b)&0xffffff)))

+#define	_XkbErrCode3(a,b,c)	_XkbErrCode2(a,(((unsigned int)(b))<<16)|(c))

+#define	_XkbErrCode4(a,b,c,d) _XkbErrCode3(a,b,((((unsigned int)(c))<<8)|(d)))

+

+extern	_X_EXPORT int	DeviceKeyPress,DeviceKeyRelease,DeviceMotionNotify;

+extern	_X_EXPORT int	DeviceButtonPress,DeviceButtonRelease;

+

+#define	Status		int

+

+extern _X_EXPORT void XkbUseMsg(

+    void

+);

+

+extern _X_EXPORT int XkbProcessArguments(

+    int				/* argc */,

+    char **			/* argv */,

+    int				/* i */

+);

+

+extern _X_EXPORT void	XkbSetExtension(DeviceIntPtr device, ProcessInputProc proc);

+

+extern _X_EXPORT void	XkbFreeCompatMap(

+    XkbDescPtr			/* xkb */,

+    unsigned int		/* which */,

+    Bool			/* freeMap */

+);

+

+extern _X_EXPORT void XkbFreeNames(

+	XkbDescPtr		/* xkb */,

+	unsigned int		/* which */,

+	Bool			/* freeMap */

+);

+

+extern _X_EXPORT int _XkbLookupAnyDevice(

+    DeviceIntPtr *pDev,

+    int id,

+    ClientPtr client,

+    Mask access_mode,

+    int *xkb_err

+);

+

+extern _X_EXPORT int _XkbLookupKeyboard(

+    DeviceIntPtr *pDev,

+    int id,

+    ClientPtr client,

+    Mask access_mode,

+    int *xkb_err

+);

+

+extern _X_EXPORT int _XkbLookupBellDevice(

+    DeviceIntPtr *pDev,

+    int id,

+    ClientPtr client,

+    Mask access_mode,

+    int *xkb_err

+);

+

+extern _X_EXPORT int _XkbLookupLedDevice(

+    DeviceIntPtr *pDev,

+    int id,

+    ClientPtr client,

+    Mask access_mode,

+    int *xkb_err

+);

+

+extern _X_EXPORT int _XkbLookupButtonDevice(

+    DeviceIntPtr *pDev,

+    int id,

+    ClientPtr client,

+    Mask access_mode,

+    int *xkb_err

+);

+

+extern _X_EXPORT XkbDescPtr XkbAllocKeyboard(

+	void

+);

+

+extern _X_EXPORT Status XkbAllocClientMap(

+	XkbDescPtr		/* xkb */,

+	unsigned int		/* which */,

+	unsigned int		/* nTypes */

+);

+

+extern _X_EXPORT Status XkbAllocServerMap(

+	XkbDescPtr		/* xkb */,

+	unsigned int		/* which */,

+	unsigned int		/* nNewActions */

+);

+

+extern _X_EXPORT void	XkbFreeClientMap(

+    XkbDescPtr			/* xkb */,

+    unsigned int		/* what */,

+    Bool			/* freeMap */

+);

+

+extern _X_EXPORT void	XkbFreeServerMap(

+    XkbDescPtr			/* xkb */,

+    unsigned int		/* what */,

+    Bool			/* freeMap */

+);

+

+extern _X_EXPORT Status XkbAllocIndicatorMaps(

+	XkbDescPtr		/* xkb */

+);

+

+extern _X_EXPORT Status	XkbAllocCompatMap(

+    XkbDescPtr			/* xkb */,

+    unsigned int		/* which */,

+    unsigned int		/* nInterpret */

+);

+

+extern _X_EXPORT Status XkbAllocNames(

+	XkbDescPtr		/* xkb */,

+	unsigned int		/* which */,

+	int			/* nTotalRG */,

+	int			/* nTotalAliases */

+);

+

+extern _X_EXPORT Status	XkbAllocControls(

+	XkbDescPtr		/* xkb */,

+	unsigned int		/* which*/

+);

+

+extern _X_EXPORT Status	XkbCopyKeyTypes(

+    XkbKeyTypePtr		/* from */,

+    XkbKeyTypePtr		/* into */,

+    int				/* num_types */

+);

+

+extern _X_EXPORT Status	XkbResizeKeyType(

+    XkbDescPtr		/* xkb */,

+    int			/* type_ndx */,

+    int			/* map_count */,

+    Bool		/* want_preserve */,

+    int			/* new_num_lvls */

+);

+

+extern _X_EXPORT void	XkbFreeKeyboard(

+	XkbDescPtr		/* xkb */,

+	unsigned int		/* which */,

+	Bool			/* freeDesc */

+);

+

+extern _X_EXPORT  void XkbSetActionKeyMods(

+	XkbDescPtr		/* xkb */,

+	XkbAction *		/* act */,

+	unsigned int 		/* mods */

+);

+

+extern _X_EXPORT unsigned int XkbMaskForVMask(

+    XkbDescPtr		/* xkb */,

+    unsigned int	/* vmask */

+);

+

+extern _X_EXPORT Bool XkbVirtualModsToReal(

+	XkbDescPtr	/* xkb */,

+	unsigned int	/* virtua_mask */,

+	unsigned int *	/* mask_rtrn */

+);

+

+extern _X_EXPORT unsigned int	XkbAdjustGroup(

+    int			/* group */,

+    XkbControlsPtr	/* ctrls */

+);

+

+extern _X_EXPORT KeySym *XkbResizeKeySyms(

+    XkbDescPtr		/* xkb */,

+    int 		/* key */,

+    int 		/* needed */

+);

+

+extern _X_EXPORT XkbAction *XkbResizeKeyActions(

+    XkbDescPtr		/* xkb */,

+    int 		/* key */,

+    int 		/* needed */

+);

+

+extern _X_EXPORT void XkbUpdateKeyTypesFromCore(

+    DeviceIntPtr	/* pXDev */,

+    KeySymsPtr          /* syms */,

+    KeyCode 		/* first */,

+    CARD8 		/* num */,

+    XkbChangesPtr	/* pChanges */

+);

+

+extern _X_EXPORT void XkbUpdateDescActions(

+    XkbDescPtr		/* xkb */,

+    KeyCode		/* first */,

+    CARD8		/* num */,

+    XkbChangesPtr	/* changes */

+);

+

+extern _X_EXPORT void XkbUpdateActions(

+    DeviceIntPtr	/* pXDev */,

+    KeyCode 		/* first */,

+    CARD8 		/* num */,

+    XkbChangesPtr  	/* pChanges */,

+    unsigned int *	/* needChecksRtrn */,

+    XkbEventCausePtr	/* cause */

+);

+

+extern _X_EXPORT KeySymsPtr XkbGetCoreMap(

+    DeviceIntPtr        /* keybd */

+);

+

+extern _X_EXPORT void XkbApplyMappingChange(

+    DeviceIntPtr	/* pXDev */,

+    KeySymsPtr          /* map */,

+    KeyCode		/* firstKey */,

+    CARD8		/* num */,

+    CARD8 *             /* modmap */,

+    ClientPtr		/* client */

+);

+

+extern _X_EXPORT void XkbSetIndicators(

+    DeviceIntPtr		/* pXDev */,

+    CARD32			/* affect */,

+    CARD32			/* values */,

+    XkbEventCausePtr		/* cause */

+);

+

+extern _X_EXPORT void XkbUpdateIndicators(

+    DeviceIntPtr		/* keybd */,

+    CARD32		 	/* changed */,

+    Bool			/* check_edevs */,

+    XkbChangesPtr		/* pChanges */,

+    XkbEventCausePtr		/* cause */

+);

+

+extern _X_EXPORT XkbSrvLedInfoPtr XkbAllocSrvLedInfo(

+    DeviceIntPtr		/* dev */,

+    KbdFeedbackPtr		/* kf */,

+    LedFeedbackPtr		/* lf */,

+    unsigned int		/* needed_parts */

+);

+

+extern _X_EXPORT XkbSrvLedInfoPtr XkbCopySrvLedInfo(

+    DeviceIntPtr		/* dev */,

+    XkbSrvLedInfoPtr		/* src */,

+    KbdFeedbackPtr		/* kf */,

+    LedFeedbackPtr		/* lf */

+);

+

+

+extern _X_EXPORT XkbSrvLedInfoPtr XkbFindSrvLedInfo(

+    DeviceIntPtr		/* dev */,

+    unsigned int		/* class */,

+    unsigned int		/* id */,

+    unsigned int		/* needed_parts */

+);

+

+extern _X_EXPORT void XkbApplyLedNameChanges(

+    DeviceIntPtr		/* dev */,

+    XkbSrvLedInfoPtr		/* sli */,

+    unsigned int		/* changed_names */,

+    xkbExtensionDeviceNotify *	/* ed */,

+    XkbChangesPtr		/* changes */,

+    XkbEventCausePtr		/* cause */

+);

+

+extern _X_EXPORT void XkbApplyLedMapChanges(

+    DeviceIntPtr		/* dev */,

+    XkbSrvLedInfoPtr		/* sli */,

+    unsigned int		/* changed_maps */,

+    xkbExtensionDeviceNotify *	/* ed */,

+    XkbChangesPtr		/* changes */,

+    XkbEventCausePtr		/* cause */

+);

+

+extern _X_EXPORT void XkbApplyLedStateChanges(

+    DeviceIntPtr		/* dev */,

+    XkbSrvLedInfoPtr		/* sli */,

+    unsigned int		/* changed_leds */,

+    xkbExtensionDeviceNotify *	/* ed */,

+    XkbChangesPtr		/* changes */,

+    XkbEventCausePtr		/* cause */

+);

+

+extern _X_EXPORT void XkbFlushLedEvents(

+    DeviceIntPtr		/* dev */,

+    DeviceIntPtr		/* kbd */,

+    XkbSrvLedInfoPtr		/* sli */,

+    xkbExtensionDeviceNotify *	/* ed */,

+    XkbChangesPtr		/* changes */,

+    XkbEventCausePtr		/* cause */

+);

+

+extern _X_EXPORT unsigned int XkbIndicatorsToUpdate(

+    DeviceIntPtr		/* dev */,

+    unsigned long		/* state_changes */,

+    Bool			/* enabled_ctrl_changes */

+);

+

+extern _X_EXPORT void XkbComputeDerivedState(

+    XkbSrvInfoPtr		/* xkbi */

+);

+

+extern _X_EXPORT void XkbCheckSecondaryEffects(

+    XkbSrvInfoPtr		/* xkbi */,

+    unsigned int		/* which */,

+    XkbChangesPtr		/* changes */,

+    XkbEventCausePtr		/* cause */

+);

+

+extern _X_EXPORT void XkbCheckIndicatorMaps(

+    DeviceIntPtr		/* dev */,

+    XkbSrvLedInfoPtr		/* sli */,

+    unsigned int		/* which */

+);

+

+extern _X_EXPORT unsigned int XkbStateChangedFlags(

+    XkbStatePtr			/* old */,

+    XkbStatePtr			/* new */

+);

+

+extern _X_EXPORT void XkbSendStateNotify(

+       DeviceIntPtr	/* kbd */,

+       xkbStateNotify *	/* pSN */

+);

+

+extern _X_EXPORT void XkbSendMapNotify(

+       DeviceIntPtr	/* kbd */,

+       xkbMapNotify *	/* ev */

+);

+

+extern _X_EXPORT int  XkbComputeControlsNotify(

+	DeviceIntPtr		/* kbd */,

+	XkbControlsPtr		/* old */,

+	XkbControlsPtr		/* new */,

+	xkbControlsNotify *	/* pCN */,

+	Bool			/* forceCtrlProc */

+);

+

+extern _X_EXPORT void XkbSendControlsNotify(

+       DeviceIntPtr		/* kbd */,

+       xkbControlsNotify *	/* ev */

+);

+

+extern _X_EXPORT void XkbSendCompatMapNotify(

+	DeviceIntPtr		/* kbd */,

+	xkbCompatMapNotify *	/* ev */

+);

+

+extern _X_EXPORT void XkbHandleBell(

+       BOOL		/* force */,

+       BOOL		/* eventOnly */,

+       DeviceIntPtr	/* kbd */,

+       CARD8		/* percent */,

+       pointer 		/* ctrl */,

+       CARD8		/* class */,

+       Atom		/* name */,

+       WindowPtr	/* pWin */,

+       ClientPtr	/* pClient */

+);

+

+extern _X_EXPORT void XkbSendAccessXNotify(

+       DeviceIntPtr		/* kbd */,

+       xkbAccessXNotify *	/* pEv */

+);

+

+extern _X_EXPORT void XkbSendNamesNotify(

+       DeviceIntPtr	/* kbd */,

+       xkbNamesNotify *	/* ev */

+);

+

+extern _X_EXPORT void XkbSendActionMessage(

+       DeviceIntPtr		/* kbd */,

+       xkbActionMessage *	/* ev */

+);

+

+extern _X_EXPORT void XkbSendExtensionDeviceNotify(

+       DeviceIntPtr			/* kbd */,

+       ClientPtr			/* client */,

+       xkbExtensionDeviceNotify *	/* ev */

+);

+

+extern _X_EXPORT void XkbSendNotification(

+    DeviceIntPtr		/* kbd */,

+    XkbChangesPtr		/* pChanges */,

+    XkbEventCausePtr		/* cause */

+);

+

+extern _X_EXPORT void XkbProcessKeyboardEvent(

+    DeviceEvent*		/* event */,

+    DeviceIntPtr		/* keybd */

+);

+

+extern _X_EXPORT void XkbHandleActions(

+    DeviceIntPtr		/* dev */,

+    DeviceIntPtr		/* kbd */,

+    DeviceEvent*		/* event */

+);

+

+extern _X_EXPORT Bool XkbEnableDisableControls(

+    XkbSrvInfoPtr	/* xkbi */,

+    unsigned long	/* change */,

+    unsigned long	/* newValues */,

+    XkbChangesPtr	/* changes */,

+    XkbEventCausePtr	/* cause */

+);

+

+extern _X_EXPORT void AccessXInit(

+    DeviceIntPtr        /* dev */

+);

+

+extern _X_EXPORT Bool AccessXFilterPressEvent(

+    DeviceEvent*	/* event */,

+    DeviceIntPtr	/* keybd */

+);

+

+extern _X_EXPORT Bool AccessXFilterReleaseEvent(

+    DeviceEvent*	/* event */,

+    DeviceIntPtr	/* keybd */

+);

+

+extern _X_EXPORT void AccessXCancelRepeatKey(

+    XkbSrvInfoPtr	/* xkbi */,

+    KeyCode		/* key */

+);

+

+extern _X_EXPORT void AccessXComputeCurveFactor(

+    XkbSrvInfoPtr	/* xkbi */,

+    XkbControlsPtr	/* ctrls */

+);

+

+extern _X_EXPORT XkbInterestPtr XkbFindClientResource(

+       DevicePtr	/* inDev */,

+       ClientPtr	/* client */

+);

+

+extern _X_EXPORT XkbInterestPtr XkbAddClientResource(

+       DevicePtr	/* inDev */,

+       ClientPtr	/* client */,

+       XID		/* id */

+);

+

+extern _X_EXPORT int XkbRemoveResourceClient(

+       DevicePtr	/* inDev */,

+       XID		/* id */

+);

+

+extern _X_EXPORT int XkbDDXAccessXBeep(

+    DeviceIntPtr        /* dev */,

+    unsigned int	/* what */,

+    unsigned int	/* which */

+);

+

+extern _X_EXPORT int XkbDDXUsesSoftRepeat(

+    DeviceIntPtr	/* dev */

+);

+

+extern _X_EXPORT void XkbDDXKeybdCtrlProc(

+	DeviceIntPtr	/* dev */,

+	KeybdCtrl *	/* ctrl */

+);

+

+extern _X_EXPORT void XkbDDXChangeControls(

+	DeviceIntPtr	/* dev */,

+	XkbControlsPtr 	/* old */,

+	XkbControlsPtr 	/* new */

+);

+

+extern _X_EXPORT void XkbDDXUpdateDeviceIndicators(

+	DeviceIntPtr		/* dev */,

+	XkbSrvLedInfoPtr	/* sli */,

+	CARD32			/* newState */

+);

+

+extern _X_EXPORT int XkbDDXTerminateServer(

+	DeviceIntPtr	/* dev */,

+	KeyCode		/* key */,

+	XkbAction *	/* act */

+);

+

+extern _X_EXPORT int XkbDDXSwitchScreen(

+	DeviceIntPtr	/* dev */,

+	KeyCode		/* key */,

+	XkbAction *	/* act */

+);

+

+extern _X_EXPORT int XkbDDXPrivate(

+	DeviceIntPtr	/* dev */,

+	KeyCode		/* key */,

+	XkbAction *	/* act */

+);

+

+extern _X_EXPORT void XkbDisableComputedAutoRepeats(

+	DeviceIntPtr 	/* pXDev */,

+	unsigned int	/* key */

+);

+

+extern _X_EXPORT void XkbSetRepeatKeys(

+	DeviceIntPtr 	/* pXDev */,

+	int		/* key */,

+	int	 	/* onoff */

+);

+

+extern _X_EXPORT int XkbLatchModifiers(

+	DeviceIntPtr 	/* pXDev */,

+	CARD8 		/* mask */,

+	CARD8 		/* latches */

+);

+

+extern _X_EXPORT int XkbLatchGroup(

+	DeviceIntPtr  	/* pXDev */,

+	int	  	/* group */

+);

+

+extern _X_EXPORT void XkbClearAllLatchesAndLocks(

+	DeviceIntPtr		/* dev */,

+	XkbSrvInfoPtr		/* xkbi */,

+	Bool			/* genEv */,

+	XkbEventCausePtr	/* cause */

+);

+

+extern _X_EXPORT void	XkbGetRulesDflts(

+        XkbRMLVOSet *           /* rmlvo */

+);

+

+extern _X_EXPORT void   XkbFreeRMLVOSet(

+        XkbRMLVOSet *           /* rmlvo */,

+        Bool                    /* freeRMLVO */

+);

+

+extern _X_EXPORT void	XkbSetRulesDflts(

+        XkbRMLVOSet *           /* rmlvo */

+);

+

+extern _X_EXPORT void	XkbDeleteRulesDflts(

+	void

+);

+

+extern _X_EXPORT int SProcXkbDispatch(

+	ClientPtr		/* client */

+);

+

+extern _X_EXPORT XkbGeometryPtr XkbLookupNamedGeometry(

+	DeviceIntPtr		/* dev */,

+	Atom			/* name */,

+	Bool *			/* shouldFree */

+);

+

+extern _X_EXPORT char *	_XkbDupString(

+	const char *		/* str */

+);

+

+extern _X_EXPORT void	XkbConvertCase(

+	KeySym 			/* sym */,

+	KeySym *		/* lower */,

+	KeySym *		/* upper */

+);

+

+extern _X_EXPORT Status	 XkbChangeKeycodeRange(

+	XkbDescPtr		/* xkb */,

+	int 			/* minKC */,

+	int 			/* maxKC */,

+	XkbChangesPtr		/* changes */

+);

+

+extern _X_EXPORT void XkbFreeSrvLedInfo(

+	XkbSrvLedInfoPtr	/* sli */

+);

+

+extern _X_EXPORT void XkbFreeInfo(

+	XkbSrvInfoPtr		/* xkbi */

+);

+

+extern _X_EXPORT Status XkbChangeTypesOfKey(

+	XkbDescPtr		/* xkb */,

+	int			/* key */,

+	int			/* nGroups */,

+	unsigned int		/* groups */,

+	int *			/* newTypesIn */,

+	XkbMapChangesPtr	/* changes */

+);

+

+extern _X_EXPORT int XkbKeyTypesForCoreSymbols(

+	XkbDescPtr		/* xkb */,

+	int			/* map_width */,

+	KeySym *		/* core_syms */,

+	unsigned int		/* protected */,

+	int *			/* types_inout */,

+	KeySym *		/* xkb_syms_rtrn */

+);

+

+extern _X_EXPORT Bool XkbApplyCompatMapToKey(

+	XkbDescPtr		/* xkb */,

+	KeyCode			/* key */,

+	XkbChangesPtr		/* changes */

+);

+

+extern _X_EXPORT Bool XkbApplyVirtualModChanges(

+	XkbDescPtr		/* xkb */,

+	unsigned int		/* changed */,

+	XkbChangesPtr		/* changes */

+);

+

+extern _X_EXPORT void XkbSendNewKeyboardNotify(

+	DeviceIntPtr		/* kbd */,

+	xkbNewKeyboardNotify *	/* pNKN */

+);

+

+extern Bool XkbCopyKeymap(

+        XkbDescPtr              /* dst */,

+        XkbDescPtr              /* src */);

+

+extern _X_EXPORT Bool XkbCopyDeviceKeymap(

+        DeviceIntPtr            /* dst */,

+        DeviceIntPtr            /* src */);

+

+extern void XkbFilterEvents(

+        ClientPtr               /* pClient */,

+        int                     /* nEvents */,

+        xEvent*                 /* xE */);

+

+extern int XkbGetEffectiveGroup(

+        XkbSrvInfoPtr           /* xkbi */,

+        XkbStatePtr             /* xkbstate */,

+        CARD8                   /* keycode */);

+

+#include "xkbfile.h"

+#include "xkbrules.h"

+

+#define	_XkbListKeycodes	0

+#define	_XkbListTypes		1

+#define	_XkbListCompat		2

+#define	_XkbListSymbols		3

+#define	_XkbListGeometry	4

+#define	_XkbListNumComponents	5

+

+typedef struct _XkbSrvListInfo {

+	int		szPool;

+	int		nPool;

+	char *		pool;

+

+	int		maxRtrn;

+	int		nTotal;

+

+	char *		pattern[_XkbListNumComponents];

+	int		nFound[_XkbListNumComponents];

+} XkbSrvListInfoRec,*XkbSrvListInfoPtr;

+

+extern _X_EXPORT Status	XkbDDXList(

+	DeviceIntPtr		/* dev */,

+	XkbSrvListInfoPtr	/* listing */,

+	ClientPtr		/* client */

+);

+

+extern _X_EXPORT unsigned int XkbDDXLoadKeymapByNames(

+	DeviceIntPtr		/* keybd */,

+	XkbComponentNamesPtr	/* names */,

+	unsigned int		/* want */,

+	unsigned int		/* need */,

+	XkbDescPtr *		/* finfoRtrn */,

+	char *			/* keymapNameRtrn */,

+	int 			/* keymapNameRtrnLen */

+);

+

+extern _X_EXPORT Bool XkbDDXNamesFromRules(

+	DeviceIntPtr		/* keybd */,

+	char *			/* rules */,

+	XkbRF_VarDefsPtr	/* defs */,

+	XkbComponentNamesPtr	/* names */

+);

+

+extern _X_EXPORT XkbDescPtr XkbCompileKeymap(

+        DeviceIntPtr    /* dev */,

+        XkbRMLVOSet *   /* rmlvo */

+);

+

+#endif /* _XKBSRV_H_ */