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

seat: optimize seat-queue handling

Browse source
This commit is contained in:
Julian Orth 2024-05-02 13:10:20 +02:00
parent fb8d4c2700
commit dc97827f7a
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/ifs/wl_seat.rs
View file

@ -173,7 +173,7 @@ pub struct WlSeatGlobal {
gesture_owner: GestureOwnerHolder, gesture_owner: GestureOwnerHolder,
dropped_dnd: RefCell<Option<DroppedDnd>>, dropped_dnd: RefCell<Option<DroppedDnd>>,
shortcuts: RefCell<AHashMap<u32, SmallMap<u32, u32, 2>>>, shortcuts: RefCell<AHashMap<u32, SmallMap<u32, u32, 2>>>,
queue_link: Cell<Option<LinkedNode<Rc<Self>>>>, queue_link: RefCell<Option<LinkedNode<Rc<Self>>>>,
tree_changed_handler: Cell<Option<SpawnedFuture<()>>>, tree_changed_handler: Cell<Option<SpawnedFuture<()>>>,
output: CloneCell<Rc<OutputNode>>, output: CloneCell<Rc<OutputNode>>,
desired_known_cursor: Cell<Option<KnownCursor>>, desired_known_cursor: Cell<Option<KnownCursor>>,
@ -243,7 +243,7 @@ impl WlSeatGlobal {
gesture_owner: Default::default(), gesture_owner: Default::default(),
dropped_dnd: RefCell::new(None), dropped_dnd: RefCell::new(None),
shortcuts: Default::default(), shortcuts: Default::default(),
queue_link: Cell::new(None), queue_link: Default::default(),
tree_changed_handler: Cell::new(None), tree_changed_handler: Cell::new(None),
output: CloneCell::new(state.dummy_output.get().unwrap()), output: CloneCell::new(state.dummy_output.get().unwrap()),
desired_known_cursor: Cell::new(None), desired_known_cursor: Cell::new(None),
@ -495,8 +495,12 @@ impl WlSeatGlobal {
} }
pub fn mark_last_active(self: &Rc<Self>) { pub fn mark_last_active(self: &Rc<Self>) {
self.queue_link let link = &mut *self.queue_link.borrow_mut();
.set(Some(self.state.seat_queue.add_last(self.clone()))); if let Some(link) = link {
self.state.seat_queue.add_last_existing(link)
} else {
*link = Some(self.state.seat_queue.add_last(self.clone()))
}
} }
pub fn disable_pointer_constraint(&self) { pub fn disable_pointer_constraint(&self) {
@ -1084,7 +1088,7 @@ impl WlSeatGlobal {
self.pointer_owner.clear(); self.pointer_owner.clear();
self.kb_owner.clear(); self.kb_owner.clear();
*self.dropped_dnd.borrow_mut() = None; *self.dropped_dnd.borrow_mut() = None;
self.queue_link.set(None); self.queue_link.take();
self.tree_changed_handler.set(None); self.tree_changed_handler.set(None);
self.output.set(self.state.dummy_output.get().unwrap()); self.output.set(self.state.dummy_output.get().unwrap());
self.constraint.take(); self.constraint.take();