diff options
| author | Ian Romanick <idr@us.ibm.com> | 2007-06-18 16:51:13 -0700 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2007-06-18 16:51:13 -0700 |
| commit | ab7a6d860d4a275a810a64b1ba7b13726ed10575 (patch) | |
| tree | 1198628dab08c3989dff073b4bbe6920a1feca59 /hw/xfree86/common/xf86Xinput.h | |
| parent | e9130b8bac73a0843d5ff6b2216eccfb3e094a48 (diff) | |
| parent | 2e7fef7d0837939e822c40b6ac77e7f0e66d57bd (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:
hw/xfree86/os-support/bus/Pci.c
hw/xfree86/os-support/bus/linuxPci.c
Diffstat (limited to 'hw/xfree86/common/xf86Xinput.h')
| -rw-r--r-- | hw/xfree86/common/xf86Xinput.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/hw/xfree86/common/xf86Xinput.h b/hw/xfree86/common/xf86Xinput.h index b2bc8dec1..f882b2608 100644 --- a/hw/xfree86/common/xf86Xinput.h +++ b/hw/xfree86/common/xf86Xinput.h @@ -163,6 +163,8 @@ extern InputInfoPtr xf86InputDevs; void InitExtInput(void); void xf86PostMotionEvent(DeviceIntPtr device, int is_absolute, int first_valuator, int num_valuators, ...); +void xf86PostMotionEventP(DeviceIntPtr device, int is_absolute, + int first_valuator, int num_valuators, int *valuators); void xf86PostProximityEvent(DeviceIntPtr device, int is_in, int first_valuator, int num_valuators, ...); void xf86PostButtonEvent(DeviceIntPtr device, int is_absolute, int button, @@ -187,6 +189,8 @@ void xf86InitValuatorAxisStruct(DeviceIntPtr dev, int axnum, int minval, void xf86InitValuatorDefaults(DeviceIntPtr dev, int axnum); void xf86AddEnabledDevice(InputInfoPtr pInfo); void xf86RemoveEnabledDevice(InputInfoPtr pInfo); +void xf86DisableDevice(DeviceIntPtr dev, Bool panic); +void xf86EnableDevice(DeviceIntPtr dev); /* xf86Helper.c */ void xf86AddInputDriver(InputDriverPtr driver, pointer module, int flags); @@ -204,6 +208,7 @@ int xf86GetMotionEvents(DeviceIntPtr dev, xTimecoord *buff, void xf86CollectInputOptions(InputInfoPtr pInfo, const char **defaultOpts, pointer extraOpts); + /* Legacy hatred */ #define SendCoreEvents 59 #define DontSendCoreEvents 60 |