feat: some fixes ig

Author: technobaboo

Cargo.lock

@@ -32,6 +32,7 @@ wayland = [
 	"dep:gl",
 	"dep:memfd",
 ]
+dmabuf = []
 profile_tokio = ["dep:console-subscriber", "tokio/tracing"]
 profile_app = ["dep:tracing-tracy"]
 local_deps = ["stereokit-rust/force-local-deps"]
@@ -115,6 +116,8 @@ khronos-egl = { version = "6.0.0", features = [
 ], optional = true }
 gl = { version = "0.14.0", optional = true }
 memfd = { version = "0.6.4", optional = true }
+libc = "0.2.172"
+nix = "0.30.1"
 
 [dependencies.stereokit-rust]
 git = "https://github.com/mvvvv/StereoKit-rust.git"

Cargo.toml

@@ -39,6 +39,7 @@ pub struct GraphicsInfo {
 unsafe impl Send for GraphicsInfo {}
 unsafe impl Sync for GraphicsInfo {}
 impl GraphicsInfo {
+	#[allow(unused)]
 	pub fn register_debug_callback(&self) -> Result<(), Error> {
 		let extensions_str = self.extensions()?;
 		dbg!(&extensions_str);

src/core/graphics_info.rs

@@ -1,11 +1,10 @@
 use std::sync::Arc;
 
+#[cfg(feature = "dmabuf")]
+use crate::wayland::dmabuf::buffer_backing::DmabufBacking;
 use crate::{
 	core::registry::Registry,
-	wayland::{
-		GraphicsInfo, core::shm_buffer_backing::ShmBufferBacking,
-		dmabuf::buffer_backing::DmabufBacking,
-	},
+	wayland::{GraphicsInfo, core::shm_buffer_backing::ShmBufferBacking},
 };
 use mint::Vector2;
 use stereokit_rust::tex::Tex;
@@ -20,6 +19,7 @@ pub static BUFFER_REGISTRY: Registry<Buffer> = Registry::new();
 #[derive(Debug)]
 pub enum BufferBacking {
 	Shm(ShmBufferBacking),
+	#[cfg(feature = "dmabuf")]
 	Dmabuf(DmabufBacking),
 }
 impl BufferBacking {
@@ -42,9 +42,11 @@ impl Buffer {
 		buffer
 	}
 
+	#[allow(unused)]
 	pub fn init_tex(self: Arc<Self>, graphics_info: &Arc<GraphicsInfo>) {
 		match &self.backing {
 			BufferBacking::Shm(_) => (),
+			#[cfg(feature = "dmabuf")]
 			BufferBacking::Dmabuf(backing) => backing.init_tex(graphics_info, self.clone()),
 		}
 	}
@@ -54,6 +56,7 @@ impl Buffer {
 		tracing::info!("Updating texture for buffer {:?}", self.id);
 		match &self.backing {
 			BufferBacking::Shm(backing) => backing.update_tex(),
+			#[cfg(feature = "dmabuf")]
 			BufferBacking::Dmabuf(backing) => backing
 				.get_tex()
 				.map(|tex| tex.get_id().to_string())
@@ -68,6 +71,7 @@ impl Buffer {
 	pub fn size(&self) -> Vector2<usize> {
 		match &self.backing {
 			BufferBacking::Shm(backing) => backing.size(),
+			#[cfg(feature = "dmabuf")]
 			BufferBacking::Dmabuf(backing) => backing.size(),
 		}
 	}

src/wayland/core/buffer.rs

@@ -3,9 +3,8 @@ use memfd::MemfdOptions;
 use slotmap::{DefaultKey, KeyData};
 use std::{
 	collections::HashSet,
-	io::Write,
 	os::{
-		fd::IntoRawFd,
+		fd::{AsRawFd, IntoRawFd},
 		unix::io::{FromRawFd, OwnedFd},
 	},
 	sync::{Arc, Weak},
@@ -82,12 +81,18 @@ impl Keyboard {
 	}
 
 	async fn send_keymap(&self, client: &mut Client, keymap: &[u8]) -> Result<()> {
-		let mut file = MemfdOptions::default()
+		let file = MemfdOptions::default()
 			.create("stardust-keymap")
 			.map_err(|e| waynest::server::Error::Custom(e.to_string()))?
 			.into_file();
-		file.write_all(keymap)?;
-		file.flush()?;
+		file.set_len(keymap.len() as u64)?;
+		// file.write_all(keymap)?;
+		// file.flush()?;
+
+		// let map = libc::mmap(addr, len, prot, flags, fd, offset)
+
+		let mut map = unsafe { memmap2::MmapMut::map_mut(file.as_raw_fd()) }?;
+		map.copy_from_slice(keymap);
 
 		let fd = unsafe { OwnedFd::from_raw_fd(file.into_raw_fd()) };
 

src/wayland/core/keyboard.rs

@@ -6,15 +6,13 @@ use crate::wayland::{
 		seat::{Seat, WlSeat},
 		shm::{Shm, WlShm},
 	},
-	dmabuf::Dmabuf,
 	xdg::wm_base::{WmBase, XdgWmBase},
 };
 pub use waynest::server::protocol::core::wayland::wl_registry::*;
+#[cfg(feature = "dmabuf")]
+use waynest::server::protocol::stable::linux_dmabuf_v1::zwp_linux_dmabuf_v1::ZwpLinuxDmabufV1;
 use waynest::{
-	server::{
-		Client, Dispatcher, Error, Result,
-		protocol::stable::linux_dmabuf_v1::zwp_linux_dmabuf_v1::ZwpLinuxDmabufV1,
-	},
+	server::{Client, Dispatcher, Error, Result},
 	wire::{NewId, ObjectId},
 };
 
@@ -25,6 +23,7 @@ impl RegistryGlobals {
 	pub const WM_BASE: u32 = 2;
 	pub const SEAT: u32 = 3;
 	pub const OUTPUT: u32 = 4;
+	#[cfg(feature = "dmabuf")]
 	pub const DMABUF: u32 = 5;
 }
 
@@ -78,11 +77,12 @@ impl Registry {
 		)
 		.await?;
 
+		#[cfg(feature = "dmabuf")]
 		self.global(
 			client,
 			sender_id,
 			RegistryGlobals::DMABUF,
-			Dmabuf::INTERFACE.to_string(),
+			crate::wayland::dmabuf::Dmabuf::INTERFACE.to_string(),
 			Dmabuf::VERSION,
 		)
 		.await?;
@@ -131,6 +131,7 @@ impl WlRegistry for Registry {
 				tracing::info!("Binding output");
 				client.insert(new_id.object_id, Output);
 			}
+			#[cfg(feature = "dmabuf")]
 			RegistryGlobals::DMABUF => {
 				tracing::info!("Binding dmabuf");
 				let dmabuf = client.insert(new_id.object_id, Dmabuf::new());

src/wayland/core/registry.rs

@@ -1,4 +1,5 @@
 pub mod core;
+#[cfg(feature = "dmabuf")]
 pub mod dmabuf;
 pub mod util;
 pub mod xdg;
@@ -16,6 +17,7 @@ use core::{
 	display::Display,
 	surface::WL_SURFACE_REGISTRY,
 };
+#[cfg(feature = "dmabuf")]
 use dmabuf::buffer_params::BufferParams;
 use mint::Vector2;
 use std::{
@@ -28,15 +30,14 @@ use std::{
 use tokio::{net::UnixStream, sync::mpsc, task::AbortHandle};
 use tokio_stream::StreamExt;
 use tracing::{debug_span, instrument};
+#[cfg(feature = "dmabuf")]
+use waynest::server::protocol::stable::linux_dmabuf_v1::zwp_linux_buffer_params_v1::ZwpLinuxBufferParamsV1;
 use waynest::{
 	server::{
 		self,
 		protocol::{
 			core::wayland::{wl_buffer::WlBuffer, wl_callback::WlCallback, wl_display::WlDisplay},
-			stable::{
-				linux_dmabuf_v1::zwp_linux_buffer_params_v1::ZwpLinuxBufferParamsV1,
-				xdg_shell::xdg_toplevel::XdgToplevel,
-			},
+			stable::xdg_shell::xdg_toplevel::XdgToplevel,
 		},
 	},
 	wire::{DecodeError, ObjectId},
@@ -98,7 +99,9 @@ pub fn get_free_wayland_socket_path() -> Option<PathBuf> {
 pub enum Message {
 	Frame(Arc<Callback>),
 	ReleaseBuffer(Arc<Buffer>),
+	#[cfg(feature = "dmabuf")]
 	DmabufImportSuccess(Arc<BufferParams>, Arc<Buffer>),
+	#[cfg(feature = "dmabuf")]
 	DmabufImportFailure(Arc<BufferParams>),
 	CloseToplevel(Arc<Toplevel>),
 	ResizeToplevel {
@@ -203,9 +206,11 @@ impl WaylandClient {
 				client.remove(callback.0);
 				callback.done(client, callback.0, serial).await
 			}
+			#[cfg(feature = "dmabuf")]
 			Message::DmabufImportSuccess(params, buffer) => {
 				params.created(client, params.id, buffer.id).await
 			}
+			#[cfg(feature = "dmabuf")]
 			Message::DmabufImportFailure(params) => {
 				client.remove(params.id);
 				params.failed(client, params.id).await