include: un-export a bunch of server-only functions.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

2 files changed, 53 insertions, 54 deletions

diff --git a/include/dix.h b/include/dix.h
index 87f49e851..14d6843e3 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -327,36 +327,36 @@ extern _X_EXPORT WindowPtr GetSpriteWindow(DeviceIntPtr pDev);
 
 extern _X_EXPORT void NoticeEventTime(InternalEvent *ev);
 
-extern _X_EXPORT void EnqueueEvent(
+extern void EnqueueEvent(
     InternalEvent * /* ev */,
     DeviceIntPtr  /* device */);
 
-extern _X_EXPORT void ActivatePointerGrab(
+extern void ActivatePointerGrab(
     DeviceIntPtr /* mouse */,
     GrabPtr /* grab */,
     TimeStamp /* time */,
     Bool /* autoGrab */);
 
-extern _X_EXPORT void DeactivatePointerGrab(
+extern void DeactivatePointerGrab(
     DeviceIntPtr /* mouse */);
 
-extern _X_EXPORT void ActivateKeyboardGrab(
+extern void ActivateKeyboardGrab(
     DeviceIntPtr /* keybd */,
     GrabPtr /* grab */,
     TimeStamp /* time */,
     Bool /* passive */);
 
-extern _X_EXPORT void DeactivateKeyboardGrab(
+extern void DeactivateKeyboardGrab(
     DeviceIntPtr /* keybd */);
 
-extern _X_EXPORT void AllowSome(
+extern void AllowSome(
     ClientPtr	/* client */,
     TimeStamp /* time */,
     DeviceIntPtr /* thisDev */,
     int /* newState */,
     Bool /* core */);
 
-extern _X_EXPORT void ReleaseActiveGrabs(
+extern void ReleaseActiveGrabs(
     ClientPtr client);
 
 extern _X_EXPORT int DeliverEventsToWindow(
@@ -367,57 +367,57 @@ extern _X_EXPORT int DeliverEventsToWindow(
     Mask /* filter */,
     GrabPtr /* grab */);
 
-extern _X_EXPORT int DeliverDeviceEvents(
+extern int DeliverDeviceEvents(
     WindowPtr /* pWin */,
     InternalEvent* /* event */,
     GrabPtr /* grab */,
     WindowPtr /* stopAt */,
     DeviceIntPtr /* dev */);
 
-extern _X_EXPORT void InitializeSprite(
+extern void InitializeSprite(
     DeviceIntPtr /* pDev */,
     WindowPtr    /* pWin */);
 
-extern _X_EXPORT void UpdateSpriteForScreen(
+extern void UpdateSpriteForScreen(
     DeviceIntPtr /* pDev */,
     ScreenPtr /* pScreen */);
 
 extern _X_EXPORT void WindowHasNewCursor(
     WindowPtr /* pWin */);
 
-extern _X_EXPORT Bool CheckDeviceGrabs(
+extern Bool CheckDeviceGrabs(
     DeviceIntPtr /* device */,
     DeviceEvent* /* event */,
     int /* checkFirst */);
 
-extern _X_EXPORT void DeliverFocusedEvent(
+extern void DeliverFocusedEvent(
     DeviceIntPtr /* keybd */,
     InternalEvent* /* event */,
     WindowPtr /* window */);
 
-extern _X_EXPORT void DeliverGrabbedEvent(
+extern void DeliverGrabbedEvent(
     InternalEvent* /* event */,
     DeviceIntPtr /* thisDev */,
     Bool /* deactivateGrab */);
 
-extern _X_EXPORT void FixKeyState(
+extern void FixKeyState(
     DeviceEvent* /* event */,
     DeviceIntPtr /* keybd */);
 
-extern _X_EXPORT void RecalculateDeliverableEvents(
+extern void RecalculateDeliverableEvents(
     WindowPtr /* pWin */);
 
 extern _X_EXPORT int OtherClientGone(
     pointer /* value */,
     XID /* id */);
 
-extern _X_EXPORT void DoFocusEvents(
+extern void DoFocusEvents(
     DeviceIntPtr /* dev */,
     WindowPtr /* fromWin */,
     WindowPtr /* toWin */,
     int /* mode */);
 
-extern _X_EXPORT int SetInputFocus(
+extern int SetInputFocus(
     ClientPtr /* client */,
     DeviceIntPtr /* dev */,
     Window /* focusID */,
@@ -425,7 +425,7 @@ extern _X_EXPORT int SetInputFocus(
     Time /* ctime */,
     Bool /* followOK */);
 
-extern _X_EXPORT int GrabDevice(
+extern int GrabDevice(
     ClientPtr /* client */,
     DeviceIntPtr /* dev */,
     unsigned /* this_mode */,
@@ -439,16 +439,16 @@ extern _X_EXPORT int GrabDevice(
     Window /* confineToWin */,
     CARD8 * /* status */);
 
-extern _X_EXPORT void InitEvents(void);
+extern void InitEvents(void);
 
-extern _X_EXPORT void CloseDownEvents(void);
+extern void CloseDownEvents(void);
 
-extern _X_EXPORT void DeleteWindowFromAnyEvents(
+extern void DeleteWindowFromAnyEvents(
     WindowPtr	/* pWin */,
     Bool /* freeResources */);
 
 
-extern _X_EXPORT Mask EventMaskForClient(
+extern Mask EventMaskForClient(
     WindowPtr /* pWin */,
     ClientPtr /* client */);
 
@@ -460,8 +460,7 @@ extern _X_EXPORT int DeliverEvents(
     int /*count*/,
     WindowPtr /*otherParent*/);
 
-extern _X_EXPORT Bool
-CheckMotion(
+extern Bool CheckMotion(
     DeviceEvent* /* ev */,
     DeviceIntPtr /* pDev */);
 
@@ -481,7 +480,7 @@ extern _X_EXPORT int TryClientEvents(
 
 extern _X_EXPORT void WindowsRestructured(void);
 
-extern _X_EXPORT Bool SetClientPointer(
+extern Bool SetClientPointer(
         ClientPtr /* client */, 
         ClientPtr /* setter */, 
         DeviceIntPtr /* device */);
@@ -492,7 +491,7 @@ extern _X_EXPORT DeviceIntPtr PickPointer(
 extern _X_EXPORT DeviceIntPtr PickKeyboard(
     ClientPtr /* client */);
 
-extern _X_EXPORT Bool IsInterferingGrab(
+extern Bool IsInterferingGrab(
         ClientPtr /* client */,
         DeviceIntPtr /* dev */,
         xEvent* /* events */);
@@ -576,11 +575,11 @@ typedef struct {
     int count;
 } DeviceEventInfoRec;
 
-extern _X_EXPORT int XItoCoreType(int xi_type);
-extern _X_EXPORT Bool DevHasCursor(DeviceIntPtr pDev);
-extern _X_EXPORT Bool IsPointerDevice( DeviceIntPtr dev);
-extern _X_EXPORT Bool IsKeyboardDevice(DeviceIntPtr dev);
-extern _X_EXPORT Bool IsPointerEvent(InternalEvent* event);
+extern int XItoCoreType(int xi_type);
+extern Bool DevHasCursor(DeviceIntPtr pDev);
+extern Bool IsPointerDevice( DeviceIntPtr dev);
+extern Bool IsKeyboardDevice(DeviceIntPtr dev);
+extern Bool IsPointerEvent(InternalEvent *event);
 
 /*
  * These are deprecated compatibility functions and will be removed soon!
diff --git a/include/input.h b/include/input.h
index 3140c3fce..baac05448 100644
--- a/include/input.h
+++ b/include/input.h
@@ -115,8 +115,8 @@ typedef struct _EventList {
 } EventList, *EventListPtr;
 
 /* The DIX stores incoming input events in this list */
-extern _X_EXPORT EventListPtr InputEventList;
-extern _X_EXPORT int InputEventListLen;
+extern EventListPtr InputEventList;
+extern int InputEventListLen;
 
 typedef int (*DeviceProc)(
     DeviceIntPtr /*device*/,
@@ -219,7 +219,7 @@ extern void set_key_down(DeviceIntPtr pDev, int key_code, int type);
 extern void set_key_up(DeviceIntPtr pDev, int key_code, int type);
 extern int key_is_down(DeviceIntPtr pDev, int key_code, int type);
 
-extern _X_EXPORT void InitCoreDevices(void);
+extern void InitCoreDevices(void);
 
 extern _X_EXPORT DeviceIntPtr AddInputDevice(
     ClientPtr /*client*/,
@@ -235,21 +235,21 @@ extern _X_EXPORT Bool ActivateDevice(
 extern _X_EXPORT Bool DisableDevice(
     DeviceIntPtr /*device*/);
 
-extern _X_EXPORT int InitAndStartDevices(void);
+extern int InitAndStartDevices(void);
 
-extern _X_EXPORT void CloseDownDevices(void);
+extern void CloseDownDevices(void);
 
-extern _X_EXPORT void UndisplayDevices(void);
+extern void UndisplayDevices(void);
 
 extern _X_EXPORT int RemoveDevice(
     DeviceIntPtr /*dev*/);
 
 extern _X_EXPORT int NumMotionEvents(void);
 
-extern _X_EXPORT void RegisterPointerDevice(
+extern void RegisterPointerDevice(
     DeviceIntPtr /*device*/);
 
-extern _X_EXPORT void RegisterKeyboardDevice(
+extern void RegisterKeyboardDevice(
     DeviceIntPtr /*device*/);
 
 extern _X_EXPORT int dixLookupDevice(
@@ -362,31 +362,31 @@ extern _X_EXPORT int ApplyPointerMapping(
     int          /* len */,
     ClientPtr	/* client */);
 
-extern _X_EXPORT Bool BadDeviceMap(
+extern Bool BadDeviceMap(
     BYTE* /*buff*/,
     int /*length*/,
     unsigned /*low*/,
     unsigned /*high*/,
     XID* /*errval*/);
 
-extern _X_EXPORT void NoteLedState(
+extern void NoteLedState(
     DeviceIntPtr /*keybd*/,
     int /*led*/,
     Bool /*on*/);
 
-extern _X_EXPORT void MaybeStopHint(
+extern void MaybeStopHint(
     DeviceIntPtr /*device*/,
     ClientPtr /*client*/);
 
-extern _X_EXPORT void ProcessPointerEvent(
+extern void ProcessPointerEvent(
     InternalEvent* /* ev */,
     DeviceIntPtr /*mouse*/);
 
-extern _X_EXPORT void ProcessKeyboardEvent(
+extern void ProcessKeyboardEvent(
     InternalEvent* /*ev*/,
     DeviceIntPtr   /*keybd*/);
 
-extern _X_EXPORT Bool LegalModifier(
+extern Bool LegalModifier(
     unsigned int /*key*/, 
     DeviceIntPtr /*pDev*/);
 
@@ -405,10 +405,10 @@ extern _X_EXPORT void SetMinimumEventSize(EventListPtr list,
                                 int min_size);
 extern _X_EXPORT void FreeEventList(EventListPtr list, int num_events);
 
-extern _X_EXPORT void CreateClassesChangedEvent(EventListPtr event,
+extern void CreateClassesChangedEvent(EventListPtr event,
                                       DeviceIntPtr master,
                                       DeviceIntPtr slave);
-extern _X_EXPORT int GetPointerEvents(
+extern int GetPointerEvents(
     EventListPtr events,
     DeviceIntPtr pDev,
     int type,
@@ -418,13 +418,13 @@ extern _X_EXPORT int GetPointerEvents(
     int num_valuators,
     int *valuators);
 
-extern _X_EXPORT int GetKeyboardEvents(
+extern int GetKeyboardEvents(
     EventListPtr events,
     DeviceIntPtr pDev,
     int type,
     int key_code);
 
-extern _X_EXPORT int GetKeyboardValuatorEvents(
+extern int GetKeyboardValuatorEvents(
     EventListPtr events,
     DeviceIntPtr pDev,
     int type,
@@ -433,7 +433,7 @@ extern _X_EXPORT int GetKeyboardValuatorEvents(
     int num_valuator,
     int *valuators);
 
-extern _X_EXPORT int GetProximityEvents(
+extern int GetProximityEvents(
     EventListPtr events,
     DeviceIntPtr pDev,
     int type,
@@ -441,7 +441,7 @@ extern _X_EXPORT int GetProximityEvents(
     int num_valuators,
     int *valuators);
 
-extern _X_EXPORT void PostSyntheticMotion(
+extern void PostSyntheticMotion(
     DeviceIntPtr pDev,
     int x,
     int y,
@@ -462,17 +462,17 @@ extern _X_EXPORT int GetMotionHistory(
     ScreenPtr pScreen,
     BOOL core);
 
-extern _X_EXPORT int AttachDevice(ClientPtr client,
+extern int AttachDevice(ClientPtr client,
                         DeviceIntPtr slave,
                         DeviceIntPtr master);
 
 extern _X_EXPORT DeviceIntPtr GetPairedDevice(DeviceIntPtr kbd);
 
-extern _X_EXPORT int AllocMasterDevice(ClientPtr client,
+extern int AllocMasterDevice(ClientPtr client,
                              char* name,
                              DeviceIntPtr* ptr,
                              DeviceIntPtr* keybd);
-extern _X_EXPORT void DeepCopyDeviceClasses(DeviceIntPtr from,
+extern void DeepCopyDeviceClasses(DeviceIntPtr from,
                                   DeviceIntPtr to);
 
 /* Helper functions. */