diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2011-12-09 18:02:49 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-12-13 13:24:57 +1000 |
| commit | a03fe819506fbcbfcb299d4919d16061603fd4ec (patch) | |
| tree | 0bfcfbaabe4577f2a6862ec3c5af649476bb2c8f | |
| parent | 10a8c428fac0d4ff8f8a3e3487c13dd349d27ed7 (diff) | |
dix: switch EventIsDeliverable to take the event type only
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>
| -rw-r--r-- | dix/events.c | 12 | ||||
| -rw-r--r-- | include/input.h | 3 |
2 files changed, 7 insertions, 8 deletions
diff --git a/dix/events.c b/dix/events.c index 086f438fd..e98f7b2aa 100644 --- a/dix/events.c +++ b/dix/events.c @@ -2532,27 +2532,27 @@ FixUpEventFromWindow( * client. * * @param[in] dev The device this event is being sent for. - * @param[in] event The event that is to be sent. + * @param[in] evtype The event type of the event that is to be sent. * @param[in] win The current event window. * * @return Bitmask of ::EVENT_XI2_MASK, ::EVENT_XI1_MASK, ::EVENT_CORE_MASK, and * ::EVENT_DONT_PROPAGATE_MASK. */ int -EventIsDeliverable(DeviceIntPtr dev, InternalEvent* event, WindowPtr win) +EventIsDeliverable(DeviceIntPtr dev, int evtype, WindowPtr win) { int rc = 0; int filter = 0; int type; OtherInputMasks *inputMasks = wOtherInputMasks(win); - if ((type = GetXI2Type(event->any.type)) != 0) + if ((type = GetXI2Type(evtype)) != 0) { if (inputMasks && xi2mask_isset(inputMasks->xi2mask, dev, type)) rc |= EVENT_XI2_MASK; } - if ((type = GetXIType(event->any.type)) != 0) + if ((type = GetXIType(evtype)) != 0) { filter = GetEventFilterMask(dev, type); @@ -2568,7 +2568,7 @@ EventIsDeliverable(DeviceIntPtr dev, InternalEvent* event, WindowPtr win) } - if ((type = GetCoreType(event->any.type)) != 0) + if ((type = GetCoreType(evtype)) != 0) { filter = GetEventFilterMask(dev, type); @@ -2667,7 +2667,7 @@ DeliverDeviceEvents(WindowPtr pWin, InternalEvent *event, GrabPtr grab, while (pWin) { - if ((mask = EventIsDeliverable(dev, event, pWin))) + if ((mask = EventIsDeliverable(dev, event->any.type, pWin))) { /* XI2 events first */ if (mask & EVENT_XI2_MASK) diff --git a/include/input.h b/include/input.h index 7c5ad3cd9..fb24fd5ec 100644 --- a/include/input.h +++ b/include/input.h @@ -552,8 +552,7 @@ void FixUpEventFromWindow(SpritePtr pSprite, Window child, Bool calcChild); extern WindowPtr XYToWindow(SpritePtr pSprite, int x, int y); -extern int EventIsDeliverable(DeviceIntPtr dev, InternalEvent* event, - WindowPtr win); +extern int EventIsDeliverable(DeviceIntPtr dev, int evtype, WindowPtr win); extern Bool ActivatePassiveGrab(DeviceIntPtr dev, GrabPtr grab, InternalEvent *ev); /** |