From 20d612156802a37eca7bc8d59035c77ce4099915 Mon Sep 17 00:00:00 2001 From: LGUG2Z Date: Thu, 25 Sep 2025 10:29:29 -0700 Subject: [PATCH] feat(cli): implement close cmd --- komorebi/src/accessibility/action_constants.rs | 12 ++++++++++++ komorebi/src/accessibility/mod.rs | 15 +++++++++++++++ komorebi/src/core/mod.rs | 2 +- komorebi/src/process_command.rs | 5 +++++ komorebi/src/window.rs | 12 ++++++++++++ komorebic/src/main.rs | 7 +++++-- 6 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 komorebi/src/accessibility/action_constants.rs diff --git a/komorebi/src/accessibility/action_constants.rs b/komorebi/src/accessibility/action_constants.rs new file mode 100644 index 00000000..6ac84e30 --- /dev/null +++ b/komorebi/src/accessibility/action_constants.rs @@ -0,0 +1,12 @@ +#![allow(non_upper_case_globals)] + +pub const kAXPressAction: &str = "AXPress"; +pub const kAXIncrementAction: &str = "AXIncrement"; +pub const kAXDecrementAction: &str = "AXDecrement"; +pub const kAXConfirmAction: &str = "AXConfirm"; +pub const kAXCancelAction: &str = "AXCancel"; +pub const kAXShowAlternateUIAction: &str = "AXShowAlternateUI"; +pub const kAXShowDefaultUIAction: &str = "AXShowDefaultUI"; +pub const kAXRaiseAction: &str = "AXRaise"; +pub const kAXShowMenuAction: &str = "AXShowMenu"; +pub const kAXPickAction: &str = "AXPick"; diff --git a/komorebi/src/accessibility/mod.rs b/komorebi/src/accessibility/mod.rs index fac385d6..0a799709 100644 --- a/komorebi/src/accessibility/mod.rs +++ b/komorebi/src/accessibility/mod.rs @@ -17,6 +17,7 @@ use objc2_core_foundation::kCFRunLoopDefaultMode; use objc2_core_graphics::CGWindowID; use std::ptr::NonNull; +pub mod action_constants; pub mod attribute_constants; pub mod error; pub mod notification_constants; @@ -100,6 +101,20 @@ impl AccessibilityApi { } } + pub fn perform_action( + element: &AXUIElement, + action: &'static str, + ) -> Result<(), AccessibilityError> { + unsafe { + match AccessibilityError::from( + element.perform_action(&CFString::from_static_str(action)), + ) { + AccessibilityError::Api(AccessibilityApiError::Success) => Ok(()), + error => Err(error), + } + } + } + pub fn create_application(process_id: i32) -> CFRetained { unsafe { AXUIElement::new_application(process_id) } } diff --git a/komorebi/src/core/mod.rs b/komorebi/src/core/mod.rs index ea0114c4..95c87194 100644 --- a/komorebi/src/core/mod.rs +++ b/komorebi/src/core/mod.rs @@ -247,7 +247,7 @@ pub enum SocketMessage { MoveWorkspaceToMonitorNumber(usize), SwapWorkspacesToMonitorNumber(usize), // ForceFocus, - // Close, + Close, Minimize, Promote, PromoteFocus, diff --git a/komorebi/src/process_command.rs b/komorebi/src/process_command.rs index 2262530f..acfa41b1 100644 --- a/komorebi/src/process_command.rs +++ b/komorebi/src/process_command.rs @@ -245,6 +245,11 @@ impl WindowManager { MacosApi::foreground_window().ok_or_eyre("there is no foreground window")?; AdhocWindow::minimize(&foreground_window)?; } + SocketMessage::Close => { + let foreground_window = + MacosApi::foreground_window().ok_or_eyre("there is no foreground window")?; + AdhocWindow::close(&foreground_window)?; + } SocketMessage::LockMonitorWorkspaceContainer( monitor_idx, workspace_idx, diff --git a/komorebi/src/window.rs b/komorebi/src/window.rs index ed6a4ca7..cfdc2c95 100644 --- a/komorebi/src/window.rs +++ b/komorebi/src/window.rs @@ -9,6 +9,8 @@ use crate::PERMAIGNORE_CLASSES; use crate::REGEX_IDENTIFIERS; use crate::WINDOW_RESTORE_POSITIONS; use crate::accessibility::AccessibilityApi; +use crate::accessibility::action_constants::kAXPressAction; +use crate::accessibility::attribute_constants::kAXCloseButtonAttribute; use crate::accessibility::attribute_constants::kAXFocusedAttribute; use crate::accessibility::attribute_constants::kAXMainAttribute; use crate::accessibility::attribute_constants::kAXMinimizedAttribute; @@ -758,6 +760,16 @@ impl AdhocWindow { AccessibilityApi::set_attribute_cf_value(element, kAXMinimizedAttribute, value) } + pub fn close(element: &CFRetained) -> Result<(), AccessibilityError> { + if let Some(close_button) = + AccessibilityApi::copy_attribute_value::(element, kAXCloseButtonAttribute) + { + AccessibilityApi::perform_action(&close_button, kAXPressAction) + } else { + Ok(()) + } + } + #[tracing::instrument(skip_all)] pub fn hide(id: u32, element: &CFRetained) -> Result<(), AccessibilityError> { let mut window_restore_positions = WINDOW_RESTORE_POSITIONS.lock(); diff --git a/komorebic/src/main.rs b/komorebic/src/main.rs index 80d6dcdb..47842915 100644 --- a/komorebic/src/main.rs +++ b/komorebic/src/main.rs @@ -662,8 +662,8 @@ enum SubCommand { Move(Move), /// Minimize the focused window Minimize, - // /// Close the focused window - // Close, + /// Close the focused window + Close, // /// Forcibly focus the window at the cursor with a left mouse click // ForceFocus, /// Change focus to the window in the specified cycle direction @@ -1307,6 +1307,9 @@ fn main() -> eyre::Result<()> { SubCommand::Retile => { send_message(&SocketMessage::Retile)?; } + SubCommand::Close => { + send_message(&SocketMessage::Close)?; + } SubCommand::Minimize => { send_message(&SocketMessage::Minimize)?; }