wayland: Yet more cursor work #14365
Merged
+567
−480
Conversation
This file contains hidden or 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
Cache the cursor image data at creation time, and use a viewport to render scaled custom cursors, instead of generating new cursor images for every scale.
Collaborator
|
FYI, we have more time for this to land in 3.4.0. Anything that goes in 3.4.2 should be extremely low risk and may get less testing than 3.4.0. |
Kontrabant
force-pushed
the
wl_cursor_vp
branch
2 times, most recently
from
aeadb5a to
7b4e79f
Compare
Contributor
Author
|
Understood. I'll look over this again today, and hit the go button if there aren't any issues so it can get wider testing. |
Some compositors don't implicitly use the pointer cursor when the tablet cursor is not set, and the presence of a tablet doesn't necessarily guarantee pointer capability. Set the cursor for tablet tools independently of pointer cursors. This required refactoring of cursor state handling, as well as some tablet related structures.
Store the images in order from smallest to largest to simplify lookup and be able to early-out of the search loop even if there is no exact match for the scale.
Kontrabant
force-pushed
the
wl_cursor_vp
branch
from
7b4e79f to
03db3c7
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Use viewports to handle scaled custom cursors instead of building a new set of images for every scale, and set tablet tool cursors separately from the pointer cursor, as some compositors don't implicitly use the pointer cursor when the tablet cursor is unset, and the presence of a tablet doesn't imply that the pointer capability will be exposed.
There isn't that much change to the cursor logic itself, but splitting out the cursor state so that it can be used by both pointer and tablet tool cursors caused a lot of churn, so it's probably best to hold on merging this until 3.4.2 to allow for time to shake out any subtile bugs this might have introduced. The tablet changes could also do with more testing, as they seem to work with emulated input, but more testing on real hardware would be preferable (the Osu project tends to find these bugs quickly).
Fixes #14332