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

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:
Kim Woelders 2009-01-05 19:35:18 +01:00 committed by Peter Hutterer
parent 515ce3e4ba
commit 30d2cfcd38
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dix/events.c
View File

@ -2414,14 +2414,12 @@ DeliverDeviceEvents(WindowPtr pWin, xEvent *xE, GrabPtr grab,
if (deliveries > 0) if (deliveries > 0)
return deliveries; 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) if (dev->isMaster && dev->coreEvents)
{ {
@ -2439,12 +2437,11 @@ DeliverDeviceEvents(WindowPtr pWin, xEvent *xE, GrabPtr grab,
if (deliveries > 0) if (deliveries > 0)
return deliveries; 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; child = pWin->drawable.id;