frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2009-03-19 20:40:43 +10:00
parent 111ef10375
commit adf21dba76
2 changed files with 53 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
include/dix.h
View File

@ -327,36 +327,36 @@ extern _X_EXPORT WindowPtr GetSpriteWindow(DeviceIntPtr pDev);
extern _X_EXPORT void NoticeEventTime(InternalEvent *ev); extern _X_EXPORT void NoticeEventTime(InternalEvent *ev);
extern _X_EXPORT void EnqueueEvent( extern void EnqueueEvent(
InternalEvent * /* ev */, InternalEvent * /* ev */,
DeviceIntPtr /* device */); DeviceIntPtr /* device */);
extern _X_EXPORT void ActivatePointerGrab( extern void ActivatePointerGrab(
DeviceIntPtr /* mouse */, DeviceIntPtr /* mouse */,
GrabPtr /* grab */, GrabPtr /* grab */,
TimeStamp /* time */, TimeStamp /* time */,
Bool /* autoGrab */); Bool /* autoGrab */);
extern _X_EXPORT void DeactivatePointerGrab( extern void DeactivatePointerGrab(
DeviceIntPtr /* mouse */); DeviceIntPtr /* mouse */);
extern _X_EXPORT void ActivateKeyboardGrab( extern void ActivateKeyboardGrab(
DeviceIntPtr /* keybd */, DeviceIntPtr /* keybd */,
GrabPtr /* grab */, GrabPtr /* grab */,
TimeStamp /* time */, TimeStamp /* time */,
Bool /* passive */); Bool /* passive */);
extern _X_EXPORT void DeactivateKeyboardGrab( extern void DeactivateKeyboardGrab(
DeviceIntPtr /* keybd */); DeviceIntPtr /* keybd */);
extern _X_EXPORT void AllowSome( extern void AllowSome(
ClientPtr /* client */, ClientPtr /* client */,
TimeStamp /* time */, TimeStamp /* time */,
DeviceIntPtr /* thisDev */, DeviceIntPtr /* thisDev */,
int /* newState */, int /* newState */,
Bool /* core */); Bool /* core */);
extern _X_EXPORT void ReleaseActiveGrabs( extern void ReleaseActiveGrabs(
ClientPtr client); ClientPtr client);
extern _X_EXPORT int DeliverEventsToWindow( extern _X_EXPORT int DeliverEventsToWindow(
@ -367,57 +367,57 @@ extern _X_EXPORT int DeliverEventsToWindow(
Mask /* filter */, Mask /* filter */,
GrabPtr /* grab */); GrabPtr /* grab */);
extern _X_EXPORT int DeliverDeviceEvents( extern int DeliverDeviceEvents(
WindowPtr /* pWin */, WindowPtr /* pWin */,
InternalEvent* /* event */, InternalEvent* /* event */,
GrabPtr /* grab */, GrabPtr /* grab */,
WindowPtr /* stopAt */, WindowPtr /* stopAt */,
DeviceIntPtr /* dev */); DeviceIntPtr /* dev */);
extern _X_EXPORT void InitializeSprite( extern void InitializeSprite(
DeviceIntPtr /* pDev */, DeviceIntPtr /* pDev */,
WindowPtr /* pWin */); WindowPtr /* pWin */);
extern _X_EXPORT void UpdateSpriteForScreen( extern void UpdateSpriteForScreen(
DeviceIntPtr /* pDev */, DeviceIntPtr /* pDev */,
ScreenPtr /* pScreen */); ScreenPtr /* pScreen */);
extern _X_EXPORT void WindowHasNewCursor( extern _X_EXPORT void WindowHasNewCursor(
WindowPtr /* pWin */); WindowPtr /* pWin */);
extern _X_EXPORT Bool CheckDeviceGrabs( extern Bool CheckDeviceGrabs(
DeviceIntPtr /* device */, DeviceIntPtr /* device */,
DeviceEvent* /* event */, DeviceEvent* /* event */,
int /* checkFirst */); int /* checkFirst */);
extern _X_EXPORT void DeliverFocusedEvent( extern void DeliverFocusedEvent(
DeviceIntPtr /* keybd */, DeviceIntPtr /* keybd */,
InternalEvent* /* event */, InternalEvent* /* event */,
WindowPtr /* window */); WindowPtr /* window */);
extern _X_EXPORT void DeliverGrabbedEvent( extern void DeliverGrabbedEvent(
InternalEvent* /* event */, InternalEvent* /* event */,
DeviceIntPtr /* thisDev */, DeviceIntPtr /* thisDev */,
Bool /* deactivateGrab */); Bool /* deactivateGrab */);
extern _X_EXPORT void FixKeyState( extern void FixKeyState(
DeviceEvent* /* event */, DeviceEvent* /* event */,
DeviceIntPtr /* keybd */); DeviceIntPtr /* keybd */);
extern _X_EXPORT void RecalculateDeliverableEvents( extern void RecalculateDeliverableEvents(
WindowPtr /* pWin */); WindowPtr /* pWin */);
extern _X_EXPORT int OtherClientGone( extern _X_EXPORT int OtherClientGone(
pointer /* value */, pointer /* value */,
XID /* id */); XID /* id */);
extern _X_EXPORT void DoFocusEvents( extern void DoFocusEvents(
DeviceIntPtr /* dev */, DeviceIntPtr /* dev */,
WindowPtr /* fromWin */, WindowPtr /* fromWin */,
WindowPtr /* toWin */, WindowPtr /* toWin */,
int /* mode */); int /* mode */);
extern _X_EXPORT int SetInputFocus( extern int SetInputFocus(
ClientPtr /* client */, ClientPtr /* client */,
DeviceIntPtr /* dev */, DeviceIntPtr /* dev */,
Window /* focusID */, Window /* focusID */,
@ -425,7 +425,7 @@ extern _X_EXPORT int SetInputFocus(
Time /* ctime */, Time /* ctime */,
Bool /* followOK */); Bool /* followOK */);
extern _X_EXPORT int GrabDevice( extern int GrabDevice(
ClientPtr /* client */, ClientPtr /* client */,
DeviceIntPtr /* dev */, DeviceIntPtr /* dev */,
unsigned /* this_mode */, unsigned /* this_mode */,
@ -439,16 +439,16 @@ extern _X_EXPORT int GrabDevice(
Window /* confineToWin */, Window /* confineToWin */,
CARD8 * /* status */); 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 */, WindowPtr /* pWin */,
Bool /* freeResources */); Bool /* freeResources */);
extern _X_EXPORT Mask EventMaskForClient( extern Mask EventMaskForClient(
WindowPtr /* pWin */, WindowPtr /* pWin */,
ClientPtr /* client */); ClientPtr /* client */);
@ -460,8 +460,7 @@ extern _X_EXPORT int DeliverEvents(
int /*count*/, int /*count*/,
WindowPtr /*otherParent*/); WindowPtr /*otherParent*/);
extern _X_EXPORT Bool extern Bool CheckMotion(
CheckMotion(
DeviceEvent* /* ev */, DeviceEvent* /* ev */,
DeviceIntPtr /* pDev */); DeviceIntPtr /* pDev */);
@ -481,7 +480,7 @@ extern _X_EXPORT int TryClientEvents(
extern _X_EXPORT void WindowsRestructured(void); extern _X_EXPORT void WindowsRestructured(void);
extern _X_EXPORT Bool SetClientPointer( extern Bool SetClientPointer(
ClientPtr /* client */, ClientPtr /* client */,
ClientPtr /* setter */, ClientPtr /* setter */,
DeviceIntPtr /* device */); DeviceIntPtr /* device */);
@ -492,7 +491,7 @@ extern _X_EXPORT DeviceIntPtr PickPointer(
extern _X_EXPORT DeviceIntPtr PickKeyboard( extern _X_EXPORT DeviceIntPtr PickKeyboard(
ClientPtr /* client */); ClientPtr /* client */);
extern _X_EXPORT Bool IsInterferingGrab( extern Bool IsInterferingGrab(
ClientPtr /* client */, ClientPtr /* client */,
DeviceIntPtr /* dev */, DeviceIntPtr /* dev */,
xEvent* /* events */); xEvent* /* events */);
@ -576,11 +575,11 @@ typedef struct {
int count; int count;
} DeviceEventInfoRec; } DeviceEventInfoRec;
extern _X_EXPORT int XItoCoreType(int xi_type); extern int XItoCoreType(int xi_type);
extern _X_EXPORT Bool DevHasCursor(DeviceIntPtr pDev); extern Bool DevHasCursor(DeviceIntPtr pDev);
extern _X_EXPORT Bool IsPointerDevice( DeviceIntPtr dev); extern Bool IsPointerDevice( DeviceIntPtr dev);
extern _X_EXPORT Bool IsKeyboardDevice(DeviceIntPtr dev); extern Bool IsKeyboardDevice(DeviceIntPtr dev);
extern _X_EXPORT Bool IsPointerEvent(InternalEvent* event); extern Bool IsPointerEvent(InternalEvent *event);
/* /*
* These are deprecated compatibility functions and will be removed soon! * These are deprecated compatibility functions and will be removed soon!

46
include/input.h
View File

@ -115,8 +115,8 @@ typedef struct _EventList {
} EventList, *EventListPtr; } EventList, *EventListPtr;
/* The DIX stores incoming input events in this list */ /* The DIX stores incoming input events in this list */
extern _X_EXPORT EventListPtr InputEventList; extern EventListPtr InputEventList;
extern _X_EXPORT int InputEventListLen; extern int InputEventListLen;
typedef int (*DeviceProc)( typedef int (*DeviceProc)(
DeviceIntPtr /*device*/, 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 void set_key_up(DeviceIntPtr pDev, int key_code, int type);
extern int key_is_down(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( extern _X_EXPORT DeviceIntPtr AddInputDevice(
ClientPtr /*client*/, ClientPtr /*client*/,
@ -235,21 +235,21 @@ extern _X_EXPORT Bool ActivateDevice(
extern _X_EXPORT Bool DisableDevice( extern _X_EXPORT Bool DisableDevice(
DeviceIntPtr /*device*/); 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( extern _X_EXPORT int RemoveDevice(
DeviceIntPtr /*dev*/); DeviceIntPtr /*dev*/);
extern _X_EXPORT int NumMotionEvents(void); extern _X_EXPORT int NumMotionEvents(void);
extern _X_EXPORT void RegisterPointerDevice( extern void RegisterPointerDevice(
DeviceIntPtr /*device*/); DeviceIntPtr /*device*/);
extern _X_EXPORT void RegisterKeyboardDevice( extern void RegisterKeyboardDevice(
DeviceIntPtr /*device*/); DeviceIntPtr /*device*/);
extern _X_EXPORT int dixLookupDevice( extern _X_EXPORT int dixLookupDevice(
@ -362,31 +362,31 @@ extern _X_EXPORT int ApplyPointerMapping(
int /* len */, int /* len */,
ClientPtr /* client */); ClientPtr /* client */);
extern _X_EXPORT Bool BadDeviceMap( extern Bool BadDeviceMap(
BYTE* /*buff*/, BYTE* /*buff*/,
int /*length*/, int /*length*/,
unsigned /*low*/, unsigned /*low*/,
unsigned /*high*/, unsigned /*high*/,
XID* /*errval*/); XID* /*errval*/);
extern _X_EXPORT void NoteLedState( extern void NoteLedState(
DeviceIntPtr /*keybd*/, DeviceIntPtr /*keybd*/,
int /*led*/, int /*led*/,
Bool /*on*/); Bool /*on*/);
extern _X_EXPORT void MaybeStopHint( extern void MaybeStopHint(
DeviceIntPtr /*device*/, DeviceIntPtr /*device*/,
ClientPtr /*client*/); ClientPtr /*client*/);
extern _X_EXPORT void ProcessPointerEvent( extern void ProcessPointerEvent(
InternalEvent* /* ev */, InternalEvent* /* ev */,
DeviceIntPtr /*mouse*/); DeviceIntPtr /*mouse*/);
extern _X_EXPORT void ProcessKeyboardEvent( extern void ProcessKeyboardEvent(
InternalEvent* /*ev*/, InternalEvent* /*ev*/,
DeviceIntPtr /*keybd*/); DeviceIntPtr /*keybd*/);
extern _X_EXPORT Bool LegalModifier( extern Bool LegalModifier(
unsigned int /*key*/, unsigned int /*key*/,
DeviceIntPtr /*pDev*/); DeviceIntPtr /*pDev*/);
@ -405,10 +405,10 @@ extern _X_EXPORT void SetMinimumEventSize(EventListPtr list,
int min_size); int min_size);
extern _X_EXPORT void FreeEventList(EventListPtr list, int num_events); 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 master,
DeviceIntPtr slave); DeviceIntPtr slave);
extern _X_EXPORT int GetPointerEvents( extern int GetPointerEvents(
EventListPtr events, EventListPtr events,
DeviceIntPtr pDev, DeviceIntPtr pDev,
int type, int type,
@ -418,13 +418,13 @@ extern _X_EXPORT int GetPointerEvents(
int num_valuators, int num_valuators,
int *valuators); int *valuators);
extern _X_EXPORT int GetKeyboardEvents( extern int GetKeyboardEvents(
EventListPtr events, EventListPtr events,
DeviceIntPtr pDev, DeviceIntPtr pDev,
int type, int type,
int key_code); int key_code);
extern _X_EXPORT int GetKeyboardValuatorEvents( extern int GetKeyboardValuatorEvents(
EventListPtr events, EventListPtr events,
DeviceIntPtr pDev, DeviceIntPtr pDev,
int type, int type,
@ -433,7 +433,7 @@ extern _X_EXPORT int GetKeyboardValuatorEvents(
int num_valuator, int num_valuator,
int *valuators); int *valuators);
extern _X_EXPORT int GetProximityEvents( extern int GetProximityEvents(
EventListPtr events, EventListPtr events,
DeviceIntPtr pDev, DeviceIntPtr pDev,
int type, int type,
@ -441,7 +441,7 @@ extern _X_EXPORT int GetProximityEvents(
int num_valuators, int num_valuators,
int *valuators); int *valuators);
extern _X_EXPORT void PostSyntheticMotion( extern void PostSyntheticMotion(
DeviceIntPtr pDev, DeviceIntPtr pDev,
int x, int x,
int y, int y,
@ -462,17 +462,17 @@ extern _X_EXPORT int GetMotionHistory(
ScreenPtr pScreen, ScreenPtr pScreen,
BOOL core); BOOL core);
extern _X_EXPORT int AttachDevice(ClientPtr client, extern int AttachDevice(ClientPtr client,
DeviceIntPtr slave, DeviceIntPtr slave,
DeviceIntPtr master); DeviceIntPtr master);
extern _X_EXPORT DeviceIntPtr GetPairedDevice(DeviceIntPtr kbd); extern _X_EXPORT DeviceIntPtr GetPairedDevice(DeviceIntPtr kbd);
extern _X_EXPORT int AllocMasterDevice(ClientPtr client, extern int AllocMasterDevice(ClientPtr client,
char* name, char* name,
DeviceIntPtr* ptr, DeviceIntPtr* ptr,
DeviceIntPtr* keybd); DeviceIntPtr* keybd);
extern _X_EXPORT void DeepCopyDeviceClasses(DeviceIntPtr from, extern void DeepCopyDeviceClasses(DeviceIntPtr from,
DeviceIntPtr to); DeviceIntPtr to);
/* Helper functions. */ /* Helper functions. */