X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a4f5b9b9a3195fc0d616724317171a5924f9da54..b9b8a2b5d79c50af78720589dc96cd7e16cde26e:/src/mac/filedlg.cpp diff --git a/src/mac/filedlg.cpp b/src/mac/filedlg.cpp index 5cc6f991f9..d003e602ab 100644 --- a/src/mac/filedlg.cpp +++ b/src/mac/filedlg.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: filedlg.cpp -// Purpose: wxFileDialog +// Purpose: wxFileDialog // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 @@ -20,6 +20,7 @@ #include "wx/filedlg.h" #include "wx/intl.h" #include "wx/tokenzr.h" +#include "wx/filename.h" #ifndef __DARWIN__ #include "PLStringFuncs.h" @@ -41,7 +42,7 @@ IMPLEMENT_CLASS(wxFileDialog, wxFileDialogBase) # include "MoreFiles.h" # include "MoreFilesExtras.h" #endif - + extern bool gUseNavServices ; // the data we need to pass to our standard file hook routine @@ -56,7 +57,7 @@ struct OpenUserDataRec { wxArrayString name ; wxArrayString extensions ; wxArrayLong filtermactypes ; - wxString defaultLocation; + wxString defaultLocation; #if TARGET_CARBON CFArrayRef menuitems ; #else @@ -87,10 +88,10 @@ NavEventProc( OpenUserDataRec * data = ( OpenUserDataRec *) ioUserData ; if (inSelector == kNavCBEvent) { #if TARGET_CARBON -#else +#else wxTheApp->MacHandleOneEvent(ioParams->eventData.eventDataParms.event); #endif - } + } else if ( inSelector == kNavCBStart ) { #if TARGET_CARBON @@ -124,7 +125,7 @@ NavEventProc( wxString extension = data->extensions[i].AfterLast('.') ; extension.MakeLower() ; wxString sfilename ; - + #if TARGET_CARBON wxMacCFStringHolder cfString( NavDialogGetSaveFileName( ioParams->context ) , false ); sfilename = cfString.AsString() ; @@ -135,12 +136,12 @@ NavEventProc( sfilename = wxMacMakeStringFromPascal( filename ) ; #endif - int pos = sfilename.Find('.',TRUE) ; + int pos = sfilename.Find('.', true) ; if ( pos != wxNOT_FOUND ) { sfilename = sfilename.Left(pos+1)+extension ; #if TARGET_CARBON - cfString = sfilename ; + cfString.Assign( sfilename , wxFONTENCODING_DEFAULT ) ; NavDialogSetSaveFileName( ioParams->context , cfString ) ; #else wxMacStringToPascal( sfilename , filename ) ; @@ -152,31 +153,13 @@ NavEventProc( } } -const wxChar * gfilters[] = -{ - wxT("*.TXT") , - wxT("*.TIF") , - wxT("*.JPG") , - - NULL -} ; - -OSType gfiltersmac[] = -{ - 'TEXT' , - 'TIFF' , - 'JPEG' , - - '****' -} ; - void MakeUserDataRec(OpenUserDataRec *myData , const wxString& filter ) { myData->menuitems = NULL ; myData->currentfilter = 0 ; - myData->saveMode = FALSE ; - + myData->saveMode = false ; + if ( filter && filter[0] ) { wxString filter2(filter) ; @@ -204,7 +187,7 @@ void MakeUserDataRec(OpenUserDataRec *myData , const wxString& filter ) } // we allow for compatibility reason to have a single filter expression (like *.*) without // an explanatory text, in that case the first part is name and extension at the same time - + wxASSERT_MSG( filterIndex == 0 || !isName , wxT("incorrect format of format string") ) ; if ( current.IsEmpty() ) myData->extensions.Add( myData->name[filterIndex] ) ; @@ -212,25 +195,32 @@ void MakeUserDataRec(OpenUserDataRec *myData , const wxString& filter ) myData->extensions.Add( current.MakeUpper() ) ; if ( filterIndex == 0 || isName ) myData->name.Add( current.MakeUpper() ) ; - + ++filterIndex ; - + const size_t extCount = myData->extensions.GetCount(); for ( size_t i = 0 ; i < extCount; i++ ) { - int j ; - for ( j = 0 ; gfilters[j] ; j++ ) + wxUint32 fileType; + wxUint32 creator; + wxString extension = myData->extensions[i]; + + if (extension.GetChar(0) == '*') + extension = extension.Mid(1); // Remove leading * + + if (extension.GetChar(0) == '.') { - if ( myData->extensions[i] == gfilters[j] ) - { - myData->filtermactypes.Add( gfiltersmac[j] ) ; - break ; - } + extension = extension.Mid(1); // Remove leading . } - if( gfilters[j] == NULL ) + + if (wxFileName::MacFindDefaultTypeAndCreator( extension, &fileType, &creator )) { - myData->filtermactypes.Add( '****' ) ; + myData->filtermactypes.Add( (OSType)fileType ); } + else + { + myData->filtermactypes.Add( '****' ) ; // We'll fail safe if it's not recognized + } } } } @@ -239,25 +229,25 @@ static Boolean CheckFile( const wxString &filename , OSType type , OpenUserDataR { wxString file(filename) ; file.MakeUpper() ; - + if ( data->extensions.GetCount() > 0 ) { //for ( int i = 0 ; i < data->numfilters ; ++i ) int i = data->currentfilter ; if ( data->extensions[i].Right(2) == wxT(".*") ) return true ; - + { if ( type == (OSType)data->filtermactypes[i] ) return true ; - + wxStringTokenizer tokenizer( data->extensions[i] , wxT(";") ) ; while( tokenizer.HasMoreTokens() ) { wxString extension = tokenizer.GetNextToken() ; if ( extension.GetChar(0) == '*' ) extension = extension.Mid(1) ; - + if ( file.Len() >= extension.Len() && extension == file.Right(extension.Len() ) ) return true ; } @@ -275,22 +265,22 @@ static pascal Boolean CrossPlatformFileFilter(CInfoPBPtr myCInfoPBPtr, void *dat Boolean visibleFlag; Boolean folderFlag; - + visibleFlag = ! (myCInfoPBPtr->hFileInfo.ioFlFndrInfo.fdFlags & kIsInvisible); folderFlag = (myCInfoPBPtr->hFileInfo.ioFlAttrib & 0x10); - + // because the semantics of the filter proc are "true means don't show // it" we need to invert the result that we return - + if ( !visibleFlag ) return true ; - + if ( !folderFlag ) { wxString file = wxMacMakeStringFromPascal( myCInfoPBPtr->hFileInfo.ioNamePtr ) ; return !CheckFile( file , myCInfoPBPtr->hFileInfo.ioFlFndrInfo.fdType , data ) ; } - + return false ; } #endif @@ -306,15 +296,15 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message, } pascal Boolean CrossPlatformFilterCallback ( - AEDesc *theItem, - void *info, - void *callBackUD, + AEDesc *theItem, + void *info, + void *callBackUD, NavFilterModes filterMode ) { bool display = true; OpenUserDataRecPtr data = (OpenUserDataRecPtr) callBackUD ; - + if (filterMode == kNavFilteringBrowserList) { NavFileOrFolderInfo* theInfo = (NavFileOrFolderInfo*) info ; @@ -326,22 +316,31 @@ pascal Boolean CrossPlatformFilterCallback ( memcpy( &spec , *theItem->dataHandle , sizeof(FSSpec) ) ; wxString file = wxMacMakeStringFromPascal( spec.name ) ; display = CheckFile( file , theInfo->fileAndFolder.fileInfo.finderInfo.fdType , data ) ; - } + } #if TARGET_CARBON else if ( theItem->descriptorType == typeFSRef ) { FSRef fsref ; memcpy( &fsref , *theItem->dataHandle , sizeof(FSRef) ) ; - wxString file ; - const short maxpath = 1024 ; - FSRefMakePath( &fsref , (UInt8*) file.GetWriteBuf(maxpath+1),maxpath) ; - file.UngetWriteBuf() ; + + + + CFURLRef fullURLRef; + fullURLRef = ::CFURLCreateFromFSRef(NULL, &fsref); +#ifdef __UNIX__ + CFURLPathStyle pathstyle = kCFURLPOSIXPathStyle; +#else + CFURLPathStyle pathstyle = kCFURLHFSPathStyle; +#endif + CFStringRef cfString = CFURLCopyFileSystemPath(fullURLRef, pathstyle); + wxString file = wxMacCFStringHolder(cfString).AsString(wxFont::GetDefaultEncoding()); + display = CheckFile( file , theInfo->fileAndFolder.fileInfo.finderInfo.fdType , data ) ; } #endif } } - + return display; } @@ -352,70 +351,71 @@ int wxFileDialog::ShowModal() NavDialogCreationOptions dialogCreateOptions; // set default options ::NavGetDefaultDialogCreationOptions(&dialogCreateOptions); - + // this was always unset in the old code dialogCreateOptions.optionFlags &= ~kNavSelectDefaultLocation; - + #if wxUSE_UNICODE - // tried using wxMacCFStringHolder in the code below, but it seems - // the CFStrings were being released before the save dialog was called, + // tried using wxMacCFStringHolder in the code below, but it seems + // the CFStrings were being released before the save dialog was called, // causing a crash - open dialog works fine with or without wxMacCFStringHolder - CFStringRef titleRef = ::CFStringCreateWithCString(NULL, - m_message.wc_str(), - kCFStringEncodingUnicode); + CFStringRef titleRef = ::CFStringCreateWithCharacters( kCFAllocatorDefault, + (const unsigned short*)m_message.wc_str(), + m_message.Len() ); #else - CFStringRef titleRef = ::CFStringCreateWithCString(NULL, + CFStringRef titleRef = ::CFStringCreateWithCString(NULL, m_message.c_str(), - CFStringGetSystemEncoding()); + m_font.GetEncoding() ); #endif dialogCreateOptions.windowTitle = titleRef; #if wxUSE_UNICODE - CFStringRef defaultFileNameRef = ::CFStringCreateWithCString(NULL, - m_fileName.wc_str(), - kCFStringEncodingUnicode); + CFStringRef defaultFileNameRef = ::CFStringCreateWithCharacters( kCFAllocatorDefault, + (const unsigned short*)m_fileName.wc_str(), + m_fileName.Len() ); #else - CFStringRef defaultFileNameRef = ::CFStringCreateWithCString(NULL, - m_fileName.c_str(), - CFStringGetSystemEncoding()); + CFStringRef defaultFileNameRef = ::CFStringCreateWithCString(NULL, + m_fileName.c_str(), + m_font.GetEncoding()); #endif dialogCreateOptions.saveFileName = defaultFileNameRef; NavDialogRef dialog; NavObjectFilterUPP navFilterUPP = NULL; - CFArrayRef cfArray = NULL; // for popupExtension + CFArrayRef cfArray = NULL; // for popupExtension OpenUserDataRec myData; myData.defaultLocation = m_dir; if (m_dialogStyle & wxSAVE) { - dialogCreateOptions.optionFlags |= kNavNoTypePopup; - dialogCreateOptions.optionFlags |= kNavDontAutoTranslate; - dialogCreateOptions.optionFlags |= kNavDontAddTranslateItems; - - // The extension is important - dialogCreateOptions.optionFlags |= kNavPreserveSaveFileExtension; - - + dialogCreateOptions.optionFlags |= kNavNoTypePopup; + dialogCreateOptions.optionFlags |= kNavDontAutoTranslate; + dialogCreateOptions.optionFlags |= kNavDontAddTranslateItems; + + // The extension is important + dialogCreateOptions.optionFlags |= kNavPreserveSaveFileExtension; + err = ::NavCreatePutFileDialog(&dialogCreateOptions, - 'TEXT', - 'TEXT', - sStandardNavEventFilter, - &myData, // for defaultLocation - &dialog); + 'TEXT', + 'TEXT', + sStandardNavEventFilter, + &myData, // for defaultLocation + &dialog); } else { MakeUserDataRec(&myData , m_wildCard); - int numfilters = myData.extensions.GetCount(); - if (numfilters > 0){ - CFMutableArrayRef popup = CFArrayCreateMutable( kCFAllocatorDefault , - numfilters , &kCFTypeArrayCallBacks ) ; - dialogCreateOptions.popupExtension = popup ; - myData.menuitems = dialogCreateOptions.popupExtension ; - for ( size_t i = 0 ; i < numfilters ; ++i ) + size_t numfilters = myData.extensions.GetCount(); + if (numfilters > 0) { - CFArrayAppendValue( popup , (CFStringRef) wxMacCFStringHolder( myData.name[i] ) ) ; - } - } + CFMutableArrayRef popup = CFArrayCreateMutable( kCFAllocatorDefault , + numfilters , &kCFTypeArrayCallBacks ) ; + dialogCreateOptions.popupExtension = popup ; + myData.menuitems = dialogCreateOptions.popupExtension ; + for ( size_t i = 0 ; i < numfilters ; ++i ) + { + CFArrayAppendValue( popup , (CFStringRef) wxMacCFStringHolder( myData.name[i] , m_font.GetEncoding() ) ) ; + } + } + navFilterUPP = NewNavObjectFilterUPP(CrossPlatformFilterCallback); err = ::NavCreateGetFileDialog(&dialogCreateOptions, NULL, // NavTypeListHandle @@ -428,7 +428,7 @@ int wxFileDialog::ShowModal() if (err == noErr) err = ::NavDialogRun(dialog); - + // clean up filter related data, etc. if (navFilterUPP) ::DisposeNavObjectFilterUPP(navFilterUPP); @@ -447,86 +447,57 @@ int wxFileDialog::ShowModal() ::CFRelease(titleRef); if (defaultFileNameRef) ::CFRelease(defaultFileNameRef); - if (err != noErr) + if (err != noErr) return wxID_CANCEL; NavReplyRecord navReply; err = ::NavDialogGetReply(dialog, &navReply); - if (err == noErr && navReply.validRecord) + if (err == noErr && navReply.validRecord) { AEKeyword theKeyword; DescType actualType; Size actualSize; FSRef theFSRef; - char thePath[FILENAME_MAX]; - + wxString thePath ; long count; ::AECountItems(&navReply.selection , &count); for (long i = 1; i <= count; ++i) { err = ::AEGetNthPtr(&(navReply.selection), 1, typeFSRef, &theKeyword, &actualType, &theFSRef, sizeof(theFSRef), &actualSize); - if (err != noErr) + if (err != noErr) break; + CFURLRef fullURLRef; if (m_dialogStyle & wxSAVE) { - thePath[0] = '\0'; CFURLRef parentURLRef = ::CFURLCreateFromFSRef(NULL, &theFSRef); - + if (parentURLRef) { - CFURLRef fullURLRef = + fullURLRef = ::CFURLCreateCopyAppendingPathComponent(NULL, - parentURLRef, - navReply.saveFileName, + parentURLRef, + navReply.saveFileName, false); ::CFRelease(parentURLRef); - if (fullURLRef) - { - CFStringRef cfString = ::CFURLCopyPath(fullURLRef); - ::CFRelease(fullURLRef); - - if (cfString) - { - // unescape the URL for - // "file name" instead of "file%20name" - CFStringRef cfStringUnescaped = - ::CFURLCreateStringByReplacingPercentEscapes(NULL, - cfString, - CFSTR("")); - ::CFRelease(cfString); - - if (cfStringUnescaped) - { -#if wxUSE_UNICODE - ::CFStringGetCString(cfStringUnescaped, - thePath, - FILENAME_MAX, - kCFStringEncodingUnicode); -#else - ::CFStringGetCString(cfStringUnescaped, - thePath, - FILENAME_MAX, - CFStringGetSystemEncoding()); -#endif - ::CFRelease(cfStringUnescaped); - } - } - } - } - if (!thePath[0]) - { - ::NavDisposeReply(&navReply); - return wxID_CANCEL; } } - else + else + { + fullURLRef = ::CFURLCreateFromFSRef(NULL, &theFSRef); + } +#ifdef __UNIX__ + CFURLPathStyle pathstyle = kCFURLPOSIXPathStyle; +#else + CFURLPathStyle pathstyle = kCFURLHFSPathStyle; +#endif + CFStringRef cfString = CFURLCopyFileSystemPath(fullURLRef, pathstyle); + thePath = wxMacCFStringHolder(cfString).AsString(m_font.GetEncoding()); + if (!thePath) { - err = ::FSRefMakePath(&theFSRef, - (UInt8 *)thePath, sizeof(thePath)); - if (err != noErr) - break; + ::NavDisposeReply(&navReply); + return wxID_CANCEL; } m_path = thePath; m_paths.Add(m_path); @@ -539,7 +510,7 @@ int wxFileDialog::ShowModal() m_dir = wxPathOnly(m_path); } ::NavDisposeReply(&navReply); - + return (err == noErr) ? wxID_OK : wxID_CANCEL; #else // TARGET_CARBON @@ -551,7 +522,7 @@ int wxFileDialog::ShowModal() bool mSelectDefault = false ; OSStatus err = noErr ; // setup dialog - + mNavFilterUPP = nil; mNavPreviewUPP = nil; mSelectDefault = false; @@ -565,15 +536,16 @@ int wxFileDialog::ShowModal() // Set default location, the location // that's displayed when the dialog // first appears - + FSSpec location ; wxMacFilename2FSSpec( m_dir , &location ) ; - + err = ::AECreateDesc(typeFSS, &location, sizeof(FSSpec), &mDefaultLocation ); - if ( mDefaultLocation.dataHandle ) { - - if (mSelectDefault) { + if ( mDefaultLocation.dataHandle ) + { + if (mSelectDefault) + { mNavOptions.dialogOptionFlags |= kNavSelectDefaultLocation; } else { mNavOptions.dialogOptionFlags &= ~kNavSelectDefaultLocation; @@ -590,9 +562,9 @@ int wxFileDialog::ShowModal() mNavReply.keyScript = smSystemScript; mNavReply.fileTranslation = nil; mNavReply.version = kNavReplyRecordVersion ; - + // zero all data - + m_path = wxEmptyString ; m_fileName = wxEmptyString ; m_paths.Empty(); @@ -605,7 +577,7 @@ int wxFileDialog::ShowModal() { mNavOptions.popupExtension = (NavMenuItemSpecArrayHandle) NewHandle( sizeof( NavMenuItemSpec ) * myData.extensions.GetCount() ) ; myData.menuitems = mNavOptions.popupExtension ; - for ( size_t i = 0 ; i < myData.extensions.GetCount() ; ++i ) + for ( size_t i = 0 ; i < myData.extensions.GetCount() ; ++i ) { (*mNavOptions.popupExtension)[i].version = kNavMenuItemSpecVersion ; (*mNavOptions.popupExtension)[i].menuCreator = 'WXNG' ; @@ -620,7 +592,7 @@ int wxFileDialog::ShowModal() mNavOptions.dialogOptionFlags |= kNavDontAutoTranslate ; mNavOptions.dialogOptionFlags |= kNavDontAddTranslateItems ; - + err = ::NavPutFile( &mDefaultLocation, &mNavReply, @@ -640,7 +612,7 @@ int wxFileDialog::ShowModal() mNavOptions.dialogOptionFlags |= kNavAllowMultipleFiles ; else mNavOptions.dialogOptionFlags &= ~kNavAllowMultipleFiles ; - + err = ::NavGetFile( &mDefaultLocation, &mNavReply, @@ -652,32 +624,33 @@ int wxFileDialog::ShowModal() &myData); m_filterIndex = myData.currentfilter ; } - + DisposeNavObjectFilterUPP(mNavFilterUPP); if ( mDefaultLocation.dataHandle != nil ) { ::AEDisposeDesc(&mDefaultLocation); } - + if ( (err != noErr) && (err != userCanceledErr) ) { return wxID_CANCEL ; } - if (mNavReply.validRecord) { - + if (mNavReply.validRecord) + { FSSpec outFileSpec ; AEDesc specDesc ; AEKeyword keyWord ; - + long count ; ::AECountItems( &mNavReply.selection , &count ) ; for ( long i = 1 ; i <= count ; ++i ) { OSErr err = ::AEGetNthDesc( &mNavReply.selection , i , typeFSS, &keyWord , &specDesc); - if ( err != noErr ) { + if ( err != noErr ) + { m_path = wxT("") ; return wxID_CANCEL ; - } + } outFileSpec = **(FSSpec**) specDesc.dataHandle; if (specDesc.dataHandle != nil) { ::AEDisposeDesc(&specDesc);