pass: improve pass debugging

src/helpers/Color.cpp

@@ -43,3 +43,7 @@ Hyprgraphics::CColor::SHSL CHyprColor::asHSL() const {
 CHyprColor CHyprColor::stripA() const {
     return {r, g, b, 1.F};
 }
+
+CHyprColor CHyprColor::modifyA(float newa) const {
+    return {r, g, b, newa};
+}

src/helpers/Color.hpp

@@ -18,6 +18,7 @@ class CHyprColor {
     Hyprgraphics::CColor::SOkLab asOkLab() const;
     Hyprgraphics::CColor::SHSL   asHSL() const;
     CHyprColor                   stripA() const;
+    CHyprColor                   modifyA(float newa) const;
 
     //
     bool operator==(const CHyprColor& c2) const {
@@ -45,3 +46,18 @@ class CHyprColor {
   private:
     Hyprgraphics::CColor::SOkLab okLab; // cache for the OkLab representation
 };
+
+//NOLINTNEXTLINE
+namespace Colors {
+    static const CHyprColor WHITE      = CHyprColor(1.F, 1.F, 1.F, 1.F);
+    static const CHyprColor GREEN      = CHyprColor(0.F, 1.F, 0.F, 1.F);
+    static const CHyprColor BLUE       = CHyprColor(0.F, 0.F, 1.F, 1.F);
+    static const CHyprColor RED        = CHyprColor(1.F, 0.F, 0.F, 1.F);
+    static const CHyprColor ORANGE     = CHyprColor(1.F, 0.5F, 0.F, 1.F);
+    static const CHyprColor YELLOW     = CHyprColor(1.F, 1.F, 0.F, 1.F);
+    static const CHyprColor MAGENTA    = CHyprColor(1.F, 0.F, 1.F, 1.F);
+    static const CHyprColor PURPLE     = CHyprColor(0.5F, 0.F, 0.5F, 1.F);
+    static const CHyprColor LIME       = CHyprColor(0.5F, 1.F, 0.1F, 1.F);
+    static const CHyprColor LIGHT_BLUE = CHyprColor(0.1F, 1.F, 1.F, 1.F);
+    static const CHyprColor BLACK      = CHyprColor(0.F, 0.F, 0.F, 1.F);
+};

src/render/OpenGL.hpp

@@ -216,6 +216,9 @@ class CHyprOpenGLImpl {
     void renderOffToMain(CFramebuffer* off);
     void bindBackOnMain();
 
+    SP<CTexture>                                loadAsset(const std::string& file);
+    SP<CTexture>                                renderText(const std::string& text, CHyprColor col, int pt, bool italic = false);
+
     void                                        setDamage(const CRegion& damage, std::optional<CRegion> finalDamage = {});
 
     uint32_t                                    getPreferredReadFormat(PHLMONITOR pMonitor);
@@ -298,8 +301,6 @@ class CHyprOpenGLImpl {
     void                    initDRMFormats();
     void                    initEGL(bool gbm);
     EGLDeviceEXT            eglDeviceFromDRMFD(int drmFD);
-    SP<CTexture>            loadAsset(const std::string& file);
-    SP<CTexture>            renderText(const std::string& text, CHyprColor col, int pt, bool italic = false);
     void                    initAssets();
     void                    initMissingAssetTexture();
 

src/render/pass/Pass.cpp

@@ -3,6 +3,10 @@
 #include <algorithm>
 #include <ranges>
 #include "../../config/ConfigValue.hpp"
+#include "../../desktop/WLSurface.hpp"
+#include "../../managers/SeatManager.hpp"
+#include "../../managers/eventLoop/EventLoopManager.hpp"
+#include "../../Compositor.hpp"
 
 bool CRenderPass::empty() const {
     return false;
@@ -120,6 +124,15 @@ CRegion CRenderPass::render(const CRegion& damage_) {
         return damage;
     }
 
+    if (!*PDEBUGPASS && debugData.present)
+        debugData = {false};
+    else if (*PDEBUGPASS && !debugData.present) {
+        debugData.present           = true;
+        debugData.keyboardFocusText = g_pHyprOpenGL->renderText("keyboard", Colors::WHITE, 12);
+        debugData.pointerFocusText  = g_pHyprOpenGL->renderText("pointer", Colors::WHITE, 12);
+        debugData.lastWindowText    = g_pHyprOpenGL->renderText("lastWindow", Colors::WHITE, 12);
+    }
+
     if (WILLBLUR && !*PDEBUGPASS) {
         // combine blur regions into one that will be expanded
         CRegion blurRegion;
@@ -171,15 +184,63 @@ CRegion CRenderPass::render(const CRegion& damage_) {
     }
 
     if (*PDEBUGPASS) {
-        CBox monbox = {{}, g_pHyprOpenGL->m_RenderData.pMonitor->vecTransformedSize};
+        renderDebugData();
-        g_pHyprOpenGL->renderRectWithDamage(&monbox, CHyprColor{1.F, 0.1F, 0.1F, 0.5F}, occludedRegion);
+        g_pEventLoopManager->doLater([] {
-        g_pHyprOpenGL->renderRectWithDamage(&monbox, CHyprColor{0.1F, 1.F, 0.1F, 0.5F}, totalLiveBlurRegion);
+            for (auto& m : g_pCompositor->m_vMonitors) {
+                g_pHyprRenderer->damageMonitor(m);
+            }
+        });
     }
 
     g_pHyprOpenGL->m_RenderData.damage = damage;
     return damage;
 }
 
+void CRenderPass::renderDebugData() {
+    CBox box = {{}, g_pHyprOpenGL->m_RenderData.pMonitor->vecTransformedSize};
+    g_pHyprOpenGL->renderRectWithDamage(&box, Colors::RED.modifyA(0.1F), occludedRegion);
+    g_pHyprOpenGL->renderRectWithDamage(&box, Colors::GREEN.modifyA(0.1F), totalLiveBlurRegion);
+
+    std::unordered_map<CWLSurfaceResource*, float> offsets;
+
+    // render focus stuff
+    auto renderHLSurface = [&offsets](SP<CTexture> texture, SP<CWLSurfaceResource> surface, const CHyprColor& color) {
+        if (!surface || !texture)
+            return;
+
+        auto hlSurface = CWLSurface::fromResource(surface);
+        if (!hlSurface)
+            return;
+
+        auto bb = hlSurface->getSurfaceBoxGlobal();
+
+        if (!bb.has_value())
+            return;
+
+        CBox box = bb->copy().translate(-g_pHyprOpenGL->m_RenderData.pMonitor->vecPosition).scale(g_pHyprOpenGL->m_RenderData.pMonitor->scale);
+
+        if (box.intersection(CBox{{}, g_pHyprOpenGL->m_RenderData.pMonitor->vecSize}).empty())
+            return;
+
+        if (offsets.contains(surface.get()))
+            box.translate(Vector2D{0.F, offsets[surface.get()]});
+        else
+            offsets[surface.get()] = 0;
+
+        g_pHyprOpenGL->renderRectWithDamage(&box, Colors::PURPLE.modifyA(0.1F), CRegion{0, 0, INT32_MAX, INT32_MAX});
+        box = {box.pos(), texture->m_vSize};
+        g_pHyprOpenGL->renderRectWithDamage(&box, CHyprColor{0.F, 0.F, 0.F, 0.2F}, CRegion{0, 0, INT32_MAX, INT32_MAX}, std::min(5.0, box.size().y));
+        g_pHyprOpenGL->renderTexture(texture, &box, 1.F);
+
+        offsets[surface.get()] += texture->m_vSize.y;
+    };
+
+    renderHLSurface(debugData.keyboardFocusText, g_pSeatManager->state.keyboardFocus.lock(), Colors::PURPLE.modifyA(0.1F));
+    renderHLSurface(debugData.pointerFocusText, g_pSeatManager->state.pointerFocus.lock(), Colors::ORANGE.modifyA(0.1F));
+    if (g_pCompositor->m_pLastWindow)
+        renderHLSurface(debugData.lastWindowText, g_pCompositor->m_pLastWindow->m_pWLSurface->resource(), Colors::LIGHT_BLUE.modifyA(0.1F));
+}
+
 float CRenderPass::oneBlurRadius() {
     // TODO: is this exact range correct?
     static auto PBLURSIZE   = CConfigValue<Hyprlang::INT>("decoration:blur:size");

src/render/pass/Pass.hpp

@@ -4,6 +4,7 @@
 #include "PassElement.hpp"
 
 class CGradientValueData;
+class CTexture;
 
 class CRenderPass {
   public:
@@ -33,6 +34,12 @@ class CRenderPass {
 
     void                              simplify();
     float                             oneBlurRadius();
+    void                              renderDebugData();
+
+    struct {
+        bool         present = false;
+        SP<CTexture> keyboardFocusText, pointerFocusText, lastWindowText;
+    } debugData;
 
     friend class CHyprOpenGLImpl;
 };