diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-01-12 11:07:08 +1000 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2009-01-11 17:41:04 -0800 |
| commit | 8cfb353078d9b5d03a9633304038141a60adc970 (patch) | |
| tree | af8699a0b8fdeb54d73f528cee930c518c09e5f4 /dix | |
| parent | 93e510d3abaee97f5b7812abc3a2693dabf94478 (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>
(cherry picked from commit 30d2cfcd3851870178d62e5067211aa36f87fbd2)
Conflicts:
dix/events.c
Signed-off-by: Keith Packard <keithp@keithp.com>
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 5530c012f..122ce6abc 100644 --- a/dix/events.c +++ b/dix/events.c @@ -2351,13 +2351,11 @@ 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; } else { core = *xE; @@ -2373,12 +2371,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; |