Merge branch 'hyprwm:main' into main

1 files changed, 32 insertions, 0 deletions

diff --git a/src/managers/KeybindManager.cpp b/src/managers/KeybindManager.cpp
index b1b51dd7..e3799a7c 100644
--- a/src/managers/KeybindManager.cpp
+++ b/src/managers/KeybindManager.cpp
@@ -39,6 +39,7 @@ CKeybindManager::CKeybindManager() {
     m_mDispatchers["dpms"]                      = dpms;
     m_mDispatchers["movewindowpixel"]           = moveWindow;
     m_mDispatchers["resizewindowpixel"]         = resizeWindow;
+    m_mDispatchers["swapnext"]                  = swapnext;
 
     m_tScrollTimer.reset();
 }
@@ -1437,3 +1438,34 @@ void CKeybindManager::dpms(std::string arg) {
 
     g_pCompositor->m_bDPMSStateON = enable;
 }
+
+void CKeybindManager::swapnext(std::string arg) {
+
+    CWindow* toSwap = nullptr;
+
+    if (!g_pCompositor->windowValidMapped(g_pCompositor->m_pLastWindow))
+        return;
+
+    const auto PLASTWINDOW = g_pCompositor->m_pLastWindow;
+
+    const auto PLASTCYCLED = g_pCompositor->windowValidMapped(g_pCompositor->m_pLastWindow->m_pLastCycledWindow) && g_pCompositor->m_pLastWindow->m_pLastCycledWindow->m_iWorkspaceID == PLASTWINDOW->m_iWorkspaceID ? g_pCompositor->m_pLastWindow->m_pLastCycledWindow : nullptr;
+
+    if (arg == "last" || arg == "l" || arg == "prev" || arg == "p")
+        toSwap = g_pCompositor->getPrevWindowOnWorkspace(PLASTCYCLED ? PLASTCYCLED : PLASTWINDOW);
+    else
+        toSwap = g_pCompositor->getNextWindowOnWorkspace(PLASTCYCLED ? PLASTCYCLED : PLASTWINDOW);
+
+    // sometimes we may come back to ourselves.
+    if (toSwap == PLASTWINDOW) {
+        if (arg == "last" || arg == "l" || arg == "prev" || arg == "p")
+            toSwap = g_pCompositor->getPrevWindowOnWorkspace(PLASTWINDOW);
+        else
+            toSwap = g_pCompositor->getNextWindowOnWorkspace(PLASTWINDOW);
+    }
+
+    g_pLayoutManager->getCurrentLayout()->switchWindows(PLASTWINDOW, toSwap);
+
+    PLASTWINDOW->m_pLastCycledWindow = toSwap;
+
+    g_pCompositor->focusWindow(PLASTWINDOW);
+}