Unify pointer events and support tablet event

Cargo.toml

@@ -244,7 +244,7 @@ wasmtimer = "0.4.2"
 web-sys = "=0.3.85"
 web-time = "1.1"
 wgpu = { version = "29", default-features = false, features = ["std", "wgsl"] }
-winit = { git = "https://github.com/iced-rs/winit.git", rev = "05b8ff17a06562f0a10bb46e6eaacbe2a95cb5ed", default-features = false, features = ["rwh_06"] }
+winit = { git = "https://github.com/rust-windowing/winit.git", rev = "f5e20bd7da25934f39abe8dc44a0597110ef6357", default-features = false }
 
 [workspace.lints.rust]
 rust_2018_idioms = { level = "deny", priority = -1 }

benches/cpu.rs

@@ -2,7 +2,7 @@
 use criterion::{Bencher, Criterion, criterion_group, criterion_main};
 
 use iced::border;
-use iced::mouse;
+use iced::pointer::mouse;
 use iced::widget::{canvas, center_y, column, container, row, scrollable, space, text};
 use iced::{Center, Color, Element, Fill, Length, Never, Point, Rectangle, Size, Theme};
 use iced_renderer::Renderer;

benches/wgpu.rs

@@ -2,7 +2,7 @@
 use criterion::{Bencher, Criterion, criterion_group, criterion_main};
 
 use iced::alignment;
-use iced::mouse;
+use iced::pointer::mouse;
 use iced::widget::{canvas, scrollable, stack, text};
 use iced::{Color, Element, Font, Length, Pixels, Point, Rectangle, Size, Theme};
 use iced_wgpu::Renderer;

core/src/element.rs

@@ -1,6 +1,6 @@
 use crate::layout;
-use crate::mouse;
 use crate::overlay;
+use crate::pointer::mouse;
 use crate::renderer;
 use crate::shell;
 use crate::widget;

core/src/event.rs

@@ -2,8 +2,7 @@
 use crate::clipboard;
 use crate::input_method;
 use crate::keyboard;
-use crate::mouse;
-use crate::touch;
+use crate::pointer;
 use crate::window;
 
 /// A user interface event.
@@ -17,15 +16,12 @@ pub enum Event {
     /// A keyboard event
     Keyboard(keyboard::Event),
 
-    /// A mouse event
-    Mouse(mouse::Event),
+    /// A pointer event
+    Pointer(pointer::Event),
 
     /// A window event
     Window(window::Event),
 
-    /// A touch event
-    Touch(touch::Event),
-
     /// An input method event
     InputMethod(input_method::Event),
 

core/src/lib.rs

@@ -23,16 +23,15 @@ pub mod input_method;
 pub mod keyboard;
 pub mod layout;
 pub mod length;
-pub mod mouse;
 pub mod overlay;
 pub mod padding;
+pub mod pointer;
 pub mod renderer;
 pub mod shell;
 pub mod svg;
 pub mod text;
 pub mod theme;
 pub mod time;
-pub mod touch;
 pub mod widget;
 pub mod window;
 

core/src/overlay.rs

@@ -8,7 +8,7 @@ pub use group::Group;
 pub use nested::Nested;
 
 use crate::layout;
-use crate::mouse;
+use crate::pointer::mouse;
 use crate::renderer;
 use crate::widget;
 use crate::widget::Tree;

core/src/overlay/element.rs

@@ -1,7 +1,7 @@
 pub use crate::Overlay;
 
 use crate::layout;
-use crate::mouse;
+use crate::pointer::mouse;
 use crate::renderer;
 use crate::shell;
 use crate::widget;

core/src/overlay/group.rs

@@ -1,6 +1,6 @@
 use crate::layout;
-use crate::mouse;
 use crate::overlay;
+use crate::pointer::mouse;
 use crate::renderer;
 use crate::widget;
 use crate::{Event, Layout, Overlay, Shell, Size};

core/src/overlay/nested.rs

@@ -1,7 +1,7 @@
 use crate::event;
 use crate::layout;
-use crate::mouse;
 use crate::overlay;
+use crate::pointer::mouse;
 use crate::renderer;
 use crate::widget;
 use crate::{Event, Layout, Shell, Size};

core/src/pointer.rs

@@ -0,0 +1,65 @@
+//! Handle pointer events.
+
+pub mod button;
+pub mod mouse;
+pub mod tablet;
+pub mod touch;
+
+mod event;
+
+pub use event::Event;
+
+/// The kind of device that produced a pointer event.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub enum Kind {
+    /// A mouse.
+    Mouse,
+
+    /// A finger touching a screen.
+    Touch(touch::Finger),
+
+    /// A tablet tool.
+    TabletTool(tablet::Kind),
+
+    /// An unknown pointer device.
+    Unknown,
+}
+
+/// The device and associated data that produced a pointer event.
+#[derive(Debug, Clone, PartialEq)]
+pub enum Source {
+    /// A mouse.
+    Mouse,
+
+    /// A finger touching a screen.
+    Touch {
+        /// The identifier of the finger.
+        finger_id: touch::Finger,
+
+        /// The force of the touch, if reported by the device.
+        force: Option<touch::Force>,
+    },
+
+    /// A tablet tool.
+    TabletTool {
+        /// The kind of tablet tool.
+        kind: tablet::Kind,
+
+        /// Data describing how the tool is held and used.
+        data: tablet::Data,
+    },
+
+    /// An unknown pointer device.
+    Unknown,
+}
+
+impl From<Source> for crate::pointer::Kind {
+    fn from(source: Source) -> Self {
+        match source {
+            Source::Mouse => Self::Mouse,
+            Source::Touch { finger_id, .. } => Self::Touch(finger_id),
+            Source::TabletTool { kind, .. } => Self::TabletTool(kind),
+            Source::Unknown => Self::Unknown,
+        }
+    }
+}

core/src/pointer/button.rs

@@ -0,0 +1,34 @@
+//! Handle pointer buttons.
+
+use crate::pointer::{mouse, tablet, touch};
+
+/// The source and button of a pointer button event.
+#[derive(Debug, Clone, PartialEq)]
+pub enum Source {
+    /// A mouse button.
+    Mouse(mouse::Button),
+
+    /// A touch contact.
+    Touch {
+        /// The identifier of the finger.
+        finger_id: touch::Finger,
+
+        /// The force of the touch, if reported by the device.
+        force: Option<touch::Force>,
+    },
+
+    /// A tablet tool button.
+    TabletTool {
+        /// The kind of tablet tool.
+        kind: tablet::Kind,
+
+        /// The button that changed state.
+        button: tablet::Button,
+
+        /// Data describing how the tool is held and used.
+        data: tablet::Data,
+    },
+
+    /// A button from an unknown pointer source.
+    Unknown(u16),
+}