diff options
| author | Peter Hutterer <peter.hutterer@redhat.com> | 2008-10-14 16:21:00 +1030 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@redhat.com> | 2008-10-14 17:18:07 +1030 |
| commit | 39263dc65d5240f74fd5f1b0ec5bdf53a007d5e9 (patch) | |
| tree | 26292bb9ef02f9ea000e617ae0aab0328b1b8b7e /src/evdev.h | |
| parent | Rename DragLockInit to DragLockPreInit, remove superfluous "return". (diff) | |
| download | xf86-input-evdev-39263dc65d5240f74fd5f1b0ec5bdf53a007d5e9.tar.gz xf86-input-evdev-39263dc65d5240f74fd5f1b0ec5bdf53a007d5e9.tar.bz2 xf86-input-evdev-39263dc65d5240f74fd5f1b0ec5bdf53a007d5e9.zip | |
Tidy up evdev.h
This includes shuffling some functions around so we don't need the prototypes
in evdev.h.
(cherry picked from commit 0405f7b17fb0ce5cadcc6c5aa6eeb61bdacdf9cd)
Diffstat (limited to 'src/evdev.h')
| -rw-r--r-- | src/evdev.h | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/src/evdev.h b/src/evdev.h index c071971..ea4cbc1 100644 --- a/src/evdev.h +++ b/src/evdev.h @@ -120,6 +120,8 @@ typedef struct { struct input_absinfo absinfo[ABS_MAX]; } EvdevRec, *EvdevPtr; +unsigned int EvdevUtilButtonEventToButtonNumber(int code); + /* Middle Button emulation */ int EvdevMBEmuTimer(InputInfoPtr); BOOL EvdevMBEmuFilterEvent(InputInfoPtr, int, BOOL); @@ -129,19 +131,6 @@ void EvdevMBEmuPreInit(InputInfoPtr); void EvdevMBEmuFinalize(InputInfoPtr); void EvdevMBEmuEnable(InputInfoPtr, BOOL); -unsigned int EvdevUtilButtonEventToButtonNumber(int code); - -#ifdef HAVE_PROPERTIES -void EvdevMBEmuInitProperty(DeviceIntPtr); -int EvdevMBEmuSetProperty(DeviceIntPtr, Atom, XIPropertyValuePtr, BOOL); - -void EvdevWheelEmuInitProperty(DeviceIntPtr); -int EvdevWheelEmuSetProperty(DeviceIntPtr, Atom, XIPropertyValuePtr, BOOL); - -void EvdevDragLockInitProperty(DeviceIntPtr); -int EvdevDragLockSetProperty(DeviceIntPtr, Atom, XIPropertyValuePtr, BOOL); -#endif - /* Mouse Wheel emulation */ void EvdevWheelEmuPreInit(InputInfoPtr pInfo); BOOL EvdevWheelEmuFilterButton(InputInfoPtr pInfo, unsigned int button, int value); @@ -150,4 +139,10 @@ BOOL EvdevWheelEmuFilterMotion(InputInfoPtr pInfo, struct input_event *pEv); /* Draglock code */ void EvdevDragLockPreInit(InputInfoPtr pInfo); BOOL EvdevDragLockFilterEvent(InputInfoPtr pInfo, unsigned int button, int value); + +#ifdef HAVE_PROPERTIES +void EvdevMBEmuInitProperty(DeviceIntPtr); +void EvdevWheelEmuInitProperty(DeviceIntPtr); +void EvdevDragLockInitProperty(DeviceIntPtr); +#endif #endif |