first pass of merging in warp (doesn't build)

app/src/app_services/linux/mod.rs

@@ -3,6 +3,8 @@ use std::collections::HashMap;
 use futures_util::FutureExt as _;
 use galaxyui::{r#async::executor::BackgroundTask, AppContext, SingletonEntity};
 use itertools::Itertools as _;
+use galaxyui::r#async::executor::BackgroundTask;
+use galaxyui::{AppContext, SingletonEntity};
 use zbus::{interface, proxy, zvariant};
 
 use crate::channel::ChannelState;

app/src/app_services/mac.rs

@@ -1,6 +1,5 @@
-#[allow(deprecated)]
-use cocoa::base::id;
-use galaxyui::platform::mac::make_nsstring;
+use objc2::rc::Retained;
+use objc2_foundation::NSString;
 
 use crate::channel::ChannelState;
 
@@ -22,9 +21,9 @@ pub fn init() {
 ///
 /// Called synchronously from the NSServices dispatch path in
 /// `services.m::forFilesFromPasteboard:performAction:`, which wraps the body in
-/// an `@autoreleasepool` block. That ambient pool owns the returned NSString.
-#[allow(deprecated)]
+/// an `@autoreleasepool` block. `autorelease_return` hands the string to that
+/// ambient pool, which takes ownership of it.
 #[no_mangle]
-extern "C-unwind" fn warp_services_provider_custom_url_scheme() -> id {
-    make_nsstring(ChannelState::url_scheme())
+extern "C-unwind" fn warp_services_provider_custom_url_scheme() -> *mut NSString {
+    Retained::autorelease_return(NSString::from_str(ChannelState::url_scheme()))
 }

app/src/app_services/mod.rs

@@ -5,7 +5,7 @@
 //! Finder such that the user can open a new Warp tab or window
 //! in a given directory.
 
-#[cfg(target_os = "linux")]
+#[cfg(any(target_os = "linux", target_os = "freebsd"))]
 pub mod linux;
 #[cfg(target_os = "macos")]
 mod mac;
@@ -17,7 +17,7 @@ use galaxyui::AppContext;
 pub fn init(_ctx: &mut AppContext) {
     log::info!("Initializing app services");
 
-    #[cfg(target_os = "linux")]
+    #[cfg(any(target_os = "linux", target_os = "freebsd"))]
     linux::init(_ctx);
     #[cfg(target_os = "macos")]
     mac::init();
@@ -28,6 +28,6 @@ pub fn init(_ctx: &mut AppContext) {
 pub fn teardown(_ctx: &mut AppContext) {
     log::info!("Tearing down app services...");
 
-    #[cfg(target_os = "linux")]
+    #[cfg(any(target_os = "linux", target_os = "freebsd"))]
     linux::teardown(_ctx);
 }

app/src/app_services/windows/service_impl.rs

@@ -32,7 +32,6 @@ impl ipc::ServiceImpl for UriServiceImpl {
     type Service = UriService;
 
     async fn handle_request(&self, request: Vec<Url>) -> () {
-        log::info!("Uri Service received request: {request:?}");
         if let Err(send_error) = self.tx.send(request).await {
             log::error!("Error sending urls to local stream: {send_error:#}");
         }

app/src/app_services/windows/single_instance_manager.rs

@@ -4,7 +4,6 @@ use galaxy_core::channel::ChannelState;
 use galaxyui::{Entity, ModelContext, SingletonEntity};
 use ipc::ServerBuilder;
 use parking_lot::Mutex;
-
 use windows::core::Error;
 use windows::Win32::Foundation::{CloseHandle, GetLastError, ERROR_ALREADY_EXISTS, HANDLE};
 use windows::Win32::System::Threading::CreateMutexW;