diff options
author | Jason Gerecke <jason.gerecke@wacom.com> | 2021-02-02 14:49:29 -0800 |
---|---|---|
committer | Jason Gerecke <killertofu@gmail.com> | 2021-02-03 06:45:17 -0800 |
commit | abffe85e3a873c63237b96e5d3d40172805f3822 (patch) | |
tree | 4cfea2282d5f774c19c29967347a9a1be74ea35b | |
parent | a93666436303b89d11eff7fd0e5de93d76a1e2d9 (diff) | |
download | xf86-input-wacom-abffe85e3a873c63237b96e5d3d40172805f3822.tar.gz |
Recognize pad devices which only have softkeys (e.g. Cintiq Pro 32)
Devices like the Cintiq Pro 32 have pad devices that have no ExpressKeys.
This prevents them from being recognized as a pad by the driver. When
the device is connected, an `Invalid type 'pad' for this device`
message would be logged.
This has not been an issue in the past since there is nothing for the
device to do without any ExpressKeys. Now that the driver is capable
of forwarding the various softkeys as fixed-function keyboard events,
however, it would be good to ensure that these kinds of devices are
detected properly.
Recognizing the device as a pad only requires us to expand on the list
of tools that are known identifiers. Since we want softkey-only pads to
be recognized, the two softkeys to the list. One or both of the keys
should be present on devices like the Cintiq Pro 32, allowing the pad
to be recognized as such.
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
-rw-r--r-- | src/wcmValidateDevice.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wcmValidateDevice.c b/src/wcmValidateDevice.c index 0acacf9..d563263 100644 --- a/src/wcmValidateDevice.c +++ b/src/wcmValidateDevice.c @@ -123,14 +123,14 @@ ret: static struct { const char* type; - __u16 tool[3]; /* tool array is terminated by 0 */ + __u16 tool[5]; /* tool array is terminated by 0 */ } wcmType [] = { { "stylus", { BTN_TOOL_PEN, 0 } }, { "eraser", { BTN_TOOL_RUBBER, 0 } }, { "cursor", { BTN_TOOL_MOUSE, 0 } }, { "touch", { BTN_TOOL_DOUBLETAP, BTN_TOOL_FINGER, 0 } }, - { "pad", { BTN_FORWARD, BTN_0, 0 } } + { "pad", { BTN_FORWARD, BTN_0, KEY_CONTROLPANEL, KEY_ONSCREEN_KEYBOARD, 0 } } }; /* validate tool type for device/product */ |