Generate the class given in class if not explicitly given #792
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
redstrate
force-pushed
the
generate-class
branch
from
583ec69 to
a82ee8d
Compare
redstrate
changed the title
redstrate
changed the title
redstrate
changed the title
redstrate
force-pushed
the
generate-class
branch
from
a82ee8d to
a3c0b1e
Compare
This is still a part of the API, and thus have required even new .tablet files to fill this out even though it's superseded by IntegratedIn. So let's generate them programmatically. This turns devices that are IntegratedIn=Display to the Cintiq class, IntegratedIn=Display;System into the ISDV4 class, and everything else into the Bamboo class.
redstrate
force-pushed
the
generate-class
branch
from
a3c0b1e to
d308d65
Compare
whot
requested changes
Oct 17, 2024
Comment on lines
+1368
to
+1374
| if (device->integration_flags & WACOM_DEVICE_INTEGRATED_DISPLAY && | ||
| device->integration_flags & WACOM_DEVICE_INTEGRATED_SYSTEM) { | ||
| return WCLASS_ISDV4; | ||
| } | ||
| if (device->integration_flags & WACOM_DEVICE_INTEGRATED_DISPLAY) { | ||
| return WCLASS_CINTIQ; | ||
| } |
There was a problem hiding this comment.
Suggested change
| if (device->integration_flags & WACOM_DEVICE_INTEGRATED_DISPLAY && | |
| device->integration_flags & WACOM_DEVICE_INTEGRATED_SYSTEM) { | |
| return WCLASS_ISDV4; | |
| } | |
| if (device->integration_flags & WACOM_DEVICE_INTEGRATED_DISPLAY) { | |
| return WCLASS_CINTIQ; | |
| } | |
| unsigned int flags = device->integration_flags & (WACOM_DEVICE_INTEGRATED_DISPLAY|WACOM_DEVICE_INTEGRATED_SYSTEM); | |
| if (flags == (WACOM_DEVICE_INTEGRATED_DISPLAY|WACOM_DEVICE_INTEGRATED_SYSTEM)) { | |
| return WCLASS_ISDV4; | |
| } | |
| if (flags == WACOM_DEVICE_INTEGRATED_DISPLAY) { | |
| return WCLASS_CINTIQ; | |
| } |
is i think a bit more readable.
(oh, and I always like to have () around any bitwise operations, it makes the code a bit more readable)
| if (device->integration_flags & WACOM_DEVICE_INTEGRATED_DISPLAY) { | ||
| return WCLASS_CINTIQ; | ||
| } | ||
| return WCLASS_BAMBOO; |
There was a problem hiding this comment.
I think the Remote class is missing here, that will need handling, could go together with #779.
Then again there's so few of them that we can mark those in the .tablet file...
There was a problem hiding this comment.
Oh, come to think of it: this is better as WCLASS_INTUOS5 - that's the most recent class and most devices are more like that than whatever the latest bamboo was like.
There was a problem hiding this comment.
For the archives: WCLASS_BAMBOO is better here because bamboos arent' expected to have stylus ids/serials.
|
@redstrate ok if I take this one and push it over the line? |
|
Yes go ahead, I don’t have access to a computer right now and would appreciate it :)On Oct 27, 2024, at 23:09, Peter Hutterer ***@***.***> wrote:
@redstrate ok if I take this one and push it over the line?
—Reply to this email directly, view it on GitHub, or unsubscribe.You are receiving this because you were mentioned.Message ID: ***@***.***>
|
|
Thanks, closing in favour of #814 now |
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.
This is still a part of the API, and thus have required even new .tablet files to fill this out even though it's superseded by
IntegratedIn. So let's generate them programmatically.This turns devices that are
IntegratedIn=Displayto theCintiqclass,IntegratedIn=Display;Systeminto theISDV4class, and everything else into theBambooclass.(This definitely needs more test cases)