Some last minute updates and doc changes for 2.4 release.

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1352 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba

stella/docs/index.html

@@ -10,7 +10,7 @@
 	<br><br>
 	<center><h2><b>A multi-platform Atari 2600 VCS emulator</b></h2></center>
 
-	<center><h4><b>Release 2.3.5</b></h4></center>
+	<center><h4><b>Release 2.4</b></h4></center>
 	<br><br>
 
 	<center><h2><b>User's Guide</b></h2></center>
@@ -218,66 +218,11 @@
     Sega Dreamcast, Unix, and Windows.
 	</p>
 
-	<h2><b>New in Release 2.3.5</b></h2>
+	<h2><b>New in Release 2.4</b></h2>
 
 	<ul>
-<li>Greatly improved cartridge bankswitch type auto-detection.  Stella
-can now (mostly) autodetect cartridge types 'E0', 'E7', '3E', '3F' and
-Superchip carts.  Obviously, this autodetection is not infallible, but
-relies on patterns in the ROM data, and how it was compiled.  Because
-of the auto-detection types already supported, almost all bankswitch
-info was removed from internal ROM properties.  Set the ROM property
-"Cartridge.Type" to "Auto-detect" for this to take effect.</li>
 
-<li>Added auto-detection of display type (NTSC or PAL).  Currently, PAL60
-ROMs will be detected as NTSC.  This is almost 100% accurate, and fails
-in very few cases (for those that are mislabeled, the ROM properties
-can be set specifically).  Set the ROM property "Display.Format" to
-"Auto-detect" for this to take effect.</li>
 
-<li>Improved emulation timing when exiting one ROM and starting another.
-Previously, this could result in the second ROM having its sound start
-later than it should have.</li>
-
-<li>Removed pause functionality from the core, since it's been superceded
-by the other event states.  You can now enter one of the menus for a
-similar effect (options, command, debugger, etc).</li>
-
-<li>Added toggle for PAL color-loss emulation, which defaults to off.
-Previous versions of Stella always used color-loss emulation.
-Related to this, added 'colorloss' commandline argument.</li>
-
-<li>Added rudimentary support for configuring the UI palette ('uipalette'
-commandline argument) and ability to change the size of the launcher window
-('launchersize' commandline argument).  This will be expanded on in future
-releases.</li>
-
-<li>Reworked options menu so it's now accessible from the ROM launcher as
-well as while playing a ROM.</li>
-
-<li>Re-added ability to change the width and height of a Console.  Related to
-this, changing XStart/YStart/Width/Height dynamically no longer resets
-the ROM.</li>
-
-<li>Removed 'tiadefaults' commandline argument, since Stella will now default
-to using accurate positioning, and not use 'tweaks'.</li>
-
-<li>Joystick code now allows all 4 directions; 'Bumper Bash' now works
-correctly.</li>
-
-<li>Improved Keypad emulation; 'Alpha Beam with Ernie', 'Oscars Trash Race'
-and 'Magicard' now work correctly.</li>
-
-<li>Reworked GUI code, so that all dialog boxes are automatically centered.</li>
-
-<li>Added 'rominfo' commandline argument, which prints some detailed info for
-a ROM.</li>
-
-<li>For the OSX port; fixed crashes in OpenGL mode.</li>
-
-<li>For the GP2X port; some improvements to the sound code.</li>
-
-<li>For the GP2X port; added vertical centering of the TIA image (when possible).</li>
 	</ul>
 
 	<p>
@@ -312,7 +257,7 @@ a ROM.</li>
 		<li>Supports cartridges using UA Limited bank-switching scheme</li>
 		<li>Supports Supercharger single-load and multi-load games</li>
 		<li>Supports property file for setting the properties associated with games</li>
-		<li>Supports user specified frame rate</li>
+<!--		<li>Supports user specified frame rate</li> -->
 		<li>Supports the NTSC, PAL, PAL60 and SECAM television standards</li>
 		<li>Supports several "undocumented features" of the TIA graphics chip used by
 			some games</li>
@@ -339,7 +284,7 @@ a ROM.</li>
 	<ul>
 		<li>Enough RAM for the OS + 16MB RAM for the emulation; 32MB highly recommended</li>
 		<li>15 bit color minimum; 16 bit color graphics card highly recommended</li>
