From 9fd928e114d7f57ac03aa7430d9cba41843347de Mon Sep 17 00:00:00 2001 From: Vaxry Date: Sun, 17 Dec 2023 20:00:18 +0000 Subject: [PATCH] internal: nuke CWindow::m_bMappedX11 it's useless. m_bIsMapped is the same. --- src/Compositor.cpp | 9 +++------ src/Window.cpp | 4 ++-- src/Window.hpp | 1 - src/events/Windows.cpp | 13 +++++-------- src/layout/DwindleLayout.cpp | 2 +- src/layout/MasterLayout.cpp | 2 +- src/managers/XWaylandManager.cpp | 2 +- 7 files changed, 13 insertions(+), 20 deletions(-) diff --git a/src/Compositor.cpp b/src/Compositor.cpp index 4f80100adac..cbdfa288187 100644 --- a/src/Compositor.cpp +++ b/src/Compositor.cpp @@ -1065,9 +1065,6 @@ bool CCompositor::windowValidMapped(CWindow* pWindow) { if (!windowExists(pWindow)) return false; - if (pWindow->m_bIsX11 && !pWindow->m_bMappedX11) - return false; - if (!pWindow->m_bIsMapped) return false; @@ -1131,7 +1128,7 @@ SIMEPopup* CCompositor::vectorToIMEPopup(const Vector2D& pos, std::listm_bIsMapped || w->m_bFadingOut || !w->m_bMappedX11) + if (!w->m_bIsMapped || w->m_bFadingOut) continue; if (w->m_pWLSurface.wlr() == pSurface) @@ -1374,7 +1371,7 @@ void CCompositor::changeWindowZOrder(CWindow* pWindow, bool top) { toMove.emplace_front(pw); for (auto& w : m_vWindows) { - if (w->m_bIsMapped && w->m_bMappedX11 && !w->isHidden() && w->m_bIsX11 && w->X11TransientFor() == pw) { + if (w->m_bIsMapped && !w->isHidden() && w->m_bIsX11 && w->X11TransientFor() == pw) { x11Stack(w.get(), top, x11Stack); } } @@ -1729,7 +1726,7 @@ CWindow* CCompositor::getConstraintWindow(SMouse* pMouse) { const auto PSURFACE = pMouse->currentConstraint->surface; for (auto& w : m_vWindows) { - if (w->isHidden() || !w->m_bMappedX11 || !w->m_bIsMapped || !w->m_pWLSurface.exists()) + if (w->isHidden() || !w->m_bIsMapped || !w->m_pWLSurface.exists()) continue; if (w->m_bIsX11) { diff --git a/src/Window.cpp b/src/Window.cpp index bd51f2ffe25..da0912ee9bb 100644 --- a/src/Window.cpp +++ b/src/Window.cpp @@ -231,7 +231,7 @@ pid_t CWindow::getPID() { wl_client_get_credentials(wl_resource_get_client(m_uSurface.xdg->resource), &PID, nullptr, nullptr); } else { - if (!m_bIsMapped || !m_bMappedX11) + if (!m_bIsMapped) return -1; PID = m_uSurface.xwayland->pid; @@ -322,7 +322,7 @@ void sendLeaveIter(wlr_surface* pSurface, int x, int y, void* data) { } void CWindow::updateSurfaceOutputs() { - if (m_iLastSurfaceMonitorID == m_iMonitorID || !m_bIsMapped || m_bHidden || !m_bMappedX11) + if (m_iLastSurfaceMonitorID == m_iMonitorID || !m_bIsMapped || m_bHidden) return; const auto PLASTMONITOR = g_pCompositor->getMonitorFromID(m_iLastSurfaceMonitorID); diff --git a/src/Window.hpp b/src/Window.hpp index c4f2a15dfc2..cff26052863 100644 --- a/src/Window.hpp +++ b/src/Window.hpp @@ -238,7 +238,6 @@ class CWindow { // XWayland stuff bool m_bIsX11 = false; - bool m_bMappedX11 = false; CWindow* m_pX11Parent = nullptr; uint64_t m_iX11Type = 0; bool m_bIsModal = false; diff --git a/src/events/Windows.cpp b/src/events/Windows.cpp index 6a151cfd67b..7f7c8ee6d9c 100644 --- a/src/events/Windows.cpp +++ b/src/events/Windows.cpp @@ -52,7 +52,6 @@ void Events::listener_mapWindow(void* owner, void* data) { const auto PWORKSPACE = PMONITOR->specialWorkspaceID ? g_pCompositor->getWorkspaceByID(PMONITOR->specialWorkspaceID) : g_pCompositor->getWorkspaceByID(PMONITOR->activeWorkspace); PWINDOW->m_iMonitorID = PMONITOR->ID; - PWINDOW->m_bMappedX11 = true; PWINDOW->m_iWorkspaceID = PMONITOR->specialWorkspaceID ? PMONITOR->specialWorkspaceID : PMONITOR->activeWorkspace; PWINDOW->m_bIsMapped = true; PWINDOW->m_bReadyToDelete = false; @@ -712,8 +711,6 @@ void Events::listener_unmapWindow(void* owner, void* data) { g_pInputManager->releaseAllMouseButtons(); } - PWINDOW->m_bMappedX11 = false; - // remove the fullscreen window status from workspace if we closed it const auto PWORKSPACE = g_pCompositor->getWorkspaceByID(PWINDOW->m_iWorkspaceID); @@ -794,7 +791,7 @@ void Events::listener_ackConfigure(void* owner, void* data) { void Events::listener_commitWindow(void* owner, void* data) { CWindow* PWINDOW = (CWindow*)owner; - if (!PWINDOW->m_bMappedX11 || PWINDOW->isHidden() || (PWINDOW->m_bIsX11 && !PWINDOW->m_bMappedX11)) + if (!PWINDOW->m_bIsMapped || PWINDOW->isHidden()) return; if (PWINDOW->m_bIsX11) @@ -1027,7 +1024,7 @@ void Events::listener_configureX11(void* owner, void* data) { const auto E = (wlr_xwayland_surface_configure_event*)data; - if (!PWINDOW->m_uSurface.xwayland->surface || !PWINDOW->m_uSurface.xwayland->surface->mapped || !PWINDOW->m_bMappedX11) { + if (!PWINDOW->m_uSurface.xwayland->surface || !PWINDOW->m_uSurface.xwayland->surface->mapped || !PWINDOW->m_bIsMapped) { wlr_xwayland_surface_configure(PWINDOW->m_uSurface.xwayland, E->x, E->y, E->width, E->height); PWINDOW->m_vPendingReportedSize = {E->width, E->height}; PWINDOW->m_vReportedSize = {E->width, E->height}; @@ -1090,7 +1087,7 @@ void Events::listener_configureX11(void* owner, void* data) { void Events::listener_unmanagedSetGeometry(void* owner, void* data) { CWindow* PWINDOW = (CWindow*)owner; - if (!PWINDOW->m_bMappedX11) + if (!PWINDOW->m_bIsMapped) return; const auto POS = PWINDOW->m_vRealPosition.goalv(); @@ -1223,7 +1220,7 @@ void Events::listener_requestMaximize(void* owner, void* data) { wlr_xdg_surface_schedule_configure(PWINDOW->m_uSurface.xdg); } else { - if (!PWINDOW->m_bMappedX11 || PWINDOW->m_iX11Type != 1) + if (!PWINDOW->m_bIsMapped || PWINDOW->m_iX11Type != 1) return; g_pCompositor->setWindowFullscreen(PWINDOW, !PWINDOW->m_bIsFullscreen, FULLSCREEN_MAXIMIZED); @@ -1236,7 +1233,7 @@ void Events::listener_requestMinimize(void* owner, void* data) { Debug::log(LOG, "Minimize request for {}", PWINDOW); if (PWINDOW->m_bIsX11) { - if (!PWINDOW->m_bMappedX11 || PWINDOW->m_iX11Type != 1) + if (!PWINDOW->m_bIsMapped || PWINDOW->m_iX11Type != 1) return; const auto E = (wlr_xwayland_minimize_event*)data; diff --git a/src/layout/DwindleLayout.cpp b/src/layout/DwindleLayout.cpp index c1009a47fd5..b30d0fb63b6 100644 --- a/src/layout/DwindleLayout.cpp +++ b/src/layout/DwindleLayout.cpp @@ -1044,7 +1044,7 @@ std::string CHyprDwindleLayout::getLayoutName() { void CHyprDwindleLayout::onEnable() { for (auto& w : g_pCompositor->m_vWindows) { - if (w->m_bIsFloating || !w->m_bMappedX11 || !w->m_bIsMapped || w->isHidden()) + if (w->m_bIsFloating || !w->m_bIsMapped || w->isHidden()) continue; onWindowCreatedTiling(w.get()); diff --git a/src/layout/MasterLayout.cpp b/src/layout/MasterLayout.cpp index ff7f9e2ece3..086bcdacbb1 100644 --- a/src/layout/MasterLayout.cpp +++ b/src/layout/MasterLayout.cpp @@ -1407,7 +1407,7 @@ void CHyprMasterLayout::replaceWindowDataWith(CWindow* from, CWindow* to) { void CHyprMasterLayout::onEnable() { for (auto& w : g_pCompositor->m_vWindows) { - if (w->m_bIsFloating || !w->m_bMappedX11 || !w->m_bIsMapped || w->isHidden()) + if (w->m_bIsFloating || !w->m_bIsMapped || w->isHidden()) continue; onWindowCreatedTiling(w.get()); diff --git a/src/managers/XWaylandManager.cpp b/src/managers/XWaylandManager.cpp index c384e6ccbb4..63b8cca087e 100644 --- a/src/managers/XWaylandManager.cpp +++ b/src/managers/XWaylandManager.cpp @@ -119,7 +119,7 @@ std::string CHyprXWaylandManager::getTitle(CWindow* pWindow) { } std::string CHyprXWaylandManager::getAppIDClass(CWindow* pWindow) { - if (!pWindow->m_bMappedX11 || !pWindow->m_bIsMapped) + if (!pWindow->m_bIsMapped) return ""; try {