X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5b781a6729859abc77e6ca5b1f81cbaad974a78f..36d9119341753b2f6f606571702a9b906050a07c:/src/mac/filedlg.cpp?ds=sidebyside diff --git a/src/mac/filedlg.cpp b/src/mac/filedlg.cpp index dc4f90e22c..bdcbdbe2c9 100644 --- a/src/mac/filedlg.cpp +++ b/src/mac/filedlg.cpp @@ -14,12 +14,16 @@ #endif #include "wx/defs.h" +#include "wx/app.h" #include "wx/utils.h" #include "wx/dialog.h" #include "wx/filedlg.h" #include "wx/intl.h" +#include "wx/tokenzr.h" -#include "PLStringFuncs.h" +#ifndef __DARWIN__ + #include "PLStringFuncs.h" +#endif #if !USE_SHARED_LIBRARY IMPLEMENT_CLASS(wxFileDialog, wxDialog) @@ -27,16 +31,33 @@ IMPLEMENT_CLASS(wxFileDialog, wxDialog) // begin wxmac -#include "Navigation.h" +#include "wx/mac/private.h" + +#include -#include "morefile.h" -#include "moreextr.h" -#include "fullpath.h" -#include "fspcompa.h" -#include "PLStringFuncs.h" +#include "MoreFiles.h" +#include "MoreFilesExtras.h" extern bool gUseNavServices ; +// the data we need to pass to our standard file hook routine +// includes a pointer to the dialog, a pointer to the standard +// file reply record (so we can inspect the current selection) +// and a copy of the "previous" file spec of the reply record +// so we can see if the selection has changed + +const int kwxMacFileTypes = 10 ; + +struct OpenUserDataRec { + int currentfilter ; + wxString name [kwxMacFileTypes] ; + wxString extensions[kwxMacFileTypes] ; + OSType filtermactypes[kwxMacFileTypes] ; + int numfilters ; +}; +typedef struct OpenUserDataRec + OpenUserDataRec, *OpenUserDataRecPtr; + static pascal void NavEventProc( NavEventCallbackMessage inSelector, NavCBRecPtr ioParams, @@ -52,8 +73,9 @@ static pascal void NavEventProc( NavEventCallbackMessage inSelector, NavCBRecPtr ioParams, - NavCallBackUserData /* ioUserData */) + NavCallBackUserData ioUserData ) { + OpenUserDataRec * data = ( OpenUserDataRec *) ioUserData ; if (inSelector == kNavCBEvent) { // In Universal Headers 3.2, Apple changed the definition of /* @@ -65,12 +87,19 @@ NavEventProc( #endif */ + wxTheApp->MacHandleOneEvent(ioParams->eventData.eventDataParms.event); + } else if ( inSelector == kNavCBPopupMenuSelect ) + { + NavMenuItemSpec * menu = (NavMenuItemSpec *) ioParams->eventData.eventDataParms.param ; + data->currentfilter = menu->menuType ; } } -char * gfilters[] = +const char * gfilters[] = { "*.TXT" , + "*.TIF" , + "*.JPG" , NULL } ; @@ -78,294 +107,118 @@ char * gfilters[] = OSType gfiltersmac[] = { 'TEXT' , + 'TIFF' , + 'JPEG' , '****' } ; -// the data we need to pass to our standard file hook routine -// includes a pointer to the dialog, a pointer to the standard -// file reply record (so we can inspect the current selection) -// and a copy of the "previous" file spec of the reply record -// so we can see if the selection has changed - -const int kwxMacFileTypes = 10 ; - -struct OpenUserDataRec { - StandardFileReply *sfrPtr; - FSSpec oldSelectionFSSpec; - char filter[kwxMacFileTypes][10] ; - OSType filtermactypes[kwxMacFileTypes] ; - int numfilters ; - DialogPtr theDlgPtr; -}; -typedef struct OpenUserDataRec - OpenUserDataRec, *OpenUserDataRecPtr; - -#if !TARGET_CARBON - -static void wxMacSetupStandardFile(short newVRefNum, long newDirID) -{ - enum - { SFSaveDisk = 0x214, CurDirStore = 0x398 }; - *(short *) SFSaveDisk = -1 * newVRefNum; - *(long *) CurDirStore = newDirID; -} - -static void wxMacSetupStandardFileFromPath( const char* s ) -{ - Str255 volume ; - Str255 path ; - short vRefNum ; - long dirRef ; - short i,j ; - Boolean isDirectory ; - - for (i=0 ; (s[i]!=0) && (s[i]!=':') ;i++) - { - volume[i]=s[i] ; - } - volume[i]=':' ; - volume[i+1]=0 ; - - // then copy the rest of the filename - - for (j=0;(s[i]!=0);i++,j++) - { - path[j]=s[i] ; - } - path[j]=0 ; - - c2pstr((Ptr) volume) ; - c2pstr((Ptr) path) ; - - SetVol(volume, 0) ; - GetVol( NULL, &vRefNum ) ; - - GetDirectoryID( vRefNum , fsRtDirID , path , &dirRef , &isDirectory ) ; - wxMacSetupStandardFile(vRefNum, dirRef) ; -} - -enum { - kSelectItem = 10, // select button item number - kSFGetFileDlgID = 251, // dialog resource number - kStrListID = 251, // our strings - kSelectStrNum = 1, // word 'Select: ' for button - kDesktopStrNum = 2, // word 'Desktop' for button - kSelectNoQuoteStrNum = 3, // word 'Select: ' for button - - kUseQuotes = true, // parameter for SetButtonName - kDontUseQuotes = false -}; - -static void GetLabelString(StringPtr theStr, short stringNum) -{ - GetIndString(theStr, kStrListID, stringNum); -} - -static void CopyPStr(StringPtr src, StringPtr dest) -{ - BlockMoveData(src, dest, 1 + src[0]); -} - -static char GetSelectKey(void) -{ - // this is the key used to trigger the select button - - // NOT INTERNATIONAL SAVVY; should at least grab it from resources - - return 's'; -} - -// FlashButton briefly highlights the dialog button -// as feedback for key equivalents - -static void FlashButton(DialogPtr theDlgPtr, short buttonID) -{ - short buttonType; - Handle buttonHandle; - Rect buttonRect; - unsigned long finalTicks; - - GetDialogItem(theDlgPtr, buttonID, &buttonType, &buttonHandle, &buttonRect); - HiliteControl((ControlHandle) buttonHandle, kControlButtonPart); - Delay(10, &finalTicks); - HiliteControl((ControlHandle) buttonHandle, 0); -} - -static Boolean SameFSSpec(FSSpecPtr spec1, FSSpecPtr spec2) -{ - return (spec1->vRefNum == spec2->vRefNum - && spec1->parID == spec2->parID - && EqualString(spec1->name, spec2->name, false, false)); -} -// MyModalDialogFilter maps a key to the Select button, and handles -// flashing of the button when the key is hit - -static pascal Boolean SFGetFolderModalDialogFilter(DialogPtr theDlgPtr, EventRecord *eventRec, - short *item, Ptr dataPtr) -{ -#pragma unused (dataPtr) - // make certain the proper dialog is showing, 'cause standard file - // can nest dialogs but calls the same filter for each - - if (((WindowPeek) theDlgPtr)->refCon == sfMainDialogRefCon) - { - // check if the select button was hit - /* - if ((eventRec->what == keyDown) - && (eventRec->modifiers & cmdKey) - && ((eventRec->message & charCodeMask) == GetSelectKey())) - { - *item = kSelectItem; - FlashButton(theDlgPtr, kSelectItem); - return true; - } - */ - } - - return false; -} -#endif !TARGET_CARBON -void ExtendedOpenFile( ConstStr255Param message , ConstStr255Param path , const char *filter , FileFilterYDUPP fileFilter, StandardFileReply *theSFR) +void MakeUserDataRec(OpenUserDataRec *myData , const wxString& filter ) { - Point thePt; - OpenUserDataRec myData; - FSSpec tempSpec; - Boolean folderFlag; - Boolean wasAliasedFlag; - DlgHookYDUPP dlgHookUPP; - ModalFilterYDUPP myModalFilterUPP; - OSErr err; - SFTypeList types ; - - - // presumably we're running System 7 or later so CustomGetFile is - // available - - // set initial contents of Select button to a space - - memcpy( theSFR->sfFile.name , "\p " , 2 ) ; - - // point the user data parameter at the reply record so we can get to it later - - myData.sfrPtr = theSFR; + myData->currentfilter = 0 ; + if ( filter && filter[0] ) { - myData.numfilters = 1 ; - for ( int i = 0 ; i < myData.numfilters ; i++ ) + wxString filter2(filter) ; + int filterIndex = 0; + bool isName = true ; + wxString current ; + for( unsigned int i = 0; i < filter2.Len(); i++ ) + { + if( filter2.GetChar(i) == wxT('|') ) + { + if( isName ) { + myData->name[filterIndex] = current ; + } + else { + myData->extensions[filterIndex] = current.MakeUpper() ; + ++filterIndex ; + } + isName = !isName ; + current = "" ; + } + else + { + current += filter2.GetChar(i) ; + } + } +// if ( filterIndex > 0 ) + { + wxASSERT_MSG( !isName , "incorrect format of format string" ) ; + myData->extensions[filterIndex] = current.MakeUpper() ; + ++filterIndex ; + } + + myData->numfilters = filterIndex ; + for ( int i = 0 ; i < myData->numfilters ; i++ ) { int j ; - - strcpy( myData.filter[i] , filter ) ; - for( j = 0 ; myData.filter[i][j] ; j++ ) - { - myData.filter[i][j] = toupper( myData.filter[i][j] ) ; - } for ( j = 0 ; gfilters[j] ; j++ ) { - if ( strcmp( myData.filter[i] , gfilters[j] ) == 0 ) + if ( strcmp( myData->extensions[i] , gfilters[j] ) == 0 ) { - myData.filtermactypes[i] = gfiltersmac[j] ; + myData->filtermactypes[i] = gfiltersmac[j] ; break ; } } if( gfilters[j] == NULL ) { - myData.filtermactypes[i] = '****' ; + myData->filtermactypes[i] = '****' ; } } } else { - myData.numfilters = 0 ; + myData->numfilters = 0 ; } - // display the dialog -#if !TARGET_CARBON - - dlgHookUPP = NULL ; -// dlgHookUPP = NewDlgHookYDProc(SFGetFolderDialogHook); - myModalFilterUPP = NewModalFilterYDProc(SFGetFolderModalDialogFilter); - - thePt.h = thePt.v = -1; // center dialog - - ParamText( message , NULL , NULL , NULL ) ; - - CustomGetFile( fileFilter, - -1, // show all types - NULL, - theSFR, - kSFGetFileDlgID, - thePt, // top left point - dlgHookUPP, - myModalFilterUPP, - nil, // activate list - nil, // activate proc - &myData); - - DisposeRoutineDescriptor(dlgHookUPP); - DisposeRoutineDescriptor(myModalFilterUPP); +} + +static Boolean CheckFile( ConstStr255Param name , OSType type , OpenUserDataRecPtr data) +{ + Str255 filename ; + +#if TARGET_CARBON + p2cstrcpy((char *)filename, name) ; #else -#endif - // if cancel wasn't pressed and no fatal error occurred... + PLstrcpy( filename , name ) ; + p2cstr( filename ) ; +#endif + wxString file(filename) ; + file.MakeUpper() ; + + if ( data->numfilters > 0 ) + { + //for ( int i = 0 ; i < data->numfilters ; ++i ) + int i = data->currentfilter ; + if ( data->extensions[i].Right(2) == ".*" ) + return true ; - if (theSFR->sfGood) - { - // if no name is in the reply record file spec, - // use the file spec of the parent folder - - if (theSFR->sfFile.name[0] == '\0') - { - err = FSMakeFSSpec(theSFR->sfFile.vRefNum, theSFR->sfFile.parID, - "\p", &tempSpec); - if (err == noErr) - { - theSFR->sfFile = tempSpec; - } - else - { - // no name to return, forget it - - theSFR->sfGood = false; - } - } - - // if there is now a name in the file spec, check if it's - // for a folder or a volume - - if (theSFR->sfFile.name[0] != '\0') - { - // the parID of the root of a disk is always fsRtParID == 1 - - if (theSFR->sfFile.parID == fsRtParID) - { - theSFR->sfIsVolume = true; - theSFR->sfIsFolder = false; // it would be reasonable for this to be true, too - } - - // we have a valid FSSpec, now let's make sure it's not for an alias file - - err = ResolveAliasFile(&theSFR->sfFile, true, &folderFlag, &wasAliasedFlag); - if (err != noErr) - { - theSFR->sfGood = false; - } - - // did the alias resolve to a folder? - - if (folderFlag && ! theSFR->sfIsVolume) - { - theSFR->sfIsFolder = true; - } - } - } + { + if ( type == data->filtermactypes[i] ) + return true ; + + wxStringTokenizer tokenizer( data->extensions[i] , ";" ) ; + 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 ; + } + } + return false ; + } + return true ; } -static pascal Boolean CrossPlatformFileFilter(CInfoPBPtr myCInfoPBPtr, Ptr dataPtr) +#ifndef __DARWIN__ +static pascal Boolean CrossPlatformFileFilter(CInfoPBPtr myCInfoPBPtr, void *dataPtr) { - Str255 filename ; OpenUserDataRecPtr data = (OpenUserDataRecPtr) dataPtr ; // return true if this item is invisible or a file @@ -383,31 +236,12 @@ static pascal Boolean CrossPlatformFileFilter(CInfoPBPtr myCInfoPBPtr, Ptr dataP if ( !folderFlag ) { - if ( data->numfilters > 0 ) - { - PLstrcpy( filename ,myCInfoPBPtr->hFileInfo.ioNamePtr ) ; - if ( filename[0] >= 4 ) - { - for( int j = 1 ; j <= filename[0] ; j++ ) - { - filename[j] = toupper( filename[j] ) ; - } - for ( int i = 0 ; i < data->numfilters ; ++i ) - { - if ( myCInfoPBPtr->hFileInfo.ioFlFndrInfo.fdType == data->filtermactypes[i] ) - return false ; - - if ( strncmp( (char*) filename + 1 + filename[0] - 4 , - & data->filter[i][ strlen(data->filter[i]) - 4 ] , 4 ) == 0 ) - return false ; - } - } - return true ; - } + return !CheckFile( myCInfoPBPtr->hFileInfo.ioNamePtr , myCInfoPBPtr->hFileInfo.ioFlFndrInfo.fdType , data ) ; } return false ; } +#endif // end wxmac @@ -476,6 +310,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message, const wxString& defaultDir, const wxString& defaultFileName, const wxString& wildCard, long style, const wxPoint& pos) { + wxASSERT_MSG( NavServicesAvailable() , "Navigation Services are not running" ) ; m_message = message; m_dialogStyle = style; m_parent = parent; @@ -486,78 +321,33 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message, m_filterIndex = 1; } -int wxFileDialog::ShowModal() + +pascal Boolean CrossPlatformFilterCallback ( + AEDesc *theItem, + void *info, + void *callBackUD, + NavFilterModes filterMode +) { - #if !TARGET_CARBON - if ( !gUseNavServices ) - { - if ( m_dialogStyle & wxSAVE ) - { - StandardFileReply reply ; - Str255 prompt ; - Str255 filename ; + bool display = true; + OpenUserDataRecPtr data = (OpenUserDataRecPtr) callBackUD ; - strcpy((char *)prompt, m_message) ; - c2pstr((char *)prompt ) ; - - strcpy((char *)filename, m_fileName) ; - c2pstr((char *)filename ) ; - #if !TARGET_CARBON - - StandardPutFile( prompt , filename , &reply ) ; - - #else - #endif - if ( reply.sfGood == false ) - { - m_path = "" ; - return wxID_CANCEL ; - } - else - { - m_path = wxMacFSSpec2UnixFilename( &reply.sfFile ) ; - return wxID_OK ; - } - } - else + if (filterMode == kNavFilteringBrowserList) { - OSType types = '????' ; - Str255 prompt ; - Str255 path ; - - strcpy((char *)prompt, m_message) ; - c2pstr((char *)prompt ) ; - - strcpy((char *)path, m_dir ) ; - c2pstr((char *)path ) ; - - StandardFileReply reply ; - FileFilterYDUPP crossPlatformFileFilterUPP = 0 ; - #if !TARGET_CARBON - crossPlatformFileFilterUPP = - NewFileFilterYDProc(CrossPlatformFileFilter); - #endif - - ExtendedOpenFile( prompt , path , m_wildCard , crossPlatformFileFilterUPP, &reply); - #if !TARGET_CARBON - DisposeFileFilterYDUPP(crossPlatformFileFilterUPP); - #endif - if ( reply.sfGood == false ) - { - m_path = "" ; - return wxID_CANCEL ; - } - else + NavFileOrFolderInfo* theInfo = (NavFileOrFolderInfo*) info ; + if (theItem->descriptorType == typeFSS && !theInfo->isFolder) { - m_path = wxMacFSSpec2UnixFilename( &reply.sfFile ) ; - return wxID_OK ; + FSSpec spec; + memcpy( &spec , *theItem->dataHandle , sizeof(FSSpec) ) ; + display = CheckFile( spec.name , theInfo->fileAndFolder.fileInfo.finderInfo.fdType , data ) ; } } - return wxID_CANCEL; + + return display; } - else -#endif - { + +int wxFileDialog::ShowModal() +{ NavDialogOptions mNavOptions; NavObjectFilterUPP mNavFilterUPP = NULL; NavPreviewUPP mNavPreviewUPP = NULL ; @@ -584,7 +374,7 @@ int wxFileDialog::ShowModal() // first appears FSSpec location ; - wxUnixFilename2FSSpec( m_dir , &location ) ; + wxMacFilename2FSSpec( m_dir , &location ) ; OSErr err = noErr ; mDefaultLocation.descriptorType = typeNull; @@ -601,11 +391,18 @@ int wxFileDialog::ShowModal() } } +#if TARGET_CARBON + c2pstrcpy((StringPtr)mNavOptions.message, m_message) ; +#else strcpy((char *)mNavOptions.message, m_message) ; c2pstr((char *)mNavOptions.message ) ; - +#endif +#if TARGET_CARBON + c2pstrcpy((StringPtr)mNavOptions.savedFileName, m_fileName) ; +#else strcpy((char *)mNavOptions.savedFileName, m_fileName) ; c2pstr((char *)mNavOptions.savedFileName ) ; +#endif if ( m_dialogStyle & wxSAVE ) { @@ -625,6 +422,27 @@ int wxFileDialog::ShowModal() } else { + OpenUserDataRec myData; + MakeUserDataRec( &myData , m_wildCard ) ; + NavTypeListHandle typelist = NULL ; + + if ( myData.numfilters > 0 ) + { + mNavOptions.popupExtension = (NavMenuItemSpecArrayHandle) NewHandle( sizeof( NavMenuItemSpec ) * myData.numfilters ) ; + for ( int i = 0 ; i < myData.numfilters ; ++i ) { + (*mNavOptions.popupExtension)[i].version = kNavMenuItemSpecVersion ; + (*mNavOptions.popupExtension)[i].menuCreator = 'WXNG' ; + (*mNavOptions.popupExtension)[i].menuType = i ; + #if TARGET_CARBON + c2pstrcpy((StringPtr)(*mNavOptions.popupExtension)[i].menuItemName, myData.name[i]) ; + #else + strcpy((char *)(*mNavOptions.popupExtension)[i].menuItemName, myData.name[i]) ; + c2pstr((char *)(*mNavOptions.popupExtension)[i].menuItemName ) ; + #endif + } + } + + mNavFilterUPP = NewNavObjectFilterUPP( CrossPlatformFilterCallback ) ; if ( m_dialogStyle & wxMULTIPLE ) mNavOptions.dialogOptionFlags |= kNavAllowMultipleFiles ; else @@ -637,10 +455,13 @@ int wxFileDialog::ShowModal() sStandardNavEventFilter , mNavPreviewUPP, mNavFilterUPP, - 0L /*inFileTypes.TypeListHandle() */, - 0L); // User Data + typelist /*inFileTypes.TypeListHandle() */, + &myData); // User Data + if ( typelist ) + DisposeHandle( (Handle) typelist ) ; } + DisposeNavObjectFilterUPP(mNavFilterUPP); if ( mDefaultLocation.dataHandle != nil ) { ::AEDisposeDesc(&mDefaultLocation); @@ -655,12 +476,13 @@ int wxFileDialog::ShowModal() 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, NULL , &specDesc); + OSErr err = ::AEGetNthDesc( &mNavReply.selection , i , typeFSS, &keyWord , &specDesc); if ( err != noErr ) { m_path = "" ; return wxID_CANCEL ; @@ -669,22 +491,19 @@ int wxFileDialog::ShowModal() if (specDesc.dataHandle != nil) { ::AEDisposeDesc(&specDesc); } - - - // outFolderDirID = thePB.dirInfo.ioDrDirID; - m_path = wxMacFSSpec2UnixFilename( &outFileSpec ) ; + m_path = wxMacFSSpec2MacFilename( &outFileSpec ) ; m_paths.Add( m_path ) ; + m_fileName = wxFileNameFromPath(m_path); m_fileNames.Add(m_fileName); - } - // set these to the first hit - m_path = m_paths[ 0 ] ; - m_fileName = wxFileNameFromPath(m_path); - m_dir = wxPathOnly(m_path); - - return wxID_OK ; + } + // set these to the first hit + m_path = m_paths[ 0 ] ; + m_fileName = wxFileNameFromPath(m_path); + m_dir = wxPathOnly(m_path); + NavDisposeReply( &mNavReply ) ; + return wxID_OK ; } return wxID_CANCEL; - } } // Generic file load/save dialog