Add support for multiple relative wheels #349
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Allow dial and ring events to be recognized as coming from the pad when there are no other better sources of information (for example, BTN_TOOL_* events earlier in the event packet, an ABS_MISC with the information, or a previously-known tool type). This fixes an issue where the pad is not recognized (and events are not generated) if your first interaction is with a relative wheel rather than a button or touchring. The events types matched by this function have an ambiguous source on their own, but other earlier tests would be able to determine the type from other context. If all other context-sensitive tests fail to find a tool type, it is reasonably safe to assume we're looking at a pad. Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
Relative wheel actions are backwards from how the user thinks about them. If you want to get/set the action that occurs when scrolling up, you currently need to work with the REL_WHEEL_DOWN action. This is difficult to explain to users and is also makes the code more difficult to follow. This commit changes the behavior so that programming the REL_WHEEL_UP action actually affects what happens when you physically scroll the wheel up. The behavior is now: physical scroll wheel up -> positive delta from kernel -> REL_WHEEL_UP action -> X11 mouse button 4 -> window scrolls up. Note that this commit will break any xsetwacom scripts that users may have which change the relative wheel actions from their defaults. It would also affect control panels that rely on xsetwacom or configuring the driver directly. We don't expect this to cause significant problems in reality since Wacom has not produced tools with relative wheels in many years and so there are few scripts/control panels to break. Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
Just like how tablets may have two absolute wheels, it also is possible for them to have two relative wheels. This commit extends the WACOM_PROP_WHEELBUTTONS property to reference two new actions: RelWheel2Up and RelWheel2Down. These actions will be triggered in response to horizontal scrolling events from the kernel (positive and negative REL_HWHEEL events, respecitively). The default action for these wheels is sending horizontal mouse scroll events (X11 mouse buttons 7 and 6, respectively). Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
|
The changes look good and clean to me. Thank you! |
whot
reviewed
Aug 8, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The X driver currently has support for devices with a single relative wheel (e.g. scroll wheels on pucks or pads). This patch set adds support for devices that have a second relative wheel sending REL_HWHEEL events from the kernel. Such a control will produce horizontal scrolling events by default. The xsetwacom tool has been updated to allow configuring these controls via the traditional "RelWheel[2]<Up|Down>" commands, as well as a new set of "Dial[2]<CCW|CW>" commands that place relative wheels on the pad (e.g. recent Huion / XP-Pen devices).