--- hatari/src/gui-osx/PrefsController.m 2019/04/09 08:49:22 1.1.1.7 +++ hatari/src/gui-osx/PrefsController.m 2019/04/09 08:59:03 1.1.1.15 @@ -1,15 +1,19 @@ /* Hatari - PrefsController.m - This file is distributed under the GNU Public License, version 2 or at - your option any later version. Read the file gpl.txt for details. + This file is distributed under the GNU General Public License, version 2 + or at your option any later version. Read the file gpl.txt for details. Preferences window controller implementation file Feb-Mar 2006, Sébastien Molines - Created Jan 2006, Sébastien Molines - Updated for recent emulator updates + 2013 : Miguel SARO, J. VERNET + 2016 : J. VERNET - Updated for 1.9.0 + 2017 : Miguel SARO resizable */ +// bOKDialog = Dialog_MainDlg(&bForceReset, &bLoadedSnapshot); // prise des préférences // TODO: Set the default paths to MacOS-friendly values // TODO: Move hardcoded string to localizable resources (e.g. string "Reset the emulator?") @@ -25,24 +29,33 @@ #include "floppy.h" #include "screen.h" #include "sdlgui.h" +#include "paths.h" +#include "keymap.h" +#include "joy.h" +#include "midi.h" // Macros to transfer data between Cocoa controls and Hatari data structures -#define EXPORT_TEXTFIELD(nstextfield, target) GuiOsx_ExportPathString([nstextfield stringValue], target, sizeof((target))) +// de l'affichage vers la structure (saveAllControls) + +#define EXPORT_TEXTFIELD(mutablStrng, target) [mutablStrng getCString:target maxLength:sizeof((target))-1 encoding:NSASCIIStringEncoding] #define EXPORT_NTEXTFIELD(nstextfield, target) target = [nstextfield intValue] #define EXPORT_SWITCH(nsbutton, target) target = ([(nsbutton) state] == NSOnState) #define EXPORT_RADIO(nsmatrix, target) target = [[(nsmatrix) selectedCell] tag] #define EXPORT_DROPDOWN(nspopupbutton, target) target = [[(nspopupbutton) selectedItem] tag] #define EXPORT_SLIDER(nsslider, target) target = [(nsslider) intValue] -#define IMPORT_TEXTFIELD(nstextfield, source) [(nstextfield) setStringValue:[[NSString stringWithCString:(source) encoding:NSASCIIStringEncoding] stringByAbbreviatingWithTildeInPath]] +// la structure vers l'affichage (setAllControls) +#define IMPORT_TEXTFIELD(nstextfield, mutablStrng, source) [mutablStrng setString:[NSString stringWithCString:(source) encoding:NSASCIIStringEncoding]] ; [nstextfield setStringValue:[NSApp pathUser:mutablStrng]] #define IMPORT_NTEXTFIELD(nstextfield, source) [(nstextfield) setIntValue:(source)] #define IMPORT_SWITCH(nsbutton, source) [(nsbutton) setState:((source))? NSOnState : NSOffState] #define IMPORT_RADIO(nsmatrix, source) [(nsmatrix) selectCellWithTag:(source)] #define IMPORT_DROPDOWN(nspopupbutton, source) [(nspopupbutton) selectItemAtIndex:[(nspopupbutton) indexOfItemWithTag:(source)]] #define IMPORT_SLIDER(nsslider,source) [(nsslider) setIntValue:source] +#define INITIAL_DIR(dossier) [dossier length] < 2 ? @"~" : dossier // Back up of the current configuration parameters + CNF_PARAMS CurrentParams; @@ -172,17 +185,19 @@ SDLKey Preferences_KeysForJoysticks[] = SDLK_LALT, SDLK_RMETA, SDLK_LMETA, +#if !WITH_SDL2 SDLK_LSUPER, SDLK_RSUPER, - SDLK_MODE, SDLK_COMPOSE, + SDLK_BREAK, + SDLK_EURO, +#endif + SDLK_MODE, SDLK_HELP, SDLK_PRINT, SDLK_SYSREQ, - SDLK_BREAK, SDLK_MENU, SDLK_POWER, - SDLK_EURO, SDLK_UNDO }; @@ -211,307 +226,331 @@ static const int nSoundFreqs[] = 50066 }; + @implementation PrefsController +char szPath[FILENAME_MAX]; -/*-----------------------------------------------------------------------*/ -/* - Helper method for Choose buttons - Returns: TRUE is the user selected a path, FALSE if he/she aborted -*/ -- (BOOL)choosePathForControl:(NSTextField*)textField chooseDirectories:(bool)chooseDirectories defaultInitialDir:(NSString*)defaultInitialDir +// not used +- (IBAction)finished:(id)sender { - // Create and configure an OpenPanel - NSOpenPanel *openPanel = [NSOpenPanel openPanel]; - [openPanel setCanChooseDirectories: chooseDirectories]; - [openPanel setCanChooseFiles: !chooseDirectories]; + //Main_RequestQuit(0) ; +} - NSString *directoryToOpen; - NSString *fileToPreselect; - NSString *oldPath = [textField stringValue]; - if ((oldPath != nil) && ([oldPath length] > 0)) - { - // There is existing path: we will open its directory with its file pre-selected. - directoryToOpen = [oldPath stringByDeletingLastPathComponent]; - fileToPreselect = [oldPath lastPathComponent]; - } +/*-----------------------------------------------------------------------*/ +/* Helper method for Choose buttons */ +/* Returns: TRUE is the user selected a path, FALSE if he/she aborted */ +/*-----------------------------------------------------------------------*/ +- (BOOL)choosePathForControl:(NSTextField*)textField chooseDirectories:(BOOL)chooseDirectories defaultInitialDir:(NSString*)defaultInitialDir + mutString:(NSMutableString *)mutString what:(NSArray *)what +{ + NSString *directoryToOpen ; + NSString *fileToPreselect ; + NSString *newPath ; + + if ((mutString != nil) && (mutString.length > 2)) + { directoryToOpen = mutString.stringByDeletingLastPathComponent ; // There is existing path: we use it. + fileToPreselect = mutString.lastPathComponent ; } else + { directoryToOpen = defaultInitialDir.stringByExpandingTildeInPath ; // no path: use user's directory + fileToPreselect = nil; } ; + + newPath = [NSApp hopenfile:chooseDirectories defoDir:directoryToOpen + defoFile:fileToPreselect types:what]; + if (newPath.length != 0) // user canceled if empty { - // Currently no path: we will open the user's directory with no file selected. - directoryToOpen = [defaultInitialDir stringByExpandingTildeInPath]; - fileToPreselect = nil; - } - - // Run the OpenPanel, then check if the user clicked OK and selected at least one file - if ( (NSOKButton == [openPanel runModalForDirectory:directoryToOpen file:fileToPreselect types:nil] ) - && ([[openPanel filenames] count] > 0) ) - { - // Get the path to the selected file - NSString *path = [[openPanel filenames] objectAtIndex:0]; - - // Set the control to it (abbreviated if possible) - [textField setStringValue:[path stringByAbbreviatingWithTildeInPath]]; - - // Signal completion - return true; - } - - // Signal that the selection was aborted - return FALSE; + [mutString setString:[NSString stringWithString:newPath]] ; // save this path + [textField setStringValue:[NSApp pathUser:newPath]]; // show localized path + return YES; + } ; + + return NO; // Selection aborted } -/*-----------------------------------------------------------------------*/ -/* - Helper method to insert a floppy image - TODO: Add code to restrict to known file types -*/ +/*----------------------------------------------------------------------*/ +/* Helper method to insert a floppy image */ +/* TODO: Add code to restrict to known file types */ +/*----------------------------------------------------------------------*/ + - (void)insertFloppyImageIntoDrive:(int)drive forTextField:(NSTextField*)floppyTextField + realPath:(NSMutableString *)realPath { - if ([self choosePathForControl:floppyTextField chooseDirectories:FALSE defaultInitialDir:[defaultImagesLocation stringValue]]) - { - // Get the full path to the selected file - NSString *path = [[floppyTextField stringValue] stringByExpandingTildeInPath]; + if ([self choosePathForControl:floppyTextField chooseDirectories:NO + defaultInitialDir:imgeDir + mutString:realPath what:@[allF]]) - // Make a non-const C string out of it - const char* constSzPath = [path cStringUsingEncoding:NSASCIIStringEncoding]; - size_t cbPath = strlen(constSzPath) + 1; - char szPath[cbPath]; - strncpy(szPath, constSzPath, cbPath); - - // Insert the floppy image at this path - Floppy_SetDiskFileName(drive, szPath, NULL); - } + Floppy_SetDiskFileName(drive, [realPath cStringUsingEncoding:NSASCIIStringEncoding], NULL); + // Insert the floppy image at this path ???? } -/*-----------------------------------------------------------------------*/ -/* - Methods for all the "Choose" buttons -*/ +//----------------------------------------------------------------------------- +- (NSString *)initial:(NSString *)route +{ +BOOL flag1, flag2; + + if ((route==nil) || (route.length == 0)) return @"~" ; + flag1 = [[NSFileManager defaultManager] fileExistsAtPath:route isDirectory:&flag2] ; + if (flag1 && !flag2) + return route ; + return route.stringByDeletingLastPathComponent ; +} + +/*----------------------------------------------------------------------*/ +// Methods for all the "Choose" buttons +/*----------------------------------------------------------------------*/ - (IBAction)chooseCartridgeImage:(id)sender; { - [self choosePathForControl: cartridgeImage chooseDirectories:FALSE defaultInitialDir:@"~"]; + [self choosePathForControl: cartridgeImage chooseDirectories:NO defaultInitialDir:[self initial:cartridge] // cartridge + mutString:cartridge what:@[allC]]; } +/*----------------------------------------------------------------------*/ - (IBAction)chooseDefaultImagesLocation:(id)sender { - [self choosePathForControl: defaultImagesLocation chooseDirectories:TRUE defaultInitialDir:@"~"]; + [self choosePathForControl: defaultImagesLocation chooseDirectories:YES defaultInitialDir:[self initial:imgeDir] // images location + mutString:imgeDir what:nil]; } - +/*----------------------------------------------------------------------*/ - (IBAction)chooseFloppyImageA:(id)sender { - [self insertFloppyImageIntoDrive:0 forTextField: floppyImageA]; + [self insertFloppyImageIntoDrive:0 forTextField:floppyImageA realPath:floppyA]; // floppy A } - +/*----------------------------------------------------------------------*/ - (IBAction)chooseFloppyImageB:(id)sender { - [self insertFloppyImageIntoDrive:1 forTextField: floppyImageB]; + [self insertFloppyImageIntoDrive:1 forTextField:floppyImageB realPath:floppyB]; // floppy B } - -- (IBAction)chooseGemdosImage:(id)sender +/*----------------------------------------------------------------------*/ +- (IBAction)chooseGemdosImage:(id)sender // directory for Gemdos { - [self choosePathForControl: gemdosImage chooseDirectories:TRUE defaultInitialDir:@"~"]; + [self choosePathForControl: gemdosImage chooseDirectories:YES defaultInitialDir:INITIAL_DIR(gemdos) // gemdos + mutString:gemdos what:nil] ; + if (gemdos.length >2 ) [gemdosImage setStringValue:[NSApp pathUser:gemdos]] ; } - +/*----------------------------------------------------------------------*/ - (IBAction)chooseHdImage:(id)sender { - [self choosePathForControl: hdImage chooseDirectories:FALSE defaultInitialDir:@"~"]; + [self choosePathForControl: hdImage chooseDirectories:NO defaultInitialDir:[self initial:hrdDisk] // HD image ? + mutString:hrdDisk what:@[@"img",@"hdv"]] ; } - +/*----------------------------------------------------------------------*/ - (IBAction)chooseIdeMasterHdImage:(id)sender { - [self choosePathForControl: ideMasterHdImage chooseDirectories:FALSE defaultInitialDir:@"~"]; + [self choosePathForControl: ideMasterHdImage chooseDirectories:NO defaultInitialDir:[self initial:masterIDE] // IDE master + mutString:masterIDE what:@[@"hdv"]]; } - +/*----------------------------------------------------------------------*/ - (IBAction)chooseIdeSlaveHdImage:(id)sender { - [self choosePathForControl: ideSlaveHdImage chooseDirectories:FALSE defaultInitialDir:@"~"]; + [self choosePathForControl: ideSlaveHdImage chooseDirectories:NO defaultInitialDir:[self initial:slaveIDE] // IDE slave + mutString:slaveIDE what:@[@"hdv"]]; } - +/*----------------------------------------------------------------------*/ - (IBAction)chooseKeyboardMappingFile:(id)sender { - [self choosePathForControl: keyboardMappingFile chooseDirectories:FALSE defaultInitialDir:@"~"]; + [self choosePathForControl: keyboardMappingFile chooseDirectories:NO defaultInitialDir:[self initial:keyboard] // keyboard mapping + mutString:keyboard what:@[@"txt",@"map"]]; } - +/*----------------------------------------------------------------------*/ - (IBAction)chooseMidiOutputFile:(id)sender { - [self choosePathForControl: writeMidiToFile chooseDirectories:FALSE defaultInitialDir:@"~"]; + [self choosePathForControl: writeMidiToFile chooseDirectories:NO defaultInitialDir:[self initial:midiOut] // midi output + mutString:midiOut what:@[@"mid"]]; } - +/*----------------------------------------------------------------------*/ - (IBAction)choosePrintToFile:(id)sender { - [self choosePathForControl: printToFile chooseDirectories:FALSE defaultInitialDir:@"~"]; + [self choosePathForControl: printToFile chooseDirectories:NO defaultInitialDir:[self initial:printit] // print to file + mutString:printit what:@[@"prn"]]; } - +/*----------------------------------------------------------------------*/ - (IBAction)chooseRS232InputFile:(id)sender { - [self choosePathForControl: readRS232FromFile chooseDirectories:FALSE defaultInitialDir:@"~"]; + [self choosePathForControl: readRS232FromFile chooseDirectories:NO defaultInitialDir:[self initial:rs232In] // RS232 input + mutString:rs232In what:nil]; } - +/*----------------------------------------------------------------------*/ - (IBAction)chooseRS232OutputFile:(id)sender { - [self choosePathForControl: writeRS232ToFile chooseDirectories:FALSE defaultInitialDir:@"~"]; + [self choosePathForControl: writeRS232ToFile chooseDirectories:NO defaultInitialDir:[self initial:rs232Out] // RS232 output + mutString:rs232Out what:nil]; } - +/*----------------------------------------------------------------------*/ - (IBAction)chooseTosImage:(id)sender; { - [self choosePathForControl: tosImage chooseDirectories:FALSE defaultInitialDir:@"~"]; + [self choosePathForControl: tosImage chooseDirectories:NO defaultInitialDir:[self initial:TOS] // TOS image + mutString:TOS what:@[allT]]; } -/*-----------------------------------------------------------------------*/ -/* - Methods for the "Eject" buttons -*/ +/*----------------------------------------------------------------------*/ +// Methods for the "Eject" buttons +/*----------------------------------------------------------------------*/ - (IBAction)ejectFloppyA:(id)sender { Floppy_SetDiskFileNameNone(0); - // Refresh the control - [floppyImageA setStringValue:@""]; + // Refresh control & mutablestring + floppyImageA.stringValue = @"" ; + floppyA.string = @"" ; } - +/*----------------------------------------------------------------------*/ - (IBAction)ejectFloppyB:(id)sender { Floppy_SetDiskFileNameNone(1); - // Refresh the control - [floppyImageB setStringValue:@""]; + // Refresh control & mutablestring + floppyImageB.stringValue = @"" ; + floppyB.string = @"" ; } - +/*----------------------------------------------------------------------*/ - (IBAction)ejectGemdosImage:(id)sender { - // Clear the control. Later. saveAllControls will set the ConfigureParams accordingly to signal this is ejected - [gemdosImage setStringValue:@""]; + // Clear the control. Later. saveAllControls will set the ConfigureParams accordingly + // to signal this is ejected + gemdosImage.stringValue = @"" ; + gemdos.string = @"" ; } - +/*----------------------------------------------------------------------*/ - (IBAction)ejectHdImage:(id)sender { - // Clear the control. Later. saveAllControls will set the ConfigureParams accordingly to signal this is ejected - [hdImage setStringValue:@""]; + // Clear the control. Later. saveAllControls will set the ConfigureParams accordingly + // to signal this is ejected + hdImage.stringValue = @"" ; + hrdDisk.string = @"" ; } - +/*----------------------------------------------------------------------*/ - (IBAction)ejectIdeMasterHdImage:(id)sender { - // Clear the control. Later. saveAllControls will set the ConfigureParams accordingly to signal this is ejected - [ideMasterHdImage setStringValue:@""]; + // Clear the control. Later. saveAllControls will set the ConfigureParams accordingly + // to signal this is ejected + ideMasterHdImage.stringValue = @"" ; + masterIDE.string = @"" ; } - +/*----------------------------------------------------------------------*/ - (IBAction)ejectIdeSlaveHdImage:(id)sender { - // Clear the control. Later. saveAllControls will set the ConfigureParams accordingly to signal this is ejected - [ideSlaveHdImage setStringValue:@""]; + // Clear the control. Later. saveAllControls will set the ConfigureParams accordingly + // to signal this is ejected + ideSlaveHdImage.stringValue = @"" ; + slaveIDE.string = @"" ; } -/*-----------------------------------------------------------------------*/ -/** - * Methods for the "Load Config" button - */ +/*----------------------------------------------------------------------*/ +/* Methods for the "Load Config" button */ +/*----------------------------------------------------------------------*/ - (IBAction)loadConfigFrom:(id)sender { - NSString *ConfigFile = [NSString stringWithCString:(sConfigFileName) encoding:NSASCIIStringEncoding]; - NSOpenPanel *openPanel = [ NSOpenPanel openPanel ]; - - if ( [ openPanel runModalForDirectory:nil file:ConfigFile types:nil ] ) - { - ConfigFile = [ [ openPanel filenames ] objectAtIndex:0 ]; - } - else - { - ConfigFile = nil; - } + NSArray *lesURLs ; + NSString *ru ; + BOOL btOk ; + + ru = [NSString stringWithCString:(Paths_GetHatariHome()) encoding:NSASCIIStringEncoding] ; + opnPanel.allowedFileTypes = @[@"cfg"] ; + opnPanel.canChooseDirectories = NO ; + opnPanel.canChooseFiles = YES ; + opnPanel.accessoryView = partage ; + //10.5 ? + // if ([opnPanel respondsToSelector:@selector(setDirectoryURL:)]) + { opnPanel.directoryURL = [NSURL fileURLWithPath:ru isDirectory:YES] ; + opnPanel.nameFieldStringValue = @"hatari" ; + btOk = [opnPanel runModal] == NSModalResponseOK; // Ok ? + } + // 10.5 ? + // else + // btOk = [opnPanel runModalForDirectory:ru file:@"hatari"] == NSModalResponseOK; //NSOKButton ; + + if (!btOk) return ; // Cancel + + lesURLs = opnPanel.URLs ; + if ((lesURLs == nil) || (lesURLs.count == 0)) + return ; + + [configNm setString:[[lesURLs objectAtIndex:0] path]] ; - if (ConfigFile != nil) - { - // Make a non-const C string out of it - const char* constSzPath = [ConfigFile cStringUsingEncoding:NSASCIIStringEncoding]; - size_t cbPath = strlen(constSzPath) + 1; - char szPath[cbPath]; - strncpy(szPath, constSzPath, cbPath); + // Make a non-const C string out of it + [configNm getCString:sConfigFileName maxLength:FILENAME_MAX encoding:NSASCIIStringEncoding]; - // Load the config into ConfigureParams - Configuration_Load(szPath); - strcpy(sConfigFileName,szPath); - // Refresh all the controls to match ConfigureParams - [self setAllControls]; - } + // Load the config into ConfigureParams + Configuration_Load(sConfigFileName); + + // Refresh all the controls to match ConfigureParams + [self setAllControls]; } -/** - * Methods for the "Load Config" button - */ +/*----------------------------------------------------------------------*/ +// Methods for the "Save Config" button (bottom preference window) +/*----------------------------------------------------------------------*/ - (IBAction)saveConfigAs:(id)sender { - char splitpath[FILENAME_MAX], splitname[FILENAME_MAX]; + NSString *ru ; + BOOL btOk ; - // Update the ConfigureParams from the controls - [self saveAllControls]; - - File_SplitPath(sConfigFileName, splitpath, splitname, NULL); - - NSSavePanel *savePanel = [ NSSavePanel savePanel ]; - - NSString* defaultDir = [NSString stringWithCString:splitpath encoding:NSASCIIStringEncoding]; - NSString *ConfigFile = [NSString stringWithCString:splitname encoding:NSASCIIStringEncoding]; - - if ( ![ savePanel runModalForDirectory:defaultDir file:ConfigFile ] ) - { - return; - } - - ConfigFile = [ savePanel filename ]; - - if (ConfigFile != nil) - { - // Make a non-const C string out of it - const char* constSzPath = [ConfigFile cStringUsingEncoding:NSASCIIStringEncoding]; - size_t cbPath = strlen(constSzPath) + 1; - char szPath[cbPath]; - strncpy(szPath, constSzPath, cbPath); - - // Save the config from ConfigureParams - strcpy(sConfigFileName, szPath); - Configuration_Save(); - } + ru = [NSString stringWithCString:(Paths_GetHatariHome()) encoding:NSASCIIStringEncoding] ; + savPanel.allowedFileTypes = @[@"cfg"] ; + savPanel.accessoryView = hartage ; + //10.5 + // if ([savPanel respondsToSelector:@selector(setDirectoryURL:)]) + { savPanel.directoryURL = [NSURL fileURLWithPath:ru isDirectory:YES] ; // Since OS X 10.6 + savPanel.nameFieldStringValue = @"hatari" ; + btOk = [savPanel runModal] == NSModalResponseOK ; // Ok ? + } + //10.5 + // else + // btOk = [savPanel runModalForDirectory:ru file:@"hatari"] == NSModalResponseOK; //NSOKButton ; // avant 10.6 + + if (!btOk) + return ; // Cancel + + [configNm setString: savPanel.URL.path ]; + + // Make a non-const C string out of it + [configNm getCString:sConfigFileName maxLength:FILENAME_MAX encoding:NSASCIIStringEncoding]; + [self saveAllControls] ; // Save the config from ConfigureParams + Configuration_Save(); // [self configSave:configNm] ; +} +/*----------------------------------------------------------------------*/ +- (IBAction)aller:(id)sender +{ + NSString *defaultDirectory ; + + defaultDirectory = [NSString stringWithCString:(Paths_GetHatariHome()) encoding:NSASCIIStringEncoding] ; + // if ([opnPanel respondsToSelector:@selector(setDirectoryURL:)]) + opnPanel.directoryURL = [NSURL fileURLWithPath:defaultDirectory isDirectory:YES] ; + // else + // [opnPanel setDirectory:defaultDirectory] ; +} +/*----------------------------------------------------------------------*/ +- (IBAction)halle:(id)sender +{ + NSString *defaultDirectory ; + + defaultDirectory = [NSString stringWithCString:(Paths_GetHatariHome()) encoding:NSASCIIStringEncoding] ; + // if ([savPanel respondsToSelector:@selector(setDirectoryURL:)]) + savPanel.directoryURL = [NSURL fileURLWithPath:defaultDirectory isDirectory:YES] ; + // else + // [savPanel setDirectory:defaultDirectory] ; } -/*-----------------------------------------------------------------------*/ -/* - Commits and closes -*/ +/*----------------------------------------------------------------------*/ +//Commits and closes Ok button in preferences window +/*----------------------------------------------------------------------*/ - (IBAction)commitAndClose:(id)sender { - BOOL applyChanges = true; // The user clicked OK [self saveAllControls]; - // If a reset is required, ask the user first - if (Change_DoNeedReset(&CurrentParams, &ConfigureParams)) - { - applyChanges = ( 0 == NSRunAlertPanel ( - NSLocalizedStringFromTable(@"Reset the emulator",@"Localizable",@"comment"), - NSLocalizedStringFromTable(@"Must be reset",@"Localizable",@"comment"), - NSLocalizedStringFromTable(@"Don't reset",@"Localizable",@"comment"), - NSLocalizedStringFromTable(@"Reset",@"Localizable",@"comment"), nil) ); - } - - // Commit the new configuration - if (applyChanges) - { - Change_CopyChangedParamsToConfiguration(&CurrentParams, &ConfigureParams, false); - } - else - { - ConfigureParams = CurrentParams; - } + [window close] ; + - // Close the window - [window close]; } +/*----------------------------------------------------------------------*/ +// Populate Joystick key dropdown - (void)initKeysDropDown:(NSPopUpButton*)dropDown { @@ -521,18 +560,61 @@ static const int nSoundFreqs[] = { SDLKey key = Preferences_KeysForJoysticks[i]; const char* szKeyName = SDL_GetKeyName(key); - [dropDown addItemWithTitle:[[NSString stringWithCString:szKeyName encoding:NSASCIIStringEncoding] capitalizedString]]; - [[dropDown lastItem] setTag:key]; + [dropDown addItemWithTitle:[[NSString stringWithCString:szKeyName encoding:NSASCIIStringEncoding] capitalizedString]]; + dropDown.lastItem.tag = key ; } } -/*-----------------------------------------------------------------------*/ -/* - Displays the Preferences dialog -*/ +// ---------------------------------------------------------------------------- +// populate MIDI dropdowns +// +- (void)initMidiDropdowns +{ + [midiInPort removeAllItems]; + [midiOutPort removeAllItems]; + const char* szinPortName = "Off"; + [midiInPort addItemWithTitle:[NSString stringWithCString:szinPortName encoding:NSASCIIStringEncoding]]; + [midiOutPort addItemWithTitle:[NSString stringWithCString:szinPortName encoding:NSASCIIStringEncoding]]; + + int i = 0; + const char* portName; + while ((portName = Midi_Host_GetPortName(i++, true))) + [midiInPort addItemWithTitle:[NSString stringWithCString:portName encoding:NSASCIIStringEncoding]]; + i = 0; + while ((portName = Midi_Host_GetPortName(i++, false))) + [midiOutPort addItemWithTitle:[NSString stringWithCString:portName encoding:NSASCIIStringEncoding]]; +} + +// ---------------------------------------------------------------------------- +// ConfigureParams -> GUI controls +// +- (void)setMidiDropdowns +{ + [midiInPort selectItemWithTitle:[NSString stringWithCString:ConfigureParams.Midi.sMidiInPortName encoding:NSASCIIStringEncoding]]; + [midiOutPort selectItemWithTitle:[NSString stringWithCString:ConfigureParams.Midi.sMidiOutPortName encoding:NSASCIIStringEncoding]]; +} + +// ---------------------------------------------------------------------------- +// GUI controls -> ConfigureParams +// +- (void)saveMidiDropdowns +{ + strncpy(ConfigureParams.Midi.sMidiInPortName, [[midiInPort titleOfSelectedItem] UTF8String], FILENAME_MAX); + strncpy(ConfigureParams.Midi.sMidiOutPortName, [[midiOutPort titleOfSelectedItem] UTF8String], FILENAME_MAX); + ConfigureParams.Midi.sMidiInPortName[FILENAME_MAX-1] = 0; + ConfigureParams.Midi.sMidiOutPortName[FILENAME_MAX-1] = 0; +} + + +/*----------------------------------------------------------------------*/ +//Displays the Preferences dialog Ouverture de la fenêtre des préférences +/*----------------------------------------------------------------------*/ - (IBAction)loadPrefs:(id)sender { + //GuiOsx_Pause(true); + [configNm setString:[NSString stringWithCString:sConfigFileName encoding:NSASCIIStringEncoding]] ; + if (!bInitialized) { // Note: These inits cannot be done in awakeFromNib as by this time SDL is not yet initialized. @@ -554,17 +636,20 @@ static const int nSoundFreqs[] = int i; for (i = 0; i < cRealJoysticks; i++) { - const char* szJoystickName = SDL_JoystickName(i); - [realJoystick addItemWithTitle:[[NSString stringWithCString:szJoystickName encoding:NSASCIIStringEncoding] capitalizedString]]; - [[realJoystick lastItem] setTag:i]; + const char* szJoystickName = Joy_GetName(i); + [realJoystick addItemWithTitle:[[NSString stringWithCString:szJoystickName encoding:NSASCIIStringEncoding] capitalizedString]]; + realJoystick.lastItem.tag = i ; } } else // No real joysticks: Disable the controls { - [[joystickMode cellWithTag:1] setEnabled:FALSE]; - [realJoystick setEnabled:FALSE]; + [joystickMode cellWithTag:1].enabled = FALSE ; + realJoystick.enabled = FALSE ; } - + + // Fill MIDI dropdowns + [self initMidiDropdowns]; + bInitialized = true; } @@ -572,18 +657,46 @@ static const int nSoundFreqs[] = // Backup of configuration settings to CurrentParams (which we will only // commit back to the configuration settings if choosing OK) CurrentParams = ConfigureParams; + applyChanges=false; [self setAllControls]; // Display the window - [[ModalWrapper alloc] runModal:window]; -} + ModalWrapper *mw = [[ModalWrapper alloc] init]; + + [mw runModal:window]; + + [mw release]; // */ + + // solve bug screen-reset: close and kill preference windows before + // M. Saro, 2013 + //if(Ok button in preferences Windows) + //{ + // Check if change need reset + if (Change_DoNeedReset(&CurrentParams, &ConfigureParams)) + { + applyChanges = [NSApp myAlerte:NSAlertStyleInformational Txt:nil + firstB:localize(@"Don't reset") alternateB:localize(@"Reset") + otherB:nil informativeTxt:localize(@"Must be reset") ] == NSAlertSecondButtonReturn ; + if (applyChanges) + Change_CopyChangedParamsToConfiguration(&CurrentParams, &ConfigureParams, true) ; + else + ConfigureParams = CurrentParams; //Restore backup params + } + else + Change_CopyChangedParamsToConfiguration(&CurrentParams, &ConfigureParams, false); //Apply config without reset + //} + // else // not OK button + // { + // ConfigureParams = CurrentParams; //Restore backup params + // } + +} -/*-----------------------------------------------------------------------*/ -/* - Updates the controls following a change in the joystick selection -*/ +/*----------------------------------------------------------------------*/ +//Updates the controls following a change in the joystick selection +/*----------------------------------------------------------------------*/ - (IBAction)changeViewedJoystick:(id)sender { // Save the pre-joystick controls, as we are about to change them @@ -597,84 +710,140 @@ static const int nSoundFreqs[] = } -/*-----------------------------------------------------------------------*/ -/* - Initializes all controls -*/ +/*----------------------------------------------------------------------*/ +//Initializes all controls, transfert des préférences dans la fenêtre +/*----------------------------------------------------------------------*/ - (void)setAllControls { + // Import the floppy paths into their controls. - IMPORT_TEXTFIELD(floppyImageA, ConfigureParams.DiskImage.szDiskFileName[0]); - IMPORT_TEXTFIELD(floppyImageB, ConfigureParams.DiskImage.szDiskFileName[1]); - + //Disk A + IMPORT_TEXTFIELD(floppyImageA, floppyA, ConfigureParams.DiskImage.szDiskFileName[0]); + IMPORT_SWITCH(enableDriveA, ConfigureParams.DiskImage.EnableDriveA); + if(ConfigureParams.DiskImage.DriveA_NumberOfHeads==1) + [driveA_NumberOfHeads setState:NSOffState]; + else + [driveA_NumberOfHeads setState:NSOnState]; + + //Disk B + IMPORT_TEXTFIELD(floppyImageB, floppyB, ConfigureParams.DiskImage.szDiskFileName[1]); // le B + IMPORT_SWITCH(enableDriveB,ConfigureParams.DiskImage.EnableDriveB); + if(ConfigureParams.DiskImage.DriveB_NumberOfHeads==1) + [driveB_NumberOfHeads setState:NSOffState]; + else + [driveB_NumberOfHeads setState:NSOnState]; + // Import all the preferences into their controls + IMPORT_TEXTFIELD(cartridgeImage, cartridge, ConfigureParams.Rom.szCartridgeImageFileName); + IMPORT_TEXTFIELD(defaultImagesLocation, imgeDir, ConfigureParams.DiskImage.szDiskImageDirectory); + IMPORT_TEXTFIELD(keyboardMappingFile, keyboard, ConfigureParams.Keyboard.szMappingFileName); + IMPORT_TEXTFIELD(printToFile, printit, ConfigureParams.Printer.szPrintToFileName); + IMPORT_TEXTFIELD(tosImage, TOS, ConfigureParams.Rom.szTosImageFileName); + IMPORT_TEXTFIELD(configFile, configNm, sConfigFileName); + IMPORT_TEXTFIELD(readRS232FromFile, rs232In, ConfigureParams.RS232.szInFileName); + IMPORT_TEXTFIELD(writeRS232ToFile, rs232Out, ConfigureParams.RS232.szOutFileName); + IMPORT_SWITCH(autoInsertB, ConfigureParams.DiskImage.bAutoInsertDiskB); - IMPORT_SWITCH(blitter, ConfigureParams.System.bBlitter); - IMPORT_SWITCH(bootFromHD, ConfigureParams.HardDisk.bBootFromHardDisk); - IMPORT_SWITCH(captureOnChange, ConfigureParams.Screen.bCrop); - IMPORT_TEXTFIELD(cartridgeImage, ConfigureParams.Rom.szCartridgeImageFileName); - IMPORT_RADIO(colorDepth, ConfigureParams.Screen.nVdiColors); - IMPORT_SWITCH(compatibleCpu, ConfigureParams.System.bCompatibleCpu); - IMPORT_RADIO(cpuClock, ConfigureParams.System.nCpuFreq); - IMPORT_RADIO(cpuType, ConfigureParams.System.nCpuLevel); - IMPORT_TEXTFIELD(defaultImagesLocation, ConfigureParams.DiskImage.szDiskImageDirectory); - IMPORT_SWITCH(enableMidi, ConfigureParams.Midi.bEnableMidi); - IMPORT_SWITCH(enablePrinter, ConfigureParams.Printer.bEnablePrinting); - IMPORT_SWITCH(enableRS232, ConfigureParams.RS232.bEnableRS232); - IMPORT_SWITCH(enableSound, ConfigureParams.Sound.bEnableSound); - IMPORT_DROPDOWN(frameSkip, ConfigureParams.Screen.nFrameSkips); - IMPORT_RADIO(keyboardMapping, ConfigureParams.Keyboard.nKeymapType); - IMPORT_TEXTFIELD(keyboardMappingFile, ConfigureParams.Keyboard.szMappingFileName); - IMPORT_RADIO(machineType, ConfigureParams.System.nMachineType); - IMPORT_RADIO(monitor, ConfigureParams.Screen.nMonitorType); - IMPORT_SWITCH(patchTimerD, ConfigureParams.System.bPatchTimerD); - IMPORT_TEXTFIELD(printToFile, ConfigureParams.Printer.szPrintToFileName); - IMPORT_RADIO(ramSize, ConfigureParams.Memory.nMemorySize); - IMPORT_TEXTFIELD(readRS232FromFile, ConfigureParams.RS232.szInFileName); - IMPORT_SWITCH(realTime, ConfigureParams.System.bRealTimeClock); - IMPORT_SWITCH(slowFDC, ConfigureParams.DiskImage.bSlowFloppy); - IMPORT_TEXTFIELD(tosImage, ConfigureParams.Rom.szTosImageFileName); - IMPORT_SWITCH(useBorders, ConfigureParams.Screen.bAllowOverscan); - IMPORT_SWITCH(useVDIResolution, ConfigureParams.Screen.bUseExtVdiResolutions); - IMPORT_TEXTFIELD(writeMidiToFile, ConfigureParams.Midi.sMidiOutFileName); - IMPORT_RADIO(writeProtection, ConfigureParams.DiskImage.nWriteProtection); - IMPORT_TEXTFIELD(writeRS232ToFile, ConfigureParams.RS232.szOutFileName); - // IMPORT_SWITCH(zoomSTLowRes, ConfigureParams.Screen.bZoomLowRes); + IMPORT_SWITCH(blitter, ConfigureParams.System.bBlitter); + IMPORT_SWITCH(bootFromHD, ConfigureParams.HardDisk.bBootFromHardDisk); + //1.9.0 New Option + IMPORT_SWITCH(bFilenameConversion, ConfigureParams.HardDisk.bFilenameConversion); + if (ConfigureParams.HardDisk.nGemdosDrive == DRIVE_SKIP) + [nGemdosDrive setState:NSOnState]; + else + [nGemdosDrive setState:NSOffState]; + + IMPORT_SWITCH(nGemdosDrive, ConfigureParams.HardDisk.nGemdosDrive); + IMPORT_SWITCH(captureOnChange, ConfigureParams.Screen.bCrop); + IMPORT_RADIO(colorDepth, ConfigureParams.Screen.nVdiColors); + IMPORT_SWITCH(compatibleCpu, ConfigureParams.System.bCompatibleCpu); + IMPORT_RADIO(cpuClock, ConfigureParams.System.nCpuFreq); + IMPORT_RADIO(cpuType, ConfigureParams.System.nCpuLevel); + IMPORT_SWITCH(enableMidi, ConfigureParams.Midi.bEnableMidi); + IMPORT_SWITCH(enablePrinter, ConfigureParams.Printer.bEnablePrinting); + IMPORT_SWITCH(enableRS232, ConfigureParams.RS232.bEnableRS232); + IMPORT_SWITCH(enableSound, ConfigureParams.Sound.bEnableSound); + IMPORT_DROPDOWN(frameSkip, ConfigureParams.Screen.nFrameSkips); + IMPORT_RADIO(keyboardMapping, ConfigureParams.Keyboard.nKeymapType); + IMPORT_RADIO(machineType, ConfigureParams.System.nMachineType); + IMPORT_RADIO(monitor, ConfigureParams.Screen.nMonitorType); + IMPORT_SWITCH(patchTimerD, ConfigureParams.System.bPatchTimerD); + IMPORT_RADIO(ramSize, ConfigureParams.Memory.STRamSize_KB); // MS 12-2016 + IMPORT_SWITCH(fastFDC, ConfigureParams.DiskImage.FastFloppy); + IMPORT_SWITCH(useBorders, ConfigureParams.Screen.bAllowOverscan); + IMPORT_SWITCH(useVDIResolution, ConfigureParams.Screen.bUseExtVdiResolutions); + IMPORT_RADIO(floppyWriteProtection, ConfigureParams.DiskImage.nWriteProtection); + IMPORT_RADIO(HDWriteProtection, ConfigureParams.HardDisk.nWriteProtection); + // IMPORT_SWITCH(zoomSTLowRes, ConfigureParams.Screen.bZoomLowRes); IMPORT_SWITCH(showStatusBar, ConfigureParams.Screen.bShowStatusbar); IMPORT_DROPDOWN(enableDSP,ConfigureParams.System.nDSPType); - IMPORT_TEXTFIELD(configFile, sConfigFileName); // 12/04/2010 IMPORT_SWITCH(falconTTRatio, ConfigureParams.Screen.bAspectCorrect); IMPORT_SWITCH(fullScreen, ConfigureParams.Screen.bFullScreen); IMPORT_SWITCH(ledDisks, ConfigureParams.Screen.bShowDriveLed); + IMPORT_SWITCH(keepDesktopResolution, ConfigureParams.Screen.bKeepResolution); + //v1.6.1 + IMPORT_SWITCH(FastBootPatch,ConfigureParams.System.bFastBoot); + IMPORT_RADIO(YMVoicesMixing,ConfigureParams.Sound.YmVolumeMixing); + +#if WITH_SDL2 + IMPORT_SWITCH(SDL2UseLinearScaling, ConfigureParams.Screen.nRenderScaleQuality); + IMPORT_SWITCH(SDL2Resizable, ConfigureParams.Screen.bResizable); + IMPORT_SWITCH(SDL2UseVSync, ConfigureParams.Screen.bUseVsync); +#endif + //deal with the Max Zoomed Stepper IMPORT_NTEXTFIELD(maxZoomedWidth, ConfigureParams.Screen.nMaxWidth); IMPORT_NTEXTFIELD(maxZoomedHeight, ConfigureParams.Screen.nMaxHeight); - [widthStepper setIntValue:[maxZoomedWidth intValue]]; - [heightStepper setIntValue:[maxZoomedHeight intValue]]; - - - - - [(force8bpp) setState:((ConfigureParams.Screen.nForceBpp==8))? NSOnState : NSOffState]; + [widthStepper setDoubleValue:[maxZoomedWidth intValue]]; + [heightStepper setDoubleValue:[maxZoomedHeight intValue]]; + //1.9.1 Video Timing + switch(ConfigureParams.System.VideoTimingMode) + { + case VIDEO_TIMING_MODE_RANDOM:[videoTiming selectItemWithTag:0];break; + case VIDEO_TIMING_MODE_WS1:[videoTiming selectItemWithTag:1];break; + case VIDEO_TIMING_MODE_WS2:[videoTiming selectItemWithTag:2];break; + case VIDEO_TIMING_MODE_WS3:[videoTiming selectItemWithTag:3];break; + case VIDEO_TIMING_MODE_WS4:[videoTiming selectItemWithTag:4];break; + } + + //deal with TT RAM Size Stepper +#ifdef ENABLE_WINUAE_CPU + int ttramsize_MB=ConfigureParams.Memory.TTRamSize_KB/1024 ; //JV 12-2016 + + IMPORT_NTEXTFIELD(TTRAMSizeValue, ttramsize_MB); // MS 12-2016 + [TTRAMSizeStepper setDoubleValue:[TTRAMSizeValue intValue]]; + IMPORT_SWITCH(cycleExactCPU, ConfigureParams.System.bCycleExactCpu); + IMPORT_SWITCH(MMU_Emulation, ConfigureParams.System.bMMU); + IMPORT_SWITCH(adressSpace24, ConfigureParams.System.bAddressSpace24); + + if (ConfigureParams.System.n_FPUType == FPU_NONE) + [FPUType selectCellWithTag:0]; + else if (ConfigureParams.System.n_FPUType == FPU_68881) + [FPUType selectCellWithTag:1]; + else if (ConfigureParams.System.n_FPUType == FPU_68882) + [FPUType selectCellWithTag:2]; + else if (ConfigureParams.System.n_FPUType == FPU_CPU) + [FPUType selectCellWithTag:3]; + //not needed anymore + //IMPORT_SWITCH(CompatibleFPU, ConfigureParams.System.bCompatibleFPU); +#endif int i; - for (i = 0; i <= DLGSOUND_50KHZ-DLGSOUND_11KHZ; i++) { if (ConfigureParams.Sound.nPlaybackFreq > nSoundFreqs[i]-500 - && ConfigureParams.Sound.nPlaybackFreq < nSoundFreqs[i]+500) + && ConfigureParams.Sound.nPlaybackFreq < nSoundFreqs[i]+500) { [playbackQuality selectCellWithTag:(i)]; break; } } - - + if (ConfigureParams.Screen.nVdiWidth >= 1024) [resolution selectCellWithTag:(2)]; else if (ConfigureParams.Screen.nVdiWidth >= 768) @@ -683,86 +852,91 @@ static const int nSoundFreqs[] = [resolution selectCellWithTag:(0)]; // If the HD flag is set, load the HD path, otherwise make it blank - if (ConfigureParams.HardDisk.bUseHardDiskImage) + if (ConfigureParams.Acsi[0].bUseDevice) { - IMPORT_TEXTFIELD(hdImage, ConfigureParams.HardDisk.szHardDiskImage); + IMPORT_TEXTFIELD(hdImage, hrdDisk, ConfigureParams.Acsi[0].sDeviceFile); } else { - [hdImage setStringValue:@""]; + hdImage.stringValue = @""; hrdDisk.string = @"" ; } // If the IDE HD flag is set, load the IDE HD path, otherwise make it blank //Master - if (ConfigureParams.HardDisk.bUseIdeMasterHardDiskImage) + if (ConfigureParams.Ide[0].bUseDevice) { - IMPORT_TEXTFIELD(ideMasterHdImage, ConfigureParams.HardDisk.szIdeMasterHardDiskImage); + IMPORT_TEXTFIELD(ideMasterHdImage, masterIDE, ConfigureParams.Ide[0].sDeviceFile); } else { - [ideMasterHdImage setStringValue:@""]; + ideMasterHdImage.stringValue = @"" ; [masterIDE setString:@""] ; } //Slave - if (ConfigureParams.HardDisk.bUseIdeSlaveHardDiskImage) + if (ConfigureParams.Ide[1].bUseDevice) { - IMPORT_TEXTFIELD(ideSlaveHdImage, ConfigureParams.HardDisk.szIdeSlaveHardDiskImage); + IMPORT_TEXTFIELD(ideSlaveHdImage, slaveIDE, ConfigureParams.Ide[1].sDeviceFile); } else { - [ideSlaveHdImage setStringValue:@""]; + ideSlaveHdImage.stringValue = @"" ; [slaveIDE setString:@""] ; } // If the Gemdos flag is set, load the Gemdos path, otherwise make it blank if (ConfigureParams.HardDisk.bUseHardDiskDirectories) { - IMPORT_TEXTFIELD(gemdosImage, ConfigureParams.HardDisk.szHardDiskDirectories[0]); + [gemdos setString:[NSString stringWithCString:(ConfigureParams.HardDisk.szHardDiskDirectories[0]) encoding:NSASCIIStringEncoding]] ; +// [gemdosImage setStringValue:[NSApp pathUser:[gemdos stringByDeletingLastPathComponent]]] ; + [gemdosImage setStringValue:[NSApp pathUser:gemdos]] ; } else { - [gemdosImage setStringValue:@""]; + gemdosImage.stringValue = @"" ; [gemdos setString:@""]; } - - // Set the per-joystick controls + + // Set the per-joystick controls [self setJoystickControls]; - + + // -- MIDI + [self setMidiDropdowns]; + // Update the controls' enabled states - [self updateEnabledStates:self]; + [self updateEnabledStates:self]; } -/*-----------------------------------------------------------------------*/ -/* - Updates the enabled states of controls who depend on other controls -*/ +/*----------------------------------------------------------------------*/ +/* Updates the enabled states of controls who depend on other controls */ +/*----------------------------------------------------------------------*/ + - (IBAction)updateEnabledStates:(id)sender { // Joystick key controls are only enabled if "Use keyboard" is selected int nJoystickMode; EXPORT_RADIO(joystickMode, nJoystickMode); BOOL bUsingKeyboard = (nJoystickMode == JOYSTICK_KEYBOARD); - [joystickUp setEnabled:bUsingKeyboard]; - [joystickRight setEnabled:bUsingKeyboard]; - [joystickDown setEnabled:bUsingKeyboard]; - [joystickLeft setEnabled:bUsingKeyboard]; - [joystickFire setEnabled:bUsingKeyboard]; + joystickUp.enabled = bUsingKeyboard; + joystickRight.enabled = bUsingKeyboard; + joystickDown.enabled = bUsingKeyboard; + joystickLeft.enabled = bUsingKeyboard; + joystickFire.enabled = bUsingKeyboard; // Resolution and colour depth depend on Extended GEM VDI resolution BOOL bUsingVDI; EXPORT_SWITCH(useVDIResolution, bUsingVDI); - [resolution setEnabled:bUsingVDI]; - [colorDepth setEnabled:bUsingVDI]; + resolution.enabled = bUsingVDI; + colorDepth.enabled = bUsingVDI; // Playback quality depends on enable sound BOOL bSoundEnabled; - EXPORT_SWITCH(enableSound, bSoundEnabled); - [playbackQuality setEnabled:bSoundEnabled]; + EXPORT_SWITCH(enableSound, bSoundEnabled); + playbackQuality.enabled = bSoundEnabled ; } -/*-----------------------------------------------------------------------*/ -/* - Updates the joystick controls to match the new joystick selection -*/ +/*----------------------------------------------------------------------*/ +/* Updates the joystick controls to match the new joystick selection */ +/*----------------------------------------------------------------------*/ + - (void)setJoystickControls { // Get and persist the ID of the newly selected joystick @@ -770,13 +944,13 @@ static const int nSoundFreqs[] = // Data validation: If the JoyID is out of bounds, correct it and, if set to use real joystick, change to disabled if ( (ConfigureParams.Joysticks.Joy[nCurrentJoystick].nJoyId < 0) - || (ConfigureParams.Joysticks.Joy[nCurrentJoystick].nJoyId >= cRealJoysticks) ) + || (ConfigureParams.Joysticks.Joy[nCurrentJoystick].nJoyId >= cRealJoysticks) ) { ConfigureParams.Joysticks.Joy[nCurrentJoystick].nJoyId = 0; if (ConfigureParams.Joysticks.Joy[nCurrentJoystick].nJoystickMode == JOYSTICK_REALSTICK) { ConfigureParams.Joysticks.Joy[nCurrentJoystick].nJoystickMode = JOYSTICK_DISABLED; - } + } } // Don't change the realJoystick dropdown if none is available (to keep "(None available)" selected) @@ -795,10 +969,9 @@ static const int nSoundFreqs[] = } -/*-----------------------------------------------------------------------*/ -/* - Saves the setting for the joystick currently being viewed -*/ +/*----------------------------------------------------------------------*/ +// Saves the setting for the joystick currently being viewed +/*----------------------------------------------------------------------*/ - (void)saveJoystickControls { EXPORT_RADIO(joystickMode, ConfigureParams.Joysticks.Joy[nCurrentJoystick].nJoystickMode); @@ -812,60 +985,123 @@ static const int nSoundFreqs[] = } -/*-----------------------------------------------------------------------*/ -/* - Saves the settings for all controls -*/ +/*----------------------------------------------------------------------*/ +// Saves the settings for all controls +/*----------------------------------------------------------------------*/ - (void)saveAllControls { // Export the preference controls into their vars + + EXPORT_TEXTFIELD(cartridge, ConfigureParams.Rom.szCartridgeImageFileName); + EXPORT_TEXTFIELD(imgeDir, ConfigureParams.DiskImage.szDiskImageDirectory); + EXPORT_TEXTFIELD(keyboard, ConfigureParams.Keyboard.szMappingFileName); + EXPORT_TEXTFIELD(printit, ConfigureParams.Printer.szPrintToFileName); + EXPORT_TEXTFIELD(rs232In, ConfigureParams.RS232.szInFileName); + EXPORT_TEXTFIELD(TOS, ConfigureParams.Rom.szTosImageFileName); + EXPORT_TEXTFIELD(midiOut, ConfigureParams.Midi.sMidiOutFileName); + EXPORT_TEXTFIELD(rs232Out, ConfigureParams.RS232.szOutFileName); + + //Disk A + + EXPORT_SWITCH(enableDriveA, ConfigureParams.DiskImage.EnableDriveA); + if([driveA_NumberOfHeads state]==NSOnState) + ConfigureParams.DiskImage.DriveA_NumberOfHeads=2; + else + ConfigureParams.DiskImage.DriveA_NumberOfHeads=1; + + //Disk B + EXPORT_SWITCH(enableDriveB,ConfigureParams.DiskImage.EnableDriveB); + if([driveB_NumberOfHeads state]==NSOnState) + ConfigureParams.DiskImage.DriveB_NumberOfHeads=2; + else + ConfigureParams.DiskImage.DriveB_NumberOfHeads=1; + EXPORT_SWITCH(autoInsertB, ConfigureParams.DiskImage.bAutoInsertDiskB); - EXPORT_SWITCH(blitter, ConfigureParams.System.bBlitter); + EXPORT_SWITCH(blitter, ConfigureParams.System.bBlitter); EXPORT_SWITCH(bootFromHD, ConfigureParams.HardDisk.bBootFromHardDisk); - EXPORT_SWITCH(captureOnChange, ConfigureParams.Screen.bCrop); - EXPORT_TEXTFIELD(cartridgeImage, ConfigureParams.Rom.szCartridgeImageFileName); - EXPORT_RADIO(colorDepth, ConfigureParams.Screen.nVdiColors); - EXPORT_SWITCH(compatibleCpu, ConfigureParams.System.bCompatibleCpu); - EXPORT_RADIO(cpuClock, ConfigureParams.System.nCpuFreq); - EXPORT_RADIO(cpuType, ConfigureParams.System.nCpuLevel); - EXPORT_TEXTFIELD(defaultImagesLocation, ConfigureParams.DiskImage.szDiskImageDirectory); - EXPORT_SWITCH(enableMidi, ConfigureParams.Midi.bEnableMidi); - EXPORT_SWITCH(enablePrinter, ConfigureParams.Printer.bEnablePrinting); - EXPORT_SWITCH(enableRS232, ConfigureParams.RS232.bEnableRS232); - EXPORT_SWITCH(enableSound, ConfigureParams.Sound.bEnableSound); - EXPORT_DROPDOWN(frameSkip, ConfigureParams.Screen.nFrameSkips); - EXPORT_RADIO(keyboardMapping, ConfigureParams.Keyboard.nKeymapType); - EXPORT_TEXTFIELD(keyboardMappingFile, ConfigureParams.Keyboard.szMappingFileName); - EXPORT_RADIO(machineType, ConfigureParams.System.nMachineType); - EXPORT_RADIO(monitor, ConfigureParams.Screen.nMonitorType); - EXPORT_SWITCH(patchTimerD, ConfigureParams.System.bPatchTimerD); - EXPORT_TEXTFIELD(printToFile, ConfigureParams.Printer.szPrintToFileName); - EXPORT_RADIO(ramSize, ConfigureParams.Memory.nMemorySize); - EXPORT_TEXTFIELD(readRS232FromFile, ConfigureParams.RS232.szInFileName); - EXPORT_SWITCH(realTime, ConfigureParams.System.bRealTimeClock); - EXPORT_SWITCH(slowFDC, ConfigureParams.DiskImage.bSlowFloppy); - EXPORT_TEXTFIELD(tosImage, ConfigureParams.Rom.szTosImageFileName); - EXPORT_SWITCH(useBorders, ConfigureParams.Screen.bAllowOverscan); - EXPORT_SWITCH(useVDIResolution, ConfigureParams.Screen.bUseExtVdiResolutions); - EXPORT_TEXTFIELD(writeMidiToFile, ConfigureParams.Midi.sMidiOutFileName); - EXPORT_RADIO(writeProtection, ConfigureParams.DiskImage.nWriteProtection); - EXPORT_TEXTFIELD(writeRS232ToFile, ConfigureParams.RS232.szOutFileName); - // EXPORT_SWITCH(zoomSTLowRes, ConfigureParams.Screen.bZoomLowRes); + // 1.9.0 new options in Disk + EXPORT_SWITCH(bFilenameConversion, ConfigureParams.HardDisk.bFilenameConversion); + + if ([nGemdosDrive state]==NSOnState) + ConfigureParams.HardDisk.nGemdosDrive = DRIVE_SKIP; + else + ConfigureParams.HardDisk.nGemdosDrive = DRIVE_C; + + EXPORT_SWITCH(captureOnChange, ConfigureParams.Screen.bCrop); + EXPORT_RADIO(colorDepth, ConfigureParams.Screen.nVdiColors); + EXPORT_SWITCH(compatibleCpu, ConfigureParams.System.bCompatibleCpu); + EXPORT_RADIO(cpuClock, ConfigureParams.System.nCpuFreq); + EXPORT_RADIO(cpuType, ConfigureParams.System.nCpuLevel); + EXPORT_SWITCH(enableMidi, ConfigureParams.Midi.bEnableMidi); + EXPORT_SWITCH(enablePrinter, ConfigureParams.Printer.bEnablePrinting); + EXPORT_SWITCH(enableRS232, ConfigureParams.RS232.bEnableRS232); + EXPORT_SWITCH(enableSound, ConfigureParams.Sound.bEnableSound); + EXPORT_DROPDOWN(frameSkip, ConfigureParams.Screen.nFrameSkips); + EXPORT_RADIO(keyboardMapping, ConfigureParams.Keyboard.nKeymapType); + EXPORT_RADIO(machineType, ConfigureParams.System.nMachineType); + EXPORT_RADIO(monitor, ConfigureParams.Screen.nMonitorType); + EXPORT_SWITCH(patchTimerD, ConfigureParams.System.bPatchTimerD); + EXPORT_RADIO(ramSize, ConfigureParams.Memory.STRamSize_KB); // MS 12-2016 + EXPORT_SWITCH(fastFDC, ConfigureParams.DiskImage.FastFloppy); + EXPORT_SWITCH(useBorders, ConfigureParams.Screen.bAllowOverscan); + EXPORT_SWITCH(useVDIResolution, ConfigureParams.Screen.bUseExtVdiResolutions); + EXPORT_RADIO(floppyWriteProtection, ConfigureParams.DiskImage.nWriteProtection); + EXPORT_RADIO(HDWriteProtection, ConfigureParams.HardDisk.nWriteProtection); + // EXPORT_SWITCH(zoomSTLowRes, ConfigureParams.Screen.bZoomLowRes); EXPORT_SWITCH(showStatusBar,ConfigureParams.Screen.bShowStatusbar); EXPORT_DROPDOWN(enableDSP,ConfigureParams.System.nDSPType); EXPORT_SWITCH(falconTTRatio, ConfigureParams.Screen.bAspectCorrect); EXPORT_SWITCH(fullScreen, ConfigureParams.Screen.bFullScreen); - IMPORT_SWITCH(ledDisks, ConfigureParams.Screen.bShowDriveLed); + EXPORT_SWITCH(ledDisks, ConfigureParams.Screen.bShowDriveLed); + EXPORT_SWITCH(keepDesktopResolution, ConfigureParams.Screen.bKeepResolution); + //v1.6.1 + EXPORT_SWITCH(FastBootPatch,ConfigureParams.System.bFastBoot); + EXPORT_RADIO(YMVoicesMixing,ConfigureParams.Sound.YmVolumeMixing); + +#if WITH_SDL2 + EXPORT_SWITCH(SDL2UseLinearScaling, ConfigureParams.Screen.nRenderScaleQuality); + EXPORT_SWITCH(SDL2Resizable, ConfigureParams.Screen.bResizable); + EXPORT_SWITCH(SDL2UseVSync, ConfigureParams.Screen.bUseVsync); +#endif + EXPORT_NTEXTFIELD(maxZoomedWidth, ConfigureParams.Screen.nMaxWidth); EXPORT_NTEXTFIELD(maxZoomedHeight, ConfigureParams.Screen.nMaxHeight); - ConfigureParams.Screen.nForceBpp = ([force8bpp state] == NSOnState) ? 8 : 0; + // VIDEO TIMING + switch([videoTiming selectedTag]) + { + case 0: ConfigureParams.System.VideoTimingMode=VIDEO_TIMING_MODE_RANDOM; break; + case 1: ConfigureParams.System.VideoTimingMode=VIDEO_TIMING_MODE_WS1; break; + case 2: ConfigureParams.System.VideoTimingMode=VIDEO_TIMING_MODE_WS2; break; + case 3: ConfigureParams.System.VideoTimingMode=VIDEO_TIMING_MODE_WS3; break; + case 4: ConfigureParams.System.VideoTimingMode=VIDEO_TIMING_MODE_WS4; break; + } +#ifdef ENABLE_WINUAE_CPU + int ttramsizeMB=[TTRAMSizeValue intValue]*1024; //JV 12-2016 + ConfigureParams.Memory.TTRamSize_KB=ttramsizeMB; + + //EXPORT_NTEXTFIELD(TTRAMSizeValue, ConfigureParams.Memory.TTRamSize_KB); // MS 12-2016 + + EXPORT_SWITCH(cycleExactCPU, ConfigureParams.System.bCycleExactCpu); + EXPORT_SWITCH(MMU_Emulation, ConfigureParams.System.bMMU); + EXPORT_SWITCH(adressSpace24, ConfigureParams.System.bAddressSpace24); + if(FPUType.selectedCell.tag == 0 ) + ConfigureParams.System.n_FPUType = FPU_NONE; + else if(FPUType.selectedCell.tag == 1 ) + ConfigureParams.System.n_FPUType = FPU_68881; + else if(FPUType.selectedCell.tag == 2 ) + ConfigureParams.System.n_FPUType = FPU_68882; + else if(FPUType.selectedCell.tag == 3 ) + ConfigureParams.System.n_FPUType = FPU_CPU; + //not needed anymore + //EXPORT_SWITCH(CompatibleFPU, ConfigureParams.System.bCompatibleFPU); +#endif ConfigureParams.Sound.nPlaybackFreq = nSoundFreqs[[[playbackQuality selectedCell] tag]]; - - switch ([[resolution selectedCell] tag]) + + switch (resolution.selectedCell.tag ) { case 0: ConfigureParams.Screen.nVdiWidth = 640; @@ -882,66 +1118,119 @@ static const int nSoundFreqs[] = } // Define the HD flag, and export the HD path if one is selected - if ([[hdImage stringValue] length] > 0) + if (hrdDisk.length > 0) { - EXPORT_TEXTFIELD(hdImage, ConfigureParams.HardDisk.szHardDiskImage); - ConfigureParams.HardDisk.bUseHardDiskImage = true; + EXPORT_TEXTFIELD(hrdDisk, ConfigureParams.Acsi[0].sDeviceFile); + ConfigureParams.Acsi[0].bUseDevice = true; } else { - ConfigureParams.HardDisk.bUseHardDiskImage = false; + ConfigureParams.Acsi[0].bUseDevice = false; } - + // Define the IDE HD flag, and export the IDE HD path if one is selected - if ([[ideMasterHdImage stringValue] length] > 0) + if (masterIDE.length > 0) { - EXPORT_TEXTFIELD(ideMasterHdImage, ConfigureParams.HardDisk.szIdeMasterHardDiskImage); - ConfigureParams.HardDisk.bUseIdeMasterHardDiskImage = true; + EXPORT_TEXTFIELD(masterIDE, ConfigureParams.Ide[0].sDeviceFile); + ConfigureParams.Ide[0].bUseDevice = YES; } else { - ConfigureParams.HardDisk.bUseIdeMasterHardDiskImage = false; + ConfigureParams.Ide[0].bUseDevice = NO; } // IDE Slave - if ([[ideSlaveHdImage stringValue] length] > 0) + if (slaveIDE.length > 0) { - EXPORT_TEXTFIELD(ideSlaveHdImage, ConfigureParams.HardDisk.szIdeSlaveHardDiskImage); - ConfigureParams.HardDisk.bUseIdeSlaveHardDiskImage = true; + EXPORT_TEXTFIELD(slaveIDE, ConfigureParams.Ide[1].sDeviceFile); + ConfigureParams.Ide[1].bUseDevice = YES; } else { - ConfigureParams.HardDisk.bUseIdeSlaveHardDiskImage = false; + ConfigureParams.Ide[1].bUseDevice = NO; } // Define the Gemdos flag, and export the Gemdos path if one is selected - if ([[gemdosImage stringValue] length] > 0) + if (gemdos.length > 0) { - EXPORT_TEXTFIELD(gemdosImage, ConfigureParams.HardDisk.szHardDiskDirectories[0]); - ConfigureParams.HardDisk.bUseHardDiskDirectories = true; + EXPORT_TEXTFIELD(gemdos, ConfigureParams.HardDisk.szHardDiskDirectories[0]); + ConfigureParams.HardDisk.bUseHardDiskDirectories = YES; } else { - ConfigureParams.HardDisk.bUseHardDiskDirectories = false; + ConfigureParams.HardDisk.bUseHardDiskDirectories = NO; } - - // Save the per-joystick controls - [self saveJoystickControls]; + + // Save the per-joystick controls + [self saveJoystickControls]; + + // -- MIDI + [self saveMidiDropdowns]; } +/*----------------------------------------------------------------------*/ // Max Zoomed Adjust - (IBAction) setWidth:(id)sender; { - NSLog(@"Change Max Zoom width: %ld", [sender intValue]); - [maxZoomedWidth setIntValue: [sender intValue]]; + NSLog(@"Change Max Zoom width: %d", [sender intValue] ); + maxZoomedWidth.intValue = [sender intValue] ; } +/*----------------------------------------------------------------------*/ - (IBAction) setHeight:(id)sender; { - NSLog(@"Change Max Zoom height: %ld", [sender intValue]); - [maxZoomedHeight setIntValue: [sender intValue]]; + NSLog(@"Change Max Zoom height: %d", [sender intValue]); + maxZoomedHeight.intValue = [sender intValue] ; } +/*----------------------------------------------------------------------*/ +- (IBAction)setTTRAMSize:(id)sender +{ + NSLog(@"Change TTRAMSize: %d", [sender intValue]); + TTRAMSizeValue.intValue = [sender intValue] ; + +} + ++(PrefsController *)prefs +{ + static PrefsController *prefs = nil; + if (!prefs) + prefs = [[PrefsController alloc] init]; + + return prefs; +} + +/*----------------------------------------------------------------------*/ +- (void)awakeFromNib +{ + cartridge = [NSMutableString stringWithCapacity:50] ; [cartridge setString:@""] ; [cartridge retain] ; + imgeDir = [NSMutableString stringWithCapacity:50] ; [imgeDir setString:@""] ; [imgeDir retain] ; + floppyA = [NSMutableString stringWithCapacity:50] ; [floppyA setString:@""] ; [floppyA retain] ; + floppyB = [NSMutableString stringWithCapacity:50] ; [floppyB setString:@""] ; [floppyB retain] ; + gemdos = [NSMutableString stringWithCapacity:50] ; [gemdos setString:@""] ; [gemdos retain] ; + hrdDisk = [NSMutableString stringWithCapacity:50] ; [hrdDisk setString:@""] ; [hrdDisk retain] ; + masterIDE = [NSMutableString stringWithCapacity:50] ; [masterIDE setString:@""] ; [masterIDE retain] ; + slaveIDE = [NSMutableString stringWithCapacity:50] ; [slaveIDE setString:@""] ; [slaveIDE retain] ; + keyboard = [NSMutableString stringWithCapacity:50] ; [keyboard setString:@""] ; [keyboard retain] ; + midiOut = [NSMutableString stringWithCapacity:50] ; [midiOut setString:@""] ; [midiOut retain] ; + printit = [NSMutableString stringWithCapacity:50] ; [printit setString:@""] ; [printit retain] ; + rs232In = [NSMutableString stringWithCapacity:50] ; [rs232In setString:@""] ; [rs232In retain] ; + rs232Out = [NSMutableString stringWithCapacity:50] ; [rs232Out setString:@""] ; [rs232Out retain] ; + TOS = [NSMutableString stringWithCapacity:50] ; [TOS setString:@""] ; [TOS retain] ; + configNm = [NSMutableString stringWithCapacity:50] ; [configNm setString:@""] ; [configNm retain] ; + opnPanel = [NSOpenPanel openPanel]; [opnPanel retain] ; + savPanel = [NSSavePanel savePanel]; [savPanel retain] ; +#ifdef ENABLE_WINUAE_CPU + cycleExactCPU.enabled = true; + MMU_Emulation.enabled = true; + adressSpace24.enabled = true; + TTRAMSizeValue.enabled = true; + //CompatibleFPU.enabled = true; + FPUType.enabled = true; + bCell68060.enabled = true; +#endif + +} @end