-		<li>SDL version 1.2.0 or greater, version 1.2.11 highly recommended</li>
+		<li>SDL version 1.2.10 or greater, latest version highly recommended</li>
 		<li>Latest version of the zlib library</li>
 		<li>Joysticks or gamepads are highly recommended</li>
 		<li>Mouse or Stelladaptor with real paddles required for paddle emulation</li>
@@ -355,7 +300,7 @@ a ROM.</li>
 		<li>GNU C++ compiler version 2.95 and the make utility are required for compiling
 			the Stella source code; GNU C++ compiler version 3.2.x/4.x or later is highly
 			recommended</li>
-		<li>x86 or PowerPC class machine required, in either 32 or 64-bit mode</li>
+		<li>x86 or PowerPC class machine, in either 32 or 64-bit mode</li>
 	</ul>
 
 	<p>
@@ -382,8 +327,6 @@ a ROM.</li>
 			source code</li>
 		<li>Pentium class machine required; OpenGL accelerated video card highly
 			recommended</li>
-		<li>SDL version 1.2.8 or greater (included in release versions) required for
-			Stelladaptor support</li>
 	</ul>
 
 
@@ -558,17 +501,14 @@ a ROM.</li>
 	<img src="graphics/launcher.png"></p>
 
 	<p>The ROM browser, snapshot, and external file settings may be changed by
-	clicking the 'Options / Files &amp; Snapshots' button:<br><br>
-	<img src="graphics/launcher_options_rom.png">&nbsp;&nbsp;
+	clicking the 'Options / Config Files' button:<br><br>
 	<img src="graphics/launcher_options_files.png"></p>
 
-	<p>Selecting a new path for an item is done by clicking the 'Path' button(s):<br><br>
+	<p>Selecting a new path for an item is done by clicking the appropriate button(s):<br><br>
 	<img src="graphics/rom_browser.png"></p>
 
