core: trigger hover and onclick only for the currently focused surface

src/core/LockSurface.cpp

@@ -139,3 +139,7 @@ void CSessionLockSurface::onCallback() {
         render();
     }
 }
+
+SP<CCWlSurface> CSessionLockSurface::getWlSurface() {
+    return surface;
+}

src/core/LockSurface.hpp

@@ -17,15 +17,16 @@ class CSessionLockSurface {
     CSessionLockSurface(const SP<COutput>& pOutput);
     ~CSessionLockSurface();
 
-    void  configure(const Vector2D& size, uint32_t serial);
+    void            configure(const Vector2D& size, uint32_t serial);
 
-    bool  readyForFrame = false;
+    bool            readyForFrame = false;
 
-    float fractionalScale = 1.0;
+    float           fractionalScale = 1.0;
 
-    void  render();
+    void            render();
-    void  onCallback();
+    void            onCallback();
-    void  onScaleUpdate();
+    void            onScaleUpdate();
+    SP<CCWlSurface> getWlSurface();
 
   private:
     WP<COutput>                   m_outputRef;

src/core/Seat.cpp

@@ -53,8 +53,19 @@ void CSeatManager::registerSeat(SP<CCWlSeat> seat) {
                     m_pCursorShape->setShape(wpCursorShapeDeviceV1Shape::WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_DEFAULT);
 
                 g_pHyprlock->m_vLastEnterCoords = {wl_fixed_to_double(surface_x), wl_fixed_to_double(surface_y)};
+
+                for (const auto& POUTPUT : g_pHyprlock->m_vOutputs) {
+                    if (!POUTPUT->m_sessionLockSurface)
+                        continue;
+
+                    const auto& PWLSURFACE = POUTPUT->m_sessionLockSurface->getWlSurface();
+                    if (PWLSURFACE->resource() == surf)
+                        g_pHyprlock->m_focusedOutput = POUTPUT;
+                }
             });
 
+            m_pPointer->setLeave([](CCWlPointer* r, uint32_t serial, wl_proxy* surf) { g_pHyprlock->m_focusedOutput.reset(); });
+
             m_pPointer->setButton([](CCWlPointer* r, uint32_t serial, uint32_t time, uint32_t button, wl_pointer_button_state state) {
                 g_pHyprlock->onClick(button, state == WL_POINTER_BUTTON_STATE_PRESSED, g_pHyprlock->m_vMouseLocation);
             });

src/core/hyprlock.cpp

