upgrade: waynest

Author: technobaboo

Cargo.lock

@@ -93,7 +93,7 @@ tempfile = "3.10"
 
 # wayland
 cluFlock = { version = "1.2.7", optional = true } # for the lockfile checking
-waynest = { git = "https://github.com/technobaboo/waynest.git", features = [
+waynest = { git = "https://github.com/verdiwm/waynest.git", features = [
 	"server",
 	"stable",
 ], default-features = false, optional = true }

Cargo.toml

@@ -9,7 +9,7 @@ use stereokit_rust::{
 };
 pub use waynest::server::protocol::core::wayland::wl_buffer::*;
 use waynest::{
-	server::{Dispatcher, Result, protocol::core::wayland::wl_shm::Format},
+	server::{Client, Dispatcher, Result, protocol::core::wayland::wl_shm::Format},
 	wire::ObjectId,
 };
 
@@ -75,7 +75,7 @@ impl Buffer {
 						let color = Color32 {
 							r: map_lock[cursor + 2], // Red is byte 2
 							g: map_lock[cursor + 1], // Green is byte 1
-							b: map_lock[cursor + 0], // Blue is byte 0
+							b: map_lock[cursor],     // Blue is byte 0
 							a: match self.format {
 								Format::Xrgb8888 => 255, // X means ignore alpha, treat as fully opaque
 								Format::Argb8888 => map_lock[cursor + 3], // Use alpha from byte 3 for ARGB
@@ -96,4 +96,8 @@ impl Buffer {
 		}
 	}
 }
-impl WlBuffer for Buffer {}
+impl WlBuffer for Buffer {
+	async fn destroy(&self, _client: &mut Client, _sender_id: ObjectId) -> Result<()> {
+		Ok(())
+	}
+}

src/wayland/core/buffer.rs

@@ -58,4 +58,8 @@ impl WlRegion for Region {
 	) -> Result<()> {
 		Ok(())
 	}
+
+	async fn destroy(&self, _client: &mut Client, _sender_id: ObjectId) -> Result<()> {
+		Ok(())
+	}
 }

src/wayland/core/compositor.rs

@@ -211,4 +211,8 @@ impl Keyboard {
 	}
 }
 
-impl WlKeyboard for Keyboard {}
+impl WlKeyboard for Keyboard {
+	async fn release(&self, _client: &mut Client, _sender_id: ObjectId) -> Result<()> {
+		Ok(())
+	}
+}

src/wayland/core/keyboard.rs

@@ -171,4 +171,7 @@ impl WlPointer for Pointer {
 	) -> Result<()> {
 		Ok(())
 	}
+	async fn release(&self, _client: &mut Client, _sender_id: ObjectId) -> Result<()> {
+		Ok(())
+	}
 }

src/wayland/core/pointer.rs

@@ -119,7 +119,7 @@ impl WlRegistry for Registry {
 			}
 			id => {
 				tracing::error!(id, "Wayland: failed to bind to registry global");
-				return Err(Error::ObjectNotFound(new_id.object_id));
+				return Err(Error::Internal);
 			}
 		}
 

src/wayland/core/registry.rs

@@ -3,11 +3,8 @@ use mint::Vector2;
 use std::sync::Arc;
 use std::sync::OnceLock;
 pub use waynest::server::protocol::core::wayland::wl_seat::*;
-use waynest::wire::Fixed;
-use waynest::{
-	server::{Client, Dispatcher, Result},
-	wire::ObjectId,
-};
+use waynest::server::{Client, Dispatcher, Result};
+use waynest::wire::{Fixed, ObjectId};
 
 #[derive(Debug)]
 pub enum SeatMessage {
@@ -196,4 +193,8 @@ impl WlSeat for Seat {
 		let _ = self.touch.set(touch);
 		Ok(())
 	}
+
+	async fn release(&self, _client: &mut Client, _sender_id: ObjectId) -> Result<()> {
+		Ok(())
+	}
 }

src/wayland/core/seat.rs

@@ -60,4 +60,12 @@ impl Touch {
 	}
 }
 
-impl WlTouch for Touch {}
+impl WlTouch for Touch {
+	async fn release(
+		&self,
+		_client: &mut waynest::server::Client,
+		_sender_id: waynest::wire::ObjectId,
+	) -> Result<()> {
+		Ok(())
+	}
+}

src/wayland/core/touch.rs

@@ -78,7 +78,7 @@ impl XdgSurface for Surface {
 			let has_valid_buffer = state
 				.buffer
 				.as_ref()
-				.map_or(false, |b| b.size.x > 0 && b.size.y > 0);
+				.is_some_and(|b| b.size.x > 0 && b.size.y > 0);
 
 			let mut mapped_lock = toplevel.mapped.lock();
 			if mapped_lock.is_none()