leyoda/cosmic-comp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle session lock surfaces in visible_outputs_for_surface

Browse source 
Fixes issue with re-draw not being queued on initial surface commit
until cursor is moved.
This commit is contained in:
Ian Douglas Scott 2023-11-14 13:13:42 -08:00 • committed by Victoria Brekenfeld
parent 14867a0893
commit 440cd03371
6 changed files with 49 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/wayland/handlers/session_lock.rs
View file

@ -1,9 +1,6 @@
// SPDX-License-Identifier: GPL-3.0-only
use crate::{
state::{SessionLock, State},
utils::prelude::*,
};
use crate::{shell::SessionLock, state::State, utils::prelude::*};
use smithay::{
delegate_session_lock,
output::Output,
@ -22,7 +19,7 @@ impl SessionLockHandler for State {
fn lock(&mut self, locker: SessionLocker) {
// Reject lock if sesion lock exists and is still valid
if let Some(session_lock) = self.common.session_lock.as_ref() {
if let Some(session_lock) = self.common.shell.session_lock.as_ref() {
if self
.common
.display_handle
@ -35,18 +32,18 @@ impl SessionLockHandler for State {
let ext_session_lock = locker.ext_session_lock().clone();
locker.lock();
self.common.session_lock = Some(SessionLock {
self.common.shell.session_lock = Some(SessionLock {
ext_session_lock,
surfaces: HashMap::new(),
});
}
fn unlock(&mut self) {
self.common.session_lock = None;
self.common.shell.session_lock = None;
}
fn new_surface(&mut self, lock_surface: LockSurface, wl_output: WlOutput) {
if let Some(session_lock) = &mut self.common.session_lock {
if let Some(session_lock) = &mut self.common.shell.session_lock {
if let Some(output) = Output::from_resource(&wl_output) {
lock_surface.with_pending_state(|states| {
let size = output.geometry().size;