handle subsurfaces

hyprwm · Feb 23, 2025 · ae8350b · ae8350b
1 parent b155613
commit ae8350b
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 17 deletions.
diff --git a/src/protocols/FrogColorManagement.cpp b/src/protocols/FrogColorManagement.cpp
@@ -37,9 +37,6 @@ CFrogColorManager::CFrogColorManager(SP<CFrogColorManagementFactoryV1> resource_
             return;
         }
 
-        if (SURF->role->role() == SURFACE_ROLE_SUBSURFACE)
-            SURF = ((CSubsurfaceRole*)SURF->role.get())->subsurface->t1Parent();
-
         const auto RESOURCE = PROTO::frogColorManagement->m_vSurfaces.emplace_back(
             makeShared<CFrogColorManagementSurface>(makeShared<CFrogColorManagedSurface>(r->client(), r->version(), id), SURF));
         if UNLIKELY (!RESOURCE->good()) {

diff --git a/src/protocols/core/Compositor.cpp b/src/protocols/core/Compositor.cpp
@@ -306,6 +306,23 @@ void CWLSurfaceResource::breadthfirst(std::function<void(SP<CWLSurfaceResource>,
     bfHelper(surfs, fn, data);
 }
 
+SP<CWLSurfaceResource> CWLSurfaceResource::findFirstHelper(SP<CWLSurfaceResource> root, std::function<bool(SP<CWLSurfaceResource>)> fn) {
+    if (fn(root))
+        return root;
+    for (auto const& sub : root->subsurfaces) {
+        if (sub.expired() || sub->surface.expired())
+            continue;
+        const auto found = findFirstHelper(sub->surface.lock(), fn);
+        if (found)
+            return found;
+    }
+    return nullptr;
+}
+
+SP<CWLSurfaceResource> CWLSurfaceResource::findFirst(std::function<bool(SP<CWLSurfaceResource>)> fn) {
+    return findFirstHelper(self.lock(), fn);
+}
+
 std::pair<SP<CWLSurfaceResource>, Vector2D> CWLSurfaceResource::at(const Vector2D& localCoords, bool allowsInput) {
     std::vector<std::pair<SP<CWLSurfaceResource>, Vector2D>> surfs;
     breadthfirst([&surfs](SP<CWLSurfaceResource> surf, const Vector2D& offset, void* data) { surfs.emplace_back(std::make_pair<>(surf, offset)); }, &surfs);

diff --git a/src/protocols/core/Compositor.hpp b/src/protocols/core/Compositor.hpp
@@ -127,6 +127,7 @@ class CWLSurfaceResource {
     WP<CContentType>                       contentType;
 
     void                                   breadthfirst(std::function<void(SP<CWLSurfaceResource>, const Vector2D&, void*)> fn, void* data);
+    SP<CWLSurfaceResource>                 findFirst(std::function<bool(SP<CWLSurfaceResource>)> fn);
     CRegion                                accumulateCurrentBufferDamage();
     void                                   presentFeedback(timespec* when, PHLMONITOR pMonitor, bool discarded = false);
     void                                   lockPendingState();
@@ -142,17 +143,18 @@ class CWLSurfaceResource {
 
     // this is for cursor dumb copy. Due to our (and wayland's...) architecture,
     // this stupid-ass hack is used
-    WP<IHLBuffer> lastBuffer;
-
-    int           stateLocks = 0;
-
-    void          destroy();
-    void          releaseBuffers(bool onlyCurrent = true);
-    void          dropPendingBuffer();
-    void          dropCurrentBuffer();
-    void          commitPendingState();
-    void          bfHelper(std::vector<SP<CWLSurfaceResource>> const& nodes, std::function<void(SP<CWLSurfaceResource>, const Vector2D&, void*)> fn, void* data);
-    void          updateCursorShm(CRegion damage = CBox{0, 0, INT16_MAX, INT16_MAX});
+    WP<IHLBuffer>          lastBuffer;
+
+    int                    stateLocks = 0;
+
+    void                   destroy();
+    void                   releaseBuffers(bool onlyCurrent = true);
+    void                   dropPendingBuffer();
+    void                   dropCurrentBuffer();
+    void                   commitPendingState();
+    void                   bfHelper(std::vector<SP<CWLSurfaceResource>> const& nodes, std::function<void(SP<CWLSurfaceResource>, const Vector2D&, void*)> fn, void* data);
+    SP<CWLSurfaceResource> findFirstHelper(SP<CWLSurfaceResource> root, std::function<bool(SP<CWLSurfaceResource>)> fn);
+    void                   updateCursorShm(CRegion damage = CBox{0, 0, INT16_MAX, INT16_MAX});
 
     friend class CWLPointerResource;
 };

diff --git a/src/render/Renderer.cpp b/src/render/Renderer.cpp
@@ -1499,9 +1499,11 @@ bool CHyprRenderer::commitPendingAndDoExplicitSync(PHLMONITOR pMonitor) {
     Debug::log(TRACE, "ColorManagement supportsBT2020 {}, supportsPQ {}", pMonitor->output->parsedEDID.supportsBT2020, SUPPORTSPQ);
     if (pMonitor->output->parsedEDID.supportsBT2020 && SUPPORTSPQ) {
         if (pMonitor->activeWorkspace && pMonitor->activeWorkspace->m_bHasFullscreenWindow && pMonitor->activeWorkspace->m_efFullscreenMode == FSMODE_FULLSCREEN) {
-            const auto WINDOW = pMonitor->activeWorkspace->getFullscreenWindow();
-            const auto SURF   = WINDOW->m_pWLSurface->resource();
-            if (SURF->colorManagement.valid() && SURF->colorManagement->hasImageDescription()) {
+            const auto WINDOW    = pMonitor->activeWorkspace->getFullscreenWindow();
+            const auto ROOT_SURF = WINDOW->m_pWLSurface->resource();
+            const auto SURF = ROOT_SURF->findFirst([ROOT_SURF](SP<CWLSurfaceResource> surf) { return surf->colorManagement.valid() && surf->extends() == ROOT_SURF->extends(); });
+
+            if (SURF && SURF->colorManagement.valid() && SURF->colorManagement->hasImageDescription()) {
                 bool needsHdrMetadataUpdate = SURF->colorManagement->needsHdrMetadataUpdate() || pMonitor->m_previousFSWindow != WINDOW;
                 if (SURF->colorManagement->needsHdrMetadataUpdate())
                     SURF->colorManagement->setHDRMetadata(createHDRMetadata(SURF->colorManagement->imageDescription(), pMonitor->output->parsedEDID));