fix: macos maybe

Author: se2crid

apps/plumeimpactor/Cargo.toml

@@ -35,6 +35,7 @@ auto-launcher = "0.6.1"
 
 [target.'cfg(target_os = "macos")'.dependencies]
 plume_gestalt = { path = "../../crates/plume_gestalt" }
+objc2 = "0.6.3"
 objc2-app-kit = { version = "0.3.2", features = ["NSResponder", "NSRunningApplication"] }
 objc2-foundation = { version = "0.3.2" }
 

apps/plumeimpactor/src/macos_reopen.rs

@@ -0,0 +1,80 @@
+#[cfg(target_os = "macos")]
+mod platform {
+    use std::sync::OnceLock;
+
+    use objc2::rc::Retained;
+    use objc2::runtime::{AnyClass, AnyObject, ClassBuilder, Sel};
+    use objc2::{msg_send, msg_send_id, sel};
+    use objc2_foundation::MainThreadMarker;
+
+    const CORE_EVENT_CLASS: u32 = 0x6165_7674; // 'aevt'
+    const REOPEN_APPLICATION_EVENT: u32 = 0x7261_7070; // 'rapp'
+
+    static HANDLER: OnceLock<Retained<AnyObject>> = OnceLock::new();
+
+    extern "C" fn handle_reopen(
+        _this: &AnyObject,
+        _cmd: Sel,
+        _event: Option<&AnyObject>,
+        _reply: Option<&AnyObject>,
+    ) {
+        crate::instance::signal_show_request();
+    }
+
+    pub(super) fn install_reopen_handler() {
+        let Some(_mtm) = MainThreadMarker::new() else {
+            log::warn!("Cannot install macOS reopen handler: not on the main thread.");
+            return;
+        };
+
+        HANDLER.get_or_init(|| {
+            let nsobject = AnyClass::get("NSObject").expect("NSObject class missing");
+            let handler_class = if let Some(mut builder) =
+                ClassBuilder::new("ImpactorReopenHandler", nsobject)
+            {
+                unsafe {
+                    builder.add_method(
+                        sel!(handleReopen:withReplyEvent:),
+                        handle_reopen
+                            as extern "C" fn(&AnyObject, Sel, Option<&AnyObject>, Option<&AnyObject>),
+                    );
+                }
+                builder.register()
+            } else {
+                AnyClass::get("ImpactorReopenHandler")
+                    .expect("ImpactorReopenHandler class missing")
+            };
+
+            let handler: Retained<AnyObject> = unsafe { msg_send_id![handler_class, new] };
+
+            let Some(manager_class) = AnyClass::get("NSAppleEventManager") else {
+                log::warn!("NSAppleEventManager class missing");
+                return handler;
+            };
+
+            let manager: Retained<AnyObject> =
+                unsafe { msg_send_id![manager_class, sharedAppleEventManager] };
+
+            unsafe {
+                let _: () = msg_send![
+                    &*manager,
+                    setEventHandler: &*handler
+                    andSelector: sel!(handleReopen:withReplyEvent:)
+                    forEventClass: CORE_EVENT_CLASS
+                    andEventID: REOPEN_APPLICATION_EVENT
+                ];
+            }
+
+            handler
+        });
+    }
+}
+
+#[cfg(not(target_os = "macos"))]
+mod platform {
+    pub(super) fn install_reopen_handler() {}
+}
+
+pub(crate) fn install_reopen_handler() {
+    platform::install_reopen_handler();
+}

apps/plumeimpactor/src/main.rs

@@ -9,6 +9,7 @@ mod appearance;
 mod defaults;
 mod instance;
 mod macos_dock;
+mod macos_reopen;
 mod refresh;
 mod screen;
 mod startup;
@@ -47,6 +48,7 @@ fn main() -> iced::Result {
     {
         notify_rust::get_bundle_identifier_or_default("Impactor");
         let _ = notify_rust::set_application("dev.khcrysalis.PlumeImpactor");
+        macos_reopen::install_reopen_handler();
     }
 
     let (_daemon_handle, connected_devices) = spawn_refresh_daemon();