Skip to content

Send quit_requested event when application is closed via CMD+Q on macOS #604

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
not-fl3 merged 1 commit into from
Mar 14, 2026
Merged

Send quit_requested event when application is closed via CMD+Q on macOS #604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/native/apple/frameworks.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,6 +441,13 @@ pub enum NSApplicationActivationPolicy {
NSApplicationActivationPolicyERROR = -1,
}

#[repr(u64)]
#[derive(Clone, Copy, Debug, PartialEq)]
pub enum NSApplicationTerminateReply {
NSApplicationTerminateCancel = 0,
NSApplicationTerminateNow = 1,
}

#[repr(u64)]
#[derive(Clone, Copy, Debug, PartialEq)]
pub enum NSBackingStoreType {
Expand Down
55 changes: 40 additions & 15 deletions src/native/macos.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,32 @@ impl Modifiers {
}
}

fn get_app_payload() -> &'static mut MacosDisplay {
unsafe {
let d = native_display().lock().unwrap();
let ptr: *mut c_void = *(*d.view).get_ivar("display_ptr");
&mut *(ptr as *mut MacosDisplay)
}
}

// Called when the application is requested to quit. Sends out the quit_requested event.
// Returns true if the quit was ordered, false if the quit was canceled.
fn handle_quit(payload: &mut MacosDisplay) -> bool {
// only give user-code a chance to intervene when quit wasn't already called
if !native_display().lock().unwrap().quit_ordered {
native_display().lock().unwrap().quit_requested = true;
if let Some(event_handler) = payload.context() {
event_handler.quit_requested_event();
}

// // user code hasn't intervened, quit the app
if native_display().lock().unwrap().quit_requested {
native_display().lock().unwrap().quit_ordered = true;
}
}
native_display().lock().unwrap().quit_ordered
}

pub fn define_app_delegate() -> *const Class {
extern "C" fn application_did_update(this: &mut Object, _: Sel, _: ObjcId) {
unsafe {
Expand All @@ -270,9 +296,22 @@ pub fn define_app_delegate() -> *const Class {
}
}

extern "C" fn application_should_terminate(_this: &mut Object, _: Sel, _: ObjcId) -> u64 {
let payload = get_app_payload();
if handle_quit(payload) {
NSApplicationTerminateReply::NSApplicationTerminateNow as u64
} else {
NSApplicationTerminateReply::NSApplicationTerminateCancel as u64
}
}

let superclass = class!(NSObject);
let mut decl = ClassDecl::new("NSAppDelegate", superclass).unwrap();
unsafe {
decl.add_method(
sel!(applicationShouldTerminate:),
application_should_terminate as extern "C" fn(&mut Object, Sel, ObjcId) -> u64,
);
decl.add_method(
sel!(applicationShouldTerminateAfterLastWindowClosed:),
yes1 as extern "C" fn(&Object, Sel, ObjcId) -> BOOL,
Expand All @@ -296,21 +335,7 @@ pub fn define_cocoa_window_delegate() -> *const Class {
msg_send_![capture_manager, stopCapture];
}

// only give user-code a chance to intervene when sapp_quit() wasn't already called
if !native_display().lock().unwrap().quit_ordered {
// if window should be closed and event handling is enabled, give user code
// a chance to intervene via sapp_cancel_quit()
native_display().lock().unwrap().quit_requested = true;
if let Some(event_handler) = payload.context() {
event_handler.quit_requested_event();
}

// user code hasn't intervened, quit the app
if native_display().lock().unwrap().quit_requested {
native_display().lock().unwrap().quit_ordered = true;
}
}
if native_display().lock().unwrap().quit_ordered {
if handle_quit(payload) {
YES
} else {
NO
Expand Down
Loading