summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--extras/input_id/input_id.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/extras/input_id/input_id.c b/extras/input_id/input_id.c
index 393a05d53a..2e143a5628 100644
--- a/extras/input_id/input_id.c
+++ b/extras/input_id/input_id.c
@@ -75,13 +75,10 @@ static void test_pointers (const unsigned long* bitmask_abs, const unsigned long
int is_mouse = 0;
int is_touchpad = 0;
- if (test_bit (ABS_PRESSURE, bitmask_abs))
- is_touchpad = 1;
-
if (test_bit (ABS_X, bitmask_abs) && test_bit (ABS_Y, bitmask_abs)) {
- if (test_bit (BTN_STYLUS, bitmask_key))
+ if (test_bit (BTN_STYLUS, bitmask_key) || test_bit (BTN_TOOL_PEN, bitmask_key))
puts("ID_INPUT_TABLET=1");
- else if (test_bit (BTN_TOUCH, bitmask_key))
+ else if (test_bit (BTN_TOOL_FINGER, bitmask_key) && !test_bit (BTN_TOOL_PEN, bitmask_key))
is_touchpad = 1;
else if (test_bit (BTN_TRIGGER, bitmask_key) ||
test_bit (BTN_A, bitmask_key) ||