From 30d2cfcd3851870178d62e5067211aa36f87fbd2 Mon Sep 17 00:00:00 2001 From: Kim Woelders Date: Mon, 5 Jan 2009 19:35:18 +0100 Subject: [PATCH] dix: Fix handling of do_not_propagate_mask window attribute. This was broken in 32aa252e988be8cbfd4f7e373fb7b7736ef1f5f2. Signed-off-by: Kim Woelders Signed-off-by: Peter Hutterer --- dix/events.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/dix/events.c b/dix/events.c index 7b698a0d1..37c922053 100644 --- a/dix/events.c +++ b/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;