Miroirs/pinnacle
1
0
Fork 0
mirror of https://github.com/pinnacle-comp/pinnacle.git synced 2025-01-13 08:01:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Guarantee no windows get drawn when locked

Browse source
This commit is contained in:
Ottatop 2024-05-15 17:26:36 -05:00
parent 333c805bdd
commit 48167a75c2
2 changed files with 28 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/backend/udev.rs
View file

@ -1495,17 +1495,19 @@ impl Udev {
state.blanking_state = BlankingState::Blanking;
}
});
} else if let Some(lock_surface) = output.with_state(|state| state.lock_surface.clone()) {
let elems = render_elements_from_surface_tree(
&mut renderer,
lock_surface.wl_surface(),
(0, 0),
output.current_scale().fractional_scale(),
1.0,
element::Kind::Unspecified,
);
} else if pinnacle.lock_state.is_locked() {
if let Some(lock_surface) = output.with_state(|state| state.lock_surface.clone()) {
let elems = render_elements_from_surface_tree(
&mut renderer,
lock_surface.wl_surface(),
(0, 0),
output.current_scale().fractional_scale(),
1.0,
element::Kind::Unspecified,
);
output_render_elements.extend(elems);
output_render_elements.extend(elems);
}
} else {
let windows = pinnacle.space.elements().cloned().collect::<Vec<_>>();

30
src/backend/winit.rs
View file

@ -269,10 +269,6 @@ impl State {
let mut output_render_elements = Vec::new();
let should_blank = self.pinnacle.lock_state.is_locking()
|| (self.pinnacle.lock_state.is_locked()
&& output.with_state(|state| state.lock_surface.is_none()));
let should_draw_cursor = !self.pinnacle.lock_state.is_unlocked()
|| output.with_state(|state| {
// Don't draw cursor when screencopy without cursor is pending
@ -302,6 +298,10 @@ impl State {
output_render_elements.extend(pointer_render_elements);
}
let should_blank = self.pinnacle.lock_state.is_locking()
|| (self.pinnacle.lock_state.is_locked()
&& output.with_state(|state| state.lock_surface.is_none()));
if should_blank {
// Don't push any render elements and we get a blank frame
output.with_state_mut(|state| {
@ -310,17 +310,19 @@ impl State {
state.blanking_state = BlankingState::Blanking;
}
});
} else if let Some(lock_surface) = output.with_state(|state| state.lock_surface.clone()) {
let elems = render_elements_from_surface_tree(
winit.backend.renderer(),
lock_surface.wl_surface(),
(0, 0),
output.current_scale().fractional_scale(),
1.0,
element::Kind::Unspecified,
);
} else if self.pinnacle.lock_state.is_locked() {
if let Some(lock_surface) = output.with_state(|state| state.lock_surface.clone()) {
let elems = render_elements_from_surface_tree(
winit.backend.renderer(),
lock_surface.wl_surface(),
(0, 0),
output.current_scale().fractional_scale(),
1.0,
element::Kind::Unspecified,
);
output_render_elements.extend(elems);
output_render_elements.extend(elems);
}
} else {
output_render_elements.extend(crate::render::output_render_elements(
output,