From 120d42812e606e214e32ff8005100e85946b7c71 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 28 May 2020 10:33:21 +1000 Subject: [PATCH] touchpad: add touch state debugging to the palm and tap state debug logs Signed-off-by: Peter Hutterer --- src/evdev-mt-touchpad-tap.c | 3 ++- src/evdev-mt-touchpad.c | 3 ++- src/evdev-mt-touchpad.h | 14 ++++++++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/evdev-mt-touchpad-tap.c b/src/evdev-mt-touchpad-tap.c index 7b5de8b6..d5d4a79d 100644 --- a/src/evdev-mt-touchpad-tap.c +++ b/src/evdev-mt-touchpad-tap.c @@ -803,8 +803,9 @@ tp_tap_handle_event(struct tp_dispatch *tp, if (current != tp->tap.state) evdev_log_debug(tp->device, - "tap: touch %d state %s → %s → %s\n", + "tap: touch %d (%s), tap state %s → %s → %s\n", t ? (int)t->index : -1, + t ? touch_state_to_str(t->state) : "", tap_state_to_str(current), tap_event_to_str(event), tap_state_to_str(tp->tap.state)); diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c index 0030682b..df745054 100644 --- a/src/evdev-mt-touchpad.c +++ b/src/evdev-mt-touchpad.c @@ -1201,8 +1201,9 @@ out: break; } evdev_log_debug(tp->device, - "palm: touch %d, palm detected (%s)\n", + "palm: touch %d (%s), palm detected (%s)\n", t->index, + touch_state_to_str(t->state), palm_state); } diff --git a/src/evdev-mt-touchpad.h b/src/evdev-mt-touchpad.h index 75a87d4a..3a33a6a4 100644 --- a/src/evdev-mt-touchpad.h +++ b/src/evdev-mt-touchpad.h @@ -53,6 +53,20 @@ enum touch_state { TOUCH_END = 5, }; +static inline const char * +touch_state_to_str(enum touch_state state) +{ + switch(state) { + CASE_RETURN_STRING(TOUCH_NONE); + CASE_RETURN_STRING(TOUCH_HOVERING); + CASE_RETURN_STRING(TOUCH_BEGIN); + CASE_RETURN_STRING(TOUCH_UPDATE); + CASE_RETURN_STRING(TOUCH_MAYBE_END); + CASE_RETURN_STRING(TOUCH_END); + } + return NULL; +} + enum touch_palm_state { PALM_NONE = 0, PALM_EDGE,