fix(wayland): new API

src/wayland/seat.rs

@@ -7,7 +7,7 @@ use crate::{
 	core::task,
 	nodes::items::panel::{Backend, Geometry, PanelItem},
 };
-use color_eyre::eyre::Result;
+use color_eyre::eyre::{bail, eyre, Result};
 use mint::Vector2;
 use nanoid::nanoid;
 use once_cell::sync::OnceCell;
@@ -15,7 +15,7 @@ use parking_lot::Mutex;
 use rand::{seq::IteratorRandom, thread_rng};
 use rustc_hash::{FxHashMap, FxHashSet};
 use smithay::{
-	input::keyboard::ModifiersState,
+	input::keyboard::{KeymapFile, ModifiersState},
 	reexports::wayland_server::{
 		backend::{ClientId, GlobalId, ObjectId},
 		protocol::{
@@ -36,7 +36,7 @@ use std::{
 };
 use tokio::sync::watch;
 use tracing::{debug, warn};
-use xkbcommon::xkb::{self, Context, Keymap};
+use xkbcommon::xkb::{self, ffi::XKB_KEYMAP_FORMAT_TEXT_V1, Keymap};
 
 pub fn handle_cursor<B: Backend>(
 	panel_item: &Arc<PanelItem<B>>,
@@ -53,14 +53,18 @@ pub fn handle_cursor<B: Backend>(
 }
 
 pub struct KeyboardInfo {
+	keymap_string: String,
+	keymap: KeymapFile,
 	state: xkb::State,
 	mods: ModifiersState,
 	keys: FxHashSet<u32>,
 }
 impl KeyboardInfo {
-	pub fn new(keymap: &Keymap) -> Self {
+	pub fn new(keymap_string: String, keymap: &Keymap) -> Self {
 		KeyboardInfo {
+			keymap_string,
 			state: xkb::State::new(keymap),
+			keymap: KeymapFile::new(keymap),
 			mods: ModifiersState::default(),
 			keys: FxHashSet::default(),
 		}
@@ -116,6 +120,7 @@ pub enum PointerEvent {
 }
 #[derive(Debug, Clone)]
 pub enum KeyboardEvent {
+	Keymap,
 	Key { key: u32, state: u32 },
 }
 
@@ -126,7 +131,7 @@ struct SurfaceInfo {
 	pointer_queue: VecDeque<PointerEvent>,
 	pointer_latest_event: Instant,
 	keyboard_queue: VecDeque<KeyboardEvent>,
-	keyboard_info: KeyboardInfo,
+	keyboard_info: Option<KeyboardInfo>,
 }
 impl SurfaceInfo {
 	fn new(wl_surface: &WlSurface, cursor_sender: watch::Sender<Option<CursorInfo>>) -> Self {
@@ -136,9 +141,7 @@ impl SurfaceInfo {
 			pointer_queue: VecDeque::new(),
 			pointer_latest_event: Instant::now(),
 			keyboard_queue: VecDeque::new(),
-			keyboard_info: KeyboardInfo::new(
-				&Keymap::new_from_names(&Context::new(0), "", "", "", "", None, 0).unwrap(),
-			),
+			keyboard_info: None,
 		}
 	}
 	fn flush(&self) {
@@ -233,20 +236,25 @@ impl SurfaceInfo {
 
 		locked
 	}
-	fn handle_keyboard_events(&mut self, keyboard: &WlKeyboard, locked: bool) -> bool {
+	fn handle_keyboard_events(&mut self, keyboard: &WlKeyboard, mut locked: bool) -> bool {
 		let Ok(focus) = self.wl_surface.upgrade() else { return false; };
+		let Some(info) = self.keyboard_info.as_mut() else { return true; };
 
 		if !locked {
 			keyboard.enter(0, &focus, vec![]);
 			if keyboard.version() >= wl_keyboard::EVT_REPEAT_INFO_SINCE {
 				keyboard.repeat_info(0, 0);
 			}
+			locked = info.keymap.send(keyboard).is_ok();
 		}
 		while let Some(event) = self.keyboard_queue.pop_front() {
 			debug!(locked, ?event, "Process keyboard event");
 			match (locked, event) {
+				(true, KeyboardEvent::Keymap) => {
+					let _ = info.keymap.send(keyboard);
+				}
 				(true, KeyboardEvent::Key { key, state }) => {
-					if let Ok(key_count) = self.keyboard_info.process(key, state, keyboard) {
+					if let Ok(key_count) = info.process(key, state, keyboard) {
 						if key_count == 0 {
 							keyboard.leave(SERIAL_COUNTER.inc(), &focus);
 							return false;
@@ -290,6 +298,31 @@ impl SeatData {
 		seat_data
 	}
 
+	pub fn set_keymap(&self, keymap_str: String, surfaces: Vec<WlSurface>) -> Result<()> {
+		let context = xkb::Context::new(0);
+		let keymap =
+			Keymap::new_from_string(&context, keymap_str.clone(), XKB_KEYMAP_FORMAT_TEXT_V1, 0)
+				.ok_or_else(|| eyre!("Keymap is not valid"))?;
+		let mut panels = self.surfaces.lock();
+		let Some((_, focus)) = self.keyboard.get() else {bail!("Could not get keyboard")};
+		for surface in surfaces {
+			let Some(surface_info) = panels.get_mut(&surface.id()) else {continue};
+			if let Some(keyboard_info) = &mut surface_info.keyboard_info {
+				if &keyboard_info.keymap_string == &keymap_str {
+					continue;
+				}
+			}
+			surface_info
+				.keyboard_info
+				.replace(KeyboardInfo::new(keymap_str.clone(), &keymap));
+
+			if *focus.lock() == surface.id() {
+				surface_info.keyboard_queue.push_back(KeyboardEvent::Keymap);
+			}
+		}
+		Ok(())
+	}
+
 	pub fn pointer_event(&self, surface: &WlSurface, event: PointerEvent) {
 		let mut surfaces = self.surfaces.lock();
 		let Some(surface_info) = surfaces.get_mut(&surface.id()) else {return};
@@ -345,6 +378,7 @@ impl SeatData {
 			if keyboard_focus.is_null() {
 				*keyboard_focus = surfaces
 					.iter()
+					.filter(|(_k, v)| v.keyboard_info.is_some())
 					.filter(|(_k, v)| !v.keyboard_queue.is_empty())
 					.map(|(k, _v)| k)
 					.choose(&mut thread_rng())