diff --git a/komorebi-client/src/lib.rs b/komorebi-client/src/lib.rs index 75c45651..8e63854c 100644 --- a/komorebi-client/src/lib.rs +++ b/komorebi-client/src/lib.rs @@ -21,6 +21,7 @@ use std::io::BufReader; use std::io::Read; use std::io::Write; use std::net::Shutdown; +use std::os::unix::net::UnixListener; use std::os::unix::net::UnixStream; use std::time::Duration; @@ -65,3 +66,23 @@ pub fn send_query(message: &SocketMessage) -> std::io::Result { Ok(response) } + +pub fn subscribe(name: &str) -> std::io::Result { + let socket = DATA_DIR.join(name); + + match std::fs::remove_file(&socket) { + Ok(()) => {} + Err(error) => match error.kind() { + std::io::ErrorKind::NotFound => {} + _ => { + return Err(error); + } + }, + }; + + let listener = UnixListener::bind(&socket)?; + + send_message(&SocketMessage::AddSubscriberSocket(name.to_string()))?; + + Ok(listener) +} diff --git a/komorebi/src/application.rs b/komorebi/src/application.rs index 8656c715..be344fdb 100644 --- a/komorebi/src/application.rs +++ b/komorebi/src/application.rs @@ -107,10 +107,10 @@ impl Application { Ok(Self { element: AccessibilityUiElement(AccessibilityApi::create_application(process_id)), process_id, - observer: AccessibilityObserver(AccessibilityApi::create_observer( + observer: AccessibilityObserver(Some(AccessibilityApi::create_observer( process_id, Some(application_observer_callback), - )?), + )?)), is_observable: true, }) } diff --git a/komorebi/src/border_manager/border.rs b/komorebi/src/border_manager/border.rs index 3d5d05ef..260715bf 100644 --- a/komorebi/src/border_manager/border.rs +++ b/komorebi/src/border_manager/border.rs @@ -94,10 +94,10 @@ impl Border { monitor_idx: Option, run_loop: CoreFoundationRunLoop, ) -> eyre::Result> { - let observer = AccessibilityObserver(AccessibilityApi::create_observer( + let observer = AccessibilityObserver(Some(AccessibilityApi::create_observer( process_id, Some(border_observer_callback), - )?); + )?)); let rect = MacosApi::window_rect(&element).unwrap_or_default(); diff --git a/komorebi/src/lib.rs b/komorebi/src/lib.rs index a17d6508..e92a1b7e 100644 --- a/komorebi/src/lib.rs +++ b/komorebi/src/lib.rs @@ -1,6 +1,5 @@ #![warn(clippy::all)] -use crate::accessibility::AccessibilityApi; use crate::accessibility::error::AccessibilityError; use crate::core::ApplicationIdentifier; use crate::core::SocketMessage; @@ -261,20 +260,20 @@ impl Default for AccessibilityUiElement { } #[derive(Debug, Clone, PartialEq)] -pub struct AccessibilityObserver(pub CFRetained); +pub struct AccessibilityObserver(pub Option>); unsafe impl Sync for AccessibilityObserver {} unsafe impl Send for AccessibilityObserver {} impl Deref for AccessibilityObserver { type Target = AXObserver; fn deref(&self) -> &Self::Target { - self.0.as_ref() + self.0.as_ref().expect("must have an AXObserver") } } impl Default for AccessibilityObserver { fn default() -> Self { - Self(AccessibilityApi::create_observer(1, None).unwrap()) + Self(None) } } diff --git a/komorebi/src/window.rs b/komorebi/src/window.rs index d75d732a..aca11f61 100644 --- a/komorebi/src/window.rs +++ b/komorebi/src/window.rs @@ -330,7 +330,7 @@ impl Window { id: AccessibilityApi::window_id(&element)?, element: AccessibilityUiElement(element), application, - observer: AccessibilityObserver(observer), + observer: AccessibilityObserver(Some(observer)), }) }