Stella - Atari 2600 Emulator

Update of /cvsroot/stella/stella/src/gui
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv22959/src/gui

Modified Files:
	OptionsDialog.cxx PopUpWidget.cxx PopUpWidget.hxx 
	VideoDialog.cxx VideoDialog.hxx 
Log Message:
Oops, forgot to add UI objects to change fullscreen resolution.


Index: OptionsDialog.cxx
===================================================================
RCS file: /cvsroot/stella/stella/src/gui/OptionsDialog.cxx,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** OptionsDialog.cxx	20 Jun 2007 16:33:23 -0000	1.52
--- OptionsDialog.cxx	21 Jun 2007 12:27:00 -0000	1.53
***************
*** 108,112 ****
  
    // Now create all the dialogs attached to each menu button
!   w = 230; h = 150;
    myVideoDialog = new VideoDialog(myOSystem, parent, font, x, y, w, h);
  
--- 108,112 ----
  
    // Now create all the dialogs attached to each menu button
!   w = 230; h = 165;
    myVideoDialog = new VideoDialog(myOSystem, parent, font, x, y, w, h);
  

Index: PopUpWidget.cxx
===================================================================
RCS file: /cvsroot/stella/stella/src/gui/PopUpWidget.cxx,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** PopUpWidget.cxx	1 Jan 2007 18:04:54 -0000	1.32
--- PopUpWidget.cxx	21 Jun 2007 12:27:00 -0000	1.33
***************
*** 511,514 ****
--- 511,527 ----
  
  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ void PopUpWidget::setSelectedName(const string& name)
