hyprwm/Hyprland
1
1
Fork 0
mirror of https://github.com/hyprwm/Hyprland.git synced 2024-11-10 12:27:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

keybinds: simulate workspace switch on focusWindow to another ws

Browse Source
This commit is contained in:
vaxerski 2023-05-01 15:39:08 +01:00
parent d6b069458d
commit 45b1e6dc5e
3 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/helpers/Workspace.cpp
View File

@ -150,3 +150,14 @@ void CWorkspace::rememberPrevWorkspace(const CWorkspace* prev) {
m_sPrevWorkspace.iID = prev->m_iID; m_sPrevWorkspace.iID = prev->m_iID;
m_sPrevWorkspace.name = prev->m_szName; m_sPrevWorkspace.name = prev->m_szName;
} }
std::string CWorkspace::getConfigName() {
if (m_bIsSpecialWorkspace) {
return "special:" + m_szName;
}
if (m_iID > 0)
return std::to_string(m_iID);
return "name:" + m_szName;
}

2
src/helpers/Workspace.hpp
View File

@ -60,4 +60,6 @@ class CWorkspace {
CWindow* getLastFocusedWindow(); CWindow* getLastFocusedWindow();
void rememberPrevWorkspace(const CWorkspace* prevWorkspace); void rememberPrevWorkspace(const CWorkspace* prevWorkspace);
std::string getConfigName();
}; };

12
src/managers/KeybindManager.cpp
View File

@ -1145,7 +1145,7 @@ void CKeybindManager::moveActiveTo(std::string args) {
const auto PWORKSPACE = g_pCompositor->getWorkspaceByID(PMONITORTOCHANGETO->activeWorkspace); const auto PWORKSPACE = g_pCompositor->getWorkspaceByID(PMONITORTOCHANGETO->activeWorkspace);
moveActiveToWorkspace(PMONITORTOCHANGETO->activeWorkspace < 0 ? "name:" + PWORKSPACE->m_szName : std::to_string(PMONITORTOCHANGETO->activeWorkspace)); moveActiveToWorkspace(PWORKSPACE->getConfigName());
} }
void CKeybindManager::toggleGroup(std::string args) { void CKeybindManager::toggleGroup(std::string args) {
@ -1659,6 +1659,16 @@ void CKeybindManager::focusWindow(std::string regexp) {
Debug::log(LOG, "Focusing to window name: %s", PWINDOW->m_szTitle.c_str()); Debug::log(LOG, "Focusing to window name: %s", PWINDOW->m_szTitle.c_str());
if (g_pCompositor->m_pLastMonitor->activeWorkspace != PWINDOW->m_iWorkspaceID) {
Debug::log(LOG, "Fake executing workspace to move focus");
const auto PWORKSPACE = g_pCompositor->getWorkspaceByID(PWINDOW->m_iWorkspaceID);
if (!PWORKSPACE) {
Debug::log(ERR, "BUG THIS: null workspace in focusWindow");
return;
}
changeworkspace(PWORKSPACE->getConfigName());
}
if (PWINDOW->isHidden() && PWINDOW->m_sGroupData.pNextWindow) { if (PWINDOW->isHidden() && PWINDOW->m_sGroupData.pNextWindow) {
// grouped, change the current to us // grouped, change the current to us
PWINDOW->setGroupCurrent(PWINDOW); PWINDOW->setGroupCurrent(PWINDOW);