summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Expósito <jose.exposito89@gmail.com>2022-11-14 18:38:13 +0100
committerJosé Expósito <jose.exposito89@gmail.com>2022-11-14 19:11:12 +0100
commit0da2d0095cfe3635b5bf8943defe315c4f58d322 (patch)
tree8b2aab9c9a67b75e04893c56e440b718a6076a7d
parent955a9cc338b7a1d6606a05ab6c0f5b7145806cf2 (diff)
downloadlibinput-0da2d0095cfe3635b5bf8943defe315c4f58d322.tar.gz
touchpad: add escape and asterisk to the DWT blacklist
The escape key can be used to cancel a drag and drop action in some desktop environments. However, it triggers disable-while-typing, ending the drag and drop action rather than cancelling it. Add it to the tp_key_ignore_for_dwt() set to avoid it. Since I'm here, add the asterisk key as it is the only numpad key not ignored by tp_key_ignore_for_dwt(). Fix: https://gitlab.freedesktop.org/libinput/libinput/-/issues/820 # [1] Suggested-by: satrmb <10471-satrmb@users.noreply.gitlab.freedesktop.org> Signed-off-by: José Expósito <jose.exposito89@gmail.com>
-rw-r--r--src/evdev-mt-touchpad.c8
-rw-r--r--test/test-touchpad.c3
2 files changed, 10 insertions, 1 deletions
diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c
index ea9c8f1e..a6afbdac 100644
--- a/src/evdev-mt-touchpad.c
+++ b/src/evdev-mt-touchpad.c
@@ -2285,7 +2285,13 @@ tp_key_ignore_for_dwt(unsigned int keycode)
if (tp_key_is_modifier(keycode))
return false;
- return keycode >= KEY_F1;
+ switch (keycode) {
+ case KEY_ESC:
+ case KEY_KPASTERISK:
+ return true;
+ default:
+ return keycode >= KEY_F1;
+ }
}
static void
diff --git a/test/test-touchpad.c b/test/test-touchpad.c
index b55d979f..c0b596a9 100644
--- a/test/test-touchpad.c
+++ b/test/test-touchpad.c
@@ -4195,6 +4195,9 @@ START_TEST(touchpad_dwt_modifier_no_dwt)
KEY_COMPOSE,
KEY_RIGHTMETA,
KEY_LEFTMETA,
+ KEY_ESC,
+ KEY_KPASTERISK,
+ KEY_F1,
};
if (!has_disable_while_typing(touchpad))