ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reworked properties file handling. The 'stella.pro' file is now assumed 

to be a master file and is read-only.  When the user merges the
properties for a given ROM, they are now stored in 'user.pro'.  The
advantage of doing it this way is that users can get updated properties
from stella.pro with each release of Stella, and at the same time keep
any customized properties in their own user.pro file.  Merging is still
activated with 'Alt s' key combo, while saving the current properties
to a separate game-specific properties file is activated with 'Ctrl s'.

Fixed UNIX and Win32 ports for the above; the OSX and PSP ports need
to be fixed by the respective maintainers (a one-liner fix).

Fixed bug where changing audio settings from AudioDialog didn't
actually close/open the sound subsystem (and hence changes weren't
taking effect).


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@775 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2005-09-11 22:55:51 +00:00
parent 32f00975ad
commit 09a8f8f10d
13 changed files with 166 additions and 237 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
stella/src/common/mainSDL.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of // See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
// //
// $Id: mainSDL.cxx,v 1.49 2005-08-25 15:19:17 stephena Exp $ // $Id: mainSDL.cxx,v 1.50 2005-09-11 22:55:51 stephena Exp $
//============================================================================ //============================================================================
#include <fstream> #include <fstream>
@ -72,23 +72,29 @@ OSystem* theOSystem = (OSystem*) NULL;
*/ */
void SetupProperties(PropertiesSet& set) void SetupProperties(PropertiesSet& set)
{ {
bool useMemList = true; // It seems we always need the list in memory // Several properties files can exist, so we attempt to load from
string theAltPropertiesFile = theOSystem->settings().getString("pro"); // all of them. If the user has specified a properties file, use
string thePropertiesFile = theOSystem->propertiesInputFilename(); // that one. Otherwise, load both the system and user properties
// files, and have the user file override all entries from the
// system file.
stringstream buf; ostringstream buf;
if(theAltPropertiesFile != "")
string altpro = theOSystem->settings().getString("pro");
if(altpro != "")
{ {
buf << "Game properties: \'" << theAltPropertiesFile << "\'\n"; buf << "Game properties: \'" << altpro << "\'\n";
set.load(theAltPropertiesFile, useMemList); set.load(altpro);
}
else if(thePropertiesFile != "")
{
buf << "Game properties: \'" << thePropertiesFile << "\'\n";
set.load(thePropertiesFile, useMemList);
} }
else else
set.load("", false); {
const string& sysPro = theOSystem->systemProperties();
const string& userPro = theOSystem->userProperties();
buf << "Game properties: \'" << sysPro << "\', \'" << userPro << "\'\n";
set.load(sysPro);
set.load(userPro);
}
if(theOSystem->settings().getBool("showinfo")) if(theOSystem->settings().getBool("showinfo"))
cout << buf.str() << endl; cout << buf.str() << endl;

8
stella/src/emucore/Console.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of // See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
// //
// $Id: Console.cxx,v 1.69 2005-09-06 19:42:35 stephena Exp $ // $Id: Console.cxx,v 1.70 2005-09-11 22:55:51 stephena Exp $
//============================================================================ //============================================================================
#include <assert.h> #include <assert.h>
@ -333,7 +333,7 @@ void Console::saveProperties(string filename, bool merge)
if(myOSystem->propSet().merge(myProperties, filename)) if(myOSystem->propSet().merge(myProperties, filename))
myOSystem->frameBuffer().showMessage("Properties merged"); myOSystem->frameBuffer().showMessage("Properties merged");
else else
myOSystem->frameBuffer().showMessage("Properties not merged"); myOSystem->frameBuffer().showMessage("Error merging properties");
} }
else // Save to the specified file directly else // Save to the specified file directly
{ {
@ -347,7 +347,7 @@ void Console::saveProperties(string filename, bool merge)
} }
else else
{ {
myOSystem->frameBuffer().showMessage("Properties not saved"); myOSystem->frameBuffer().showMessage("Error saving properties");
} }
} }
} }
@ -398,7 +398,7 @@ void Console::setPalette()
void Console::fry() void Console::fry()
{ {
for (int ZPmem=0; ZPmem<0x100; ZPmem += rand() % 4) for (int ZPmem=0; ZPmem<0x100; ZPmem += rand() % 4)
mySystem->poke(ZPmem, mySystem->peek(ZPmem) & (uInt8)rand() % 256); mySystem->poke(ZPmem, mySystem->peek(ZPmem) & (uInt8)rand() % 256);
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

6
stella/src/emucore/EventHandler.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of // See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
// //
// $Id: EventHandler.cxx,v 1.94 2005-09-04 13:26:44 optixx Exp $ // $Id: EventHandler.cxx,v 1.95 2005-09-11 22:55:51 stephena Exp $
//============================================================================ //============================================================================
#include <algorithm> #include <algorithm>
@ -385,8 +385,8 @@ void EventHandler::poll(uInt32 time)
myOSystem->console().enableBits(true); myOSystem->console().enableBits(true);
break; break;
case SDLK_s: // Alt-s merges properties into stella.pro case SDLK_s: // Alt-s merges properties into user properties (user.pro)
myOSystem->console().saveProperties(myOSystem->propertiesOutputFilename(), true); myOSystem->console().saveProperties(myOSystem->userProperties(), true);
break; break;
} }
} }

