mirror of
https://github.com/ghostty-org/ghostty.git
synced 2026-09-03 21:00:27 +00:00
8696bef644
#13611 Route new-tab window presentation through an Objective-C exception catcher. AppKit can raise an NSInternalInconsistencyException while selecting a new tab in native fullscreen. Catch the presentation exception, report it through the existing error logging path, and leave Ghostty running when AppKit’s fullscreen window stack is inconsistent. This was pretty hard to reproduce but I was able to reproduce it about 1/3rd of the time via AppleScript automation...
57 lines
1.8 KiB
Objective-C
57 lines
1.8 KiB
Objective-C
#import "ObjCExceptionCatcher.h"
|
|
|
|
#import <AppKit/AppKit.h>
|
|
|
|
static NSError *GhosttyErrorFromException(NSException *exception, NSInteger code) {
|
|
NSString *reason = exception.reason ?: @"Unknown Objective-C exception";
|
|
return [NSError errorWithDomain:@"Ghostty.ObjCException"
|
|
code:code
|
|
userInfo:@{
|
|
NSLocalizedDescriptionKey: reason,
|
|
@"exception_name": exception.name,
|
|
}];
|
|
}
|
|
|
|
BOOL GhosttyAddTabbedWindowSafely(
|
|
id parent,
|
|
id child,
|
|
NSInteger ordered,
|
|
NSError * _Nullable * _Nullable error
|
|
) {
|
|
// AppKit occasionally throws NSException while adding tabbed windows,
|
|
// in particular when creating tabs from the tab overview page since some
|
|
// macOS update recently in 2025/2026 (unclear).
|
|
//
|
|
// We must catch it in Objective-C; letting this cross into Swift is unsafe.
|
|
@try {
|
|
[((NSWindow *)parent) addTabbedWindow:(NSWindow *)child ordered:(NSWindowOrderingMode)ordered];
|
|
return YES;
|
|
} @catch (NSException *exception) {
|
|
if (error != NULL) {
|
|
*error = GhosttyErrorFromException(exception, 1);
|
|
}
|
|
|
|
return NO;
|
|
}
|
|
}
|
|
|
|
BOOL GhosttyShowWindowSafely(
|
|
id controller,
|
|
id _Nullable sender,
|
|
NSError * _Nullable * _Nullable error
|
|
) {
|
|
// Selecting a newly added tab can throw from NSWindowStackController when
|
|
// the tab group contains windows in inconsistent native fullscreen states.
|
|
// Catch the exception here so the AppKit assertion doesn't abort the app.
|
|
@try {
|
|
[((NSWindowController *)controller) showWindow:sender];
|
|
return YES;
|
|
} @catch (NSException *exception) {
|
|
if (error != NULL) {
|
|
*error = GhosttyErrorFromException(exception, 2);
|
|
}
|
|
|
|
return NO;
|
|
}
|
|
}
|