per monitor hdr check

hyprwm · Jan 17, 2025 · 83ba215 · 83ba215
1 parent aad967c
commit 83ba215
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/helpers/Monitor.hpp b/src/helpers/Monitor.hpp
@@ -191,6 +191,7 @@ class CMonitor {
 
     bool        m_bEnabled             = false;
     bool        m_bRenderingInitPassed = false;
+    WP<CWindow> m_previousFSWindow;
 
     // For the list lookup
 

diff --git a/src/render/Renderer.cpp b/src/render/Renderer.cpp
@@ -1468,18 +1468,18 @@ bool CHyprRenderer::commitPendingAndDoExplicitSync(PHLMONITOR pMonitor) {
             const auto WINDOW = pMonitor->activeWorkspace->getFullscreenWindow();
             const auto SURF   = WINDOW->m_pWLSurface->resource();
             if (SURF->colorManagement.valid() && SURF->colorManagement->hasImageDescription()) {
-                bool needsHdrMetadataUpdate = SURF->colorManagement->needsHdrMetadataUpdate() || m_previousFSWindow != WINDOW;
+                bool needsHdrMetadataUpdate = SURF->colorManagement->needsHdrMetadataUpdate() || pMonitor->m_previousFSWindow != WINDOW;
                 if (SURF->colorManagement->needsHdrMetadataUpdate())
                     SURF->colorManagement->setHDRMetadata(createHDRMetadata(SURF->colorManagement.get()->imageDescription(), pMonitor->output->parsedEDID));
                 if (needsHdrMetadataUpdate)
                     pMonitor->output->state->setHDRMetadata(SURF->colorManagement->hdrMetadata());
             } else if ((pMonitor->output->state->state().hdrMetadata.hdmi_metadata_type1.eotf == 2) != *PHDR)
                 pMonitor->output->state->setHDRMetadata(*PHDR ? createHDRMetadata(2, pMonitor->output->parsedEDID) : createHDRMetadata(0, pMonitor->output->parsedEDID));
-            m_previousFSWindow = WINDOW;
+            pMonitor->m_previousFSWindow = WINDOW;
         } else {
             if ((pMonitor->output->state->state().hdrMetadata.hdmi_metadata_type1.eotf == 2) != *PHDR)
                 pMonitor->output->state->setHDRMetadata(*PHDR ? createHDRMetadata(2, pMonitor->output->parsedEDID) : createHDRMetadata(0, pMonitor->output->parsedEDID));
-            m_previousFSWindow.reset();
+            pMonitor->m_previousFSWindow.reset();
         }
     }
 

diff --git a/src/render/Renderer.hpp b/src/render/Renderer.hpp
@@ -129,7 +129,6 @@ class CHyprRenderer {
 
     bool              commitPendingAndDoExplicitSync(PHLMONITOR pMonitor);
 
-    WP<CWindow>       m_previousFSWindow;
     bool              m_bCursorHidden        = false;
     bool              m_bCursorHasSurface    = false;
     SP<CRenderbuffer> m_pCurrentRenderbuffer = nullptr;