mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

launching a binary from the command line hangs on macOS Sonoma (#799)

Browse Source
This commit is contained in:
ManoloFLTK 2023-10-18 07:21:20 +02:00
parent 9f141aefc6
commit c27009e52c
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/Fl_cocoa.mm
View File

@ -1799,12 +1799,7 @@ void Fl_Cocoa_Screen_Driver::open_display_platform() {
FLAppDelegate *delegate = (Fl_Darwin_System_Driver::calc_mac_os_version() < 100500 ? [FLAppDelegateBefore10_5 alloc] : [FLAppDelegate alloc]);
[(NSApplication*)NSApp setDelegate:[delegate init]];
if (need_new_nsapp) {
BOOL condition = (fl_mac_os_version >= 101300);
if (fl_mac_os_version >= 140000) { // hack to detect if app is started by Xcode
NSDictionary *environment = [[NSProcessInfo processInfo] environment];
condition = (environment[@"__XCODE_BUILT_PRODUCTS_DIR_PATHS"] != nil);
}
if (condition && is_bundled() ) {
if (fl_mac_os_version >= 101300 && fl_mac_os_version < 140000 && is_bundled()) {
[NSApp activateIgnoringOtherApps:YES];
in_nsapp_run = true;
[NSApp run];
@ -1820,15 +1815,15 @@ void Fl_Cocoa_Screen_Driver::open_display_platform() {
dequeue:NO];
}
}
// empty the event queue but keep system events for drag&drop of files at launch
NSEvent *ign_event;
do ign_event = [NSApp nextEventMatchingMask:(NSEventMaskAny & ~NSEventMaskSystemDefined)
untilDate:[NSDate dateWithTimeIntervalSinceNow:0]
inMode:NSDefaultRunLoopMode
dequeue:YES];
while (ign_event);
if (fl_mac_os_version < 140000) {
// empty the event queue but keep system events for drag&drop of files at launch
NSEvent *ign_event;
do ign_event = [NSApp nextEventMatchingMask:(NSEventMaskAny & ~NSEventMaskSystemDefined)
untilDate:[NSDate dateWithTimeIntervalSinceNow:0]
inMode:NSDefaultRunLoopMode
dequeue:YES];
while (ign_event);
}
if (![NSApp isActive]) foreground_and_activate();
if (![NSApp servicesMenu]) createAppleMenu();
else Fl_Sys_Menu_Bar::window_menu_style(Fl_Sys_Menu_Bar::no_window_menu);