layerSurface: refactor/move to a memory-safe impl

Makes all the pointers smart to avoid memory issues
Refactors layerSurface code to live inside desktop/layersurface

3 files changed, 19 insertions, 19 deletions

diff --git a/src/managers/input/InputManager.cpp b/src/managers/input/InputManager.cpp
index 47dc2bf6..72c1772c 100644
--- a/src/managers/input/InputManager.cpp
+++ b/src/managers/input/InputManager.cpp
@@ -120,13 +120,13 @@ void CInputManager::mouseMoveUnified(uint32_t time, bool refocus) {
     const auto  FOLLOWMOUSE = *PFOLLOWONDND && m_sDrag.drag ? 1 : *PFOLLOWMOUSE;
 
     m_pFoundSurfaceToFocus = nullptr;
-    m_pFoundLSToFocus      = nullptr;
+    m_pFoundLSToFocus.reset();
     m_pFoundWindowToFocus.reset();
-    wlr_surface*   foundSurface = nullptr;
-    Vector2D       surfaceCoords;
-    Vector2D       surfacePos = Vector2D(-1337, -1337);
-    PHLWINDOW      pFoundWindow;
-    SLayerSurface* pFoundLayerSurface = nullptr;
+    wlr_surface* foundSurface = nullptr;
+    Vector2D     surfaceCoords;
+    Vector2D     surfacePos = Vector2D(-1337, -1337);
+    PHLWINDOW    pFoundWindow;
+    PHLLS        pFoundLayerSurface;
 
     if (!g_pCompositor->m_bReadyToProcess || g_pCompositor->m_bIsShuttingDown || g_pCompositor->m_bUnsafeState)
         return;
diff --git a/src/managers/input/InputManager.hpp b/src/managers/input/InputManager.hpp
index e20bca2a..08e9e831 100644
--- a/src/managers/input/InputManager.hpp
+++ b/src/managers/input/InputManager.hpp
@@ -38,10 +38,10 @@ enum eBorderIconDirection {
 };
 
 struct STouchData {
-    PHLWINDOWREF   touchFocusWindow;
-    SLayerSurface* touchFocusLS      = nullptr;
-    wlr_surface*   touchFocusSurface = nullptr;
-    Vector2D       touchSurfaceOrigin;
+    PHLWINDOWREF touchFocusWindow;
+    PHLLSREF     touchFocusLS;
+    wlr_surface* touchFocusSurface = nullptr;
+    Vector2D     touchSurfaceOrigin;
 };
 
 // The third row is always 0 0 1 and is not expected by `libinput_device_config_calibration_set_matrix`
@@ -138,7 +138,7 @@ class CInputManager {
     std::list<SSwitchDevice> m_lSwitches;
 
     // Exclusive layer surfaces
-    std::deque<SLayerSurface*> m_dExclusiveLSes;
+    std::deque<PHLLSREF> m_dExclusiveLSes;
 
     // constraints
     std::vector<std::weak_ptr<CPointerConstraint>> m_vConstraints;
@@ -224,9 +224,9 @@ class CInputManager {
     void               applyConfigToKeyboard(SKeyboard*);
 
     // this will be set after a refocus()
-    wlr_surface*   m_pFoundSurfaceToFocus = nullptr;
-    SLayerSurface* m_pFoundLSToFocus      = nullptr;
-    PHLWINDOWREF   m_pFoundWindowToFocus;
+    wlr_surface* m_pFoundSurfaceToFocus = nullptr;
+    PHLLSREF     m_pFoundLSToFocus;
+    PHLWINDOWREF m_pFoundWindowToFocus;
 
     // for holding focus on buttons held
     bool m_bFocusHeldByButtons   = false;
diff --git a/src/managers/input/Touch.cpp b/src/managers/input/Touch.cpp
index a3f28ac0..91f4ada6 100644
--- a/src/managers/input/Touch.cpp
+++ b/src/managers/input/Touch.cpp
@@ -37,7 +37,7 @@ void CInputManager::onTouchDown(wlr_touch_down_event* e) {
     if (m_sActiveSwipe.pWorkspaceBegin) {
         return;
         // TODO: Don't swipe if you touched a floating window.
-    } else if (*PSWIPETOUCH && (!m_pFoundLSToFocus || m_pFoundLSToFocus->layer <= ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM)) {
+    } else if (*PSWIPETOUCH && (m_pFoundLSToFocus.expired() || m_pFoundLSToFocus.lock()->layer <= ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM)) {
         const auto PWORKSPACE = PMONITOR->activeWorkspace;
         const bool VERTANIMS  = PWORKSPACE->m_vRenderOffset.getConfig()->pValues->internalStyle == "slidevert" ||
             PWORKSPACE->m_vRenderOffset.getConfig()->pValues->internalStyle.starts_with("slidefadevert");
@@ -74,8 +74,8 @@ void CInputManager::onTouchDown(wlr_touch_down_event* e) {
             g_pCompositor->vectorWindowToSurface(g_pInputManager->getMouseCoordsInternal(), m_sTouchData.touchFocusWindow.lock(), local);
             m_sTouchData.touchSurfaceOrigin = g_pInputManager->getMouseCoordsInternal() - local;
         }
-    } else if (m_sTouchData.touchFocusLS) {
-        local = g_pInputManager->getMouseCoordsInternal() - Vector2D(m_sTouchData.touchFocusLS->geometry.x, m_sTouchData.touchFocusLS->geometry.y);
+    } else if (!m_sTouchData.touchFocusLS.expired()) {
+        local = g_pInputManager->getMouseCoordsInternal() - m_sTouchData.touchFocusLS.lock()->geometry.pos();
 
         m_sTouchData.touchSurfaceOrigin = g_pInputManager->getMouseCoordsInternal() - local;
     } else {
@@ -139,8 +139,8 @@ void CInputManager::onTouchMove(wlr_touch_motion_event* e) {
 
         wlr_seat_touch_notify_motion(g_pCompositor->m_sSeat.seat, e->time_msec, e->touch_id, local.x, local.y);
         // wlr_seat_pointer_notify_motion(g_pCompositor->m_sSeat.seat, e->time_msec, local.x, local.y);
-    } else if (m_sTouchData.touchFocusLS) {
-        const auto PMONITOR = g_pCompositor->getMonitorFromID(m_sTouchData.touchFocusLS->monitorID);
+    } else if (!m_sTouchData.touchFocusLS.expired()) {
+        const auto PMONITOR = g_pCompositor->getMonitorFromID(m_sTouchData.touchFocusLS.lock()->monitorID);
 
         wlr_cursor_warp(g_pCompositor->m_sWLRCursor, nullptr, PMONITOR->vecPosition.x + e->x * PMONITOR->vecSize.x, PMONITOR->vecPosition.y + e->y * PMONITOR->vecSize.y);