mirror/Hyprland
3
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland.git synced 2026-02-05 15:55:24 +00:00
Code Issues Projects Releases Wiki Activity

keybinds: attempt to wrap around if fallback is allowed in movefocus

Browse Source 
fixes #8909
This commit is contained in:
vaxerski
2025-01-02 17:36:02 +01:00
parent 94381e5999
commit 365caa49ff
3 changed files with 69 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/managers/KeybindManager.cpp
View File

@ -1423,11 +1423,44 @@ SDispatchResult CKeybindManager::moveFocusTo(std::string args) {
if (*PNOFALLBACK)
return {.success = false, .error = std::format("Nothing to focus to in direction {}", arg)};
Debug::log(LOG, "No monitor found in direction {}, falling back to next window on current workspace", arg);
Debug::log(LOG, "No monitor found in direction {}, getting the inverse edge", arg);
const auto PWINDOWNEXT = g_pCompositor->getNextWindowOnWorkspace(PLASTWINDOW, true);
if (PWINDOWNEXT)
switchToWindow(PWINDOWNEXT);
const auto PMONITOR = PLASTWINDOW->m_pMonitor.lock();
if (!PMONITOR)
return {.success = false, .error = "last window has no monitor?"};
if (arg == 'l' || arg == 'r') {
if (STICKS(PLASTWINDOW->m_vPosition.x, PMONITOR->vecPosition.x) && STICKS(PLASTWINDOW->m_vSize.x, PMONITOR->vecSize.x))
return {.success = false, .error = "move does not make sense, would return back"};
} else if (STICKS(PLASTWINDOW->m_vPosition.y, PMONITOR->vecPosition.y) && STICKS(PLASTWINDOW->m_vSize.y, PMONITOR->vecSize.y))
return {.success = false, .error = "move does not make sense, would return back"};
CBox box = PMONITOR->logicalBox();
switch (arg) {
case 'l':
box.x += box.w;
box.w = 1;
break;
case 'r':
box.x -= 1;
box.w = 1;
break;
case 'u':
case 't':
box.y += box.h;
box.h = 1;
break;
case 'd':
case 'b':
box.y -= 1;
box.h = 1;
break;
}
const auto PWINDOWCANDIDATE = g_pCompositor->getWindowInDirection(box, PMONITOR->activeWorkspace, arg, PLASTWINDOW, PLASTWINDOW->m_bIsFloating);
if (PWINDOWCANDIDATE)
switchToWindow(PWINDOWCANDIDATE);
return {};
}