desktop: cleanup, unify desktop elements as views (#12563)

1 files changed, 0 insertions, 240 deletions

diff --git a/src/desktop/WLSurface.cpp b/src/desktop/WLSurface.cpp
deleted file mode 100644
index a7b654f0..00000000
--- a/src/desktop/WLSurface.cpp
+++ /dev/null
@@ -1,240 +0,0 @@
-#include "WLSurface.hpp"
-#include "LayerSurface.hpp"
-#include "../desktop/Window.hpp"
-#include "../protocols/core/Compositor.hpp"
-#include "../protocols/LayerShell.hpp"
-#include "../render/Renderer.hpp"
-
-void CWLSurface::assign(SP<CWLSurfaceResource> pSurface) {
-    m_resource = pSurface;
-    init();
-    m_inert = false;
-}
-
-void CWLSurface::assign(SP<CWLSurfaceResource> pSurface, PHLWINDOW pOwner) {
-    m_windowOwner = pOwner;
-    m_resource    = pSurface;
-    init();
-    m_inert = false;
-}
-
-void CWLSurface::assign(SP<CWLSurfaceResource> pSurface, PHLLS pOwner) {
-    m_layerOwner = pOwner;
-    m_resource   = pSurface;
-    init();
-    m_inert = false;
-}
-
-void CWLSurface::assign(SP<CWLSurfaceResource> pSurface, CSubsurface* pOwner) {
-    m_subsurfaceOwner = pOwner;
-    m_resource        = pSurface;
-    init();
-    m_inert = false;
-}
-
-void CWLSurface::assign(SP<CWLSurfaceResource> pSurface, CPopup* pOwner) {
-    m_popupOwner = pOwner;
-    m_resource   = pSurface;
-    init();
-    m_inert = false;
-}
-
-void CWLSurface::unassign() {
-    destroy();
-}
-
-CWLSurface::~CWLSurface() {
-    destroy();
-}
-
-bool CWLSurface::exists() const {
-    return m_resource;
-}
-
-SP<CWLSurfaceResource> CWLSurface::resource() const {
-    return m_resource.lock();
-}
-
-bool CWLSurface::small() const {
-    if (!validMapped(m_windowOwner) || !exists())
-        return false;
-
-    if (!m_resource->m_current.texture)
-        return false;
-
-    const auto O             = m_windowOwner.lock();
-    const auto REPORTED_SIZE = O->getReportedSize();
-
-    return REPORTED_SIZE.x > m_resource->m_current.size.x + 1 || REPORTED_SIZE.y > m_resource->m_current.size.y + 1;
-}
-
-Vector2D CWLSurface::correctSmallVec() const {
-    if (!validMapped(m_windowOwner) || !exists() || !small() || m_fillIgnoreSmall)
-        return {};
-
-    const auto SIZE = getViewporterCorrectedSize();
-    const auto O    = m_windowOwner.lock();
-    const auto REP  = O->getReportedSize();
-
-    return Vector2D{(REP.x - SIZE.x) / 2, (REP.y - SIZE.y) / 2}.clamp({}, {INFINITY, INFINITY}) * (O->m_realSize->value() / REP);
-}
-
-Vector2D CWLSurface::correctSmallVecBuf() const {
-    if (!exists() || !small() || m_fillIgnoreSmall || !m_resource->m_current.texture)
-        return {};
-
-    const auto SIZE = getViewporterCorrectedSize();
-    const auto BS   = m_resource->m_current.bufferSize;
-
-    return Vector2D{(BS.x - SIZE.x) / 2, (BS.y - SIZE.y) / 2}.clamp({}, {INFINITY, INFINITY});
-}
-
-Vector2D CWLSurface::getViewporterCorrectedSize() const {
-    if (!exists() || !m_resource->m_current.texture)
-        return {};
-
-    return m_resource->m_current.viewport.hasDestination ? m_resource->m_current.viewport.destination : m_resource->m_current.bufferSize;
-}
-
-CRegion CWLSurface::computeDamage() const {
-    if (!m_resource->m_current.texture)
-        return {};
-
-    CRegion damage = m_resource->m_current.accumulateBufferDamage();
-    damage.transform(wlTransformToHyprutils(m_resource->m_current.transform), m_resource->m_current.bufferSize.x, m_resource->m_current.bufferSize.y);
-
-    const auto BUFSIZE    = m_resource->m_current.bufferSize;
-    const auto CORRECTVEC = correctSmallVecBuf();
-
-    if (m_resource->m_current.viewport.hasSource)
-        damage.intersect(m_resource->m_current.viewport.source);
-
-    const auto SCALEDSRCSIZE =
-        m_resource->m_current.viewport.hasSource ? m_resource->m_current.viewport.source.size() * m_resource->m_current.scale : m_resource->m_current.bufferSize;
-
-    damage.scale({BUFSIZE.x / SCALEDSRCSIZE.x, BUFSIZE.y / SCALEDSRCSIZE.y});
-    damage.translate(CORRECTVEC);
-
-    // go from buffer coords in the damage to hl logical
-
-    const auto     BOX      = getSurfaceBoxGlobal();
-    const auto     SURFSIZE = m_resource->m_current.size;
-    const Vector2D SCALE    = SURFSIZE / m_resource->m_current.bufferSize;
-
-    damage.scale(SCALE);
-    if (BOX.has_value()) {
-        if (m_windowOwner)
-            damage.intersect(CBox{{}, BOX->size() * m_windowOwner->m_X11SurfaceScaledBy});
-        else
-            damage.intersect(CBox{{}, BOX->size()});
-    }
-
-    return damage;
-}
-
-void CWLSurface::destroy() {
-    if (!m_resource)
-        return;
-
-    m_events.destroy.emit();
-
-    m_constraint.reset();
-
-    m_listeners.destroy.reset();
-    m_resource->m_hlSurface.reset();
-    m_windowOwner.reset();
-    m_layerOwner.reset();
-    m_popupOwner      = nullptr;
-    m_subsurfaceOwner = nullptr;
-    m_inert           = true;
-
-    if (g_pHyprRenderer && g_pHyprRenderer->m_lastCursorData.surf && g_pHyprRenderer->m_lastCursorData.surf->get() == this)
-        g_pHyprRenderer->m_lastCursorData.surf.reset();
-
-    m_resource.reset();
-
-    Debug::log(LOG, "CWLSurface {:x} called destroy()", rc<uintptr_t>(this));
-}
-
-void CWLSurface::init() {
-    if (!m_resource)
-        return;
-
-    RASSERT(!m_resource->m_hlSurface, "Attempted to duplicate CWLSurface ownership!");
-
-    m_resource->m_hlSurface = m_self.lock();
-
-    m_listeners.destroy = m_resource->m_events.destroy.listen([this] { destroy(); });
-
-    Debug::log(LOG, "CWLSurface {:x} called init()", rc<uintptr_t>(this));
-}
-
-PHLWINDOW CWLSurface::getWindow() const {
-    return m_windowOwner.lock();
-}
-
-PHLLS CWLSurface::getLayer() const {
-    return m_layerOwner.lock();
-}
-
-CPopup* CWLSurface::getPopup() const {
-    return m_popupOwner;
-}
-
-CSubsurface* CWLSurface::getSubsurface() const {
-    return m_subsurfaceOwner;
-}
-
-bool CWLSurface::desktopComponent() const {
-    return !m_layerOwner.expired() || !m_windowOwner.expired() || m_subsurfaceOwner || m_popupOwner;
-}
-
-std::optional<CBox> CWLSurface::getSurfaceBoxGlobal() const {
-    if (!desktopComponent())
-        return {};
-
-    if (!m_windowOwner.expired())
-        return m_windowOwner->getWindowMainSurfaceBox();
-    if (!m_layerOwner.expired())
-        return m_layerOwner->m_geometry;
-    if (m_popupOwner)
-        return CBox{m_popupOwner->coordsGlobal(), m_popupOwner->size()};
-    if (m_subsurfaceOwner)
-        return CBox{m_subsurfaceOwner->coordsGlobal(), m_subsurfaceOwner->size()};
-
-    return {};
-}
-
-void CWLSurface::appendConstraint(WP<CPointerConstraint> constraint) {
-    m_constraint = constraint;
-}
-
-SP<CPointerConstraint> CWLSurface::constraint() const {
-    return m_constraint.lock();
-}
-
-bool CWLSurface::visible() {
-    if (!m_windowOwner.expired())
-        return g_pHyprRenderer->shouldRenderWindow(m_windowOwner.lock());
-    if (!m_layerOwner.expired())
-        return true;
-    if (m_popupOwner)
-        return m_popupOwner->visible();
-    if (m_subsurfaceOwner)
-        return m_subsurfaceOwner->visible();
-    return true; // non-desktop, we don't know much.
-}
-
-SP<CWLSurface> CWLSurface::fromResource(SP<CWLSurfaceResource> pSurface) {
-    if (!pSurface)
-        return nullptr;
-    return pSurface->m_hlSurface.lock();
-}
-
-bool CWLSurface::keyboardFocusable() const {
-    if (m_windowOwner || m_popupOwner || m_subsurfaceOwner)
-        return true;
-    if (m_layerOwner && m_layerOwner->m_layerSurface)
-        return m_layerOwner->m_layerSurface->m_current.interactivity != ZWLR_LAYER_SURFACE_V1_KEYBOARD_INTERACTIVITY_NONE;
-    return false;
-}