Pen/Stylus support #4287

DasLixou · 2025-06-21T15:46:35Z

Adopted #3810

I've made some cleanup to the Web Implementation, and a hovering eraser should now just be treated as that instead of a eraser button push.

The structure now looks like this:

PointerSource::Tool {
    tool: ToolKind,
    data: ToolData,
}

enum ToolKind {
    Pen,
    Eraser,
}

// StylusData is the old ToolData

DasLixou · 2025-06-21T15:49:32Z

Also it seems that on_touch_cancel in web's pointer.rs is neither assigned nor used anywhere. Should I remove it here or in a follow-up?

kchibisov · 2025-06-21T15:55:50Z

winit-core/src/event.rs

+    /// ![Tilt X](https://raw.githubusercontent.com/rust-windowing/winit/master/docs/res/tool_tilt_x.webp)
+    ///
+    /// <sub>
+    ///   For image attribution, see the
+    ///   <a href="https://github.com/rust-windowing/winit/blob/master/docs/res/ATTRIBUTION.md">
+    ///     ATTRIBUTION.md
+    ///   </a>
+    ///   file.
+    /// </sub>


local path can be used for docs, IIRC.

rust-lang/rust#32104

I tried and well.. seems like I can't :c

winit-core/src/event.rs

kchibisov · 2025-06-21T15:59:05Z

winit-core/src/event.rs

