pointer focus works now

1 files changed, 13 insertions, 2 deletions

diff --git a/src/Compositor.cpp b/src/Compositor.cpp
index 7c170d13..2d7c1826 100644
--- a/src/Compositor.cpp
+++ b/src/Compositor.cpp
@@ -186,12 +186,23 @@ void CCompositor::focusWindow(CWindow* pWindow) {
     if (m_sWLRSeat->keyboard_state.focused_surface == PWINDOWSURFACE)
         return; // Don't focus when already focused on this.
 
+    // Unfocus last window
+    if (m_pLastFocus && windowValidMapped(m_pLastFocus))
+        g_pXWaylandManager->activateSurface(g_pXWaylandManager->getWindowSurface(m_pLastFocus), false);
+    if (m_sWLRSeat->keyboard_state.focused_surface){
+        const auto XDGSURFACE = wlr_xdg_surface_from_wlr_surface(m_sWLRSeat->keyboard_state.focused_surface);
+        if (XDGSURFACE)
+            wlr_xdg_toplevel_set_activated(XDGSURFACE->toplevel, false);
+
+        const auto XWLSURFACE = wlr_xwayland_surface_from_wlr_surface(m_sWLRSeat->keyboard_state.focused_surface);
+        if (XWLSURFACE)
+            wlr_xwayland_surface_activate(XWLSURFACE, false);
+    }
+
     const auto KEYBOARD = wlr_seat_get_keyboard(m_sWLRSeat);
     wlr_seat_keyboard_notify_enter(m_sWLRSeat, PWINDOWSURFACE, KEYBOARD->keycodes, KEYBOARD->num_keycodes, &KEYBOARD->modifiers);
 
     g_pXWaylandManager->activateSurface(PWINDOWSURFACE, true);
-    if (m_pLastFocus && windowValidMapped(m_pLastFocus))
-        g_pXWaylandManager->activateSurface(g_pXWaylandManager->getWindowSurface(m_pLastFocus), false);
     
     m_pLastFocus = pWindow;