Multiple focus handling changes

4 files changed, 55 insertions, 31 deletions

diff --git a/src/managers/InputManager.cpp b/src/managers/InputManager.cpp
index 4c66c7bf..2483832a 100644
--- a/src/managers/InputManager.cpp
+++ b/src/managers/InputManager.cpp
@@ -34,28 +34,32 @@ void CInputManager::mouseMoveUnified(uint32_t time) {
 
     Vector2D surfaceCoords;
     Vector2D surfacePos = Vector2D(-1337, -1337);
+    CWindow* pFoundWindow = nullptr;
 
     // first, we check if the workspace doesnt have a fullscreen window
     const auto PWORKSPACE = g_pCompositor->getWorkspaceByID(PMONITOR->activeWorkspace);
     if (PWORKSPACE->hasFullscreenWindow) {
-        const auto PFULLSCREENWINDOW = g_pCompositor->getFullscreenWindowOnWorkspace(PWORKSPACE->ID);
-
-        // should never ever happen but who knows
-        if (PFULLSCREENWINDOW) {
-            foundSurface = g_pXWaylandManager->getWindowSurface(PFULLSCREENWINDOW);
-            if (foundSurface)
-                surfacePos = PFULLSCREENWINDOW->m_vRealPosition;
-
-            for (auto& w : g_pCompositor->m_lWindows) {
-                wlr_box box = {w.m_vRealPosition.x, w.m_vRealPosition.y, w.m_vRealSize.x, w.m_vRealSize.y};
-                if (w.m_iWorkspaceID == PFULLSCREENWINDOW->m_iWorkspaceID && w.m_bIsMapped && w.m_bCreatedOverFullscreen && wlr_box_contains_point(&box, mouseCoords.x, mouseCoords.y)) {
-                    foundSurface = g_pXWaylandManager->getWindowSurface(&w);
-                    if (foundSurface)
-                        surfacePos = w.m_vRealPosition;
-                    break;
-                }
+        pFoundWindow = g_pCompositor->getFullscreenWindowOnWorkspace(PWORKSPACE->ID);
+
+        for (auto w = g_pCompositor->m_lWindows.rbegin(); w != g_pCompositor->m_lWindows.rend(); ++w) {
+            wlr_box box = {w->m_vRealPosition.x, w->m_vRealPosition.y, w->m_vRealSize.x, w->m_vRealSize.y};
+            if (w->m_iWorkspaceID == pFoundWindow->m_iWorkspaceID && w->m_bIsMapped && w->m_bCreatedOverFullscreen && wlr_box_contains_point(&box, mouseCoords.x, mouseCoords.y)) {
+                foundSurface = g_pXWaylandManager->getWindowSurface(&(*w));
+                if (foundSurface)
+                    surfacePos = w->m_vRealPosition;
+                break;
             }
-        } 
+        }
+
+        if (pFoundWindow && !foundSurface) {
+            if (pFoundWindow->m_bIsX11) {
+                foundSurface = g_pXWaylandManager->getWindowSurface(pFoundWindow);
+                if (foundSurface)
+                    surfacePos = pFoundWindow->m_vRealPosition;
+            } else {
+                foundSurface = g_pCompositor->vectorWindowToSurface(mouseCoords, pFoundWindow, surfaceCoords);
+            }
+        }
     }
 
     // then surfaces on top
@@ -66,16 +70,16 @@ void CInputManager::mouseMoveUnified(uint32_t time) {
         foundSurface = g_pCompositor->vectorToLayerSurface(mouseCoords, &PMONITOR->m_aLayerSurfaceLists[ZWLR_LAYER_SHELL_V1_LAYER_TOP], &surfaceCoords);
 
     // then windows
-    const auto PWINDOWIDEAL = g_pCompositor->vectorToWindowIdeal(mouseCoords);
-    if (!foundSurface && PWINDOWIDEAL) {
-        if (!PWINDOWIDEAL->m_bIsX11) {
-            foundSurface = g_pCompositor->vectorWindowToSurface(mouseCoords, PWINDOWIDEAL, surfaceCoords);
+    pFoundWindow = g_pCompositor->vectorToWindowIdeal(mouseCoords);
+    if (!foundSurface && pFoundWindow) {
+        if (!pFoundWindow->m_bIsX11) {
+            foundSurface = g_pCompositor->vectorWindowToSurface(mouseCoords, pFoundWindow, surfaceCoords);
         } else {
-            foundSurface = g_pXWaylandManager->getWindowSurface(PWINDOWIDEAL);
-            surfacePos = PWINDOWIDEAL->m_vRealPosition;
+            foundSurface = g_pXWaylandManager->getWindowSurface(pFoundWindow);
+            surfacePos = pFoundWindow->m_vRealPosition;
         }
     }
-        
+
     // then surfaces below
     if (!foundSurface)
         foundSurface = g_pCompositor->vectorToLayerSurface(mouseCoords, &PMONITOR->m_aLayerSurfaceLists[ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM], &surfaceCoords);
@@ -100,7 +104,10 @@ void CInputManager::mouseMoveUnified(uint32_t time) {
     wlr_seat_pointer_notify_enter(g_pCompositor->m_sSeat.seat, foundSurface, surfaceLocal.x, surfaceLocal.y);
     wlr_seat_pointer_notify_motion(g_pCompositor->m_sSeat.seat, time, surfaceLocal.x, surfaceLocal.y);
 
-    g_pCompositor->focusSurface(foundSurface, PWINDOWIDEAL ? PWINDOWIDEAL : nullptr);
+    if (pFoundWindow)
+        g_pCompositor->focusWindow(pFoundWindow, foundSurface);
+    else
+        g_pCompositor->focusSurface(foundSurface);
 
     g_pLayoutManager->getCurrentLayout()->onMouseMove(getMouseCoordsInternal());
 }
diff --git a/src/managers/KeybindManager.cpp b/src/managers/KeybindManager.cpp
index 22c880b4..d9d2fa72 100644
--- a/src/managers/KeybindManager.cpp
+++ b/src/managers/KeybindManager.cpp
@@ -88,9 +88,12 @@ void CKeybindManager::spawn(std::string args) {
 }
 
 void CKeybindManager::killActive(std::string args) {
-    if (g_pCompositor->m_pLastFocus && g_pCompositor->windowValidMapped(g_pCompositor->getWindowFromSurface(g_pCompositor->m_pLastFocus)))
-        g_pXWaylandManager->sendCloseWindow(g_pCompositor->getWindowFromSurface(g_pCompositor->m_pLastFocus));
-
+    if (g_pCompositor->m_pLastWindow && g_pCompositor->windowValidMapped(g_pCompositor->m_pLastWindow)) {
+        g_pXWaylandManager->sendCloseWindow(g_pCompositor->m_pLastWindow);
+        g_pCompositor->m_pLastFocus = nullptr;
+        g_pCompositor->m_pLastWindow = nullptr;
+    }
+    
     g_pCompositor->focusWindow(g_pCompositor->windowFromCursor());
 }
 
@@ -99,7 +102,7 @@ void CKeybindManager::clearKeybinds() {
 }
 
 void CKeybindManager::toggleActiveFloating(std::string args) {
-    const auto ACTIVEWINDOW = g_pCompositor->getWindowFromSurface(g_pCompositor->m_pLastFocus);
+    const auto ACTIVEWINDOW = g_pCompositor->m_pLastWindow;
 
     if (g_pCompositor->windowValidMapped(ACTIVEWINDOW)) {
         ACTIVEWINDOW->m_bIsFloating = !ACTIVEWINDOW->m_bIsFloating;
@@ -170,7 +173,7 @@ void CKeybindManager::changeworkspace(std::string args) {
 }
 
 void CKeybindManager::fullscreenActive(std::string args) {
-    const auto PWINDOW = g_pCompositor->getWindowFromSurface(g_pCompositor->m_pLastFocus);
+    const auto PWINDOW = g_pCompositor->m_pLastWindow;
 
     if (!g_pCompositor->windowValidMapped(PWINDOW))
         return;
@@ -187,7 +190,7 @@ void CKeybindManager::fullscreenActive(std::string args) {
 }
 
 void CKeybindManager::moveActiveToWorkspace(std::string args) {
-    const auto PWINDOW = g_pCompositor->getWindowFromSurface(g_pCompositor->m_pLastFocus);
+    const auto PWINDOW = g_pCompositor->m_pLastWindow;
 
     if (!g_pCompositor->windowValidMapped(PWINDOW))
         return;
diff --git a/src/managers/XWaylandManager.cpp b/src/managers/XWaylandManager.cpp
index 6fd37f94..0e419c0f 100644
--- a/src/managers/XWaylandManager.cpp
+++ b/src/managers/XWaylandManager.cpp
@@ -37,6 +37,19 @@ void CHyprXWaylandManager::activateSurface(wlr_surface* pSurface, bool activate)
         wlr_xwayland_surface_activate(wlr_xwayland_surface_from_wlr_surface(pSurface), activate);
 }
 
+void CHyprXWaylandManager::activateWindow(CWindow* pWindow, bool activate) {
+    if (pWindow == g_pCompositor->m_pLastWindow)
+        return;
+
+    if (pWindow->m_bIsX11)
+        wlr_xwayland_surface_activate(pWindow->m_uSurface.xwayland, activate);
+    else
+        wlr_xdg_toplevel_set_activated(pWindow->m_uSurface.xdg->toplevel, activate);
+
+    g_pCompositor->m_pLastFocus = getWindowSurface(pWindow);
+    g_pCompositor->m_pLastWindow = pWindow;
+}
+
 void CHyprXWaylandManager::getGeometryForWindow(CWindow* pWindow, wlr_box* pbox) {
     if (pWindow->m_bIsX11) {
         pbox->x = pWindow->m_uSurface.xwayland->x;
diff --git a/src/managers/XWaylandManager.hpp b/src/managers/XWaylandManager.hpp
index 143d60da..7008d0e8 100644
--- a/src/managers/XWaylandManager.hpp
+++ b/src/managers/XWaylandManager.hpp
@@ -12,6 +12,7 @@ public:
 
     wlr_surface*        getWindowSurface(CWindow*);
     void                activateSurface(wlr_surface*, bool);
+    void                activateWindow(CWindow*, bool);
     void                getGeometryForWindow(CWindow*, wlr_box*);
     std::string         getTitle(CWindow*);
     std::string         getAppIDClass(CWindow*);