From a55db6c6c4721c935dd93f59aec7d3eb35193d3b Mon Sep 17 00:00:00 2001
From: Ivan Molodetskikh <yalterz@gmail.com>
Date: Sun, 17 Mar 2024 09:21:36 +0400
Subject: Warp mouse to focus on window closing

---
 src/handlers/xdg_shell.rs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/handlers/xdg_shell.rs b/src/handlers/xdg_shell.rs
index 7302c2ac..ec40bb7e 100644
--- a/src/handlers/xdg_shell.rs
+++ b/src/handlers/xdg_shell.rs
@@ -460,7 +460,15 @@ impl XdgShellHandler for State {
             return;
         };
 
+        let active_window = self.niri.layout.active_window().map(|(w, _)| w);
+        let was_active = active_window == Some(&window);
+
         self.niri.layout.remove_window(&window);
+
+        if was_active {
+            self.maybe_warp_cursor_to_focus();
+        }
+
         self.niri.queue_redraw(output);
     }
 
-- 
cgit