From 5f595b60de8f189c50604be14b53374bcd44b347 Mon Sep 17 00:00:00 2001 From: stephena Date: Sat, 24 Jan 2009 17:32:29 +0000 Subject: [PATCH] Added '-gl_aspectn' and 'gl_aspectp' commandline arguments (and associated UI items) to set the aspect ratio to use in NTSC and PAL modes. This replaces the '-gl_aspect' setting. Hold-select/reset/button0 now work from the UI. Grabmouse can now be set in the UI. Changed status of the fix for ATI/OpenGL/sound from fixed to workaround. Sound will work for the first ROM, but not for subsequent ones. This improves on the previous behaviour, where sound didn't work at all. Bumped version to 2.7.1. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1655 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba --- stella/Changes.txt | 21 ++++-- stella/Todo.txt | 2 + stella/docs/graphics/options_video.png | Bin 6904 -> 7596 bytes stella/docs/index.html | 13 ++-- stella/src/common/FrameBufferGL.cxx | 7 +- stella/src/common/Version.hxx | 4 +- stella/src/common/mainSDL.cxx | 47 +++++-------- stella/src/emucore/FrameBuffer.hxx | 8 +-- stella/src/emucore/OSystem.cxx | 20 ++++-- stella/src/emucore/OSystem.hxx | 6 +- stella/src/emucore/Settings.cxx | 16 +++-- stella/src/gui/LauncherDialog.cxx | 8 +-- stella/src/gui/LauncherDialog.hxx | 4 +- stella/src/gui/ListWidget.cxx | 17 +---- stella/src/gui/VideoDialog.cxx | 92 ++++++++++++++++++------- stella/src/gui/VideoDialog.hxx | 16 +++-- 16 files changed, 169 insertions(+), 112 deletions(-) diff --git a/stella/Changes.txt b/stella/Changes.txt index 35f18e126..9b2bb7a49 100644 --- a/stella/Changes.txt +++ b/stella/Changes.txt @@ -14,10 +14,13 @@ 2.7 to 2.7.1: (Jan. 26, 2009) - * Fixed issue with sound not working in OpenGL video mode in Windows with - ATI video hardware. Related to this, added '-audiofirst' commandline - argument, which initializes audio before video when emulating a ROM - (this is what was causing the sound to not work). + * Partial workaround for sound not working in OpenGL video mode in + Windows with ATI video hardware. Sound will now work for the first ROM + selected, but not for subsequent ones (you will have to quit and + restart Stella for sound to work again). Related to this, added + '-audiofirst' commandline argument, which initializes audio before video + when emulating a ROM. Further work is required to completely fix + this bug. * Fixed bug where volume wasn't being saved in 'Audio Settings' when started from the ROM launcher. @@ -36,6 +39,16 @@ now be changed with the '-eepromdir' commandline argument as well as in the UI. + * Added '-gl_aspectn' and '-gl_aspectp' commandline arguments (and + associated UI items), which replace the previous '-gl_aspect' setting. + The aspect modes can now be set separately for NTSC and PAL mode. + + * Fixed bug with hold-select/reset/button0 when overriding ROM properties; + the checkboxes in the UI weren't actually doing anything. + + * The 'grabmouse' option is now configurable from the UI; previously + it was only accessible from the commandline or its shortcut key. + * Removed 'Emulation_HmoveBlanks' ROM property and associated UI item. You can no longer optionally turn off HMOVE blanking; it is always enabled when necessary. diff --git a/stella/Todo.txt b/stella/Todo.txt index 4def97e2e..a5cc920fc 100644 --- a/stella/Todo.txt +++ b/stella/Todo.txt @@ -36,6 +36,8 @@ Stephen Anthony at stephena@users.sourceforge.net. directory named that way. Basically the same as is currently done for ROMs. + (2) Add popup text widget to dynamically select the entries shown. + * More support for copy and paste. * Fix PropSet to properly delete entries when 'Default' is pressed in diff --git a/stella/docs/graphics/options_video.png b/stella/docs/graphics/options_video.png index fb7100742de15aed2b1762bbd16353ae8765c4b0..0bf94626dcb068c4b7e32627adf2682819d507eb 100644 GIT binary patch literal 7596 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 literal 6904 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 YCkx_N@EPyN0Pv%&VQ{BH&F<-c0XY;WxBvhE diff --git a/stella/docs/index.html b/stella/docs/index.html index cd2cff879..087b5cb02 100644 --- a/stella/docs/index.html +++ b/stella/docs/index.html @@ -607,11 +607,12 @@ - 
-gl_aspect <number>
+ 
-gl_aspectn <number>
-gl_aspectp <number>
OpenGL mode only. Specify the amount (as a percentage) to scale the - image width. Since many video modes do not use square pixels, you can - reduce width until the pixels appear square. Allowable values are - 80 - 120; I find 85 - 90 gives the most authentic look. + TIA image width in NTSC and PAL mode. Since many video modes do not + use square pixels, you can reduce width until the pixels appear square. + Allowable values are 80 - 120; I find 85 - 90 gives the most authentic + look for NTSC, and 105 - 110 for PAL. @@ -1065,12 +1066,14 @@ FS Resresolution for fullscreen mode-fullres Timing (*)how to wait between frames (requires restart)-timing GL FilterOpenGL filter mode-gl_filter - GL AspectOpenGL width of window-gl_aspect + GL Aspect (N)OpenGL width of TIA image in NTSC mode-gl_aspectn + GL Aspect (P)OpenGL width of TIA image in PAL mode-gl_aspectp Framerateframes per second in emulation mode-framerate Fullscreen modeself-explanatory-fullscreen PAL color-lossuse PAL color-loss effect-colorloss GL FS Stretchstretch fullscreen OpenGL in emulation mode-gl_fsmax GL VSyncenable OpenGL vertical synchronization-gl_vsync + Grab mousekeep mouse in SDL window-grabmouse Center window (*)attempt to center SDL window (requires restart)-center diff --git a/stella/src/common/FrameBufferGL.cxx b/stella/src/common/FrameBufferGL.cxx index 66ce69ae4..4a0100bce 100644 --- a/stella/src/common/FrameBufferGL.cxx +++ b/stella/src/common/FrameBufferGL.cxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: FrameBufferGL.cxx,v 1.135 2009-01-22 00:49:32 stephena Exp $ +// $Id: FrameBufferGL.cxx,v 1.136 2009-01-24 17:32:29 stephena Exp $ //============================================================================ #ifdef DISPLAY_OPENGL @@ -221,8 +221,9 @@ bool FrameBufferGL::setVidMode(VideoMode& mode) // Aspect ratio and fullscreen stretching only applies to the TIA if(!inUIMode) { - // Aspect ratio - int aspect = myOSystem->settings().getInt("gl_aspect"); + // Aspect ratio (depends on whether NTSC or PAL is detected) + int aspect = myOSystem->settings().getInt( + myOSystem->console().getFramerate() > 55.0 ? "gl_aspectn" : "gl_aspectp"); if(aspect != 100) mode.image_w = (uInt16)(float(mode.image_w * aspect) / 100.0); diff --git a/stella/src/common/Version.hxx b/stella/src/common/Version.hxx index 9611f142e..3e29da6de 100644 --- a/stella/src/common/Version.hxx +++ b/stella/src/common/Version.hxx @@ -13,13 +13,13 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: Version.hxx,v 1.46 2009-01-19 16:52:32 stephena Exp $ +// $Id: Version.hxx,v 1.47 2009-01-24 17:32:29 stephena Exp $ //============================================================================ #ifndef VERSION_HXX #define VERSION_HXX -#define STELLA_BASE_VERSION "2.7.1_cvs" +#define STELLA_BASE_VERSION "2.7.1" #ifdef NIGHTLY_BUILD #define STELLA_VERSION STELLA_BASE_VERSION "pre-" NIGHTLY_BUILD diff --git a/stella/src/common/mainSDL.cxx b/stella/src/common/mainSDL.cxx index 7f36b8ac3..244c95421 100644 --- a/stella/src/common/mainSDL.cxx +++ b/stella/src/common/mainSDL.cxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: mainSDL.cxx,v 1.86 2009-01-11 19:10:40 stephena Exp $ +// $Id: mainSDL.cxx,v 1.87 2009-01-24 17:32:29 stephena Exp $ //============================================================================ #include @@ -62,13 +62,15 @@ OSystem* theOSystem = (OSystem*) NULL; // Does general Cleanup in case any operation failed (or at end of program) -void Cleanup() +int Cleanup() { if(theOSystem) delete theOSystem; if(SDL_WasInit(SDL_INIT_VIDEO) & SDL_INIT_VIDEO) SDL_Quit(); + + return 0; } @@ -108,7 +110,11 @@ int main(int argc, char* argv[]) // Create the full OSystem after the settings, since settings are // probably needed for defaults - theOSystem->create(); + if(!theOSystem->create()) + { + cout << "ERROR: Couldn't create OSystem" << endl; + return Cleanup(); + } // Check to see if the user requested info about a specific ROM, // or the list of internal ROMs @@ -116,8 +122,7 @@ int main(int argc, char* argv[]) if(theOSystem->settings().getBool("listrominfo")) { theOSystem->propSet().print(); - Cleanup(); - return 0; + return Cleanup(); } else if(theOSystem->settings().getBool("rominfo")) { @@ -126,14 +131,12 @@ int main(int argc, char* argv[]) else cout << "ERROR: ROM doesn't exist" << endl; - Cleanup(); - return 0; + return Cleanup(); } else if(theOSystem->settings().getBool("help")) { theOSystem->settings().usage(); - Cleanup(); - return 0; + return Cleanup(); } // Request that the SDL window be centered, if possible @@ -154,14 +157,11 @@ int main(int argc, char* argv[]) // the ROM actually exists, use it to create a new console. // If not, use the built-in ROM launcher. In this case, we enter 'launcher' // mode and let the main event loop take care of opening a new console/ROM. - FilesystemNode node(romfile); - if(argc == 1 || romfile == "" || !romnode.exists()) { if(!theOSystem->createLauncher()) { - Cleanup(); - return 0; + return Cleanup(); } } else if(theOSystem->createConsole(romfile)) @@ -170,21 +170,10 @@ int main(int argc, char* argv[]) { for(int i = 0; i < 30; ++i) theOSystem->frameBuffer().update(); theOSystem->eventHandler().takeSnapshot(); - Cleanup(); - return 0; + return Cleanup(); } - if(theOSystem->settings().getBool("holdreset")) - theOSystem->eventHandler().handleEvent(Event::ConsoleReset, 1); - - if(theOSystem->settings().getBool("holdselect")) - theOSystem->eventHandler().handleEvent(Event::ConsoleSelect, 1); - - if(theOSystem->settings().getBool("holdbutton0")) - theOSystem->eventHandler().handleEvent(Event::JoystickZeroFire1, 1); - #ifdef DEBUGGER_SUPPORT - // Set up any breakpoint that was on the command line // (and remove the key from the settings, so they won't get set again) const string& initBreak = theOSystem->settings().getString("break"); @@ -201,10 +190,7 @@ int main(int argc, char* argv[]) #endif } else - { - Cleanup(); - return 0; - } + return Cleanup(); // Swallow any spurious events in the queue // These are normally caused by joystick/mouse jitter @@ -215,6 +201,5 @@ int main(int argc, char* argv[]) theOSystem->mainLoop(); // Cleanup time ... - Cleanup(); - return 0; + return Cleanup(); } diff --git a/stella/src/emucore/FrameBuffer.hxx b/stella/src/emucore/FrameBuffer.hxx index cb433dd13..fd9b74f45 100644 --- a/stella/src/emucore/FrameBuffer.hxx +++ b/stella/src/emucore/FrameBuffer.hxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: FrameBuffer.hxx,v 1.116 2009-01-19 16:52:32 stephena Exp $ +// $Id: FrameBuffer.hxx,v 1.117 2009-01-24 17:32:29 stephena Exp $ //============================================================================ #ifndef FRAMEBUFFER_HXX @@ -91,7 +91,7 @@ enum { into FBSurfaces), are in turn drawn here as well. @author Stephen Anthony - @version $Id: FrameBuffer.hxx,v 1.116 2009-01-19 16:52:32 stephena Exp $ + @version $Id: FrameBuffer.hxx,v 1.117 2009-01-24 17:32:29 stephena Exp $ */ class FrameBuffer { @@ -192,7 +192,7 @@ class FrameBuffer /** Toggles between fullscreen and window mode. - Grabmouse activated when in fullscreen mode. + Grabmouse activated when in fullscreen mode. */ void toggleFullscreen(); @@ -563,7 +563,7 @@ class FrameBuffer FrameBuffer type. @author Stephen Anthony - @version $Id: FrameBuffer.hxx,v 1.116 2009-01-19 16:52:32 stephena Exp $ + @version $Id: FrameBuffer.hxx,v 1.117 2009-01-24 17:32:29 stephena Exp $ */ // Text alignment modes for drawString() enum TextAlignment { diff --git a/stella/src/emucore/OSystem.cxx b/stella/src/emucore/OSystem.cxx index 857108621..b10d57909 100644 --- a/stella/src/emucore/OSystem.cxx +++ b/stella/src/emucore/OSystem.cxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: OSystem.cxx,v 1.153 2009-01-22 00:49:32 stephena Exp $ +// $Id: OSystem.cxx,v 1.154 2009-01-24 17:32:29 stephena Exp $ //============================================================================ #include @@ -180,7 +180,8 @@ 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(); + if(!queryVideoHardware()) + return false; //////////////////////////////////////////////////////////////////// // Create fonts to draw text @@ -491,6 +492,15 @@ bool OSystem::createConsole(const string& romfile, const string& md5sum) retval = false; } + // Also check if certain virtual buttons should be held down + // These must be checked each time a new console is being created + if(mySettings->getBool("holdreset")) + myEventHandler->handleEvent(Event::ConsoleReset, 1); + if(mySettings->getBool("holdselect")) + myEventHandler->handleEvent(Event::ConsoleSelect, 1); + if(mySettings->getBool("holdbutton0")) + myEventHandler->handleEvent(Event::JoystickZeroFire1, 1); + return retval; } @@ -852,12 +862,12 @@ void OSystem::mainLoop() } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -void OSystem::queryVideoHardware() +bool OSystem::queryVideoHardware() { // Go ahead and open the video hardware; we're going to need it eventually if(SDL_WasInit(SDL_INIT_VIDEO) == 0) if(SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER) < 0) - return; + return false; // First get the maximum windowed desktop resolution const SDL_VideoInfo* info = SDL_GetVideoInfo(); @@ -893,6 +903,8 @@ void OSystem::queryVideoHardware() myResolutions.insert_at(0, r); // insert in opposite (of descending) order } } + + return true; } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/stella/src/emucore/OSystem.hxx b/stella/src/emucore/OSystem.hxx index 19dadac92..772af1463 100644 --- a/stella/src/emucore/OSystem.hxx +++ b/stella/src/emucore/OSystem.hxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: OSystem.hxx,v 1.78 2009-01-21 12:03:17 stephena Exp $ +// $Id: OSystem.hxx,v 1.79 2009-01-24 17:32:29 stephena Exp $ //============================================================================ #ifndef OSYSTEM_HXX @@ -56,7 +56,7 @@ typedef Common::Array ResolutionList; other objects belong. @author Stephen Anthony - @version $Id: OSystem.hxx,v 1.78 2009-01-21 12:03:17 stephena Exp $ + @version $Id: OSystem.hxx,v 1.79 2009-01-24 17:32:29 stephena Exp $ */ class OSystem { @@ -422,7 +422,7 @@ class OSystem /** Query the OSystem video hardware for resolution information. */ - virtual void queryVideoHardware(); + virtual bool queryVideoHardware(); /** Set the base directory for all Stella files (these files may be diff --git a/stella/src/emucore/Settings.cxx b/stella/src/emucore/Settings.cxx index 0a6d78c1a..83c74c1d5 100644 --- a/stella/src/emucore/Settings.cxx +++ b/stella/src/emucore/Settings.cxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: Settings.cxx,v 1.162 2009-01-22 00:49:32 stephena Exp $ +// $Id: Settings.cxx,v 1.163 2009-01-24 17:32:29 stephena Exp $ //============================================================================ #include @@ -40,7 +40,8 @@ Settings::Settings(OSystem* osystem) // OpenGL specific options setInternal("gl_filter", "nearest"); - setInternal("gl_aspect", "100"); + setInternal("gl_aspectn", "100"); + setInternal("gl_aspectp", "100"); setInternal("gl_fsmax", "false"); setInternal("gl_lib", "libGL.so"); setInternal("gl_vsync", "false"); @@ -228,9 +229,13 @@ void Settings::validate() if(s != "linear" && s != "nearest") setInternal("gl_filter", "nearest"); - i = getInt("gl_aspect"); + i = getInt("gl_aspectn"); if(i < 80 || i > 120) - setInternal("gl_aspect", "100"); + setInternal("gl_aspectn", "100"); + + i = getInt("gl_aspectp"); + if(i < 80 || i > 120) + setInternal("gl_aspectp", "100"); #endif #ifdef SOUND_SUPPORT @@ -294,7 +299,8 @@ void Settings::usage() << " -gl_filter Type is one of the following:\n" << " nearest Normal scaling (GL_NEAREST)\n" << " linear Blurred scaling (GL_LINEAR)\n" - << " -gl_aspect Scale the width by the given percentage\n" + << " -gl_aspectn Scale the TIA width by the given percentage in NTSC mode\n" + << " -gl_aspectp Scale the TIA width by the given percentage in PAL mode\n" << " -gl_fsmax <1|0> Stretch GL image in fullscreen emulation mode\n" << " -gl_vsync <1|0> Enable synchronize to vertical blank interrupt\n" << " -gl_texrect <1|0> Enable GL_TEXTURE_RECTANGLE extension\n" diff --git a/stella/src/gui/LauncherDialog.cxx b/stella/src/gui/LauncherDialog.cxx index c9735f113..457422a4b 100644 --- a/stella/src/gui/LauncherDialog.cxx +++ b/stella/src/gui/LauncherDialog.cxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: LauncherDialog.cxx,v 1.102 2009-01-16 14:57:52 stephena Exp $ +// $Id: LauncherDialog.cxx,v 1.103 2009-01-24 17:32:29 stephena Exp $ // // Based on code from ScummVM - Scumm Interpreter // Copyright (C) 2002-2004 The ScummVM project @@ -63,9 +63,9 @@ LauncherDialog::LauncherDialog(OSystem* osystem, DialogContainer* parent, { const GUI::Font& font = instance().launcherFont(); - const int fontHeight = font.getFontHeight(); - const int bwidth = (_w - 2 * 10 - 8 * (4 - 1)) / 4; - const int bheight = font.getLineHeight() + 4; + const int fontHeight = font.getFontHeight(), + bwidth = (_w - 2 * 10 - 8 * (4 - 1)) / 4, + bheight = font.getLineHeight() + 4; int xpos = 0, ypos = 0, lwidth = 0; WidgetArray wid; diff --git a/stella/src/gui/LauncherDialog.hxx b/stella/src/gui/LauncherDialog.hxx index 6121116f8..31f46e70e 100644 --- a/stella/src/gui/LauncherDialog.hxx +++ b/stella/src/gui/LauncherDialog.hxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: LauncherDialog.hxx,v 1.40 2009-01-05 19:44:29 stephena Exp $ +// $Id: LauncherDialog.hxx,v 1.41 2009-01-24 17:32:29 stephena Exp $ // // Based on code from ScummVM - Scumm Interpreter // Copyright (C) 2002-2004 The ScummVM project @@ -34,6 +34,7 @@ class GlobalPropsDialog; class LauncherFilterDialog; class OSystem; class Properties; +class EditTextWidget; class RomInfoWidget; class StaticTextWidget; class StringListWidget; @@ -89,6 +90,7 @@ class LauncherDialog : public Dialog StaticTextWidget* myDirLabel; StaticTextWidget* myDir; StaticTextWidget* myRomCount; + EditTextWidget* myFilename; GameList* myGameList; OptionsDialog* myOptions; diff --git a/stella/src/gui/ListWidget.cxx b/stella/src/gui/ListWidget.cxx index 94ca7d2fb..f5c6d999a 100644 --- a/stella/src/gui/ListWidget.cxx +++ b/stella/src/gui/ListWidget.cxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: ListWidget.cxx,v 1.54 2009-01-05 22:05:35 stephena Exp $ +// $Id: ListWidget.cxx,v 1.55 2009-01-24 17:32:29 stephena Exp $ // // Based on code from ScummVM - Scumm Interpreter // Copyright (C) 2002-2004 The ScummVM project @@ -208,17 +208,6 @@ int ListWidget::findItem(int x, int y) const return (y - 1) / _fontHeight + _currentPos; } -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -static bool matchingCharsIgnoringCase(string s, string pattern) -{ - // Make the strings uppercase so we can compare them - transform(s.begin(), s.end(), s.begin(), (int(*)(int)) toupper); - transform(pattern.begin(), pattern.end(), pattern.begin(), (int(*)(int)) toupper); - - // Make sure that if the pattern is found, it occurs at the start of 's' - return (s.find(pattern, 0) == string::size_type(0)); -} - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bool ListWidget::handleKeyDown(int ascii, int keycode, int modifiers) { @@ -250,8 +239,8 @@ bool ListWidget::handleKeyDown(int ascii, int keycode, int modifiers) int newSelectedItem = 0; for (StringList::const_iterator i = _list.begin(); i != _list.end(); ++i) { - const bool match = matchingCharsIgnoringCase(*i, _quickSelectStr); - if (match) + if(BSPF_strncasecmp((*i).c_str(), _quickSelectStr.c_str(), + _quickSelectStr.length()) == 0) { _selectedItem = newSelectedItem; break; diff --git a/stella/src/gui/VideoDialog.cxx b/stella/src/gui/VideoDialog.cxx index d11c08500..4f9388b87 100644 --- a/stella/src/gui/VideoDialog.cxx +++ b/stella/src/gui/VideoDialog.cxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: VideoDialog.cxx,v 1.65 2009-01-22 00:49:32 stephena Exp $ +// $Id: VideoDialog.cxx,v 1.66 2009-01-24 17:32:29 stephena Exp $ // // Based on code from ScummVM - Scumm Interpreter // Copyright (C) 2002-2004 The ScummVM project @@ -47,15 +47,15 @@ VideoDialog::VideoDialog(OSystem* osystem, DialogContainer* parent, buttonWidth = font.getStringWidth("Defaults") + 20, buttonHeight = font.getLineHeight() + 4; int xpos, ypos; - int lwidth = font.getStringWidth("Dirty Rects: "), + int lwidth = font.getStringWidth("GL Aspect (P): "), pwidth = font.getStringWidth("1920x1200"), fwidth = font.getStringWidth("Renderer: "); WidgetArray wid; StringMap items; // Set real dimensions - _w = 46 * fontWidth + 10; - _h = 12 * (lineHeight + 4) + 10; + _w = 48 * fontWidth + 10; + _h = 13 * (lineHeight + 4) + 10; xpos = 5; ypos = 10; @@ -122,16 +122,28 @@ VideoDialog::VideoDialog(OSystem* osystem, DialogContainer* parent, wid.push_back(myGLFilterPopup); ypos += lineHeight + 4; - // GL aspect ratio - myAspectRatioSlider = + // GL aspect ratio (NTSC mode) + myNAspectRatioSlider = new SliderWidget(this, font, xpos, ypos, pwidth, lineHeight, - "GL Aspect: ", lwidth, kAspectRatioChanged); - myAspectRatioSlider->setMinValue(80); myAspectRatioSlider->setMaxValue(120); - wid.push_back(myAspectRatioSlider); - myAspectRatioLabel = - new StaticTextWidget(this, font, xpos + myAspectRatioSlider->getWidth() + 4, + "GL Aspect (N): ", lwidth, kNAspectRatioChanged); + myNAspectRatioSlider->setMinValue(80); myNAspectRatioSlider->setMaxValue(120); + wid.push_back(myNAspectRatioSlider); + myNAspectRatioLabel = + new StaticTextWidget(this, font, xpos + myNAspectRatioSlider->getWidth() + 4, ypos + 1, fontWidth * 3, fontHeight, "", kTextAlignLeft); - myAspectRatioLabel->setFlags(WIDGET_CLEARBG); + myNAspectRatioLabel->setFlags(WIDGET_CLEARBG); + ypos += lineHeight + 4; + + // GL aspect ratio (PAL mode) + myPAspectRatioSlider = + new SliderWidget(this, font, xpos, ypos, pwidth, lineHeight, + "GL Aspect (P): ", lwidth, kPAspectRatioChanged); + myPAspectRatioSlider->setMinValue(80); myPAspectRatioSlider->setMaxValue(120); + wid.push_back(myPAspectRatioSlider); + myPAspectRatioLabel = + new StaticTextWidget(this, font, xpos + myPAspectRatioSlider->getWidth() + 4, + ypos + 1, fontWidth * 3, fontHeight, "", kTextAlignLeft); + myPAspectRatioLabel->setFlags(WIDGET_CLEARBG); ypos += lineHeight + 4; // Framerate @@ -146,7 +158,7 @@ VideoDialog::VideoDialog(OSystem* osystem, DialogContainer* parent, myFrameRateLabel->setFlags(WIDGET_CLEARBG); // Move over to the next column - xpos += myAspectRatioSlider->getWidth() + myAspectRatioLabel->getWidth(); + xpos += myNAspectRatioSlider->getWidth() + myNAspectRatioLabel->getWidth(); ypos = 10; // Fullscreen @@ -173,6 +185,12 @@ VideoDialog::VideoDialog(OSystem* osystem, DialogContainer* parent, wid.push_back(myUseVSyncCheckbox); ypos += lineHeight + 4; + // Grab mouse (in windowed mode) + myGrabmouseCheckbox = new CheckboxWidget(this, font, xpos, ypos, + "Grab mouse"); + wid.push_back(myGrabmouseCheckbox); + ypos += lineHeight + 4; + // Center window (in windowed mode) myCenterCheckbox = new CheckboxWidget(this, font, xpos, ypos, "Center window (*)"); @@ -197,13 +215,16 @@ VideoDialog::VideoDialog(OSystem* osystem, DialogContainer* parent, // Disable certain functions when we know they aren't present #ifndef DISPLAY_GL myGLFilterPopup->clearFlags(WIDGET_ENABLED); - myAspectRatioSlider->clearFlags(WIDGET_ENABLED); - myAspectRatioLabel->clearFlags(WIDGET_ENABLED); + myNAspectRatioSlider->clearFlags(WIDGET_ENABLED); + myNAspectRatioLabel->clearFlags(WIDGET_ENABLED); + myPAspectRatioSlider->clearFlags(WIDGET_ENABLED); + myPAspectRatioLabel->clearFlags(WIDGET_ENABLED); myGLStretchCheckbox->clearFlags(WIDGET_ENABLED); myUseVSyncCheckbox->clearFlags(WIDGET_ENABLED); #endif #ifndef WINDOWED_SUPPORT myFullscreenCheckbox->clearFlags(WIDGET_ENABLED); + myGrabmouseCheckbox->clearFlags(WIDGET_ENABLED); myCenterCheckbox->clearFlags(WIDGET_ENABLED); #endif } @@ -249,11 +270,15 @@ void VideoDialog::loadConfig() instance().settings().getString("gl_filter"), "nearest"); myGLFilterPopup->setEnabled(gl); - // GL aspect ratio setting - myAspectRatioSlider->setValue(instance().settings().getInt("gl_aspect")); - myAspectRatioSlider->setEnabled(gl); - myAspectRatioLabel->setLabel(instance().settings().getString("gl_aspect")); - myAspectRatioLabel->setEnabled(gl); + // GL aspect ratio setting (NTSC and PAL) + myNAspectRatioSlider->setValue(instance().settings().getInt("gl_aspectn")); + myNAspectRatioSlider->setEnabled(gl); + myNAspectRatioLabel->setLabel(instance().settings().getString("gl_aspectn")); + myNAspectRatioLabel->setEnabled(gl); + myPAspectRatioSlider->setValue(instance().settings().getInt("gl_aspectp")); + myPAspectRatioSlider->setEnabled(gl); + myPAspectRatioLabel->setLabel(instance().settings().getString("gl_aspectp")); + myPAspectRatioLabel->setEnabled(gl); // Framerate (0 or -1 means disabled) int rate = instance().settings().getInt("framerate"); @@ -276,6 +301,9 @@ void VideoDialog::loadConfig() myUseVSyncCheckbox->setState(instance().settings().getBool("gl_vsync")); myUseVSyncCheckbox->setEnabled(gl); + // Grab mouse + myGrabmouseCheckbox->setState(instance().settings().getBool("grabmouse")); + // Center window myCenterCheckbox->setState(instance().settings().getBool("center")); } @@ -301,8 +329,9 @@ void VideoDialog::saveConfig() // GL Filter setting instance().settings().setString("gl_filter", myGLFilterPopup->getSelectedTag()); - // GL aspect ratio setting - instance().settings().setString("gl_aspect", myAspectRatioLabel->getLabel()); + // GL aspect ratio setting (NTSC and PAL) + instance().settings().setString("gl_aspectn", myNAspectRatioLabel->getLabel()); + instance().settings().setString("gl_aspectp", myPAspectRatioLabel->getLabel()); // Framerate int i = myFrameRateSlider->getValue(); @@ -326,6 +355,10 @@ void VideoDialog::saveConfig() // Use sync to vertical blank (GL mode only) instance().settings().setBool("gl_vsync", myUseVSyncCheckbox->getState()); + // Grab mouse + instance().settings().setBool("grabmouse", myGrabmouseCheckbox->getState()); + instance().frameBuffer().setCursorState(); + // Center window instance().settings().setBool("center", myCenterCheckbox->getState()); @@ -343,8 +376,10 @@ void VideoDialog::setDefaults() myFSResPopup->setSelected("auto", ""); myFrameTimingPopup->setSelected("sleep", ""); myGLFilterPopup->setSelected("nearest", ""); - myAspectRatioSlider->setValue(100); - myAspectRatioLabel->setLabel("100"); + myNAspectRatioSlider->setValue(100); + myNAspectRatioLabel->setLabel("100"); + myPAspectRatioSlider->setValue(100); + myPAspectRatioLabel->setLabel("100"); myFrameRateSlider->setValue(0); myFrameRateLabel->setLabel("0"); @@ -352,6 +387,7 @@ void VideoDialog::setDefaults() myColorLossCheckbox->setState(false); myGLStretchCheckbox->setState(false); myUseVSyncCheckbox->setState(true); + myGrabmouseCheckbox->setState(false); myCenterCheckbox->setState(true); // Make sure that mutually-exclusive items are not enabled at the same time @@ -387,8 +423,12 @@ void VideoDialog::handleCommand(CommandSender* sender, int cmd, setDefaults(); break; - case kAspectRatioChanged: - myAspectRatioLabel->setValue(myAspectRatioSlider->getValue()); + case kNAspectRatioChanged: + myNAspectRatioLabel->setValue(myNAspectRatioSlider->getValue()); + break; + + case kPAspectRatioChanged: + myPAspectRatioLabel->setValue(myPAspectRatioSlider->getValue()); break; case kFrameRateChanged: diff --git a/stella/src/gui/VideoDialog.hxx b/stella/src/gui/VideoDialog.hxx index 5fdc126f3..4b89eecc7 100644 --- a/stella/src/gui/VideoDialog.hxx +++ b/stella/src/gui/VideoDialog.hxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: VideoDialog.hxx,v 1.29 2009-01-06 23:02:18 stephena Exp $ +// $Id: VideoDialog.hxx,v 1.30 2009-01-24 17:32:29 stephena Exp $ // // Based on code from ScummVM - Scumm Interpreter // Copyright (C) 2002-2004 The ScummVM project @@ -56,8 +56,10 @@ class VideoDialog : public Dialog PopUpWidget* myFSResPopup; PopUpWidget* myFrameTimingPopup; PopUpWidget* myGLFilterPopup; - SliderWidget* myAspectRatioSlider; - StaticTextWidget* myAspectRatioLabel; + SliderWidget* myNAspectRatioSlider; + StaticTextWidget* myNAspectRatioLabel; + SliderWidget* myPAspectRatioSlider; + StaticTextWidget* myPAspectRatioLabel; SliderWidget* myFrameRateSlider; StaticTextWidget* myFrameRateLabel; @@ -66,11 +68,13 @@ class VideoDialog : public Dialog CheckboxWidget* myGLStretchCheckbox; CheckboxWidget* myUseVSyncCheckbox; CheckboxWidget* myCenterCheckbox; + CheckboxWidget* myGrabmouseCheckbox; enum { - kAspectRatioChanged = 'VDar', - kFrameRateChanged = 'VDfr', - kFullScrChanged = 'VDfs' + kNAspectRatioChanged = 'VDan', + kPAspectRatioChanged = 'VDap', + kFrameRateChanged = 'VDfr', + kFullScrChanged = 'VDfs' }; };