+ {
+   for(unsigned int item = 0; item < _entries.size(); ++item)
+   {
+     if(_entries[item].name == name)
+     {
+       setSelected(item);
+       return;
+     }
+   }
+ }
+ 
+ // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  void PopUpWidget::setSelectedTag(int tag)
  {
***************
*** 524,527 ****
--- 537,546 ----
  
  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ void PopUpWidget::setSelectedMax()
+ {
+   setSelected(_entries.size() - 1);
+ }
+ 
+ // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  void PopUpWidget::drawWidget(bool hilite)
  {

Index: PopUpWidget.hxx
===================================================================
RCS file: /cvsroot/stella/stella/src/gui/PopUpWidget.hxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** PopUpWidget.hxx	1 Jan 2007 18:04:54 -0000	1.17
--- PopUpWidget.hxx	21 Jun 2007 12:27:00 -0000	1.18
***************
*** 73,79 ****
--- 73,85 ----
      void setSelected(int item);
  	
+     /** Select the first entry matching the given name. */
+     void setSelectedName(const string& name);
+ 
      /** Select the first entry matching the given tag. */
      void setSelectedTag(int tag);
  
+     /** Select the highest/last entry in the internal list. */
+     void setSelectedMax();
+ 
      int getSelected() const
        { return _selectedItem; }

Index: VideoDialog.cxx
===================================================================
RCS file: /cvsroot/stella/stella/src/gui/VideoDialog.cxx,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** VideoDialog.cxx	20 Jun 2007 16:33:23 -0000	1.43
--- VideoDialog.cxx	21 Jun 2007 12:27:00 -0000	1.44
***************
*** 87,90 ****
--- 87,98 ----
    ypos += lineHeight + 4;
  
+   // Fullscreen resolution
+   myFSResPopup = new PopUpWidget(this, font, xpos, ypos, pwidth,
+                                  lineHeight, "FS Res: ", lwidth);
+   for(uInt32 i = 0; i < instance()->supportedResolutions().size(); ++i)
+     myFSResPopup->appendEntry(instance()->supportedResolutions()[i].name, i+1);
+   wid.push_back(myFSResPopup);
+   ypos += lineHeight + 4;
+ 
    // Available UI zoom levels
    myUIZoomSlider = new SliderWidget(this, font, xpos, ypos, pwidth, lineHeight,
***************
*** 230,233 ****
--- 238,247 ----
    else if(s == "user")     myPalettePopup->setSelectedTag(4);
  
+   // Fullscreen resolution
+   s = instance()->settings().getString("fullres");
+   myFSResPopup->setSelectedName(s);
+   if(myFSResPopup->getSelectedTag() < 0)
+     myFSResPopup->setSelectedMax();
+ 
    // UI zoom level
    s = instance()->settings().getString("zoom_ui");
***************
*** 294,303 ****
    instance()->settings().setString("gl_fsmax", s);
  
- /*
-   // Aspect ratio
-   s = myAspectRatioLabel->getLabel();
-   instance()->settings().setString("gl_aspect", s);
- */
- 
    // Palette
    i = myPalettePopup->getSelectedTag();
--- 308,311 ----
***************
*** 308,311 ****
--- 316,323 ----
    instance()->settings().setString("palette", s);
  
+   // Fullscreen resolution
+   s = myFSResPopup->getSelectedString();
+   instance()->settings().setString("fullres", s);
+ 
    // UI Scaler
    s = myUIZoomLabel->getLabel();
***************
*** 350,353 ****
--- 362,366 ----
    myFSStretchPopup->setSelectedTag(1);
    myPalettePopup->setSelectedTag(1);
+   myFSResPopup->setSelectedMax();
    myUIZoomSlider->setValue(2);
    myUIZoomLabel->setLabel("2");
***************
*** 387,390 ****
--- 400,405 ----
  {
  #ifdef WINDOWED_SUPPORT
+   myFSResPopup->setEnabled(enable);
+ 
    myUIZoomSlider->setEnabled(!enable);
    myUIZoomLabel->setEnabled(!enable);

Index: VideoDialog.hxx
===================================================================
RCS file: /cvsroot/stella/stella/src/gui/VideoDialog.hxx,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** VideoDialog.hxx	20 Jun 2007 16:33:23 -0000	1.20
--- VideoDialog.hxx	21 Jun 2007 12:27:00 -0000	1.21
***************
*** 55,58 ****
--- 55,59 ----
      PopUpWidget*      myFSStretchPopup;
      PopUpWidget*      myPalettePopup;
+     PopUpWidget*      myFSResPopup;
      SliderWidget*     myUIZoomSlider;
      StaticTextWidget* myUIZoomLabel;

Update of /cvsroot/stella/stella/src/emucore
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv22959/src/emucore

Modified Files:
	M6532.cxx 
Log Message:
Oops, forgot to add UI objects to change fullscreen resolution.


Index: M6532.cxx
===================================================================
RCS file: /cvsroot/stella/stella/src/emucore/M6532.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** M6532.cxx	1 Jan 2007 18:04:48 -0000	1.9
--- M6532.cxx	21 Jun 2007 12:27:00 -0000	1.10
***************
*** 239,242 ****
--- 239,243 ----
    {
      myDDRA = value;
+ #ifdef ATARIVOX_SUPPORT
  	 /*
      20060608 bkw: Not the most elegant thing in the world...
***************
*** 263,266 ****
--- 264,268 ----
        c.write(Controller::Four, !(value & 0x08));
  	 }
+ #endif
    }
    else if((addr & 0x07) == 0x02)    // Port B I/O Register (Console switches)

Update of /cvsroot/stella/stella/src/debugger/gui
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv22959/src/debugger/gui

Modified Files:
	DebuggerDialog.cxx PromptWidget.cxx 
Log Message:
Oops, forgot to add UI objects to change fullscreen resolution.


Index: DebuggerDialog.cxx
===================================================================
RCS file: /cvsroot/stella/stella/src/debugger/gui/DebuggerDialog.cxx,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** DebuggerDialog.cxx	1 Jan 2007 18:04:43 -0000	1.18
--- DebuggerDialog.cxx	21 Jun 2007 12:27:00 -0000	1.19
***************
*** 294,297 ****
  void DebuggerDialog::doExit()
  {
!   instance()->debugger().quit();
  }
--- 294,297 ----
  void DebuggerDialog::doExit()
  {
!   instance()->debugger().parser()->run("run");
  }

Index: PromptWidget.cxx
===================================================================
RCS file: /cvsroot/stella/stella/src/debugger/gui/PromptWidget.cxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** PromptWidget.cxx	1 Jan 2007 18:04:44 -0000	1.15
--- PromptWidget.cxx	21 Jun 2007 12:27:00 -0000	1.16
***************
*** 167,171 ****
    bool handled = true;
    bool dirty = false;
! 	
    switch(ascii)
    {
--- 167,171 ----
    bool handled = true;
    bool dirty = false;
!   
    switch(ascii)
    {
***************
*** 189,193 ****
  
          // Pass the command to the debugger, and print the result
!         print( instance()->debugger().run(command) + "\n");
        }
  
--- 189,194 ----
  
          // Pass the command to the debugger, and print the result
!         string result = instance()->debugger().run(command) + "\n";
!         print( result );
        }
  
***************
*** 203,207 ****
  
        if(_currentPos <= _promptStartPos)
!     	break;
  
        scrollToCurrent();
--- 204,208 ----
  
        if(_currentPos <= _promptStartPos)
!         break;
  
        scrollToCurrent();
***************
*** 212,221 ****
  
        char *str = new char[len + 1];
!       for (i = 0; i < len; i++) {
!     	str[i] = buffer(_promptStartPos + i) & 0x7f;
!     	if(strchr("*@<> ", str[i]) != NULL ) {
!     	  lastDelimPos = i;
!     	  delimiter = str[i];
!     	}
        }
        str[len] = '\0';
--- 213,224 ----
  
        char *str = new char[len + 1];
!       for (i = 0; i < len; i++)
!       {
!         str[i] = buffer(_promptStartPos + i) & 0x7f;
!         if(strchr("*@<> ", str[i]) != NULL )
!         {
!           lastDelimPos = i;
!           delimiter = str[i];
!         }
        }
        str[len] = '\0';
***************
*** 225,282 ****
        int possibilities;
  
!       if(lastDelimPos < 0) {
!     	// no delimiters, do command completion:
!     	DebuggerParser *parser = instance()->debugger().parser();
!     	possibilities = parser->countCompletions(str);
  
!     	if(possibilities < 1) {
!     	  delete[] str;
!     	  break;
!     	}
  
!     	completionList = parser->getCompletions();
!     	prefix = parser->getCompletionPrefix();
! 	    } else {
!     	// we got a delimiter, so this must be a label:
!     	EquateList *equates = instance()->debugger().equates();
!     	possibilities = equates->countCompletions(str + lastDelimPos + 1);
  
!     	if(possibilities < 1) {
!     	  delete[] str;
!     	  break;
!     	}
  
! 	    	completionList = equates->getCompletions();
! 	    	prefix = equates->getCompletionPrefix();
! 	    }
  
!       if(possibilities == 1) {
!     	// add to buffer as though user typed it (plus a space)
!     	_currentPos = _promptStartPos + lastDelimPos + 1;
!     	while(*completionList != '\0') {
!     	  putcharIntern(*completionList++);
!     	}
!     	putcharIntern(' ');
!     	_promptEndPos = _currentPos;
!       } else {
!     	nextLine();
!     	// add to buffer as-is, then add PROMPT plus whatever we have so far
!     	_currentPos = _promptStartPos + lastDelimPos + 1;
  
!     	print("\n");
!     	print(completionList);
!     	print("\n");
!     	print(PROMPT);
  
!     	_promptStartPos = _currentPos;
  
!     	for(i=0; i<lastDelimPos; i++)
!     	  putcharIntern(str[i]);
  
!     	if(lastDelimPos > 0)
!     	  putcharIntern(delimiter);
  
!     	print(prefix);
!     	_promptEndPos = _currentPos;
        }
        delete[] str;
--- 228,291 ----
        int possibilities;
  
!       if(lastDelimPos < 0)
!       {
!         // no delimiters, do command completion:
!         DebuggerParser *parser = instance()->debugger().parser();
!         possibilities = parser->countCompletions(str);
  
!         if(possibilities < 1) {
!           delete[] str;
!           break;
!         }
  
!         completionList = parser->getCompletions();
!         prefix = parser->getCompletionPrefix();
!       }
!       else
!       {
!         // we got a delimiter, so this must be a label:
!         EquateList *equates = instance()->debugger().equates();
!         possibilities = equates->countCompletions(str + lastDelimPos + 1);
  
!         if(possibilities < 1) {
!           delete[] str;
!           break;
!         }
  
!         completionList = equates->getCompletions();
!         prefix = equates->getCompletionPrefix();
!       }
  
!       if(possibilities == 1)
!       {
!         // add to buffer as though user typed it (plus a space)
!         _currentPos = _promptStartPos + lastDelimPos + 1;
!         while(*completionList != '\0')
!           putcharIntern(*completionList++);
  
!         putcharIntern(' ');
!         _promptEndPos = _currentPos;
!       }
!       else
!       {
!         nextLine();
!         // add to buffer as-is, then add PROMPT plus whatever we have so far
!         _currentPos = _promptStartPos + lastDelimPos + 1;
  
!         print("\n");
!         print(completionList);
!         print("\n");
!         print(PROMPT);
  
!         _promptStartPos = _currentPos;
  
!         for(i=0; i<lastDelimPos; i++)
!           putcharIntern(str[i]);
  
!         if(lastDelimPos > 0)
!           putcharIntern(delimiter);
! 
!         print(prefix);
!         _promptEndPos = _currentPos;
        }
        delete[] str;
***************
*** 640,644 ****
  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  int PromptWidget::compareHistory(const char *histLine) {
! 	return 1;
  }
  
--- 649,653 ----
  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  int PromptWidget::compareHistory(const char *histLine) {
!   return 1;
  }

Update of /cvsroot/stella/stella/src/win32
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv13284/src/win32

Modified Files:
	OSystemWin32.cxx OSystemWin32.hxx Stella.vcproj 
Log Message:
Fixes to the Win32 port for the latest video mode revamping.


Index: OSystemWin32.cxx
===================================================================
RCS file: /cvsroot/stella/stella/src/win32/OSystemWin32.cxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** OSystemWin32.cxx	1 Jan 2007 18:04:56 -0000	1.17
--- OSystemWin32.cxx	20 Jun 2007 20:36:28 -0000	1.18
***************
*** 68,76 ****
    return (uInt32) SDL_GetTicks() * 1000;
  }
- 
- // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- void OSystemWin32::getScreenDimensions(int& width, int& height)
- {
-   width  = (int) GetSystemMetrics(SM_CXSCREEN);
-   height = (int) GetSystemMetrics(SM_CYSCREEN);
- }
--- 68,69 ----

Index: OSystemWin32.hxx
===================================================================
RCS file: /cvsroot/stella/stella/src/win32/OSystemWin32.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** OSystemWin32.hxx	1 Jan 2007 18:04:56 -0000	1.9
--- OSystemWin32.hxx	20 Jun 2007 20:36:28 -0000	1.10
***************
*** 48,56 ****
      */
      virtual uInt32 getTicks();
- 
-     /**
-       This method queries the dimensions of the screen for this hardware.
-     */
-     virtual void getScreenDimensions(int& width, int& height);
  };
  
--- 48,51 ----

Index: Stella.vcproj
===================================================================
RCS file: /cvsroot/stella/stella/src/win32/Stella.vcproj,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** Stella.vcproj	14 Jan 2007 16:42:38 -0000	1.27
--- Stella.vcproj	20 Jun 2007 20:36:28 -0000	1.28
***************
*** 22,26 ****
  				Optimization="0"
  				AdditionalIncludeDirectories="..\yacc;..\debugger;..\gui;..\emucore\m6502\src\bspf\src;..\emucore\m6502\src;..\emucore;..\common;..\win32;..\debugger\gui;..\cheat"
! 				PreprocessorDefinitions="BSPF_WIN32;WIN32;_DEBUG;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;DISPLAY_OPENGL;SOUND_SUPPORT;CHEATCODE_SUPPORT"
  				MinimalRebuild="TRUE"
  				BasicRuntimeChecks="3"
--- 22,26 ----
  				Optimization="0"
  				AdditionalIncludeDirectories="..\yacc;..\debugger;..\gui;..\emucore\m6502\src\bspf\src;..\emucore\m6502\src;..\emucore;..\common;..\win32;..\debugger\gui;..\cheat"
! 				PreprocessorDefinitions="BSPF_WIN32;WIN32;_DEBUG;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;DISPLAY_OPENGL;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT"
  				MinimalRebuild="TRUE"
  				BasicRuntimeChecks="3"
***************
*** 74,78 ****
  				Name="VCCLCompilerTool"
  				AdditionalIncludeDirectories="..\yacc;..\emucore\m6502\src\bspf\src;..\emucore\m6502\src;..\emucore;..\common;..\gui;..\debugger\gui;..\debugger;..\win32;..\cheat"
! 				PreprocessorDefinitions="BSPF_WIN32;WIN32;NDEBUG;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;DISPLAY_OPENGL;SOUND_SUPPORT;CHEATCODE_SUPPORT"
  				RuntimeLibrary="2"
  				UsePrecompiledHeader="0"
--- 74,78 ----
  				Name="VCCLCompilerTool"
  				AdditionalIncludeDirectories="..\yacc;..\emucore\m6502\src\bspf\src;..\emucore\m6502\src;..\emucore;..\common;..\gui;..\debugger\gui;..\debugger;..\win32;..\cheat"
! 				PreprocessorDefinitions="BSPF_WIN32;WIN32;NDEBUG;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;DISPLAY_OPENGL;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT"
  				RuntimeLibrary="2"
  				UsePrecompiledHeader="0"

Update of /cvsroot/stella/stella/src/emucore
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv13284/src/emucore

Modified Files:
	Settings.cxx 
Log Message:
Fixes to the Win32 port for the latest video mode revamping.


Index: Settings.cxx
===================================================================
RCS file: /cvsroot/stella/stella/src/emucore/Settings.cxx,v
retrieving revision 1.117
retrieving revision 1.118
diff -C2 -d -r1.117 -r1.118
*** Settings.cxx	20 Jun 2007 16:33:22 -0000	1.117
--- Settings.cxx	20 Jun 2007 20:36:28 -0000	1.118
***************
*** 20,23 ****
--- 20,24 ----
  #include <sstream>
  #include <fstream>
+ #include <algorithm>
  
  #include "OSystem.hxx"

Update of /cvsroot/stella/stella/src/debugger
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv13284/src/debugger

Modified Files:
	Debugger.cxx 
Log Message:
Fixes to the Win32 port for the latest video mode revamping.


Index: Debugger.cxx
===================================================================
RCS file: /cvsroot/stella/stella/src/debugger/Debugger.cxx,v
retrieving revision 1.109
retrieving revision 1.110
diff -C2 -d -r1.109 -r1.110
*** Debugger.cxx	1 Jan 2007 18:04:41 -0000	1.109
--- Debugger.cxx	20 Jun 2007 20:36:28 -0000	1.110
***************
*** 157,161 ****
  
    string title = string("Stella ") + STELLA_VERSION + ": Debugger mode";
!   myOSystem->frameBuffer().initialize(title, r.width(), r.height(), false);
  }
  
--- 157,161 ----
  
    string title = string("Stella ") + STELLA_VERSION + ": Debugger mode";
!   myOSystem->frameBuffer().initialize(title, r.width(), r.height());
  }

Update of /cvsroot/stella/stella/src/tools
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv13346/src/tools

Added Files:
	check-sig.cxx 
Log Message:
Added 'WINDOWED_SUPPORT' compile-time argument, which can be used for
those systems which don't actually have a windowing environment.  When
this is set, toggling from fullscreen will not be possible, and certain
window-related UI functions will not be accessible.

Completely revamped video subsystem.  Windowed and fullscreen modes are
now dealt with separately.  Windows can be zoomed using the 'zoom_ui'
and 'zoom_tia' arguments.  Fullscreen modes are now set by resolution,
not zoom, so you can specify to always use a certain fullscreen
resolution, and the images will be scaled appropriately.  This also
fixes the fullscreen issues on widescreen monitors; just select a
widescreen video mode, and the aspect ratio will always be correct.

Removed dirty-rect support for software rendering of the TIA image,
as it ended up being slower than just updating the entire image.
For those resolutions where it will start to slow down (1024x768 or
higher), one should be using OpenGL.

Fixed issue in Windows when returning from fullscreen mode made the
window constantly 'shrink' in size.  It was related to auto-detecting
the desktop resolution, which is really the job of SDL.  As such, all
further releases of Stella will require SDL 1.2.10, which includes
this auto-detection code internally.

Made ROM launcher resizable, configurable in sizes from 320x240
to 800x600.  Updated the UIDialog to change these quantities from the
UI (Stella will need to be restarted for it to take effect).

Removed aspect ratio support, since it was causing problems, and the
new fullscreen mode work has made it obsolete.  i *may* consider it
again in the future, if there's sufficient demand.

Added 'fullres' commandline argument, used to set the fullscreen
resolution.

Added 'launcherres' commandline argument, used to set the ROM
launcher resolution.  This replaces 'launchersize' argument, which
has been removed.

Changed 'scale_ui' and 'scale_tia' to 'zoom_ui' and 'zoom_tia',
respectively.  Their function remains the same.

Changed meaning of 'gl_fsmax' argument to specify what modes to use
fullscreen OpenGL scaling (previously, this was a boolean, and
didn't consider different modes).



--- NEW FILE: check-sig.cxx ---
#include <iostream>
#include <iomanip>
#include <fstream>
#include <sstream>
#include <cstring>

using namespace std;

typedef unsigned char uInt8;
typedef unsigned int uInt32;

// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
int searchForBytes(const uInt8* image, uInt32 imagesize,
                   const uInt8* signature, uInt32 sigsize)
{
  uInt32 count = 0;
  for(uInt32 i = 0; i < imagesize - sigsize; ++i)
  {
    uInt32 matches = 0;
    for(uInt32 j = 0; j < sigsize; ++j)
    {
      if(image[i+j] == signature[j])
        ++matches;
      else
        break;
    }
    if(matches == sigsize)
      ++count;
  }

  return count;
}

// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
int main(int ac, char* av[])
{
	if(ac != 3)
	{
		cout << "usage: " << av[0] << " <filename> <hex pattern>\n";
		exit(0);
	}
  
    ifstream in(av[1], ios_base::binary);
	in.seekg(0, ios::end);
	int i_size = (int) in.tellg();
	in.seekg(0, ios::beg);

	uInt8* image = new uInt8[i_size];
    in.read((char*)(image), i_size);
    in.close();

	int s_size = 0;
	uInt8* sig = new uInt8[strlen(av[2])/2];
	istringstream buf(av[2]);

	uInt32 c;
	while(buf >> hex >> c)
	{
		sig[s_size++] = (uInt8)c;
//		cerr << "character = " << hex << (int)sig[s_size-1] << endl;
	}
//	cerr << "sig size = " << hex << s_size << endl;

	int result = searchForBytes(image, i_size, sig, s_size);
	if(result > 0)
		cout << setw(3) << result << " hits:  \'" << av[2] << "\' - \"" << av[1] << "\"" << endl;

	delete[] image;
	delete[] sig;

	return 0;
}

Update of /cvsroot/stella/stella/src/gui
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv13346/src/gui

Modified Files:
	Launcher.cxx Launcher.hxx OptionsDialog.cxx UIDialog.cxx 
	UIDialog.hxx VideoDialog.cxx VideoDialog.hxx Widget.cxx 
	Widget.hxx 
Log Message:
Added 'WINDOWED_SUPPORT' compile-time argument, which can be used for
those systems which don't actually have a windowing environment.  When
this is set, toggling from fullscreen will not be possible, and certain
window-related UI functions will not be accessible.

Completely revamped video subsystem.  Windowed and fullscreen modes are
now dealt with separately.  Windows can be zoomed using the 'zoom_ui'
and 'zoom_tia' arguments.  Fullscreen modes are now set by resolution,
not zoom, so you can specify to always use a certain fullscreen
resolution, and the images will be scaled appropriately.  This also
fixes the fullscreen issues on widescreen monitors; just select a
widescreen video mode, and the aspect ratio will always be correct.

Removed dirty-rect support for software rendering of the TIA image,
as it ended up being slower than just updating the entire image.
For those resolutions where it will start to slow down (1024x768 or
higher), one should be using OpenGL.

Fixed issue in Windows when returning from fullscreen mode made the
window constantly 'shrink' in size.  It was related to auto-detecting
the desktop resolution, which is really the job of SDL.  As such, all
further releases of Stella will require SDL 1.2.10, which includes
this auto-detection code internally.

Made ROM launcher resizable, configurable in sizes from 320x240
to 800x600.  Updated the UIDialog to change these quantities from the
UI (Stella will need to be restarted for it to take effect).

Removed aspect ratio support, since it was causing problems, and the
new fullscreen mode work has made it obsolete.  i *may* consider it
again in the future, if there's sufficient demand.

Added 'fullres' commandline argument, used to set the fullscreen
resolution.

Added 'launcherres' commandline argument, used to set the ROM
launcher resolution.  This replaces 'launchersize' argument, which
has been removed.

Changed 'scale_ui' and 'scale_tia' to 'zoom_ui' and 'zoom_tia',
respectively.  Their function remains the same.

Changed meaning of 'gl_fsmax' argument to specify what modes to use
fullscreen OpenGL scaling (previously, this was a boolean, and
didn't consider different modes).



Index: Launcher.cxx
===================================================================
RCS file: /cvsroot/stella/stella/src/gui/Launcher.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Launcher.cxx	19 Jan 2007 21:53:27 -0000	1.14
--- Launcher.cxx	20 Jun 2007 16:33:23 -0000	1.15
***************
*** 17,20 ****
--- 17,22 ----
  //============================================================================
  
+ #include <sstream>
+ 
  #include "LauncherDialog.hxx"
  #include "Version.hxx"
***************
*** 31,56 ****
      myHeight(240)
  {
!   int size = myOSystem->settings().getInt("launchersize");
!   switch(size)
!   {
!     case 1:
!       myWidth  = 320;
!       myHeight = 240;
!       break;
!     case 2:
!       myWidth  = 400;
!       myHeight = 300;
!       break;
!     case 3:
!       myWidth  = 512;
!       myHeight = 384;
!       break;
!   }
  
    // Error check the resolution
!   int w, h;
!   osystem->getScreenDimensions(w, h);
!   if(myWidth > w) myWidth = w;
!   if(myHeight > h) myHeight = h;
  
    myBaseDialog = new LauncherDialog(myOSystem, this, 0, 0, myWidth, myHeight);
--- 33,46 ----
      myHeight(240)
  {
!   int w, h;
!   myOSystem->settings().getSize("launcherres", w, h);
!   myWidth = w >= 0 ? w : 0;
!   myHeight = h >= 0 ? h : 0;
  
    // Error check the resolution
!   if(myWidth < 320) myWidth = 320;
!   if(myWidth > osystem->desktopWidth()) myWidth = osystem->desktopWidth();
!   if(myHeight < 240) myHeight = 240;
!   if(myHeight > osystem->desktopHeight()) myHeight = osystem->desktopHeight();
  
    myBaseDialog = new LauncherDialog(myOSystem, this, 0, 0, myWidth, myHeight);
***************
*** 66,69 ****
  {
    string title = string("Stella ") + STELLA_VERSION;
!   myOSystem->frameBuffer().initialize(title, myWidth, myHeight, false);
  }
--- 56,59 ----
  {
    string title = string("Stella ") + STELLA_VERSION;
!   myOSystem->frameBuffer().initialize(title, myWidth, myHeight);
  }

Index: Launcher.hxx
===================================================================
RCS file: /cvsroot/stella/stella/src/gui/Launcher.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Launcher.hxx	1 Jan 2007 18:04:53 -0000	1.9
--- Launcher.hxx	20 Jun 2007 16:33:23 -0000	1.10
***************
*** 51,56 ****
      // The width and height of this dialog
      // These can only be changed by exiting and restarting Stella
!     int myWidth;
!     int myHeight;
  };
  
--- 51,56 ----
      // The width and height of this dialog
      // These can only be changed by exiting and restarting Stella
!     uInt32 myWidth;
!     uInt32 myHeight;
  };
  

Index: OptionsDialog.cxx
===================================================================
RCS file: /cvsroot/stella/stella/src/gui/OptionsDialog.cxx,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** OptionsDialog.cxx	23 Jan 2007 09:37:38 -0000	1.51
--- OptionsDialog.cxx	20 Jun 2007 16:33:23 -0000	1.52
***************
*** 108,112 ****
  
    // Now create all the dialogs attached to each menu button
!   w = 230; h = 135;
    myVideoDialog = new VideoDialog(myOSystem, parent, font, x, y, w, h);
  
--- 108,112 ----
  
    // Now create all the dialogs attached to each menu button
!   w = 230; h = 150;
    myVideoDialog = new VideoDialog(myOSystem, parent, font, x, y, w, h);
  
***************
*** 114,124 ****
    myAudioDialog = new AudioDialog(myOSystem, parent, font, x, y, w, h);
  
-   // knakos: I think this is wrong: (instantiating twice)
-   //w = 230; h = 185;
-   //myInputDialog = new InputDialog(myOSystem, parent, font, x, y, w, h);
- 
  #ifdef _WIN32_WCE
!   int sx, sy;
!   myOSystem->getScreenDimensions(sx, sy);
    // we scale the input dialog down a bit in low res devices.
    // looks only a little ugly, but the functionality is very welcome
--- 114,119 ----
    myAudioDialog = new AudioDialog(myOSystem, parent, font, x, y, w, h);
  
  #ifdef _WIN32_WCE
!   int sx = myOSystem->desktopWidth();
    // we scale the input dialog down a bit in low res devices.
    // looks only a little ugly, but the functionality is very welcome
***************
*** 130,134 ****
    myInputDialog = new InputDialog(myOSystem, parent, font, x, y, w, h);
  
!   w = 200; h = 90;
    myUIDialog = new UIDialog(myOSystem, parent, font, x, y, w, h);
  
--- 125,129 ----
    myInputDialog = new InputDialog(myOSystem, parent, font, x, y, w, h);
  
!   w = 200; h = 105;
    myUIDialog = new UIDialog(myOSystem, parent, font, x, y, w, h);
  

Index: UIDialog.cxx
===================================================================
RCS file: /cvsroot/stella/stella/src/gui/UIDialog.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** UIDialog.cxx	23 Jan 2007 09:37:39 -0000	1.3
--- UIDialog.cxx	20 Jun 2007 16:33:23 -0000	1.4
***************
*** 46,56 ****
    xpos = 10;  ypos = 10;
  
!   // Launcher size
!   myLauncherPopup = new PopUpWidget(this, font, xpos, ypos, pwidth, lineHeight,
!                                     "Rom launcher size: ", lwidth);
!   myLauncherPopup->appendEntry("320x240", 1);
!   myLauncherPopup->appendEntry("400x300", 2);
!   myLauncherPopup->appendEntry("512x384", 3);
!   wid.push_back(myLauncherPopup);
    ypos += lineHeight + 4;
  
--- 46,76 ----
    xpos = 10;  ypos = 10;
  
!   // Launcher width and height
!   myLauncherWidthSlider = new SliderWidget(this, font, xpos, ypos, pwidth,
!                                            lineHeight, "Launcher Width: ",
!                                            lwidth, kLWidthChanged);
!   myLauncherWidthSlider->setMinValue(320);
!   myLauncherWidthSlider->setMaxValue(800);
!   myLauncherWidthSlider->setStepValue(10);
!   wid.push_back(myLauncherWidthSlider);
!   myLauncherWidthLabel =
!       new StaticTextWidget(this, font,
!                            xpos + myLauncherWidthSlider->getWidth() + 4,
!                            ypos + 1, 15, fontHeight, "", kTextAlignLeft);
!   myLauncherWidthLabel->setFlags(WIDGET_CLEARBG);
!   ypos += lineHeight + 4;
! 
!   myLauncherHeightSlider = new SliderWidget(this, font, xpos, ypos, pwidth,
!                                             lineHeight, "Launcher Height: ",
!                                             lwidth, kLHeightChanged);
!   myLauncherHeightSlider->setMinValue(240);
!   myLauncherHeightSlider->setMaxValue(600);
!   myLauncherHeightSlider->setStepValue(10);
!   wid.push_back(myLauncherHeightSlider);
!   myLauncherHeightLabel =
!       new StaticTextWidget(this, font,
!                            xpos + myLauncherHeightSlider->getWidth() + 4,
!                            ypos + 1, 15, fontHeight, "", kTextAlignLeft);
!   myLauncherHeightLabel->setFlags(WIDGET_CLEARBG);
    ypos += lineHeight + 4;
  
***************
*** 104,117 ****
  void UIDialog::loadConfig()
  {
-   int i;
- 
    // Launcher size
!   i = instance()->settings().getInt("launchersize");
!   if(i < 1 || i > 3)
!     i = 1;
!   myLauncherPopup->setSelectedTag(i);
  
    // UI palette
!   i = instance()->settings().getInt("uipalette");
    if(i < 1 || i > 2)
      i = 1;
--- 124,142 ----
  void UIDialog::loadConfig()
  {
    // Launcher size
!   int w, h;
!   instance()->settings().getSize("launcherres", w, h);
!   if(w < 320) w = 320;
!   if(w > 800) w = 800;
!   if(h < 240) h = 240;
!   if(h > 600) h = 600;
! 
!   myLauncherWidthSlider->setValue(w);
!   myLauncherWidthLabel->setValue(w);
!   myLauncherHeightSlider->setValue(h);
!   myLauncherHeightLabel->setValue(h);
  
    // UI palette
!   int i = instance()->settings().getInt("uipalette");
    if(i < 1 || i > 2)
      i = 1;
***************
*** 122,135 ****
  void UIDialog::saveConfig()
  {
-   Settings& settings = instance()->settings();
-   int i;
- 
    // Launcher size
!   i = myLauncherPopup->getSelectedTag();
!   settings.setInt("launchersize", i);
  
    // UI palette
!   i = myPalettePopup->getSelectedTag();
!   settings.setInt("uipalette", i);
  }
  
--- 147,157 ----
  void UIDialog::saveConfig()
  {
    // Launcher size
!   instance()->settings().setSize("launcherres", 
!     myLauncherWidthSlider->getValue(), myLauncherHeightSlider->getValue());
  
    // UI palette
!   instance()->settings().setInt("uipalette",
!     myPalettePopup->getSelectedTag());
  }
  
***************
*** 137,145 ****
  void UIDialog::setDefaults()
  {
  #if !defined (GP2X)
-   myLauncherPopup->setSelectedTag(2);
    myPalettePopup->setSelectedTag(1);
  #else
-   myLauncherPopup->setSelectedTag(1);
    myPalettePopup->setSelectedTag(2);
  #endif
--- 159,172 ----
  void UIDialog::setDefaults()
  {
+   int w = MIN(instance()->desktopWidth(), (const uInt32) 400);
+   int h = MIN(instance()->desktopHeight(), (const uInt32) 300);
+   myLauncherWidthSlider->setValue(w);
+   myLauncherWidthLabel->setValue(w);
+   myLauncherHeightSlider->setValue(h);
+   myLauncherHeightLabel->setValue(h);
+ 
  #if !defined (GP2X)
    myPalettePopup->setSelectedTag(1);
  #else
    myPalettePopup->setSelectedTag(2);
  #endif
***************
*** 153,156 ****
--- 180,191 ----
    switch(cmd)
    {
+     case kLWidthChanged:
+       myLauncherWidthLabel->setValue(myLauncherWidthSlider->getValue());
+       break;
+ 
+     case kLHeightChanged:
+       myLauncherHeightLabel->setValue(myLauncherHeightSlider->getValue());
+       break;
+ 
      case kOKCmd:
        saveConfig();

Index: UIDialog.hxx
===================================================================
RCS file: /cvsroot/stella/stella/src/gui/UIDialog.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** UIDialog.hxx	1 Jan 2007 18:04:54 -0000	1.2
--- UIDialog.hxx	20 Jun 2007 16:33:23 -0000	1.3
***************
*** 27,30 ****
--- 27,32 ----
  class DialogContainer;
  class PopUpWidget;
+ class SliderWidget;
+ class StaticTextWidget;
  
  #include "OSystem.hxx"
***************
*** 39,43 ****
  
    protected:
!     PopUpWidget* myLauncherPopup;
      PopUpWidget* myPalettePopup;
  
--- 41,49 ----
  
    protected:
!     SliderWidget*     myLauncherWidthSlider;
!     StaticTextWidget* myLauncherWidthLabel;
!     SliderWidget*     myLauncherHeightSlider;
!     StaticTextWidget* myLauncherHeightLabel;
! 
      PopUpWidget* myPalettePopup;
  
***************
*** 48,51 ****
--- 54,62 ----
  
      virtual void handleCommand(CommandSender* sender, int cmd, int data, int id);
+ 
+     enum {
+       kLWidthChanged  = 'UIlw',
+       kLHeightChanged = 'UIlh',
+     };
  };
  

Index: VideoDialog.cxx
===================================================================
RCS file: /cvsroot/stella/stella/src/gui/VideoDialog.cxx,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** VideoDialog.cxx	23 Jan 2007 09:37:39 -0000	1.42
--- VideoDialog.cxx	20 Jun 2007 16:33:23 -0000	1.43
***************
*** 67,80 ****
    ypos += lineHeight + 4;
  
!   // Aspect ratio
!   myAspectRatioSlider = new SliderWidget(this, font, xpos, ypos, pwidth, lineHeight,
!                                          "GL Aspect: ", lwidth, kAspectRatioChanged);
!   myAspectRatioSlider->setMinValue(1); myAspectRatioSlider->setMaxValue(100);
!   wid.push_back(myAspectRatioSlider);
!   myAspectRatioLabel = new StaticTextWidget(this, font,
!                                             xpos + myAspectRatioSlider->getWidth() + 4,
!                                             ypos + 1,
!                                             15, fontHeight, "", kTextAlignLeft);
!   myAspectRatioLabel->setFlags(WIDGET_CLEARBG);
    ypos += lineHeight + 4;
  
--- 67,78 ----
    ypos += lineHeight + 4;
  
!   // GL FS stretch
!   myFSStretchPopup = new PopUpWidget(this, font, xpos, ypos,
!                                      pwidth, lineHeight, "GL Stretch: ", lwidth);
!   myFSStretchPopup->appendEntry("Never", 1);
!   myFSStretchPopup->appendEntry("UI mode", 2);
!   myFSStretchPopup->appendEntry("TIA mode", 3);
!   myFSStretchPopup->appendEntry("Always", 4);
!   wid.push_back(myFSStretchPopup);
    ypos += lineHeight + 4;
  
***************
*** 89,113 ****
    ypos += lineHeight + 4;
  
!   // Available TIA scalers
!   myTIAScalerPopup = new PopUpWidget(this, font, xpos, ypos, pwidth,
!                                   lineHeight, "TIA Scaler: ", lwidth);
!   myTIAScalerPopup->appendEntry("Zoom1x", 1);
!   myTIAScalerPopup->appendEntry("Zoom2x", 2);
!   myTIAScalerPopup->appendEntry("Zoom3x", 3);
!   myTIAScalerPopup->appendEntry("Zoom4x", 4);
!   myTIAScalerPopup->appendEntry("Zoom5x", 5);
!   myTIAScalerPopup->appendEntry("Zoom6x", 6);
!   wid.push_back(myTIAScalerPopup);
! 
    ypos += lineHeight + 4;
!   myUIScalerPopup = new PopUpWidget(this, font, xpos, ypos, pwidth,
!                                     lineHeight, "UI Scaler: ", lwidth);
!   myUIScalerPopup->appendEntry("Zoom1x", 1);
!   myUIScalerPopup->appendEntry("Zoom2x", 2);
!   myUIScalerPopup->appendEntry("Zoom3x", 3);
!   myUIScalerPopup->appendEntry("Zoom4x", 4);
!   myUIScalerPopup->appendEntry("Zoom5x", 5);
!   myUIScalerPopup->appendEntry("Zoom6x", 6);
!   wid.push_back(myUIScalerPopup);
  
    // Move over to the next column
--- 87,112 ----
    ypos += lineHeight + 4;
  
!   // Available UI zoom levels
!   myUIZoomSlider = new SliderWidget(this, font, xpos, ypos, pwidth, lineHeight,
!                                     "UI Zoom: ", lwidth, kUIZoomChanged);
!   myUIZoomSlider->setMinValue(1); myUIZoomSlider->setMaxValue(10);
!   wid.push_back(myUIZoomSlider);
!   myUIZoomLabel = new StaticTextWidget(this, font,
!                                        xpos + myUIZoomSlider->getWidth() + 4,
!                                        ypos + 1,
!                                        15, fontHeight, "", kTextAlignLeft);
!   myUIZoomLabel->setFlags(WIDGET_CLEARBG);
    ypos += lineHeight + 4;
! 
!   // Available TIA zoom levels
!   myTIAZoomSlider = new SliderWidget(this, font, xpos, ypos, pwidth, lineHeight,
!                                      "TIA Zoom: ", lwidth, kTIAZoomChanged);
!   myTIAZoomSlider->setMinValue(1); myTIAZoomSlider->setMaxValue(10);
!   wid.push_back(myTIAZoomSlider);
!   myTIAZoomLabel = new StaticTextWidget(this, font,
!                                         xpos + myTIAZoomSlider->getWidth() + 4,
!                                         ypos + 1,
!                                         15, fontHeight, "", kTextAlignLeft);
!   myTIAZoomLabel->setFlags(WIDGET_CLEARBG);
  
    // Move over to the next column
***************
*** 128,132 ****
    // Fullscreen
    myFullscreenCheckbox = new CheckboxWidget(this, font, xpos + 5, ypos,
!                                             "Fullscreen mode");
    wid.push_back(myFullscreenCheckbox);
    ypos += lineHeight + 4;
--- 127,131 ----
    // Fullscreen
    myFullscreenCheckbox = new CheckboxWidget(this, font, xpos + 5, ypos,
!                                             "Fullscreen mode", kFullScrChanged);
    wid.push_back(myFullscreenCheckbox);
    ypos += lineHeight + 4;
***************
*** 138,158 ****
    ypos += lineHeight + 4;
  
-   // Use dirty rectangle merging
-   myDirtyRectCheckbox = new CheckboxWidget(this, font, xpos + 5, ypos,
-                                            "Dirty-rect merging");
-   wid.push_back(myDirtyRectCheckbox);
-   ypos += lineHeight + 4;
- 
-   // Use desktop res in OpenGL
-   myUseDeskResCheckbox = new CheckboxWidget(this, font, xpos + 5, ypos,
-                                             "Desktop Res in FS");
-   wid.push_back(myUseDeskResCheckbox);
-   ypos += lineHeight + 4;
- 
    // Use sync to vblank in OpenGL
    myUseVSyncCheckbox = new CheckboxWidget(this, font, xpos + 5, ypos,
                                            "GL VSync");
    wid.push_back(myUseVSyncCheckbox);
!   ypos += lineHeight + 20;
  
    // Add Defaults, OK and Cancel buttons
--- 137,157 ----
    ypos += lineHeight + 4;
  
    // Use sync to vblank in OpenGL
    myUseVSyncCheckbox = new CheckboxWidget(this, font, xpos + 5, ypos,
                                            "GL VSync");
    wid.push_back(myUseVSyncCheckbox);
!   ypos += lineHeight + 4;
! 
!   // Center window (in windowed mode)
!   myCenterCheckbox = new CheckboxWidget(this, font, xpos + 5, ypos,
!                                         "Center window (*)");
!   wid.push_back(myCenterCheckbox);
!   ypos += lineHeight + 4;
! 
!   // Add message concerning usage
!   lwidth = font.getStringWidth("(*) Requires application restart");
!   new StaticTextWidget(this, font, 10, _h - 38, lwidth, fontHeight,
!                        "(*) Requires application restart",
!                        kTextAlignLeft);
  
    // Add Defaults, OK and Cancel buttons
***************
*** 178,186 ****
    addToFocusList(wid);
  
! #ifdef _WIN32_WCE
!   myTIAScalerPopup->clearFlags(WIDGET_ENABLED);
!   myUIScalerPopup->clearFlags(WIDGET_ENABLED);
    myFullscreenCheckbox->clearFlags(WIDGET_ENABLED);
!   myDirtyRectCheckbox->clearFlags(WIDGET_ENABLED);
  #endif
  }
--- 177,193 ----
    addToFocusList(wid);
  
!   // Disable certain functions when we know they aren't present
! #ifndef DISPLAY_GL
!   myFilterPopup->clearFlags(WIDGET_ENABLED);
!   myFSStretchPopup->clearFlags(WIDGET_ENABLED);
!   myUseVSyncCheckbox->clearFlags(WIDGET_ENABLED);
! #endif
! #ifndef WINDOWED_SUPPORT
!   myUIZoomSlider->clearFlags(WIDGET_ENABLED);
!   myUIZoomLabel->clearFlags(WIDGET_ENABLED);
!   myTIAZoomSlider->clearFlags(WIDGET_ENABLED);
!   myTIAZoomLabel->clearFlags(WIDGET_ENABLED);
    myFullscreenCheckbox->clearFlags(WIDGET_ENABLED);
!   myCenterCheckbox->clearFlags(WIDGET_ENABLED);
  #endif
  }
***************
*** 197,201 ****
    bool b;
    int i;
-   double f;
  
    // Renderer setting
--- 204,207 ----
***************
*** 209,220 ****
    else if(s == "nearest") myFilterPopup->setSelectedTag(2);
  
!   // Aspect ratio - another huge hack
!   s = instance()->settings().getString("gl_aspect");
!   f = instance()->settings().getFloat("gl_aspect");
!   if(f < 1.1)      { f = 1.1;  s = "1.1"; }
!   else if(f > 2.0) { f = 2.0;  s = "2.0"; }
!   i = (int)((f * 10) - 10) * 10;
!   myAspectRatioSlider->setValue(i);
!   myAspectRatioLabel->setLabel(s);
  
    // Palette
--- 215,225 ----
    else if(s == "nearest") myFilterPopup->setSelectedTag(2);
  
!   // GL stretch setting
!   s = instance()->settings().getString("gl_fsmax");
!   if(s == "never")        myFSStretchPopup->setSelectedTag(1);
!   else if(s == "ui")      myFSStretchPopup->setSelectedTag(2);
!   else if(s == "tia")     myFSStretchPopup->setSelectedTag(3);
!   else if(s == "always")  myFSStretchPopup->setSelectedTag(4);
!   else                    myFSStretchPopup->setSelectedTag(1);
  
    // Palette
***************
*** 225,247 ****
    else if(s == "user")     myPalettePopup->setSelectedTag(4);
  
!   // TIA Scaler
!   s = instance()->settings().getString("scale_tia");
!   if(s == "zoom1x")       myTIAScalerPopup->setSelectedTag(1);
!   else if(s == "zoom2x")  myTIAScalerPopup->setSelectedTag(2);
!   else if(s == "zoom3x")  myTIAScalerPopup->setSelectedTag(3);
!   else if(s == "zoom4x")  myTIAScalerPopup->setSelectedTag(4);
!   else if(s == "zoom5x")  myTIAScalerPopup->setSelectedTag(5);
!   else if(s == "zoom6x")  myTIAScalerPopup->setSelectedTag(6);
!   else                    myTIAScalerPopup->setSelectedTag(0);
  
!   // UI Scaler
!   s = instance()->settings().getString("scale_ui");
!   if(s == "zoom1x")       myUIScalerPopup->setSelectedTag(1);
!   else if(s == "zoom2x")  myUIScalerPopup->setSelectedTag(2);
!   else if(s == "zoom3x")  myUIScalerPopup->setSelectedTag(3);
!   else if(s == "zoom4x")  myUIScalerPopup->setSelectedTag(4);
!   else if(s == "zoom5x")  myUIScalerPopup->setSelectedTag(5);
!   else if(s == "zoom6x")  myUIScalerPopup->setSelectedTag(6);
!   else                    myUIScalerPopup->setSelectedTag(0);
  
    // FIXME - what to do with this??
--- 230,244 ----
    else if(s == "user")     myPalettePopup->setSelectedTag(4);
  
!   // UI zoom level
!   s = instance()->settings().getString("zoom_ui");
!   i = instance()->settings().getInt("zoom_ui");
!   myUIZoomSlider->setValue(i);
!   myUIZoomLabel->setLabel(s);
  
!   // TIA zoom level
!   s = instance()->settings().getString("zoom_tia");
!   i = instance()->settings().getInt("zoom_tia");
!   myTIAZoomSlider->setValue(i);
!   myTIAZoomLabel->setLabel(s);
  
    // FIXME - what to do with this??
***************
*** 251,254 ****
--- 248,252 ----
    b = instance()->settings().getBool("fullscreen");
    myFullscreenCheckbox->setState(b);
+   handleFullscreenChange(b);
  
    // PAL color-loss effect
***************
*** 256,271 ****
    myColorLossCheckbox->setState(b);
  
-   // Dirty-rect merging (software mode only)
-   b = instance()->settings().getBool("dirtyrects");
-   myDirtyRectCheckbox->setState(b);
- 
-   // Use desktop resolution in fullscreen mode (GL mode only)
-   b = instance()->settings().getBool("gl_fsmax");
-   myUseDeskResCheckbox->setState(b);
- 
    // Use sync to vertical blank (GL mode only)
    b = instance()->settings().getBool("gl_vsync");
    myUseVSyncCheckbox->setState(b);
  
    // Make sure that mutually-exclusive items are not enabled at the same time
    i = myRendererPopup->getSelectedTag();
--- 254,265 ----
    myColorLossCheckbox->setState(b);
  
    // Use sync to vertical blank (GL mode only)
    b = instance()->settings().getBool("gl_vsync");
    myUseVSyncCheckbox->setState(b);
  
+   // Center window
+   b = instance()->settings().getBool("center");
+   myCenterCheckbox->setState(b);
+ 
    // Make sure that mutually-exclusive items are not enabled at the same time
    i = myRendererPopup->getSelectedTag();
***************
*** 292,298 ****
--- 286,302 ----
    instance()->settings().setString("gl_filter", s);
  
+   // GL stretch setting
+   i = myFSStretchPopup->getSelectedTag();
+   if(i == 1)       s = "never";
+   else if(i == 2)  s = "ui";
+   else if(i == 3)  s = "tia";
+   else if(i == 4)  s = "always";
+   instance()->settings().setString("gl_fsmax", s);
+ 
+ /*
    // Aspect ratio
    s = myAspectRatioLabel->getLabel();
    instance()->settings().setString("gl_aspect", s);
+ */
  
    // Palette
***************
*** 304,326 ****
    instance()->settings().setString("palette", s);
  
-   // TIA Scaler
-   i = myTIAScalerPopup->getSelectedTag();
-   if(i == 1)       s = "zoom1x";
-   else if(i == 2)  s = "zoom2x";
-   else if(i == 3)  s = "zoom3x";
-   else if(i == 4)  s = "zoom4x";
-   else if(i == 5)  s = "zoom5x";
-   else if(i == 6)  s = "zoom6x";
-   instance()->settings().setString("scale_tia", s);
- 
    // UI Scaler
!   i = myUIScalerPopup->getSelectedTag();
!   if(i == 1)       s = "zoom1x";
!   else if(i == 2)  s = "zoom2x";
!   else if(i == 3)  s = "zoom3x";
!   else if(i == 4)  s = "zoom4x";
!   else if(i == 5)  s = "zoom5x";
!   else if(i == 6)  s = "zoom6x";
!   instance()->settings().setString("scale_ui", s);
  
    // Framerate   FIXME - I haven't figured out what to do with this yet
--- 308,318 ----
    instance()->settings().setString("palette", s);
  
    // UI Scaler
!   s = myUIZoomLabel->getLabel();
!   instance()->settings().setString("zoom_ui", s);
! 
!   // TIA Scaler
!   s = myTIAZoomLabel->getLabel();
!   instance()->settings().setString("zoom_tia", s);
  
    // Framerate   FIXME - I haven't figured out what to do with this yet
***************
*** 339,354 ****
    instance()->settings().setBool("colorloss", b);
  
-   // Dirty rectangle merging (software mode only)
-   b = myDirtyRectCheckbox->getState();
-   instance()->settings().setBool("dirtyrects", b);
- 
-   // Use desktop resolution in fullscreen mode (GL mode only)
-   b = myUseDeskResCheckbox->getState();
-   instance()->settings().setBool("gl_fsmax", b);
- 
    // Use sync to vertical blank (GL mode only)
    b = myUseVSyncCheckbox->getState();
    instance()->settings().setBool("gl_vsync", b);
  
    // Finally, issue a complete framebuffer re-initialization
    instance()->createFrameBuffer(false);
--- 331,342 ----
    instance()->settings().setBool("colorloss", b);
  
    // Use sync to vertical blank (GL mode only)
    b = myUseVSyncCheckbox->getState();
    instance()->settings().setBool("gl_vsync", b);
  
+   // Center window
+   b = myCenterCheckbox->getState();
+   instance()->settings().setBool("center", b);
+ 
    // Finally, issue a complete framebuffer re-initialization
    instance()->createFrameBuffer(false);
***************
*** 360,382 ****
    myRendererPopup->setSelectedTag(1);
    myFilterPopup->setSelectedTag(1);
    myPalettePopup->setSelectedTag(1);
!   myTIAScalerPopup->setSelectedTag(2);
!   myUIScalerPopup->setSelectedTag(2);
  //  myFrameRateSlider->setValue(0);
  //  myFrameRateLabel->setLabel("0");
  
-   // For some unknown reason (ie, a bug), slider widgets can only
-   // take certain ranges of numbers.  So we have to fudge things ...
-   myAspectRatioSlider->setValue(100);
-   myAspectRatioLabel->setLabel("2.0");
- 
    myFullscreenCheckbox->setState(false);
    myColorLossCheckbox->setState(false);
-   myDirtyRectCheckbox->setState(false);
-   myUseDeskResCheckbox->setState(true);
    myUseVSyncCheckbox->setState(true);
  
    // Make sure that mutually-exclusive items are not enabled at the same time
    handleRendererChange(1);  // 1 indicates software mode
  }
  
--- 348,368 ----
    myRendererPopup->setSelectedTag(1);
    myFilterPopup->setSelectedTag(1);
+   myFSStretchPopup->setSelectedTag(1);
    myPalettePopup->setSelectedTag(1);
!   myUIZoomSlider->setValue(2);
!   myUIZoomLabel->setLabel("2");
!   myTIAZoomSlider->setValue(2);
!   myTIAZoomLabel->setLabel("2");
  //  myFrameRateSlider->setValue(0);
  //  myFrameRateLabel->setLabel("0");
  
    myFullscreenCheckbox->setState(false);
    myColorLossCheckbox->setState(false);
    myUseVSyncCheckbox->setState(true);
+   myCenterCheckbox->setState(true);
  
    // Make sure that mutually-exclusive items are not enabled at the same time
    handleRendererChange(1);  // 1 indicates software mode
+   handleFullscreenChange(false);  // indicates fullscreen deactivated
  }
  
***************
*** 384,400 ****
  void VideoDialog::handleRendererChange(int item)
  {
    // When we're in software mode, certain OpenGL-related options are disabled
    bool gl = (item > 1) ? true : false;
  
    myFilterPopup->setEnabled(gl);
!   myAspectRatioSlider->setEnabled(gl);
!   myAspectRatioLabel->setEnabled(gl);
!   myUseDeskResCheckbox->setEnabled(gl);
    myUseVSyncCheckbox->setEnabled(gl);
  
!   // Also, in OpenGL mode, certain software related items are disabled
!   myDirtyRectCheckbox->setEnabled(!gl);
  
    _dirty = true;
  }
  
--- 370,397 ----
  void VideoDialog::handleRendererChange(int item)
  {
+ #ifdef DISPLAY_OPENGL
    // When we're in software mode, certain OpenGL-related options are disabled
    bool gl = (item > 1) ? true : false;
  
    myFilterPopup->setEnabled(gl);
!   myFSStretchPopup->setEnabled(gl);
!   myFSStretchPopup->setEnabled(gl);
    myUseVSyncCheckbox->setEnabled(gl);
  
!   _dirty = true;
! #endif
! }
! 
! // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
! void VideoDialog::handleFullscreenChange(bool enable)
! {
! #ifdef WINDOWED_SUPPORT
!   myUIZoomSlider->setEnabled(!enable);
!   myUIZoomLabel->setEnabled(!enable);
!   myTIAZoomSlider->setEnabled(!enable);
!   myTIAZoomLabel->setEnabled(!enable);
  
    _dirty = true;
+ #endif
  }
  
***************
*** 418,433 ****
        break;
  
!     case kAspectRatioChanged:
!     {
!       // This is terribly dirty, but what can we do?
!       float ratio = (((myAspectRatioSlider->getValue() + 9) / 10) / 10.0) + 1.0;
!       ostringstream r;
!       if(ratio == 2.0)
!         r << ratio << ".0";
!       else
!         r << ratio;
!       myAspectRatioLabel->setLabel(r.str());
        break;
-     }
  
      case kFrameRateChanged:
--- 415,425 ----
        break;
  
!     case kUIZoomChanged:
!       myUIZoomLabel->setValue(myUIZoomSlider->getValue());
!       break;
! 
!     case kTIAZoomChanged:
!       myTIAZoomLabel->setValue(myTIAZoomSlider->getValue());
        break;
  
      case kFrameRateChanged:
***************
*** 435,438 ****
--- 427,434 ----
        break;
  
+     case kFullScrChanged:
+       handleFullscreenChange(myFullscreenCheckbox->getState());
+       break;
+ 
      default:
        Dialog::handleCommand(sender, cmd, data, 0);

Index: VideoDialog.hxx
===================================================================
RCS file: /cvsroot/stella/stella/src/gui/VideoDialog.hxx,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** VideoDialog.hxx	1 Jan 2007 18:04:55 -0000	1.19
--- VideoDialog.hxx	20 Jun 2007 16:33:23 -0000	1.20
***************
*** 47,50 ****
--- 47,51 ----
  
      void handleRendererChange(int item);
+     void handleFullscreenChange(bool enable);
      virtual void handleCommand(CommandSender* sender, int cmd, int data, int id);
  
***************
*** 52,60 ****
      PopUpWidget*      myRendererPopup;
      PopUpWidget*      myFilterPopup;
!     SliderWidget*     myAspectRatioSlider;
!     StaticTextWidget* myAspectRatioLabel;
      PopUpWidget*      myPalettePopup;
!     PopUpWidget*      myTIAScalerPopup;
!     PopUpWidget*      myUIScalerPopup;
  
      SliderWidget*     myFrameRateSlider;
--- 53,62 ----
      PopUpWidget*      myRendererPopup;
      PopUpWidget*      myFilterPopup;
!     PopUpWidget*      myFSStretchPopup;
      PopUpWidget*      myPalettePopup;
!     SliderWidget*     myUIZoomSlider;
!     StaticTextWidget* myUIZoomLabel;
!     SliderWidget*     myTIAZoomSlider;
!     StaticTextWidget* myTIAZoomLabel;
  
      SliderWidget*     myFrameRateSlider;
***************
*** 62,73 ****
      CheckboxWidget*   myFullscreenCheckbox;
      CheckboxWidget*   myColorLossCheckbox;
-     CheckboxWidget*   myDirtyRectCheckbox;
-     CheckboxWidget*   myUseDeskResCheckbox;
      CheckboxWidget*   myUseVSyncCheckbox;
  
      enum {
!       kRendererChanged    = 'VDrd',
!       kAspectRatioChanged = 'VDar',
!       kFrameRateChanged   = 'VDfr'
      };
  };
--- 64,76 ----
      CheckboxWidget*   myFullscreenCheckbox;
      CheckboxWidget*   myColorLossCheckbox;
      CheckboxWidget*   myUseVSyncCheckbox;
+     CheckboxWidget*   myCenterCheckbox;
  
      enum {
!       kRendererChanged   = 'VDrd',
!       kUIZoomChanged     = 'VDui',
!       kTIAZoomChanged    = 'VDti',
!       kFrameRateChanged  = 'VDfr',
!       kFullScrChanged    = 'VDfs'
      };
  };

Index: Widget.cxx
===================================================================
RCS file: /cvsroot/stella/stella/src/gui/Widget.cxx,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** Widget.cxx	15 Jan 2007 13:51:55 -0000	1.48
--- Widget.cxx	20 Jun 2007 16:33:23 -0000	1.49
***************
*** 526,533 ****
       << ", min = " << _valueMin
       << endl;*/
!   if(value < _valueMin)
!     value = _valueMin;
!   else if(value > _valueMax)
!     value = _valueMax;
  
    if(value != _value)
--- 526,531 ----
       << ", min = " << _valueMin
       << endl;*/
!   if(value < _valueMin)      value = _valueMin;
!   else if(value > _valueMax) value = _valueMax;
  
    if(value != _value)
***************
*** 543,547 ****
  {
    _valueMin = value;
- //  _stepValue = (int) ((_valueMax - _valueMin) * 0.05); // Step at 5% intervals
  }
  
--- 541,544 ----
***************
*** 550,554 ****
  {
    _valueMax = value;
! //  _stepValue = (int) ((_valueMax - _valueMin) * 0.05); // Step at 5% intervals
  }
  
--- 547,556 ----
  {
    _valueMax = value;
! }
! 
! // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
! void SliderWidget::setStepValue(int value)
! {
!   _stepValue = value;
  }
  
***************
*** 638,641 ****
--- 640,646 ----
  int SliderWidget::valueToPos(int value)
  {
+   if(value < _valueMin)      value = _valueMin;
+   else if(value > _valueMax) value = _valueMax;
+ 
    return ((_w - _labelWidth - 4) * (value - _valueMin) / (_valueMax - _valueMin));
  }
***************
*** 644,647 ****
  int SliderWidget::posToValue(int pos)
  {
!   return (pos) * (_valueMax - _valueMin) / (_w - _labelWidth - 4) + _valueMin;
  }
--- 649,655 ----
  int SliderWidget::posToValue(int pos)
  {
!   int value = (pos) * (_valueMax - _valueMin) / (_w - _labelWidth - 4) + _valueMin;
! 
!   // Scale the position to the correct interval (according to step value)
!   return value - (value % _stepValue);
  }

Index: Widget.hxx
===================================================================
RCS file: /cvsroot/stella/stella/src/gui/Widget.hxx,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** Widget.hxx	1 Jan 2007 18:04:55 -0000	1.53
--- Widget.hxx	20 Jun 2007 16:33:23 -0000	1.54
***************
*** 290,293 ****
--- 290,295 ----
      void  setMaxValue(int value);
      int getMaxValue() const      { return _valueMax; }
+     void  setStepValue(int value);
+     int getStepValue() const      { return _stepValue; }
  
      virtual void handleMouseMoved(int x, int y, int button);

Update of /cvsroot/stella/stella/src/emucore
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv13346/src/emucore

Modified Files:
	EventHandler.cxx FrameBuffer.cxx FrameBuffer.hxx OSystem.cxx 
	OSystem.hxx Settings.cxx Settings.hxx 
Log Message:
Added 'WINDOWED_SUPPORT' compile-time argument, which can be used for
those systems which don't actually have a windowing environment.  When
this is set, toggling from fullscreen will not be possible, and certain
window-related UI functions will not be accessible.

Completely revamped video subsystem.  Windowed and fullscreen modes are
now dealt with separately.  Windows can be zoomed using the 'zoom_ui'
and 'zoom_tia' arguments.  Fullscreen modes are now set by resolution,
not zoom, so you can specify to always use a certain fullscreen
resolution, and the images will be scaled appropriately.  This also
fixes the fullscreen issues on widescreen monitors; just select a
widescreen video mode, and the aspect ratio will always be correct.

Removed dirty-rect support for software rendering of the TIA image,
as it ended up being slower than just updating the entire image.
For those resolutions where it will start to slow down (1024x768 or
higher), one should be using OpenGL.

Fixed issue in Windows when returning from fullscreen mode made the
window constantly 'shrink' in size.  It was related to auto-detecting
the desktop resolution, which is really the job of SDL.  As such, all
further releases of Stella will require SDL 1.2.10, which includes
this auto-detection code internally.

Made ROM launcher resizable, configurable in sizes from 320x240
to 800x600.  Updated the UIDialog to change these quantities from the
UI (Stella will need to be restarted for it to take effect).

Removed aspect ratio support, since it was causing problems, and the
new fullscreen mode work has made it obsolete.  i *may* consider it
again in the future, if there's sufficient demand.

Added 'fullres' commandline argument, used to set the fullscreen
resolution.

Added 'launcherres' commandline argument, used to set the ROM
launcher resolution.  This replaces 'launchersize' argument, which
has been removed.

Changed 'scale_ui' and 'scale_tia' to 'zoom_ui' and 'zoom_tia',
respectively.  Their function remains the same.

Changed meaning of 'gl_fsmax' argument to specify what modes to use
fullscreen OpenGL scaling (previously, this was a boolean, and
didn't consider different modes).



Index: EventHandler.cxx
===================================================================
RCS file: /cvsroot/stella/stella/src/emucore/EventHandler.cxx,v
retrieving revision 1.202
retrieving revision 1.203
diff -C2 -d -r1.202 -r1.203
*** EventHandler.cxx	22 Feb 2007 02:15:46 -0000	1.202
--- EventHandler.cxx	20 Jun 2007 16:33:22 -0000	1.203
***************
*** 389,397 ****
      #ifndef MAC_OSX
              case SDLK_EQUALS:
!               myOSystem->frameBuffer().scale(+1);
                break;
  
              case SDLK_MINUS:
!               myOSystem->frameBuffer().scale(-1);
                break;
  
--- 389,397 ----
      #ifndef MAC_OSX
              case SDLK_EQUALS:
!               myOSystem->frameBuffer().changeVidMode(+1);
                break;
  
              case SDLK_MINUS:
!               myOSystem->frameBuffer().changeVidMode(-1);
                break;
  
***************
*** 511,519 ****
  
              case SDLK_EQUALS:
!               myOSystem->frameBuffer().scale(+1);
                break;
  
              case SDLK_MINUS:
!               myOSystem->frameBuffer().scale(-1);
                break;
  
--- 511,519 ----
  
              case SDLK_EQUALS:
!               myOSystem->frameBuffer().changeVidMode(+1);
                break;
  
              case SDLK_MINUS:
!               myOSystem->frameBuffer().changeVidMode(-1);
                break;
  
***************
*** 851,855 ****
    // Take window zooming into account
    int x = event.motion.x, y = event.motion.y;
!   myOSystem->frameBuffer().translateCoords(&x, &y);
  
    // Determine which mode we're in, then send the event to the appropriate place
--- 851,855 ----
    // Take window zooming into account
    int x = event.motion.x, y = event.motion.y;
!   myOSystem->frameBuffer().translateCoords(x, y);
  
    // Determine which mode we're in, then send the event to the appropriate place
***************
*** 857,860 ****
--- 857,861 ----
    {
      int w = myOSystem->frameBuffer().baseWidth();
+     if(x < 0 || x > w) return;
  
      // Grabmouse introduces some lag into the mouse movement,
***************
*** 883,887 ****
      Int32 x = event.button.x, y = event.button.y;
  //if (state) cerr << "B: x = " << x << ", y = " << y << endl;
!     myOSystem->frameBuffer().translateCoords(&x, &y);
  //if (state) cerr << "A: x = " << x << ", y = " << y << endl << endl;
      MouseButton button;
--- 884,888 ----
      Int32 x = event.button.x, y = event.button.y;
  //if (state) cerr << "B: x = " << x << ", y = " << y << endl;
!     myOSystem->frameBuffer().translateCoords(x, y);
  //if (state) cerr << "A: x = " << x << ", y = " << y << endl << endl;
      MouseButton button;

Index: FrameBuffer.cxx
===================================================================
RCS file: /cvsroot/stella/stella/src/emucore/FrameBuffer.cxx,v
retrieving revision 1.117
retrieving revision 1.118
diff -C2 -d -r1.117 -r1.118
*** FrameBuffer.cxx	30 Jan 2007 17:13:10 -0000	1.117
--- FrameBuffer.cxx	20 Jun 2007 16:33:22 -0000	1.118
***************
*** 41,45 ****
    : myOSystem(osystem),
      myScreen(0),
-     theAspectRatio(1.0),
      theRedrawTIAIndicator(true),
      myUsePhosphor(false),
--- 41,44 ----
***************
*** 56,101 ****
  
  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
! void FrameBuffer::initialize(const string& title, uInt32 width, uInt32 height,
!                              bool useAspect)
  {
-   bool isAlreadyInitialized = (SDL_WasInit(SDL_INIT_VIDEO) & SDL_INIT_VIDEO) > 0;
- 
-   myBaseDim.x = myBaseDim.y = 0;
-   myBaseDim.w = (uInt16) width;
-   myBaseDim.h = (uInt16) height;
- 
    // Now (re)initialize the SDL video system
    // These things only have to be done one per FrameBuffer creation
!   if(!isAlreadyInitialized)
!   {
!     Uint32 initflags = SDL_INIT_VIDEO | SDL_INIT_TIMER;
! 
!     if(SDL_Init(initflags) < 0)
        return;
-   }
-   myInitializedCount++;
  
!   // Query the desktop size
!   // This is really the job of SDL
!   int dwidth = 0, dheight = 0;
!   myOSystem->getScreenDimensions(dwidth, dheight);
!   myDesktopDim.w = dwidth;  myDesktopDim.h = dheight;
  
!   // Get the aspect ratio for the display if it's been enabled
!   theAspectRatio = 1.0;
!   if(useAspect) setAspectRatio();
  
    // Set fullscreen flag
    mySDLFlags = myOSystem->settings().getBool("fullscreen") ? SDL_FULLSCREEN : 0;
  
!   // Set the available scalers for this framebuffer, based on current eventhandler
!   // state and the maximum size of a window for the current desktop
!   setAvailableScalers();
  
    // Initialize video subsystem
!   Scaler scaler;
!   getScaler(scaler, 0, currentScalerName());
!   setScaler(scaler);
!   initSubsystem();
  
    // Set window title and icon
--- 55,85 ----
  
  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
! void FrameBuffer::initialize(const string& title, uInt32 width, uInt32 height)
  {
    // Now (re)initialize the SDL video system
    // These things only have to be done one per FrameBuffer creation
!   if(SDL_WasInit(SDL_INIT_VIDEO) == 0)
!     if(SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER) < 0)
        return;
  
!   myInitializedCount++;
  
!   myBaseDim.x = myBaseDim.y = 0;
!   myBaseDim.w = (uInt16) width;
!   myBaseDim.h = (uInt16) height;
  
    // Set fullscreen flag
+ #ifdef WINDOWED_SUPPORT
    mySDLFlags = myOSystem->settings().getBool("fullscreen") ? SDL_FULLSCREEN : 0;
+ #else
+   mySDLFlags = 0;
+ #endif
  
!   // Set the available video modes for this framebuffer
!   setAvailableVidModes();
  
    // Initialize video subsystem
!   VideoMode mode = getSavedVidMode();
!   initSubsystem(mode);
  
    // Set window title and icon
***************
*** 372,378 ****
  void FrameBuffer::setFullscreen(bool enable)
  {
    // Update the settings
    myOSystem->settings().setBool("fullscreen", enable);
- 
    if(enable)
      mySDLFlags |= SDL_FULLSCREEN;
--- 356,362 ----
  void FrameBuffer::setFullscreen(bool enable)
  {
+ #ifdef WINDOWED_SUPPORT
    // Update the settings
    myOSystem->settings().setBool("fullscreen", enable);
    if(enable)
      mySDLFlags |= SDL_FULLSCREEN;
***************
*** 380,404 ****
      mySDLFlags &= ~SDL_FULLSCREEN;
  
!   if(!createScreen())
!     return;
  
!   myOSystem->eventHandler().refreshDisplay();
!   setCursorState();
  }
  
  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
! bool FrameBuffer::scale(int direction, const string& type)
  {
!   Scaler newScaler;
!   const string& currentScaler = (direction == 0 ? type : currentScalerName());
!   getScaler(newScaler, direction, currentScaler);
  
!   // Only update the scaler if it's changed from the old one
!   if(currentScaler != string(newScaler.comparitor))
!   {
!     setScaler(newScaler);
!     if(!createScreen())
!       return false;
  
      EventHandler::State state = myOSystem->eventHandler().state();
      bool inTIAMode = (state == EventHandler::S_EMULATE ||
--- 364,401 ----
      mySDLFlags &= ~SDL_FULLSCREEN;
  
!   // Do a dummy call to getSavedVidMode to set up the modelists
!   // and have it point to the correct 'current' mode
!   getSavedVidMode();
  
!   // Do a mode change to the 'current' mode by not passing a '+1' or '-1'
!   // to changeVidMode()
!   changeVidMode(0);
! #endif
  }
  
  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
! bool FrameBuffer::changeVidMode(int direction)
  {
!   VideoMode oldmode = myCurrentModeList->current();
!   if(direction == +1)
!     myCurrentModeList->next();
!   else if(direction == -1)
!     myCurrentModeList->previous();
  
!   VideoMode newmode = myCurrentModeList->current();
!   if(!setVidMode(newmode))
!     return false;
! 
!   myOSystem->eventHandler().refreshDisplay();
!   setCursorState();
!   showMessage(newmode.name);
  
+   // Determine which mode we're in, and save to the appropriate setting
+   if(fullScreen())
+   {
+     myOSystem->settings().setSize("fullres", newmode.screen_w, newmode.screen_h);
+   }
+   else
+   {
      EventHandler::State state = myOSystem->eventHandler().state();
      bool inTIAMode = (state == EventHandler::S_EMULATE ||
***************
*** 407,419 ****
                        state == EventHandler::S_CMDMENU);
  
-     myOSystem->eventHandler().refreshDisplay();
-     showMessage(newScaler.name);
- 
      if(inTIAMode)
!       myOSystem->settings().setString("scale_tia", newScaler.comparitor);
      else
!       myOSystem->settings().setString("scale_ui", newScaler.comparitor);
    }
    return true;
  }
  
--- 404,426 ----
                        state == EventHandler::S_CMDMENU);
  
      if(inTIAMode)
!       myOSystem->settings().setInt("zoom_tia", newmode.zoom);
      else
!       myOSystem->settings().setInt("zoom_ui", newmode.zoom);
    }
+ 
    return true;
+ /*
+ cerr << "New mode:" << endl
+ 	<< "    screen w = " << newmode.screen_w << endl
+ 	<< "    screen h = " << newmode.screen_h << endl
+ 	<< "    image x  = " << newmode.image_x << endl
+ 	<< "    image y  = " << newmode.image_y << endl
+ 	<< "    image w  = " << newmode.image_w << endl
+ 	<< "    image h  = " << newmode.image_h << endl
+ 	<< "    zoom     = " << newmode.zoom << endl
+ 	<< "    name     = " << newmode.name << endl
+ 	<< endl;
+ */
  }
  
***************
*** 460,464 ****
  bool FrameBuffer::fullScreen()
  {
!   return myOSystem->settings().getBool("fullscreen");
  }
  
--- 467,475 ----
  bool FrameBuffer::fullScreen()
  {
! #ifdef WINDOWED_SUPPORT
!     return myOSystem->settings().getBool("fullscreen");
! #else
!     return true;
! #endif
  }
  
***************
*** 667,773 ****
  
  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
! int FrameBuffer::maxWindowSizeForScreen()
  {
!   uInt32 sWidth     = myDesktopDim.w;
!   uInt32 sHeight    = myDesktopDim.h;
!   uInt32 multiplier = 10;
! 
!   // If screenwidth or height could not be found, use default zoom value
!   if(sWidth == 0 || sHeight == 0)
!     return 4;
! 
!   bool found = false;
!   while(!found && (multiplier > 0))
    {
!     // Figure out the desired size of the window
!     uInt32 width  = (uInt32) (myBaseDim.w * multiplier * theAspectRatio);
      uInt32 height = myBaseDim.h * multiplier;
  
!     if((width < sWidth) && (height < sHeight))
!       found = true;
!     else
!       multiplier--;
!   }
  
!   if(found)
!     return multiplier;
!   else
!     return 1;
  }
  
  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
! void FrameBuffer::setAvailableScalers()
  {
!   /** Different emulation modes support different scalers, and the size
!       of the current desktop also determines how much a window can be
!       zoomed. */
!   int maxsize = maxWindowSizeForScreen();
!   myScalerList.clear();
  
!   for(int i = 0; i < kScalerListSize; ++i)
!     if(ourScalers[i].zoom <= maxsize)
!       myScalerList.push_back(&ourScalers[i]);
! }
  
! // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
! void FrameBuffer::getScaler(Scaler& scaler, int direction, const string& name)
! {
!   // First search for the scaler specified by name
!   int pos = -1;
!   for(unsigned int i = 0; i < myScalerList.size(); ++i)
    {
!     if(BSPF_strcasecmp(myScalerList[i]->name, name.c_str()) == 0)
!     {
!       pos = i;
!       break;
!     }
    }
  
!   // If we found a scaler, look at direction
!   if(pos >= 0)
    {
!     switch(direction)
      {
!       case 0:   // actual scaler specified in 'name'
!         // pos is already set from above
!         break;
!       case -1:  // previous scaler from one specified in 'name'
!         pos--;
!         if(pos < 0) pos = myScalerList.size() - 1;
!         break;
!       case +1:  // next scaler from one specified in 'name'
!         pos = (pos + 1) % myScalerList.size();
!         break;
      }
!     scaler = *(myScalerList[pos]);
    }
    else
    {
!     // Otherwise, get the largest scaler that's available
!     scaler = *(myScalerList[myScalerList.size()-1]);
!   }
! }
  
! // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
! const string& FrameBuffer::currentScalerName()
! {
!   EventHandler::State state = myOSystem->eventHandler().state();
!   bool inTIAMode = (state == EventHandler::S_EMULATE ||
!                     state == EventHandler::S_PAUSE   ||
!                     state == EventHandler::S_MENU    ||
!                     state == EventHandler::S_CMDMENU);
  
!   return (inTIAMode ?
!      myOSystem->settings().getString("scale_tia") :
!      myOSystem->settings().getString("scale_ui") );
  }
- 
- // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Scaler FrameBuffer::ourScalers[kScalerListSize] = {
-   { kZOOM1X,  "Zoom1x", "zoom1x", 1 },
-   { kZOOM2X,  "Zoom2x", "zoom2x", 2 },
-   { kZOOM3X,  "Zoom3x", "zoom3x", 3 },
-   { kZOOM4X,  "Zoom4x", "zoom4x", 4 },
-   { kZOOM5X,  "Zoom5x", "zoom5x", 5 },
-   { kZOOM6X,  "Zoom6x", "zoom6x", 6 }
- };
--- 678,792 ----
  
  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
! uInt32 FrameBuffer::maxWindowSizeForScreen(uInt32 screenWidth, uInt32 screenHeight)
  {
!   uInt32 multiplier = 1;
!   for(;;)
    {
!     // Figure out the zoomed size of the window
!     uInt32 width  = myBaseDim.w * multiplier;
      uInt32 height = myBaseDim.h * multiplier;
  
!     if((width > screenWidth) || (height > screenHeight))
!       break;
  
!     ++multiplier;
!   }
!   return multiplier > 1 ? multiplier - 1 : 1;
  }
  
  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
! void FrameBuffer::setAvailableVidModes()
  {
!   // First we look at windowed modes
!   // These can be sized exactly as required, since there's normally no
!   // restriction on window size (up the maximum size)
!   myWindowedModeList.clear();
!   int max_zoom = maxWindowSizeForScreen(myOSystem->desktopWidth(),
!                                         myOSystem->desktopHeight());
!   for(int i = 1; i <= max_zoom; ++i)
!   {
!     VideoMode m;
!     m.image_x = m.image_y = 0;
!     m.image_w = m.screen_w = myBaseDim.w * i;
!     m.image_h = m.screen_h = myBaseDim.h * i;
!     m.zoom = i;
!     ostringstream buf;
!     buf << "Zoom " << i << "x";
!     m.name = buf.str();
  
!     myWindowedModeList.add(m);
!   }
  
!   // Now consider the fullscreen modes
!   // There are often stricter requirements on these, and they're normally
!   // different depending on the OSystem in use
!   // As well, we usually can't get fullscreen modes in the exact size
!   // we want, so we need to calculate image offsets
!   myFullscreenModeList.clear();
!   const ResolutionList& res = myOSystem->supportedResolutions();
!   for(unsigned int i = 0; i < res.size(); ++i)
    {
!     VideoMode m;
!     m.screen_w = res[i].width;
!     m.screen_h = res[i].height;
!     m.zoom = maxWindowSizeForScreen(m.screen_w, m.screen_h);
!     m.name = res[i].name;
! 
!     // Auto-calculate 'smart' centering; platform-specific framebuffers are
!     // free to ignore or augment it
!     m.image_w = myBaseDim.w * m.zoom;
!     m.image_h = myBaseDim.h * m.zoom;
!     m.image_x = (m.screen_w - m.image_w) / 2;
!     m.image_y = (m.screen_h - m.image_h) / 2;
! 
! /*
! cerr << "Fullscreen modes:" << endl
! 	<< "  Mode " << i << endl
! 	<< "    screen w = " << m.screen_w << endl
! 	<< "    screen h = " << m.screen_h << endl
! 	<< "    image x  = " << m.image_x << endl
! 	<< "    image y  = " << m.image_y << endl
! 	<< "    image w  = " << m.image_w << endl
! 	<< "    image h  = " << m.image_h << endl
! 	<< "    zoom     = " << m.zoom << endl
! 	<< endl;
! */
!     myFullscreenModeList.add(m);
    }
+ }
  
! // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
! VideoMode FrameBuffer::getSavedVidMode()
! {
!   if(myOSystem->settings().getBool("fullscreen"))
    {
!     // Point the modelist to fullscreen modes, and set the iterator to
!     // the mode closest to the given resolution
!     int w = -1, h = -1;
!     myOSystem->settings().getSize("fullres", w, h);
!     if(w < 0 || h < 0)
      {
!       w = myOSystem->desktopWidth();
!       h = myOSystem->desktopHeight();
      }
!     myCurrentModeList = &myFullscreenModeList;
!     myCurrentModeList->setByResolution(w, h);
    }
    else
    {
!     // Point the modelist to windowed modes, and set the iterator to
!     // the mode closest to the given zoom level
!     EventHandler::State state = myOSystem->eventHandler().state();
!     bool inTIAMode = (state == EventHandler::S_EMULATE ||
!                       state == EventHandler::S_PAUSE   ||
!                       state == EventHandler::S_MENU    ||
!                       state == EventHandler::S_CMDMENU);
!     int zoom = (inTIAMode ? myOSystem->settings().getInt("zoom_tia") :
!                             myOSystem->settings().getInt("zoom_ui") );
  
!     myCurrentModeList = &myWindowedModeList;
!     myCurrentModeList->setByZoom(zoom);
!   }
  
!   return myCurrentModeList->current();
  }

Index: FrameBuffer.hxx
===================================================================
RCS file: /cvsroot/stella/stella/src/emucore/FrameBuffer.hxx,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -d -r1.86 -r1.87
*** FrameBuffer.hxx	30 Jan 2007 17:13:10 -0000	1.86
--- FrameBuffer.hxx	20 Jun 2007 16:33:22 -0000	1.87
***************
*** 29,32 ****
--- 29,33 ----
  #include "Font.hxx"
  #include "GuiUtils.hxx"
+ #include "VideoModeList.hxx"
  
  class OSystem;
***************
*** 77,88 ****
  };
  
- // Different types of scalers available
- enum ScalerType { kZOOM1X, kZOOM2X, kZOOM3X, kZOOM4X, kZOOM5X, kZOOM6X };
- struct Scaler {
-   ScalerType type;
-   const char* name;
-   const char* comparitor;
-   int zoom;
- };
  
  /**
--- 78,81 ----
***************
*** 98,101 ****
--- 91,96 ----
  class FrameBuffer
  {
+   friend class TiaOutputWidget;
+ 
    public:
      /**
***************
*** 116,123 ****
        @param width   The width of the framebuffer
        @param height  The height of the framebuffer
-       @param aspect  Whether to use the aspect ratio setting
      */
!     void initialize(const string& title, uInt32 width, uInt32 height,
!                     bool aspect = true);
  
      /**
--- 111,116 ----
        @param width   The width of the framebuffer
        @param height  The height of the framebuffer
      */
!     void initialize(const string& title, uInt32 width, uInt32 height);
  
      /**
***************
*** 194,207 ****
  
      /**
!       This method is called when the user wants to scale the window, in effect
!       changing to another scaler.
!       direction = -1 means window should go to the next lower scaler
!       direction =  0 means window should be created with the given scaler
!       direction = +1 means window should go to the next higher scaler
  
        @param direction  Described above
-       @param type       The scaler to use if direction is set to 0
      */
!     bool scale(int direction, const string& type = "zoom1x");
  
      /**
--- 187,198 ----
  
      /**
!       This method is called when the user wants to switch to the next available
!       video mode (functionality depends on fullscreen or windowed mode).
!       direction = -1 means go to the next lower video mode
!       direction = +1 means go to the next higher video mode
  
        @param direction  Described above
      */
!     bool changeVidMode(int direction);
  
      /**
***************
*** 288,292 ****
      void drawString(const GUI::Font* font, const string& str, int x, int y, int w,
                      int color, TextAlignment align = kTextAlignLeft,
!                     int deltax = 0, bool useEllipsis = true);
  
      /**
--- 279,283 ----
      void drawString(const GUI::Font* font, const string& str, int x, int y, int w,
                      int color, TextAlignment align = kTextAlignLeft,
! 	                    int deltax = 0, bool useEllipsis = true);
  
      /**
***************
*** 295,358 ****
      virtual void stateChanged(EventHandler::State state) { }
  
    public:
-     //////////////////////////////////////////////////////////////////////
-     // The following methods are system-specific and must be implemented
-     // in derived classes.
-     //////////////////////////////////////////////////////////////////////
-     /**
-       This method is called to initialize the subsystem-specific video mode
-       with the given scaler.
-     */
-     virtual bool initSubsystem() = 0;
- 
-     /**
-       This method is called to query the type of the FrameBuffer.
-     */
-     virtual BufferType type() = 0;
- 
-     /**
-       This method is called to provide information about the FrameBuffer.
-     */
-     virtual string about() = 0;
- 
-     /**
-       This method is called to set the aspect ratio of the screen.
-     */
-     virtual void setAspectRatio() = 0;
- 
-     /**
-       This method is called to change to the given scaler type.
- 
-       @param scaler  The scaler to use for rendering the mediasource
-     */
-     virtual void setScaler(Scaler scaler) = 0;
- 
-     /**
-       This method is called whenever the screen needs to be recreated.
-       It updates the global screen variable.
-     */
-     virtual bool createScreen() = 0;
- 
-     /**
-       Switches between the filtering options in the video subsystem.
-     */
-     virtual void toggleFilter() = 0;
- 
-     /**
-       This method should be called anytime the MediaSource needs to be redrawn
-       to the screen.
-     */
-     virtual void drawMediaSource() = 0;
- 
-     /**
-       This method is called before any drawing is done (per-frame).
-     */
-     virtual void preFrameUpdate() = 0;
- 
-     /**
-       This method is called after any drawing is done (per-frame).
-     */
-     virtual void postFrameUpdate() = 0;
- 
      /**
        This method is called to get the specified scanline data.
--- 286,294 ----
      virtual void stateChanged(EventHandler::State state) { }
  
+   //////////////////////////////////////////////////////////////////////
+   // The following methods are system-specific and must be implemented
+   // in derived classes.
+   //////////////////////////////////////////////////////////////////////
    public:
      /**
        This method is called to get the specified scanline data.
***************
*** 364,376 ****
  
      /**
-       This method is called to map a given r,g,b triple to the screen palette.
- 
-       @param r  The red component of the color.
-       @param g  The green component of the color.
-       @param b  The blue component of the color.
-     */
-     virtual Uint32 mapRGB(Uint8 r, Uint8 g, Uint8 b) = 0;
- 
-     /**
        This method should be called to draw a horizontal line.
  
--- 300,303 ----
***************
*** 435,439 ****
        @param y  Y coordinate to translate
      */
!     virtual void translateCoords(Int32* x, Int32* y) = 0;
  
      /**
--- 362,366 ----
        @param y  Y coordinate to translate
      */
!     virtual void translateCoords(Int32& x, Int32& y) = 0;
  
      /**
***************
*** 453,456 ****
--- 380,439 ----
      virtual void enablePhosphor(bool enable, int blend) = 0;
  
+     /**
+       This method is called to query the type of the FrameBuffer.
+     */
+     virtual BufferType type() = 0;
+ 
+   protected:
+     /**
+       This method is called to initialize the video subsystem
+       with the given video mode.  Normally, it will also call setVidMode().
+     */
+     virtual bool initSubsystem(VideoMode mode) = 0;
+ 
+     /**
+       This method is called to change to the given video mode.
+ 
+       @param mode  The video mode to use for rendering the mediasource
+     */
+     virtual bool setVidMode(VideoMode mode) = 0;
+ 
+     /**
+       Switches between the filtering options in the video subsystem.
+     */
+     virtual void toggleFilter() = 0;
+ 
+     /**
+       This method should be called anytime the MediaSource needs to be redrawn
+       to the screen.
+     */
+     virtual void drawMediaSource() = 0;
+ 
+     /**
+       This method is called before any drawing is done (per-frame).
+     */
+     virtual void preFrameUpdate() = 0;
+ 
+     /**
+       This method is called after any drawing is done (per-frame).
+     */
+     virtual void postFrameUpdate() = 0;
+ 
+     /**
+       This method is called to map a given r,g,b triple to the screen palette.
+ 
+       @param r  The red component of the color.
+       @param g  The green component of the color.
+       @param b  The blue component of the color.
+     */
+     virtual Uint32 mapRGB(Uint8 r, Uint8 g, Uint8 b) = 0;
+ 
+     /**
+       This method is called to provide information about the FrameBuffer.
+     */
+     virtual string about() = 0;
+ 
+ 
+ 
    protected:
      // The parent system for the framebuffer
***************
*** 469,475 ****
      SDL_Rect myScreenDim;
  
-     // Dimensions of the desktop area
-     SDL_Rect myDesktopDim;
- 
      // The SDL video buffer
      SDL_Surface* myScreen;
--- 452,455 ----
***************
*** 482,488 ****
      Uint32 myAvgPalette[256][256];
  
-     // The aspect ratio of the window
-     float theAspectRatio;
- 
      // Indicates if the TIA area should be redrawn
      bool theRedrawTIAIndicator;
--- 462,465 ----
***************
*** 516,547 ****
  
      /**
!       Calculate the maximum window size that the current screen can hold.
!       If not supported by platform, always return 4.
      */
!     int maxWindowSizeForScreen();
  
      /**
!       Set the scalers available for this framebuffer based on current emulation
!       state and maximum window size.
      */
!     void setAvailableScalers();
  
      /**
!       Returns a scaler based on the current eventhandler mode and the value of direction.
!       If there's any error, default to 'zoom1x'.
!       direction = -1 means previous scaler based on value in 'name'
!       direction =  0 means actual scaler based on value in 'name'
!       direction = +1 means next scaler based on value in 'name'
! 
!       @param scaler     The reference to store the scaler we're looking for
!       @param direction  Described above
!       @param name       The name of the scaler
!     */
!     void getScaler(Scaler& scaler, int direction, const string& name);
  
!     /**
!       Get the current scaler based on the eventhandler mode.
      */
!     const string& currentScalerName();
  
    private:
--- 493,514 ----
  
      /**
!       Calculate the maximum level by which the base window can be zoomed and
!       still fit in the given screen dimensions.
      */
!     uInt32 maxWindowSizeForScreen(uInt32 screenWidth, uInt32 screenHeight);
  
      /**
!       Set all possible video modes (both windowed and fullscreen) available for
!       this framebuffer based on current emulation state and maximum window size.
      */
!     void setAvailableVidModes();
  
      /**
!       Returns an appropriate video mode based on the current eventhandler
!       state, taking into account the maximum size of the window.
  
!       @return  A valid VideoMode for this framebuffer
      */
!     VideoMode getSavedVidMode();
  
    private:
***************
*** 561,572 ****
      Message myMessage;
  
!     // The various scalers available in TIA vs. non-TIA mode
!     // For the foreseeable future, the UI scalers will be restricted
!     // from using the more advanced scalers
!     enum { kScalerListSize = 6 };
!     static Scaler ourScalers[kScalerListSize];
! 
!     // The list of scalers available in the current mode
!     Common::Array<Scaler*> myScalerList;
  };
  
--- 528,535 ----
      Message myMessage;
  
!     // The list of all available video modes for this framebuffer
!     VideoModeList myWindowedModeList;
!     VideoModeList myFullscreenModeList;
!     VideoModeList* myCurrentModeList;
  };
  

Index: OSystem.cxx
===================================================================
RCS file: /cvsroot/stella/stella/src/emucore/OSystem.cxx,v
retrieving revision 1.96
retrieving revision 1.97
diff -C2 -d -r1.96 -r1.97
*** OSystem.cxx	6 Feb 2007 23:34:33 -0000	1.96
--- OSystem.cxx	20 Jun 2007 16:33:22 -0000	1.97
***************
*** 66,69 ****
--- 66,85 ----
      myConsoleFont(NULL)
  {
+ #ifdef DISPLAY_OPENGL
+   myFeatures += "OpenGL ";
+ #endif
+ #ifdef SOUND_SUPPORT
+   myFeatures += "Sound ";
+ #endif
+ #ifdef JOYSTICK_SUPPORT
+   myFeatures += "Joystick ";
+ #endif
+ #ifdef DEBUGGER_SUPPORT
+   myFeatures += "Debugger ";
+ #endif
+ #ifdef CHEATCODE_SUPPORT
+   myFeatures += "Cheats";
+ #endif
+ 
  #if 0
    // Debugging info for the GUI widgets
***************
*** 132,135 ****
--- 148,156 ----
  bool OSystem::create()
  {
+   // Get relevant information about the video hardware
+   // This must be done before any graphics context is created, since
+   // it may be needed to initialize the size of graphical objects
+   queryVideoHardware();
+ 
    // Create fonts to draw text
    myFont         = new GUI::Font(GUI::stellaDesc);
***************
*** 162,182 ****
    createSound();
  
-   // Determine which features were conditionally compiled into Stella
- #ifdef DISPLAY_OPENGL
-   myFeatures += "OpenGL ";
- #endif
- #ifdef SOUND_SUPPORT
-   myFeatures += "Sound ";
- #endif
- #ifdef JOYSTICK_SUPPORT
-   myFeatures += "Joystick ";
- #endif
- #ifdef DEBUGGER_SUPPORT
-   myFeatures += "Debugger ";
- #endif
- #ifdef CHEATCODE_SUPPORT
-   myFeatures += "Cheats";
- #endif
- 
    return true;
  }
--- 183,186 ----
***************
*** 499,505 ****
        return false;
  
!     *image = new uInt8[512 * 1024];
!     in.read((char*)(*image), 512 * 1024);
!     *size = in.gcount();
      in.close();
    }
--- 503,511 ----
        return false;
  
!     in.seekg(0, ios::end);
!     *size = (int)in.tellg();
!     in.seekg(0, ios::beg);
!     *image = new uInt8[*size];
!     in.read((char*)(*image), *size);
      in.close();
    }
