add geometry info to mayland window socket

Author: m4rch3n1ng

mayland-comm/src/lib.rs

@@ -314,6 +314,16 @@ pub mod output {
 /// a mayland window
 #[derive(Debug, Serialize, Deserialize)]
 pub struct Window {
+	/// relative window geometry
+	///
+	/// relative, as in relative to the workspace
+	pub relative: window::Geometry,
+	/// absolute window geometry
+	///
+	/// may be `None` if the window is on an orphaned
+	/// workspace or no output is connected.
+	pub absolute: Option<window::Geometry>,
+
 	/// the window app id
 	///
 	/// x11 calls this "class"
@@ -330,8 +340,11 @@ pub struct Window {
 	pub xwayland: bool,
 }
 
-mod window {
+pub mod window {
+	//! mayland window extra info
+
 	use super::Window;
+	use serde::{Deserialize, Serialize};
 	use std::fmt::Display;
 
 	impl Display for Window {
@@ -342,6 +355,10 @@ mod window {
 				writeln!(f, "window")?;
 			}
 
+			let geometry = self.absolute.as_ref().unwrap_or(&self.relative);
+			writeln!(f, "    at: {},{}", geometry.x, geometry.y)?;
+			writeln!(f, "    size: {}x{}", geometry.w, geometry.h)?;
+
 			if let Some(app_id) = &self.app_id {
 				writeln!(f, "    app_id: {app_id:?}")?;
 			}
@@ -356,6 +373,19 @@ mod window {
 			Ok(())
 		}
 	}
+
+	/// the window geometry
+	#[derive(Debug, Deserialize, Serialize)]
+	pub struct Geometry {
+		/// x
+		pub x: i32,
+		/// y
+		pub y: i32,
+		/// width
+		pub w: i32,
+		/// height
+		pub h: i32,
+	}
 }
 
 /// a mayland workspace

src/comm.rs

@@ -139,8 +139,14 @@ async fn handle_client(mut stream: Async<'_, UnixStream>, state: SocketState) ->
 					.workspaces
 					.workspaces
 					.values()
-					.flat_map(|workspace| workspace.windows().map(move |window| (window, workspace)))
-					.map(|(window, workspace)| window.comm_info(workspace, keyboard_focus))
+					.flat_map(|workspace| {
+						workspace
+							.windows_geometry()
+							.map(move |(window, geometry)| (window, geometry, workspace))
+					})
+					.map(|(window, geometry, workspace)| {
+						window.comm_info(geometry, workspace, keyboard_focus)
+					})
 					.collect();
 
 				let _ = tx.send_blocking(windows);

src/layout/workspace.rs

@@ -380,7 +380,7 @@ impl WorkspaceManager {
 #[derive(Debug)]
 pub struct Workspace {
 	pub idx: usize,
-	output: Option<Output>,
+	pub output: Option<Output>,
 
 	tiling: Tiling,
 	floating: Floating,

src/shell/window.rs

@@ -444,11 +444,32 @@ impl MappedWindow {
 	/// get [`mayland_comm::Window`] info for [`mayland`]
 	pub fn comm_info(
 		&self,
+		geometry: Rectangle<i32, Logical>,
 		workspace: &Workspace,
 		keyboard_focus: Option<&KeyboardFocusTarget>,
 	) -> mayland_comm::Window {
 		let active = keyboard_focus.is_some_and(|focus| focus == self);
 
+		let absolute = workspace.output.as_ref().map(|output| {
+			let output_location = output.current_location();
+			let mut absolute = geometry;
+			absolute.loc += output_location;
+
+			mayland_comm::window::Geometry {
+				x: absolute.loc.x,
+				y: absolute.loc.y,
+				w: absolute.size.w,
+				h: absolute.size.h,
+			}
+		});
+
+		let relative = mayland_comm::window::Geometry {
+			x: geometry.loc.x,
+			y: geometry.loc.y,
+			w: geometry.size.w,
+			h: geometry.size.h,
+		};
+
 		match self.underlying_surface() {
 			WindowSurface::Wayland(xdg) => with_states(xdg.wl_surface(), |states| {
 				let surface_data = states
@@ -459,6 +480,9 @@ impl MappedWindow {
 					.unwrap();
 
 				mayland_comm::Window {
+					relative,
+					absolute,
+
 					app_id: surface_data.app_id.clone(),
 					title: surface_data.title.clone(),