mirror of
https://github.com/hyprwm/Hyprland
synced 2024-11-22 21:45:58 +01:00
add switching to previous workspace
This commit is contained in:
parent
9513031da3
commit
04f0efadc3
2 changed files with 31 additions and 0 deletions
|
@ -18,6 +18,9 @@ public:
|
||||||
int m_iID = -1;
|
int m_iID = -1;
|
||||||
std::string m_szName = "";
|
std::string m_szName = "";
|
||||||
uint64_t m_iMonitorID = -1;
|
uint64_t m_iMonitorID = -1;
|
||||||
|
// Previous workspace ID is stored during a workspace change, allowing travel
|
||||||
|
// to the previous workspace.
|
||||||
|
int m_iPrevWorkspaceID = -1;
|
||||||
bool m_bHasFullscreenWindow = false;
|
bool m_bHasFullscreenWindow = false;
|
||||||
eFullscreenMode m_efFullscreenMode = FULLSCREEN_FULL;
|
eFullscreenMode m_efFullscreenMode = FULLSCREEN_FULL;
|
||||||
|
|
||||||
|
|
|
@ -454,11 +454,31 @@ void CKeybindManager::changeworkspace(std::string args) {
|
||||||
int workspaceToChangeTo = 0;
|
int workspaceToChangeTo = 0;
|
||||||
std::string workspaceName = "";
|
std::string workspaceName = "";
|
||||||
|
|
||||||
|
// Flag needed so that the previous workspace is not recorded when switching
|
||||||
|
// to a previous workspace.
|
||||||
|
bool isSwitchingToPrevious = false;
|
||||||
|
|
||||||
if (args.find("[internal]") == 0) {
|
if (args.find("[internal]") == 0) {
|
||||||
workspaceToChangeTo = std::stoi(args.substr(10));
|
workspaceToChangeTo = std::stoi(args.substr(10));
|
||||||
const auto PWORKSPACE = g_pCompositor->getWorkspaceByID(workspaceToChangeTo);
|
const auto PWORKSPACE = g_pCompositor->getWorkspaceByID(workspaceToChangeTo);
|
||||||
if (PWORKSPACE)
|
if (PWORKSPACE)
|
||||||
workspaceName = PWORKSPACE->m_szName;
|
workspaceName = PWORKSPACE->m_szName;
|
||||||
|
} else if (args.find("previous") == 0) {
|
||||||
|
const auto P_MONITOR = g_pCompositor->getMonitorFromCursor();
|
||||||
|
const auto P_CURRENT_WORKSPACE = g_pCompositor->getWorkspaceByID(P_MONITOR->activeWorkspace);
|
||||||
|
|
||||||
|
// Do nothing if there's no previous workspace, otherwise switch to it.
|
||||||
|
if (P_CURRENT_WORKSPACE->m_iPrevWorkspaceID == -1) {
|
||||||
|
Debug::log(LOG, "No previous workspace to change to");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
workspaceToChangeTo = P_CURRENT_WORKSPACE->m_iPrevWorkspaceID;
|
||||||
|
isSwitchingToPrevious = true;
|
||||||
|
|
||||||
|
// TODO: Add support for cycles
|
||||||
|
P_CURRENT_WORKSPACE->m_iPrevWorkspaceID = -1;
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
workspaceToChangeTo = getWorkspaceIDFromString(args, workspaceName);
|
workspaceToChangeTo = getWorkspaceIDFromString(args, workspaceName);
|
||||||
}
|
}
|
||||||
|
@ -477,6 +497,10 @@ void CKeybindManager::changeworkspace(std::string args) {
|
||||||
|
|
||||||
const auto PWORKSPACETOCHANGETO = g_pCompositor->getWorkspaceByID(workspaceToChangeTo);
|
const auto PWORKSPACETOCHANGETO = g_pCompositor->getWorkspaceByID(workspaceToChangeTo);
|
||||||
|
|
||||||
|
if (!isSwitchingToPrevious)
|
||||||
|
// Remember previous workspace.
|
||||||
|
PWORKSPACETOCHANGETO->m_iPrevWorkspaceID = g_pCompositor->getMonitorFromCursor()->activeWorkspace;
|
||||||
|
|
||||||
if (workspaceToChangeTo == SPECIAL_WORKSPACE_ID)
|
if (workspaceToChangeTo == SPECIAL_WORKSPACE_ID)
|
||||||
PWORKSPACETOCHANGETO->m_iMonitorID = PMONITOR->ID;
|
PWORKSPACETOCHANGETO->m_iMonitorID = PMONITOR->ID;
|
||||||
|
|
||||||
|
@ -541,6 +565,10 @@ void CKeybindManager::changeworkspace(std::string args) {
|
||||||
|
|
||||||
const auto PWORKSPACE = g_pCompositor->m_vWorkspaces.emplace_back(std::make_unique<CWorkspace>(PMONITOR->ID, workspaceName, workspaceToChangeTo == SPECIAL_WORKSPACE_ID)).get();
|
const auto PWORKSPACE = g_pCompositor->m_vWorkspaces.emplace_back(std::make_unique<CWorkspace>(PMONITOR->ID, workspaceName, workspaceToChangeTo == SPECIAL_WORKSPACE_ID)).get();
|
||||||
|
|
||||||
|
if (!isSwitchingToPrevious)
|
||||||
|
// Remember previous workspace.
|
||||||
|
PWORKSPACE->m_iPrevWorkspaceID = OLDWORKSPACE;
|
||||||
|
|
||||||
// start anim on new workspace
|
// start anim on new workspace
|
||||||
PWORKSPACE->startAnim(true, ANIMTOLEFT);
|
PWORKSPACE->startAnim(true, ANIMTOLEFT);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue