From 52b0b8927fa56f42ad6b39fb45bbed5a2d392dce Mon Sep 17 00:00:00 2001
From: srdusr <99972264+srdusr@users.noreply.github.com>
Date: Thu, 8 Aug 2024 23:56:00 +0200
Subject: Fix clicks landing on a window hidden on another workspace

WindowManager::hit_test/window_at filtered only by `!w.minimized`,
never by workspace - but a window on a workspace that isn't current
is not minimized, it's just not shown. Rendering (visible_windows/
visible_windows_front_to_back) already restricted to the current
workspace; hit-testing didn't, so a click landing on where an
invisible window's stale on-screen geometry happened to sit routed to
that window instead of whatever was actually visible underneath.

Reported live. Fixed by adding the same workspace check rendering
already uses, plus a regression test with two identically-positioned
windows on different workspaces.
---
 crates/core/src/manager/tests.rs | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'crates/core/src/manager/tests.rs')

diff --git a/crates/core/src/manager/tests.rs b/crates/core/src/manager/tests.rs
index a098245..24e8932 100644
--- a/crates/core/src/manager/tests.rs
+++ b/crates/core/src/manager/tests.rs
@@ -222,6 +222,29 @@
         assert_eq!(hit, TitlebarHit::Drag);
     }
 
+    #[test]
+    fn hit_test_ignores_a_window_on_another_workspace_even_if_its_geometry_overlaps() {
+        // Reported live: clicking a window sent the click to a different,
+        // invisible window that merely happened to sit at the same screen
+        // coordinates on a workspace that wasn't current. Rendering already
+        // filtered by workspace (`visible_windows`); hit-testing didn't.
+        let mut wm = wm_with_monitor();
+        let a = wm.alloc_window_id();
+        let mut wa = Window::new(a, "a");
+        wa.geometry = Rect::new(0, 0, 400, 300);
+        wm.add_window(wa);
+        let b = wm.alloc_window_id();
+        let mut wb = Window::new(b, "b");
+        wb.geometry = Rect::new(0, 0, 400, 300); // identical geometry to `a`
+        wm.add_window(wb);
+        let other_workspace = wm.add_workspace("2", "dynamic");
+        wm.move_window_to_workspace(b, other_workspace); // b is now off-screen, not minimized
+
+        let (hit_id, _) = wm.hit_test(200, 10).unwrap();
+        assert_eq!(hit_id, a, "a click must land on the visible window, not one hidden on another workspace");
+        assert_eq!(wm.window_at(200, 10), Some(a));
+    }
+
     #[test]
     fn moving_window_to_another_workspace_removes_it_from_current() {
         let mut wm = wm_with_monitor();
-- 
cgit v1.2.3