diff --git a/justfile b/justfile index 20cc01ac..1675ba26 100644 --- a/justfile +++ b/justfile @@ -73,7 +73,6 @@ jsonschema: cargo run --package komorebic -- application-specific-configuration-schema > schema.asc.json cargo run --package komorebi-bar -- --schema > schema.bar.json - nixgen: schemars-nixgen schema.json -o nix/komorebi-options.nix --name komorebi --description "komorebi for Mac configuration" schemars-nixgen schema.bar.json -o nix/komorebi-bar-options.nix --name komorebi-bar --description "komorebi for Mac bar configuration" diff --git a/komorebi/src/process_event.rs b/komorebi/src/process_event.rs index b68b6f8b..d368510c 100644 --- a/komorebi/src/process_event.rs +++ b/komorebi/src/process_event.rs @@ -649,8 +649,40 @@ impl WindowManager { // self.update_focused_workspace(false, false)?; } } - WindowManagerEvent::Destroy(_, process_id) => { - self.reap_invalid_windows_for_application(process_id)?; + WindowManagerEvent::Destroy(notification, process_id) => { + // some apps like Discord in all of their relentless Electron slop stupidity + // hijack CMD+W to send a HIDE instead of a close (i.e. the equivalent of pressing CMD+H) + let mut should_force_reap = false; + if matches!( + notification, + SystemNotification::Accessibility( + AccessibilityNotification::AXApplicationHidden + ) + ) { + let application = self.application(process_id)?; + let window_count = application + .window_elements() + .map(|elements| elements.len()) + .unwrap_or(0); + + // force reap if the app has exactly 1 window (i.e. the one being hidden) + if window_count == 1 { + tracing::debug!( + "app {} has only 1 window and sent AXApplicationHidden, treating as window close", + application.name().unwrap_or_default() + ); + should_force_reap = true; + } + } + + if should_force_reap { + let workspace = self.focused_workspace_mut()?; + workspace.reap_invalid_windows_for_application(process_id, &[])?; + } else { + // app has multiple windows, use normal orphan reaping strategy + self.reap_invalid_windows_for_application(process_id)?; + } + self.update_focused_workspace(false, false)?; } WindowManagerEvent::Unmanage(_, _, window_id) => { diff --git a/komorebi/src/window_manager_event.rs b/komorebi/src/window_manager_event.rs index 7109f04c..89049b81 100644 --- a/komorebi/src/window_manager_event.rs +++ b/komorebi/src/window_manager_event.rs @@ -81,7 +81,10 @@ impl WindowManagerEvent { SystemNotification::Accessibility(AccessibilityNotification::AXUIElementDestroyed) | SystemNotification::AppKitWorkspace( AppKitWorkspaceNotification::NSWorkspaceDidTerminateApplicationNotification, - ) => Some(WindowManagerEvent::Destroy(notification, process_id)), + ) + | SystemNotification::Accessibility(AccessibilityNotification::AXApplicationHidden) => { + Some(WindowManagerEvent::Destroy(notification, process_id)) + } // TODO: figure out if we wanna handle the hide/unhide notifications separately // TODO: maybe turn window id into a vec of window IDs for hidden apps SystemNotification::Accessibility(AccessibilityNotification::AXWindowMiniaturized) => { diff --git a/komorebi/src/workspace.rs b/komorebi/src/workspace.rs index aaf3251a..f1340fb0 100644 --- a/komorebi/src/workspace.rs +++ b/komorebi/src/workspace.rs @@ -407,6 +407,14 @@ impl Workspace { && focused_window.application.process_id == process_id { if !valid_window_ids.contains(&focused_window.id) { + if let Ok(rect) = MacosApi::window_rect(&focused_window.element) { + tracing::debug!( + "reaping window {} ({}): rect = {:?}", + focused_window.id, + focused_window.title().unwrap_or_default(), + rect + ); + } invalid_window_ids.push(focused_window.id); } @@ -424,6 +432,14 @@ impl Workspace { if focused_window.application.process_id == process_id && !valid_window_ids.contains(&focused_window.id) { + if let Ok(rect) = MacosApi::window_rect(&focused_window.element) { + tracing::debug!( + "reaping monocle window {} ({}): rect = {:?}", + focused_window.id, + focused_window.title().unwrap_or_default(), + rect + ); + } invalid_window_ids.push(focused_window.id); } @@ -437,6 +453,14 @@ impl Workspace { for window in self.floating_windows() { if window.application.process_id == process_id { if !valid_window_ids.contains(&window.id) { + if let Ok(rect) = MacosApi::window_rect(&window.element) { + tracing::debug!( + "reaping floating window {} ({}): rect = {:?}", + window.id, + window.title().unwrap_or_default(), + rect + ); + } invalid_floating_window_ids.push(window.id); }