dix: Fix handling of do_not_propagate_mask window attribute.
This was broken in 32aa252e98
.
Signed-off-by: Kim Woelders <kim@woelders.dk>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
parent
515ce3e4ba
commit
30d2cfcd38
19
dix/events.c
19
dix/events.c
|
@ -2414,14 +2414,12 @@ DeliverDeviceEvents(WindowPtr pWin, xEvent *xE, GrabPtr grab,
|
|||
if (deliveries > 0)
|
||||
return deliveries;
|
||||
}
|
||||
|
||||
if ((deliveries < 0) ||
|
||||
(pWin == stopAt) ||
|
||||
(inputMasks &&
|
||||
(filter & inputMasks->dontPropagateMask[mskidx])))
|
||||
return 0;
|
||||
}
|
||||
|
||||
if ((deliveries < 0) || (pWin == stopAt) ||
|
||||
(inputMasks && (filter & inputMasks->dontPropagateMask[mskidx])))
|
||||
return 0;
|
||||
|
||||
if (dev->isMaster && dev->coreEvents)
|
||||
{
|
||||
|
||||
|
@ -2439,12 +2437,11 @@ DeliverDeviceEvents(WindowPtr pWin, xEvent *xE, GrabPtr grab,
|
|||
if (deliveries > 0)
|
||||
return deliveries;
|
||||
}
|
||||
|
||||
if ((deliveries < 0) ||
|
||||
(pWin == stopAt) ||
|
||||
(filter & wDontPropagateMask(pWin)))
|
||||
return 0;
|
||||
}
|
||||
|
||||
if ((deliveries < 0) || (pWin == stopAt) ||
|
||||
(filter & wDontPropagateMask(pWin)))
|
||||
return 0;
|
||||
}
|
||||
|
||||
child = pWin->drawable.id;
|
||||
|
|
Loading…
Reference in New Issue
Block a user