Desktop: Support input from drawing tablets (#4354)

* Rename the editor mouse state types to Pointer* and the input_ modules

* Add optional pen attributes to the editor pointer state types

* Desktop: Send tablet pointer clicks to CEF as mouse clicks

* Desktop: End pointer lock and pending window drags on any left-equivalent release

* Desktop: Route pointer input carrying pen attributes directly to the editor

* Desktop: Route wheel and pinch input inside the viewport directly to the editor

* Desktop: Track double clicks on the direct editor route

* Desktop: Move the pointer lock position into InputState

* Restore the input state pointer position when pointer lock ends (review)

* Fix pen input being swallowed by Windows resize helper

* Update winit to 0.31.0-beta.2 from crates.io

editor/src/messages/input_mapper/input_mapper_message.rs

@@ -1,5 +1,5 @@
-use crate::messages::input_mapper::utility_types::input_keyboard::Key;
-use crate::messages::input_mapper::utility_types::input_mouse::MouseButton;
+use crate::messages::input_mapper::utility_types::keyboard::Key;
+use crate::messages::input_mapper::utility_types::pointer::MouseButton;
 use crate::messages::prelude::*;
 
 #[impl_message(Message, KeyMappingMessage, Lookup)]

editor/src/messages/input_mapper/input_mapper_message_handler.rs

@@ -1,7 +1,7 @@
-use super::utility_types::input_keyboard::KeysGroup;
+use super::utility_types::keyboard::KeysGroup;
 use super::utility_types::misc::Mapping;
 use crate::application::Editor;
-use crate::messages::input_mapper::utility_types::input_keyboard::{self, Key};
+use crate::messages::input_mapper::utility_types::keyboard::{self, Key};
 use crate::messages::input_mapper::utility_types::misc::MappingEntry;
 use crate::messages::prelude::*;
 
@@ -58,7 +58,7 @@ impl InputMapperMessageHandler {
 				.map(|i| {
 					// TODO: Use a safe solution eventually
 					assert!(
-						i < input_keyboard::NUMBER_OF_KEYS,
+						i < keyboard::NUMBER_OF_KEYS,
 						"Attempting to convert a Key with enum index {i}, which is larger than the number of Key enums",
 					);
 					(i as u8).try_into().unwrap()

editor/src/messages/input_mapper/input_mappings.rs

@@ -1,11 +1,11 @@
 use crate::application::Editor;
 use crate::consts::{BIG_NUDGE_AMOUNT, BRUSH_SIZE_CHANGE_KEYBOARD, NUDGE_AMOUNT};
 use crate::messages::input_mapper::key_mapping::MappingVariant;
-use crate::messages::input_mapper::utility_types::input_keyboard::{Key, KeyStates};
-use crate::messages::input_mapper::utility_types::input_mouse::MouseButton;
+use crate::messages::input_mapper::utility_types::keyboard::{Key, KeyStates};
 use crate::messages::input_mapper::utility_types::macros::*;
 use crate::messages::input_mapper::utility_types::misc::MappingEntry;
 use crate::messages::input_mapper::utility_types::misc::{KeyMappingEntries, Mapping};
+use crate::messages::input_mapper::utility_types::pointer::MouseButton;
 use crate::messages::portfolio::document::node_graph::utility_types::Direction;
 use crate::messages::portfolio::document::utility_types::misc::GroupFolderType;
 use crate::messages::prelude::*;

editor/src/messages/input_mapper/key_mapping/key_mapping_message_handler.rs

@@ -1,5 +1,5 @@
 use crate::messages::input_mapper::input_mapper_message_handler::InputMapperMessageContext;
-use crate::messages::input_mapper::utility_types::input_keyboard::KeysGroup;
+use crate::messages::input_mapper::utility_types::keyboard::KeysGroup;
 use crate::messages::prelude::*;
 
 #[derive(ExtractField)]

editor/src/messages/input_mapper/utility_types/macros.rs

@@ -162,7 +162,7 @@ macro_rules! action_shortcut {
 macro_rules! action_shortcut_manual {
 	($($keys:expr),*) => {
 		Some(crate::messages::input_mapper::utility_types::misc::ActionShortcut::Shortcut(
-			crate::messages::input_mapper::utility_types::input_keyboard::LabeledShortcut(vec![$($keys.into()),*]).into(),
+			crate::messages::input_mapper::utility_types::keyboard::LabeledShortcut(vec![$($keys.into()),*]).into(),
 		))
 	};
 }

editor/src/messages/input_mapper/utility_types/misc.rs

@@ -1,7 +1,7 @@
-use super::input_keyboard::{KeysGroup, LabeledShortcut, all_required_modifiers_pressed};
+use super::keyboard::{KeysGroup, LabeledShortcut, all_required_modifiers_pressed};
 use crate::messages::input_mapper::key_mapping::MappingVariant;
-use crate::messages::input_mapper::utility_types::input_keyboard::{KeyStates, NUMBER_OF_KEYS};
-use crate::messages::input_mapper::utility_types::input_mouse::NUMBER_OF_MOUSE_BUTTONS;
+use crate::messages::input_mapper::utility_types::keyboard::{KeyStates, NUMBER_OF_KEYS};
+use crate::messages::input_mapper::utility_types::pointer::NUMBER_OF_MOUSE_BUTTONS;
 use crate::messages::prelude::*;
 use core::time::Duration;
 

editor/src/messages/input_mapper/utility_types/mod.rs

@@ -1,4 +1,5 @@
-pub mod input_keyboard;
-pub mod input_mouse;
+pub mod keyboard;
+pub mod pointer;
+
 pub mod macros;
 pub mod misc;

editor/src/messages/input_mapper/utility_types/pointer.rs

@@ -50,15 +50,20 @@ impl ScrollDelta {
 	}
 }
 
-// TODO: Document the difference between this and EditorMouseState
+// TODO: Document the difference between this and EditorPointerState
 #[derive(Debug, Copy, Clone, Default, PartialEq, serde::Serialize, serde::Deserialize)]
-pub struct MouseState {
+pub struct PointerState {
 	pub position: ViewportPosition,
 	pub mouse_keys: MouseKeys,
 	pub scroll_delta: ScrollDelta,
+	pub pressure: Option<f64>,
+	pub tilt: Option<DVec2>,
+	pub twist: Option<f64>,
+	pub wheel: Option<f64>,
+	pub eraser: bool,
 }
 
-impl MouseState {
+impl PointerState {
 	pub fn finish_transaction(&self, drag_start: DVec2, responses: &mut VecDeque<Message>) {
 		let drag_too_small = drag_start.distance(self.position) <= DRAG_THRESHOLD;
 		let response = if drag_too_small { DocumentMessage::AbortTransaction } else { DocumentMessage::EndTransaction };
@@ -66,15 +71,20 @@ impl MouseState {
 	}
 }
 
-// TODO: Document the difference between this and MouseState
+// TODO: Document the difference between this and PointerState
 #[derive(Debug, Copy, Clone, Default, PartialEq, serde::Serialize, serde::Deserialize)]
-pub struct EditorMouseState {
+pub struct EditorPointerState {
 	pub editor_position: EditorPosition,
 	pub mouse_keys: MouseKeys,
 	pub scroll_delta: ScrollDelta,
+	pub pressure: Option<f64>,
+	pub tilt: Option<DVec2>,
+	pub twist: Option<f64>,
+	pub wheel: Option<f64>,
+	pub eraser: bool,
 }
 
-impl EditorMouseState {
+impl EditorPointerState {
 	pub fn from_keys_and_editor_position(keys: u8, editor_position: EditorPosition) -> Self {
 		// TODO: Some graphic tablets send key codes not mentioned in the spec. In the future we would like to support these as well.
 		let mouse_keys = MouseKeys::from_bits_truncate(keys);
@@ -82,15 +92,20 @@ impl EditorMouseState {
 		Self {
 			editor_position,
 			mouse_keys,
-			scroll_delta: ScrollDelta::default(),
+			..Default::default()
 		}
 	}
 
-	pub fn to_mouse_state(&self, viewport: &ViewportMessageHandler) -> MouseState {
-		MouseState {
+	pub fn to_pointer_state(&self, viewport: &ViewportMessageHandler) -> PointerState {
+		PointerState {
 			position: (viewport.logical(self.editor_position) - viewport.offset()).into(),
 			mouse_keys: self.mouse_keys,
 			scroll_delta: self.scroll_delta,
+			pressure: self.pressure,
+			tilt: self.tilt,
+			twist: self.twist,
+			wheel: self.wheel,
+			eraser: self.eraser,
 		}
 	}
 }

editor/src/messages/input_preprocessor/input_preprocessor_message.rs

@@ -1,17 +1,17 @@
-use crate::messages::input_mapper::utility_types::input_keyboard::{Key, ModifierKeys};
-use crate::messages::input_mapper::utility_types::input_mouse::EditorMouseState;
+use crate::messages::input_mapper::utility_types::keyboard::{Key, ModifierKeys};
+use crate::messages::input_mapper::utility_types::pointer::EditorPointerState;
 use crate::messages::prelude::*;
 
 #[impl_message(Message, InputPreprocessor)]
 #[derive(PartialEq, Clone, Debug, serde::Serialize, serde::Deserialize)]
 pub enum InputPreprocessorMessage {
-	DoubleClick { editor_mouse_state: EditorMouseState, modifier_keys: ModifierKeys },
+	DoubleClick { editor_mouse_state: EditorPointerState, modifier_keys: ModifierKeys },
 	KeyDown { key: Key, key_repeat: bool, modifier_keys: ModifierKeys },
 	KeyUp { key: Key, key_repeat: bool, modifier_keys: ModifierKeys },
-	PointerDown { editor_mouse_state: EditorMouseState, modifier_keys: ModifierKeys },
-	PointerMove { editor_mouse_state: EditorMouseState, modifier_keys: ModifierKeys },
-	PointerUp { editor_mouse_state: EditorMouseState, modifier_keys: ModifierKeys },
-	PointerShake { editor_mouse_state: EditorMouseState, modifier_keys: ModifierKeys },
+	PointerDown { editor_mouse_state: EditorPointerState, modifier_keys: ModifierKeys },
+	PointerMove { editor_mouse_state: EditorPointerState, modifier_keys: ModifierKeys },
+	PointerUp { editor_mouse_state: EditorPointerState, modifier_keys: ModifierKeys },
+	PointerShake { editor_mouse_state: EditorPointerState, modifier_keys: ModifierKeys },
 	CurrentTime { timestamp: u64 },
-	WheelScroll { editor_mouse_state: EditorMouseState, modifier_keys: ModifierKeys },
+	WheelScroll { editor_mouse_state: EditorPointerState, modifier_keys: ModifierKeys },
 }

editor/src/messages/input_preprocessor/input_preprocessor_message_handler.rs

@@ -1,7 +1,7 @@
 use crate::application::Editor;
-use crate::messages::input_mapper::utility_types::input_keyboard::{Key, KeyStates, ModifierKeys};
-use crate::messages::input_mapper::utility_types::input_mouse::{MouseButton, MouseKeys, MouseState};
+use crate::messages::input_mapper::utility_types::keyboard::{Key, KeyStates, ModifierKeys};
 use crate::messages::input_mapper::utility_types::misc::FrameTimeInfo;
+use crate::messages::input_mapper::utility_types::pointer::{MouseButton, MouseKeys, PointerState};
 use crate::messages::prelude::*;
 use std::time::Duration;
 
@@ -15,7 +15,7 @@ pub struct InputPreprocessorMessageHandler {
 	pub frame_time: FrameTimeInfo,
 	pub time: u64,
 	pub keyboard: KeyStates,
-	pub mouse: MouseState,
+	pub mouse: PointerState,
 }
 
 #[message_handler_data]
@@ -27,10 +27,10 @@ impl<'a> MessageHandler<InputPreprocessorMessage, InputPreprocessorMessageContex
 			InputPreprocessorMessage::DoubleClick { editor_mouse_state, modifier_keys } => {
 				self.update_states_of_modifier_keys(modifier_keys, responses);
 
-				let mouse_state = editor_mouse_state.to_mouse_state(viewport);
-				self.mouse.position = mouse_state.position;
+				let pointer_state = editor_mouse_state.to_pointer_state(viewport);
+				self.mouse.position = pointer_state.position;
 
-				for key in mouse_state.mouse_keys {
+				for key in pointer_state.mouse_keys {
 					responses.add(InputMapperMessage::DoubleClick(match key {
 						MouseKeys::LEFT => MouseButton::Left,
 						MouseKeys::RIGHT => MouseButton::Right,
@@ -60,35 +60,35 @@ impl<'a> MessageHandler<InputPreprocessorMessage, InputPreprocessorMessageContex
 			InputPreprocessorMessage::PointerDown { editor_mouse_state, modifier_keys } => {
 				self.update_states_of_modifier_keys(modifier_keys, responses);
 
-				let mouse_state = editor_mouse_state.to_mouse_state(viewport);
-				self.mouse.position = mouse_state.position;
+				let pointer_state = editor_mouse_state.to_pointer_state(viewport);
+				self.mouse.position = pointer_state.position;
 
-				self.translate_mouse_event(mouse_state, true, responses);
+				self.translate_mouse_event(pointer_state, true, responses);
 			}
 			InputPreprocessorMessage::PointerMove { editor_mouse_state, modifier_keys } => {
 				self.update_states_of_modifier_keys(modifier_keys, responses);
 
-				let mouse_state = editor_mouse_state.to_mouse_state(viewport);
-				self.mouse.position = mouse_state.position;
+				let pointer_state = editor_mouse_state.to_pointer_state(viewport);
+				self.mouse.position = pointer_state.position;
 
 				responses.add(InputMapperMessage::PointerMove);
 
 				// While any pointer button is already down, additional button down events are not reported, but they are sent as `pointermove` events
-				self.translate_mouse_event(mouse_state, false, responses);
+				self.translate_mouse_event(pointer_state, false, responses);
 			}
 			InputPreprocessorMessage::PointerUp { editor_mouse_state, modifier_keys } => {
 				self.update_states_of_modifier_keys(modifier_keys, responses);
 
-				let mouse_state = editor_mouse_state.to_mouse_state(viewport);
-				self.mouse.position = mouse_state.position;
+				let pointer_state = editor_mouse_state.to_pointer_state(viewport);
+				self.mouse.position = pointer_state.position;
 
-				self.translate_mouse_event(mouse_state, false, responses);
+				self.translate_mouse_event(pointer_state, false, responses);
 			}
 			InputPreprocessorMessage::PointerShake { editor_mouse_state, modifier_keys } => {
 				self.update_states_of_modifier_keys(modifier_keys, responses);
 
-				let mouse_state = editor_mouse_state.to_mouse_state(viewport);
-				self.mouse.position = mouse_state.position;
+				let pointer_state = editor_mouse_state.to_pointer_state(viewport);
+				self.mouse.position = pointer_state.position;
 
 				responses.add(InputMapperMessage::PointerShake);
 			}
@@ -100,9 +100,9 @@ impl<'a> MessageHandler<InputPreprocessorMessage, InputPreprocessorMessageContex
 			InputPreprocessorMessage::WheelScroll { editor_mouse_state, modifier_keys } => {
 				self.update_states_of_modifier_keys(modifier_keys, responses);
 
-				let mouse_state = editor_mouse_state.to_mouse_state(viewport);
-				self.mouse.position = mouse_state.position;
-				self.mouse.scroll_delta = mouse_state.scroll_delta;
+				let pointer_state = editor_mouse_state.to_pointer_state(viewport);
+				self.mouse.position = pointer_state.position;
+				self.mouse.scroll_delta = pointer_state.scroll_delta;
 
 				responses.add(InputMapperMessage::WheelScroll);
 			}
@@ -116,7 +116,7 @@ impl<'a> MessageHandler<InputPreprocessorMessage, InputPreprocessorMessageContex
 }
 
 impl InputPreprocessorMessageHandler {
-	fn translate_mouse_event(&mut self, mut new_state: MouseState, allow_first_button_down: bool, responses: &mut VecDeque<Message>) {
+	fn translate_mouse_event(&mut self, mut new_state: PointerState, allow_first_button_down: bool, responses: &mut VecDeque<Message>) {
 		let click_mappings = [
 			(MouseKeys::LEFT, Key::MouseLeft),
 			(MouseKeys::RIGHT, Key::MouseRight),
@@ -185,18 +185,17 @@ impl InputPreprocessorMessageHandler {
 
 #[cfg(test)]
 mod test {
-	use crate::messages::input_mapper::utility_types::input_keyboard::{Key, ModifierKeys};
-	use crate::messages::input_mapper::utility_types::input_mouse::{EditorMouseState, MouseKeys, ScrollDelta};
+	use crate::messages::input_mapper::utility_types::keyboard::{Key, ModifierKeys};
+	use crate::messages::input_mapper::utility_types::pointer::EditorPointerState;
 	use crate::messages::prelude::*;
 
 	#[test]
 	fn process_action_mouse_move_handle_modifier_keys() {
 		let mut input_preprocessor = InputPreprocessorMessageHandler::default();
 
-		let editor_mouse_state = EditorMouseState {
+		let editor_mouse_state = EditorPointerState {
 			editor_position: (4., 809.).into(),
-			mouse_keys: MouseKeys::default(),
-			scroll_delta: ScrollDelta::default(),
+			..Default::default()
 		};
 		let modifier_keys = ModifierKeys::ALT;
 		let message = InputPreprocessorMessage::PointerMove { editor_mouse_state, modifier_keys };
@@ -216,7 +215,7 @@ mod test {
 	fn process_action_mouse_down_handle_modifier_keys() {
 		let mut input_preprocessor = InputPreprocessorMessageHandler::default();
 
-		let editor_mouse_state = EditorMouseState::default();
+		let editor_mouse_state = EditorPointerState::default();
 		let modifier_keys = ModifierKeys::CONTROL;
 		let message = InputPreprocessorMessage::PointerDown { editor_mouse_state, modifier_keys };
 
@@ -235,7 +234,7 @@ mod test {
 	fn process_action_mouse_up_handle_modifier_keys() {
 		let mut input_preprocessor = InputPreprocessorMessageHandler::default();
 
-		let editor_mouse_state = EditorMouseState::default();
+		let editor_mouse_state = EditorPointerState::default();
 		let modifier_keys = ModifierKeys::SHIFT;
 		let message = InputPreprocessorMessage::PointerUp { editor_mouse_state, modifier_keys };
 

editor/src/messages/layout/layout_message_handler.rs

@@ -1,4 +1,4 @@
-use crate::messages::input_mapper::utility_types::input_keyboard::KeysGroup;
+use crate::messages::input_mapper::utility_types::keyboard::KeysGroup;
 use crate::messages::layout::utility_types::widget_prelude::*;
 use crate::messages::portfolio::document::node_graph::document_node_definitions::DefinitionIdentifier;
 use crate::messages::prelude::*;

editor/src/messages/layout/utility_types/layout_widget.rs

@@ -2,7 +2,7 @@ use super::widgets::button_widgets::*;
 use super::widgets::input_widgets::*;
 use super::widgets::label_widgets::*;
 use crate::application::generate_uuid;
-use crate::messages::input_mapper::utility_types::input_keyboard::KeysGroup;
+use crate::messages::input_mapper::utility_types::keyboard::KeysGroup;
 use crate::messages::prelude::*;
 use std::collections::HashMap;
 use std::collections::hash_map::DefaultHasher;

editor/src/messages/portfolio/document/document_message.rs

@@ -2,7 +2,7 @@ use std::path::PathBuf;
 use std::sync::Arc;
 
 use super::utility_types::misc::{GroupFolderType, SnappingState};
-use crate::messages::input_mapper::utility_types::input_keyboard::Key;
+use crate::messages::input_mapper::utility_types::keyboard::Key;
 use crate::messages::portfolio::document::data_panel::DataPanelMessage;
 use crate::messages::portfolio::document::overlays::utility_types::{OverlayContext, OverlaysType};
 use crate::messages::portfolio::document::utility_types::document_metadata::LayerNodeIdentifier;

editor/src/messages/portfolio/document/navigation/navigation_message.rs

@@ -1,4 +1,4 @@
-use crate::messages::input_mapper::utility_types::input_keyboard::Key;
+use crate::messages::input_mapper::utility_types::keyboard::Key;
 use crate::messages::prelude::*;
 use glam::DVec2;
 

editor/src/messages/portfolio/document/navigation/navigation_message_handler.rs

@@ -4,8 +4,8 @@ use crate::consts::{
 	VIEWPORT_ZOOM_TO_FIT_PADDING_SCALE_FACTOR,
 };
 use crate::messages::frontend::utility_types::MouseCursorIcon;
-use crate::messages::input_mapper::utility_types::input_keyboard::{Key, MouseMotion};
-use crate::messages::input_mapper::utility_types::input_mouse::ViewportPosition;
+use crate::messages::input_mapper::utility_types::keyboard::{Key, MouseMotion};
+use crate::messages::input_mapper::utility_types::pointer::ViewportPosition;
 use crate::messages::portfolio::document::navigation::utility_types::NavigationOperation;
 use crate::messages::portfolio::document::utility_types::misc::PTZ;
 use crate::messages::portfolio::document::utility_types::network_interface::NodeNetworkInterface;

editor/src/messages/portfolio/document/node_graph/node_graph_message.rs

@@ -1,5 +1,5 @@
 use super::utility_types::Direction;
-use crate::messages::input_mapper::utility_types::input_keyboard::Key;
+use crate::messages::input_mapper::utility_types::keyboard::Key;
 use crate::messages::portfolio::document::node_graph::document_node_definitions::DefinitionIdentifier;
 use crate::messages::portfolio::document::utility_types::document_metadata::LayerNodeIdentifier;
 use crate::messages::portfolio::document::utility_types::network_interface::{ImportOrExport, InputConnector, NodeTemplate, OutputConnector};

editor/src/messages/portfolio/document/utility_types/transformation.rs

@@ -392,7 +392,7 @@ impl TransformOperation {
 	}
 
 	pub fn hints(&self, responses: &mut VecDeque<Message>, local: bool) {
-		use crate::messages::input_mapper::utility_types::input_keyboard::{Key, MouseMotion};
+		use crate::messages::input_mapper::utility_types::keyboard::{Key, MouseMotion};
 		use crate::messages::tool::utility_types::{HintData, HintGroup, HintInfo};
 
 		let mut input_hints = Vec::new();

editor/src/messages/portfolio/portfolio_message_handler.rs

@@ -6,7 +6,7 @@ use crate::consts::{DEFAULT_DOCUMENT_NAME, FILE_EXTENSION, GDD_FILE_EXTENSION};
 use crate::messages::animation::TimingInformation;
 use crate::messages::dialog::simple_dialogs;
 use crate::messages::frontend::utility_types::{DocumentInfo, PersistedState};
-use crate::messages::input_mapper::utility_types::input_keyboard::Key;
+use crate::messages::input_mapper::utility_types::keyboard::Key;
 use crate::messages::input_mapper::utility_types::macros::{action_shortcut, action_shortcut_manual};
 use crate::messages::layout::utility_types::widget_prelude::*;
 use crate::messages::portfolio::document::DocumentMessageContext;

editor/src/messages/tool/common_functionality/resize.rs

@@ -1,4 +1,4 @@
-use crate::messages::input_mapper::utility_types::input_keyboard::Key;
+use crate::messages::input_mapper::utility_types::keyboard::Key;
 use crate::messages::portfolio::document::graph_operation::utility_types::TransformIn;
 use crate::messages::portfolio::document::utility_types::document_metadata::LayerNodeIdentifier;
 use crate::messages::prelude::*;

editor/src/messages/tool/tool_messages/freehand_tool.rs

@@ -422,7 +422,7 @@ fn extend_path_with_next_segment(tool_data: &mut FreehandToolData, position: DVe
 
 #[cfg(test)]
 mod test_freehand {
-	use crate::messages::input_mapper::utility_types::input_mouse::{EditorMouseState, MouseKeys, ScrollDelta};
+	use crate::messages::input_mapper::utility_types::pointer::{EditorPointerState, MouseKeys};
 	use crate::messages::portfolio::document::graph_operation::utility_types::TransformIn;
 	use crate::messages::tool::common_functionality::graph_modification_utils::{NodeGraphLayer, get_stroke_width};
 	use crate::messages::tool::common_functionality::stroke_options::StrokeOptionsUpdate;
@@ -530,10 +530,10 @@ mod test_freehand {
 		let last_initial_point = initial_points[initial_points.len() - 1];
 		editor
 			.mouseup(
-				EditorMouseState {
+				EditorPointerState {
 					editor_position: last_initial_point,
 					mouse_keys: MouseKeys::empty(),
-					scroll_delta: ScrollDelta::default(),
+					..Default::default()
 				},
 				ModifierKeys::empty(),
 			)
@@ -589,10 +589,10 @@ mod test_freehand {
 		let last_extension_point = extension_points[extension_points.len() - 1];
 		editor
 			.mouseup(
-				EditorMouseState {
+				EditorPointerState {
 					editor_position: last_extension_point,
 					mouse_keys: MouseKeys::empty(),
-					scroll_delta: ScrollDelta::default(),
+					..Default::default()
 				},
 				ModifierKeys::empty(),
 			)
@@ -643,10 +643,10 @@ mod test_freehand {
 		let last_initial_point = initial_points[initial_points.len() - 1];
 		editor
 			.mouseup(
-				EditorMouseState {
+				EditorPointerState {
 					editor_position: last_initial_point,
 					mouse_keys: MouseKeys::empty(),
-					scroll_delta: ScrollDelta::default(),
+					..Default::default()
 				},
 				ModifierKeys::empty(),
 			)
@@ -678,10 +678,10 @@ mod test_freehand {
 
 		editor
 			.mousedown(
-				EditorMouseState {
+				EditorPointerState {
 					editor_position: first_second_point,
 					mouse_keys: MouseKeys::LEFT,
-					scroll_delta: ScrollDelta::default(),
+					..Default::default()
 				},
 				ModifierKeys::SHIFT,
 			)
@@ -694,10 +694,10 @@ mod test_freehand {
 		let last_second_point = second_path_points[second_path_points.len() - 1];
 		editor
 			.mouseup(
-				EditorMouseState {
+				EditorPointerState {
 					editor_position: last_second_point,
 					mouse_keys: MouseKeys::empty(),
-					scroll_delta: ScrollDelta::default(),
+					..Default::default()
 				},
 				ModifierKeys::SHIFT,
 			)
@@ -767,10 +767,10 @@ mod test_freehand {
 		let last_point = points[points.len() - 1];
 		editor
 			.mouseup(
-				EditorMouseState {
+				EditorPointerState {
 					editor_position: last_point,
 					mouse_keys: MouseKeys::empty(),
-					scroll_delta: ScrollDelta::default(),
+					..Default::default()
 				},
 				ModifierKeys::empty(),
 			)

editor/src/messages/tool/tool_messages/gradient_tool.rs

@@ -2051,8 +2051,7 @@ enum GradientDragHintState {
 mod test_gradient {
 	use super::{gradient_to_viewport_transform, midpoint_diamonds, midpoint_ratio_at};
 	use crate::consts::{GRADIENT_MIDPOINT_MAX, GRADIENT_MIDPOINT_MIN};
-	use crate::messages::input_mapper::utility_types::input_mouse::EditorMouseState;
-	use crate::messages::input_mapper::utility_types::input_mouse::ScrollDelta;
+	use crate::messages::input_mapper::utility_types::pointer::EditorPointerState;
 	use crate::messages::portfolio::document::graph_operation::utility_types::TransformIn;
 	use crate::messages::portfolio::document::utility_types::misc::GroupFolderType;
 	use crate::messages::portfolio::document::utility_types::network_interface::{InputConnector, OutputConnector};
@@ -2525,10 +2524,10 @@ mod test_gradient {
 		editor.move_mouse(end_pos.x, end_pos.y, ModifierKeys::empty(), MouseKeys::LEFT).await;
 		editor
 			.mouseup(
-				EditorMouseState {
+				EditorPointerState {
 					editor_position: end_pos,
 					mouse_keys: MouseKeys::empty(),
-					scroll_delta: ScrollDelta::default(),
+					..Default::default()
 				},
 				ModifierKeys::empty(),
 			)
@@ -2579,10 +2578,10 @@ mod test_gradient {
 		let click_position = DVec2::new(25., 0.);
 		editor
 			.mousedown(
-				EditorMouseState {
+				EditorPointerState {
 					editor_position: click_position,
 					mouse_keys: MouseKeys::LEFT,
-					scroll_delta: ScrollDelta::default(),
+					..Default::default()
 				},
 				ModifierKeys::empty(),
 			)
@@ -2593,10 +2592,10 @@ mod test_gradient {
 
 		editor
 			.mouseup(
-				EditorMouseState {
+				EditorPointerState {
 					editor_position: drag_position,
 					mouse_keys: MouseKeys::empty(),
-					scroll_delta: ScrollDelta::default(),
+					..Default::default()
 				},
 				ModifierKeys::empty(),
 			)
@@ -2658,10 +2657,10 @@ mod test_gradient {
 		editor.left_mousedown(position2.x, position2.y, ModifierKeys::empty()).await;
 		editor
 			.mouseup(
-				EditorMouseState {
+				EditorPointerState {
 					editor_position: position2,
 					mouse_keys: MouseKeys::empty(),
-					scroll_delta: ScrollDelta::default(),
+					..Default::default()
 				},
 				ModifierKeys::empty(),
 			)
@@ -2907,10 +2906,10 @@ mod test_gradient {
 		editor.move_mouse(new_viewport_end.x, new_viewport_end.y, ModifierKeys::empty(), MouseKeys::LEFT).await;
 		editor
 			.mouseup(
-				EditorMouseState {
+				EditorPointerState {
 					editor_position: new_viewport_end,
 					mouse_keys: MouseKeys::empty(),
-					scroll_delta: ScrollDelta::default(),
+					..Default::default()
 				},
 				ModifierKeys::empty(),
 			)
@@ -2984,10 +2983,10 @@ mod test_gradient {
 		editor.move_mouse(new_viewport_end.x, new_viewport_end.y, ModifierKeys::empty(), MouseKeys::LEFT).await;
 		editor
 			.mouseup(
-				EditorMouseState {
+				EditorPointerState {
 					editor_position: new_viewport_end,
 					mouse_keys: MouseKeys::empty(),
-					scroll_delta: ScrollDelta::default(),
+					..Default::default()
 				},
 				ModifierKeys::empty(),
 			)

editor/src/messages/tool/tool_messages/mod.rs

@@ -14,7 +14,7 @@ pub mod text_tool;
 
 pub mod tool_prelude {
 	pub use crate::messages::frontend::utility_types::MouseCursorIcon;
-	pub use crate::messages::input_mapper::utility_types::input_keyboard::{Key, MouseMotion};
+	pub use crate::messages::input_mapper::utility_types::keyboard::{Key, MouseMotion};
 	pub use crate::messages::layout::utility_types::widget_prelude::*;
 	pub use crate::messages::prelude::*;
 	pub use crate::messages::tool::utility_types::{EventToMessageMap, Fsm, ToolActionMessageContext, ToolMetadata, ToolTransition, ToolType};

editor/src/messages/tool/tool_messages/pen_tool.rs

@@ -1,6 +1,6 @@
 use super::tool_prelude::*;
 use crate::consts::{COLOR_OVERLAY_BLUE, COLOR_OVERLAY_BLUE_05, HIDE_HANDLE_DISTANCE, LINE_ROTATE_SNAP_ANGLE, SEGMENT_OVERLAY_SIZE};
-use crate::messages::input_mapper::utility_types::input_mouse::MouseKeys;
+use crate::messages::input_mapper::utility_types::pointer::MouseKeys;
 use crate::messages::portfolio::document::node_graph::document_node_definitions::resolve_network_node_type;
 use crate::messages::portfolio::document::overlays::utility_functions::path_overlays;
 use crate::messages::portfolio::document::overlays::utility_types::{DrawHandles, OverlayContext};

editor/src/messages/tool/tool_messages/select_tool.rs

@@ -2,7 +2,7 @@
 
 use super::tool_prelude::*;
 use crate::consts::*;
-use crate::messages::input_mapper::utility_types::input_mouse::ViewportPosition;
+use crate::messages::input_mapper::utility_types::pointer::ViewportPosition;
 use crate::messages::portfolio::document::graph_operation::utility_types::TransformIn;
 use crate::messages::portfolio::document::overlays::utility_types::OverlayContext;
 use crate::messages::portfolio::document::utility_types::document_metadata::{DocumentMetadata, LayerNodeIdentifier};

editor/src/messages/tool/tool_messages/spline_tool.rs

@@ -1,6 +1,6 @@
 use super::tool_prelude::*;
 use crate::consts::{DRAG_THRESHOLD, PATH_JOIN_THRESHOLD, SNAP_POINT_TOLERANCE};
-use crate::messages::input_mapper::utility_types::input_mouse::MouseKeys;
+use crate::messages::input_mapper::utility_types::pointer::MouseKeys;
 use crate::messages::portfolio::document::node_graph::document_node_definitions::{resolve_network_node_type, resolve_proto_node_type};
 use crate::messages::portfolio::document::overlays::utility_functions::path_endpoint_overlays;
 use crate::messages::portfolio::document::overlays::utility_types::OverlayContext;

editor/src/messages/tool/transform_layer/transform_layer_message.rs

@@ -1,4 +1,4 @@
-use crate::messages::input_mapper::utility_types::input_keyboard::Key;
+use crate::messages::input_mapper::utility_types::keyboard::Key;
 use crate::messages::portfolio::document::overlays::utility_types::OverlayContext;
 use crate::messages::portfolio::document::utility_types::transformation::TransformType;
 use crate::messages::prelude::*;

editor/src/messages/tool/transform_layer/transform_layer_message_handler.rs

@@ -1,5 +1,5 @@
 use crate::consts::{ANGLE_MEASURE_RADIUS_FACTOR, ARC_MEASURE_RADIUS_FACTOR_RANGE, COLOR_OVERLAY_BLUE, COLOR_OVERLAY_GRAY, SLOWING_DIVISOR};
-use crate::messages::input_mapper::utility_types::input_mouse::{DocumentPosition, ViewportPosition};
+use crate::messages::input_mapper::utility_types::pointer::{DocumentPosition, ViewportPosition};
 use crate::messages::portfolio::document::overlays::utility_functions::text_width;
 use crate::messages::portfolio::document::overlays::utility_types::{OverlayProvider, Pivot};
 use crate::messages::portfolio::document::utility_types::document_metadata::LayerNodeIdentifier;

editor/src/messages/tool/utility_types.rs

@@ -4,7 +4,7 @@ use super::common_functionality::shape_editor::ShapeState;
 use super::tool_messages::*;
 use crate::messages::broadcast::BroadcastMessage;
 use crate::messages::broadcast::event::EventMessage;
-use crate::messages::input_mapper::utility_types::input_keyboard::{Key, KeysGroup, LabeledKeyOrMouseMotion, LabeledShortcut, MouseMotion};
+use crate::messages::input_mapper::utility_types::keyboard::{Key, KeysGroup, LabeledKeyOrMouseMotion, LabeledShortcut, MouseMotion};
 use crate::messages::input_mapper::utility_types::macros::action_shortcut;
 use crate::messages::input_mapper::utility_types::misc::ActionShortcut;
 use crate::messages::layout::utility_types::widget_prelude::*;

editor/src/test_utils.rs

@@ -1,6 +1,6 @@
 use crate::application::Editor;
-use crate::messages::input_mapper::utility_types::input_keyboard::ModifierKeys;
-use crate::messages::input_mapper::utility_types::input_mouse::{EditorMouseState, MouseKeys, ScrollDelta, ViewportPosition};
+use crate::messages::input_mapper::utility_types::keyboard::ModifierKeys;
+use crate::messages::input_mapper::utility_types::pointer::{EditorPointerState, MouseKeys, ViewportPosition};
 use crate::messages::portfolio::document::node_graph::document_node_definitions::DefinitionIdentifier;
 use crate::messages::prelude::*;
 use crate::messages::tool::tool_messages::tool_prelude::Key;
@@ -105,7 +105,7 @@ impl EditorTestUtils {
 		self.move_mouse(position.x, position.y, modifier_keys, MouseKeys::empty()).await;
 
 		self.mousedown(
-			EditorMouseState {
+			EditorPointerState {
 				editor_position: position,
 				mouse_keys: button,
 				..Default::default()
@@ -115,7 +115,7 @@ impl EditorTestUtils {
 		.await;
 
 		self.mouseup(
-			EditorMouseState {
+			EditorPointerState {
 				editor_position: position,
 				..Default::default()
 			},
@@ -134,10 +134,10 @@ impl EditorTestUtils {
 		self.move_mouse(x2, y2, modifier_keys, MouseKeys::LEFT).await;
 
 		self.mouseup(
-			EditorMouseState {
+			EditorPointerState {
 				editor_position: (x2, y2).into(),
 				mouse_keys: MouseKeys::empty(),
-				scroll_delta: ScrollDelta::default(),
+				..Default::default()
 			},
 			modifier_keys,
 		)
@@ -154,10 +154,10 @@ impl EditorTestUtils {
 		self.move_mouse(100., 100., ModifierKeys::default(), MouseKeys::LEFT).await;
 
 		self.mousedown(
-			EditorMouseState {
+			EditorPointerState {
 				editor_position: (100., 100.).into(),
 				mouse_keys: MouseKeys::LEFT | MouseKeys::RIGHT,
-				scroll_delta: ScrollDelta::default(),
+				..Default::default()
 			},
 			ModifierKeys::default(),
 		)
@@ -173,7 +173,7 @@ impl EditorTestUtils {
 	}
 
 	pub async fn move_mouse(&mut self, x: f64, y: f64, modifier_keys: ModifierKeys, mouse_keys: MouseKeys) {
-		let editor_mouse_state = EditorMouseState {
+		let editor_mouse_state = EditorPointerState {
 			editor_position: ViewportPosition::new(x, y),
 			mouse_keys,
 			..Default::default()
@@ -181,11 +181,11 @@ impl EditorTestUtils {
 		self.input(InputPreprocessorMessage::PointerMove { editor_mouse_state, modifier_keys }).await;
 	}
 
-	pub async fn mousedown(&mut self, editor_mouse_state: EditorMouseState, modifier_keys: ModifierKeys) {
+	pub async fn mousedown(&mut self, editor_mouse_state: EditorPointerState, modifier_keys: ModifierKeys) {
 		self.input(InputPreprocessorMessage::PointerDown { editor_mouse_state, modifier_keys }).await;
 	}
 
-	pub async fn mouseup(&mut self, editor_mouse_state: EditorMouseState, modifier_keys: ModifierKeys) {
+	pub async fn mouseup(&mut self, editor_mouse_state: EditorPointerState, modifier_keys: ModifierKeys) {
 		self.handle_message(InputPreprocessorMessage::PointerUp { editor_mouse_state, modifier_keys }).await;
 	}
 
@@ -198,10 +198,10 @@ impl EditorTestUtils {
 
 	pub async fn left_mousedown(&mut self, x: f64, y: f64, modifier_keys: ModifierKeys) {
 		self.mousedown(
-			EditorMouseState {
+			EditorPointerState {
 				editor_position: (x, y).into(),
 				mouse_keys: MouseKeys::LEFT,
-				scroll_delta: ScrollDelta::default(),
+				..Default::default()
 			},
 			modifier_keys,
 		)
@@ -210,10 +210,10 @@ impl EditorTestUtils {
 
 	pub async fn left_mouseup(&mut self, x: f64, y: f64, modifier_keys: ModifierKeys) {
 		self.mouseup(
-			EditorMouseState {
+			EditorPointerState {
 				editor_position: (x, y).into(),
 				mouse_keys: MouseKeys::empty(),
-				scroll_delta: ScrollDelta::default(),
+				..Default::default()
 			},
 			modifier_keys,
 		)
@@ -266,10 +266,10 @@ impl EditorTestUtils {
 
 	pub async fn double_click(&mut self, position: DVec2) {
 		self.handle_message(InputPreprocessorMessage::DoubleClick {
-			editor_mouse_state: EditorMouseState {
+			editor_mouse_state: EditorPointerState {
 				editor_position: position,
 				mouse_keys: MouseKeys::LEFT,
-				scroll_delta: ScrollDelta::default(),
+				..Default::default()
 			},
 			modifier_keys: ModifierKeys::empty(),
 		})
@@ -290,10 +290,10 @@ impl EditorTestUtils {
 		}
 
 		self.mouseup(
-			EditorMouseState {
+			EditorPointerState {
 				editor_position: points[points.len() - 1],
 				mouse_keys: MouseKeys::empty(),
-				scroll_delta: ScrollDelta::default(),
+				..Default::default()
 			},
 			modifier_keys,
 		)
@@ -352,8 +352,8 @@ pub mod test_prelude {
 	pub use crate::application::Editor;
 	pub use crate::float_eq;
 	pub use crate::messages::clipboard::utility_types::ClipboardContentRaw;
-	pub use crate::messages::input_mapper::utility_types::input_keyboard::{Key, ModifierKeys};
-	pub use crate::messages::input_mapper::utility_types::input_mouse::MouseKeys;
+	pub use crate::messages::input_mapper::utility_types::keyboard::{Key, ModifierKeys};
+	pub use crate::messages::input_mapper::utility_types::pointer::MouseKeys;
 	pub use crate::messages::portfolio::document::node_graph::document_node_definitions::DefinitionIdentifier;
 	pub use crate::messages::portfolio::document::utility_types::document_metadata::LayerNodeIdentifier;
 	pub use crate::messages::prelude::*;