From 4ea4efb871997a245539cae9d966ec8f07d3e907 Mon Sep 17 00:00:00 2001 From: vaxerski Date: Thu, 9 Feb 2023 14:15:42 +0000 Subject: add prev to getWorkspaceIDFromString --- src/helpers/MiscFunctions.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/helpers/MiscFunctions.cpp b/src/helpers/MiscFunctions.cpp index 88e6fa51..40121de3 100644 --- a/src/helpers/MiscFunctions.cpp +++ b/src/helpers/MiscFunctions.cpp @@ -288,6 +288,22 @@ int getWorkspaceIDFromString(const std::string& in, std::string& outName) { if (!PWORKSPACE || (g_pCompositor->getWindowsOnWorkspace(id) == 0)) return id; } + } else if (in.find("prev") == 0) { + if (!g_pCompositor->m_pLastMonitor) + return INT_MAX; + + const auto PWORKSPACE = g_pCompositor->getWorkspaceByID(g_pCompositor->m_pLastMonitor->activeWorkspace); + + if (!PWORKSPACE) + return INT_MAX; + + const auto PLASTWORKSPACE = g_pCompositor->getWorkspaceByID(PWORKSPACE->m_iPrevWorkspaceID); + + if (!PLASTWORKSPACE) + return INT_MAX; + + outName = PLASTWORKSPACE->m_szName; + return PLASTWORKSPACE->m_iID; } else { if ((in[0] == 'm' || in[0] == 'e') && (in[1] == '-' || in[1] == '+') && isNumber(in.substr(2))) { bool onAllMonitors = in[0] == 'e'; -- cgit v1.2.3