diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2011-12-09 18:38:53 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-12-13 13:24:57 +1000 |
| commit | adf8a0d62c0643f4c44a3b6d2e3c6c9b02532915 (patch) | |
| tree | 97c45a7d4f73b1c553ee8e188a4b7046f9a77a29 /include | |
| parent | a03fe819506fbcbfcb299d4919d16061603fd4ec (diff) | |
dix: move event filter retrieval helpers to inpututils.c
No functional changes
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/input.h | 1 | ||||
| -rw-r--r-- | include/inpututils.h | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/input.h b/include/input.h index fb24fd5ec..bd12f6829 100644 --- a/include/input.h +++ b/include/input.h @@ -544,7 +544,6 @@ extern _X_EXPORT void FreeInputAttributes(InputAttributes *attrs); extern Mask GetEventMask(DeviceIntPtr dev, xEvent* ev, InputClientsPtr clients); extern Mask GetEventFilter(DeviceIntPtr dev, xEvent *event); extern Bool WindowXI2MaskIsset(DeviceIntPtr dev, WindowPtr win, xEvent* ev); -extern Mask GetXI2EventFilterMask(int evtype); extern int GetXI2MaskByte(XI2Mask *mask, DeviceIntPtr dev, int event_type); void FixUpEventFromWindow(SpritePtr pSprite, xEvent *xE, diff --git a/include/inpututils.h b/include/inpututils.h index 96ad6df4d..5aa60c2c1 100644 --- a/include/inpututils.h +++ b/include/inpututils.h @@ -32,6 +32,8 @@ #include "input.h" #include <X11/extensions/XI2proto.h> +extern Mask filters[MAXDEVICES][128]; + struct _ValuatorMask { int8_t last_bit; /* highest bit set in mask */ uint8_t mask[(MAX_VALUATORS + 7)/8]; @@ -42,6 +44,8 @@ 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); |