diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-17 19:03:47 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-17 19:03:47 +0000 |
| commit | c57959ad6a4c0f5329762f401fd7871ffb2ee90c (patch) | |
| tree | f223828f827382311611edf114ddd0c42cb3b23f /include/input.h | |
| parent | 9508a382f8a9f241dab097d921b6d290c1c3a776 (diff) | |
merge XFree86 4.3.0.1 to -CURRENT
Diffstat (limited to 'include/input.h')
| -rw-r--r-- | include/input.h | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/include/input.h b/include/input.h index 161af2d63..e34098f89 100644 --- a/include/input.h +++ b/include/input.h @@ -45,6 +45,8 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +/* $XFree86: xc/programs/Xserver/include/input.h,v 3.7 2001/12/14 19:59:54 dawes Exp $ */ + #ifndef INPUT_H #define INPUT_H @@ -152,6 +154,7 @@ typedef struct { extern KeybdCtrl defaultKeyboardControl; extern PtrCtrl defaultPointerControl; +#undef AddInputDevice extern DevicePtr AddInputDevice( #if NeedFunctionPrototypes DeviceProc /*deviceProc*/, @@ -159,6 +162,16 @@ extern DevicePtr AddInputDevice( #endif ); +#define AddInputDevice(deviceProc, autoStart) \ + _AddInputDevice(deviceProc, autoStart) + +extern DeviceIntPtr _AddInputDevice( +#if NeedFunctionPrototypes + DeviceProc /*deviceProc*/, + Bool /*autoStart*/ +#endif +); + extern Bool EnableDevice( #if NeedFunctionPrototypes DeviceIntPtr /*device*/ @@ -183,24 +196,50 @@ extern void CloseDownDevices( #endif ); +extern void RemoveDevice( +#if NeedFunctionPrototypes + DeviceIntPtr /*dev*/ +#endif +); + extern int NumMotionEvents( #if NeedFunctionPrototypes void #endif ); +#undef RegisterPointerDevice extern void RegisterPointerDevice( #if NeedFunctionPrototypes DevicePtr /*device*/ #endif ); +#define RegisterPointerDevice(device) \ + _RegisterPointerDevice(device) + +extern void _RegisterPointerDevice( +#if NeedFunctionPrototypes + DeviceIntPtr /*device*/ +#endif +); + +#undef RegisterKeyboardDevice extern void RegisterKeyboardDevice( #if NeedFunctionPrototypes DevicePtr /*device*/ #endif ); +#define RegisterKeyboardDevice(device) \ + _RegisterKeyboardDevice(device) + +extern void _RegisterKeyboardDevice( +#if NeedFunctionPrototypes + DeviceIntPtr /*device*/ +#endif +); + extern DevicePtr LookupKeyboardDevice( #if NeedFunctionPrototypes void |