frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dix: use helper functions in EventIsDeliverable 

Proximity events don't have an XI2 type and caused error messages in the
log when trying to get the event filter. Use this opportunity to
clean up the code, instead of manually setting the fields that
GetEventFilter requires use EventTo(XI2|XI|Core) instead.

Co-Authored-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Peter Hutterer 2011-08-11 10:59:07 +10:00
parent 7998797975
commit 3be379f507
1 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
dix/events.c
View File

@ -2503,44 +2503,45 @@ EventIsDeliverable(DeviceIntPtr dev, InternalEvent* event, WindowPtr win)
int filter = 0;
int type;
OtherInputMasks *inputMasks = wOtherInputMasks(win);
xEvent ev;
/* XXX: this makes me gag */
type = GetXI2Type(event);
ev.u.u.type = GenericEvent; /* GetEventFilter only cares about type and evtype*/
((xGenericEvent*)&ev)->extension = IReqCode;
((xGenericEvent*)&ev)->evtype = type;
filter = GetEventFilter(dev, &ev);
if (type && inputMasks &&
((inputMasks->xi2mask[XIAllDevices][type/8] & filter) ||
((inputMasks->xi2mask[XIAllMasterDevices][type/8] & filter) && IsMaster(dev)) ||
(inputMasks->xi2mask[dev->id][type/8] & filter)))
rc |= EVENT_XI2_MASK;
if ((type = GetXI2Type(event)) != 0)
{
filter = GetXI2EventFilterMask(type);
type = GetXIType(event);
ev.u.u.type = type;
filter = GetEventFilter(dev, &ev);
if (inputMasks &&
(GetXI2MaskByte(inputMasks->xi2mask, dev, type) & filter))
rc |= EVENT_XI2_MASK;
}
/* Check for XI mask */
if (type && inputMasks &&
(inputMasks->deliverableEvents[dev->id] & filter) &&
(inputMasks->inputEvents[dev->id] & filter))
rc |= EVENT_XI1_MASK;
if ((type = GetXIType(event)) != 0)
{
filter = GetEventFilterMask(dev, type);
/* Check for XI DontPropagate mask */
if (type && inputMasks &&
(inputMasks->dontPropagateMask[dev->id] & filter))
rc |= EVENT_DONT_PROPAGATE_MASK;
/* Check for XI mask */
if (inputMasks &&
(inputMasks->deliverableEvents[dev->id] & filter) &&
(inputMasks->inputEvents[dev->id] & filter))
rc |= EVENT_XI1_MASK;
/* Check for core mask */
type = GetCoreType(event);
if (type && (win->deliverableEvents & filter) &&
((wOtherEventMasks(win) | win->eventMask) & filter))
rc |= EVENT_CORE_MASK;
/* Check for XI DontPropagate mask */
if (inputMasks && (inputMasks->dontPropagateMask[dev->id] & filter))
rc |= EVENT_DONT_PROPAGATE_MASK;
/* Check for core DontPropagate mask */
if (type && (filter & wDontPropagateMask(win)))
rc |= EVENT_DONT_PROPAGATE_MASK;
}
if ((type = GetCoreType(event)) != 0)
{
filter = GetEventFilterMask(dev, type);
/* Check for core mask */
if ((win->deliverableEvents & filter) &&
((wOtherEventMasks(win) | win->eventMask) & filter))
rc |= EVENT_CORE_MASK;
/* Check for core DontPropagate mask */
if (filter & wDontPropagateMask(win))
rc |= EVENT_DONT_PROPAGATE_MASK;
}
return rc;
}