hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-23 02:45:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

add general:workspace_back_and_forth option

Browse source
This commit is contained in:
Charles Taylor 2022-08-21 20:40:06 +10:00
parent 04f0efadc3
commit d6ff7e40cf
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/config/ConfigManager.cpp
View file

@ -34,6 +34,7 @@ void CConfigManager::setDefaultVars() {
configValues["general:apply_sens_to_raw"].intValue = 0; configValues["general:apply_sens_to_raw"].intValue = 0;
configValues["general:main_mod"].strValue = "SUPER"; // exposed to the user for easier configuring configValues["general:main_mod"].strValue = "SUPER"; // exposed to the user for easier configuring
configValues["general:main_mod_internal"].intValue = g_pKeybindManager->stringToModMask("SUPER"); // actually used and automatically calculated configValues["general:main_mod_internal"].intValue = g_pKeybindManager->stringToModMask("SUPER"); // actually used and automatically calculated
configValues["general:workspace_back_and_forth"].intValue = 0;
configValues["general:damage_tracking"].strValue = "full"; configValues["general:damage_tracking"].strValue = "full";
configValues["general:damage_tracking_internal"].intValue = DAMAGE_TRACKING_FULL; configValues["general:damage_tracking_internal"].intValue = DAMAGE_TRACKING_FULL;

19
src/managers/KeybindManager.cpp
View file

@ -464,8 +464,8 @@ void CKeybindManager::changeworkspace(std::string args) {
if (PWORKSPACE) if (PWORKSPACE)
workspaceName = PWORKSPACE->m_szName; workspaceName = PWORKSPACE->m_szName;
} else if (args.find("previous") == 0) { } else if (args.find("previous") == 0) {
const auto P_MONITOR = g_pCompositor->getMonitorFromCursor(); const auto P_CURRENT_WORKSPACE = g_pCompositor->getWorkspaceByID(
const auto P_CURRENT_WORKSPACE = g_pCompositor->getWorkspaceByID(P_MONITOR->activeWorkspace); g_pCompositor->getMonitorFromCursor()->activeWorkspace);
// Do nothing if there's no previous workspace, otherwise switch to it. // Do nothing if there's no previous workspace, otherwise switch to it.
if (P_CURRENT_WORKSPACE->m_iPrevWorkspaceID == -1) { if (P_CURRENT_WORKSPACE->m_iPrevWorkspaceID == -1) {
@ -488,6 +488,21 @@ void CKeybindManager::changeworkspace(std::string args) {
return; return;
} }
// Workspace_back_and_forth being enabled means that an attempt to switch to
// the current workspace will instead switch to the previous.
if (g_pConfigManager->getConfigValuePtr("general:workspace_back_and_forth")->intValue == 1
&& g_pCompositor->getMonitorFromCursor()->activeWorkspace == workspaceToChangeTo) {
const auto P_CURRENT_WORKSPACE = g_pCompositor->getWorkspaceByID(
g_pCompositor->getMonitorFromCursor()->activeWorkspace);
workspaceToChangeTo = P_CURRENT_WORKSPACE->m_iPrevWorkspaceID;
isSwitchingToPrevious = true;
// TODO: Add support for cycles
P_CURRENT_WORKSPACE->m_iPrevWorkspaceID = -1;
}
// remove constraints // remove constraints
g_pInputManager->unconstrainMouse(); g_pInputManager->unconstrainMouse();