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

session-lock: move unlock logic to single place

Browse source
This commit is contained in:
Julian Orth 2024-07-10 20:27:27 +02:00
parent 5a53b74265
commit 44bdca8235
3 changed files with 16 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/ifs/ext_session_lock_v1.rs
View file

@ -87,16 +87,7 @@ impl ExtSessionLockV1RequestHandler for ExtSessionLockV1 {
return Err(ExtSessionLockV1Error::NeverLocked);
}
if !self.finished.get() {
let state = &self.client.state;
state.lock.locked.set(false);
state.lock.lock.take();
for output in state.root.outputs.lock().values() {
if let Some(surface) = output.set_lock_surface(None) {
surface.destroy_node();
}
}
state.tree_changed();
state.damage();
self.client.state.do_unlock();
}
self.client.remove_obj(self)?;
Ok(())

13
src/ifs/jay_compositor.rs
View file

@ -216,19 +216,12 @@ impl JayCompositorRequestHandler for JayCompositor {
fn unlock(&self, _req: Unlock, _slf: &Rc<Self>) -> Result<(), Self::Error> {
let state = &self.client.state;
if state.lock.locked.replace(false) {
if let Some(lock) = state.lock.lock.take() {
if state.lock.locked.get() {
if let Some(lock) = state.lock.lock.get() {
lock.finish();
}
for output in state.root.outputs.lock().values() {
if let Some(surface) = output.set_lock_surface(None) {
surface.destroy_node();
}
}
state.tree_changed();
state.damage();
state.do_unlock();
}
self.client.symmetric_delete.set(true);
Ok(())
}

12
src/state.rs
View file

@ -736,6 +736,18 @@ impl State {
}
}
pub fn do_unlock(&self) {
self.lock.locked.set(false);
self.lock.lock.take();
for output in self.root.outputs.lock().values() {
if let Some(surface) = output.set_lock_surface(None) {
surface.destroy_node();
}
}
self.tree_changed();
self.damage();
}
pub fn clear(&self) {
self.lock.lock.take();
self.xwayland.handler.borrow_mut().take();