From 6541f9fda39b83356bf19d9c619e46707b74e3c8 Mon Sep 17 00:00:00 2001 From: Ottatop Date: Tue, 14 May 2024 21:44:59 -0500 Subject: [PATCH] Draw cursor when locked correctly --- src/backend/udev.rs | 2 +- src/backend/winit.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/backend/udev.rs b/src/backend/udev.rs index 4953965..cc14b59 100644 --- a/src/backend/udev.rs +++ b/src/backend/udev.rs @@ -1449,7 +1449,7 @@ impl Udev { // If there isn't a pending screencopy that doesn't want to overlay the cursor, // render it. match pending_screencopy_with_cursor { - Some(include_cursor) if !should_blank => { + Some(include_cursor) if pinnacle.lock_state.is_unlocked() => { if include_cursor { // HACK: Doing `RenderFrameResult::blit_frame_result` with something on the // | cursor plane causes the cursor to overwrite the pixels underneath it, diff --git a/src/backend/winit.rs b/src/backend/winit.rs index 1105cf6..6be396a 100644 --- a/src/backend/winit.rs +++ b/src/backend/winit.rs @@ -272,7 +272,7 @@ impl State { || (self.pinnacle.lock_state.is_locked() && output.with_state(|state| state.lock_surface.is_none())); - let should_draw_cursor = !should_blank + let should_draw_cursor = !self.pinnacle.lock_state.is_unlocked() || output.with_state(|state| { // Don't draw cursor when screencopy without cursor is pending !state