From: "Ahelenia Ziemiańska" <nabijaczleweli@nabijaczleweli.xyz>
To: unlisted-recipients:; (no To-header on input)
Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com>,
Peter Hutterer <peter.hutterer@who-t.net>,
Jiri Kosina <jikos@kernel.org>,
linux-input@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 4/4] HID: input: work around Win8 stylus-on-touchscreen reporting
Date: Wed, 17 Feb 2021 18:22:48 +0100 [thread overview]
Message-ID: <b0cb2d0ee8743263608284e0e5112c446e3cb2ee.1613582014.git.nabijaczleweli@nabijaczleweli.xyz> (raw)
In-Reply-To: <cover.1613582014.git.nabijaczleweli@nabijaczleweli.xyz>
[-- Attachment #1: Type: text/plain, Size: 2318 bytes --]
With this, these devices now behave as tablets as expected by userspace
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
---
drivers/hid/hid-input.c | 41 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index a5ba92978473..b8813fc3e9d2 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -1273,6 +1273,41 @@ static void hidinput_handle_scroll(struct hid_usage *usage,
input_event(input, EV_REL, usage->code, hi_res);
}
+/*
+ * Win8 tablet stylus devices send, in order:
+ * HID_DG_TIPSWITCH (BTN_TOUCH)
+ * HID_DG_INVERT (BTN_TOOL_RUBBER)
+ * HID_DG_ERASER (BTN_TOUCH)
+ * HID_DG_INRANGE (BTN_TOOL_PEN)
+ *
+ * For each of these states:
+ * hover : INRANGE
+ * touching : TIPSWITCH
+ * hover+2 : INVERT INRANGE
+ * touching+2: ERASER INRANGE
+ *
+ * Which means we'd send BTN_TOUCH=0 + BTN_TOOL_PEN=1 on proximity,
+ * then BTN_TOUCH=1 and BTN_TOOL_PEN=0 in consecutive groups when touched,
+ * indicating the stylus leaving the screen as soon as the two meet.
+ */
+static void hidinput_fixup_win8_inrange(struct hid_device *hid, struct hid_field *field, __s32 *value)
+{
+ unsigned f, u;
+ struct hid_field *rfield;
+
+ if (!*value) {
+ for (f = 0; f < field->report->maxfield; ++f) {
+ rfield = field->report->field[f];
+ for (u = 0; u < rfield->maxusage; ++u) {
+ if (rfield->usage[u].hid == HID_DG_TIPSWITCH) {
+ *value = rfield->value[u];
+ return;
+ }
+ }
+ }
+ }
+}
+
void hidinput_hid_event(struct hid_device *hid, struct hid_field *field, struct hid_usage *usage, __s32 value)
{
struct input_dev *input;
@@ -1306,7 +1341,13 @@ void hidinput_hid_event(struct hid_device *hid, struct hid_field *field, struct
return;
}
+ if (usage->hid == HID_DG_ERASER && value)
+ *quirks |= HID_QUIRK_INVERT;
+
if (usage->hid == HID_DG_INRANGE) {
+ if (hid->group == HID_GROUP_MULTITOUCH_WIN_8)
+ hidinput_fixup_win8_inrange(hid, field, &value);
+
if (value) {
input_event(input, usage->type, (*quirks & HID_QUIRK_INVERT) ? BTN_TOOL_RUBBER : usage->code, 1);
return;
--
2.20.1
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2021-02-17 17:33 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-17 17:22 [PATCH 0/4] Stylus-on-touchscreen device support наб
2021-02-17 17:22 ` [PATCH 1/4] HID: multitouch: require Finger field to mark Win8 reports as MT Ahelenia Ziemiańska
2021-02-17 17:22 ` [PATCH 2/4] HID: multitouch: set Stylus suffix for Stylus-application devices, too Ahelenia Ziemiańska
2021-02-17 17:22 ` [PATCH 3/4] HID: input: replace outdated HID numbers+comments with macros Ahelenia Ziemiańska
2021-02-17 17:22 ` Ahelenia Ziemiańska [this message]
2021-03-08 10:15 ` [PATCH 0/4] Stylus-on-touchscreen device support Jiri Kosina
2021-03-08 10:21 ` Benjamin Tissoires
2021-03-08 10:40 ` наб
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b0cb2d0ee8743263608284e0e5112c446e3cb2ee.1613582014.git.nabijaczleweli@nabijaczleweli.xyz \
--to=nabijaczleweli@nabijaczleweli.xyz \
--cc=benjamin.tissoires@redhat.com \
--cc=jikos@kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=peter.hutterer@who-t.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).