summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMihail Konev <k.mvc@ya.ru>2016-09-14 11:47:15 +0100
committerPeter Hutterer <peter.hutterer@who-t.net>2016-09-21 17:33:43 +1000
commit5794bdd52821463acf691c4230741f6b4289669b (patch)
tree40115dcd4f2de741393fb062039b51c585aea03a
parentfc1c358b955258ce675e49490de7c3b8ddee2b76 (diff)
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@ya.ru> Reviewed-by: Daniel Stone <daniels@collabora.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--xkb/xkbActions.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c
index 048ed441a..2ffd3fadc 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)