Desktop: Implement native file handler on Mac #4106
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -26,8 +26,8 @@ impl super::NativeWindow for NativeWindowImpl { | |
| } | ||
|
|
||
| fn new(_window: &dyn Window, app_event_scheduler: AppEventScheduler) -> Self { | ||
| app::setup(app_event_scheduler.clone()); | ||
| let menu = menu::Menu::new(app_event_scheduler); | ||
| NativeWindowImpl { menu } | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,6 +1,22 @@ | ||||||
| use std::ffi::CStr; | ||||||
| use std::ffi::OsStr; | ||||||
| use std::ops::Deref; | ||||||
| use std::os::unix::ffi::OsStrExt; | ||||||
| use std::path::PathBuf; | ||||||
| use std::sync::{Mutex, Once}; | ||||||
|
|
||||||
| use objc2::rc::Retained; | ||||||
| use objc2::runtime::ProtocolObject; | ||||||
| use objc2::{ClassType, MainThreadMarker, MainThreadOnly, define_class, msg_send}; | ||||||
|
Contributor
There was a problem hiding this comment. Import
Suggested change
|
||||||
| use objc2_app_kit::{NSApplication, NSApplicationDelegate, NSEvent, NSEventType, NSResponder}; | ||||||
| use objc2_foundation::{NSArray, NSObject, NSObjectProtocol, NSURL}; | ||||||
|
|
||||||
| use crate::event::{AppEvent, AppEventScheduler}; | ||||||
|
|
||||||
| static APP_EVENT_SCHEDULER: Mutex<Option<AppEventScheduler>> = Mutex::new(None); | ||||||
| static INSTALL_DELEGATE: Once = Once::new(); | ||||||
|
|
||||||
| static LAUNCH_DOCUMENTS: Mutex<Vec<PathBuf>> = Mutex::new(Vec::new()); | ||||||
|
|
||||||
| define_class!( | ||||||
| #[unsafe(super(NSApplication, NSResponder, NSObject))] | ||||||
|
|
@@ -20,12 +36,66 @@ define_class!( | |||||
| } | ||||||
| ); | ||||||
|
|
||||||
| define_class!( | ||||||
| #[unsafe(super(NSObject))] | ||||||
| #[thread_kind = MainThreadOnly] | ||||||
| #[name = "GraphiteApplicationDelegate"] | ||||||
| struct GraphiteApplicationDelegate; | ||||||
|
|
||||||
| unsafe impl NSObjectProtocol for GraphiteApplicationDelegate {} | ||||||
|
|
||||||
| unsafe impl NSApplicationDelegate for GraphiteApplicationDelegate { | ||||||
| #[unsafe(method(application:openURLs:))] | ||||||
| fn application_open_urls(&self, _application: &NSApplication, urls: &NSArray<NSURL>) { | ||||||
| let Some(app_event_scheduler) = APP_EVENT_SCHEDULER.lock().ok() else { | ||||||
|
Contributor
There was a problem hiding this comment. P2: The error message here is misleading: Prompt for AI agents |
||||||
| tracing::error!("Received macOS open URL event before the app event scheduler was initialized"); | ||||||
| return; | ||||||
| }; | ||||||
|
Comment on lines
+50
to
+53
Contributor
There was a problem hiding this comment. The error message here is misleading. Additionally, returning early on a poisoned lock prevents the paths from being added to the buffer. It is better to collect the paths first and then attempt to schedule the event if the scheduler is available. fn application_open_urls(&self, _application: &NSApplication, urls: &NSArray<NSURL>) {
let mut paths = Vec::new();
for index in 0..urls.count() {
let url = urls.objectAtIndex(index);
if !url.isFileURL() {
tracing::error!("Ignoring macOS open URL event for non-file URL: {:?}", url);
continue;
}
let path = unsafe { CStr::from_ptr(url.fileSystemRepresentation().as_ptr()) };
let path = PathBuf::from(OsStr::from_bytes(path.to_bytes()));
paths.push(path);
}
if paths.is_empty() {
return;
}
let mut pending_paths_to_open = LAUNCH_DOCUMENTS.lock().unwrap();
pending_paths_to_open.extend(paths);
if let Ok(scheduler_guard) = APP_EVENT_SCHEDULER.lock() {
if let Some(app_event_scheduler) = scheduler_guard.as_ref() {
app_event_scheduler.schedule(AppEvent::AddLaunchDocuments(std::mem::take(&mut pending_paths_to_open)));
}
}
} |
||||||
|
|
||||||
| let mut pending_paths_to_open = LAUNCH_DOCUMENTS.lock().unwrap(); | ||||||
|
|
||||||
| for index in 0..urls.count() { | ||||||
| let url = urls.objectAtIndex(index); | ||||||
| if !url.isFileURL() { | ||||||
| tracing::error!("Ignoring macOS open URL event for non-file URL: {:?}", url); | ||||||
| continue; | ||||||
| } | ||||||
|
|
||||||
| let path = unsafe { CStr::from_ptr(url.fileSystemRepresentation().as_ptr()) }; | ||||||
| let path = PathBuf::from(OsStr::from_bytes(path.to_bytes())); | ||||||
|
|
||||||
| pending_paths_to_open.push(path); | ||||||
| } | ||||||
|
|
||||||
| if let Some(app_event_scheduler) = app_event_scheduler.deref() { | ||||||
| app_event_scheduler.schedule(AppEvent::AddLaunchDocuments(std::mem::take(&mut pending_paths_to_open))); | ||||||
| } | ||||||
| } | ||||||
| } | ||||||
| ); | ||||||
|
|
||||||
| fn instance() -> objc2::rc::Retained<NSApplication> { | ||||||
| unsafe { msg_send![GraphiteApplication::class(), sharedApplication] } | ||||||
| } | ||||||
|
|
||||||
| pub(super) fn init() { | ||||||
| let _ = instance(); | ||||||
|
|
||||||
| INSTALL_DELEGATE.call_once(|| { | ||||||
| let mtm = MainThreadMarker::new().expect("only ever called from main thread"); | ||||||
| let delegate: Retained<GraphiteApplicationDelegate> = unsafe { msg_send![super(GraphiteApplicationDelegate::alloc(mtm).set_ivars(())), init] }; | ||||||
|
Contributor
There was a problem hiding this comment. The use of
Suggested change
|
||||||
| instance().setDelegate(Some(ProtocolObject::from_ref(&*delegate))); | ||||||
| std::mem::forget(delegate); | ||||||
| }); | ||||||
| } | ||||||
|
|
||||||
| pub(super) fn setup(app_event_scheduler: AppEventScheduler) { | ||||||
| let mut app_event_scheduler_guard = APP_EVENT_SCHEDULER.lock().unwrap(); | ||||||
|
|
||||||
| let mut pending_paths_to_open = LAUNCH_DOCUMENTS.lock().unwrap(); | ||||||
| app_event_scheduler.schedule(AppEvent::AddLaunchDocuments(std::mem::take(&mut pending_paths_to_open))); | ||||||
|
|
||||||
| *app_event_scheduler_guard = Some(app_event_scheduler); | ||||||
| } | ||||||
|
|
||||||
| pub(super) fn hide() { | ||||||
|
|
||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There is a small typo in the error message: "send" should be "sent".