1 files changed, 160 insertions, 79 deletions

diff --git a/indra/newview/llfilepicker_mac.mm b/indra/newview/llfilepicker_mac.mm
index 0ae5fc3f77..bca5b10c8a 100644
--- a/indra/newview/llfilepicker_mac.mm
+++ b/indra/newview/llfilepicker_mac.mm
@@ -29,108 +29,189 @@
 #include <iostream>
 #include "llfilepicker_mac.h"
 
-std::unique_ptr<std::vector<std::string>> doLoadDialog(const std::vector<std::string>* allowed_types,
-                 unsigned int flags)
+NSOpenPanel *init_panel(const std::vector<std::string>* allowed_types, unsigned int flags)
 {
-    std::unique_ptr<std::vector<std::string>> outfiles;
-
-    @autoreleasepool {
-        int i, result;
-        //Aura TODO:  We could init a small window and release it at the end of this routine
-        //for a modeless interface.
+    int i;
+    
+    NSOpenPanel *panel = [NSOpenPanel openPanel];
+    NSMutableArray *fileTypes = nil;
+    
+    
+    if ( allowed_types && !allowed_types->empty())
+    {
+        fileTypes = [[NSMutableArray alloc] init];
         
-        NSOpenPanel *panel = [NSOpenPanel openPanel];
-        //NSString *fileName = nil;
-        NSMutableArray *fileTypes = nil;
-        
-        if ( allowed_types && !allowed_types->empty())
+        for (i=0;i<allowed_types->size();++i)
         {
-            fileTypes = [[[NSMutableArray alloc] init] autorelease];
-            
-            for (i=0;i<allowed_types->size();++i)
-            {
-                [fileTypes addObject:
-                 [NSString stringWithCString:(*allowed_types)[i].c_str()
-                                    encoding:[NSString defaultCStringEncoding]]];
-            }
+            [fileTypes addObject:
+             [NSString stringWithCString:(*allowed_types)[i].c_str()
+                                encoding:[NSString defaultCStringEncoding]]];
         }
+    }
         
-        //[panel setMessage:@"Import one or more files or directories."];
-        [panel setAllowsMultipleSelection: ( (flags & F_MULTIPLE)?true:false ) ];
-        [panel setCanChooseDirectories: ( (flags & F_DIRECTORY)?true:false ) ];
-        [panel setCanCreateDirectories: true];
-        [panel setResolvesAliases: true];
-        [panel setCanChooseFiles: ( (flags & F_FILE)?true:false )];
-        [panel setTreatsFilePackagesAsDirectories: ( flags & F_NAV_SUPPORT ) ];
-        
-        if (fileTypes)
+    //[panel setMessage:@"Import one or more files or directories."];
+    [panel setAllowsMultipleSelection: ( (flags & F_MULTIPLE)?true:false ) ];
+    [panel setCanChooseDirectories: ( (flags & F_DIRECTORY)?true:false ) ];
+    [panel setCanCreateDirectories: true];
+    [panel setResolvesAliases: true];
+    [panel setCanChooseFiles: ( (flags & F_FILE)?true:false )];
+    [panel setTreatsFilePackagesAsDirectories: ( flags & F_NAV_SUPPORT ) ];
+    
+    if (fileTypes)
+    {
+        [panel setAllowedFileTypes:fileTypes];
+    }
+    else
+    {
+        // I suggest it's better to open the last path and let this default to home dir as necessary
+        // for consistency with other OS X apps
+        //
+        //[panel setDirectoryURL: fileURLWithPath(NSHomeDirectory()) ];
+    }
+    return panel;
+}
+
+std::unique_ptr<std::vector<std::string>> doLoadDialog(const std::vector<std::string>* allowed_types, 
+                 unsigned int flags)
+{
+    int result;
+
+    NSOpenPanel *panel = init_panel(allowed_types,flags);
+    
+    result = [panel runModal];
+    
+    std::unique_ptr<std::vector<std::string>> outfiles = nullptr;
+
+    if (result == NSOKButton) 
+    {
+        NSArray *filesToOpen = [panel URLs];
+        int count = [filesToOpen count];
+
+        if (count > 0)
         {
-            [panel setAllowedFileTypes:fileTypes];
-            result = [panel runModal];
+            outfiles = std::make_unique<std::vector<std::string>>();
         }
-        else
-        {
-            // I suggest it's better to open the last path and let this default to home dir as necessary
-            // for consistency with other OS X apps
-            //
-            //[panel setDirectoryURL: fileURLWithPath(NSHomeDirectory()) ];
-            result = [panel runModal];
+
+        for (int i=0; i<count; i++) {
+            NSString *aFile = [filesToOpen objectAtIndex:i];
+            std::string afilestr = [[aFile stringByStandardizingPath] UTF8String];
+            outfiles->push_back(std::move(afilestr));
         }
-        
-        if (result == NSOKButton)
+    }
+    return outfiles;
+}
+
+void doLoadDialogModeless(const std::vector<std::string>* allowed_types,
+                 unsigned int flags,
+                 void (*callback)(bool, std::vector<std::string> &, void*),
+                 void *userdata)
+{
+    // Note: might need to return and save this panel
+    // so that it does not close immediately
+    NSOpenPanel *panel = init_panel(allowed_types,flags);
+    
+    [panel beginWithCompletionHandler:^(NSModalResponse result)
         {
-            NSArray *filesToOpen = [panel URLs];
-            int i, count = [filesToOpen count];
-            
-            if (count > 0)
+            std::vector<std::string> outfiles;
+            if (result == NSOKButton)
             {
-                outfiles.reset(new std::vector<std::string>);
+                NSArray *filesToOpen = [panel URLs];
+                int i, count = [filesToOpen count];
+                
+                if (count > 0)
+                {
+                    
+                    for (i=0; i<count; i++) {
+                        NSString *aFile = [[filesToOpen objectAtIndex:i] path];
+                        std::string *afilestr = new std::string([aFile UTF8String]);
+                        outfiles.push_back(*afilestr);
+                    }
+                    callback(true, outfiles, userdata);
+                }
+                else // no valid result
+                {
+                    callback(false, outfiles, userdata);
+                }
             }
-            
-            for (i=0; i<count; i++) {
-                NSString *aFile = [[filesToOpen objectAtIndex:i] path];
-                std::string afilestr = std::string([aFile UTF8String]);
-                outfiles->push_back(afilestr);
+            else // cancel
+            {
+                callback(false, outfiles, userdata);
             }
-        }
-    }
-
-    return outfiles;
+        }];
 }
 
-
-std::unique_ptr<std::string> doSaveDialog(const std::string* file,
+std::unique_ptr<std::string> doSaveDialog(const std::string* file, 
                   const std::string* type,
                   const std::string* creator,
                   const std::string* extension,
                   unsigned int flags)
 {
-    std::unique_ptr<std::string> outfile;
-    @autoreleasepool {
-        NSSavePanel *panel = [NSSavePanel savePanel];
-        
-        NSString *extensionns = [NSString stringWithCString:extension->c_str() encoding:[NSString defaultCStringEncoding]];
-        NSArray *fileType = [extensionns componentsSeparatedByString:@","];
-        
-        //[panel setMessage:@"Save Image File"];
-        [panel setTreatsFilePackagesAsDirectories: ( flags & F_NAV_SUPPORT ) ];
-        [panel setCanSelectHiddenExtension:true];
-        [panel setAllowedFileTypes:fileType];
-        NSString *fileName = [NSString stringWithCString:file->c_str() encoding:[NSString defaultCStringEncoding]];
-        
-        NSURL* url = [NSURL fileURLWithPath:fileName];
-        [panel setNameFieldStringValue: fileName];
-        [panel setDirectoryURL: url];
-        if([panel runModal] ==
-           NSFileHandlingPanelOKButton)
+    NSSavePanel *panel = [NSSavePanel savePanel]; 
+    
+    NSString *extensionns = [NSString stringWithCString:extension->c_str() encoding:[NSString defaultCStringEncoding]];
+    NSArray *fileType = [extensionns componentsSeparatedByString:@","];
+    
+    //[panel setMessage:@"Save Image File"]; 
+    [panel setTreatsFilePackagesAsDirectories: ( flags & F_NAV_SUPPORT ) ];
+    [panel setCanSelectHiddenExtension:true]; 
+    [panel setAllowedFileTypes:fileType];
+    NSString *fileName = [NSString stringWithCString:file->c_str() encoding:[NSString defaultCStringEncoding]];
+    
+    std::unique_ptr<std::string> outfile = nullptr;
+    NSURL* url = [NSURL fileURLWithPath:fileName];
+    [panel setNameFieldStringValue: fileName];
+    [panel setDirectoryURL: url];
+    if([panel runModal] == 
+       NSFileHandlingPanelOKButton) 
+    {
+        NSURL* url = [panel URL];
+        NSString* p = [url path];
+        outfile = std::make_unique<std::string>( [p UTF8String] );
+        // write the file 
+    } 
+    return outfile;
+}
+
+void doSaveDialogModeless(const std::string* file,
+                  const std::string* type,
+                  const std::string* creator,
+                  const std::string* extension,
+                  unsigned int flags,
+                  void (*callback)(bool, std::string&, void*),
+                  void *userdata)
+{
+    NSSavePanel *panel = [NSSavePanel savePanel];
+    
+    NSString *extensionns = [NSString stringWithCString:extension->c_str() encoding:[NSString defaultCStringEncoding]];
+    NSArray *fileType = [extensionns componentsSeparatedByString:@","];
+    
+    //[panel setMessage:@"Save Image File"];
+    [panel setTreatsFilePackagesAsDirectories: ( flags & F_NAV_SUPPORT ) ];
+    [panel setCanSelectHiddenExtension:true];
+    [panel setAllowedFileTypes:fileType];
+    NSString *fileName = [NSString stringWithCString:file->c_str() encoding:[NSString defaultCStringEncoding]];
+    
+    NSURL* url = [NSURL fileURLWithPath:fileName];
+    [panel setNameFieldStringValue: fileName];
+    [panel setDirectoryURL: url];
+    
+    
+    [panel beginWithCompletionHandler:^(NSModalResponse result)
+    {
+        if (result == NSOKButton)
         {
             NSURL* url = [panel URL];
             NSString* p = [url path];
-            outfile.reset(new std::string([p UTF8String]));
-            // write the file
+            std::string outfile([p UTF8String]);
+            
+            callback(true, outfile, userdata);
         }
-    }
-    return outfile;
+        else // cancel
+        {
+            std::string outfile;
+            callback(false, outfile, userdata);
+        }
+    }];
 }
 
 #endif