refactor(wayland/xdg): cleanup

src/wayland/xdg/backend.rs

@@ -5,7 +5,7 @@ use crate::{
 		drawable::model::ModelPart,
 		items::panel::{Backend, Geometry, PanelItemInitData, SurfaceId, ToplevelInfo},
 	},
-	wayland::core::surface::Surface,
+	wayland::{Message, core::surface::Surface},
 };
 use mint::Vector2;
 use std::sync::Arc;
@@ -82,53 +82,49 @@ impl Backend for XdgBackend {
 	}
 
 	fn close_toplevel(&self) {
-		let _ =
+		let _ = self
-			self.toplevel()
+			.toplevel()
 			.surface()
 			.message_sink
-				.send(crate::wayland::Message::CloseToplevel(
+			.send(Message::CloseToplevel(self.toplevel().clone()));
-					self.toplevel().clone(),
-				));
 	}
 
 	fn auto_size_toplevel(&self) {
-		let _ =
+		let _ = self
-			self.toplevel()
+			.toplevel()
 			.surface()
 			.message_sink
-				.send(crate::wayland::Message::ResizeToplevel {
+			.send(Message::ResizeToplevel {
 				toplevel: self.toplevel().clone(),
 				size: None,
 			});
 	}
 
 	fn set_toplevel_size(&self, size: Vector2<u32>) {
-		let _ =
+		let _ = self
-			self.toplevel()
+			.toplevel()
 			.surface()
 			.message_sink
-				.send(crate::wayland::Message::ResizeToplevel {
+			.send(Message::ResizeToplevel {
 				toplevel: self.toplevel().clone(),
 				size: Some(size),
 			});
 	}
 
 	fn set_toplevel_focused_visuals(&self, focused: bool) {
-		let _ = self.toplevel().surface().message_sink.send(
-			crate::wayland::Message::SetToplevelVisualActive {
-				toplevel: self.toplevel().clone(),
-				active: focused,
-			},
-		);
-	}
-
-	fn pointer_motion(&self, surface: &SurfaceId, position: Vector2<f32>) {
-		if let Some(surface) = self.surface_from_id(surface.clone()) {
 		let _ = self
 			.toplevel()
 			.surface()
 			.message_sink
-				.send(crate::wayland::Message::Seat(
+			.send(Message::SetToplevelVisualActive {
+				toplevel: self.toplevel().clone(),
+				active: focused,
+			});
+	}
+
+	fn pointer_motion(&self, surface: &SurfaceId, position: Vector2<f32>) {
+		if let Some(surface) = self.surface_from_id(surface.clone()) {
+			let _ = self.toplevel().surface().message_sink.send(Message::Seat(
 				crate::wayland::core::seat::SeatMessage::PointerMotion { surface, position },
 			));
 		}
@@ -136,11 +132,7 @@ impl Backend for XdgBackend {
 
 	fn pointer_button(&self, surface: &SurfaceId, button: u32, pressed: bool) {
 		if let Some(surface) = self.surface_from_id(surface.clone()) {
-			let _ = self
+			let _ = self.toplevel().surface().message_sink.send(Message::Seat(
-				.toplevel()
-				.surface()
-				.message_sink
-				.send(crate::wayland::Message::Seat(
 				crate::wayland::core::seat::SeatMessage::PointerButton {
 					surface,
 					button,
@@ -157,11 +149,7 @@ impl Backend for XdgBackend {
 		scroll_steps: Option<Vector2<f32>>,
 	) {
 		if let Some(surface) = self.surface_from_id(surface.clone()) {
-			let _ = self
+			let _ = self.toplevel().surface().message_sink.send(Message::Seat(
-				.toplevel()
-				.surface()
-				.message_sink
-				.send(crate::wayland::Message::Seat(
 				crate::wayland::core::seat::SeatMessage::PointerScroll {
 					surface,
 					scroll_distance,
@@ -178,11 +166,7 @@ impl Backend for XdgBackend {
 			if pressed { "pressed" } else { "released" }
 		);
 		if let Some(surface) = self.surface_from_id(surface.clone()) {
-			let _ = self
+			let _ = self.toplevel().surface().message_sink.send(Message::Seat(
-				.toplevel()
-				.surface()
-				.message_sink
-				.send(crate::wayland::Message::Seat(
 				crate::wayland::core::seat::SeatMessage::KeyboardKey {
 					surface,
 					keymap_id,
@@ -201,11 +185,7 @@ impl Backend for XdgBackend {
 			position.y
 		);
 		if let Some(surface) = self.surface_from_id(surface.clone()) {
-			let _ = self
+			let _ = self.toplevel().surface().message_sink.send(Message::Seat(
-				.toplevel()
-				.surface()
-				.message_sink
-				.send(crate::wayland::Message::Seat(
 				crate::wayland::core::seat::SeatMessage::TouchDown {
 					surface,
 					id,
@@ -223,7 +203,7 @@ impl Backend for XdgBackend {
 			position.y
 		);
 		let surface = self.toplevel().surface();
-		let _ = surface.message_sink.send(crate::wayland::Message::Seat(
+		let _ = surface.message_sink.send(Message::Seat(
 			crate::wayland::core::seat::SeatMessage::TouchMove { id, position },
 		));
 	}
@@ -231,7 +211,7 @@ impl Backend for XdgBackend {
 	fn touch_up(&self, id: u32) {
 		tracing::debug!("Backend: Touch up {}", id);
 		let surface = self.toplevel().surface();
-		let _ = surface.message_sink.send(crate::wayland::Message::Seat(
+		let _ = surface.message_sink.send(Message::Seat(
 			crate::wayland::core::seat::SeatMessage::TouchUp { id },
 		));
 	}
@@ -239,7 +219,7 @@ impl Backend for XdgBackend {
 	fn reset_input(&self) {
 		tracing::debug!("Backend: Reset input");
 		let surface = self.toplevel().surface();
-		let _ = surface.message_sink.send(crate::wayland::Message::Seat(
+		let _ = surface.message_sink.send(Message::Seat(
 			crate::wayland::core::seat::SeatMessage::Reset,
 		));
 	}