16
stella/src/emucore/OSystem.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of // See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
// //
// $Id: OSystem.cxx,v 1.38 2005-09-11 15:44:51 stephena Exp $ // $Id: OSystem.cxx,v 1.39 2005-09-11 22:55:51 stephena Exp $
//============================================================================ //============================================================================
#include <cassert> #include <cassert>
@ -139,18 +139,12 @@ void OSystem::setStateDir(const string& statedir)
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void OSystem::setPropertiesFiles(const string& userprops, void OSystem::setPropertiesDir(const string& userpath,
const string& systemprops) const string& systempath)
{ {
// Set up the input and output properties files // Set up the input and output properties files
myPropertiesOutputFile = userprops; myUserPropertiesFile = userpath + BSPF_PATH_SEPARATOR + "user.pro";
mySystemPropertiesFile = systempath + BSPF_PATH_SEPARATOR + "stella.pro";
if(FilesystemNode::fileExists(userprops))
myPropertiesInputFile = userprops;
else if(FilesystemNode::fileExists(systemprops))
myPropertiesInputFile = systemprops;
else
myPropertiesInputFile = "";
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

18
stella/src/emucore/OSystem.hxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of // See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
// //
// $Id: OSystem.hxx,v 1.28 2005-08-29 18:36:41 stephena Exp $ // $Id: OSystem.hxx,v 1.29 2005-09-11 22:55:51 stephena Exp $
//============================================================================ //============================================================================
#ifndef OSYSTEM_HXX #ifndef OSYSTEM_HXX
@ -43,7 +43,7 @@ class Debugger;
other objects belong. other objects belong.
@author Stephen Anthony @author Stephen Anthony
@version $Id: OSystem.hxx,v 1.28 2005-08-29 18:36:41 stephena Exp $ @version $Id: OSystem.hxx,v 1.29 2005-09-11 22:55:51 stephena Exp $
*/ */
class OSystem class OSystem
{ {
@ -195,19 +195,19 @@ class OSystem
/** /**
This method should be called to get the filename of the This method should be called to get the filename of the
properties (stella.pro) file for the purpose of loading. system-wide properties file (stella.pro).
@return String representing the full path of the properties filename. @return String representing the full path of the properties filename.
*/ */
const string& propertiesInputFilename() { return myPropertiesInputFile; } const string& systemProperties() { return mySystemPropertiesFile; }
/** /**
This method should be called to get the filename of the This method should be called to get the filename of the
properties (stella.pro) file for the purpose of saving. user-specific properties file (user.pro).
@return String representing the full path of the properties filename. @return String representing the full path of the properties filename.
*/ */
const string& propertiesOutputFilename() { return myPropertiesOutputFile; } const string& userProperties() { return myUserPropertiesFile; }
/** /**
This method should be called to get the filename of the config file This method should be called to get the filename of the config file
@ -325,7 +325,7 @@ class OSystem
/** /**
Set the locations of game properties files Set the locations of game properties files
*/ */
void setPropertiesFiles(const string& userprops, const string& systemprops); void setPropertiesDir(const string& userpath, const string& systempath);
/** /**
Set the locations of config files Set the locations of config files
@ -381,8 +381,8 @@ class OSystem
string myBaseDir; string myBaseDir;
string myStateDir; string myStateDir;
string myPropertiesInputFile; string mySystemPropertiesFile;
string myPropertiesOutputFile; string myUserPropertiesFile;
string myConfigInputFile; string myConfigInputFile;
string myConfigOutputFile; string myConfigOutputFile;

184
stella/src/emucore/PropsSet.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of // See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
// //
// $Id: PropsSet.cxx,v 1.11 2005-09-06 19:42:35 stephena Exp $ // $Id: PropsSet.cxx,v 1.12 2005-09-11 22:55:51 stephena Exp $
//============================================================================ //============================================================================
#include <assert.h> #include <assert.h>
@ -23,11 +23,8 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
PropertiesSet::PropertiesSet() PropertiesSet::PropertiesSet()
: myRoot(0), : myRoot(NULL),
mySize(0), mySize(0)
myUseMemList(true),
myPropertiesFilename(""),
mySaveOnExit(false)
{ {
myDefaultProperties = &defaultProperties(); myDefaultProperties = &defaultProperties();
} }
@ -35,92 +32,46 @@ PropertiesSet::PropertiesSet()
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
PropertiesSet::~PropertiesSet() PropertiesSet::~PropertiesSet()
{ {
if(myPropertiesStream.is_open())
myPropertiesStream.close();
if(myUseMemList && mySaveOnExit && (myPropertiesFilename != ""))
{
ofstream out(myPropertiesFilename.c_str());
if(out.is_open())
{
save(out);
out.close();
}
}
deleteNode(myRoot); deleteNode(myRoot);
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void PropertiesSet::getMD5(string md5, Properties &properties) void PropertiesSet::getMD5(const string& md5, Properties &properties)
{ {
bool found = false; bool found = false;
if(myUseMemList) // Make sure tree isn't empty
if(myRoot == 0)
{ {
// Make sure tree isn't empty properties = myDefaultProperties;
if(myRoot == 0) return;
{
properties = myDefaultProperties;
return;
}
// Else, do a BST search for the node with the given md5
TreeNode* current = myRoot;
while(current)
{
string currentMd5 = current->props->get("Cartridge.MD5");
if(currentMd5 == md5)
{
found = true;
break;
}
else
{
if(md5 < currentMd5)
current = current->left;
else
current = current->right;
}
}
if(found)
properties = *(current->props);
else
properties = myDefaultProperties;
} }
// Else, do a BST search for the node with the given md5
TreeNode* current = myRoot;
while(current)
{
string currentMd5 = current->props->get("Cartridge.MD5");
if(currentMd5 == md5)
{
found = true;
break;
}
else
{
if(md5 < currentMd5)
current = current->left;
else
current = current->right;
}
}
if(found)
properties = *(current->props);
else else
{ properties = myDefaultProperties;
// Loop reading properties until required properties found
for(;;)
{
// Make sure the stream is still good or we're done
if(!myPropertiesStream)
{
break;
}
// Get the property list associated with this profile
Properties currentProperties(myDefaultProperties);
currentProperties.load(myPropertiesStream);
// If the stream is still good then insert the properties
if(myPropertiesStream)
{
string currentMd5 = currentProperties.get("Cartridge.MD5");
if(currentMd5 == md5)
{
properties = currentProperties;
return;
}
}
}
properties = myDefaultProperties;
}
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -145,6 +96,7 @@ void PropertiesSet::insertNode(TreeNode* &t, const Properties& properties)
{ {
delete t->props; delete t->props;
t->props = new Properties(properties); t->props = new Properties(properties);
t->count++;
} }
} }
else else
@ -153,6 +105,7 @@ void PropertiesSet::insertNode(TreeNode* &t, const Properties& properties)
t->props = new Properties(properties); t->props = new Properties(properties);
t->left = 0; t->left = 0;
t->right = 0; t->right = 0;
t->count = 1;
++mySize; ++mySize;
} }
@ -171,37 +124,27 @@ void PropertiesSet::deleteNode(TreeNode *node)
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void PropertiesSet::load(string filename, bool useList) void PropertiesSet::load(const string& filename)
{ {
myUseMemList = useList; ifstream in(filename.c_str(), ios::in);
if(filename == "") // Loop reading properties
return; for(;;)
{
// Make sure the stream is still good or we're done
if(!in)
break;
myPropertiesStream.open(filename.c_str(), ios::in); // Get the property list associated with this profile
Properties properties(myDefaultProperties);
properties.load(in);
if(myUseMemList) // If the stream is still good then insert the properties
{ if(in)
// Loop reading properties insert(properties);
for(;;) }
{ if(in)
// Make sure the stream is still good or we're done in.close();
if(!myPropertiesStream)
{
break;
}
// Get the property list associated with this profile
Properties properties(myDefaultProperties);
properties.load(myPropertiesStream);
// If the stream is still good then insert the properties
if(myPropertiesStream)
{
insert(properties);
}
}
}
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -222,7 +165,8 @@ void PropertiesSet::saveNode(ostream& out, TreeNode *node)
{ {
if(node) if(node)
{ {
node->props->save(out); if(node->count > 1)
node->props->save(out);
saveNode(out, node->left); saveNode(out, node->left);
saveNode(out, node->right); saveNode(out, node->right);
} }
@ -246,18 +190,18 @@ uInt32 PropertiesSet::size() const
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
bool PropertiesSet::merge(Properties& properties, string& filename, bool saveOnExit) bool PropertiesSet::merge(const Properties& properties, const string& filename)
{ {
myPropertiesFilename = filename; ofstream out(filename.c_str());
mySaveOnExit = saveOnExit; if(out.is_open())
{
// Can't merge the properties if the PropertiesSet isn't in memory insert(properties);
if(!myUseMemList) save(out);
out.close();
return true;
}
else
return false; return false;
insert(properties);
return true;
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

93
stella/src/emucore/PropsSet.hxx
View File

@ -13,17 +13,15 @@
// See the file "license" for information on usage and redistribution of // See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
// //
// $Id: PropsSet.hxx,v 1.7 2005-06-16 01:11:28 stephena Exp $ // $Id: PropsSet.hxx,v 1.8 2005-09-11 22:55:51 stephena Exp $
//============================================================================ //============================================================================
#ifndef PROPERTIESSET_HXX #ifndef PROPERTIES_SET_HXX
#define PROPERTIESSET_HXX #define PROPERTIES_SET_HXX
#include <fstream> #include <fstream>
#include <string>
#include "bspf.hxx" #include "bspf.hxx"
#include "Props.hxx"
class Properties; class Properties;
@ -51,35 +49,35 @@ class PropertiesSet
*/ */
virtual ~PropertiesSet(); virtual ~PropertiesSet();
public:
/** /**
Get the property from the set with the given MD5. Get the property from the set with the given MD5.
@param md5 The md5 of the property to get @param md5 The md5 of the property to get
@param properties The property with the given MD5, or @param properties The property with the given MD5, or the default
the default property if not found properties if not found
*/ */
void getMD5(string md5, Properties& properties); void getMD5(const string& md5, Properties& properties);
/** /**
Load properties from the specified file. Use the given Load properties from the specified file. Use the given
defaults properties as the defaults for any properties loaded. defaults properties as the defaults for any properties loaded.
@param string The input file to use @param filename Full pathname of input file to use
@param useList Flag to indicate storing properties in memory (default true)
*/ */
void load(string filename, bool useList = true); void load(const string& filename);
/** /**
Save properties to the specified output stream Save properties to the specified output stream
@param out The output stream to use @param out The output stream to use
*/ */
void save(ostream& out); void save(ostream& out);
/** /**
Get the number of properties in the collection. Get the number of properties in the collection.
@return The number of properties in the collection @return The number of properties in the collection
*/ */
uInt32 size() const; uInt32 size() const;
@ -91,94 +89,79 @@ class PropertiesSet
/** /**
Merge the given properties into the collection. Merge the given properties into the collection.
@param properties The properties to merge @param properties The properties to merge
@param saveOnExit Whether to sync the PropertiesSet to disk on exit @param filename Full pathname of properties file to save
@param filename Where the PropertiesSet should be saved
@return True on success, false on failure @return True on success, false on failure
Failure will occur if the PropertiesSet isn't currently in memory Failure occurs if file couldn't be opened for writing
*/ */
bool merge(Properties& properties, string& filename, bool saveOnExit = true); bool merge(const Properties& properties, const string& filename);
private: private:
struct TreeNode {
struct TreeNode Properties* props;
{ TreeNode* left;
Properties *props; TreeNode* right;
TreeNode *left; int count;
TreeNode *right; };
};
/** /**
Insert the properties into the set. If a duplicate is inserted Insert the properties into the set. If a duplicate is inserted
the old properties are overwritten with the new ones. the old properties are overwritten with the new ones.
@param properties The collection of properties @param properties The collection of properties
*/ */
void insert(const Properties& properties); void insert(const Properties& properties);
/** /**
Insert a node in the bst, keeping the tree sorted. Insert a node in the bst, keeping the tree sorted.
@param node The current subroot of the tree @param node The current subroot of the tree
@param properties The collection of properties @param properties The collection of properties
*/ */
void insertNode(TreeNode* &node, const Properties& properties); void insertNode(TreeNode* &node, const Properties& properties);
/** /**
Deletes a node from the bst. Does not preserve bst sorting. Deletes a node from the bst. Does not preserve bst sorting.
@param node The current subroot of the tree @param node The current subroot of the tree
*/ */
void deleteNode(TreeNode *node); void deleteNode(TreeNode *node);
/** /**
Save current node properties to the specified output stream Save current node properties to the specified output stream
@param out The output stream to use @param out The output stream to use
@param node The current subroot of the tree @param node The current subroot of the tree
*/ */
void saveNode(ostream& out, TreeNode *node); void saveNode(ostream& out, TreeNode *node);
/** /**
Prints the current node properties Prints the current node properties
@param node The current subroot of the tree @param node The current subroot of the tree
*/ */
void printNode(TreeNode *node); void printNode(TreeNode *node);
/** /**
Get the default properties object to use for other properties objects Get the default properties object to use for other properties objects
@return The default properties object @return The default properties object
*/ */
static const Properties& defaultProperties(); static const Properties& defaultProperties();
private:
// The root of the BST // The root of the BST
TreeNode* myRoot; TreeNode* myRoot;
// Default properties to use for properties objects
static Properties ourDefaultProperties;
// The default properties set
const Properties* myDefaultProperties;
// Property to use as the key
string myKey;
// The size of the properties bst (i.e. the number of properties in it) // The size of the properties bst (i.e. the number of properties in it)
uInt32 mySize; uInt32 mySize;
// Whether to construct an in-memory list or rescan the file each time // The default properties set
bool myUseMemList; const Properties* myDefaultProperties;
// The file stream for the stella.pro file // Default properties to use for properties objects
ifstream myPropertiesStream; static Properties ourDefaultProperties;
// The filename where this PropertiesSet should be saved
string myPropertiesFilename;
// Whether or not to actually save the PropertiesSet on exit
bool mySaveOnExit;
}; };
#endif #endif

3
stella/src/gui/AudioDialog.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of // See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
// //
// $Id: AudioDialog.cxx,v 1.15 2005-09-10 16:19:20 bwmott Exp $ // $Id: AudioDialog.cxx,v 1.16 2005-09-11 22:55:51 stephena Exp $
// //
// Based on code from ScummVM - Scumm Interpreter // Based on code from ScummVM - Scumm Interpreter
// Copyright (C) 2002-2004 The ScummVM project // Copyright (C) 2002-2004 The ScummVM project
@ -167,6 +167,7 @@ void AudioDialog::saveConfig()
// be a time-consuming operation // be a time-consuming operation
if(restart) if(restart)
{ {
instance()->sound().close();
instance()->sound().initialize(); instance()->sound().initialize();
instance()->sound().mute(true); instance()->sound().mute(true);
} }

6
stella/src/gui/PopUpWidget.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of // See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
// //
// $Id: PopUpWidget.cxx,v 1.16 2005-08-30 17:51:26 stephena Exp $ // $Id: PopUpWidget.cxx,v 1.17 2005-09-11 22:55:51 stephena Exp $
// //
// Based on code from ScummVM - Scumm Interpreter // Based on code from ScummVM - Scumm Interpreter
// Copyright (C) 2002-2004 The ScummVM project // Copyright (C) 2002-2004 The ScummVM project
@ -204,7 +204,9 @@ void PopUpDialog::setSelection(int item)
void PopUpDialog::sendSelection() void PopUpDialog::sendSelection()
{ {
if(_popUpBoss->_cmd) if(_popUpBoss->_cmd)
_popUpBoss->sendCommand(_popUpBoss->_cmd, _selection, _popUpBoss->_id); _popUpBoss->sendCommand(_popUpBoss->_cmd,
_popUpBoss->_entries[_selection].tag,
_popUpBoss->_id);
// We remove the dialog when the user has selected an item // We remove the dialog when the user has selected an item
parent()->removeDialog(); parent()->removeDialog();

16
stella/src/gui/PopUpWidget.hxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of // See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
// //
// $Id: PopUpWidget.hxx,v 1.7 2005-06-16 00:56:00 stephena Exp $ // $Id: PopUpWidget.hxx,v 1.8 2005-09-11 22:55:51 stephena Exp $
// //
// Based on code from ScummVM - Scumm Interpreter // Based on code from ScummVM - Scumm Interpreter
// Copyright (C) 2002-2004 The ScummVM project // Copyright (C) 2002-2004 The ScummVM project
@ -74,7 +74,7 @@ class PopUpWidget : public Widget, public CommandSender
/** Select the first entry matching the given tag. */ /** Select the first entry matching the given tag. */
void setSelectedTag(int tag); void setSelectedTag(int tag);
int getSelected() const { return _selectedItem; } int getSelected() const { return _selectedItem; }
int getSelectedTag() const { return (_selectedItem >= 0) ? _entries[_selectedItem].tag : (int)-1; } int getSelectedTag() const { return (_selectedItem >= 0) ? _entries[_selectedItem].tag : (int)-1; }
const string& getSelectedString() const { return (_selectedItem >= 0) ? _entries[_selectedItem].name : EmptyString; } const string& getSelectedString() const { return (_selectedItem >= 0) ? _entries[_selectedItem].name : EmptyString; }
@ -95,10 +95,10 @@ class PopUpDialog : public Dialog
{ {
protected: protected:
PopUpWidget* _popUpBoss; PopUpWidget* _popUpBoss;
int _clickX, _clickY; int _clickX, _clickY;
uInt8* _buffer; uInt8* _buffer;
int _selection; int _selection;
int _openTime; int _openTime;
public: public:
PopUpDialog(PopUpWidget* boss, int clickX, int clickY); PopUpDialog(PopUpWidget* boss, int clickX, int clickY);
@ -106,9 +106,9 @@ class PopUpDialog : public Dialog
void drawDialog(); void drawDialog();
void handleMouseDown(int x, int y, int button, int clickCount); void handleMouseDown(int x, int y, int button, int clickCount);
void handleMouseWheel(int x, int y, int direction); // Scroll through entries with scroll wheel void handleMouseWheel(int x, int y, int direction); // Scroll through entries with scroll wheel
void handleMouseMoved(int x, int y, int button); // Redraw selections depending on mouse position void handleMouseMoved(int x, int y, int button); // Redraw selections depending on mouse position
void handleKeyDown(int ascii, int keycode, int modifiers); // Scroll through entries with arrow keys etc. void handleKeyDown(int ascii, int keycode, int modifiers); // Scroll through entries with arrow keys etc.
protected: protected:
void drawMenuEntry(int entry, bool hilite); void drawMenuEntry(int entry, bool hilite);

4
stella/src/macosx/OSystemMACOSX.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of // See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
// //
// $Id: OSystemMACOSX.cxx,v 1.4 2005-06-16 01:11:29 stephena Exp $ // $Id: OSystemMACOSX.cxx,v 1.5 2005-09-11 22:55:51 stephena Exp $
//============================================================================ //============================================================================
#include <cstdlib> #include <cstdlib>
@ -73,10 +73,12 @@ OSystemMACOSX::OSystemMACOSX()
string statedir = basedir + "/state"; string statedir = basedir + "/state";
setStateDir(statedir); setStateDir(statedir);
// FIXME - use setPropertiesDir() method
string userPropertiesFile = basedir + "/stella.pro"; string userPropertiesFile = basedir + "/stella.pro";
strcat(parentdir,"/../../../stella.pro"); strcat(parentdir,"/../../../stella.pro");
string systemPropertiesFile = parentdir; string systemPropertiesFile = parentdir;
setPropertiesFiles(userPropertiesFile, systemPropertiesFile); setPropertiesFiles(userPropertiesFile, systemPropertiesFile);
////
string userConfigFile = basedir + "/stellarc"; string userConfigFile = basedir + "/stellarc";
string systemConfigFile = "/etc/stellarc"; string systemConfigFile = "/etc/stellarc";

8
stella/src/unix/OSystemUNIX.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of // See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
// //
// $Id: OSystemUNIX.cxx,v 1.12 2005-06-16 01:11:29 stephena Exp $ // $Id: OSystemUNIX.cxx,v 1.13 2005-09-11 22:55:51 stephena Exp $
//============================================================================ //============================================================================
#include <cstdlib> #include <cstdlib>
@ -39,7 +39,7 @@
setBaseDir() setBaseDir()
setStateDir() setStateDir()
setPropertiesFiles() setPropertiesDir()
setConfigFiles() setConfigFiles()
setCacheFile() setCacheFile()
@ -60,9 +60,7 @@ OSystemUNIX::OSystemUNIX()
string statedir = basedir + "/state"; string statedir = basedir + "/state";
setStateDir(statedir); setStateDir(statedir);
string userPropertiesFile = basedir + "/stella.pro"; setPropertiesDir(basedir, "/etc");
string systemPropertiesFile = "/etc/stella.pro";
setPropertiesFiles(userPropertiesFile, systemPropertiesFile);
string userConfigFile = basedir + "/stellarc"; string userConfigFile = basedir + "/stellarc";
string systemConfigFile = "/etc/stellarc"; string systemConfigFile = "/etc/stellarc";

7
stella/src/win32/OSystemWin32.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of // See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
// //
// $Id: OSystemWin32.cxx,v 1.6 2005-09-11 15:44:51 stephena Exp $ // $Id: OSystemWin32.cxx,v 1.7 2005-09-11 22:55:51 stephena Exp $
//============================================================================ //============================================================================
#include <sstream> #include <sstream>
@ -29,7 +29,7 @@
setBaseDir() setBaseDir()
setStateDir() setStateDir()
setPropertiesFiles() setPropertiesDir()
setConfigFiles() setConfigFiles()
setCacheFile() setCacheFile()
@ -55,8 +55,7 @@ OSystemWin32::OSystemWin32()
string stateDir = basedir + "state\\"; string stateDir = basedir + "state\\";
setStateDir(stateDir); setStateDir(stateDir);
string propsFile = basedir + "stella.pro"; setPropertiesDir(basedir, basedir);
setPropertiesFiles(propsFile, propsFile); // Input and output are the same
string configFile = basedir + "stella.ini"; string configFile = basedir + "stella.ini";
setConfigFiles(configFile, configFile); // Input and output are the same setConfigFiles(configFile, configFile); // Input and output are the same