Hi, On 03-11-17 10:56, Benjamin Tissoires wrote:
On Nov 02 2017 or thereabouts, Hans de Goede wrote:The Novatek 0603:0002 mt clickpad / keyboard combo found in some budget Cherry Trail laptops, only reports the clickpad's button status in the report for finger / slot 0. In the other reports the button field value is always 0. This leads to BTN_LEFT 0-1-0-1 events being reported to userspace when the button is pressed and 2 fingers or more are down. Making it impossible to (left)click with one finger and drag with another to e.g. select text. This commit adds a quirk for this, ignoring the button field from reports for the other fingers, fixing this.Hi Hans, may I have a look at the hid-record output when you press the button with one and with two fingers? Because the quirk is pretty awful, and I wonder if there is not something fishy in our implementation.
Ok, recording of: 1) Clicking left-bottom of touchpad (left-button click on clickpad) 2) Dragging with a 2nd finger from left to right to select some text 3) Releasing 2nd finger 4) Releasing left-bottom / the click-button and the 1st finger Attached. Note AFAICT what is happening is really simply, the touchpad sends reports containing data for 1 finger, so once 2 fingers are down it alternately sends report for contactid 0 and contactid 1 and only the reports with contactid 0 contain a valid value for the BTN_LEFT field, in the reports with contactid 1 the field which we map to BTN_LEFT is always 0, so I really see no other solution then ignoring that field for contactid != 0. Regards, Hans
Cheers, BenjaminCc: Daniel Drake <drake@xxxxxxxxxxxx> Cc: Carlo Caione <carlo@xxxxxxxxxxxx> Cc: Robert McQueen <robert@xxxxxxxxxxxx> Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx> --- drivers/hid/hid-ids.h | 1 + drivers/hid/hid-multitouch.c | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index be2e005c3c51..45bc5d81208c 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -797,6 +797,7 @@ #define USB_DEVICE_ID_NINTENDO_WIIMOTE2 0x0330#define USB_VENDOR_ID_NOVATEK 0x0603+#define USB_DEVICE_ID_NOVATEK_MT_TP 0x0002 #define USB_DEVICE_ID_NOVATEK_PCT 0x0600 #define USB_DEVICE_ID_NOVATEK_MOUSE 0x1602diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.cindex bb939f6990f1..28a58cfd2d3e 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -73,6 +73,7 @@ MODULE_LICENSE("GPL"); #define MT_QUIRK_TOUCH_SIZE_SCALING BIT(15) #define MT_QUIRK_STICKY_FINGERS BIT(16) #define MT_QUIRK_ASUS_CUSTOM_UP BIT(17) +#define MT_QUIRK_BUTTON_IN_SLOT0_ONLY BIT(18)#define MT_INPUTMODE_TOUCHSCREEN 0x02#define MT_INPUTMODE_TOUCHPAD 0x03 @@ -135,6 +136,7 @@ struct mt_device { bool is_buttonpad; /* is this device a button pad? */ bool serial_maybe; /* need to check for serial protocol */ bool curvalid; /* is the current contact valid? */ + int curslot; /* current linux mt slot */ unsigned mt_flags; /* flags to pass to input-mt */ };@@ -173,6 +175,7 @@ static void mt_post_parse(struct mt_device *td);#define MT_CLS_ASUS 0x010b #define MT_CLS_VTL 0x0110 #define MT_CLS_GOOGLE 0x0111 +#define MT_CLS_NOVATEK 0x0112#define MT_DEFAULT_MAXCONTACT 10#define MT_MAX_MAXCONTACT 250 @@ -307,6 +310,14 @@ static struct mt_class mt_classes[] = { MT_QUIRK_SLOT_IS_CONTACTID | MT_QUIRK_HOVERING }, + { .name = MT_CLS_NOVATEK, + .quirks = MT_QUIRK_ALWAYS_VALID | + MT_QUIRK_IGNORE_DUPLICATES | + MT_QUIRK_HOVERING | + MT_QUIRK_CONTACT_CNT_ACCURATE | + MT_QUIRK_STICKY_FINGERS | + MT_QUIRK_BUTTON_IN_SLOT0_ONLY + }, { } };@@ -676,6 +687,7 @@ static void mt_complete_slot(struct mt_device *td, struct input_dev *input)active = (s->touch_state || s->inrange_state) && s->confidence_state;+ td->curslot = slotnum;input_mt_slot(input, slotnum); input_mt_report_slot_state(input, MT_TOOL_FINGER, active); if (active) { @@ -794,6 +806,13 @@ static void mt_process_mt_event(struct hid_device *hid, struct hid_field *field, break;default:+ if ((quirks & MT_QUIRK_BUTTON_IN_SLOT0_ONLY) && + td->curslot != 0 && + usage->type == EV_KEY && + usage->code >= BTN_MOUSE && + usage->code < BTN_JOYSTICK) + return; + if (usage->type) input_event(input, usage->type, usage->code, value); @@ -1605,6 +1624,12 @@ static const struct hid_device_id mt_devices[] = { MT_USB_DEVICE(USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_TURBOX_TOUCHSCREEN_MOSART) },+ /* Novatek multi-touch touchpad / keyboard combo */+ { .driver_data = MT_CLS_NOVATEK, + HID_DEVICE(BUS_USB, HID_GROUP_MULTITOUCH_WIN_8, + USB_VENDOR_ID_NOVATEK, + USB_DEVICE_ID_NOVATEK_MT_TP) }, + /* Novatek Panel */ { .driver_data = MT_CLS_NSMU, MT_USB_DEVICE(USB_VENDOR_ID_NOVATEK, -- 2.14.3
Attachment:
log.gz
Description: application/gzip
