kossLAN/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

seat: properly destroy physical devices when changing keymap

Browse source
This commit is contained in:
Julian Orth 2025-09-07 12:58:23 +02:00
parent 6bea5a072c
commit 3b60c62f82
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/ifs/wl_seat.rs
View file

@ -523,14 +523,22 @@ impl WlSeatGlobal {
false false
} }
pub fn set_seat_keymap(&self, keymap: &Rc<KbvmMap>) { pub fn set_seat_keymap(self: &Rc<Self>, keymap: &Rc<KbvmMap>) {
self.seat_kb_map.set(keymap.clone()); self.seat_kb_map.set(keymap.clone());
let new = self.get_kb_state(keymap); let new = self.get_kb_state(keymap);
let old = self.seat_kb_state.set(new.clone()); let old = self.seat_kb_state.set(new.clone());
if rc_eq(&old, &new) { if rc_eq(&old, &new) {
return; return;
} }
self.kb_devices.lock().retain(|_, p| p.has_custom_map.get()); let mut to_destroy = vec![];
for (id, s) in self.kb_devices.lock().iter() {
if !s.has_custom_map.get() {
to_destroy.push(*id);
}
}
for dev in to_destroy {
self.destroy_physical_keyboard(dev);
}
{ {
let new = &*new.borrow(); let new = &*new.borrow();
self.modifiers_listener.attach(&new.kb_state.mods_changed); self.modifiers_listener.attach(&new.kb_state.mods_changed);