diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_cocoa.mm | 50 |
1 files changed, 39 insertions, 11 deletions
diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm index acb9dfc91..1d4f27136 100644 --- a/src/Fl_cocoa.mm +++ b/src/Fl_cocoa.mm @@ -114,6 +114,10 @@ static NSString *TIFF_pasteboard_type = (fl_mac_os_version >= 100600 ? NSPastebo static NSString *PDF_pasteboard_type = (fl_mac_os_version >= 100600 ? NSPasteboardTypePDF : NSPDFPboardType); static NSString *PICT_pasteboard_type = (fl_mac_os_version >= 100600 ? @"com.apple.pict" : NSPICTPboardType); static NSString *UTF8_pasteboard_type = (fl_mac_os_version >= 100600 ? NSPasteboardTypeString : NSStringPboardType); +static bool in_nsapp_run = false; // true during execution of [NSApp run] +static NSMutableArray *dropped_files_list = nil; // list of files dropped at app launch +typedef void (*open_cb_f_type)(const char *); +static open_cb_f_type get_open_cb(); #if CONSOLIDATE_MOTION static Fl_Window* send_motion; @@ -845,6 +849,18 @@ static int do_queued_events( double time = 0.0 ) double Fl_Cocoa_Screen_Driver::wait(double time_to_wait) { + if (dropped_files_list) { // when the list of dropped files is not empty, open one and remove it from list + open_cb_f_type open_cb = get_open_cb(); + NSString *s; + if ( (s = (NSString*)[dropped_files_list firstObject]) != nil) { + if (open_cb) open_cb([s UTF8String]); + [dropped_files_list removeObjectAtIndex:0]; + } + if ([dropped_files_list count] == 0) { + [dropped_files_list release]; + dropped_files_list = nil; + } + } Fl::run_checks(); static int in_idle = 0; NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; @@ -1456,8 +1472,8 @@ static FLWindowDelegate *flwindowdelegate_instance = nil; <NSApplicationDelegate> #endif { - void (*open_cb)(const char*); @public + open_cb_f_type open_cb; TSMDocumentID currentDoc; } - (void)applicationDidFinishLaunching:(NSNotification *)notification; @@ -1469,7 +1485,6 @@ static FLWindowDelegate *flwindowdelegate_instance = nil; - (void)applicationWillHide:(NSNotification *)notify; - (void)applicationWillUnhide:(NSNotification *)notify; - (BOOL)application:(NSApplication *)theApplication openFile:(NSString *)filename; -- (void)open_cb:(void (*)(const char*))cb; @end @implementation FLAppDelegate - (void)applicationDidFinishLaunching:(NSNotification *)notification @@ -1620,10 +1635,16 @@ static FLWindowDelegate *flwindowdelegate_instance = nil; } - (BOOL)application:(NSApplication *)theApplication openFile:(NSString *)filename { + if (fl_mac_os_version < 101300) { // without the next two statements, the opening of the 1st window is delayed by several seconds - // under Mac OS ≥ 10.8 when a file is dragged on the application icon - Fl_Window *firstw = Fl::first_window(); - if (firstw) firstw->wait_for_expose(); + // under 10.8 ≤ Mac OS < 10.13 when a file is dragged on the application icon + Fl_Window *firstw = Fl::first_window(); + if (firstw) firstw->wait_for_expose(); + } else if (in_nsapp_run) { // memorize all dropped filenames + if (!dropped_files_list) dropped_files_list = [[NSMutableArray alloc] initWithCapacity:1]; + [dropped_files_list addObject:filename]; + return YES; + } if (open_cb) { fl_lock_function(); (*open_cb)([filename UTF8String]); @@ -1633,10 +1654,6 @@ static FLWindowDelegate *flwindowdelegate_instance = nil; } return NO; } -- (void)open_cb:(void (*)(const char*))cb -{ - open_cb = cb; -} @end @interface FLAppDelegateBefore10_5 : FLAppDelegate @@ -1659,12 +1676,16 @@ static FLWindowDelegate *flwindowdelegate_instance = nil; } @end +static open_cb_f_type get_open_cb() { + return ((FLAppDelegate*)[NSApp delegate])->open_cb; +} + /* * Install an open documents event handler... */ void Fl_Darwin_System_Driver::open_callback(void (*cb)(const char *)) { fl_open_display(); - [(FLAppDelegate*)[NSApp delegate] open_cb:cb]; + ((FLAppDelegate*)[NSApp delegate])->open_cb = cb; } @implementation FLApplication @@ -1721,7 +1742,14 @@ void Fl_Cocoa_Screen_Driver::open_display_platform() { localPool = [[NSAutoreleasePool alloc] init]; // never released FLAppDelegate *delegate = (fl_mac_os_version < 100500 ? [FLAppDelegateBefore10_5 alloc] : [FLAppDelegate alloc]); [(NSApplication*)NSApp setDelegate:[delegate init]]; - if (need_new_nsapp) (fl_mac_os_version >= 101300 ? [NSApp run] : [NSApp finishLaunching]); + if (need_new_nsapp) { + if (fl_mac_os_version >= 101300 ) { + in_nsapp_run = true; + [NSApp run]; + in_nsapp_run = false; + } + else [NSApp finishLaunching]; + } // empty the event queue but keep system events for drag&drop of files at launch NSEvent *ign_event; |