props: bump ver to 0.32.3

forces them to not draw stupid decorations of their own. Wlroots stopped doing it for us. Fixes #3830

props.json

@@ -1,3 +1,3 @@
 {
-    "version": "0.32.1"
+    "version": "0.32.3"
 }

src/managers/XWaylandManager.cpp

@@ -184,8 +184,11 @@ void CHyprXWaylandManager::setWindowSize(CWindow* pWindow, Vector2D size, bool f
 }
 
 void CHyprXWaylandManager::setWindowStyleTiled(CWindow* pWindow, uint32_t edgez) {
-    if (!pWindow->m_bIsX11)
-        wlr_xdg_toplevel_set_tiled(pWindow->m_uSurface.xdg->toplevel, edgez);
+    if (pWindow->m_bIsX11)
+        return;
+
+    wlr_xdg_toplevel_set_tiled(pWindow->m_uSurface.xdg->toplevel, edgez);
+    wlr_xdg_toplevel_set_maximized(pWindow->m_uSurface.xdg->toplevel, true);
 }
 
 wlr_surface* CHyprXWaylandManager::surfaceAt(CWindow* pWindow, const Vector2D& client, Vector2D& surface) {

src/render/decorations/CHyprDropShadowDecoration.cpp

@@ -38,13 +38,8 @@ void CHyprDropShadowDecoration::damageEntire() {
 }
 
 void CHyprDropShadowDecoration::updateWindow(CWindow* pWindow) {
-
-    const auto PWORKSPACE = g_pCompositor->getWorkspaceByID(pWindow->m_iWorkspaceID);
-
-    const auto WORKSPACEOFFSET = PWORKSPACE && !pWindow->m_bPinned ? PWORKSPACE->m_vRenderOffset.vec() : Vector2D();
-
-    m_vLastWindowPos  = pWindow->m_vRealPosition.vec() + WORKSPACEOFFSET;
-    m_vLastWindowSize = pWindow->m_vRealSize.vec();
+    m_vLastWindowPos  = m_pWindow->m_vRealPosition.vec();
+    m_vLastWindowSize = m_pWindow->m_vRealSize.vec();
 
     m_bLastWindowBox          = {m_vLastWindowPos.x, m_vLastWindowPos.y, m_vLastWindowSize.x, m_vLastWindowSize.y};
     m_bLastWindowBoxWithDecos = g_pDecorationPositioner->getBoxWithIncludedDecos(pWindow);
@@ -76,11 +71,13 @@ void CHyprDropShadowDecoration::draw(CMonitor* pMonitor, float a, const Vector2D
     if (*PSHADOWS != 1)
         return; // disabled
 
-    const auto ROUNDING = m_pWindow->rounding() + m_pWindow->getRealBorderSize();
+    const auto ROUNDING        = m_pWindow->rounding() + m_pWindow->getRealBorderSize();
+    const auto PWORKSPACE      = g_pCompositor->getWorkspaceByID(m_pWindow->m_iWorkspaceID);
+    const auto WORKSPACEOFFSET = PWORKSPACE && !m_pWindow->m_bPinned ? PWORKSPACE->m_vRenderOffset.vec() : Vector2D();
 
     // draw the shadow
     CBox fullBox = m_bLastWindowBoxWithDecos;
-    fullBox.translate(-pMonitor->vecPosition);
+    fullBox.translate(-pMonitor->vecPosition + WORKSPACEOFFSET);
     fullBox.x -= *PSHADOWSIZE;
     fullBox.y -= *PSHADOWSIZE;
     fullBox.w += 2 * *PSHADOWSIZE;
@@ -114,8 +111,8 @@ void CHyprDropShadowDecoration::draw(CMonitor* pMonitor, float a, const Vector2D
         CBox withDecos = m_bLastWindowBoxWithDecos;
 
         // get window box
-        windowBox.translate(-pMonitor->vecPosition).scale(pMonitor->scale).round();
-        withDecos.translate(-pMonitor->vecPosition).scale(pMonitor->scale).round();
+        windowBox.translate(-pMonitor->vecPosition + WORKSPACEOFFSET).scale(pMonitor->scale).round();
+        withDecos.translate(-pMonitor->vecPosition + WORKSPACEOFFSET).scale(pMonitor->scale).round();
 
         auto scaledDecoExtents = withDecos.extentsFrom(windowBox).round();
 

src/render/decorations/DecorationPositioner.cpp

@@ -6,6 +6,11 @@ CDecorationPositioner::CDecorationPositioner() {
         auto* const PWINDOW = std::any_cast<CWindow*>(data);
         this->onWindowUnmap(PWINDOW);
     });
+
+    g_pHookSystem->hookDynamic("openWindow", [this](void* call, SCallbackInfo& info, std::any data) {
+        auto* const PWINDOW = std::any_cast<CWindow*>(data);
+        this->onWindowMap(PWINDOW);
+    });
 }
 
 Vector2D CDecorationPositioner::getEdgeDefinedPoint(uint32_t edges, CWindow* pWindow) {
@@ -52,7 +57,12 @@ Vector2D CDecorationPositioner::getEdgeDefinedPoint(uint32_t edges, CWindow* pWi
 
 void CDecorationPositioner::uncacheDecoration(IHyprWindowDecoration* deco) {
     std::erase_if(m_vWindowPositioningDatas, [&](const auto& data) { return data->pDecoration == deco; });
-    m_mWindowDatas[deco->m_pWindow].needsRecalc = true;
+
+    const auto WIT = std::find_if(m_mWindowDatas.begin(), m_mWindowDatas.end(), [&](const auto& other) { return other.first == deco->m_pWindow; });
+    if (WIT == m_mWindowDatas.end())
+        return;
+
+    WIT->second.needsRecalc = true;
 }
 
 void CDecorationPositioner::repositionDeco(IHyprWindowDecoration* deco) {
@@ -73,11 +83,29 @@ CDecorationPositioner::SWindowPositioningData* CDecorationPositioner::getDataFor
     return DATA;
 }
 
+void CDecorationPositioner::sanitizeDatas() {
+    std::erase_if(m_mWindowDatas, [](const auto& other) { return !g_pCompositor->windowValidMapped(other.first); });
+    std::erase_if(m_vWindowPositioningDatas, [](const auto& other) {
+        if (!g_pCompositor->windowValidMapped(other->pWindow))
+            return true;
+        if (std::find_if(other->pWindow->m_dWindowDecorations.begin(), other->pWindow->m_dWindowDecorations.end(),
+                         [&](const auto& el) { return el.get() == other->pDecoration; }) == other->pWindow->m_dWindowDecorations.end())
+            return true;
+        return false;
+    });
+}
+
 void CDecorationPositioner::onWindowUpdate(CWindow* pWindow) {
     if (!g_pCompositor->windowValidMapped(pWindow))
         return;
 
-    auto* const WINDOWDATA = &m_mWindowDatas[pWindow];
+    const auto WIT = std::find_if(m_mWindowDatas.begin(), m_mWindowDatas.end(), [&](const auto& other) { return other.first == pWindow; });
+    if (WIT == m_mWindowDatas.end())
+        return;
+
+    const auto WINDOWDATA = &WIT->second;
+
+    sanitizeDatas();
 
     //
     std::vector<CDecorationPositioner::SWindowPositioningData*> datas;
@@ -221,8 +249,15 @@ void CDecorationPositioner::onWindowUnmap(CWindow* pWindow) {
     m_mWindowDatas.erase(pWindow);
 }
 
+void CDecorationPositioner::onWindowMap(CWindow* pWindow) {
+    m_mWindowDatas[pWindow] = {};
+}
+
 SWindowDecorationExtents CDecorationPositioner::getWindowDecorationReserved(CWindow* pWindow) {
-    return m_mWindowDatas[pWindow].reserved;
+    try {
+        const auto E = m_mWindowDatas.at(pWindow);
+        return E.reserved;
+    } catch (std::out_of_range& e) { return {}; }
 }
 
 SWindowDecorationExtents CDecorationPositioner::getWindowDecorationExtents(CWindow* pWindow, bool inputOnly) {
@@ -232,6 +267,9 @@ SWindowDecorationExtents CDecorationPositioner::getWindowDecorationExtents(CWind
         if (data->pWindow != pWindow)
             continue;
 
+        if (!data->pWindow || !data->pDecoration)
+            continue;
+
         if (!(data->pDecoration->getDecorationFlags() & DECORATION_ALLOWS_MOUSE_INPUT) && inputOnly)
             continue;
 

src/render/decorations/DecorationPositioner.hpp

@@ -9,14 +9,12 @@
 class CWindow;
 class IHyprWindowDecoration;
 
-enum eDecorationPositioningPolicy
-{
+enum eDecorationPositioningPolicy {
     DECORATION_POSITION_ABSOLUTE = 0, /* Decoration does not interfere with anything else */
     DECORATION_POSITION_STICKY,       /* Decoration is stuck to some edge of a window */
 };
 
-enum eDecorationEdges
-{
+enum eDecorationEdges {
     DECORATION_EDGE_TOP    = 1 << 0,
     DECORATION_EDGE_BOTTOM = 1 << 1,
     DECORATION_EDGE_LEFT   = 1 << 2,
@@ -93,6 +91,8 @@ class CDecorationPositioner {
 
     SWindowPositioningData*                              getDataFor(IHyprWindowDecoration* pDecoration, CWindow* pWindow);
     void                                                 onWindowUnmap(CWindow* pWindow);
+    void                                                 onWindowMap(CWindow* pWindow);
+    void                                                 sanitizeDatas();
 };
 
 inline std::unique_ptr<CDecorationPositioner> g_pDecorationPositioner;

src/render/shaders/Textures.hpp

@@ -238,14 +238,13 @@ vec3 rgb2hsl(vec3 col) {
 
     vec3  adds = vec3(((green - blue) / delta), 2.0 + ((blue - red) / delta), 4.0 + ((red - green) / delta));
 
-    float deltaGtz = (delta > 0.0) ? 1.0 : 0.0;
+    if (delta > 0.0) {
+        hue += dot(adds, masks);
+        hue /= 6.0;
 
-    hue += dot(adds, masks);
-    hue *= deltaGtz;
-    hue /= 6.0;
-
-    if (hue < 0.0)
-        hue += 1.0;
+        if (hue < 0.0)
+            hue += 1.0;
+    }
 
     return vec3(hue, sat, lum);
 }
@@ -258,19 +257,18 @@ vec3 hsl2rgb(vec3 col) {
     float       sat = col.y;
     float       lum = col.z;
 
-    vec3        xt = vec3(rcpsixth * (hue - twothird), 0.0, rcpsixth * (1.0 - hue));
-
-    if (hue < twothird) {
-        xt.r = 0.0;
-        xt.g = rcpsixth * (twothird - hue);
-        xt.b = rcpsixth * (hue - onethird);
-    }
+    vec3        xt = vec3(0.0);
 
     if (hue < onethird) {
         xt.r = rcpsixth * (onethird - hue);
         xt.g = rcpsixth * hue;
         xt.b = 0.0;
-    }
+    } else if (hue < twothird) {
+        xt.r = 0.0;
+        xt.g = rcpsixth * (twothird - hue);
+        xt.b = rcpsixth * (hue - onethird);
+    } else
+        xt = vec3(rcpsixth * (hue - twothird), 0.0, rcpsixth * (1.0 - hue));
 
     xt = min(xt, 1.0);