diff options
| author | Kim Woelders <kim@woelders.dk> | 2009-01-05 19:35:18 +0100 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-01-08 11:45:21 +1000 |
| commit | 30d2cfcd3851870178d62e5067211aa36f87fbd2 (patch) | |
| tree | 032a7c8fe2be66c9b5401b7a3d11af0748f34759 /dix | |
| parent | 515ce3e4ba42605a1ee9979e8bb5acd3cf6470a3 (diff) | |
dix: Fix handling of do_not_propagate_mask window attribute.
This was broken in 32aa252e988be8cbfd4f7e373fb7b7736ef1f5f2.
Signed-off-by: Kim Woelders <kim@woelders.dk>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'dix')
| -rw-r--r-- | dix/events.c | 19 |
1 files 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; |