diff options
| author | marha <marha@users.sourceforge.net> | 2011-12-16 20:49:54 +0100 |
|---|---|---|
| committer | Marc Haesen <marc@hc-consult.be> | 2011-12-16 20:46:08 +0100 |
| commit | 1ae4005bfe3690b34ec40e33918b3e24468d47e1 (patch) | |
| tree | 451bee4796d3058f90af4e66f2cfbdfbe6c77bfe /xorg-server/include/inpututils.h | |
| parent | 64718ba8bdcecd8d736a48239847b1f9aadd40ea (diff) | |
| parent | 47913e82955ec8e2b1ba4d4b145497dede9163b5 (diff) | |
| download | vcxsrv-1ae4005bfe3690b34ec40e33918b3e24468d47e1.tar.gz vcxsrv-1ae4005bfe3690b34ec40e33918b3e24468d47e1.tar.bz2 vcxsrv-1ae4005bfe3690b34ec40e33918b3e24468d47e1.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/dix/dispatch.c
xorg-server/dix/registry.c
xorg-server/include/resource.h
xorg-server/os/access.c
xorg-server/os/auth.c
Diffstat (limited to 'xorg-server/include/inpututils.h')
| -rw-r--r-- | xorg-server/include/inpututils.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/xorg-server/include/inpututils.h b/xorg-server/include/inpututils.h index 5f9dfecc3..9e22c5a28 100644 --- a/xorg-server/include/inpututils.h +++ b/xorg-server/include/inpututils.h @@ -32,6 +32,8 @@ #include "input.h" #include <X11/extensions/XI2proto.h> +extern Mask event_filters[MAXDEVICES][MAXEVENTS]; + struct _ValuatorMask { int8_t last_bit; /* highest bit set in mask */ uint8_t mask[(MAX_VALUATORS + 7)/8]; @@ -40,6 +42,10 @@ struct _ValuatorMask { extern void verify_internal_event(const InternalEvent *ev); extern void init_device_event(DeviceEvent *event, DeviceIntPtr dev, Time ms); +extern int event_get_corestate(DeviceIntPtr mouse, DeviceIntPtr kbd); +extern void event_set_state(DeviceIntPtr mouse, DeviceIntPtr kbd, DeviceEvent *event); +extern Mask event_get_filter_from_type(DeviceIntPtr dev, int evtype); +extern Mask event_get_filter_from_xi2type(int evtype); FP3232 double_to_fp3232(double in); FP1616 double_to_fp1616(double in); |