feat(wayland): xdg decoration

Author: technobaboo

src/wayland/mod.rs

@@ -85,7 +85,6 @@ pub enum WaylandError {
 }
 impl<T: Clone> From<StoreError<T>> for WaylandError {
 	fn from(_value: StoreError<T>) -> Self {
-		panic!("a");
 		Self::FailedToInsertObject
 	}
 }

src/wayland/registry.rs

@@ -1,7 +1,5 @@
-use crate::wayland::relative_pointer::RelativePointerManager;
-use crate::wayland::{Client, WaylandResult};
 use crate::wayland::{
-	WaylandError,
+	Client, WaylandError, WaylandResult,
 	core::{
 		compositor::{Compositor, WlCompositor},
 		data_device::DataDeviceManager,
@@ -13,9 +11,13 @@ use crate::wayland::{
 	dmabuf::Dmabuf,
 	mesa_drm::MesaDrm,
 	presentation::Presentation,
+	relative_pointer::RelativePointerManager,
 	util::ClientExt,
 	viewporter::Viewporter,
-	xdg::wm_base::{WmBase, XdgWmBase},
+	xdg::{
+		decoration::XdgDecorationManager,
+		wm_base::{WmBase, XdgWmBase},
+	},
 };
 use waynest::{NewId, ObjectId};
 use waynest_protocols::server::{
@@ -29,7 +31,10 @@ use waynest_protocols::server::{
 		presentation_time::wp_presentation::WpPresentation,
 		viewporter::wp_viewporter::WpViewporter,
 	},
-	unstable::relative_pointer_unstable_v1::zwp_relative_pointer_manager_v1::ZwpRelativePointerManagerV1,
+	unstable::{
+		relative_pointer_unstable_v1::zwp_relative_pointer_manager_v1::ZwpRelativePointerManagerV1,
+		xdg_decoration_unstable_v1::zxdg_decoration_manager_v1::ZxdgDecorationManagerV1,
+	},
 };
 use waynest_server::Client as _;
 
@@ -47,6 +52,7 @@ impl RegistryGlobals {
 	pub const VIEWPORTER: u32 = 9;
 	pub const RELATIVE_POINTER: u32 = 10;
 	pub const SUBCOMPOSITOR: u32 = 11;
+	pub const XDG_DECORATION: u32 = 12;
 }
 
 #[derive(Debug, waynest_server::RequestDispatcher, Default)]
@@ -167,6 +173,15 @@ impl Registry {
 		)
 		.await?;
 
+		self.global(
+			client,
+			sender_id,
+			RegistryGlobals::XDG_DECORATION,
+			XdgDecorationManager::INTERFACE.to_string(),
+			XdgDecorationManager::VERSION,
+		)
+		.await?;
+
 		Ok(())
 	}
 }
@@ -261,6 +276,17 @@ impl WlRegistry for Registry {
 
 				client.insert(new_id.object_id, Subcompositor)?;
 			}
+			RegistryGlobals::XDG_DECORATION => {
+				tracing::info!("Binding xdg_decoration_manager");
+
+				client.insert(
+					new_id.object_id,
+					XdgDecorationManager {
+						_version: new_id.version,
+						id: new_id.object_id,
+					},
+				)?;
+			}
 			id => {
 				tracing::error!(id, "Wayland: failed to bind to registry global");
 				return Err(WaylandError::UnknownGlobal(name));

src/wayland/xdg/decoration.rs

@@ -0,0 +1,73 @@
+use crate::wayland::{Client, WaylandResult};
+use waynest::ObjectId;
+use waynest_protocols::server::unstable::xdg_decoration_unstable_v1::{
+	zxdg_decoration_manager_v1::*, zxdg_toplevel_decoration_v1::*,
+};
+use waynest_server::Client as _;
+
+#[derive(Debug, waynest_server::RequestDispatcher)]
+#[waynest(error = crate::wayland::WaylandError, connection = crate::wayland::Client)]
+pub struct XdgDecorationManager {
+	pub _version: u32,
+	pub id: ObjectId,
+}
+impl ZxdgDecorationManagerV1 for XdgDecorationManager {
+	type Connection = Client;
+
+	async fn destroy(
+		&self,
+		client: &mut Self::Connection,
+		_sender_id: ObjectId,
+	) -> WaylandResult<()> {
+		client.remove(self.id);
+		Ok(())
+	}
+
+	async fn get_toplevel_decoration(
+		&self,
+		client: &mut Self::Connection,
+		_sender_id: ObjectId,
+		id: ObjectId,
+		_toplevel: ObjectId,
+	) -> WaylandResult<()> {
+		client.insert(id, XdgDecoration { id })?;
+		Ok(())
+	}
+}
+
+#[derive(Debug, waynest_server::RequestDispatcher)]
+#[waynest(error = crate::wayland::WaylandError, connection = crate::wayland::Client)]
+pub struct XdgDecoration {
+	id: ObjectId,
+}
+impl ZxdgToplevelDecorationV1 for XdgDecoration {
+	type Connection = Client;
+
+	async fn destroy(
+		&self,
+		client: &mut Self::Connection,
+		sender_id: ObjectId,
+	) -> WaylandResult<()> {
+		client.remove(sender_id);
+		Ok(())
+	}
+
+	async fn set_mode(
+		&self,
+		client: &mut Self::Connection,
+		_sender_id: ObjectId,
+		_mode: Mode,
+	) -> WaylandResult<()> {
+		// TODO: proper robust implementation where configure must be sent before first buffer attach
+		self.configure(client, self.id, Mode::ServerSide).await
+	}
+
+	async fn unset_mode(
+		&self,
+		client: &mut Self::Connection,
+		_sender_id: ObjectId,
+	) -> WaylandResult<()> {
+		// TODO: proper robust implementation where configure must be sent before first buffer attach
+		self.configure(client, self.id, Mode::ServerSide).await
+	}
+}

src/wayland/xdg/mod.rs

@@ -1,4 +1,5 @@
 pub mod backend;
+pub mod decoration;
 pub mod popup;
 pub mod positioner;
 pub mod surface;