Skip to content

Commit ce5a68f

Browse files
committed
uclogic: Pass keyboard reports as is
Allow keyboard reports from interface #1 of Huion tablets to pass unmodified, and stop the Wacom X.org driver from handling them. The method for the latter is rather crude and also take the Dial reports from the Wacom driver, but it's expected that libinput will be able to handle them (still to be tested). This enables Huion HS611 media and desktop keys.
1 parent caf0fdd commit ce5a68f

2 files changed

Lines changed: 7 additions & 2 deletions

File tree

hid-uclogic-params.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -703,8 +703,12 @@ static int uclogic_params_huion_init(struct uclogic_params *params,
703703
goto cleanup;
704704
}
705705

706-
/* If it's not a pen interface */
707-
if (bInterfaceNumber != 0) {
706+
/* If it's a custom keyboard interface */
707+
if (bInterfaceNumber == 1) {
708+
/* Keep everything intact */
709+
goto output;
710+
/* Else, if it's not a pen interface */
711+
} else if (bInterfaceNumber != 0) {
708712
uclogic_params_init_invalid(&p);
709713
goto output;
710714
}

xorg.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Section "InputClass"
88
Identifier "Huion tablets with Wacom driver"
99
MatchUSBID "5543:006e|256c:006e|256c:006d"
1010
MatchDevicePath "/dev/input/event*"
11+
MatchIsKeyboard "false"
1112
Driver "wacom"
1213
EndSection
1314

0 commit comments

Comments
 (0)