From a958884b5259ec5d6a2c97078b373c722ae20c39 Mon Sep 17 00:00:00 2001 From: Maximilian Seidler <78690852+PaideiaDilemma@users.noreply.github.com> Date: Fri, 15 Mar 2024 17:17:13 +0100 Subject: [PATCH] lock: fix red screen issues with multiple monitors (#5100) * lock: use uint64_t for iMonitorID * lock: move activateLock to onNewSessionLock * lock: add red screen fade * lock: damage when fading the red screen and delay for screencopy * lock: remove redundant scheduleFrameForMonitor --- src/managers/SessionLockManager.cpp | 22 +++++++++++++++++++--- src/managers/SessionLockManager.hpp | 10 ++++++++-- src/render/Renderer.cpp | 17 ++++++++++++----- src/render/Renderer.hpp | 2 +- 4 files changed, 40 insertions(+), 11 deletions(-) diff --git a/src/managers/SessionLockManager.cpp b/src/managers/SessionLockManager.cpp index 82606a8a..1e366034 100644 --- a/src/managers/SessionLockManager.cpp +++ b/src/managers/SessionLockManager.cpp @@ -15,8 +15,6 @@ static void handleSurfaceMap(void* owner, void* data) { if (PMONITOR) g_pHyprRenderer->damageMonitor(PMONITOR); - - g_pSessionLockManager->activateLock(); // activate lock here to prevent the red screen from flashing before that } static void handleSurfaceCommit(void* owner, void* data) { @@ -97,6 +95,8 @@ void CSessionLockManager::onNewSessionLock(wlr_session_lock_v1* pWlrLock) { m_sSessionLock.active = false; + m_sSessionLock.mMonitorsWithoutMappedSurfaceTimers.clear(); + g_pCompositor->m_sSeat.exclusiveClient = nullptr; g_pInputManager->refocus(); @@ -126,13 +126,15 @@ void CSessionLockManager::onNewSessionLock(wlr_session_lock_v1* pWlrLock) { pWlrLock, "wlr_session_lock_v1"); wlr_session_lock_v1_send_locked(pWlrLock); + + g_pSessionLockManager->activateLock(); } bool CSessionLockManager::isSessionLocked() { return m_sSessionLock.active; } -SSessionLockSurface* CSessionLockManager::getSessionLockSurfaceForMonitor(const int& id) { +SSessionLockSurface* CSessionLockManager::getSessionLockSurfaceForMonitor(uint64_t id) { for (auto& sls : m_sSessionLock.vSessionLockSurfaces) { if (sls->iMonitorID == id) { if (sls->mapped) @@ -145,6 +147,20 @@ SSessionLockSurface* CSessionLockManager::getSessionLockSurfaceForMonitor(const return nullptr; } +// We don't want the red screen to flash. +// This violates the protocol a bit, but tries to handle the missing sync between a lock surface beeing created and the red screen beeing drawn. +float CSessionLockManager::getRedScreenAlphaForMonitor(uint64_t id) { + const auto& NOMAPPEDSURFACETIMER = m_sSessionLock.mMonitorsWithoutMappedSurfaceTimers.find(id); + + if (NOMAPPEDSURFACETIMER == m_sSessionLock.mMonitorsWithoutMappedSurfaceTimers.end()) { + m_sSessionLock.mMonitorsWithoutMappedSurfaceTimers.emplace(id, CTimer()); + m_sSessionLock.mMonitorsWithoutMappedSurfaceTimers[id].reset(); + return 0.f; + } + + return std::clamp(NOMAPPEDSURFACETIMER->second.getSeconds() - /* delay for screencopy */ 0.5f, 0.f, 1.f); +} + bool CSessionLockManager::isSurfaceSessionLock(wlr_surface* pSurface) { for (auto& sls : m_sSessionLock.vSessionLockSurfaces) { if (sls->pWlrLockSurface->surface == pSurface) diff --git a/src/managers/SessionLockManager.hpp b/src/managers/SessionLockManager.hpp index 51232867..c2c539db 100644 --- a/src/managers/SessionLockManager.hpp +++ b/src/managers/SessionLockManager.hpp @@ -1,10 +1,13 @@ #pragma once #include "../defines.hpp" +#include "../helpers/Timer.hpp" +#include +#include struct SSessionLockSurface { wlr_session_lock_surface_v1* pWlrLockSurface = nullptr; - int iMonitorID = -1; + uint64_t iMonitorID = -1; bool mapped = false; @@ -18,6 +21,7 @@ struct SSessionLock { wlr_session_lock_v1* pWlrLock = nullptr; std::vector> vSessionLockSurfaces; + std::unordered_map mMonitorsWithoutMappedSurfaceTimers; DYNLISTENER(newSurface); DYNLISTENER(unlock); @@ -30,7 +34,9 @@ class CSessionLockManager { ~CSessionLockManager() = default; void onNewSessionLock(wlr_session_lock_v1*); - SSessionLockSurface* getSessionLockSurfaceForMonitor(const int&); + SSessionLockSurface* getSessionLockSurfaceForMonitor(uint64_t); + + float getRedScreenAlphaForMonitor(uint64_t); bool isSessionLocked(); bool isSurfaceSessionLock(wlr_surface*); diff --git a/src/render/Renderer.cpp b/src/render/Renderer.cpp index 10f15a9d..815b70fb 100644 --- a/src/render/Renderer.cpp +++ b/src/render/Renderer.cpp @@ -815,16 +815,23 @@ void CHyprRenderer::renderAllClientsForWorkspace(CMonitor* pMonitor, CWorkspace* g_pHyprOpenGL->m_RenderData.renderModif = {}; } -void CHyprRenderer::renderLockscreen(CMonitor* pMonitor, timespec* now) { +void CHyprRenderer::renderLockscreen(CMonitor* pMonitor, timespec* now, const CBox& geometry) { TRACY_GPU_ZONE("RenderLockscreen"); if (g_pSessionLockManager->isSessionLocked()) { - const auto PSLS = g_pSessionLockManager->getSessionLockSurfaceForMonitor(pMonitor->ID); + Vector2D translate = {geometry.x, geometry.y}; + float scale = (float)geometry.width / pMonitor->vecPixelSize.x; + const auto PSLS = g_pSessionLockManager->getSessionLockSurfaceForMonitor(pMonitor->ID); if (!PSLS) { // locked with no surface, fill with red - CBox boxe = {0, 0, INT16_MAX, INT16_MAX}; - g_pHyprOpenGL->renderRect(&boxe, CColor(1.0, 0.2, 0.2, 1.0)); + const auto ALPHA = g_pSessionLockManager->getRedScreenAlphaForMonitor(pMonitor->ID); + + CBox monbox = {translate.x, translate.y, pMonitor->vecTransformedSize.x * scale, pMonitor->vecTransformedSize.y * scale}; + g_pHyprOpenGL->renderRect(&monbox, CColor(1.0, 0.2, 0.2, ALPHA)); + + if (ALPHA < 1.f) /* animate */ + damageMonitor(pMonitor); } else { renderSessionLockSurface(PSLS, pMonitor, now); } @@ -1206,7 +1213,7 @@ void CHyprRenderer::renderMonitor(CMonitor* pMonitor) { CBox renderBox = {0, 0, (int)pMonitor->vecPixelSize.x, (int)pMonitor->vecPixelSize.y}; renderWorkspace(pMonitor, g_pCompositor->getWorkspaceByID(pMonitor->activeWorkspace), &now, renderBox); - renderLockscreen(pMonitor, &now); + renderLockscreen(pMonitor, &now, renderBox); if (pMonitor == g_pCompositor->m_pLastMonitor) { g_pHyprNotificationOverlay->draw(pMonitor); diff --git a/src/render/Renderer.hpp b/src/render/Renderer.hpp index 53cace82..e480b26d 100644 --- a/src/render/Renderer.hpp +++ b/src/render/Renderer.hpp @@ -59,7 +59,7 @@ class CHyprRenderer { void setCursorHidden(bool hide); void calculateUVForSurface(CWindow*, wlr_surface*, bool main = false, const Vector2D& projSize = {}, bool fixMisalignedFSV1 = false); std::tuple getRenderTimes(CMonitor* pMonitor); // avg max min - void renderLockscreen(CMonitor* pMonitor, timespec* now); + void renderLockscreen(CMonitor* pMonitor, timespec* now, const CBox& geometry); void setOccludedForBackLayers(CRegion& region, CWorkspace* pWorkspace); void setOccludedForMainWorkspace(CRegion& region, CWorkspace* pWorkspace); // TODO: merge occlusion methods bool canSkipBackBufferClear(CMonitor* pMonitor);