xkb: Keyboard mouse button emulation should not suppress other keyboard events

Submitted by Andreas Wettstein on Feb. 15, 2014, 4:37 p.m.

Details

Message ID 87lhxcz60r.fsf@solnet.ch
State Accepted
Commit f937032ee6526af3c9206a2d8c6eacdeeb490d3b
Headers show

Not browsing as part of any series.

Commit Message

Andreas Wettstein Feb. 15, 2014, 4:37 p.m.
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>
---
 xkb/xkbActions.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c
index da2e242..89360df 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

Comments

This patch has not been reviewed yet.  It is fairly small (but on the
other hand, not much of use without the patch to fix ISOLock).  Can
someone please have a look?

Thank you,

Andreas
On 15 February 2014 16:37, Andreas Wettstein <wettstein509@solnet.ch> wrote:
> 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>