xserver: Branch 'server-1.6-branch'

[Keith Packard]

 dix/events.c |   19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

New commits:
commit 8cfb353078d9b5d03a9633304038141a60adc970
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Mon Jan 12 11:07:08 2009 +1000

    dix: Fix handling of do_not_propagate_mask window attribute.
    
    This was broken in 32aa252e988be8cbfd4f7e373fb7b7736ef1f5f2.
    
    Signed-off-by: Kim Woelders <kim at woelders.dk>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    (cherry picked from commit 30d2cfcd3851870178d62e5067211aa36f87fbd2)
    
    Conflicts:
    
    	dix/events.c
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/dix/events.c b/dix/events.c
index 5530c01..122ce6a 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;