diff options
| author | Andreas Wettstein <wettstein509@solnet.ch> | 2014-02-15 17:37:24 +0100 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2015-09-29 12:21:34 -0400 |
| commit | f937032ee6526af3c9206a2d8c6eacdeeb490d3b (patch) | |
| tree | 701ccc24a0f40b8c73b4199e7a9208794951b9be | |
| parent | 5447ac45bc090e8f3269979af4db55f619c5f278 (diff) | |
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 <wettstein509@solnet.ch>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
| -rw-r--r-- | xkb/xkbActions.c | 4 |
1 files changed, 3 insertions, 1 deletions
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 |