From 3f7d9b304811bf54918cc42729f2d05740700573 Mon Sep 17 00:00:00 2001 From: MightyPlaza <123664421+MightyPlaza@users.noreply.github.com> Date: Mon, 4 Sep 2023 19:54:14 +0100 Subject: [PATCH] fix groups and swallowing modified: src/Compositor.cpp modified: src/Compositor.hpp modified: src/events/Windows.cpp --- src/Compositor.cpp | 10 ++++++++ src/Compositor.hpp | 1 + src/events/Windows.cpp | 56 ++++++++++++++++++++++-------------------- 3 files changed, 41 insertions(+), 26 deletions(-) diff --git a/src/Compositor.cpp b/src/Compositor.cpp index 73ed8439..58c50bcc 100644 --- a/src/Compositor.cpp +++ b/src/Compositor.cpp @@ -1164,6 +1164,16 @@ int CCompositor::getWindowsOnWorkspace(const int& id) { return no; } +int CCompositor::getVisibleWindowsOnWorkspace(const int& id) { + int no = 0; + for (auto& w : m_vWindows) { + if (w->m_iWorkspaceID == id && w->m_bIsMapped && !w->isHidden()) + no++; + } + + return no; +} + CWindow* CCompositor::getUrgentWindow() { for (auto& w : m_vWindows) { if (w->m_bIsMapped && w->m_bIsUrgent) diff --git a/src/Compositor.hpp b/src/Compositor.hpp index 2661af27..8482ed33 100644 --- a/src/Compositor.hpp +++ b/src/Compositor.hpp @@ -153,6 +153,7 @@ class CCompositor { void sanityCheckWorkspaces(); void updateWorkspaceWindowDecos(const int&); int getWindowsOnWorkspace(const int&); + int getVisibleWindowsOnWorkspace(const int&); CWindow* getUrgentWindow(); bool hasUrgentWindowOnWorkspace(const int&); CWindow* getFirstWindowOnWorkspace(const int&); diff --git a/src/events/Windows.cpp b/src/events/Windows.cpp index ca617a4a..b8cc8769 100644 --- a/src/events/Windows.cpp +++ b/src/events/Windows.cpp @@ -229,13 +229,15 @@ void Events::listener_mapWindow(void* owner, void* data) { if (PWINDOW->m_bPinned && !PWINDOW->m_bIsFloating) PWINDOW->m_bPinned = false; - const CVarList WORKSPACEARGS = CVarList(requestedWorkspace, 2, ' '); + bool isWorkspaceSet = false; + const CVarList WORKSPACEARGS = CVarList(requestedWorkspace, 2, ' '); if (!WORKSPACEARGS[0].empty()) { std::string requestedWorkspaceName; const int REQUESTEDWORKSPACEID = getWorkspaceIDFromString(WORKSPACEARGS[0], requestedWorkspaceName); if (REQUESTEDWORKSPACEID != INT_MAX) { + isWorkspaceSet = true; if (WORKSPACEARGS[1].find("silent") == 0) workspaceSilent = true; @@ -255,35 +257,11 @@ void Events::listener_mapWindow(void* owner, void* data) { if (pWorkspace->m_bIsSpecialWorkspace) g_pCompositor->getMonitorFromID(pWorkspace->m_iMonitorID)->setSpecialWorkspace(pWorkspace); else - g_pKeybindManager->m_mDispatchers["workspace"](requestedWorkspaceName); + g_pKeybindManager->m_mDispatchers["workspace"](pWorkspace->m_szName); PMONITOR = g_pCompositor->m_pLastMonitor; } } - } else { - auto pWorkspace = g_pCompositor->getWorkspaceByID(PWINDOW->m_iWorkspaceID); - auto workspaceRule = pWorkspace ? g_pConfigManager->getWorkspaceRuleFor(pWorkspace) : SWorkspaceRule{}; - const auto PMONITOR = g_pCompositor->getMonitorFromID(PWINDOW->m_iMonitorID); - - int maxSize = workspaceRule.maxSize; - if (maxSize != 0 && maxSize < g_pCompositor->getWindowsOnWorkspace(pWorkspace->m_iID)) { - if (pWorkspace->m_bIsSpecialWorkspace) { - PWINDOW->m_iWorkspaceID = PMONITOR->activeWorkspace; - PMONITOR->setSpecialWorkspace(nullptr); - } - - pWorkspace = g_pCompositor->getWorkspaceByID(PMONITOR->activeWorkspace); - workspaceRule = pWorkspace ? g_pConfigManager->getWorkspaceRuleFor(pWorkspace) : SWorkspaceRule{}; - maxSize = workspaceRule.maxSize; - if (maxSize != 0 && maxSize < g_pCompositor->getWindowsOnWorkspace(pWorkspace->m_iID)) { - std::string requestedWorkspaceName; - const int REQUESTEDWORKSPACEID = getWorkspaceIDFromString("empty", requestedWorkspaceName); - // doesn't exist since it's empty - pWorkspace = g_pCompositor->createNewWorkspace(REQUESTEDWORKSPACEID, PWINDOW->m_iMonitorID, requestedWorkspaceName); - PWINDOW->m_iWorkspaceID = pWorkspace->m_iID; - g_pKeybindManager->m_mDispatchers["workspace"](requestedWorkspaceName); - } - } } if (PWINDOW->m_bIsFloating) { @@ -594,6 +572,32 @@ void Events::listener_mapWindow(void* owner, void* data) { } } + if (!isWorkspaceSet) { + auto pWorkspace = g_pCompositor->getWorkspaceByID(PWINDOW->m_iWorkspaceID); + auto workspaceRule = pWorkspace ? g_pConfigManager->getWorkspaceRuleFor(pWorkspace) : SWorkspaceRule{}; + const auto PMONITOR = g_pCompositor->getMonitorFromID(PWINDOW->m_iMonitorID); + + int maxSize = workspaceRule.maxSize; + if (maxSize != 0 && maxSize < g_pCompositor->getVisibleWindowsOnWorkspace(pWorkspace->m_iID)) { + if (pWorkspace->m_bIsSpecialWorkspace) { + g_pCompositor->moveWindowToWorkspaceSafe(PWINDOW, g_pCompositor->getWorkspaceByID(PMONITOR->activeWorkspace)); + PMONITOR->setSpecialWorkspace(nullptr); + } + + pWorkspace = g_pCompositor->getWorkspaceByID(PMONITOR->activeWorkspace); + workspaceRule = pWorkspace ? g_pConfigManager->getWorkspaceRuleFor(pWorkspace) : SWorkspaceRule{}; + maxSize = workspaceRule.maxSize; + if (maxSize != 0 && maxSize < g_pCompositor->getVisibleWindowsOnWorkspace(pWorkspace->m_iID)) { + std::string requestedWorkspaceName; + const int REQUESTEDWORKSPACEID = getWorkspaceIDFromString("empty", requestedWorkspaceName); + // doesn't exist since it's empty + pWorkspace = g_pCompositor->createNewWorkspace(REQUESTEDWORKSPACEID, PWINDOW->m_iMonitorID, requestedWorkspaceName); + g_pCompositor->moveWindowToWorkspaceSafe(PWINDOW, pWorkspace); + g_pKeybindManager->m_mDispatchers["workspace"](pWorkspace->m_szName); + } + } + } + PWINDOW->m_bFirstMap = false; Debug::log(LOG, "Map request dispatched, monitor %s, xywh: %f %f %f %f", PMONITOR->szName.c_str(), PWINDOW->m_vRealPosition.goalv().x, PWINDOW->m_vRealPosition.goalv().y,