+#[cfg_attr(feature = "serde", derive(Deserialize, Serialize))]
+pub struct ToolState {
+    /// The force applied to the tool against the surface.
+    pub force: Force,


is it a pressure from the https://wayland.app/protocols/tablet-v2#zwp_tablet_tool_v2:event:pressure , maybe pressure is a better name in general?

Hmmm.. I just looked, W3C also uses pressure for their force, but the winit type is already named Force and is shared with touch so idk

Is Touch and Preassure in the same units? I'd probably use different types if they are not.

well yeah - they're not just units, it's an enum with either calibrated values or normalized pressure between 0 and 1 for max strength, so yeah they share the same logic.

I could however add a doc alias name if you like that

I've now made Force have a doc alias to Pressure. @madsmtm searching through winit docs, there is mac's TouchpadPressure event with a pressure: f32 field, couldn't that also be made a Force?

winit-core/src/event.rs

kchibisov · 2025-06-21T16:03:31Z

Implement X11 before merging? (I'm happy to do it) and I'm not sure if it's done already.

you can, but not sure if someone would be able to actually review x11 part. We can split it out.

Could you check how wayland spec maps to the w3c spec? I think wayland one is more broad so we might have more stuff? I can generally add Wayland.

As for the PR itself and merging it, I think we really need Windows (even basic one, but its not mandatory to merge, just would be nice), because we ripped it and so to make 0.31 we need it kind of back (yes, web is also needed).

DasLixou · 2025-06-21T16:06:47Z

Implement X11 before merging? (I'm happy to do it) and I'm not sure if it's done already.

you can, but not sure if someone would be able to actually review x11 part. We can split it out.

Could you check how wayland spec maps to the w3c spec? I think wayland one is more broad so we might have more stuff? I can generally add Wayland.

As for the PR itself and merging it, I think we really need Windows (even basic one, but its not mandatory to merge, just would be nice), because we ripped it and so to make 0.31 we need it kind of back (yes, web is also needed).

I'm trying to get the base here through CI, then I could look what can be done for the other backend, but what do you mean by "we ripped windows"? O.o

One thing I for sure want to get is apple pencil support for uikit and I can also test that.

DasLixou · 2025-06-21T16:14:49Z

winit-x11/src/event_processor.rs

+        let Some(DeviceType::Mouse) = self
+            .devices
+            .borrow()
+            .get(&mkdid(event.sourceid as xinput::DeviceId))
+            .map(|device| device.r#type)
+        else {
+            return;
+        };
+


@daxpedda Can you explain why you have done that? I can't quite follow..

DasLixou · 2025-06-21T17:06:42Z

winit-web/src/web_sys/pointer.rs

+                            if button != 0 {
+                                tracing::error!("unexpected touch button id: {button}");
                            }


Original had != 1 but W3C says Touch Contact would be 0

kchibisov · 2025-06-21T17:39:42Z

but what do you mean by "we ripped windows"? O.o

It used to work before due to some common handling in terms of just going through touch iirc, but now there's no tablet at all, so to not regress we need it back. The rest of the backends are entirely optional for e.g. next release, etc.

DasLixou · 2025-06-22T12:07:31Z

Ok so I looked and the X11 backend for sure isn't done yet.

- This adds pen/stylus support. - Move `Force::Calibrated::altitude_angle` to `ToolAngle::altitude`. - `Force::normalized()` now takes a `Option<ToolAngle>` to calculate the perpendicular force. - Just introducing types, no implementation yet!

Add a new `CursorButton` and `ToolButton` type.

Fixed: device events are emitted regardless of cursor type.

DasLixou · 2025-06-22T12:51:21Z

Hmm I'm a bit unsure about the Tool -> Stylus change while reading the web and wayland specs.. should I revert it?

kchibisov · 2025-06-22T22:59:45Z

Yes, to TabletTool, since there's a thing called TabletPad as well, so it'll be more clear in the future that those are related.

kchibisov

I'll give more deep review in terms of API when I'll try to implement Wayland part. For now, it's not really clear for me how to map things (since no browser maps wayland yet) so will take some time, I guess.

kchibisov · 2025-06-28T04:39:56Z

winit-core/src/event.rs

    /// **macOS:** Unsupported.
    Touch(FingerId),
-    Stylus(StylusTool),
+    Tool(ToolKind),


Prefix everything with Tablet please, since it's not clear what tool otherwise(As I initially requested).

My thought was that after a quick search, i didn't find much about how other platforms handle that "tablet pad" buttons and thought I may need to combine tool and pad buttons, but even then a tablet prefix would be smart so yeah I'm gonna change that when I'm back at my pc.

Without Tablet prefix it's not clear what Tool it is, since Tool is rather a broad term I'd say, that's why I've kind of demanded it, not only because of TabletPad.

kchibisov · 2025-08-03T07:49:28Z

Opened #4318 which addresses some issues and adds windows/Wayland.

DasLixou · 2025-08-03T15:40:43Z

Sorry, I didn't have much time because I had to study but had planned to integrate Apple Pencil support next week or so. Glad to see this has still progress and I also feel easier seeing this in better hands than mine. Let's see if I don't forget to add apple pencil support to your continuation then ^^'

kchibisov · 2025-08-03T15:45:37Z

Apple stuff don't block things, we just needed Web Windows for regression to be fixed, since we removed Pressure data for those backends due to recent refactoring.

Good luck with studies.

DasLixou requested review from daxpedda, kchibisov, madsmtm and notgull as code owners June 21, 2025 15:46

kchibisov requested changes Jun 21, 2025

View reviewed changes

DasLixou commented Jun 21, 2025

View reviewed changes

daxpedda and others added 12 commits June 22, 2025 14:09

Rename WindowEvent::MouseButton to CursorButton

ba2e0c2

Add a new `CursorButton` and `ToolButton` type.

Web: Pen/Stylus implementation

d65ae06

Fixed: device events are emitted regardless of cursor type.

add newline back to example

cf29c91

fix spelling

aec3cf0

fix formatting

c60c111

fix mkdid

4b6d2cd

fix fmt again

da4bb29

fix winit/ move

0fcdb46

make ToolState non_exhaustive

198f43a

revert non_exhaustive and fix fmt

b2fcb6a

Update Stylus types

3aeed21

DasLixou force-pushed the pen branch from 314153b to 3aeed21 Compare June 22, 2025 12:09

DasLixou added 2 commits June 22, 2025 14:14

fmt

7f98e3d

fix links

9bd9677

rename again

6169845

fmt

938e57c

kchibisov requested changes Jun 28, 2025

View reviewed changes

kchibisov closed this Aug 3, 2025

madsmtm mentioned this pull request Sep 4, 2025

winit-core:winit: add tablet input support #4318

Merged

Pen/Stylus support #4287

Pen/Stylus support #4287

Uh oh!

Conversation

DasLixou commented Jun 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

DasLixou commented Jun 21, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

kchibisov commented Jun 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

DasLixou commented Jun 21, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

kchibisov commented Jun 21, 2025

Uh oh!

DasLixou commented Jun 22, 2025

Uh oh!

DasLixou commented Jun 22, 2025

Uh oh!

kchibisov commented Jun 22, 2025

Uh oh!

kchibisov left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

kchibisov commented Aug 3, 2025

Uh oh!

DasLixou commented Aug 3, 2025

Uh oh!

kchibisov commented Aug 3, 2025

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

3 participants

DasLixou commented Jun 21, 2025 •

edited

Loading

kchibisov commented Jun 21, 2025 •

edited

Loading