***************
*** 704,707 ****
--- 710,752 ----
  
  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ void OSystem::queryVideoHardware()
+ {
+   if(SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER) < 0)
+     return;
+ 
+   // First get the maximum windowed desktop resolution
+   const SDL_VideoInfo* info = SDL_GetVideoInfo();
+   myDesktopWidth  = info->current_w;
+   myDesktopHeight = info->current_h;
+ 
+   // Then get the valid fullscreen modes
+   // If there are any errors, just use the desktop resolution
+   ostringstream buf;
+   SDL_Rect** modes = SDL_ListModes(NULL, SDL_FULLSCREEN);
+   if((modes == (SDL_Rect**)0) || (modes == (SDL_Rect**)-1))
+   {
+     Resolution r;
+     r.width  = myDesktopWidth;
+     r.height = myDesktopHeight;
+     buf << r.width << "x" << r.height;
+     r.name = buf.str();
+     myResolutions.push_back(r);
+   }
+   else
+   {
+     for(uInt32 i = 0; modes[i]; ++i)
+     {
+       Resolution r;
+       r.width  = modes[i]->w;
+       r.height = modes[i]->h;
+       buf.str("");
+       buf << r.width << "x" << r.height;
+       r.name = buf.str();
+       myResolutions.insert_at(0, r);  // insert in opposite (of descending) order
+     }
+   }
+ }
+ 
+ // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  /*
    Palette is defined as follows:

