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

seat: keep track of focus serials

Browse source
This commit is contained in:
Julian Orth 2024-10-17 15:48:47 +02:00
parent eff490a653
commit 324540c41e
5 changed files with 26 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/ifs/wl_seat/kb_owner.rs
View file

@ -29,8 +29,8 @@ impl KbOwnerHolder {
self.owner.get().ungrab(seat)
}
pub fn set_kb_node(&self, seat: &Rc<WlSeatGlobal>, node: Rc<dyn Node>) {
self.owner.get().set_kb_node(seat, node);
pub fn set_kb_node(&self, seat: &Rc<WlSeatGlobal>, node: Rc<dyn Node>, serial: u64) {
self.owner.get().set_kb_node(seat, node, serial);
}
pub fn clear(&self) {
@ -45,12 +45,13 @@ struct GrabKbOwner;
trait KbOwner {
fn grab(&self, seat: &Rc<WlSeatGlobal>, node: Rc<dyn Node>) -> bool;
fn ungrab(&self, seat: &Rc<WlSeatGlobal>);
fn set_kb_node(&self, seat: &Rc<WlSeatGlobal>, node: Rc<dyn Node>);
fn set_kb_node(&self, seat: &Rc<WlSeatGlobal>, node: Rc<dyn Node>, serial: u64);
}
impl KbOwner for DefaultKbOwner {
fn grab(&self, seat: &Rc<WlSeatGlobal>, node: Rc<dyn Node>) -> bool {
self.set_kb_node(seat, node);
let serial = seat.state.next_serial(node.node_client().as_deref());
self.set_kb_node(seat, node, serial);
seat.kb_owner.owner.set(Rc::new(GrabKbOwner));
true
}
@ -59,7 +60,7 @@ impl KbOwner for DefaultKbOwner {
// nothing
}
fn set_kb_node(&self, seat: &Rc<WlSeatGlobal>, node: Rc<dyn Node>) {
fn set_kb_node(&self, seat: &Rc<WlSeatGlobal>, node: Rc<dyn Node>, serial: u64) {
let old = seat.keyboard_node.get();
if old.node_id() == node.node_id() {
return;
@ -78,6 +79,7 @@ impl KbOwner for DefaultKbOwner {
}
// log::info!("focus {}", node.node_id());
node.clone().node_on_focus(seat);
seat.keyboard_node_serial.set(serial);
seat.keyboard_node.set(node.clone());
seat.tablet_on_keyboard_node_change();
}
@ -92,7 +94,7 @@ impl KbOwner for GrabKbOwner {
seat.kb_owner.owner.set(seat.kb_owner.default.clone());
}
fn set_kb_node(&self, _seat: &Rc<WlSeatGlobal>, _node: Rc<dyn Node>) {
fn set_kb_node(&self, _seat: &Rc<WlSeatGlobal>, _node: Rc<dyn Node>, _serial: u64) {
// nothing
}
}