`da1c094`

Route discovered windows to their actual monitor's workspace

discover_and_observe was sending every discovered window through
add_window_to_active without specifying a target workspace, so each
window landed in active_workspace_mut() — the workspace on the
monitor under the cursor at startup. Windows on other monitors got
inserted into the cursor monitor's BSP tree, then apply_layout asked
AX to move them across displays; some apps (Ghostty especially)
either reject or race that cross-display move and stay physically on
their original monitor while remaining logically in the wrong
workspace's tree. Visible to the user as 'two windows reachable via
stack-cycle but never joining the tile.'

Fix is local to the discovery loop: compute each window's monitor
from its center point and temporarily set focused_monitor to that
monitor for the duration of the add_window_to_active call. Restore
focused_monitor after the loop. add_window_to_active itself is
unchanged, so the rule path and runtime Created path keep working
exactly as before.

Refs memory observation #2542.

Authored by mfwolffe <wolffemf@dukes.jmu.edu> 1 week ago

SHA: da1c0948b29b641b434e6b4c3f83819a44fec101
Parents: b9e6405
Tree: 74075ea

1 changed file

Status	File	+	-
M	`tarmac/src/core/state.rs`	20	0

tarmac/src/core/state.rsmodified

          );
          let windows = discover_all_windows();
++        // Route each discovered window to the workspace active on the
++        // monitor it physically lives on, not always the cursor's
++        // monitor's workspace. add_window_to_active resolves the target
++        // workspace via active_workspace_mut() which reads
++        // focused_monitor — temporarily point that at each window's
++        // monitor for the duration of the insert, then restore.
++        // Without this, windows on non-cursor monitors get inserted
++        // into the cursor monitor's BSP tree and apply_layout asks AX
++        // to move them across displays; some apps (Ghostty in
++        // particular) fail or race that move and end up logically in
++        // the wrong workspace's tree while remaining physically on
++        // their original monitor — visible to the user as windows
++        // that are reachable via stack-cycle but never join the tile.
++        let original_focused = self.focused_monitor;
          for w in &windows {
++            let cx = w.x + w.width / 2.0;
++            let cy = w.y + w.height / 2.0;
++            let mi = super::monitor::index_at_point(&self.monitors, cx, cy)
++                .unwrap_or(original_focused);
++            self.focused_monitor = mi;
              self.add_window_to_active(
                  &w.id,
                  w.app_pid,
                  w.ax_ref.clone(),
              );
+         }
++        self.focused_monitor = original_focused;
          tracing::info!(
              windows = self.registry.count(),