diff options
| author | vaxerski <43317083+vaxerski@users.noreply.github.com> | 2023-03-13 15:19:25 +0000 |
|---|---|---|
| committer | vaxerski <43317083+vaxerski@users.noreply.github.com> | 2023-03-13 15:19:25 +0000 |
| commit | e749af7b60386f4ff414ef3e2e804523046e46a9 (patch) | |
| tree | db7999bda973306d2fb7f5159b3499cbe4c0f3b8 /src/helpers | |
| parent | 17deeb07ad4ce1b34bfe22524f9b248c5c6e01e6 (diff) | |
dispatchers: remember named workspaces in prev
Diffstat (limited to 'src/helpers')
| -rw-r--r-- | src/helpers/MiscFunctions.cpp | 6 | ||||
| -rw-r--r-- | src/helpers/Workspace.hpp | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/helpers/MiscFunctions.cpp b/src/helpers/MiscFunctions.cpp index ab3c826e..de385e9b 100644 --- a/src/helpers/MiscFunctions.cpp +++ b/src/helpers/MiscFunctions.cpp @@ -297,7 +297,7 @@ int getWorkspaceIDFromString(const std::string& in, std::string& outName) { if (!PWORKSPACE) return INT_MAX; - const auto PLASTWORKSPACE = g_pCompositor->getWorkspaceByID(PWORKSPACE->m_iPrevWorkspaceID); + const auto PLASTWORKSPACE = g_pCompositor->getWorkspaceByID(PWORKSPACE->m_sPrevWorkspace.iID); if (!PLASTWORKSPACE) return INT_MAX; @@ -470,8 +470,8 @@ int64_t getPPIDof(int64_t pid) { return 0; #else - std::string dir = "/proc/" + std::to_string(pid) + "/status"; - FILE* infile; + std::string dir = "/proc/" + std::to_string(pid) + "/status"; + FILE* infile; infile = fopen(dir.c_str(), "r"); if (!infile) diff --git a/src/helpers/Workspace.hpp b/src/helpers/Workspace.hpp index 2fa29d1c..d70702fd 100644 --- a/src/helpers/Workspace.hpp +++ b/src/helpers/Workspace.hpp @@ -23,7 +23,11 @@ class CWorkspace { uint64_t m_iMonitorID = -1; // Previous workspace ID is stored during a workspace change, allowing travel // to the previous workspace. - int m_iPrevWorkspaceID = -1; + struct SPrevWorkspaceData { + int iID = -1; + std::string name = ""; + } m_sPrevWorkspace; + bool m_bHasFullscreenWindow = false; eFullscreenMode m_efFullscreenMode = FULLSCREEN_FULL; |