Major overhaul of input and communication systems

* Add input manager * WIP lifetime hell * Hell yeah, dark lifetime magic * Replace events with actions in tools * Fix borrow in GlobalEventHandler * Fix typo in response-handler * Distribute dispatch structure * Add translation from events to actions * Port default key actions to input_mapper * Split actions macro * Add handling for Ambiguous Mouse events * Fix warnings and clippy lints * Add actions macro * WIP rework * Add AsMessage macro * Add implementation for derived enums * Add macro implementation for top level message * Add #[child] attribute to indicate derivation * Replace some mentions of Actions and Responses with Message * It compiles !!! * Add functionality to some message handlers * Add document rendering * ICE * Rework the previous code while keeping basic functionality * Reduce parent-top-level macro args to only two * Add workaround for ICE * Fix cyclic reference in document.rs * Make derive_transitive_child a bit more powerful This addresses the todo that was left, enabling arbitrary expressions to be passed as the last parameter of a #[parent] attribute * Adapt frontend message format * Make responses use VecDeque Our responses are a queue so we should use a queue type for them * Move traits to sensible location * Are we rectangle yet? * Simplify, improve & document `derive_discriminant` * Change `child` to `sub_discriminant` This only applies to `ToDiscriminant`. Code using `#[impl_message]` continues to work. * Add docs for `derive_transitive_child` * Finish docs and improve macros The improvements are that impl_message now uses trait resolution to obtain the parent's discriminant and that derive_as_message now allows for non-unit variants (which we don't use but it's nice to have, just in case) * Remove logging call * Move files around and cleanup structure * Fix proc macro doc tests * Improve actions_fn!() macro * Add ellipse tool * Pass populated actions list to the input mapper * Add KeyState bitvector * Merge mouse buttons into "keyboard" * Add macro for initialization of key mapper table * Add syntactic sugar for the macro * Implement mapping function * Translate the remaining tools * Fix shape tool * Add keybindings for line and pen tool * Fix modifiers * Cleanup * Add doc comments for the actions macro * Fix formatting * Rename MouseMove to PointerMove * Add keybinds for tools * Apply review suggestions * Rename KeyMappings -> KeyMappingEntries * Apply review changes Co-authored-by: T0mstone <realt0mstone@gmail.com> Co-authored-by: Paul Kupper <kupper.pa@gmail.com>
2026-09-24 08:28:11 +08:00 · 2021-05-23 01:26:24 +02:00
parent 56c1110800
commit a596ce0104
72 changed files with 3028 additions and 1856 deletions
@@ -0,0 +1,59 @@
+use crate::message_prelude::*;
+use document_core::{response::LayerPanelEntry, DocumentResponse, LayerId};
+use serde::{Deserialize, Serialize};
+
+pub type Callback = Box<dyn Fn(FrontendMessage)>;
+
+#[impl_message(Message, Frontend)]
+#[derive(PartialEq, Clone, Deserialize, Serialize, Debug)]
+pub enum FrontendMessage {
+	CollapseFolder { path: Vec<LayerId> },
+	ExpandFolder { path: Vec<LayerId>, children: Vec<LayerPanelEntry> },
+	SetActiveTool { tool_name: String },
+	UpdateCanvas { document: String },
+	EnableTextInput,
+	DisableTextInput,
+}
+
+impl From<DocumentResponse> for Message {
+	fn from(response: DocumentResponse) -> Self {
+		let frontend: FrontendMessage = response.into();
+		frontend.into()
+	}
+}
+impl From<DocumentResponse> for FrontendMessage {
+	fn from(response: DocumentResponse) -> Self {
+		match response {
+			DocumentResponse::ExpandFolder { path, children } => Self::ExpandFolder { path, children },
+			DocumentResponse::CollapseFolder { path } => Self::CollapseFolder { path },
+			_ => unimplemented!("The frontend does not handle {:?}", response),
+		}
+	}
+}
+
+pub struct FrontendMessageHandler {
+	callback: crate::Callback,
+}
+
+impl FrontendMessageHandler {
+	pub fn new(callback: Callback) -> Self {
+		Self { callback }
+	}
+}
+
+impl MessageHandler<FrontendMessage, ()> for FrontendMessageHandler {
+	fn process_action(&mut self, message: FrontendMessage, _data: (), _responses: &mut VecDeque<Message>) {
+		log::trace!("Sending {} Response", message.to_discriminant().global_name());
+		(self.callback)(message)
+	}
+	advertise_actions!(
+		FrontendMessageDiscriminant;
+
+		CollapseFolder,
+		ExpandFolder,
+		SetActiveTool,
+		UpdateCanvas,
+		EnableTextInput,
+		DisableTextInput,
+	);
+}
@@ -0,0 +1,3 @@
+pub mod frontend_message_handler;
+
+pub use frontend_message_handler::{Callback, FrontendMessage, FrontendMessageDiscriminant, FrontendMessageHandler};