From 1cea603cbebdae38d811fe8f7e795e850d6a7942 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 18 Aug 2017 05:12:14 +1000 Subject: [PATCH libinput] udev: hardcode the Wacom EKR into the 27QHDT device group Most EKR users will use it with the 27QHDT, so let's force it into that group by default. There's a range of cases that's not covered (including 27QHD, no touch) or any case of the EKR being used with another tablet or even the receiver plugged into another USB port. All these cases need custom udev rules to assign the right device group, let's just get the default right though. https://bugs.freedesktop.org/show_bug.cgi?id=102235 Signed-off-by: Peter Hutterer --- udev/libinput-device-group.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/udev/libinput-device-group.c b/udev/libinput-device-group.c index fa70e115..84aaebca 100644 --- a/udev/libinput-device-group.c +++ b/udev/libinput-device-group.c @@ -32,12 +32,14 @@ #if HAVE_LIBWACOM_GET_PAIRED_DEVICE #include +#endif static void wacom_handle_paired(struct udev_device *device, int *vendor_id, int *product_id) { +#if HAVE_LIBWACOM_GET_PAIRED_DEVICE WacomDeviceDatabase *db = NULL; WacomDevice *tablet = NULL; const WacomMatch *paired; @@ -61,8 +63,8 @@ out: libwacom_destroy(tablet); if (db) libwacom_database_destroy(db); -} #endif +} int main(int argc, char **argv) { @@ -122,10 +124,19 @@ int main(int argc, char **argv) &version) != 4) { snprintf(group, sizeof(group), "%s:%s", product, phys); } else { -#if HAVE_LIBWACOM_GET_PAIRED_DEVICE - if (vendor_id == VENDOR_ID_WACOM) - wacom_handle_paired(device, &vendor_id, &product_id); -#endif + if (vendor_id == VENDOR_ID_WACOM) { + /* We force the ExpressKey remote to be in the same + * device group as the 27QHDT to have them paired + * automatically. 27QHD (no touch) users need a custom + * udev rule, so do those that need to use the + * EKR with another tablet. + */ + if (product_id == 0x331) /* ExpressKey Remote */ + product_id = 0x32c; /* 27QHT */ + else + wacom_handle_paired(device, &vendor_id, &product_id); + } + snprintf(group, sizeof(group), "%x/%x/%x/%x:%s", -- 2.13.3