From f937032ee6526af3c9206a2d8c6eacdeeb490d3b Mon Sep 17 00:00:00 2001 From: Andreas Wettstein Date: Sat, 15 Feb 2014 17:37:24 +0100 Subject: [PATCH] xkb: Keyboard mouse button emulation should not suppress other keyboard events With this change, when a key mapped to an action to emulate mouse button presses and releases is held down, other keys pressed during that time are still processed normally. This is a prerequisite for proper support of ISOLock. Signed-off-by: Andreas Wettstein Reviewed-by: Daniel Stone --- xkb/xkbActions.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c index 96190601d..1a9878dda 100644 --- a/xkb/xkbActions.c +++ b/xkb/xkbActions.c @@ -639,6 +639,7 @@ _XkbFilterPointerBtn(XkbSrvInfoPtr xkbi, } break; } + return 0; } else if (filter->keycode == keycode) { int button = filter->upAction.btn.button; @@ -664,8 +665,9 @@ _XkbFilterPointerBtn(XkbSrvInfoPtr xkbi, break; } filter->active = 0; + return 0; } - return 0; + return 1; } static int