From 84bc0a73f6aad2bdbba9a36f7a751261abf606d9 Mon Sep 17 00:00:00 2001 From: Vaxry Date: Fri, 17 Nov 2023 15:29:51 +0000 Subject: [PATCH] compositor: drop unused vectorToWindow func --- src/Compositor.cpp | 40 ---------------------------------------- src/Compositor.hpp | 1 - 2 files changed, 41 deletions(-) diff --git a/src/Compositor.cpp b/src/Compositor.cpp index 70a19cb5..79e9360c 100644 --- a/src/Compositor.cpp +++ b/src/Compositor.cpp @@ -630,46 +630,6 @@ bool CCompositor::windowExists(CWindow* pWindow) { return false; } -CWindow* CCompositor::vectorToWindow(const Vector2D& pos) { - const auto PMONITOR = getMonitorFromVector(pos); - - if (PMONITOR->specialWorkspaceID) { - for (auto& w : m_vWindows | std::views::reverse) { - auto box = w->getWindowMainSurfaceBox(); - if (w->m_bIsFloating && w->m_iWorkspaceID == PMONITOR->specialWorkspaceID && w->m_bIsMapped && box.containsPoint(pos) && !w->isHidden() && !w->m_bNoFocus) - return w.get(); - } - - for (auto& w : m_vWindows) { - auto box = w->getWindowMainSurfaceBox(); - if (w->m_iWorkspaceID == PMONITOR->specialWorkspaceID && box.containsPoint(pos) && w->m_bIsMapped && !w->m_bIsFloating && !w->isHidden() && !w->m_bNoFocus) - return w.get(); - } - } - - // pinned - for (auto& w : m_vWindows | std::views::reverse) { - auto box = w->getWindowMainSurfaceBox(); - if (box.containsPoint(pos) && w->m_bIsMapped && w->m_bIsFloating && !w->isHidden() && w->m_bPinned && !w->m_bNoFocus) - return w.get(); - } - - // first loop over floating cuz they're above, m_vWindows should be sorted bottom->top, for tiled it doesn't matter. - for (auto& w : m_vWindows | std::views::reverse) { - auto box = w->getWindowMainSurfaceBox(); - if (box.containsPoint(pos) && w->m_bIsMapped && w->m_bIsFloating && isWorkspaceVisible(w->m_iWorkspaceID) && !w->isHidden() && !w->m_bPinned && !w->m_bNoFocus) - return w.get(); - } - - for (auto& w : m_vWindows) { - auto box = w->getWindowMainSurfaceBox(); - if (box.containsPoint(pos) && w->m_bIsMapped && !w->m_bIsFloating && PMONITOR->activeWorkspace == w->m_iWorkspaceID && !w->isHidden() && !w->m_bNoFocus) - return w.get(); - } - - return nullptr; -} - CWindow* CCompositor::vectorToWindowTiled(const Vector2D& pos) { const auto PMONITOR = getMonitorFromVector(pos); diff --git a/src/Compositor.hpp b/src/Compositor.hpp index 59fc9136..7d187a80 100644 --- a/src/Compositor.hpp +++ b/src/Compositor.hpp @@ -137,7 +137,6 @@ class CCompositor { void focusSurface(wlr_surface*, CWindow* pWindowOwner = nullptr); bool windowExists(CWindow*); bool windowValidMapped(CWindow*); - CWindow* vectorToWindow(const Vector2D&); CWindow* vectorToWindowIdeal(const Vector2D&); // used only for finding a window to focus on, basically a "findFocusableWindow" CWindow* vectorToWindowTiled(const Vector2D&); wlr_surface* vectorToLayerSurface(const Vector2D&, std::vector>*, Vector2D*, SLayerSurface**);