Skip to content

Commit 33e5df0

Browse files
jigpuJiri Kosina
authored andcommitted
HID: wacom: Report ABS_MISC event for Cintiq Companion Hybrid
It appears that the Cintiq Companion Hybrid does not send an ABS_MISC event to userspace when any of its ExpressKeys are pressed. This is not strictly necessary now that the pad exists on its own device, but should be fixed for consistency's sake. Traditionally both the stylus and pad shared the same device node, and xf86-input-wacom would use ABS_MISC for disambiguation. Not sending this causes the Hybrid to behave incorrectly with xf86-input-wacom beginning with its 8f44f3 commit. Signed-off-by: Jason Gerecke <[email protected]> Reviewed-by: Benjamin Tissoires <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
1 parent b3bd7ef commit 33e5df0

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

drivers/hid/wacom_wac.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -783,6 +783,12 @@ static int wacom_intuos_irq(struct wacom_wac *wacom)
783783
input_report_key(input, BTN_7, (data[4] & 0x40)); /* Left */
784784
input_report_key(input, BTN_8, (data[4] & 0x80)); /* Down */
785785
input_report_key(input, BTN_0, (data[3] & 0x01)); /* Center */
786+
787+
if (data[4] | (data[3] & 0x01)) {
788+
input_report_abs(input, ABS_MISC, PAD_DEVICE_ID);
789+
} else {
790+
input_report_abs(input, ABS_MISC, 0);
791+
}
786792
} else if (features->type >= INTUOS5S && features->type <= INTUOSPL) {
787793
int i;
788794

0 commit comments

Comments
 (0)