Index: OSystem.hxx
===================================================================
RCS file: /cvsroot/stella/stella/src/emucore/OSystem.hxx,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** OSystem.hxx	1 Jan 2007 18:04:49 -0000	1.51
--- OSystem.hxx	20 Jun 2007 16:33:22 -0000	1.52
***************
*** 29,32 ****
--- 29,33 ----
  class VideoDialog;
  
+ #include "Array.hxx"
  #include "EventHandler.hxx"
  #include "FrameBuffer.hxx"
***************
*** 34,42 ****
  #include "Settings.hxx"
  #include "Console.hxx"
- #include "StringList.hxx"
  #include "Font.hxx"
  
  #include "bspf.hxx"
  
  
  /**
--- 35,48 ----
  #include "Settings.hxx"
  #include "Console.hxx"
  #include "Font.hxx"
  
  #include "bspf.hxx"
  
+ struct Resolution {
+   uInt32 width;
+   uInt32 height;
+   string name;
+ };
+ typedef Common::Array<Resolution> ResolutionList;
  
  /**
***************
*** 195,198 ****
--- 201,217 ----
  
      /**
+       Get the maximum dimensions of a window for the video hardware.
+     */
+     const uInt32 desktopWidth() const  { return myDesktopWidth; }
+     const uInt32 desktopHeight() const { return myDesktopHeight; }
+ 
+     /**
+       Get the supported fullscreen resolutions for the video hardware.
+ 
+       @return  An array of supported resolutions
+     */
+     const ResolutionList& supportedResolutions() const { return myResolutions; }
+ 
+     /**
        Return the default directory for storing data.
      */
***************
*** 304,312 ****
      virtual uInt32 getTicks() = 0;
  
-     /**
-       This method queries the dimensions of the screen for the given device.
-     */
-     virtual void getScreenDimensions(int& width, int& height) = 0;
- 
      //////////////////////////////////////////////////////////////////////
      // The following methods are system-specific and can be overrided in
--- 323,326 ----
***************
*** 358,361 ****
--- 372,381 ----
    protected:
      /**
+       Query the OSystem video hardware for resolution information.
+     */
+     virtual void queryVideoHardware();
+ 
+   protected:
+     /**
        Set the base directory for all Stella files
      */
***************
*** 416,419 ****
--- 436,445 ----
      CheatManager* myCheatManager;
  
+     // Maximum dimensions of the desktop area
+     uInt32 myDesktopWidth, myDesktopHeight;
+ 
+     // Supported fullscreen resolutions
+     ResolutionList myResolutions;
+ 
      // Number of times per second to iterate through the main loop
      uInt32 myDisplayFrameRate;
***************
*** 457,460 ****
--- 483,489 ----
      TimingInfo myTimingInfo;
  
+     // Capabilities for this OSystem
+     uInt32 myCapabilities;
+ 
      // Table of RGB values for GUI elements
      static uInt32 ourGUIColors[kNumUIPalettes][kNumColors-256];

Index: Settings.cxx
===================================================================
RCS file: /cvsroot/stella/stella/src/emucore/Settings.cxx,v
retrieving revision 1.116
retrieving revision 1.117
diff -C2 -d -r1.116 -r1.117
*** Settings.cxx	6 Feb 2007 23:34:33 -0000	1.116
--- Settings.cxx	20 Jun 2007 16:33:22 -0000	1.117
***************
*** 35,49 ****
    // Add options that are common to all versions of Stella
    setInternal("video", "soft");
-   setInternal("dirtyrects", "false"); // This only becomes useful at high resolutions
  
    setInternal("gl_filter", "nearest");
!   setInternal("gl_aspect", "2.0");
!   setInternal("gl_fsmax", "true");
    setInternal("gl_lib", "libGL.so");
    setInternal("gl_vsync", "false");
  
!   setInternal("scale_ui", "zoom2x");
!   setInternal("scale_tia", "zoom2x");
    setInternal("fullscreen", "false");
    setInternal("center", "true");
    setInternal("grabmouse", "false");
--- 35,48 ----
    // Add options that are common to all versions of Stella
    setInternal("video", "soft");
  
    setInternal("gl_filter", "nearest");
!   setInternal("gl_fsmax", "never");
    setInternal("gl_lib", "libGL.so");
    setInternal("gl_vsync", "false");
  
!   setInternal("zoom_ui", "2");
!   setInternal("zoom_tia", "2");
    setInternal("fullscreen", "false");
+   setInternal("fullres", "");
    setInternal("center", "true");
    setInternal("grabmouse", "false");
***************
*** 81,85 ****
    setInternal("modtime", "");
    setInternal("debugheight", "0");
!   setInternal("launchersize", "2");
    setInternal("uipalette", "0");
    setInternal("autoslot", "false");
--- 80,84 ----
    setInternal("modtime", "");
    setInternal("debugheight", "0");
!   setInternal("launcherres", "320x240");
    setInternal("uipalette", "0");
    setInternal("autoslot", "false");
***************
*** 221,227 ****
      setInternal("gl_filter", "nearest");
  
!   float f = getFloat("gl_aspect");
!   if(f < 1.1 || f > 2.0)
!     setInternal("gl_aspect", "2.0");
  #endif
  
--- 220,226 ----
      setInternal("gl_filter", "nearest");
  
!   s = getString("gl_fsmax");
!   if(s != "never" && s != "ui" && s != "tia" && s != "always")
!     setInternal("gl_fsmax", "never");
  #endif
  
***************
*** 238,250 ****
  #endif
  
!   s = getString("scale_ui");
!   if(s != "zoom1x" && s != "zoom2x" && s != "zoom3x" &&
!      s != "zoom4x" && s != "zoom5x" && s != "zoom6x")
!     setInternal("scale_ui", "zoom1x");
  
!   s = getString("scale_tia");
!   if(s != "zoom1x" && s != "zoom2x" && s != "zoom3x" &&
!      s != "zoom4x" && s != "zoom5x" && s != "zoom6x")
!     setInternal("scale_tia", "zoom1x");
  
    i = getInt("paddle");
--- 237,247 ----
  #endif
  
!   i = getInt("zoom_ui");
!   if(i < 1 || i > 10)
!     setInternal("zoom_ui", "2");
  
!   i = getInt("zoom_tia");
!   if(i < 1 || i > 10)
!     setInternal("zoom_tia", "2");
  
    i = getInt("paddle");
***************
*** 284,295 ****
      << "                 nearest         Normal scaling (GL_NEAREST)\n"
      << "                 linear          Blurred scaling (GL_LINEAR)\n"
!     << "  -gl_aspect    <number>       Scale the width by the given amount\n"
!     << "  -gl_fsmax     <1|0>          Use the largest available screenmode in fullscreen OpenGL\n"
      << "  -gl_vsync     <1|0>          Enable synchronize to vertical blank interrupt\n"
      << endl
    #endif
!     << "  -scale_tia    <scaler>       Use the specified scaler in emulation mode\n"
!     << "  -scale_ui     <scaler>       Use the specified scaler in non-emulation mode (ROM browser/debugger)\n"
      << "  -fullscreen   <1|0>          Play the game in fullscreen mode\n"
      << "  -center       <1|0>          Centers game window (if possible)\n"
      << "  -grabmouse    <1|0>          Keeps the mouse in the game window\n"
--- 281,293 ----
      << "                 nearest         Normal scaling (GL_NEAREST)\n"
      << "                 linear          Blurred scaling (GL_LINEAR)\n"
!     << "  -gl_fsmax     <never|always| Stretch GL image in fullscreen mode\n"
!     << "                 ui|tia\n"
      << "  -gl_vsync     <1|0>          Enable synchronize to vertical blank interrupt\n"
      << endl
    #endif
!     << "  -zoom_tia     <zoom>         Use the specified zoom level in emulation mode\n"
!     << "  -zoom_ui      <zoom>         Use the specified zoom level in non-emulation mode (ROM browser/debugger)\n"
      << "  -fullscreen   <1|0>          Play the game in fullscreen mode\n"
+     << "  -fullres      <res>          The resolution to use in fullscreen mode\n"
      << "  -center       <1|0>          Centers game window (if possible)\n"
      << "  -grabmouse    <1|0>          Keeps the mouse in the game window\n"
***************
*** 330,334 ****
      << "  -listrominfo                 Display contents of stella.pro, one line per ROM entry\n"
      << "  -rominfo      <rom>          Display detailed information for the given ROM\n"
!     << "  -launchersize <1|2|3>        Set the size of the ROM launcher\n"
      << "  -uipalette    <1|2>          Used the specified palette for UI elements\n"
      << "  -help                        Show the text you're now reading\n"
--- 328,332 ----
      << "  -listrominfo                 Display contents of stella.pro, one line per ROM entry\n"
      << "  -rominfo      <rom>          Display detailed information for the given ROM\n"
!     << "  -launcherres  <res>          The resolution to use in ROM launcher mode\n"
      << "  -uipalette    <1|2>          Used the specified palette for UI elements\n"
      << "  -help                        Show the text you're now reading\n"
***************
*** 462,465 ****
--- 460,473 ----
  
  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ void Settings::getSize(const string& key, int& x, int& y) const