@@ -669,55 +669,56 @@ void CHyprlock::handleKeySym(xkb_keysym_t sym, bool composed) {
 }
 
 void CHyprlock::onClick(uint32_t button, bool down, const Vector2D& pos) {
-    for (auto& o : m_vOutputs) {
+    if (!m_focusedOutput.lock())
-        if (!o->m_sessionLockSurface)
+        return;
-            continue;
 
-        const auto widgets = g_pRenderer->getOrCreateWidgetsFor(*o->m_sessionLockSurface);
+    // TODO: add the UNLIKELY marco from Hyprland
-        for (const auto& widget : widgets) {
+    if (!m_focusedOutput->m_sessionLockSurface)
-            if (widget->containsPoint(pos))
+        return;
-                widget->onClick(button, down, pos);
+
-        }
+    const auto widgets = g_pRenderer->getOrCreateWidgetsFor(*m_focusedOutput->m_sessionLockSurface);
+    for (const auto& widget : widgets) {
+        if (widget->containsPoint(pos))
+            widget->onClick(button, down, pos);
     }
 }
 
 void CHyprlock::onHover(const Vector2D& pos) {
-    bool cursorChanged = false;
+    if (!m_focusedOutput.lock())
+        return;
 
-    for (auto& o : m_vOutputs) {
+    if (!m_focusedOutput->m_sessionLockSurface)
-        if (!o->m_sessionLockSurface)
+        return;
-            continue;
 
-        const auto widgets           = g_pRenderer->getOrCreateWidgetsFor(*o->m_sessionLockSurface);
+    bool       outputNeedsRedraw = false;
-        bool       outputNeedsRedraw = false;
+    bool       cursorChanged     = false;
 
-        for (const auto& widget : widgets) {
+    const auto widgets = g_pRenderer->getOrCreateWidgetsFor(*m_focusedOutput->m_sessionLockSurface);
-            const bool containsPoint = widget->containsPoint(pos);
+    for (const auto& widget : widgets) {
-            const bool wasHovered    = widget->isHovered();
+        const bool CONTAINSPOINT = widget->containsPoint(pos);
+        const bool HOVERED       = widget->isHovered();
 
-            if (containsPoint) {
+        if (CONTAINSPOINT) {
-                if (!wasHovered) {
+            if (!HOVERED) {
-                    widget->setHover(true);
+                widget->setHover(true);
-                    widget->onHover(pos);
+                widget->onHover(pos);
-                    outputNeedsRedraw = true;
-                }
-
-                if (!cursorChanged)
-                    cursorChanged = true;
-
-            } else if (wasHovered) {
-                widget->setHover(false);
                 outputNeedsRedraw = true;
             }
+
+            if (!cursorChanged)
+                cursorChanged = true;
+
+        } else if (HOVERED) {
+            widget->setHover(false);
+            outputNeedsRedraw = true;
         }
-
-        if (outputNeedsRedraw)
-            o->m_sessionLockSurface->render();
     }
 
-    if (!cursorChanged) {
+    if (!cursorChanged)
         g_pSeatManager->m_pCursorShape->setShape(WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_DEFAULT);
-    }
+
+    if (outputNeedsRedraw)
+        m_focusedOutput->m_sessionLockSurface->render();
 }
 
 bool CHyprlock::acquireSessionLock() {

src/core/hyprlock.hpp

@@ -99,7 +99,9 @@ class CHyprlock {
     //
     std::chrono::system_clock::time_point m_tGraceEnds;
     Vector2D                              m_vLastEnterCoords = {};
-    Vector2D                              m_vMouseLocation   = {};
+    WP<COutput>                           m_focusedOutput;
+
+    Vector2D                              m_vMouseLocation = {};
 
     std::shared_ptr<CTimer>               m_pKeyRepeatTimer = nullptr;
 

src/renderer/Framebuffer.cpp

@@ -117,6 +117,6 @@ CFramebuffer::~CFramebuffer() {
     release();
 }
 
-bool CFramebuffer::isAllocated() {
+bool CFramebuffer::isAllocated() const {
     return m_iFb != (GLuint)-1;
-}
+}

src/renderer/Framebuffer.hpp

@@ -13,7 +13,7 @@ class CFramebuffer {
     void      bind() const;
     void      release();
     void      reset();
-    bool      isAllocated();
+    bool      isAllocated() const;
 
     Vector2D  m_vSize;
 
@@ -21,4 +21,4 @@ class CFramebuffer {
     GLuint    m_iFb = -1;
 
     CTexture* m_pStencilTex = nullptr;
-};
+};

src/renderer/widgets/IWidget.cpp

@@ -271,5 +271,5 @@ bool IWidget::isHovered() const {
 }
 
 bool IWidget::containsPoint(const Vector2D& pos) const {
-    return getBoundingBox().containsPoint(pos);
+    return getBoundingBoxWl().containsPoint(pos);
 }

src/renderer/widgets/IWidget.hpp

@@ -24,7 +24,7 @@ class IWidget {
     static int      roundingForBox(const CBox& box, int roundingConfig);
     static int      roundingForBorderBox(const CBox& borderBox, int roundingConfig, int thickness);
 
-    virtual CBox    getBoundingBox() const {
+    virtual CBox    getBoundingBoxWl() const {
         return CBox();
     };
     virtual void onClick(uint32_t button, bool down, const Vector2D& pos) {}

src/renderer/widgets/Image.cpp

@@ -6,6 +6,7 @@
 #include "../../config/ConfigDataValues.hpp"
 #include <cmath>
 #include <hyprlang.hpp>
+#include <hyprutils/math/Vector2D.hpp>
 
 CImage::~CImage() {
     reset();
@@ -84,14 +85,14 @@ void CImage::configure(const std::unordered_map<std::string, std::any>& props, c
     shadow.configure(m_self.lock(), props, viewport);
 
     try {
-        size     = std::any_cast<Hyprlang::INT>(props.at("size"));
+        size      = std::any_cast<Hyprlang::INT>(props.at("size"));
-        rounding = std::any_cast<Hyprlang::INT>(props.at("rounding"));
+        rounding  = std::any_cast<Hyprlang::INT>(props.at("rounding"));
-        border   = std::any_cast<Hyprlang::INT>(props.at("border_size"));
+        border    = std::any_cast<Hyprlang::INT>(props.at("border_size"));
-        color    = *CGradientValueData::fromAnyPv(props.at("border_color"));
+        color     = *CGradientValueData::fromAnyPv(props.at("border_color"));
-        pos      = CLayoutValueData::fromAnyPv(props.at("position"))->getAbsolute(viewport);
+        configPos = CLayoutValueData::fromAnyPv(props.at("position"))->getAbsolute(viewport);
-        halign   = std::any_cast<Hyprlang::STRING>(props.at("halign"));
+        halign    = std::any_cast<Hyprlang::STRING>(props.at("halign"));
-        valign   = std::any_cast<Hyprlang::STRING>(props.at("valign"));
+        valign    = std::any_cast<Hyprlang::STRING>(props.at("valign"));
-        angle    = std::any_cast<Hyprlang::FLOAT>(props.at("rotate"));
+        angle     = std::any_cast<Hyprlang::FLOAT>(props.at("rotate"));
 
         path           = std::any_cast<Hyprlang::STRING>(props.at("path"));
         reloadTime     = std::any_cast<Hyprlang::INT>(props.at("reload_time"));
@@ -197,10 +198,10 @@ bool CImage::draw(const SRenderData& data) {
 
     shadow.draw(data);
 
-    const auto TEXPOS = posFromHVAlign(viewport, tex->m_vSize, pos, halign, valign, angle);
+    pos = posFromHVAlign(viewport, tex->m_vSize, configPos, halign, valign, angle);
 
-    texbox.x = TEXPOS.x;
+    texbox.x = pos.x;
-    texbox.y = TEXPOS.y;
+    texbox.y = pos.y;
 
     texbox.round();
     texbox.rot = angle;
@@ -235,10 +236,14 @@ void CImage::renderUpdate() {
     g_pHyprlock->renderOutput(stringPort);
 }
 
-CBox CImage::getBoundingBox() const {
+CBox CImage::getBoundingBoxWl() const {
-    if (!asset)
+    if (!imageFB.isAllocated())
-        return {pos.x, abs(pos.y - viewport.y), 0, 0};
+        return CBox{};
-    return {pos.x, abs(pos.y - viewport.y + asset->texture.m_vSize.y), asset->texture.m_vSize.x, asset->texture.m_vSize.y};
+
+    return {
+        Vector2D{pos.x, viewport.y - pos.y - imageFB.m_cTex.m_vSize.y},
+        imageFB.m_cTex.m_vSize,
+    };
 }
 
 void CImage::onClick(uint32_t button, bool down, const Vector2D& pos) {

src/renderer/widgets/Image.hpp

@@ -24,7 +24,7 @@ class CImage : public IWidget {
 
     virtual void configure(const std::unordered_map<std::string, std::any>& props, const SP<COutput>& pOutput);
     virtual bool draw(const SRenderData& data);
-    virtual CBox getBoundingBox() const;
+    virtual CBox getBoundingBoxWl() const;
     virtual void onClick(uint32_t button, bool down, const Vector2D& pos);
     virtual void onHover(const Vector2D& pos);
 
@@ -45,6 +45,7 @@ class CImage : public IWidget {
     double                                  angle;
     CGradientValueData                      color;
     Vector2D                                pos;
+    Vector2D                                configPos;
 
     std::string                             halign, valign, path;
 

src/renderer/widgets/Label.cpp

@@ -174,10 +174,14 @@ void CLabel::renderUpdate() {
     g_pHyprlock->renderOutput(outputStringPort);
 }
 
-CBox CLabel::getBoundingBox() const {
+CBox CLabel::getBoundingBoxWl() const {
     if (!asset)
-        return {pos.x, abs(pos.y - viewport.y), 0, 0};
+        return CBox{};
-    return {pos.x, abs(pos.y - viewport.y + asset->texture.m_vSize.y), asset->texture.m_vSize.x, asset->texture.m_vSize.y};
+
+    return {
+        Vector2D{pos.x, viewport.y - pos.y - asset->texture.m_vSize.y},
+        asset->texture.m_vSize,
+    };
 }
 
 void CLabel::onClick(uint32_t button, bool down, const Vector2D& pos) {
@@ -188,4 +192,4 @@ void CLabel::onClick(uint32_t button, bool down, const Vector2D& pos) {
 void CLabel::onHover(const Vector2D& pos) {
     if (!onclickCommand.empty())
         g_pSeatManager->m_pCursorShape->setShape(WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_POINTER);
-}
+}

src/renderer/widgets/Label.hpp

@@ -21,7 +21,7 @@ class CLabel : public IWidget {
 
     virtual void configure(const std::unordered_map<std::string, std::any>& prop, const SP<COutput>& pOutput);
     virtual bool draw(const SRenderData& data);
-    virtual CBox getBoundingBox() const;
+    virtual CBox getBoundingBoxWl() const;
     virtual void onClick(uint32_t button, bool down, const Vector2D& pos);
     virtual void onHover(const Vector2D& pos);
 

src/renderer/widgets/PasswordInputField.cpp

@@ -474,10 +474,13 @@ void CPasswordInputField::updateColors() {
     colorState.font = fontTarget;
 }
 
-CBox CPasswordInputField::getBoundingBox() const {
+CBox CPasswordInputField::getBoundingBoxWl() const {
-    return {pos.x, abs(pos.y - viewport.y + size->value().y), size->value().x, size->value().y};
+    return {
+        Vector2D{pos.x, viewport.y - pos.y - size->value().y},
+        size->value(),
+    };
 }
 
 void CPasswordInputField::onHover(const Vector2D& pos) {
     g_pSeatManager->m_pCursorShape->setShape(WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_TEXT);
-}
+}

src/renderer/widgets/PasswordInputField.hpp

@@ -24,7 +24,7 @@ class CPasswordInputField : public IWidget {
     virtual void configure(const std::unordered_map<std::string, std::any>& prop, const SP<COutput>& pOutput);
     virtual bool draw(const SRenderData& data);
     virtual void onHover(const Vector2D& pos);
-    virtual CBox getBoundingBox() const;
+    virtual CBox getBoundingBoxWl() const;
 
     void         reset();
     void         onFadeOutTimer();

src/renderer/widgets/Shape.cpp

@@ -4,6 +4,7 @@
 #include "../../core/hyprlock.hpp"
 #include <cmath>
 #include <hyprlang.hpp>
+#include <sys/types.h>
 
 void CShape::registerSelf(const SP<CShape>& self) {
     m_self = self;
@@ -102,9 +103,11 @@ bool CShape::draw(const SRenderData& data) {
 
     return data.opacity < 1.0;
 }
-
+CBox CShape::getBoundingBoxWl() const {
-CBox CShape::getBoundingBox() const {
+    return {
-    return {pos.x, abs(pos.y - viewport.y + size.y), size.x, size.y};
+        Vector2D{pos.x, viewport.y - pos.y - size.y},
+        size,
+    };
 }
 
 void CShape::onClick(uint32_t button, bool down, const Vector2D& pos) {

src/renderer/widgets/Shape.hpp

@@ -18,7 +18,7 @@ class CShape : public IWidget {
 
     virtual void configure(const std::unordered_map<std::string, std::any>& prop, const SP<COutput>& pOutput);
     virtual bool draw(const SRenderData& data);
-    virtual CBox getBoundingBox() const;
+    virtual CBox getBoundingBoxWl() const;
     virtual void onClick(uint32_t button, bool down, const Vector2D& pos);
     virtual void onHover(const Vector2D& pos);