From c505eb55ff967f2a0474e88a50803412ba550a61 Mon Sep 17 00:00:00 2001 From: Vaxry Date: Mon, 28 Apr 2025 20:18:02 +0100 Subject: screencopy: support hw cursors while sharing with cursor --- src/managers/PointerManager.cpp | 4 ++-- src/managers/PointerManager.hpp | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'src/managers') diff --git a/src/managers/PointerManager.cpp b/src/managers/PointerManager.cpp index 6a53001b..e8d71e1a 100644 --- a/src/managers/PointerManager.cpp +++ b/src/managers/PointerManager.cpp @@ -591,13 +591,13 @@ SP CPointerManager::renderHWCursorBuffer(SP overridePos) { +void CPointerManager::renderSoftwareCursorsFor(PHLMONITOR pMonitor, const Time::steady_tp& now, CRegion& damage, std::optional overridePos, bool forceRender) { if (!hasCursor()) return; auto state = stateFor(pMonitor); - if ((!state->hardwareFailed && state->softwareLocks == 0)) { + if (!state->hardwareFailed && state->softwareLocks == 0 && !forceRender) { if (currentCursorImage.surface) currentCursorImage.surface->resource()->frame(now); return; diff --git a/src/managers/PointerManager.hpp b/src/managers/PointerManager.hpp index 10726bc6..3569b218 100644 --- a/src/managers/PointerManager.hpp +++ b/src/managers/PointerManager.hpp @@ -49,7 +49,8 @@ class CPointerManager { void unlockSoftwareAll(); bool softwareLockedFor(PHLMONITOR pMonitor); - void renderSoftwareCursorsFor(PHLMONITOR pMonitor, const Time::steady_tp& now, CRegion& damage /* logical */, std::optional overridePos = {} /* monitor-local */); + void renderSoftwareCursorsFor(PHLMONITOR pMonitor, const Time::steady_tp& now, CRegion& damage /* logical */, std::optional overridePos = {} /* monitor-local */, + bool forceRender = false); // this is needed e.g. during screensharing where // the software cursors aren't locked during the cursor move, but they -- cgit v1.2.3