From a4a43d3ceba12bf51a96f928187ebdf5298db1c2 Mon Sep 17 00:00:00 2001
From: Nova <technobaboo@gmail.com>
Date: Sun, 6 Jul 2025 12:52:05 -0700
Subject: [PATCH] fix: keyboard crashiness

---
 Cargo.lock                   | 10 +++++-----
 src/wayland/core/keyboard.rs | 15 +++++----------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 033887b..044c8df 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3464,7 +3464,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667"
 dependencies = [
  "cfg-if",
- "windows-targets 0.53.2",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -6016,7 +6016,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f9612d9503675b07b244922ea6f6f3cdd88c43add1b3498084613fc88cdf69d"
 dependencies = [
  "cc",
- "windows-targets 0.52.6",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -6389,7 +6389,7 @@ dependencies = [
 [[package]]
 name = "waynest"
 version = "0.0.25"
-source = "git+https://github.com/verdiwm/waynest.git#418768890e3cda975caee6ce54d35284f6f6d627"
+source = "git+https://github.com/verdiwm/waynest.git#4d52d23690b19eb1ecc742b99377acca25765ad0"
 dependencies = [
  "async-trait",
  "bitflags 2.9.1",
@@ -6407,7 +6407,7 @@ dependencies = [
 [[package]]
 name = "waynest-macros"
 version = "0.0.25"
-source = "git+https://github.com/verdiwm/waynest.git#418768890e3cda975caee6ce54d35284f6f6d627"
+source = "git+https://github.com/verdiwm/waynest.git#4d52d23690b19eb1ecc742b99377acca25765ad0"
 dependencies = [
  "quote",
  "syn 2.0.104",
@@ -6565,7 +6565,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
diff --git a/src/wayland/core/keyboard.rs b/src/wayland/core/keyboard.rs
index 3683746..99d1888 100644
--- a/src/wayland/core/keyboard.rs
+++ b/src/wayland/core/keyboard.rs
@@ -7,8 +7,9 @@ use memfd::MemfdOptions;
 use slotmap::{DefaultKey, KeyData};
 use std::{
 	collections::HashSet,
+	io::Write,
 	os::{
-		fd::{AsRawFd, IntoRawFd},
+		fd::IntoRawFd,
 		unix::io::{FromRawFd, OwnedFd},
 	},
 	sync::{Arc, Weak},
@@ -89,18 +90,13 @@ impl Keyboard {
 	}
 
 	async fn send_keymap(&self, client: &mut Client, keymap: &[u8]) -> Result<()> {
-		let file = MemfdOptions::default()
+		let mut file = MemfdOptions::default()
 			.create("stardust-keymap")
 			.map_err(|e| waynest::server::Error::Custom(e.to_string()))?
 			.into_file();
 		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);
+		file.write_all(keymap)?;
+		file.flush()?;
 
 		let fd = unsafe { OwnedFd::from_raw_fd(file.into_raw_fd()) };
 
@@ -131,7 +127,6 @@ impl Keyboard {
 			let mut old_keymap_id = self.current_keymap_id.lock().await;
 
 			if *old_keymap_id != keymap_id {
-				// println!("Updating keymap to {keymap_id}");
 				let keymap_key = DefaultKey::from(KeyData::from_ffi(keymap_id));
 
 				// Get keymap data and drop the lock immediately