+ {
+   string size = getString(key);
+   replace(size.begin(), size.end(), 'x', ' ');
+   istringstream buf(size);
+   buf >> x;
+   buf >> y;
+ }
+ 
+ // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  int Settings::getInt(const string& key) const
  {
***************
*** 530,533 ****
--- 538,549 ----
  
  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ void Settings::setSize(const string& key, const int value1, const int value2)
+ {
+   ostringstream buf;
+   buf << value1 << "x" << value2;
+   setString(key, buf.str());
+ }
+ 
+ // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  int Settings::getInternalPos(const string& key) const
  {

Index: Settings.hxx
===================================================================
RCS file: /cvsroot/stella/stella/src/emucore/Settings.hxx,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** Settings.hxx	1 Jan 2007 18:04:49 -0000	1.31
--- Settings.hxx	20 Jun 2007 16:33:22 -0000	1.32
***************
*** 75,79 ****
      /**
        Get the value assigned to the specified key.  If the key does
!       not exist then 0 is returned.
  
        @param key The key of the setting to lookup
--- 75,79 ----
      /**
        Get the value assigned to the specified key.  If the key does
!       not exist then -1 is returned.
  
        @param key The key of the setting to lookup
***************
*** 110,113 ****
--- 110,122 ----
  
      /**
+       Get the x*y size assigned to the specified key.  If the key does
+       not exist (or is invalid) then results are -1 for each item.
+ 
+       @param key The key of the setting to lookup
+       @return The x and y values encoded in the key
+     */
+     void getSize(const string& key, int& x, int& y) const;
+ 
+     /**
        Set the value associated with key to the given value.
  
***************
*** 141,144 ****
--- 150,161 ----
      void setString(const string& key, const string& value);
  
+     /**
+       Set the value associated with key to the given value.
+ 
+       @param key   The key of the setting
+       @param value The value to assign to the setting
+     */
+     void setSize(const string& key, const int value1, const int value2);
+ 
    private:
      // Copy constructor isn't supported by this class so make it private

Update of /cvsroot/stella/stella/src/unix
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv13346/src/unix

Modified Files:
	OSystemUNIX.cxx OSystemUNIX.hxx 
Log Message:
Added 'WINDOWED_SUPPORT' compile-time argument, which can be used for
those systems which don't actually have a windowing environment.  When
this is set, toggling from fullscreen will not be possible, and certain
window-related UI functions will not be accessible.

Completely revamped video subsystem.  Windowed and fullscreen modes are
now dealt with separately.  Windows can be zoomed using the 'zoom_ui'
and 'zoom_tia' arguments.  Fullscreen modes are now set by resolution,
not zoom, so you can specify to always use a certain fullscreen
resolution, and the images will be scaled appropriately.  This also
fixes the fullscreen issues on widescreen monitors; just select a
widescreen video mode, and the aspect ratio will always be correct.

Removed dirty-rect support for software rendering of the TIA image,
as it ended up being slower than just updating the entire image.
For those resolutions where it will start to slow down (1024x768 or
higher), one should be using OpenGL.

Fixed issue in Windows when returning from fullscreen mode made the
window constantly 'shrink' in size.  It was related to auto-detecting
the desktop resolution, which is really the job of SDL.  As such, all
further releases of Stella will require SDL 1.2.10, which includes
this auto-detection code internally.

Made ROM launcher resizable, configurable in sizes from 320x240
to 800x600.  Updated the UIDialog to change these quantities from the
UI (Stella will need to be restarted for it to take effect).

Removed aspect ratio support, since it was causing problems, and the
new fullscreen mode work has made it obsolete.  i *may* consider it
again in the future, if there's sufficient demand.

Added 'fullres' commandline argument, used to set the fullscreen
resolution.

Added 'launcherres' commandline argument, used to set the ROM
launcher resolution.  This replaces 'launchersize' argument, which
has been removed.

Changed 'scale_ui' and 'scale_tia' to 'zoom_ui' and 'zoom_tia',
respectively.  Their function remains the same.

Changed meaning of 'gl_fsmax' argument to specify what modes to use
fullscreen OpenGL scaling (previously, this was a boolean, and
didn't consider different modes).



Index: OSystemUNIX.cxx
===================================================================
RCS file: /cvsroot/stella/stella/src/unix/OSystemUNIX.cxx,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** OSystemUNIX.cxx	1 Jan 2007 18:04:55 -0000	1.25
--- OSystemUNIX.cxx	20 Jun 2007 16:33:23 -0000	1.26
***************
*** 18,22 ****
  
  #include <SDL.h>
- #include <SDL_syswm.h>
  
  #include <cstdlib>
--- 18,21 ----
***************
*** 82,108 ****
  #endif
  }
- 
- // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- void OSystemUNIX::getScreenDimensions(int& width, int& height)
- {
-   // We might need to temporarily enable VIDEO support to check
-   // screen dimensions
-   bool isAlreadyInitialized = (SDL_WasInit(SDL_INIT_VIDEO) & SDL_INIT_VIDEO) > 0;
-   if(!isAlreadyInitialized)
-     SDL_Init(SDL_INIT_VIDEO);
- 
-   SDL_SysWMinfo myWMInfo;
-   SDL_VERSION(&myWMInfo.version);
-   if(SDL_GetWMInfo(&myWMInfo) > 0 && myWMInfo.subsystem == SDL_SYSWM_X11)
-   {
-     myWMInfo.info.x11.lock_func();
-     width  = DisplayWidth(myWMInfo.info.x11.display,
-                DefaultScreen(myWMInfo.info.x11.display));
-     height = DisplayHeight(myWMInfo.info.x11.display,
-                DefaultScreen(myWMInfo.info.x11.display));
-     myWMInfo.info.x11.unlock_func();
-   }
- 
-   if(!isAlreadyInitialized)
-     SDL_QuitSubSystem(SDL_INIT_VIDEO);
- }
--- 81,82 ----

Index: OSystemUNIX.hxx
===================================================================
RCS file: /cvsroot/stella/stella/src/unix/OSystemUNIX.hxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** OSystemUNIX.hxx	1 Jan 2007 18:04:55 -0000	1.14
--- OSystemUNIX.hxx	20 Jun 2007 16:33:23 -0000	1.15
***************
*** 22,26 ****
  #include "bspf.hxx"
  
- 
  /**
    This class defines UNIX-like OS's (Linux) system specific settings.
--- 22,25 ----
***************
*** 42,46 ****
      virtual ~OSystemUNIX();
  
-   public:
      /**
        This method returns number of ticks in microseconds.
--- 41,44 ----
***************
*** 49,58 ****
      */
      uInt32 getTicks();
- 
-     /**
-       This method queries the dimensions of the screen for this hardware.
-       It is assumed that a UNIX SDL framebuffer is using X11.
-     */
-     void getScreenDimensions(int& width, int& height);
  };
  
--- 47,50 ----

Update of /cvsroot/stella/stella/src/psp/data
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv13346/src/psp/data

Removed Files:
	ICON0.PNG PIC1.PNG stellarc.psp 
Log Message:
Added 'WINDOWED_SUPPORT' compile-time argument, which can be used for
those systems which don't actually have a windowing environment.  When
this is set, toggling from fullscreen will not be possible, and certain
window-related UI functions will not be accessible.

Completely revamped video subsystem.  Windowed and fullscreen modes are
now dealt with separately.  Windows can be zoomed using the 'zoom_ui'
and 'zoom_tia' arguments.  Fullscreen modes are now set by resolution,
not zoom, so you can specify to always use a certain fullscreen
resolution, and the images will be scaled appropriately.  This also
fixes the fullscreen issues on widescreen monitors; just select a
widescreen video mode, and the aspect ratio will always be correct.

Removed dirty-rect support for software rendering of the TIA image,
as it ended up being slower than just updating the entire image.
For those resolutions where it will start to slow down (1024x768 or
higher), one should be using OpenGL.

Fixed issue in Windows when returning from fullscreen mode made the
window constantly 'shrink' in size.  It was related to auto-detecting
the desktop resolution, which is really the job of SDL.  As such, all
further releases of Stella will require SDL 1.2.10, which includes
this auto-detection code internally.

Made ROM launcher resizable, configurable in sizes from 320x240
to 800x600.  Updated the UIDialog to change these quantities from the
UI (Stella will need to be restarted for it to take effect).

Removed aspect ratio support, since it was causing problems, and the
new fullscreen mode work has made it obsolete.  i *may* consider it
again in the future, if there's sufficient demand.

Added 'fullres' commandline argument, used to set the fullscreen
resolution.

Added 'launcherres' commandline argument, used to set the ROM
launcher resolution.  This replaces 'launchersize' argument, which
has been removed.

Changed 'scale_ui' and 'scale_tia' to 'zoom_ui' and 'zoom_tia',
respectively.  Their function remains the same.

Changed meaning of 'gl_fsmax' argument to specify what modes to use
fullscreen OpenGL scaling (previously, this was a boolean, and
didn't consider different modes).



--- ICON0.PNG DELETED ---

--- PIC1.PNG DELETED ---

--- stellarc.psp DELETED ---

Update of /cvsroot/stella/stella/src/psp
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv13346/src/psp

Removed Files:
	FSNodePSP.cxx FrameBufferPSP.cxx FrameBufferPSP.hxx 
	OSystemPSP.cxx OSystemPSP.hxx SettingsPSP.cxx SettingsPSP.hxx 
	module.mk pspstdint.h 
Log Message:
Added 'WINDOWED_SUPPORT' compile-time argument, which can be used for
those systems which don't actually have a windowing environment.  When
this is set, toggling from fullscreen will not be possible, and certain
window-related UI functions will not be accessible.

Completely revamped video subsystem.  Windowed and fullscreen modes are
now dealt with separately.  Windows can be zoomed using the 'zoom_ui'
and 'zoom_tia' arguments.  Fullscreen modes are now set by resolution,
not zoom, so you can specify to always use a certain fullscreen
resolution, and the images will be scaled appropriately.  This also
fixes the fullscreen issues on widescreen monitors; just select a
widescreen video mode, and the aspect ratio will always be correct.

Removed dirty-rect support for software rendering of the TIA image,
as it ended up being slower than just updating the entire image.
For those resolutions where it will start to slow down (1024x768 or
higher), one should be using OpenGL.

Fixed issue in Windows when returning from fullscreen mode made the
window constantly 'shrink' in size.  It was related to auto-detecting
the desktop resolution, which is really the job of SDL.  As such, all
further releases of Stella will require SDL 1.2.10, which includes
this auto-detection code internally.

Made ROM launcher resizable, configurable in sizes from 320x240
to 800x600.  Updated the UIDialog to change these quantities from the
UI (Stella will need to be restarted for it to take effect).

Removed aspect ratio support, since it was causing problems, and the
new fullscreen mode work has made it obsolete.  i *may* consider it
again in the future, if there's sufficient demand.

Added 'fullres' commandline argument, used to set the fullscreen
resolution.

Added 'launcherres' commandline argument, used to set the ROM
launcher resolution.  This replaces 'launchersize' argument, which
has been removed.

Changed 'scale_ui' and 'scale_tia' to 'zoom_ui' and 'zoom_tia',
respectively.  Their function remains the same.

Changed meaning of 'gl_fsmax' argument to specify what modes to use
fullscreen OpenGL scaling (previously, this was a boolean, and
didn't consider different modes).



--- FSNodePSP.cxx DELETED ---

--- FrameBufferPSP.cxx DELETED ---

--- FrameBufferPSP.hxx DELETED ---

--- OSystemPSP.cxx DELETED ---

--- OSystemPSP.hxx DELETED ---

--- SettingsPSP.cxx DELETED ---

--- SettingsPSP.hxx DELETED ---

--- module.mk DELETED ---

--- pspstdint.h DELETED ---

Update of /cvsroot/stella/stella/src/gp2x
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv13346/src/gp2x

Modified Files:
	FrameBufferGP2X.cxx OSystemGP2X.cxx 
Log Message:
Added 'WINDOWED_SUPPORT' compile-time argument, which can be used for
those systems which don't actually have a windowing environment.  When
this is set, toggling from fullscreen will not be possible, and certain
window-related UI functions will not be accessible.

Completely revamped video subsystem.  Windowed and fullscreen modes are
now dealt with separately.  Windows can be zoomed using the 'zoom_ui'
and 'zoom_tia' arguments.  Fullscreen modes are now set by resolution,
not zoom, so you can specify to always use a certain fullscreen
resolution, and the images will be scaled appropriately.  This also
fixes the fullscreen issues on widescreen monitors; just select a
widescreen video mode, and the aspect ratio will always be correct.

Removed dirty-rect support for software rendering of the TIA image,
as it ended up being slower than just updating the entire image.
For those resolutions where it will start to slow down (1024x768 or
higher), one should be using OpenGL.

Fixed issue in Windows when returning from fullscreen mode made the
window constantly 'shrink' in size.  It was related to auto-detecting
the desktop resolution, which is really the job of SDL.  As such, all
further releases of Stella will require SDL 1.2.10, which includes
this auto-detection code internally.

Made ROM launcher resizable, configurable in sizes from 320x240
to 800x600.  Updated the UIDialog to change these quantities from the
UI (Stella will need to be restarted for it to take effect).

Removed aspect ratio support, since it was causing problems, and the
new fullscreen mode work has made it obsolete.  i *may* consider it
again in the future, if there's sufficient demand.

Added 'fullres' commandline argument, used to set the fullscreen
resolution.

Added 'launcherres' commandline argument, used to set the ROM
launcher resolution.  This replaces 'launchersize' argument, which
has been removed.

Changed 'scale_ui' and 'scale_tia' to 'zoom_ui' and 'zoom_tia',
respectively.  Their function remains the same.

Changed meaning of 'gl_fsmax' argument to specify what modes to use
fullscreen OpenGL scaling (previously, this was a boolean, and
didn't consider different modes).



Index: FrameBufferGP2X.cxx
===================================================================
RCS file: /cvsroot/stella/stella/src/gp2x/FrameBufferGP2X.cxx,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** FrameBufferGP2X.cxx	7 Jan 2007 17:59:52 -0000	1.21
--- FrameBufferGP2X.cxx	20 Jun 2007 16:33:22 -0000	1.22
***************
*** 41,48 ****
  
  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
! bool FrameBufferGP2X::initSubsystem()
  {
    // Create the screen
!   return createScreen();
  }
  
--- 41,48 ----
  
  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
! bool FrameBufferGP2X::initSubsystem(VideoMode mode)
  {
    // Create the screen
!   return setVidMode(mode);
  }
  
***************
*** 55,72 ****
  
  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
! void FrameBufferGP2X::setAspectRatio()
! {
!   // Aspect ratio correction not yet available in software mode
!   theAspectRatio = 1.0;
! }
! 
! // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
! void FrameBufferGP2X::setScaler(Scaler scaler)
! {
!   // Not supported, we always use 1x zoom
! }
! 
! // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
! bool FrameBufferGP2X::createScreen()
  {
    // Make sure to clear the screen, since we're using different resolutions,
--- 55,59 ----
  
  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
! bool FrameBufferGP2X::setVidMode(VideoMode mode)
  {
    // Make sure to clear the screen, since we're using different resolutions,

Index: OSystemGP2X.cxx
===================================================================
RCS file: /cvsroot/stella/stella/src/gp2x/OSystemGP2X.cxx,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** OSystemGP2X.cxx	24 Jan 2007 21:36:38 -0000	1.26
--- OSystemGP2X.cxx	20 Jun 2007 16:33:22 -0000	1.27
***************
*** 68,71 ****
--- 68,74 ----
    myPreviousEvents = new uInt8[8];  memset(myPreviousEvents, 0, 8);
    myCurrentEvents  = new uInt8[8];  memset(myCurrentEvents, 0, 8);
+ 
+   // GP2X doesn't have windowed mode; it's always in fullscreen
+   clearCapability(CAP_WINDOWED);
  }

Update of /cvsroot/stella/stella/src/common
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv13346/src/common

Modified Files:
	FrameBufferGL.cxx FrameBufferGL.hxx FrameBufferSoft.cxx 
	FrameBufferSoft.hxx 
Added Files:
	VideoModeList.hxx 
Log Message:
Added 'WINDOWED_SUPPORT' compile-time argument, which can be used for
those systems which don't actually have a windowing environment.  When
this is set, toggling from fullscreen will not be possible, and certain
window-related UI functions will not be accessible.

Completely revamped video subsystem.  Windowed and fullscreen modes are
now dealt with separately.  Windows can be zoomed using the 'zoom_ui'
and 'zoom_tia' arguments.  Fullscreen modes are now set by resolution,
not zoom, so you can specify to always use a certain fullscreen
resolution, and the images will be scaled appropriately.  This also
fixes the fullscreen issues on widescreen monitors; just select a
widescreen video mode, and the aspect ratio will always be correct.

Removed dirty-rect support for software rendering of the TIA image,
as it ended up being slower than just updating the entire image.
For those resolutions where it will start to slow down (1024x768 or
higher), one should be using OpenGL.

Fixed issue in Windows when returning from fullscreen mode made the
window constantly 'shrink' in size.  It was related to auto-detecting
the desktop resolution, which is really the job of SDL.  As such, all
further releases of Stella will require SDL 1.2.10, which includes
this auto-detection code internally.

Made ROM launcher resizable, configurable in sizes from 320x240
to 800x600.  Updated the UIDialog to change these quantities from the
UI (Stella will need to be restarted for it to take effect).

Removed aspect ratio support, since it was causing problems, and the
new fullscreen mode work has made it obsolete.  i *may* consider it
again in the future, if there's sufficient demand.

Added 'fullres' commandline argument, used to set the fullscreen
resolution.

Added 'launcherres' commandline argument, used to set the ROM
launcher resolution.  This replaces 'launchersize' argument, which
has been removed.

Changed 'scale_ui' and 'scale_tia' to 'zoom_ui' and 'zoom_tia',
respectively.  Their function remains the same.

Changed meaning of 'gl_fsmax' argument to specify what modes to use
fullscreen OpenGL scaling (previously, this was a boolean, and
didn't consider different modes).



--- NEW FILE: VideoModeList.hxx ---
//============================================================================
//
//   SSSS    tt          lll  lll       
//  SS  SS   tt           ll   ll        
//  SS     tttttt  eeee   ll   ll   aaaa 
//   SSSS    tt   ee  ee  ll   ll      aa
//      SS   tt   eeeeee  ll   ll   aaaaa  --  "An Atari 2600 VCS Emulator"
//  SS  SS   tt   ee      ll   ll  aa  aa
//   SSSS     ttt  eeeee llll llll  aaaaa
//
// Copyright (c) 1995-2007 by Bradford W. Mott and the Stella team
//
// See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: VideoModeList.hxx,v 1.1 2007/06/20 16:33:22 stephena Exp $
//============================================================================

#ifndef VIDMODE_LIST_HXX
#define VIDMODE_LIST_HXX

#include "Array.hxx"
#include "bspf.hxx"

struct VideoMode {
  uInt32 image_x, image_y, image_w, image_h;
  uInt32 screen_w, screen_h;
  uInt32 zoom;
  string name;
};

/**
  This class implements an iterator around an array of VideoMode objects.

  @author  Stephen Anthony
  @version $Id: VideoModeList.hxx,v 1.1 2007/06/20 16:33:22 stephena Exp $
*/
class VideoModeList
{
  public:
    VideoModeList() : myIdx(-1) { }

    void add(VideoMode mode) { myModeList.push_back(mode); }

    void clear() { myModeList.clear(); }

    bool isEmpty() const { return myModeList.isEmpty(); }

    uInt32 size() const { return myModeList.size(); }

    const VideoMode& previous()
    {
      --myIdx;
      if(myIdx < 0) myIdx = myModeList.size() - 1;
      return current();
    }

    const VideoMode& current() const
    {
      return myModeList[myIdx];
    }

    const VideoMode& next()
    {
      myIdx = (myIdx + 1) % myModeList.size();
      return current();
    }

    void setByResolution(uInt32 width, uInt32 height)
    {
      // Find the largest resolution within the given bounds
      myIdx = 0;
      for(unsigned int i = myModeList.size() - 1; i; --i)
      {
        if(myModeList[i].screen_w <= width && myModeList[i].screen_h <= height)
        {
          myIdx = i;
          break;
        }
      }
    }

    void setByZoom(uInt32 zoom)
    {
      // Find the largest zoom within the given bounds
      myIdx = 0;
      for(unsigned int i = myModeList.size() - 1; i; --i)
      {
        if(myModeList[i].zoom <= zoom)
        {
          myIdx = i;
          break;
        }
      }
    }

    static bool modesAreEqual(const VideoMode& m1, const VideoMode& m2)
    {
      return (m1.image_x == m2.image_x) &&
             (m1.image_y == m2.image_y) &&
             (m1.image_w == m2.image_w) &&
             (m1.image_h == m2.image_h) &&
             (m1.screen_w == m2.screen_w) &&
             (m1.screen_h == m2.screen_h) &&
             (m1.zoom == m2.zoom) &&
             (m1.name == m2.name);
    }

  private:
    Common::Array<VideoMode> myModeList;
    int myIdx;
};

#endif

Index: FrameBufferGL.cxx
===================================================================
RCS file: /cvsroot/stella/stella/src/common/FrameBufferGL.cxx,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -d -r1.86 -r1.87
*** FrameBufferGL.cxx	15 Jan 2007 00:07:51 -0000	1.86
--- FrameBufferGL.cxx	20 Jun 2007 16:33:22 -0000	1.87
***************
*** 89,97 ****
      myTexture(NULL),
      myHaveTexRectEXT(false),
-     myScreenmode(0),
-     myScreenmodeCount(0),
      myFilterParamName("GL_NEAREST"),
!     myZoomLevel(1),
!     myFSScaleFactor(1.0),
      myDirtyFlag(true)
  {
--- 89,94 ----
      myTexture(NULL),
      myHaveTexRectEXT(false),
      myFilterParamName("GL_NEAREST"),
!     myScaleFactor(1.0),
      myDirtyFlag(true)
  {
***************
*** 187,191 ****
  
  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
! bool FrameBufferGL::initSubsystem()
  {
    mySDLFlags |= SDL_OPENGL;
--- 184,188 ----
  
  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
! bool FrameBufferGL::initSubsystem(VideoMode mode)
  {
    mySDLFlags |= SDL_OPENGL;
***************
*** 208,220 ****
    }
  
-   // Get the valid OpenGL screenmodes
-   myScreenmodeCount = 0;
-   myScreenmode = SDL_ListModes(NULL, SDL_FULLSCREEN|SDL_OPENGL);
-   if((myScreenmode != (SDL_Rect**) -1) && (myScreenmode != (SDL_Rect**) 0))
-     for(uInt32 i = 0; myScreenmode[i]; ++i)
-       myScreenmodeCount++;
- 
    // Create the screen
!   if(!createScreen())
      return false;
  
--- 205,210 ----
    }
  
    // Create the screen
!   if(!setVidMode(mode))
      return false;
  
***************
*** 249,268 ****
  
  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
! void FrameBufferGL::setAspectRatio()
  {
!   theAspectRatio = myOSystem->settings().getFloat("gl_aspect") / 2;
!   if(theAspectRatio <= 0.0)
!     theAspectRatio = 1.0;
! }
  
! // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
! void FrameBufferGL::setScaler(Scaler scaler)
! {
!   myZoomLevel = scaler.zoom;
! }
  
- // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- bool FrameBufferGL::createScreen()
- {
    SDL_GL_SetAttribute( SDL_GL_RED_SIZE,   myRGB[0] );
    SDL_GL_SetAttribute( SDL_GL_GREEN_SIZE, myRGB[1] );
--- 239,291 ----
  
  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
! bool FrameBufferGL::setVidMode(VideoMode mode)
  {
!   myScreenDim.x = myScreenDim.y = 0;
!   myScreenDim.w = mode.screen_w;
!   myScreenDim.h = mode.screen_h;
  
!   myImageDim.x = mode.image_x;
!   myImageDim.y = mode.image_y;
!   myImageDim.w = mode.image_w;
!   myImageDim.h = mode.image_h;
! 
!   // Activate stretching if its been requested and it makes sense to do so
!   myScaleFactor = 1.0;
!   if(fullScreen() && (mode.image_w < mode.screen_w) &&
!      (mode.image_h < mode.screen_h))
!   {
!     const string& gl_fsmax = myOSystem->settings().getString("gl_fsmax");
!     bool inUIMode =
!       myOSystem->eventHandler().state() == EventHandler::S_LAUNCHER ||
!       myOSystem->eventHandler().state() == EventHandler::S_DEBUGGER;
! 
!     // Only stretch in certain modes
!     if((gl_fsmax == "always") || 
!        (inUIMode && gl_fsmax == "ui") ||
!        (!inUIMode && gl_fsmax == "tia"))
!     {
!       float scaleX = float(myImageDim.w) / myScreenDim.w;
!       float scaleY = float(myImageDim.h) / myScreenDim.h;
! 
!       if(scaleX > scaleY)
!         myScaleFactor = float(myScreenDim.w) / myImageDim.w;
!       else
!         myScaleFactor = float(myScreenDim.h) / myImageDim.h;
! 
!       myImageDim.w = (Uint16) (myScaleFactor * myImageDim.w);
!       myImageDim.h = (Uint16) (myScaleFactor * myImageDim.h);
!       myImageDim.x = (myScreenDim.w - myImageDim.w) / 2;
!       myImageDim.y = (myScreenDim.h - myImageDim.h) / 2;
!     }
!   }
! 
!   // Combine the zoom level and scaler into one quantity
!   myScaleFactor *= (float) mode.zoom;
! 
!   GLdouble orthoWidth  = (GLdouble)
!       (myImageDim.w / myScaleFactor);
!   GLdouble orthoHeight = (GLdouble)
!       (myImageDim.h / myScaleFactor);
  
    SDL_GL_SetAttribute( SDL_GL_RED_SIZE,   myRGB[0] );
    SDL_GL_SetAttribute( SDL_GL_GREEN_SIZE, myRGB[1] );
***************
*** 277,285 ****
    SDL_GL_SetAttribute( SDL_GL_SWAP_CONTROL, vsync );
  
-   // Set the screen coordinates
-   GLdouble orthoWidth  = 0.0;
-   GLdouble orthoHeight = 0.0;
-   setDimensions(&orthoWidth, &orthoHeight);
- 
    // Create screen containing GL context
    myScreen = SDL_SetVideoMode(myScreenDim.w, myScreenDim.h, 0, mySDLFlags);
--- 300,303 ----
***************
*** 292,296 ****
    // Check for some extensions that can potentially speed up operation
    const char* extensions = (const char *) p_glGetString(GL_EXTENSIONS);
!   myHaveTexRectEXT       = strstr(extensions, "ARB_texture_rectangle") != NULL;
  
    // Initialize GL display
--- 310,314 ----
    // Check for some extensions that can potentially speed up operation
    const char* extensions = (const char *) p_glGetString(GL_EXTENSIONS);
!   myHaveTexRectEXT = strstr(extensions, "ARB_texture_rectangle") != NULL;
  
    // Initialize GL display
***************
*** 545,553 ****
  
  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
! void FrameBufferGL::translateCoords(Int32* x, Int32* y)
  {
    // Wow, what a mess :)
!   *x = (Int32) (((*x - myImageDim.x) / (myZoomLevel * myFSScaleFactor * theAspectRatio)));
!   *y = (Int32) (((*y - myImageDim.y) / (myZoomLevel * myFSScaleFactor)));
  }
  
--- 563,571 ----
  
  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
! void FrameBufferGL::translateCoords(Int32& x, Int32& y)
  {
    // Wow, what a mess :)
!   x = (Int32) ((x - myImageDim.x) / myScaleFactor);
!   y = (Int32) ((y - myImageDim.y) / myScaleFactor);
  }
  
***************
*** 668,777 ****
  
  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- void FrameBufferGL::setDimensions(GLdouble* orthoWidth, GLdouble* orthoHeight)
- {
-   // We always know the initial image width and height
-   // We have to determine final image dimensions as well as screen dimensions
-   myImageDim.x = 0;
-   myImageDim.y = 0;
-   myImageDim.w = (Uint16) (myBaseDim.w * myZoomLevel * theAspectRatio);
-   myImageDim.h = (Uint16) (myBaseDim.h * myZoomLevel);
-   myScreenDim  = myImageDim;
- 
-   myFSScaleFactor = 1.0f;
- 
-   // Determine if we're in fullscreen or windowed mode
-   // In fullscreen mode, we clip the SDL screen to known resolutions
-   // In windowed mode, we use the actual image resolution for the SDL screen
-   if(mySDLFlags & SDL_FULLSCREEN)
-   {
-     float scaleX = 0.0f;
-     float scaleY = 0.0f;
- 
-     // When in a fullscreen, most text mode, attempt to do 'nice' scaling
-     // This means scaling will only use integral values (1, 2, 3, ...)
-     bool gl_fsmax = myOSystem->settings().getBool("gl_fsmax");
-     bool nicescale = myOSystem->eventHandler().state() == EventHandler::S_LAUNCHER ||
-                      myOSystem->eventHandler().state() == EventHandler::S_DEBUGGER;
- 
-     if(gl_fsmax && myDesktopDim.w != 0 && myDesktopDim.h != 0)
-     {
-       // Use the largest available screen size
-       myScreenDim.w = myDesktopDim.w;
-       myScreenDim.h = myDesktopDim.h;
- 
-       scaleX = float(myImageDim.w) / myScreenDim.w;
-       scaleY = float(myImageDim.h) / myScreenDim.h;
- 
-       if(scaleX > scaleY)
-         myFSScaleFactor = float(myScreenDim.w) / myImageDim.w;
-       else
-         myFSScaleFactor = float(myScreenDim.h) / myImageDim.h;
- 
-       if(nicescale)
-         myFSScaleFactor = (int)myFSScaleFactor;
- 
-       myImageDim.w = (Uint16) (myFSScaleFactor * myImageDim.w);
-       myImageDim.h = (Uint16) (myFSScaleFactor * myImageDim.h);
-     }
-     else if(gl_fsmax && myScreenmode != (SDL_Rect**) -1)
-     {
-       // Use the largest available screen size
-       myScreenDim.w = myScreenmode[0]->w;
-       myScreenDim.h = myScreenmode[0]->h;
- 
-       scaleX = float(myImageDim.w) / myScreenDim.w;
-       scaleY = float(myImageDim.h) / myScreenDim.h;
- 
-       if(scaleX > scaleY)
-         myFSScaleFactor = float(myScreenDim.w) / myImageDim.w;
-       else
-         myFSScaleFactor = float(myScreenDim.h) / myImageDim.h;
- 
-       if(nicescale)
-         myFSScaleFactor = (int)myFSScaleFactor;
- 
-       myImageDim.w = (Uint16) (myFSScaleFactor * myImageDim.w);
-       myImageDim.h = (Uint16) (myFSScaleFactor * myImageDim.h);
-     }
-     else if(myScreenmode == (SDL_Rect**) -1)
-     {
-       // All modes are available, so use the exact image resolution
-       myScreenDim.w = myImageDim.w;
-       myScreenDim.h = myImageDim.h;
-     }
-     else  // otherwise, search for a valid screenmode
-     {
-       for(uInt32 i = myScreenmodeCount-1; i >= 0; i--)
-       {
-         if(myImageDim.w <= myScreenmode[i]->w && myImageDim.h <= myScreenmode[i]->h)
-         {
-           myScreenDim.w = myScreenmode[i]->w;
-           myScreenDim.h = myScreenmode[i]->h;
-           break;
-         }
-       }
-     }
- 
-     // Now calculate the OpenGL coordinates
-     myImageDim.x = (myScreenDim.w - myImageDim.w) / 2;
-     myImageDim.y = (myScreenDim.h - myImageDim.h) / 2;
- 
-     *orthoWidth  = (GLdouble) (myImageDim.w / (myZoomLevel * theAspectRatio * myFSScaleFactor));
-     *orthoHeight = (GLdouble) (myImageDim.h / (myZoomLevel * myFSScaleFactor));
-   }
-   else
-   {
-     *orthoWidth  = (GLdouble) (myImageDim.w / (myZoomLevel * theAspectRatio));
-     *orthoHeight = (GLdouble) (myImageDim.h / myZoomLevel);
-   }
- /*
-   cerr << "myImageDim.x = " << myImageDim.x << ", myImageDim.y = " << myImageDim.y << endl;
-   cerr << "myImageDim.w = " << myImageDim.w << ", myImageDim.h = " << myImageDim.h << endl;
-   cerr << "myScreenDim.w = " << myScreenDim.w << ", myScreenDim.h = " << myScreenDim.h << endl;
-   cerr << endl;
- */
- }
- 
- // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  bool FrameBufferGL::myFuncsLoaded = false;
  
--- 686,689 ----

Index: FrameBufferGL.hxx
===================================================================
RCS file: /cvsroot/stella/stella/src/common/FrameBufferGL.hxx,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** FrameBufferGL.hxx	12 Jan 2007 16:03:10 -0000	1.43
--- FrameBufferGL.hxx	20 Jun 2007 16:33:22 -0000	1.44
***************
*** 68,72 ****
        Return false if any operation fails, otherwise return true.
      */
!     virtual bool initSubsystem();
  
      /**
--- 68,72 ----
        Return false if any operation fails, otherwise return true.
      */
!     virtual bool initSubsystem(VideoMode mode);
  
      /**
***************
*** 81,100 ****
  
      /**
!       This method is called to set the aspect ratio of the screen.
!     */
!     virtual void setAspectRatio();
! 
!     /**
!       This method is called to change to the given scaler type.
! 
!       @param scaler  The scaler to use for rendering the mediasource
!     */
!     virtual void setScaler(Scaler scaler);
  
!     /**
!       This method is called whenever the screen needs to be recreated.
!       It updates the global screen variable.
      */
!     virtual bool createScreen();
  
      /**
--- 81,89 ----
  
      /**
!       This method is called to change to the given video mode.
  
!       @param mode  The mode to use for rendering the mediasource
      */
!     virtual bool setVidMode(VideoMode mode);
  
      /**
***************
*** 201,205 ****
        @param y  Y coordinate to translate
      */
!     inline virtual void translateCoords(Int32* x, Int32* y);
  
      /**
--- 190,194 ----
        @param y  Y coordinate to translate
      */
!     inline virtual void translateCoords(Int32& x, Int32& y);
  
      /**
***************
*** 222,227 ****
      bool createTextures();
  
-     void setDimensions(GLdouble* orthoWidth, GLdouble* orthoHeight);
- 
      inline uInt32 power_of_two(uInt32 input)
      {
--- 211,214 ----
***************
*** 258,267 ****
      bool myHaveTexRectEXT;
  
-     // The possible OpenGL screenmodes to use
-     SDL_Rect** myScreenmode;
- 
-     // The number of usable OpenGL screenmodes
-     uInt32 myScreenmodeCount;
- 
      // The depth of the texture buffer
      uInt32 myDepth;
--- 245,248 ----
***************
*** 273,282 ****
      string myFilterParamName;
  
!     // Used for zooming/scaling
!     uInt32 myZoomLevel;
! 
!     // The scaling to use in fullscreen mode
!     // This is separate from both zoomlevel and aspect ratio
!     float myFSScaleFactor;
  
      // TODO - will be removed when textured dirty rect support is added
--- 254,259 ----
      string myFilterParamName;
  
!     // The amount by which to scale the imagein fullscreen mode
!     float myScaleFactor;
  
      // TODO - will be removed when textured dirty rect support is added

Index: FrameBufferSoft.cxx
===================================================================
RCS file: /cvsroot/stella/stella/src/common/FrameBufferSoft.cxx,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** FrameBufferSoft.cxx	30 Jan 2007 17:13:07 -0000	1.70
--- FrameBufferSoft.cxx	20 Jun 2007 16:33:22 -0000	1.71
***************
*** 33,40 ****
    : FrameBuffer(osystem),
      myZoomLevel(1),
!     myRenderType(kDirtyRect),
!     myUseDirtyRects(true),
!     myRectList(NULL),
!     myOverlayRectList(NULL)
  {
  }
--- 33,40 ----
    : FrameBuffer(osystem),
      myZoomLevel(1),
!     myRenderType(kSoftZoom_16),
!     myDirtyFlag(false),
!     myInUIMode(false),
!     myRectList(NULL)
  {
  }
***************
*** 44,60 ****
  {
    delete myRectList;
-   delete myOverlayRectList;
  }
  
  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
! bool FrameBufferSoft::initSubsystem()
  {
    // Set up the rectangle list to be used in the dirty update
    delete myRectList;
    myRectList = new RectList();
-   delete myOverlayRectList;
-   myOverlayRectList = new RectList();
  
!   if(!myRectList || !myOverlayRectList)
    {
      cerr << "ERROR: Unable to get memory for SDL rects" << endl;
--- 44,57 ----
  {
    delete myRectList;
  }
  
  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
! bool FrameBufferSoft::initSubsystem(VideoMode mode)
  {
    // Set up the rectangle list to be used in the dirty update
    delete myRectList;
    myRectList = new RectList();
  
!   if(!myRectList)
    {
      cerr << "ERROR: Unable to get memory for SDL rects" << endl;
***************
*** 63,67 ****
  
    // Create the screen
!   return createScreen();
  }
  
--- 60,64 ----
  
    // Create the screen
!   return setVidMode(mode);
  }
  
***************
*** 87,127 ****
  
  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
! void FrameBufferSoft::setAspectRatio()
! {
!   // Aspect ratio correction not yet available in software mode
!   theAspectRatio = 1.0;
! }
! 
! // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
! void FrameBufferSoft::setScaler(Scaler scaler)
! {
!   switch(scaler.type)
!   {
!     case kZOOM1X:
!     case kZOOM2X:
!     case kZOOM3X:
!     case kZOOM4X:
!     case kZOOM5X:
!     case kZOOM6X:
!       // Software framebuffer doesn't handle the fancy scaling modes
!       myZoomLevel = scaler.zoom;
!       break;
!     default:  // should never get here
!       myZoomLevel = 1;
!       break;
!   }
! }
! 
! // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
! bool FrameBufferSoft::createScreen()
  {
    myScreenDim.x = myScreenDim.y = 0;
  
!   myScreenDim.w = myBaseDim.w * myZoomLevel;
!   myScreenDim.h = myBaseDim.h * myZoomLevel;
  
!   // In software mode, the image and screen dimensions are always the same
!   myImageDim = myScreenDim;
  
    myScreen = SDL_SetVideoMode(myScreenDim.w, myScreenDim.h, 0, mySDLFlags);
    if(myScreen == NULL)
--- 84,106 ----
  
  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
! bool FrameBufferSoft::setVidMode(VideoMode mode)
  {
    myScreenDim.x = myScreenDim.y = 0;
+   myScreenDim.w = mode.screen_w;
+   myScreenDim.h = mode.screen_h;
  
!   myImageDim.x = mode.image_x;
!   myImageDim.y = mode.image_y;
!   myImageDim.w = mode.image_w;
!   myImageDim.h = mode.image_h;
  
!   myZoomLevel = mode.zoom;
  
+   // Make sure to clear the screen
+   if(myScreen)
+   {
+     SDL_FillRect(myScreen, NULL, 0);
+     SDL_UpdateRect(myScreen, 0, 0, 0, 0);
+   }
    myScreen = SDL_SetVideoMode(myScreenDim.w, myScreenDim.h, 0, mySDLFlags);
    if(myScreen == NULL)
***************
*** 135,143 ****
    // Make sure drawMediaSource() knows which renderer to use
    stateChanged(myOSystem->eventHandler().state());
  
    // Erase old rects, since they've probably been scaled for
    // a different sized screen
    myRectList->start();
-   myOverlayRectList->start();
  
    return true;
--- 114,122 ----
    // Make sure drawMediaSource() knows which renderer to use
    stateChanged(myOSystem->eventHandler().state());
+   myBaseOffset = myImageDim.y * myPitch + myImageDim.x;
  
    // Erase old rects, since they've probably been scaled for
    // a different sized screen
    myRectList->start();
  
    return true;
***************
*** 151,312 ****
    uInt8* currentFrame   = mediasrc.currentFrameBuffer();
    uInt8* previousFrame  = mediasrc.previousFrameBuffer();
-   uInt16 screenMultiple = (uInt16) myZoomLevel;
  
    uInt32 width  = mediasrc.width();
    uInt32 height = mediasrc.height();
  
!   switch(myRenderType) // use switch/case, since we'll eventually have filters
    {
-     case kDirtyRect:
-     {
-       struct Rectangle
-       {
-         uInt8 color;
-         uInt16 x, y, width, height;
-       } rectangles[2][160];
- 
-       // This array represents the rectangles that need displaying
-       // on the current scanline we're processing
-       Rectangle* currentRectangles = rectangles[0];
- 
-       // This array represents the rectangles that are still active
-       // from the previous scanlines we have processed
-       Rectangle* activeRectangles = rectangles[1];
- 
-       // Indicates the number of active rectangles
-       uInt16 activeCount = 0;
- 
-       // This update procedure requires theWidth to be a multiple of four.  
-       // This is validated when the properties are loaded.
-       for(uInt16 y = 0; y < height; ++y)
-       {
-         // Indicates the number of current rectangles
-         uInt16 currentCount = 0;
- 
-         // Look at four pixels at a time to see if anything has changed
-         uInt32* current = (uInt32*)(currentFrame); 
-         uInt32* previous = (uInt32*)(previousFrame);
- 
-         for(uInt16 x = 0; x < width; x += 4, ++current, ++previous)
-         {
-           // Has something changed in this set of four pixels?
-           if((*current != *previous) || theRedrawTIAIndicator)
-           {
-             uInt8* c = (uInt8*)current;
-             uInt8* p = (uInt8*)previous;
- 
-             // Look at each of the bytes that make up the uInt32
-             for(uInt16 i = 0; i < 4; ++i, ++c, ++p)
-             {
-               // See if this pixel has changed
-               if((*c != *p) || theRedrawTIAIndicator)
-               {
-                 // Can we extend a rectangle or do we have to create a new one?
-                 if((currentCount != 0) && 
-                     (currentRectangles[currentCount - 1].color == *c) &&
-                     ((currentRectangles[currentCount - 1].x + 
-                       currentRectangles[currentCount - 1].width) == (x + i)))
-                 {
-                   currentRectangles[currentCount - 1].width += 1;
-                 }
-                 else
-                 {
-                   currentRectangles[currentCount].x = x + i;
-                   currentRectangles[currentCount].y = y;
-                   currentRectangles[currentCount].width = 1;
-                   currentRectangles[currentCount].height = 1;
-                   currentRectangles[currentCount].color = *c;
-                   currentCount++;
-                 }
-               }
-             }
-           }
-         }
- 
-         // Merge the active and current rectangles flushing any that are of no use
-         uInt16 activeIndex = 0;
- 
-         for(uInt16 t = 0; (t < currentCount) && (activeIndex < activeCount); ++t)
-         {
-           Rectangle& current = currentRectangles[t];
-           Rectangle& active = activeRectangles[activeIndex];
- 
-           // Can we merge the current rectangle with an active one?
-           if((current.x == active.x) && (current.width == active.width) &&
-               (current.color == active.color))
-           {
-             current.y = active.y;
-             current.height = active.height + 1;
- 
-             ++activeIndex;
-           }
-           // Is it impossible for this active rectangle to be merged?
-           else if(current.x >= active.x)
-           {
-             // Flush the active rectangle
-             SDL_Rect temp;
- 
-             temp.x = active.x * screenMultiple << 1;
-             temp.y = active.y * screenMultiple;
-             temp.w = active.width  * screenMultiple << 1;
-             temp.h = active.height * screenMultiple;
- 
-             myRectList->add(&temp);
-             SDL_FillRect(myScreen, &temp, myDefPalette[active.color]);
- 
-             ++activeIndex;
-           }
-         }
- 
-         // Flush any remaining active rectangles
-         for(uInt16 s = activeIndex; s < activeCount; ++s)
-         {
-           Rectangle& active = activeRectangles[s];
- 
-           SDL_Rect temp;
-           temp.x = active.x * screenMultiple << 1;
-           temp.y = active.y * screenMultiple;
-           temp.w = active.width  * screenMultiple << 1;
-           temp.h = active.height * screenMultiple;
- 
-           myRectList->add(&temp);
-           SDL_FillRect(myScreen, &temp, myDefPalette[active.color]);
-         }
- 
-         // We can now make the current rectangles into the active rectangles
-         Rectangle* tmp = currentRectangles;
-         currentRectangles = activeRectangles;
-         activeRectangles = tmp;
-         activeCount = currentCount;
- 
-         currentFrame  += width;
-         previousFrame += width;
-       }
- 
-       // Flush any rectangles that are still active
-       for(uInt16 t = 0; t < activeCount; ++t)
-       {
-         Rectangle& active = activeRectangles[t];
- 
-         SDL_Rect temp;
-         temp.x = active.x * screenMultiple << 1;
-         temp.y = active.y * screenMultiple;
-         temp.w = active.width  * screenMultiple << 1;
-         temp.h = active.height * screenMultiple;
- 
-         myRectList->add(&temp);
-         SDL_FillRect(myScreen, &temp, myDefPalette[active.color]);
-       }
-       break;  // kDirtyRect
-     }
- 
      case kSoftZoom_16:
      {
-       SDL_Rect temp;
-       temp.x = temp.y = temp.w = temp.h = 0;
-       myRectList->add(&temp);
- 
        SDL_LockSurface(myScreen);
!       uInt16* buffer    = (uInt16*)myScreen->pixels;
        uInt32 bufofsY    = 0;
        uInt32 screenofsY = 0;
--- 130,143 ----
    uInt8* currentFrame   = mediasrc.currentFrameBuffer();
    uInt8* previousFrame  = mediasrc.previousFrameBuffer();
  
    uInt32 width  = mediasrc.width();
    uInt32 height = mediasrc.height();
  
!   switch(myRenderType)
    {
      case kSoftZoom_16:
      {
        SDL_LockSurface(myScreen);
!       uInt16* buffer    = (uInt16*)myScreen->pixels + myBaseOffset;
        uInt32 bufofsY    = 0;
        uInt32 screenofsY = 0;
***************
*** 332,335 ****
--- 163,167 ----
                  buffer[pos++] = (uInt16) myDefPalette[v];
                }
+               myDirtyFlag = true;
              }
              else
***************
*** 346,355 ****
      case kSoftZoom_24:
      {
-       SDL_Rect temp;
-       temp.x = temp.y = temp.w = temp.h = 0;
-       myRectList->add(&temp);
- 
        SDL_LockSurface(myScreen);
!       uInt8* buffer     = (uInt8*)myScreen->pixels;
        uInt32 bufofsY    = 0;
        uInt32 screenofsY = 0;
--- 178,183 ----
      case kSoftZoom_24:
      {
        SDL_LockSurface(myScreen);
!       uInt8* buffer     = (uInt8*)myScreen->pixels + myBaseOffset;
        uInt32 bufofsY    = 0;
        uInt32 screenofsY = 0;
***************
*** 380,383 ****
--- 208,212 ----
                  buffer[pos++] = r;  buffer[pos++] = g;  buffer[pos++] = b;
                }
+               myDirtyFlag = true;
              }
              else  // try to eliminate multply whereever possible
***************
*** 394,403 ****
      case kSoftZoom_32:
      {
-       SDL_Rect temp;
-       temp.x = temp.y = temp.w = temp.h = 0;
-       myRectList->add(&temp);
- 
        SDL_LockSurface(myScreen);
!       uInt32* buffer    = (uInt32*)myScreen->pixels;
        uInt32 bufofsY    = 0;
        uInt32 screenofsY = 0;
--- 223,228 ----
      case kSoftZoom_32:
      {
        SDL_LockSurface(myScreen);
!       uInt32* buffer    = (uInt32*)myScreen->pixels + myBaseOffset;
        uInt32 bufofsY    = 0;
        uInt32 screenofsY = 0;
***************
*** 423,426 ****
--- 248,252 ----
                  buffer[pos++] = (uInt32) myDefPalette[v];
                }
+               myDirtyFlag = true;
              }
              else
***************
*** 437,446 ****
      case kPhosphor_16:
      {
-       SDL_Rect temp;
-       temp.x = temp.y = temp.w = temp.h = 0;
-       myRectList->add(&temp);
- 
        SDL_LockSurface(myScreen);
!       uInt16* buffer    = (uInt16*)myScreen->pixels;
        uInt32 bufofsY    = 0;
        uInt32 screenofsY = 0;
--- 263,268 ----
      case kPhosphor_16:
      {
        SDL_LockSurface(myScreen);
!       uInt16* buffer    = (uInt16*)myScreen->pixels + myBaseOffset;
        uInt32 bufofsY    = 0;
        uInt32 screenofsY = 0;
***************
*** 470,473 ****
--- 292,296 ----
        }
        SDL_UnlockSurface(myScreen);
+       myDirtyFlag = true;
        break;  // kPhosphor_16
      }
***************
*** 475,484 ****
      case kPhosphor_24:
      {
-       SDL_Rect temp;
-       temp.x = temp.y = temp.w = temp.h = 0;
-       myRectList->add(&temp);
- 
        SDL_LockSurface(myScreen);
!       uInt8* buffer     = (uInt8*)myScreen->pixels;
        uInt32 bufofsY    = 0;
        uInt32 screenofsY = 0;
--- 298,303 ----
      case kPhosphor_24:
      {
        SDL_LockSurface(myScreen);
!       uInt8* buffer     = (uInt8*)myScreen->pixels + myBaseOffset;
        uInt32 bufofsY    = 0;
        uInt32 screenofsY = 0;
***************
*** 512,515 ****
--- 331,335 ----
        }
        SDL_UnlockSurface(myScreen);
+       myDirtyFlag = true;
        break;  // kPhosphor_24
      }
***************
*** 517,526 ****
      case kPhosphor_32:
      {
-       SDL_Rect temp;
-       temp.x = temp.y = temp.w = temp.h = 0;
-       myRectList->add(&temp);
- 
        SDL_LockSurface(myScreen);
!       uInt32* buffer    = (uInt32*)myScreen->pixels;
        uInt32 bufofsY    = 0;
        uInt32 screenofsY = 0;
--- 337,342 ----
      case kPhosphor_32:
      {
        SDL_LockSurface(myScreen);
!       uInt32* buffer    = (uInt32*)myScreen->pixels + myBaseOffset;
        uInt32 bufofsY    = 0;
        uInt32 screenofsY = 0;
***************
*** 550,553 ****
--- 366,370 ----
        }
        SDL_UnlockSurface(myScreen);
+       myDirtyFlag = true;
        break;  // kPhosphor_32
      }
***************
*** 558,569 ****
  void FrameBufferSoft::preFrameUpdate()
  {
-   // Start a new rectlist on each display update
-   myRectList->start();
- 
-   // Add all previous overlay rects, then erase
-   SDL_Rect* dirtyOverlayRects = myOverlayRectList->rects();
-   for(unsigned int i = 0; i < myOverlayRectList->numRects(); ++i)
-     myRectList->add(&dirtyOverlayRects[i]);
-   myOverlayRectList->start();
  }
  
--- 375,378 ----
***************
*** 571,581 ****
  void FrameBufferSoft::postFrameUpdate()
  {
!   if(myUseDirtyRects)
      SDL_UpdateRects(myScreen, myRectList->numRects(), myRectList->rects());
!   else if(myRectList->numRects() > 0)
    {
      SDL_Flip(myScreen);
!     myRectList->start();
    }
  }
  
--- 380,400 ----
  void FrameBufferSoft::postFrameUpdate()
  {
! /*
! cerr << "FrameBufferSoft::postFrameUpdate()" << endl
! 	<< "  myInUIMode:             " << myInUIMode << endl
! 	<< "  myRectList->numRects(): " << myRectList->numRects() << endl
! 	<< "  myDirtyFlag:            " << myDirtyFlag << endl
! 	<< endl;
! */
!   if(myInUIMode && myRectList->numRects() > 0)
!   {
      SDL_UpdateRects(myScreen, myRectList->numRects(), myRectList->rects());
!   }
!   else if(myDirtyFlag || myRectList->numRects() > 0)
    {
      SDL_Flip(myScreen);
!     myDirtyFlag = false;
    }
+   myRectList->start();
  }
  
***************
*** 589,597 ****
    uInt8 *p, r, g, b;
  
!   for(Int32 x = 0; x < myScreen->w; x++)
    {
!     p = (Uint8*) ((uInt8*)myScreen->pixels +  // Start at top of RAM
!                  (row * myScreen->pitch) +    // Go down 'row' lines
!                  (x * myBytesPerPixel));      // Go in 'x' pixels
  
      switch(myBytesPerPixel)
--- 408,418 ----
    uInt8 *p, r, g, b;
  
!   // Row will be offset by the amount the actual image is shifted down
!   row += myImageDim.y;
!   for(Int32 x = 0; x < myScreen->w; ++x)
    {
!     p = (Uint8*) ((uInt8*)myScreen->pixels +              // Start at top of RAM
!                  (row * myScreen->pitch) +                // Go down 'row' lines
!                  ((x + myImageDim.x) * myBytesPerPixel)); // Go in 'x' pixels
  
      switch(myBytesPerPixel)
***************
*** 639,644 ****
  
    // Horizontal line
!   tmp.x = x * myZoomLevel;
!   tmp.y = y * myZoomLevel;
    tmp.w = (x2 - x + 1) * myZoomLevel;
    tmp.h = myZoomLevel;
--- 460,465 ----
  
    // Horizontal line
!   tmp.x = myImageDim.x + x * myZoomLevel;
!   tmp.y = myImageDim.y + y * myZoomLevel;
    tmp.w = (x2 - x + 1) * myZoomLevel;
    tmp.h = myZoomLevel;
***************
*** 652,657 ****
  
    // Vertical line
!   tmp.x = x * myZoomLevel;
!   tmp.y = y * myZoomLevel;
    tmp.w = myZoomLevel;
    tmp.h = (y2 - y + 1) * myZoomLevel;
--- 473,478 ----
  
    // Vertical line
!   tmp.x = myImageDim.x + x * myZoomLevel;
!   tmp.y = myImageDim.y + y * myZoomLevel;
    tmp.w = myZoomLevel;
    tmp.h = (y2 - y + 1) * myZoomLevel;
***************
*** 666,671 ****
  
    // Fill the rectangle
!   tmp.x = x * myZoomLevel;
!   tmp.y = y * myZoomLevel;
    tmp.w = w * myZoomLevel;
    tmp.h = h * myZoomLevel;
--- 487,492 ----
  
    // Fill the rectangle
!   tmp.x = myImageDim.x + x * myZoomLevel;
!   tmp.y = myImageDim.y + y * myZoomLevel;
    tmp.w = w * myZoomLevel;
    tmp.h = h * myZoomLevel;
***************
*** 703,707 ****
      {
        // Get buffer position where upper-left pixel of the character will be drawn
!       uInt16* buffer = (uInt16*) myScreen->pixels + yorig * myPitch + xorig;
        for(int y = h; y; --y)
        {
--- 524,528 ----
      {
        // Get buffer position where upper-left pixel of the character will be drawn
!       uInt16* buffer = (uInt16*) myScreen->pixels + myBaseOffset + yorig * myPitch + xorig;
        for(int y = h; y; --y)
        {
***************
*** 729,733 ****
      {
        // Get buffer position where upper-left pixel of the character will be drawn
!       uInt8* buffer = (uInt8*) myScreen->pixels + yorig * myPitch + xorig;
        uInt32 pixel = myDefPalette[color];
        uInt8 r = (pixel & myFormat->Rmask) >> myFormat->Rshift;
--- 550,554 ----
      {
        // Get buffer position where upper-left pixel of the character will be drawn
!       uInt8* buffer = (uInt8*) myScreen->pixels + myBaseOffset + yorig * myPitch + xorig;
        uInt32 pixel = myDefPalette[color];
        uInt8 r = (pixel & myFormat->Rmask) >> myFormat->Rshift;
***************
*** 764,768 ****
      {
        // Get buffer position where upper-left pixel of the character will be drawn
!       uInt32* buffer = (uInt32*) myScreen->pixels + yorig * myPitch + xorig;
        for(int y = h; y; --y)
        {
--- 585,589 ----
      {
        // Get buffer position where upper-left pixel of the character will be drawn
!       uInt32* buffer = (uInt32*) myScreen->pixels + myBaseOffset + yorig * myPitch + xorig;
        for(int y = h; y; --y)
        {
***************
*** 806,811 ****
        if(bitmap[y] & mask)
        {
!         rect.x = (x + xorig) * myZoomLevel;
!         rect.y = (y + yorig) * myZoomLevel;
          rect.w = rect.h = myZoomLevel;
          SDL_FillRect(myScreen, &rect, myDefPalette[color]);
--- 627,632 ----
        if(bitmap[y] & mask)
        {
!         rect.x = myImageDim.x + (x + xorig) * myZoomLevel;
!         rect.y = myImageDim.y + (y + yorig) * myZoomLevel;
          rect.w = rect.h = myZoomLevel;
          SDL_FillRect(myScreen, &rect, myDefPalette[color]);
***************
*** 816,825 ****
  
  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
! void FrameBufferSoft::translateCoords(Int32* x, Int32* y)
  {
!   // We don't bother checking offsets or aspect ratios, since
!   // they're not yet supported in software mode.
!   *x /= myZoomLevel;
!   *y /= myZoomLevel;
  }
  
--- 637,644 ----
  
  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
! void FrameBufferSoft::translateCoords(Int32& x, Int32& y)
  {
!   x = (x - myImageDim.x) / myZoomLevel;
!   y = (y - myImageDim.y) / myZoomLevel;
  }
  
***************
*** 827,840 ****
  void FrameBufferSoft::addDirtyRect(uInt32 x, uInt32 y, uInt32 w, uInt32 h)
  {
!   // Add a dirty rect to the overlay rectangle list
!   // They will actually be added to the main rectlist in preFrameUpdate()
    // TODO - intelligent merging of rectangles, to avoid overlap
    SDL_Rect temp;
!   temp.x = x * myZoomLevel;
!   temp.y = y * myZoomLevel;
    temp.w = w * myZoomLevel;
    temp.h = h * myZoomLevel;
  
!   myOverlayRectList->add(&temp);
  
  //  cerr << "addDirtyRect():  "
--- 646,658 ----
  void FrameBufferSoft::addDirtyRect(uInt32 x, uInt32 y, uInt32 w, uInt32 h)
  {
!   // Add a dirty rect to the UI rectangle list
    // TODO - intelligent merging of rectangles, to avoid overlap
    SDL_Rect temp;
!   temp.x = myImageDim.x + x * myZoomLevel;
!   temp.y = myImageDim.y + y * myZoomLevel;
    temp.w = w * myZoomLevel;
    temp.h = h * myZoomLevel;
  
!   myRectList->add(&temp);
  
  //  cerr << "addDirtyRect():  "
***************
*** 857,886 ****
      return;
  
!   // When in a UI mode, always use dirty rects
!   // Otherwise, check the 'dirtyrects' setting
!   // Phosphor mode implies a full update, so turn off dirty rects
!   bool emulation = (state == EventHandler::S_EMULATE ||
!                     state == EventHandler::S_PAUSE);
!   if(emulation)
!   {
!     if(myUsePhosphor)
!       myUseDirtyRects = false;
!     else
!       myUseDirtyRects = myOSystem->settings().getBool("dirtyrects");
!   }
!   else
!     myUseDirtyRects = true;
  
    // Make sure drawMediaSource() knows which renderer to use
-   // Testing for dirty rects takes priority over phosphor mode,
-   // since phosphor mode only exists while emulating a ROM
    switch(myBytesPerPixel)
    {
      case 2:  // 16-bit
        myPitch = myScreen->pitch/2;
!       if(myUsePhosphor && emulation)
          myRenderType = kPhosphor_16;
-       else if(myUseDirtyRects)
-         myRenderType = kDirtyRect;
        else
          myRenderType = kSoftZoom_16;
--- 675,688 ----
      return;
  
!   myInUIMode = (state == EventHandler::S_LAUNCHER ||
!                 state == EventHandler::S_DEBUGGER);
  
    // Make sure drawMediaSource() knows which renderer to use
    switch(myBytesPerPixel)
    {
      case 2:  // 16-bit
        myPitch = myScreen->pitch/2;
!       if(myUsePhosphor)
          myRenderType = kPhosphor_16;
        else
          myRenderType = kSoftZoom_16;
***************
*** 888,895 ****
      case 3:  // 24-bit
        myPitch = myScreen->pitch;
!       if(myUsePhosphor && emulation)
          myRenderType = kPhosphor_24;
-       else if(myUseDirtyRects)
-         myRenderType = kDirtyRect;
        else
          myRenderType = kSoftZoom_24;
--- 690,695 ----
      case 3:  // 24-bit
        myPitch = myScreen->pitch;
!       if(myUsePhosphor)
          myRenderType = kPhosphor_24;
        else
          myRenderType = kSoftZoom_24;
***************
*** 897,909 ****
      case 4:  // 32-bit
        myPitch = myScreen->pitch/4;
!       if(myUsePhosphor && emulation)
          myRenderType = kPhosphor_32;
-       else if(myUseDirtyRects)
-         myRenderType = kDirtyRect;
        else
          myRenderType = kSoftZoom_32;
        break;
      default:
!       myRenderType = kDirtyRect; // What else should we do here?
        break;
    }
--- 697,707 ----
      case 4:  // 32-bit
        myPitch = myScreen->pitch/4;
!       if(myUsePhosphor)
          myRenderType = kPhosphor_32;
        else
          myRenderType = kSoftZoom_32;
        break;
      default:
!       myRenderType = kSoftZoom_16; // What else should we do here?
        break;
    }
***************
*** 911,915 ****
    // Have the changes take effect
    myOSystem->eventHandler().refreshDisplay();
- 
- //cerr << "Render type = " << myRenderType << ", dirty rects = " << myUseDirtyRects << endl;
  }
--- 709,711 ----

Index: FrameBufferSoft.hxx
===================================================================
RCS file: /cvsroot/stella/stella/src/common/FrameBufferSoft.hxx,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** FrameBufferSoft.hxx	15 Jan 2007 00:07:51 -0000	1.45
--- FrameBufferSoft.hxx	20 Jun 2007 16:33:22 -0000	1.46
***************
*** 56,60 ****
        Return false if any operation fails, otherwise return true.
      */
!     virtual bool initSubsystem();
  
      /**
--- 56,60 ----
        Return false if any operation fails, otherwise return true.
      */
!     virtual bool initSubsystem(VideoMode mode);
  
      /**
***************
*** 69,88 ****
  
      /**
!       This method is called to set the aspect ratio of the screen.
!     */
!     virtual void setAspectRatio();
! 
!     /**
!       This method is called to change to the given scaler type.
! 
!       @param scaler  The scaler to use for rendering the mediasource
!     */
!     virtual void setScaler(Scaler scaler);
  
!     /**
!       This method is called whenever the screen needs to be recreated.
!       It updates the global screen variable.
      */
!     virtual bool createScreen();
  
      /**
--- 69,77 ----
  
      /**
!       This method is called to change to the given videomode type.
  
!       @param mode  The video mode to use for rendering the mediasource
      */
!     virtual bool setVidMode(VideoMode mode);
  
      /**
***************
*** 189,193 ****
        @param y  Y coordinate to translate
      */
!     virtual void translateCoords(Int32* x, Int32* y);
  
      /**
--- 178,182 ----
        @param y  Y coordinate to translate
      */
!     virtual void translateCoords(Int32& x, Int32& y);
  
      /**
***************
*** 216,223 ****
      int myBytesPerPixel;
      int myPitch;
      SDL_PixelFormat* myFormat;
  
      enum RenderType {
-       kDirtyRect,
        kSoftZoom_16,
        kSoftZoom_24,
--- 205,212 ----
      int myBytesPerPixel;
      int myPitch;
+     int myBaseOffset;
      SDL_PixelFormat* myFormat;
  
      enum RenderType {
        kSoftZoom_16,
        kSoftZoom_24,
***************
*** 229,240 ****
      RenderType myRenderType;
  
!     // Use dirty updates (SDL_UpdateRects instead of SDL_UpdateRect)
!     bool myUseDirtyRects;
  
!     // Used in the dirty update of the SDL surface
!     RectList* myRectList;
  
!     // Used in the dirty update of the overlay surface
!     RectList* myOverlayRectList;
  };
  
--- 218,229 ----
      RenderType myRenderType;
  
!     // Indicates if the TIA image has been modified
!     bool myDirtyFlag;
  
!     // Indicates if we're in a purely UI mode
!     bool myInUIMode;
  
!     // Used in the dirty update of rectangles in non-TIA modes
!     RectList* myRectList;
  };

Update of /cvsroot/stella/stella
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv13346

Modified Files:
	configure 
Log Message:
Added 'WINDOWED_SUPPORT' compile-time argument, which can be used for
those systems which don't actually have a windowing environment.  When
this is set, toggling from fullscreen will not be possible, and certain
window-related UI functions will not be accessible.

Completely revamped video subsystem.  Windowed and fullscreen modes are
now dealt with separately.  Windows can be zoomed using the 'zoom_ui'
and 'zoom_tia' arguments.  Fullscreen modes are now set by resolution,
not zoom, so you can specify to always use a certain fullscreen
resolution, and the images will be scaled appropriately.  This also
fixes the fullscreen issues on widescreen monitors; just select a
widescreen video mode, and the aspect ratio will always be correct.

Removed dirty-rect support for software rendering of the TIA image,
as it ended up being slower than just updating the entire image.
For those resolutions where it will start to slow down (1024x768 or
higher), one should be using OpenGL.

Fixed issue in Windows when returning from fullscreen mode made the
window constantly 'shrink' in size.  It was related to auto-detecting
the desktop resolution, which is really the job of SDL.  As such, all
further releases of Stella will require SDL 1.2.10, which includes
this auto-detection code internally.

Made ROM launcher resizable, configurable in sizes from 320x240
to 800x600.  Updated the UIDialog to change these quantities from the
UI (Stella will need to be restarted for it to take effect).

Removed aspect ratio support, since it was causing problems, and the
new fullscreen mode work has made it obsolete.  i *may* consider it
again in the future, if there's sufficient demand.

Added 'fullres' commandline argument, used to set the fullscreen
resolution.

Added 'launcherres' commandline argument, used to set the ROM
launcher resolution.  This replaces 'launchersize' argument, which
has been removed.

Changed 'scale_ui' and 'scale_tia' to 'zoom_ui' and 'zoom_tia',
respectively.  Their function remains the same.

Changed meaning of 'gl_fsmax' argument to specify what modes to use
fullscreen OpenGL scaling (previously, this was a boolean, and
didn't consider different modes).



Index: configure
===================================================================
RCS file: /cvsroot/stella/stella/configure,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** configure	18 Dec 2006 16:44:38 -0000	1.44
--- configure	20 Jun 2007 16:33:22 -0000	1.45
***************
*** 20,23 ****
--- 20,24 ----
  # default option behaviour yes/no
  _build_gl=yes
+ _build_windowed=yes
  _build_sound=yes
  _build_debugger=yes
***************
*** 256,259 ****
--- 257,262 ----
    --enable-gl            enable/disable OpenGL rendering support [enabled]
    --disable-gl
+   --enable-windowed      enable/disable windowed rendering modes [enabled]
+   --disable-windowed
    --enable-sound         enable/disable sound support [enabled]
    --disable-sound
***************
*** 299,302 ****
--- 302,307 ----
        --enable-gl)              _build_gl=yes        ;;
        --disable-gl)             _build_gl=no         ;;
+       --enable-windowed)        _build_windowed=yes  ;;
+       --disable-windowed)       _build_windowed=no   ;;
        --enable-sound)           _build_sound=yes     ;;
        --disable-sound)          _build_sound=no      ;;
***************
*** 539,542 ****
--- 544,548 ----
  			_build_static=yes
  			_build_gl=no
+ 			_build_windowed=no
  			;;
  		*)
***************
*** 690,693 ****
--- 696,707 ----
  fi
  
+ if test "$_build_windowed" = "yes" ; then
+ 	echo_n "   Windowed rendering modes enabled"
+ 	echo
+ else
+ 	echo_n "   Windowed rendering modes disabled"
+ 	echo
+ fi
+ 
  if test "$_build_sound" = "yes" ; then
  	echo_n "   Sound support enabled"
***************
*** 853,856 ****
--- 867,874 ----
  fi
  
+ if test "$_build_windowed" = yes ; then
+ 	DEFINES="$DEFINES -DWINDOWED_SUPPORT"
+ fi
+ 
  if test "$_build_sound" = yes ; then
  	DEFINES="$DEFINES -DSOUND_SUPPORT"

Update of /cvsroot/stella/stella/src/emucore
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv26571/src/emucore

Modified Files:
	stella.pro DefProps.hxx Cart.hxx Cart.cxx 
Log Message:
Improvements to E0 autodetection; now Swordquest Waterworld isn't
misdetected any more.

Optimizations in autodetect logic, thanks to suggestions from
Thomas Jentzsch.


Index: stella.pro
===================================================================
RCS file: /cvsroot/stella/stella/src/emucore/stella.pro,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** stella.pro	9 Jun 2007 23:20:19 -0000	1.58
--- stella.pro	14 Jun 2007 13:47:49 -0000	1.59
***************
*** 11488,11492 ****
  "Cartridge.Name" "SwordQuest - Waterworld (1983) (Atari)"
  "Cartridge.Rarity" "Unbelievably Rare"
- "Cartridge.Type" "F8"
  ""
  
--- 11488,11491 ----

Index: DefProps.hxx
===================================================================
RCS file: /cvsroot/stella/stella/src/emucore/DefProps.hxx,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** DefProps.hxx	9 Jun 2007 23:20:16 -0000	1.41
--- DefProps.hxx	14 Jun 2007 13:47:49 -0000	1.42
***************
*** 1963,1967 ****
    { "bc4cf38a4bee45752dc466c98ed7ad09", "Atari", "CX26136", "Solaris (1986) (Atari) (PAL) [!]", "", "Uncommon", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "bc526185ad324241782dc68ba5d0540b", "", "", "Dodge Demo 1 (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
!   { "bc5389839857612cfabeb810ba7effdc", "Atari", "CX2671", "SwordQuest - Waterworld (1983) (Atari)", "", "Unbelievably Rare", "", "F8", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "bc6432cbed32c695658514c4eb41d905", "Manuel Polik", "", "Star Fire (MP) (2002) (PD)", "Won't work with Stella < V1.2", "New Release", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "bc703ea6afb20bc089f04d8c9d79a2bd", "", "", "Gunfight 2600 - Not mergeable with Colbert wizardry... (2001) (MP)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
--- 1963,1967 ----
    { "bc4cf38a4bee45752dc466c98ed7ad09", "Atari", "CX26136", "Solaris (1986) (Atari) (PAL) [!]", "", "Uncommon", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "bc526185ad324241782dc68ba5d0540b", "", "", "Dodge Demo 1 (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
!   { "bc5389839857612cfabeb810ba7effdc", "Atari", "CX2671", "SwordQuest - Waterworld (1983) (Atari)", "", "Unbelievably Rare", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "bc6432cbed32c695658514c4eb41d905", "Manuel Polik", "", "Star Fire (MP) (2002) (PD)", "Won't work with Stella < V1.2", "New Release", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "bc703ea6afb20bc089f04d8c9d79a2bd", "", "", "Gunfight 2600 - Not mergeable with Colbert wizardry... (2001) (MP)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 

Index: Cart.hxx
===================================================================
RCS file: /cvsroot/stella/stella/src/emucore/Cart.hxx,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** Cart.hxx	8 Jun 2007 12:36:51 -0000	1.18
--- Cart.hxx	14 Jun 2007 13:47:50 -0000	1.19
***************
*** 141,149 ****
        @param signature  The byte sequence to search for
        @param sigsize    The number of bytes in the signature
  
!       @return  The number of times the signature was found
      */
!     static int searchForBytes(const uInt8* image, uInt32 imagesize,
!                               const uInt8* signature, uInt32 sigsize);
  
      /**
--- 141,151 ----
        @param signature  The byte sequence to search for
        @param sigsize    The number of bytes in the signature
+       @param minhits    The minimum number of times a signature is to be found
  
!       @return  True if the signature was found at least 'minhits' time, else false
      */
!     static bool searchForBytes(const uInt8* image, uInt32 imagesize,
!                                const uInt8* signature, uInt32 sigsize,
!                                uInt32 minhits);
  
      /**

Index: Cart.cxx
===================================================================
RCS file: /cvsroot/stella/stella/src/emucore/Cart.cxx,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** Cart.cxx	9 Jun 2007 23:20:16 -0000	1.33
--- Cart.cxx	14 Jun 2007 13:47:50 -0000	1.34
***************
*** 202,209 ****
      else if(isProbablyE0(image, size))
        type = "E0";
-     else if(isProbably3F(image, size))
-       type = isProbably3E(image, size) ? "3E" : "3F";
      else if(isProbably3E(image, size))
        type = "3E";
      else if(isProbablyUA(image, size))
        type = "UA";
--- 202,209 ----
      else if(isProbablyE0(image, size))
        type = "E0";
      else if(isProbably3E(image, size))
        type = "3E";
+     else if(isProbably3F(image, size))
+       type = "3F";
      else if(isProbablyUA(image, size))
        type = "UA";
***************
*** 231,238 ****
      else if(isProbablyE7(image, size))
        type = "E7";
-     else if(isProbably3F(image, size))
-       type = isProbably3E(image, size) ? "3E" : "3F";
      else if(isProbably3E(image, size))
        type = "3E";
      else
        type = "F6";
--- 231,238 ----
      else if(isProbablyE7(image, size))
        type = "E7";
      else if(isProbably3E(image, size))
        type = "3E";
+     else if(isProbably3F(image, size))
+       type = "3F";
      else
        type = "F6";
***************
*** 242,249 ****
      if(isProbablySC(image, size))
        type = "F4SC";
-     else if(isProbably3F(image, size))
-       type = isProbably3E(image, size) ? "3E" : "3F";
      else if(isProbably3E(image, size))
        type = "3E";
      else
        type = "F4";
--- 242,249 ----
      if(isProbablySC(image, size))
        type = "F4SC";
      else if(isProbably3E(image, size))
        type = "3E";
+     else if(isProbably3F(image, size))
+       type = "3F";
      else
        type = "F4";
***************
*** 252,259 ****
    {
      // TODO - autodetect 4A50
!     if(isProbably3F(image, size))
!       type = isProbably3E(image, size) ? "3E" : "3F";
!     else if(isProbably3E(image, size))
        type = "3E";
      else
        type = "MB";
--- 252,259 ----
    {
      // TODO - autodetect 4A50
!     if(isProbably3E(image, size))
        type = "3E";
+     else if(isProbably3F(image, size))
+       type = "3F";
      else
        type = "MB";
***************
*** 262,269 ****
    {
      // TODO - autodetect 4A50
!     if(isProbably3F(image, size))
!       type = isProbably3E(image, size) ? "3E" : "3F";
!     else if(isProbably3E(image, size))
        type = "3E";
      else
        type = "MC";
--- 262,269 ----
    {
      // TODO - autodetect 4A50
!     if(isProbably3E(image, size))
        type = "3E";
+     else if(isProbably3F(image, size))
+       type = "3F";
      else
        type = "MC";
***************
*** 271,278 ****
    else  // what else can we do?
    {
!     if(isProbably3F(image, size))
!       type = isProbably3E(image, size) ? "3E" : "3F";
!     else if(isProbably3E(image, size))
        type = "3E";
      else
        type = "4K";  // Most common bankswitching type
--- 271,278 ----
    else  // what else can we do?
    {
!     if(isProbably3E(image, size))
        type = "3E";
+     else if(isProbably3F(image, size))
+       type = "3F";
      else
        type = "4K";  // Most common bankswitching type
***************
*** 283,288 ****
  
  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
! int Cartridge::searchForBytes(const uInt8* image, uInt32 imagesize,
!                               const uInt8* signature, uInt32 sigsize)
  {
    uInt32 count = 0;
--- 283,289 ----
  
  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
! bool Cartridge::searchForBytes(const uInt8* image, uInt32 imagesize,
!                                const uInt8* signature, uInt32 sigsize,
!                                uInt32 minhits)
  {
    uInt32 count = 0;
***************
*** 298,305 ****
      }
      if(matches == sigsize)
        ++count;
    }
  
!   return count;
  }
  
--- 299,311 ----
      }
      if(matches == sigsize)
+     {
        ++count;
+       i += sigsize;  // skip past this signature 'window' entirely
+     }
+     if(count >= minhits)
+       break;
    }
  
!   return (count >= minhits);
  }
  
***************
*** 331,335 ****
    // at least two banks
    uInt8 signature[] = { 0x85, 0x3F };  // STA $3F
!   return searchForBytes(image, size, signature, 2) > 1;
  }
  
--- 337,341 ----
    // at least two banks
    uInt8 signature[] = { 0x85, 0x3F };  // STA $3F
!   return searchForBytes(image, size, signature, 2, 2);
  }
  
***************
*** 341,345 ****
    // immediate mode LDA
    uInt8 signature[] = { 0x85, 0x3E, 0xA9, 0x00 };  // STA $3E; LDA #$00
!   return searchForBytes(image, size, signature, 4) > 0;
  }
  
--- 347,351 ----
    // immediate mode LDA
    uInt8 signature[] = { 0x85, 0x3E, 0xA9, 0x00 };  // STA $3E; LDA #$00
!   return searchForBytes(image, size, signature, 4, 1);
  }
  
***************
*** 348,368 ****
  {
    // E0 cart bankswitching is triggered by accessing addresses
!   // $FE0 to $FF7 using absolute non-indexed addressing
!   // So we search for the pattern 'LDA Fxxx' or 'STA Fxxx' in hex
!   // using the regex (AD|8D, E0-F7, xF)
!   // This must be present at least three times, since there are
!   // three segments to be initialized (and a few more so that more
!   // of the ROM is used)
    // Thanks to "stella@..." for this advice
!   uInt32 count = 0;
!   for(uInt32 i = 0; i < size - 2; ++i)
    {
!     uInt8 b1 = image[i], b2 = image[i+1], b3 = image[i+2];
!     if((b1 == 0xAD || b1 == 0x8D) &&
!        (b2 >= 0xE0 && b2 <= 0xF7) &&
!        (b3 & 0xF == 0xF))
!     {
!       if(++count > 4)  return true;
!     }
    }
    return false;
--- 354,374 ----
  {
    // E0 cart bankswitching is triggered by accessing addresses
!   // $FE0 to $FF9 using absolute non-indexed addressing
!   // To eliminate false positives (and speed up processing), we
!   // search for only certain known signatures
    // Thanks to "stella@..." for this advice
!   // These signatures are attributed to the MESS project
!   uInt8 signature[6][3] = {
!    { 0x8D, 0xE0, 0x1F },  // STA $1FE0
!    { 0x8D, 0xE0, 0x5F },  // STA $5FE0
!    { 0x8D, 0xE9, 0xFF },  // STA $FFE9
!    { 0xAD, 0xE9, 0xFF },  // LDA $FFE9
!    { 0xAD, 0xED, 0xFF },  // LDA $FFED
!    { 0xAD, 0xF3, 0xBF }   // LDA $BFF3
!   };
!   for(uInt32 i = 0; i < 6; ++i)
    {
!     if(searchForBytes(image, size, signature[i], 3, 1))
!       return true;
    }
    return false;
***************
*** 410,414 ****
    // using 'STA $240'
    uInt8 signature[] = { 0x8D, 0x40, 0x02 };  // STA $240
!   return searchForBytes(image, size, signature, 3) > 0;
  }
  
--- 416,420 ----
    // using 'STA $240'
    uInt8 signature[] = { 0x8D, 0x40, 0x02 };  // STA $240
!   return searchForBytes(image, size, signature, 3, 1);
  }
  
***************
*** 422,429 ****
      { 0x99, 0x00, 0xF4 }   // STA $F400
    };
!   if(searchForBytes(image, size, signature[0], 3) > 0)
      return true;
    else
!     return searchForBytes(image, size, signature[1], 3) > 0;
  }
  
--- 428,435 ----
      { 0x99, 0x00, 0xF4 }   // STA $F400
    };
!   if(searchForBytes(image, size, signature[0], 3, 1))
      return true;
    else
!     return searchForBytes(image, size, signature[1], 3, 1);
  }
  
***************
*** 442,446 ****
    for(uInt32 i = 0; i < 4; ++i)
    {
!     if(searchForBytes(image, size, signature[i], 5) > 0)
        return true;
    }
--- 448,452 ----
    for(uInt32 i = 0; i < 4; ++i)
    {
!     if(searchForBytes(image, size, signature[i], 5, 1))
        return true;
    }

Update of /cvsroot/stella/stella/src/emucore
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv5739/src/emucore

Modified Files:
	Cart.cxx DefProps.hxx stella.pro 
Log Message:
Further improvements to '3E' bankswitch autodetection.  We're now down
to requiring only 4 entries out of 2722 ROMs where auto-detection fails.


Index: Cart.cxx
===================================================================
RCS file: /cvsroot/stella/stella/src/emucore/Cart.cxx,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** Cart.cxx	8 Jun 2007 12:36:51 -0000	1.32
--- Cart.cxx	9 Jun 2007 23:20:16 -0000	1.33
***************
*** 204,207 ****
--- 204,209 ----
      else if(isProbably3F(image, size))
        type = isProbably3E(image, size) ? "3E" : "3F";
+     else if(isProbably3E(image, size))
+       type = "3E";
      else if(isProbablyUA(image, size))
        type = "UA";
***************
*** 231,234 ****
--- 233,238 ----
      else if(isProbably3F(image, size))
        type = isProbably3E(image, size) ? "3E" : "3F";
+     else if(isProbably3E(image, size))
+       type = "3E";
      else
        type = "F6";
***************
*** 240,243 ****
--- 244,249 ----
      else if(isProbably3F(image, size))
        type = isProbably3E(image, size) ? "3E" : "3F";
+     else if(isProbably3E(image, size))
+       type = "3E";
      else
        type = "F4";
***************
*** 248,251 ****
--- 254,259 ----
      if(isProbably3F(image, size))
        type = isProbably3E(image, size) ? "3E" : "3F";
+     else if(isProbably3E(image, size))
+       type = "3E";
      else
        type = "MB";
***************
*** 256,259 ****
--- 264,269 ----
      if(isProbably3F(image, size))
        type = isProbably3E(image, size) ? "3E" : "3F";
+     else if(isProbably3E(image, size))
+       type = "3E";
      else
        type = "MC";
***************
*** 263,266 ****
--- 273,278 ----
      if(isProbably3F(image, size))
        type = isProbably3E(image, size) ? "3E" : "3F";
+     else if(isProbably3E(image, size))
+       type = "3E";
      else
        type = "4K";  // Most common bankswitching type
***************
*** 319,323 ****
    // at least two banks
    uInt8 signature[] = { 0x85, 0x3F };  // STA $3F
!   return searchForBytes(image, size, signature, 2) > 2;
  }
  
--- 331,335 ----
    // at least two banks
    uInt8 signature[] = { 0x85, 0x3F };  // STA $3F
!   return searchForBytes(image, size, signature, 2) > 1;
  }
  
***************
*** 325,331 ****
  bool Cartridge::isProbably3E(const uInt8* image, uInt32 size)
  {
!   // TODO - fix this one, once I find a test ROM
!   uInt8 signature[] = { 0x85, 0x3E };
!   return searchForBytes(image, size, signature, 2) > 2;
  }
  
--- 337,345 ----
  bool Cartridge::isProbably3E(const uInt8* image, uInt32 size)
  {
!   // 3E cart bankswitching is triggered by storing the bank number
!   // in address 3E using 'STA $3E', commonly followed by an
!   // immediate mode LDA
!   uInt8 signature[] = { 0x85, 0x3E, 0xA9, 0x00 };  // STA $3E; LDA #$00
!   return searchForBytes(image, size, signature, 4) > 0;
  }
  

Index: DefProps.hxx
===================================================================
RCS file: /cvsroot/stella/stella/src/emucore/DefProps.hxx,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** DefProps.hxx	8 Jun 2007 12:36:51 -0000	1.40
--- DefProps.hxx	9 Jun 2007 23:20:16 -0000	1.41
***************
*** 1303,1307 ****
    { "791bc8aceb6b0f4d9990d6062b30adfa", "Activision", "AB-035-04", "Pitfall! (1982) (Activision) (PAL) [!]", "", "Rare", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "7926083ad423ed685de3b3a04a914315", "Barry Laws Jr.", "", "Face Invaders 2 by Barry Laws Jr. (Space Invaders Hack)", "Hack of Astroblast (Mattel)", "New Release (Hack)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
!   { "792b1d93eb1d8045260c840b0688ec8f", "Kroko", "", "3E Bankswitch Test (TIA @ $00)", "", "", "", "3E", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "7972e5101fa548b952d852db24ad6060", "Atari", "CX2627 / 6699841", "Human Cannonball (AKA Cannon Man) (1978) (Atari)", "", "Uncommon", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "798b8921276eec9e332dfcb47a2dbb17", "", "", "Cookie Monster Munch (1983) (Atari) (PAL) [a1][!]", "Uses Kids/Keypad Controllers", "", "", "", "", "", "", "", "KEYBOARD", "KEYBOARD", "", "", "", "", "", "", "" }, 
--- 1303,1307 ----
    { "791bc8aceb6b0f4d9990d6062b30adfa", "Activision", "AB-035-04", "Pitfall! (1982) (Activision) (PAL) [!]", "", "Rare", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "7926083ad423ed685de3b3a04a914315", "Barry Laws Jr.", "", "Face Invaders 2 by Barry Laws Jr. (Space Invaders Hack)", "Hack of Astroblast (Mattel)", "New Release (Hack)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
!   { "792b1d93eb1d8045260c840b0688ec8f", "Kroko", "", "3E Bankswitch Test (TIA @ $00)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "7972e5101fa548b952d852db24ad6060", "Atari", "CX2627 / 6699841", "Human Cannonball (AKA Cannon Man) (1978) (Atari)", "", "Uncommon", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "798b8921276eec9e332dfcb47a2dbb17", "", "", "Cookie Monster Munch (1983) (Atari) (PAL) [a1][!]", "Uses Kids/Keypad Controllers", "", "", "", "", "", "", "", "KEYBOARD", "KEYBOARD", "", "", "", "", "", "", "" }, 
***************
*** 1500,1504 ****
    { "8b7ca29a55432f886cee3d452fb00481", "Starpath", "AR-4201", "Sword of Saros (1983) (Starpath) (PAL)", "", "Extremely Rare", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "8b81af55cd2ef3c7444d6aec4e3a1c09", "", "", "Dark Mage [b1]", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "", "" }, 
!   { "8bbfd951c89cc09c148bfabdefa08bec", "UA Limited", "", "Pleiades (UA Limited)", "", "Prototype", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "", "" }, 
    { "8bc0d2052b4f259e7a50a7c771b45241", "Xonox", "", "Tomarc the Barbarian (1983) (Xonox)", "", "Rare", "", "", "", "", "", "", "", "", "", "", "24", "", "", "", "" }, 
    { "8bd8f65377023bdb7c5fcf46ddda5d31", "Activision", "AG-019", "Sky Jinks (1982) (Activision) [o1]", "", "Rare", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
--- 1500,1504 ----
    { "8b7ca29a55432f886cee3d452fb00481", "Starpath", "AR-4201", "Sword of Saros (1983) (Starpath) (PAL)", "", "Extremely Rare", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "8b81af55cd2ef3c7444d6aec4e3a1c09", "", "", "Dark Mage [b1]", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "", "" }, 
!   { "8bbfd951c89cc09c148bfabdefa08bec", "UA Limited", "", "Pleiades (UA Limited)", "", "Prototype", "", "", "", "", "", "", "", "", "", "", "32", "", "YES", "", "" }, 
    { "8bc0d2052b4f259e7a50a7c771b45241", "Xonox", "", "Tomarc the Barbarian (1983) (Xonox)", "", "Rare", "", "", "", "", "", "", "", "", "", "", "24", "", "", "", "" }, 
    { "8bd8f65377023bdb7c5fcf46ddda5d31", "Activision", "AG-019", "Sky Jinks (1982) (Activision) [o1]", "", "Rare", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
***************
*** 1646,1650 ****
    { "9ad362179c2eea4ea115c7640b4b003e", "Activision", "AX-013", "Barnstorming (1982) (Activision) [p1][!]", "", "Uncommon", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "9ad36e699ef6f45d9eb6c4cf90475c9f", "Imagic", "IA3203", "Atlantis (1982) (Imagic) [!]", "", "Uncommon", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
!   { "9b150a42fc788960fbb4cbe250259ee2", "Kroko", "", "3E Bankswitch Test (TIA @ $40)", "", "", "", "3E", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "9b21d8fc78cc4308990d99a4d906ec52", "", "C-838", "Immies & Aggies (CCE)", "", "Extremely Rare", "", "", "", "", "", "", "", "", "", "", "18", "223", "", "", "" }, 
    { "9b246683f44c963a50e41d6b485bee77", "", "", "Boring (PAL) (AD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
--- 1646,1650 ----
    { "9ad362179c2eea4ea115c7640b4b003e", "Activision", "AX-013", "Barnstorming (1982) (Activision) [p1][!]", "", "Uncommon", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "9ad36e699ef6f45d9eb6c4cf90475c9f", "Imagic", "IA3203", "Atlantis (1982) (Imagic) [!]", "", "Uncommon", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
!   { "9b150a42fc788960fbb4cbe250259ee2", "Kroko", "", "3E Bankswitch Test (TIA @ $40)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "9b21d8fc78cc4308990d99a4d906ec52", "", "C-838", "Immies & Aggies (CCE)", "", "Extremely Rare", "", "", "", "", "", "", "", "", "", "", "18", "223", "", "", "" }, 
    { "9b246683f44c963a50e41d6b485bee77", "", "", "Boring (PAL) (AD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
***************
*** 1912,1916 ****
    { "b5cb9cf6e668ea3f4cc2be00ea70ec3c", "CommaVid", "CM-005", "Mines of Minos (1982) (CommaVid) (PAL) [!]", "", "Extremely Rare", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "", "" }, 
    { "b6166f15720fdf192932f1f76df5b65d", "Amiga", "3130", "Off Your Rocker (1983) (Amiga)", "", "Extremely Rare", "", "", "", "", "", "", "", "", "", "", "27", "", "", "", "" }, 
!   { "b65d4a38d6047735824ee99684f3515e", "", "", "Megaboy (Brazil) (PAL) [!]", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "b676a9b7094e0345a76ef027091d916b", "Video Gems / Thomas Jentzsch", "", "Mission Survive (1983) (NTSC by Thomas Jentzsch)", "", "New Release (Video Format Conversion)", "", "", "", "A", "", "", "", "", "", "", "", "", "YES", "", "" }, 
    { "b6812eaf87127f043e78f91f2028f9f4", "Simage", "", "Eli's Ladder (Simage)", "", "Unbelievably Rare", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
--- 1912,1916 ----
    { "b5cb9cf6e668ea3f4cc2be00ea70ec3c", "CommaVid", "CM-005", "Mines of Minos (1982) (CommaVid) (PAL) [!]", "", "Extremely Rare", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "", "" }, 
    { "b6166f15720fdf192932f1f76df5b65d", "Amiga", "3130", "Off Your Rocker (1983) (Amiga)", "", "Extremely Rare", "", "", "", "", "", "", "", "", "", "", "27", "", "", "", "" }, 
!   { "b65d4a38d6047735824ee99684f3515e", "", "", "Megaboy (Brazil) (PAL) [!]", "", "", "", "", "", "", "", "", "", "", "", "", "30", "", "", "", "" }, 
    { "b676a9b7094e0345a76ef027091d916b", "Video Gems / Thomas Jentzsch", "", "Mission Survive (1983) (NTSC by Thomas Jentzsch)", "", "New Release (Video Format Conversion)", "", "", "", "A", "", "", "", "", "", "", "", "", "YES", "", "" }, 
    { "b6812eaf87127f043e78f91f2028f9f4", "Simage", "", "Eli's Ladder (Simage)", "", "Unbelievably Rare", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 

Index: stella.pro
===================================================================
RCS file: /cvsroot/stella/stella/src/emucore/stella.pro,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** stella.pro	8 Jun 2007 12:36:52 -0000	1.57
--- stella.pro	9 Jun 2007 23:20:19 -0000	1.58
***************
*** 69,73 ****
  "Cartridge.Manufacturer" "Kroko"
  "Cartridge.Name" "3E Bankswitch Test (TIA @ $40)"
- "Cartridge.Type" "3E"
  ""
  
--- 69,72 ----
***************
*** 75,79 ****
  "Cartridge.Manufacturer" "Kroko"
  "Cartridge.Name" "3E Bankswitch Test (TIA @ $00)"
- "Cartridge.Type" "3E"
  ""
  
--- 74,77 ----
***************
*** 8776,8779 ****
--- 8774,8778 ----
  "Cartridge.Name" "Pleiades (UA Limited)"
  "Cartridge.Rarity" "Prototype"
+ "Display.YStart" "32"
  "Display.Phosphor" "YES"
  ""
***************
*** 11145,11148 ****
--- 11144,11148 ----
  "Cartridge.MD5" "b65d4a38d6047735824ee99684f3515e"
  "Cartridge.Name" "Megaboy (Brazil) (PAL) [!]"
+ "Display.YStart" "30"
  ""

Update of /cvsroot/stella/stella/src/emucore
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv30195/src/emucore

Modified Files:
	Cart.cxx Cart.hxx DefProps.hxx stella.pro 
Log Message:
Added bankswitch autodetection for UA Limited (UA), CommaVid (CV)
and Activision (FE) carts.

Removed most of the pre-defined bankswitching types from the internal
database, since auto-detection is now quite accurate.  There are only
6 entries out of 2722 where the type needs to be overridden; not bad,
I think :)  Testing is welcome, because I may have introduced some minor
regressions.


Index: Cart.cxx
===================================================================
RCS file: /cvsroot/stella/stella/src/emucore/Cart.cxx,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** Cart.cxx	14 Jan 2007 16:17:51 -0000	1.31
--- Cart.cxx	8 Jun 2007 12:36:51 -0000	1.32
***************
*** 182,195 ****
            (size == 4096 && memcmp(image, image + 2048, 2048) == 0))
    {
!     // TODO - autodetect CV
!     type = "2K";
    }
    else if(size == 4096)
    {
!     type = "4K";
    }
    else if(size == 8192)  // 8K
    {
-     // TODO - autodetect FE and UA, probably not possible
      if(isProbablySC(image, size))
        type = "F8SC";
--- 182,199 ----
            (size == 4096 && memcmp(image, image + 2048, 2048) == 0))
    {
!     if(isProbablyCV(image, size))
!       type = "CV";
!     else
!       type = "2K";
    }
    else if(size == 4096)
    {
!     if(isProbablyCV(image, size))
!       type = "CV";
!     else
!       type = "4K";
    }
    else if(size == 8192)  // 8K
    {
      if(isProbablySC(image, size))
        type = "F8SC";
***************
*** 200,203 ****
--- 204,211 ----
      else if(isProbably3F(image, size))
        type = isProbably3E(image, size) ? "3E" : "3F";
+     else if(isProbablyUA(image, size))
+       type = "UA";
+     else if(isProbablyFE(image, size))
+       type = "FE";
      else
        type = "F8";
***************
*** 263,275 ****
  
  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
! int Cartridge::searchForBytes(const uInt8* image, uInt32 size, uInt8 byte1, uInt8 byte2)
  {
    uInt32 count = 0;
!   for(uInt32 i = 0; i < size - 1; ++i)
    {
!     if((image[i] == byte1) && (image[i + 1] == byte2))
      {
!       ++count;
      }
    }
  
--- 271,290 ----
  
  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
! int Cartridge::searchForBytes(const uInt8* image, uInt32 imagesize,
!                               const uInt8* signature, uInt32 sigsize)
  {
    uInt32 count = 0;
!   for(uInt32 i = 0; i < imagesize - sigsize; ++i)
    {
!     uInt32 matches = 0;
!     for(uInt32 j = 0; j < sigsize; ++j)
      {
!       if(image[i+j] == signature[j])
!         ++matches;
!       else
!         break;
      }
+     if(matches == sigsize)
+       ++count;
    }
  
***************
*** 299,303 ****
  bool Cartridge::isProbably3F(const uInt8* image, uInt32 size)
  {
!   return (searchForBytes(image, size, 0x85, 0x3F) > 2);
  }
  
--- 314,323 ----
  bool Cartridge::isProbably3F(const uInt8* image, uInt32 size)
  {
!   // 3F cart bankswitching is triggered by storing the bank number
!   // in address 3F using 'STA $3F'
!   // We expect it will be present at least 2 times, since there are
!   // at least two banks
!   uInt8 signature[] = { 0x85, 0x3F };  // STA $3F
!   return searchForBytes(image, size, signature, 2) > 2;
  }
  
***************
*** 305,309 ****
  bool Cartridge::isProbably3E(const uInt8* image, uInt32 size)
  {
!   return (searchForBytes(image, size, 0x85, 0x3E) > 2);
  }
  
--- 325,331 ----
  bool Cartridge::isProbably3E(const uInt8* image, uInt32 size)
  {
!   // TODO - fix this one, once I find a test ROM
!   uInt8 signature[] = { 0x85, 0x3E };
!   return searchForBytes(image, size, signature, 2) > 2;
  }
  
***************
*** 369,372 ****
--- 391,438 ----
  
  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ bool Cartridge::isProbablyUA(const uInt8* image, uInt32 size)
+ {
+   // UA cart bankswitching switches to bank 1 by accessing address 0x240
+   // using 'STA $240'
+   uInt8 signature[] = { 0x8D, 0x40, 0x02 };  // STA $240
+   return searchForBytes(image, size, signature, 3) > 0;
+ }
+ 
+ // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ bool Cartridge::isProbablyCV(const uInt8* image, uInt32 size)
+ {
+   // CV RAM access occurs at addresses $f3ff and $f400
+   // These signatures are attributed to the MESS project
+   uInt8 signature[2][3] = {
+     { 0x9D, 0xFF, 0xF3 },  // STA $F3FF
+     { 0x99, 0x00, 0xF4 }   // STA $F400
+   };
+   if(searchForBytes(image, size, signature[0], 3) > 0)
+     return true;
+   else
+     return searchForBytes(image, size, signature[1], 3) > 0;
+ }
+ 
+ // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ bool Cartridge::isProbablyFE(const uInt8* image, uInt32 size)
+ {
+   // FE bankswitching is very weird, but always seems to include a
+   // 'JSR $xxxx'
+   // These signatures are attributed to the MESS project
+   uInt8 signature[4][5] = {
+     { 0x20, 0x00, 0xD0, 0xC6, 0xC5 },  // JSR $D000; DEC $C5
+     { 0x20, 0xC3, 0xF8, 0xA5, 0x82 },  // JSR $F8C3; LDA $82
+     { 0xD0, 0xFB, 0x20, 0x73, 0xFE },  // BNE $FB; JSR $FE73
+     { 0x20, 0x00, 0xF0, 0x84, 0xD6 }   // JSR $F000; STY $D6
+   };
+   for(uInt32 i = 0; i < 4; ++i)
+   {
+     if(searchForBytes(image, size, signature[i], 5) > 0)
+       return true;
+   }
+   return false;
+ }
+ 
+ // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  Cartridge::Cartridge(const Cartridge&)
  {

Index: Cart.hxx
===================================================================
RCS file: /cvsroot/stella/stella/src/emucore/Cart.hxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Cart.hxx	14 Jan 2007 16:17:52 -0000	1.17
--- Cart.hxx	8 Jun 2007 12:36:51 -0000	1.18
***************
*** 135,141 ****
  
      /**
!       Utility method used by isProbably3F and isProbably3E
      */
!     static int searchForBytes(const uInt8* image, uInt32 size, uInt8 byte1, uInt8 byte2);
  
      /**
--- 135,149 ----
  
      /**
!       Search the image for the specified byte signature
! 
!       @param image      A pointer to the ROM image
!       @param imagesize  The size of the ROM image 
!       @param signature  The byte sequence to search for
!       @param sigsize    The number of bytes in the signature
! 
!       @return  The number of times the signature was found
      */
!     static int searchForBytes(const uInt8* image, uInt32 imagesize,
!                               const uInt8* signature, uInt32 sigsize);
  
      /**
***************
*** 164,167 ****
--- 172,190 ----
      static bool isProbablyE7(const uInt8* image, uInt32 size);
  
+     /**
+       Returns true if the image is probably a UA bankswitching cartridge
+     */
+     static bool isProbablyUA(const uInt8* image, uInt32 size);
+ 
+     /**
+       Returns true if the image is probably a CV bankswitching cartridge
+     */
+     static bool isProbablyCV(const uInt8* image, uInt32 size);
+ 
+     /**
+       Returns true if the image is probably an FE bankswitching cartridge
+     */
+     static bool isProbablyFE(const uInt8* image, uInt32 size);
+ 
    private:
      // Contains info about this cartridge in string format

Index: DefProps.hxx
===================================================================
RCS file: /cvsroot/stella/stella/src/emucore/DefProps.hxx,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** DefProps.hxx	9 Apr 2007 18:12:38 -0000	1.39
--- DefProps.hxx	8 Jun 2007 12:36:51 -0000	1.40
***************
*** 238,242 ****
    { "14b1e30982962c72f426e2e763eb4274", "Atari", "", "Polo (Atari) (Prototype) [o1]", "", "Prototype", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "14c2548712099c220964d7f044c59fd9", "", "", "Boing! (PD)", "", "Extremely Rare", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "", "" }, 
!   { "14d365bbfaac3d20c6119591f57acca4", "", "", "Video Life (CommaVid) [h1]", "", "", "", "CV", "", "", "", "", "", "", "", "", "", "", "YES", "", "" }, 
    { "14dbb3686dd31964332dc2ef0c55cad0", "", "", "Demo Image Series #15 - Three Marios (PAL) (Non-Interleave) (06-03-2003) (AD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "152c253478b009c275e18cd731b48561", "", "", "Quest (11-10-2002) (Chris Larkin)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
--- 238,242 ----
    { "14b1e30982962c72f426e2e763eb4274", "Atari", "", "Polo (Atari) (Prototype) [o1]", "", "Prototype", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "14c2548712099c220964d7f044c59fd9", "", "", "Boing! (PD)", "", "Extremely Rare", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "", "" }, 
!   { "14d365bbfaac3d20c6119591f57acca4", "", "", "Video Life (CommaVid) [h1]", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "", "" }, 
    { "14dbb3686dd31964332dc2ef0c55cad0", "", "", "Demo Image Series #15 - Three Marios (PAL) (Non-Interleave) (06-03-2003) (AD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "152c253478b009c275e18cd731b48561", "", "", "Quest (11-10-2002) (Chris Larkin)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
***************
*** 802,806 ****
    { "4947c9de2e28b2f5f3b0c40ce7e56d93", "", "", "3-D Corridor Demo 2 (29-03-2003) (MP)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "49571b26f46620a85f93448359324c28", "", "", "Save Our Ship (PAL) [p1][!]", "", "", "", "", "", "", "", "", "", "", "", "NTSC", "38", "", "", "", "" }, 
!   { "497f3d2970c43e5224be99f75e97cbbb", "CommaVid", "", "Video Life (CommaVid)", "", "Extremely Rare", "", "CV", "", "", "", "", "", "", "", "", "", "", "YES", "", "" }, 
    { "4999b45be0ab5a85bac1b7c0e551542b", "CCE", "", "Double Dragon (CCE)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "4a1a0509bfc1015273a542dfe2040958", "Atari", "CX2628 / 6699842 / 4975117", "Bowling (1978) (Atari) [b1]", "", "Common", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
--- 802,806 ----
    { "4947c9de2e28b2f5f3b0c40ce7e56d93", "", "", "3-D Corridor Demo 2 (29-03-2003) (MP)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "49571b26f46620a85f93448359324c28", "", "", "Save Our Ship (PAL) [p1][!]", "", "", "", "", "", "", "", "", "", "", "", "NTSC", "38", "", "", "", "" }, 
!   { "497f3d2970c43e5224be99f75e97cbbb", "CommaVid", "", "Video Life (CommaVid)", "", "Extremely Rare", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "", "" }, 
    { "4999b45be0ab5a85bac1b7c0e551542b", "CCE", "", "Double Dragon (CCE)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "4a1a0509bfc1015273a542dfe2040958", "Atari", "CX2628 / 6699842 / 4975117", "Bowling (1978) (Atari) [b1]", "", "Common", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
***************
*** 863,870 ****
    { "4f0071946e80ca68edfdccbac86dcce0", "", "", "Virtual Pet Demo 1 (CRACKERS) (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "4f2d47792a06da224ba996c489a87939", "", "", "Super Action Pak - Pitf,GPrix,LaserB,Barn (1988) (Activision) (PAL) [!]", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
!   { "4f618c2429138e0280969193ed6c107e", "Activision", "AZ-028", "Robot Tank (1983) (Activision) [!]", "", "Rare", "", "FE", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "4f634893d54e9cabe106e0ec0b7bdcdf", "Retroactive", "", "Qb (2.14) (Retroactive) (PAL)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "", "" }, 
    { "4f64d6d0694d9b7a1ed7b0cb0b83e759", "20th Century Fox", "11016", "Revenge of the Beefsteak Tomatoes (1983) (20th Century Fox) [!]", "", "Rare", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
!   { "4f6702c3ba6e0ee2e2868d054b00c064", "Activision", "AZ-033", "Space Shuttle - Journey Into Space (1983) (Activision) (PAL) [!]", "", "Rare", "", "FE", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "4f781f0476493c50dc578336f1132a67", "Atari", "CX2611", "Indy 500 (1978) (Atari) (PAL) [p1][o1][!]", "Uses Driving Controllers", "Uncommon", "", "", "", "", "", "", "DRIVING", "DRIVING", "", "", "", "", "", "", "" }, 
    { "4f82d8d78099dd71e8e169646e799d05", "Atari", "", "Miniature Golf (1979) (Atari) (PAL) [p1][o1][!]", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
--- 863,870 ----
    { "4f0071946e80ca68edfdccbac86dcce0", "", "", "Virtual Pet Demo 1 (CRACKERS) (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "4f2d47792a06da224ba996c489a87939", "", "", "Super Action Pak - Pitf,GPrix,LaserB,Barn (1988) (Activision) (PAL) [!]", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
!   { "4f618c2429138e0280969193ed6c107e", "Activision", "AZ-028", "Robot Tank (1983) (Activision) [!]", "", "Rare", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "4f634893d54e9cabe106e0ec0b7bdcdf", "Retroactive", "", "Qb (2.14) (Retroactive) (PAL)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "", "" }, 
    { "4f64d6d0694d9b7a1ed7b0cb0b83e759", "20th Century Fox", "11016", "Revenge of the Beefsteak Tomatoes (1983) (20th Century Fox) [!]", "", "Rare", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
!   { "4f6702c3ba6e0ee2e2868d054b00c064", "Activision", "AZ-033", "Space Shuttle - Journey Into Space (1983) (Activision) (PAL) [!]", "", "Rare", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "4f781f0476493c50dc578336f1132a67", "Atari", "CX2611", "Indy 500 (1978) (Atari) (PAL) [p1][o1][!]", "Uses Driving Controllers", "Uncommon", "", "", "", "", "", "", "DRIVING", "DRIVING", "", "", "", "", "", "", "" }, 
    { "4f82d8d78099dd71e8e169646e799d05", "Atari", "", "Miniature Golf (1979) (Atari) (PAL) [p1][o1][!]", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
***************
*** 1283,1287 ****
    { "76ee917d817ef9a654bc4783e0273ac4", "Starsoft", "", "Fox & Goat (Starsoft) (PAL) [!]", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "76f53abbbf39a0063f24036d6ee0968a", "Mattel", "MT7045", "Bump 'N' Jump (1983) (Mattel)", "", "Rare", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
!   { "76f66ce3b83d7a104a899b4b3354a2f2", "UA", "", "Cat Trax (1983) (UA)", "", "", "", "", "", "", "", "", "", "", "", "", "30", "", "YES", "", "" }, 
    { "77057d9d14b99e465ea9e29783af0ae3", "Activision", "AG-001", "Dragster (1980) (Activision) [!]", "", "Uncommon", "", "", "", "", "", "", "", "", "", "", "27", "", "", "", "" }, 
    { "7732e4e4cc2644f163d6650ddcc9d9df", "HES", "", "2 Pak Black - Challenge, Surfing (HES) (PAL) [!]", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
--- 1283,1287 ----
    { "76ee917d817ef9a654bc4783e0273ac4", "Starsoft", "", "Fox & Goat (Starsoft) (PAL) [!]", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "76f53abbbf39a0063f24036d6ee0968a", "Mattel", "MT7045", "Bump 'N' Jump (1983) (Mattel)", "", "Rare", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
!   { "76f66ce3b83d7a104a899b4b3354a2f2", "UA Limited", "", "Cat Trax (1983) (UA)", "", "", "", "", "", "", "", "", "", "", "", "", "30", "", "YES", "", "" }, 
    { "77057d9d14b99e465ea9e29783af0ae3", "Activision", "AG-001", "Dragster (1980) (Activision) [!]", "", "Uncommon", "", "", "", "", "", "", "", "", "", "", "27", "", "", "", "" }, 
    { "7732e4e4cc2644f163d6650ddcc9d9df", "HES", "", "2 Pak Black - Challenge, Surfing (HES) (PAL) [!]", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
***************
*** 1464,1468 ****
    { "87e79cd41ce136fd4f72cc6e2c161bee", "", "CX2675", "Ms. Pac-Man (1982) (Atari)", "", "Common", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "NO" }, 
    { "87f020daa98d0132e98e43db7d8fea7e", "20th Century Fox", "11001", "Worm War I (1982) (20th Century Fox) [!]", "", "Uncommon", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
!   { "883258dcd68cefc6cd4d40b1185116dc", "Activision", "AZ-030", "Decathlon (1983) (Activision) (PAL) [!]", "", "Rare", "", "FE", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "885b2002fa9d27502d84968d4656c4ca", "CBS Electronics", "4L-2737", "Omega Race (1983) (CBS Electronics) [o1]", "Uses Booster Grip Controller; set right difficulty to 'A' to use Booster-Grip in both ports", "Uncommon", "", "", "", "A", "", "", "BOOSTER-GRIP", "BOOSTER-GRIP", "", "", "", "", "", "", "" }, 
    { "8874b68751fd2ba6d3306a263ae57a7d", "Eric Mooney", "", "Invaders by Erik Mooney (Alpha 1) (PD)", "", "New Release", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
--- 1464,1468 ----
    { "87e79cd41ce136fd4f72cc6e2c161bee", "", "CX2675", "Ms. Pac-Man (1982) (Atari)", "", "Common", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "NO" }, 
    { "87f020daa98d0132e98e43db7d8fea7e", "20th Century Fox", "11001", "Worm War I (1982) (20th Century Fox) [!]", "", "Uncommon", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
!   { "883258dcd68cefc6cd4d40b1185116dc", "Activision", "AZ-030", "Decathlon (1983) (Activision) (PAL) [!]", "", "Rare", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "885b2002fa9d27502d84968d4656c4ca", "CBS Electronics", "4L-2737", "Omega Race (1983) (CBS Electronics) [o1]", "Uses Booster Grip Controller; set right difficulty to 'A' to use Booster-Grip in both ports", "Uncommon", "", "", "", "A", "", "", "BOOSTER-GRIP", "BOOSTER-GRIP", "", "", "", "", "", "", "" }, 
    { "8874b68751fd2ba6d3306a263ae57a7d", "Eric Mooney", "", "Invaders by Erik Mooney (Alpha 1) (PD)", "", "New Release", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
***************
*** 1500,1504 ****
    { "8b7ca29a55432f886cee3d452fb00481", "Starpath", "AR-4201", "Sword of Saros (1983) (Starpath) (PAL)", "", "Extremely Rare", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "8b81af55cd2ef3c7444d6aec4e3a1c09", "", "", "Dark Mage [b1]", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "", "" }, 
!   { "8bbfd951c89cc09c148bfabdefa08bec", "UA Limited", "", "Pleiades (UA Limited)", "", "Prototype", "", "UA", "", "", "", "", "", "", "", "", "", "", "YES", "", "" }, 
    { "8bc0d2052b4f259e7a50a7c771b45241", "Xonox", "", "Tomarc the Barbarian (1983) (Xonox)", "", "Rare", "", "", "", "", "", "", "", "", "", "", "24", "", "", "", "" }, 
    { "8bd8f65377023bdb7c5fcf46ddda5d31", "Activision", "AG-019", "Sky Jinks (1982) (Activision) [o1]", "", "Rare", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
--- 1500,1504 ----
    { "8b7ca29a55432f886cee3d452fb00481", "Starpath", "AR-4201", "Sword of Saros (1983) (Starpath) (PAL)", "", "Extremely Rare", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "8b81af55cd2ef3c7444d6aec4e3a1c09", "", "", "Dark Mage [b1]", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "", "" }, 
!   { "8bbfd951c89cc09c148bfabdefa08bec", "UA Limited", "", "Pleiades (UA Limited)", "", "Prototype", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "", "" }, 
    { "8bc0d2052b4f259e7a50a7c771b45241", "Xonox", "", "Tomarc the Barbarian (1983) (Xonox)", "", "Rare", "", "", "", "", "", "", "", "", "", "", "24", "", "", "", "" }, 
    { "8bd8f65377023bdb7c5fcf46ddda5d31", "Activision", "AG-019", "Sky Jinks (1982) (Activision) [o1]", "", "Rare", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
***************
*** 1685,1689 ****
    { "9f2d58dce1b81c6ba201ed103507c025", "", "", "Fu Kung! (V0.02) (2003) (AD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "9f48eeb47836cf145a15771775f0767a", "Atari", "CX262", "Basic Programming (1978) (Atari)", "Uses Keypad Controllers", "Rare", "", "", "", "", "", "", "KEYBOARD", "KEYBOARD", "", "", "", "", "YES", "", "" }, 
!   { "9f59eddf9ba91a7d93bce7ee4b7693bc", "", "", "Montezuma's Revenge - Starring Panama Joe (PAL by Thomas Jentzsch).a26", "", "", "", "", "", "", "", "", "", "", "", "PAL60", "", "", "", "", "" }, 
    { "9f8fad4badcd7be61bbd2bcaeef3c58f", "Parker Bros", "PB5330", "Reactor (1982) (Parker Bros)", "", "Uncommon", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "9f901509f0474bf9760e6ebd80e629cd", "", "CX2623 / 99819 / 75125", "Home Run (1978) [o1]", "", "Common", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
--- 1685,1689 ----
    { "9f2d58dce1b81c6ba201ed103507c025", "", "", "Fu Kung! (V0.02) (2003) (AD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "9f48eeb47836cf145a15771775f0767a", "Atari", "CX262", "Basic Programming (1978) (Atari)", "Uses Keypad Controllers", "Rare", "", "", "", "", "", "", "KEYBOARD", "KEYBOARD", "", "", "", "", "YES", "", "" }, 
!   { "9f59eddf9ba91a7d93bce7ee4b7693bc", "", "", "Montezuma's Revenge - Starring Panama Joe (PAL60 by Thomas Jentzsch).a26", "", "", "", "", "", "", "", "", "", "", "", "PAL60", "", "", "", "", "" }, 
    { "9f8fad4badcd7be61bbd2bcaeef3c58f", "Parker Bros", "PB5330", "Reactor (1982) (Parker Bros)", "", "Uncommon", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "9f901509f0474bf9760e6ebd80e629cd", "", "CX2623 / 99819 / 75125", "Home Run (1978) [o1]", "", "Common", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
***************
*** 1823,1827 ****
    { "ac53b83e1b57a601eeae9d3ce1b4a458", "Retroactive", "", "Qb (2.15) (Retroactive) (NTSC)", "", "New Release", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "", "" }, 
    { "ac5f78bae0638cf3f2a0c8d07eb4df69", "", "", "Minesweeper (V.99) (Soren Gust) (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
!   { "ac7c2260378975614192ca2bc3d20e0b", "Activision", "AZ-030", "Decathlon (1983) (Activision) [!]", "", "Rare", "", "FE", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "ac9adbd6de786a242e19d4bec527982b", "Activision", "AX-012", "Ice Hockey (1981) (Activision) (PAL) [!]", "", "Uncommon", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "aca09ffea77174b148b96b205109db4d", "Activision", "AG-007", "Tennis (1981) (Activision) [o1]", "", "Common", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
--- 1823,1827 ----
    { "ac53b83e1b57a601eeae9d3ce1b4a458", "Retroactive", "", "Qb (2.15) (Retroactive) (NTSC)", "", "New Release", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "", "" }, 
    { "ac5f78bae0638cf3f2a0c8d07eb4df69", "", "", "Minesweeper (V.99) (Soren Gust) (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
!   { "ac7c2260378975614192ca2bc3d20e0b", "Activision", "AZ-030", "Decathlon (1983) (Activision) [!]", "", "Rare", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "ac9adbd6de786a242e19d4bec527982b", "Activision", "AX-012", "Ice Hockey (1981) (Activision) (PAL) [!]", "", "Uncommon", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "aca09ffea77174b148b96b205109db4d", "Activision", "AG-007", "Tennis (1981) (Activision) [o1]", "", "Common", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
***************
*** 2004,2008 ****
    { "c00b65d1bae0aef6a1b5652c9c2156a1", "Atari", "CX2621", "Video Olympics (1978) (Atari) [o1]", "Uses the Paddle Controllers", "Common", "", "", "", "", "", "", "PADDLES", "PADDLES", "YES", "", "", "", "", "", "" }, 
    { "c02e1afa0671e438fd526055c556d231", "", "", "A-Team, The (Atari) (Prototype) (PAL-60) [!]", "", "", "", "", "", "", "", "", "", "", "", "PAL60", "", "", "", "", "" }, 
!   { "c032c2bd7017fdfbba9a105ec50f800e", "Activision", "", "Thwocker (Activision) (Prototype) [!]", "", "Prototype", "", "FE", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "c033dc1d7b6fde41b9cadce9638909bb", "", "", "Skeleton (V1.1) (06-09-2002) (Eric Ball)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "c05f367fa4767ceb27abadf0066df7f4", "", "", "TomInv (31-07-2001) (TJ)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
--- 2004,2008 ----
    { "c00b65d1bae0aef6a1b5652c9c2156a1", "Atari", "CX2621", "Video Olympics (1978) (Atari) [o1]", "Uses the Paddle Controllers", "Common", "", "", "", "", "", "", "PADDLES", "PADDLES", "YES", "", "", "", "", "", "" }, 
    { "c02e1afa0671e438fd526055c556d231", "", "", "A-Team, The (Atari) (Prototype) (PAL-60) [!]", "", "", "", "", "", "", "", "", "", "", "", "PAL60", "", "", "", "", "" }, 
!   { "c032c2bd7017fdfbba9a105ec50f800e", "Activision", "", "Thwocker (Activision) (Prototype) [!]", "", "Prototype", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "c033dc1d7b6fde41b9cadce9638909bb", "", "", "Skeleton (V1.1) (06-09-2002) (Eric Ball)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "c05f367fa4767ceb27abadf0066df7f4", "", "", "TomInv (31-07-2001) (TJ)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
***************
*** 2111,2115 ****
    { "cad982c9b45bc5eff34e4ea982d5f1ca", "", "", "Song (17-02-2003) (Paul Slocum)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "", "" }, 
    { "cae8f83c06831ec7bb6a3c07e98e9342", "Colin Hughes", "", "Tetris 2600 (Colin Hughes) [o1]", "", "New Release", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "", "" }, 
!   { "cb0b5b8458a13a074e1fe82d3c4e8f3c", "Activision", "AZ-028", "Robot Tank (1983) (Activision) (PAL) [b1]", "", "Rare", "", "FE", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "cb24210dc86d92df97b38cf2a51782da", "Ariola", "VG-01", "Missile Control (AKA Raketen-Angriff) (Ariola) (PAL) [!]", "", "Extremely Rare", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "cb4a7b507372c24f8b9390d22d54a918", "ITT", "", "Peter Penguin (Jagt auf Diamanten-Frisco) (ITT) (PAL) [!]", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
--- 2111,2115 ----
    { "cad982c9b45bc5eff34e4ea982d5f1ca", "", "", "Song (17-02-2003) (Paul Slocum)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "", "" }, 
    { "cae8f83c06831ec7bb6a3c07e98e9342", "Colin Hughes", "", "Tetris 2600 (Colin Hughes) [o1]", "", "New Release", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "", "" }, 
!   { "cb0b5b8458a13a074e1fe82d3c4e8f3c", "Activision", "AZ-028", "Robot Tank (1983) (Activision) (PAL) [b1]", "", "Rare", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "cb24210dc86d92df97b38cf2a51782da", "Ariola", "VG-01", "Missile Control (AKA Raketen-Angriff) (Ariola) (PAL) [!]", "", "Extremely Rare", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "cb4a7b507372c24f8b9390d22d54a918", "ITT", "", "Peter Penguin (Jagt auf Diamanten-Frisco) (ITT) (PAL) [!]", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
***************
*** 2154,2158 ****
    { "cdb81bf33d830ee4ee0606ee99e84dba", "Starpath", "AR-4300", "Fireball (1982) (Starpath) (PAL)", "Uses the Paddle Controllers", "Rare", "", "", "", "", "", "", "PADDLES", "", "", "", "", "", "", "", "" }, 
    { "cdc1a5c61d7488eadc9aba36166b253d", "Retroactive", "", "Qb (V0.12) (Stella) (2001) (Retroactive)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "", "" }, 
!   { "cddabfd68363a76cd30bee4e8094c646", "CommaVid", "", "Magicard (CommaVid)", "Uses Keypad Controllers", "", "", "CV", "", "", "", "", "KEYBOARD", "KEYBOARD", "", "", "24", "", "", "", "" }, 
    { "ce17325834bf8b0a0d0d8de08478d436", "", "", "Boring Freeway (Freeway Hack)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "ce243747bf34a2de366f846b3f4ca772", "Goliath", "", "Felix Return (Goliath) (PAL) [!]", "", "", "", "", "", "", "", "", "", "", "", "", "39", "256", "", "", "" }, 
--- 2154,2158 ----
    { "cdb81bf33d830ee4ee0606ee99e84dba", "Starpath", "AR-4300", "Fireball (1982) (Starpath) (PAL)", "Uses the Paddle Controllers", "Rare", "", "", "", "", "", "", "PADDLES", "", "", "", "", "", "", "", "" }, 
    { "cdc1a5c61d7488eadc9aba36166b253d", "Retroactive", "", "Qb (V0.12) (Stella) (2001) (Retroactive)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "", "" }, 
!   { "cddabfd68363a76cd30bee4e8094c646", "CommaVid", "", "Magicard (CommaVid)", "Uses Keypad Controllers", "", "", "", "", "", "", "", "KEYBOARD", "KEYBOARD", "", "", "24", "", "", "", "" }, 
    { "ce17325834bf8b0a0d0d8de08478d436", "", "", "Boring Freeway (Freeway Hack)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "ce243747bf34a2de366f846b3f4ca772", "Goliath", "", "Felix Return (Goliath) (PAL) [!]", "", "", "", "", "", "", "", "", "", "", "", "", "39", "256", "", "", "" }, 
***************
*** 2223,2227 ****
    { "d36308387241e98f813646f346e7f9f7", "", "", "Ghostbuster 2 (PAL) (King Atari)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "", "" }, 
    { "d39e29b03af3c28641084dd1528aae05", "Goliath-Funvision", "", "Spider Kong (AKA Karate) (Goliath-Funvision) (PAL) [!]", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
!   { "d3bb42228a6cd452c111c1932503cc03", "UA Limited", "", "Funky Fish (UA Limited)", "", "Prototype", "", "UA", "", "", "", "", "", "", "", "", "38", "", "YES", "", "" }, 
    { "d45ebf130ed9070ea8ebd56176e48a38", "Sega", "001-01", "Tac Scan (1983) (Sega) [!]", "Uses the Paddle Controllers (right only)", "Uncommon", "", "", "", "", "", "YES", "PADDLES", "PADDLES", "YES", "", "", "215", "YES", "", "" }, 
    { "d47387658ed450db77c3f189b969cc00", "Playaround", "", "Westward Ho (Playground) (PAL)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
--- 2223,2227 ----
    { "d36308387241e98f813646f346e7f9f7", "", "", "Ghostbuster 2 (PAL) (King Atari)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "", "" }, 
    { "d39e29b03af3c28641084dd1528aae05", "Goliath-Funvision", "", "Spider Kong (AKA Karate) (Goliath-Funvision) (PAL) [!]", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
!   { "d3bb42228a6cd452c111c1932503cc03", "UA Limited", "", "Funky Fish (UA Limited)", "", "Prototype", "", "", "", "", "", "", "", "", "", "", "38", "", "YES", "", "" }, 
    { "d45ebf130ed9070ea8ebd56176e48a38", "Sega", "001-01", "Tac Scan (1983) (Sega) [!]", "Uses the Paddle Controllers (right only)", "Uncommon", "", "", "", "", "", "YES", "PADDLES", "PADDLES", "YES", "", "", "215", "YES", "", "" }, 
    { "d47387658ed450db77c3f189b969cc00", "Playaround", "", "Westward Ho (Playground) (PAL)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
***************
*** 2604,2608 ****
    { "f5d103a9ae36d1d4ee7eef657b75d2b3", "Starpath", "AR-4105", "Frogger Preview (1982) (Starpath)", "", "Extremely Rare", "", "", "", "", "", "", "", "", "", "", "31", "", "", "", "" }, 
    { "f613aad84d2163d6b197b220bfec1b7e", "", "", "X-Doom V.27 (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
!   { "f687ec4b69611a7f78bd69b8a567937a", "Activision", "AZ-028", "Robot Tank (1983) (Activision) (PAL) [!]", "", "Rare", "", "FE", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "f69a39b215852a0c2764d2a923c1e463", "", "", "Move a Blue Blob Demo 2 (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "f69bb58b815a6bdca548fa4d5e0d5a75", "Atari", "", "Bowling (32-in-1) (Atari) (PAL) [!]", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
--- 2604,2608 ----
    { "f5d103a9ae36d1d4ee7eef657b75d2b3", "Starpath", "AR-4105", "Frogger Preview (1982) (Starpath)", "", "Extremely Rare", "", "", "", "", "", "", "", "", "", "", "31", "", "", "", "" }, 
    { "f613aad84d2163d6b197b220bfec1b7e", "", "", "X-Doom V.27 (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
!   { "f687ec4b69611a7f78bd69b8a567937a", "Activision", "AZ-028", "Robot Tank (1983) (Activision) (PAL) [!]", "", "Rare", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "f69a39b215852a0c2764d2a923c1e463", "", "", "Move a Blue Blob Demo 2 (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "f69bb58b815a6bdca548fa4d5e0d5a75", "Atari", "", "Bowling (32-in-1) (Atari) (PAL) [!]", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
***************
*** 2685,2689 ****
    { "fb91dfc36cddaa54b09924ae8fd96199", "", "", "Frogger II - Threedeep! (1984) (Parker Bros) (PAL) [!]", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "", "" }, 
    { "fbac6476e7b2b20d246202af81662c88", "Starpath", "AR-4400", "Dragonstomper Preview (1982) (Starpath) (PAL)", "", "Extremely Rare", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
!   { "fbb0151ea2108e33b2dbaae14a1831dd", "Activision / Thomas Jentzsch", "", "Robot Tank TV by Thomas Jentzsch (2 Joystick Hack)", "Uses two simultaneous Joystick Controllers, Hack of Robot Tank (Activision)", "New Release (Hack)", "", "FE", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "fbb4f3debf48dc961b559384467f2057", "", "", "River Raid III (1985) (Digitel-Brazil) [!]", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "fbd6102e17a5c02c6e1911381b7203f9", "", "", "Star Fire - Warping!! (10-04-2003) (MP)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
--- 2685,2689 ----
    { "fb91dfc36cddaa54b09924ae8fd96199", "", "", "Frogger II - Threedeep! (1984) (Parker Bros) (PAL) [!]", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "", "" }, 
    { "fbac6476e7b2b20d246202af81662c88", "Starpath", "AR-4400", "Dragonstomper Preview (1982) (Starpath) (PAL)", "", "Extremely Rare", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
!   { "fbb0151ea2108e33b2dbaae14a1831dd", "Activision / Thomas Jentzsch", "", "Robot Tank TV by Thomas Jentzsch (2 Joystick Hack)", "Uses two simultaneous Joystick Controllers, Hack of Robot Tank (Activision)", "New Release (Hack)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "fbb4f3debf48dc961b559384467f2057", "", "", "River Raid III (1985) (Digitel-Brazil) [!]", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
    { "fbd6102e17a5c02c6e1911381b7203f9", "", "", "Star Fire - Warping!! (10-04-2003) (MP)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 

Index: stella.pro
===================================================================
RCS file: /cvsroot/stella/stella/src/emucore/stella.pro,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** stella.pro	6 Feb 2007 23:34:33 -0000	1.56
--- stella.pro	8 Jun 2007 12:36:52 -0000	1.57
***************
*** 1371,1375 ****
  "Cartridge.MD5" "14d365bbfaac3d20c6119591f57acca4"
  "Cartridge.Name" "Video Life (CommaVid) [h1]"
- "Cartridge.Type" "CV"
  "Display.Phosphor" "YES"
  ""
--- 1371,1374 ----
***************
*** 4678,4682 ****
  "Cartridge.Name" "Video Life (CommaVid)"
  "Cartridge.Rarity" "Extremely Rare"
- "Cartridge.Type" "CV"
  "Display.Phosphor" "YES"
  ""
--- 4677,4680 ----
***************
*** 5018,5022 ****
  "Cartridge.Name" "Robot Tank (1983) (Activision) [!]"
  "Cartridge.Rarity" "Rare"
- "Cartridge.Type" "FE"
  ""
  
--- 5016,5019 ----
***************
*** 5048,5052 ****
  "Cartridge.Name" "Space Shuttle - Journey Into Space (1983) (Activision) (PAL) [!]"
  "Cartridge.Rarity" "Rare"
- "Cartridge.Type" "FE"
  ""
  
--- 5045,5048 ----
***************
*** 7471,7475 ****
  
  "Cartridge.MD5" "76f66ce3b83d7a104a899b4b3354a2f2"
! "Cartridge.Manufacturer" "UA"
  "Cartridge.Name" "Cat Trax (1983) (UA)"
  "Display.YStart" "30"
--- 7467,7471 ----
  
  "Cartridge.MD5" "76f66ce3b83d7a104a899b4b3354a2f2"
! "Cartridge.Manufacturer" "UA Limited"
  "Cartridge.Name" "Cat Trax (1983) (UA)"
  "Display.YStart" "30"
***************
*** 8550,8554 ****
  "Cartridge.Name" "Decathlon (1983) (Activision) (PAL) [!]"
  "Cartridge.Rarity" "Rare"
- "Cartridge.Type" "FE"
  ""
  
--- 8546,8549 ----
***************
*** 8781,8785 ****
  "Cartridge.Name" "Pleiades (UA Limited)"
  "Cartridge.Rarity" "Prototype"
- "Cartridge.Type" "UA"
  "Display.Phosphor" "YES"
  ""
--- 8776,8779 ----
***************
*** 9740,9744 ****
  
  "Cartridge.MD5" "9f59eddf9ba91a7d93bce7ee4b7693bc"
! "Cartridge.Name" "Montezuma's Revenge - Starring Panama Joe (PAL by Thomas Jentzsch).a26"
  "Display.Format" "PAL60"
  ""
--- 9734,9738 ----
  
  "Cartridge.MD5" "9f59eddf9ba91a7d93bce7ee4b7693bc"
! "Cartridge.Name" "Montezuma's Revenge - Starring Panama Joe (PAL60 by Thomas Jentzsch).a26"
  "Display.Format" "PAL60"
  ""
***************
*** 10631,10635 ****
  "Cartridge.Name" "Decathlon (1983) (Activision) [!]"
  "Cartridge.Rarity" "Rare"
- "Cartridge.Type" "FE"
  ""
  
--- 10625,10628 ----
***************
*** 11746,11750 ****
  "Cartridge.Name" "Thwocker (Activision) (Prototype) [!]"
  "Cartridge.Rarity" "Prototype"
- "Cartridge.Type" "FE"
  ""
  
--- 11739,11742 ----
***************
*** 12360,12364 ****
  "Cartridge.Name" "Robot Tank (1983) (Activision) (PAL) [b1]"
  "Cartridge.Rarity" "Rare"
- "Cartridge.Type" "FE"
  ""
  
--- 12352,12355 ----
***************
*** 12597,12601 ****
  "Cartridge.Name" "Magicard (CommaVid)"
  "Cartridge.Note" "Uses Keypad Controllers"
- "Cartridge.Type" "CV"
  "Controller.Left" "KEYBOARD"
  "Controller.Right" "KEYBOARD"
--- 12588,12591 ----
***************
*** 12994,12998 ****
  "Cartridge.Name" "Funky Fish (UA Limited)"
  "Cartridge.Rarity" "Prototype"
- "Cartridge.Type" "UA"
  "Display.YStart" "38"
  "Display.Phosphor" "YES"
--- 12984,12987 ----
***************
*** 15190,15194 ****
  "Cartridge.Name" "Robot Tank (1983) (Activision) (PAL) [!]"
  "Cartridge.Rarity" "Rare"
- "Cartridge.Type" "FE"
  ""
  
--- 15179,15182 ----
***************
*** 15662,15666 ****
  "Cartridge.Note" "Uses two simultaneous Joystick Controllers, Hack of Robot Tank (Activision)"
  "Cartridge.Rarity" "New Release (Hack)"
- "Cartridge.Type" "FE"
  ""
  
--- 15650,15653 ----