xserver: Branch 'master'

[Peter Hutterer]

 xkb/xkbActions.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 5794bdd52821463acf691c4230741f6b4289669b
Author: Mihail Konev <k.mvc at ya.ru>
Date:   Wed Sep 14 11:47:15 2016 +0100

    xkb: fix turbo-repeat of RedirectKey-ed keysyms
    
    RedirectKey() action had been broken by commit 2e6190.
    A dropped check caused over-intense autorepeat of keysyms enriched
    with the action.
    
    Previous to this commit, the check wrapped the entire switch() block,
    which was dropped with the move to a separate function.
    
    Restore the checking.
    
    Signed-off-by: Mihail Konev <k.mvc at ya.ru>
    Reviewed-by: Daniel Stone <daniels at collabora.com>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c
index 048ed44..2ffd3fa 100644
--- a/xkb/xkbActions.c
+++ b/xkb/xkbActions.c
@@ -1337,7 +1337,8 @@ XkbHandleActions(DeviceIntPtr dev, DeviceIntPtr kbd, DeviceEvent *event)
         }
 
         sendEvent = _XkbApplyFilters(xkbi, key, &act);
-        XkbActionGetFilter(dev, event, key, &act, &sendEvent);
+        if (sendEvent)
+            XkbActionGetFilter(dev, event, key, &act, &sendEvent);
     }
     else {
         if (!keyEvent)