-	<p>Once a ROM directory has been selected, clicking 'Reload' will update the
-	ROM listing (assuming you're not in 'rombrowse' mode).  You can start
-	emulation by selecting a ROM and pressing 'Enter' or clicking 'Play', or
-	double-clicking a ROM.</p>
+	<p>You can start emulation by selecting a ROM and pressing 'Enter' or
+	clicking 'Play', or double-clicking a ROM.</p>
 
 	<p>
 	<h2><b>Command Line</b></h2>
@@ -765,12 +705,6 @@ a ROM.</li>
 			<td>Set threshold for eliminating paddle jitter.</td>
 		</tr>
 
-		<tr>
-			<td><pre>-rombrowse &lt;1|0&gt;</pre></td>
-			<td>The ROM listing is treated as a filesystem, where one can traverse
-				folders.  As of Stella 2.3, this is the default browsing mode.</td>
-		</tr>
-
 		<tr>
 			<td><pre>-autoslot &lt;1|0&gt;</pre></td>
 			<td>Automatically switch to the next available save state slot after
@@ -811,7 +745,12 @@ a ROM.</li>
 		</tr>
 
 		<tr>
-			<td><pre>-statdir &lt;dir&gt;</pre></td>
+			<td><pre>-mwheel &lt;lines&gt;</pre></td>
+			<td>Set the number of lines a mousewheel will scroll in the UI.</td>
+		</tr>
+
+		<tr>
+			<td><pre>-statedir &lt;dir&gt;</pre></td>
 			<td>Set the directory in which to save state files.</td>
 		</tr>
 
@@ -848,13 +787,13 @@ a ROM.</li>
 		</tr>
 
 		<tr>
-			<td><pre>-break &lt;address&gt;</pre></td>
-			<td>Set a breakpoint at specified address.</td>
+			<td><pre>-debuggerres &lt;WxH&gt;</pre></td>
+			<td>Set the size of the debugger window.</td>
 		</tr>
 
 		<tr>
-			<td><pre>-debugheight &lt;number&gt;</pre></td>
-			<td>Set height of debugger in lines of text (currently not 100% working)</td>
+			<td><pre>-break &lt;address&gt;</pre></td>
+			<td>Set a breakpoint at specified address.</td>
 		</tr>
 
 		<tr>

stella/src/cheat/CheatCodeDialog.cxx

@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: CheatCodeDialog.cxx,v 1.14 2007-01-01 18:04:39 stephena Exp $
+// $Id: CheatCodeDialog.cxx,v 1.15 2007-08-17 16:12:50 stephena Exp $
 //
 //   Based on code from ScummVM - Scumm Interpreter
 //   Copyright (C) 2002-2004 The ScummVM project
@@ -70,7 +70,7 @@ CheatCodeDialog::CheatCodeDialog(OSystem* osystem, DialogContainer* parent,
   myCheatInput = new InputTextDialog(this, font, labels, 0, 0);
   myCheatInput->setTarget(this);
 
-  // Add OK and Cancel buttons  **** FIXME - coordinates
+  // Add OK and Cancel buttons
 #ifndef MAC_OSX
   b = addButton(font, _w - 2 * (kButtonWidth + 7), _h - 24, "OK", kOKCmd);
   wid.push_back(b);

stella/src/common/Version.hxx

@@ -13,13 +13,13 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: Version.hxx,v 1.26 2007-02-22 02:15:46 stephena Exp $
+// $Id: Version.hxx,v 1.27 2007-08-17 16:12:50 stephena Exp $
 //============================================================================
 
 #ifndef VERSION_HXX
 #define VERSION_HXX
 
-#define STELLA_BASE_VERSION "2.3.6cvs"
+#define STELLA_BASE_VERSION "2.4"
 
 #ifdef NIGHTLY_BUILD
 #define STELLA_VERSION STELLA_BASE_VERSION "pre-" NIGHTLY_BUILD

stella/src/debugger/DebuggerParser.cxx

@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: DebuggerParser.cxx,v 1.100 2007-08-15 17:43:51 stephena Exp $
+// $Id: DebuggerParser.cxx,v 1.101 2007-08-17 16:12:50 stephena Exp $
 //============================================================================
 
 #include <fstream>
@@ -1095,16 +1095,6 @@ void DebuggerParser::executeRam()
     commandResult = debugger->setRAM(args);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-// "reload"
-void DebuggerParser::executeReload()
-{
-  debugger->quit();
-  debugger->getOSystem()->createConsole();
-  debugger->start();
-  commandResult = "_EXIT_DEBUGGER";  // Set PromptWidget for more info
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 // "reset"
 void DebuggerParser::executeReset()
@@ -1658,15 +1648,6 @@ DebuggerParser::Command DebuggerParser::commands[kNumCommands] = {
     &DebuggerParser::executeRam
   },
 
-  {
-    "reload",
-    "Reload ROM and symbol file",
-    false,
-    true,
-    { kARG_END_ARGS },
-    &DebuggerParser::executeReload
-  },
-
   {
     "reset",
     "Reset 6507 to init vector (does not reset TIA, RIOT)",

stella/src/debugger/DebuggerParser.hxx

@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: DebuggerParser.hxx,v 1.50 2007-08-15 17:43:51 stephena Exp $
+// $Id: DebuggerParser.hxx,v 1.51 2007-08-17 16:12:50 stephena Exp $
 //============================================================================
 
 #ifndef DEBUGGER_PARSER_HXX
@@ -81,7 +81,7 @@ class DebuggerParser
 
   private:
     enum {
-      kNumCommands   = 58,
+      kNumCommands   = 57,
       kMAX_ARG_TYPES = 10 // TODO: put in separate header file Command.hxx
     };
 
@@ -168,7 +168,6 @@ class DebuggerParser
     void executePc();
     void executePrint();
     void executeRam();  // also implements 'poke' command
-    void executeReload();
     void executeReset();
     void executeRiot();
     void executeRom();

stella/src/debugger/gui/RamWidget.cxx

@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: RamWidget.cxx,v 1.11 2007-01-01 18:04:44 stephena Exp $
+// $Id: RamWidget.cxx,v 1.12 2007-08-17 16:12:50 stephena Exp $
 //
 //   Based on code from ScummVM - Scumm Interpreter
 //   Copyright (C) 2002-2004 The ScummVM project
@@ -32,16 +32,6 @@
 #include "RamDebug.hxx"
 #include "RamWidget.hxx"
 
-enum {
-  kUndoCmd     = 'RWud',
-  kRevertCmd   = 'RWrv',
-  kSearchCmd   = 'RWse',
-  kCmpCmd      = 'RWcp',
-  kRestartCmd  = 'RWrs',
-  kSValEntered = 'RWsv',
-  kCValEntered = 'RWcv'
-};
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 RamWidget::RamWidget(GuiObject* boss, const GUI::Font& font, int x, int y)
   : Widget(boss, font, x, y, 16, 16),

stella/src/debugger/gui/RamWidget.hxx

@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: RamWidget.hxx,v 1.3 2007-01-01 18:04:44 stephena Exp $
+// $Id: RamWidget.hxx,v 1.4 2007-08-17 16:12:50 stephena Exp $
 //
 //   Based on code from ScummVM - Scumm Interpreter
 //   Copyright (C) 2002-2004 The ScummVM project
@@ -53,6 +53,16 @@ class RamWidget : public Widget, public CommandSender
     void doRestart();
 
   private:
+    enum {
+      kUndoCmd     = 'RWud',
+      kRevertCmd   = 'RWrv',
+      kSearchCmd   = 'RWse',
+      kCmpCmd      = 'RWcp',
+      kRestartCmd  = 'RWrs',
+      kSValEntered = 'RWsv',
+      kCValEntered = 'RWcv'
+    };
+
     int myUndoAddress;
     int myUndoValue;
 

stella/src/debugger/gui/RomWidget.cxx

@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: RomWidget.cxx,v 1.21 2007-08-12 23:05:12 stephena Exp $
+// $Id: RomWidget.cxx,v 1.22 2007-08-17 16:12:50 stephena Exp $
 //
 //   Based on code from ScummVM - Scumm Interpreter
 //   Copyright (C) 2002-2004 The ScummVM project
@@ -59,7 +59,7 @@ RomWidget::RomWidget(GuiObject* boss, const GUI::Font& font, int x, int y)
 
   xpos += t->getWidth() + 10;
   myBank = new DataGridWidget(boss, font, xpos, ypos-2,
-                              1, 1, 2, 2, kBASE_16_4);
+                              1, 1, 3, 8, kBASE_10);
   myBank->setTarget(this);
   myBank->setRange(0, instance()->debugger().bankCount());
   if(instance()->debugger().bankCount() <= 1)
@@ -75,7 +75,7 @@ RomWidget::RomWidget(GuiObject* boss, const GUI::Font& font, int x, int y)
 
   xpos += t->getWidth() + 10;
   myBankCount = new EditTextWidget(boss, font, xpos, ypos-2,
-                                   20, font.getLineHeight(), "");
+                                   30, font.getLineHeight(), "");
   myBankCount->setEditable(false);
 
   // Create rom listing
@@ -210,8 +210,7 @@ void RomWidget::loadConfig()
   myBank->setList(alist, vlist, changed);
 
   // Indicate total number of banks
-  int bankCount = dbg.bankCount();
-  myBankCount->setEditString(dbg.valueToString(bankCount));
+  myBankCount->setEditString(dbg.valueToString(dbg.bankCount(), kBASE_10));
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

stella/src/emucore/OSystem.cxx

@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: OSystem.cxx,v 1.107 2007-08-15 19:14:49 stephena Exp $
+// $Id: OSystem.cxx,v 1.108 2007-08-17 16:12:50 stephena Exp $
 //============================================================================
 
 #include <cassert>
@@ -160,7 +160,7 @@ bool OSystem::create()
 
   // Create fonts to draw text
   myFont         = new GUI::Font(GUI::stellaDesc);
-  myLauncherFont = new GUI::Font(GUI::stellaDesc);  // FIXME
+  myLauncherFont = new GUI::Font(GUI::stellaDesc);
   myConsoleFont  = new GUI::Font(GUI::consoleDesc);
 
   // Create the event handler for the system

stella/src/gui/InputTextDialog.cxx

@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: InputTextDialog.cxx,v 1.17 2007-08-06 20:16:51 stephena Exp $
+// $Id: InputTextDialog.cxx,v 1.18 2007-08-17 16:12:50 stephena Exp $
 //
 //   Based on code from ScummVM - Scumm Interpreter
 //   Copyright (C) 2002-2004 The ScummVM project
@@ -39,8 +39,8 @@ InputTextDialog::InputTextDialog(GuiObject* boss, const GUI::Font& font,
   const int fontWidth  = font.getMaxCharWidth(),
             fontHeight = font.getFontHeight(),
             lineHeight = font.getLineHeight(),
-            bwidth  = font.getStringWidth(" Cancel "),
-            bheight = font.getLineHeight() + 2;
+            bwidth  = font.getStringWidth("  Cancel  "),
+            bheight = font.getLineHeight() + 4;
   unsigned int xpos, ypos, i, lwidth = 0, maxIdx = 0;
   WidgetArray wid;