2009-01-10 18:42:49 +00:00
|
|
|
//============================================================================
|
2003-09-25 16:20:34 +00:00
|
|
|
//
|
|
|
|
// 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
|
|
|
|
//
|
2011-01-01 16:04:32 +00:00
|
|
|
// Copyright (c) 1995-2011 by Bradford W. Mott, Stephen Anthony
|
2010-04-10 21:37:23 +00:00
|
|
|
// and the Stella Team
|
2003-09-25 16:20:34 +00:00
|
|
|
//
|
2010-01-10 03:23:32 +00:00
|
|
|
// See the file "License.txt" for information on usage and redistribution of
|
2003-09-25 16:20:34 +00:00
|
|
|
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
|
|
|
//
|
2009-05-13 13:55:40 +00:00
|
|
|
// $Id$
|
2003-09-25 16:20:34 +00:00
|
|
|
//============================================================================
|
|
|
|
|
Reworked 'fullres' argument to also accept the 'auto' option. In this case,
fullscreen resolutions will be automatically chosen based on the required
size for the window. The image will be centered and keep the same aspect
ratio, however, so operation will still work correctly on widescreen
monitors. 'Auto' will be the new default. Otherwise, if a specific
resolution is requested, Stella will try to accomodate it *only* if it fits
into the resolution; otherwise the smallest resolution that fits will be
used.
Removed 'zoom_ui' and 'zoom_tia'. The UI can now only be at 1x mode.
Aded 'tia_filter' commandline argument, which specifies to the filter
to use when rendering the tia image. For now, these accept 'zoom1x',
'zoom2x'..., up to 'zoom10x', and duplicate previous behaviour. Eventually,
Scalexx and HQxx filters may be added. Still TODO is add this to the UI.
First pass at making the standard build use a minimum of zoom2x for the TIA,
so the UI can be larger and use a better looking font. There's still work
to do in this area, especially for those ports with limited hardware that
support zoom1x only.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1544 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-07-22 14:54:39 +00:00
|
|
|
#include <algorithm>
|
2003-09-30 01:22:45 +00:00
|
|
|
#include <sstream>
|
|
|
|
|
2003-09-25 16:20:34 +00:00
|
|
|
#include "bspf.hxx"
|
2007-09-03 18:37:24 +00:00
|
|
|
|
|
|
|
#include "CommandMenu.hxx"
|
2003-09-25 16:20:34 +00:00
|
|
|
#include "Console.hxx"
|
The first version of a GUI for event remapping is here!
Now for the things that aren't finished yet:
- Only the most basic functions can be remapped. If you
erase the mapping for those that can't yet be remapped,
you'll have to delete the 'keymap' line from stellarc and
start over.
- Core events can only be remapped to other keys on the keyboard.
I haven't got the joystick remapping working yet (but it should
be easy to do).
- The TIA needs to be modified to show 320 pixels horizontally.
Right now, I'm using 8 pixel-width fonts on a framebuffer of
160 pixels, so there's not a lot of horizontal real estate.
So text will probably overwrite other stuff. This is cosmetic,
and WILL be fixed.
- Modification of the TIA will break every frontends rendering
code. It had to be done sometime ...
- I haven't yet added any user feedback mechanism for the user. So when
you go into remap mode and are about to remap a key, you won't
know it :) I'll be adding arrows (like in XMAME) ...
I've added a "Game Information" menu, which shows things like Game name,
manufacturer, rarity, type, etc. Basically stuff from the stella.pro file.
It has no purpose other than for coolness :)
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@193 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2003-09-28 21:59:24 +00:00
|
|
|
#include "EventHandler.hxx"
|
2007-09-03 18:37:24 +00:00
|
|
|
#include "Event.hxx"
|
2005-06-08 18:45:09 +00:00
|
|
|
#include "Font.hxx"
|
Added first pass of the ROM launcher. When you press 'Start' in the ROM
launcher, it launches Frostbite. Then pressing 'Escape' goes back to the
launcher, and you're able to then launch Frostbite again! Success !!!
Still TODO is actually get a ROM listing and use the selected game, but
the fact that it works multiple times for some game means that the
infrastructure is working correctly :)
Changed behaviour of the 'Escape' key. Specifically, it now only acts
as a key to enter ROM launcher mode. In the case where the emulation
was started without the launcher, the key will now do nothing. From now
on, the only way to quit Stella is Ctrl-Q (or equivalent for OSX),
close the window, or from the 'Quit' button.
Also, the 'Enter launcher mode' event will eventually be made remappable,
as will the 'Enter menu mode' event (currently the 'Tab' key).
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@412 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-05-06 18:39:00 +00:00
|
|
|
#include "Launcher.hxx"
|
2007-09-03 18:37:24 +00:00
|
|
|
#include "Menu.hxx"
|
2005-02-21 02:23:57 +00:00
|
|
|
#include "OSystem.hxx"
|
2007-09-03 18:37:24 +00:00
|
|
|
#include "Settings.hxx"
|
2009-01-19 16:52:32 +00:00
|
|
|
#include "TIA.hxx"
|
2007-09-03 18:37:24 +00:00
|
|
|
|
|
|
|
#include "FrameBuffer.hxx"
|
2005-08-24 22:54:30 +00:00
|
|
|
|
2006-12-15 16:43:12 +00:00
|
|
|
#ifdef DEBUGGER_SUPPORT
|
2005-08-24 22:54:30 +00:00
|
|
|
#include "Debugger.hxx"
|
|
|
|
#endif
|
|
|
|
|
2003-09-25 16:20:34 +00:00
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
2005-02-21 20:43:53 +00:00
|
|
|
FrameBuffer::FrameBuffer(OSystem* osystem)
|
Reworked the mapping of joysticks yet again. After some thought, it
made no sense to restrict Stella to only work with two joysticks, since
there's no reason one couldn't use four devices, with each one emulating
a paddle (once I get paddle remapping done). So I've removed that
restriction, and also removed the 'leftport' and 'rightport' arguments.
The one case where remapping a joystick *does* make sense is for
multiple Stelladaptors. In that case, there might only be one
Stelladaptor installed, but you'd like it to emulate the right virtual
port. Previously this wasn't possible, but now it is with the addition
of the 'sa1' and 'sa2' commandline arguments. These arguments accept
either 'left' or 'right', specifying which virtual port to emulate.
Updated the InputDialog virtual device tab for remapping Stelladaptors.
Shortened some keynames in EventHandler, so that the actual character is
used (for example, ? instead of QUESTION).
Some fixes for the OS/2 port.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@884 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-11-19 22:26:14 +00:00
|
|
|
: myOSystem(osystem),
|
2006-01-11 13:25:20 +00:00
|
|
|
myScreen(0),
|
2010-11-07 16:19:26 +00:00
|
|
|
mySDLFlags(0),
|
2008-08-04 11:56:12 +00:00
|
|
|
myRedrawEntireFrame(true),
|
2006-01-10 20:37:00 +00:00
|
|
|
myUsePhosphor(false),
|
|
|
|
myPhosphorBlend(77),
|
2007-01-30 17:13:10 +00:00
|
|
|
myInitializedCount(0),
|
2010-04-14 15:41:42 +00:00
|
|
|
myPausedCount(0)
|
2003-09-25 16:20:34 +00:00
|
|
|
{
|
2008-12-25 23:05:16 +00:00
|
|
|
myMsg.surface = myStatsMsg.surface = NULL;
|
2008-12-12 15:51:07 +00:00
|
|
|
myMsg.surfaceID = myStatsMsg.surfaceID = -1;
|
|
|
|
myMsg.enabled = myStatsMsg.enabled = false;
|
2003-10-17 18:02:16 +00:00
|
|
|
}
|
2003-10-01 19:01:02 +00:00
|
|
|
|
2003-10-17 18:02:16 +00:00
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
|
|
FrameBuffer::~FrameBuffer(void)
|
|
|
|
{
|
2008-12-12 18:32:53 +00:00
|
|
|
// Free all allocated surfaces
|
|
|
|
while(!mySurfaceList.empty())
|
|
|
|
{
|
|
|
|
delete (*mySurfaceList.begin()).second;
|
|
|
|
mySurfaceList.erase(mySurfaceList.begin());
|
|
|
|
}
|
2003-10-17 18:02:16 +00:00
|
|
|
}
|
2003-09-26 22:39:36 +00:00
|
|
|
|
2003-10-17 18:02:16 +00:00
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
2011-06-07 13:40:59 +00:00
|
|
|
FBInitStatus FrameBuffer::initialize(const string& title,
|
|
|
|
uInt32 width, uInt32 height)
|
2003-10-17 18:02:16 +00:00
|
|
|
{
|
2010-04-29 12:46:07 +00:00
|
|
|
ostringstream buf;
|
|
|
|
|
2005-02-22 18:41:16 +00:00
|
|
|
// Now (re)initialize the SDL video system
|
2006-12-03 01:13:45 +00:00
|
|
|
// These things only have to be done one per FrameBuffer creation
|
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).
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1323 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2007-06-20 16:33:23 +00:00
|
|
|
if(SDL_WasInit(SDL_INIT_VIDEO) == 0)
|
2008-05-30 19:07:55 +00:00
|
|
|
{
|
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).
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1323 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2007-06-20 16:33:23 +00:00
|
|
|
if(SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER) < 0)
|
2008-05-30 19:07:55 +00:00
|
|
|
{
|
2010-04-29 12:46:07 +00:00
|
|
|
buf << "ERROR: Couldn't initialize SDL: " << SDL_GetError() << endl;
|
|
|
|
myOSystem->logMessage(buf.str(), 0);
|
2010-07-22 15:41:46 +00:00
|
|
|
return kFailComplete;
|
2008-05-30 19:07:55 +00:00
|
|
|
}
|
|
|
|
}
|
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).
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1323 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2007-06-20 16:33:23 +00:00
|
|
|
myInitializedCount++;
|
2006-12-03 01:24:34 +00:00
|
|
|
|
2010-07-22 15:41:46 +00:00
|
|
|
// A 'windowed' system is defined as one where the window size can be
|
|
|
|
// larger than the screen size, as there's some sort of window manager
|
|
|
|
// that takes care of it (all current desktop systems fall in this category)
|
|
|
|
// However, some systems have no concept of windowing, and have hard limits
|
|
|
|
// on how large a window can be (ie, the size of the 'desktop' is the
|
|
|
|
// absolute upper limit on window size)
|
|
|
|
//
|
|
|
|
// If the WINDOWED_SUPPORT macro is defined, we treat the system as the
|
|
|
|
// former type; if not, as the latter type
|
2006-12-03 01:24:34 +00:00
|
|
|
|
2010-11-07 16:19:26 +00:00
|
|
|
uInt32 flags = mySDLFlags;
|
2009-06-05 14:05:23 +00:00
|
|
|
#ifdef WINDOWED_SUPPORT
|
2010-07-22 15:41:46 +00:00
|
|
|
// We assume that a desktop size of at least 640x480 means that we're
|
|
|
|
// running on a 'large' system, and the window size requirements can
|
|
|
|
// be relaxed
|
|
|
|
// Otherwise, we treat the system as if WINDOWED_SUPPORT is not defined
|
|
|
|
if(myOSystem->desktopWidth() < 640 && myOSystem->desktopHeight() < 480 &&
|
|
|
|
(myOSystem->desktopWidth() < width || myOSystem->desktopHeight() < height))
|
|
|
|
return kFailTooLarge;
|
2010-11-07 16:19:26 +00:00
|
|
|
|
|
|
|
if(myOSystem->settings().getString("fullscreen") == "1")
|
|
|
|
{
|
|
|
|
if(myOSystem->desktopWidth() < width || myOSystem->desktopHeight() < height)
|
|
|
|
return kFailTooLarge;
|
|
|
|
|
|
|
|
flags |= SDL_FULLSCREEN;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
flags &= ~SDL_FULLSCREEN;
|
2010-07-22 15:41:46 +00:00
|
|
|
#else
|
|
|
|
// Make sure this mode is even possible
|
|
|
|
// We only really need to worry about it in non-windowed environments,
|
|
|
|
// where requesting a window that's too large will probably cause a crash
|
|
|
|
if(myOSystem->desktopWidth() < width || myOSystem->desktopHeight() < height)
|
|
|
|
return kFailTooLarge;
|
2009-06-05 14:05:23 +00:00
|
|
|
#endif
|
|
|
|
|
2010-11-07 16:19:26 +00:00
|
|
|
// Only update the actual flags if no errors were detected
|
|
|
|
mySDLFlags = flags;
|
|
|
|
|
2008-06-19 12:01:31 +00:00
|
|
|
// Set the available video modes for this framebuffer
|
|
|
|
setAvailableVidModes(width, height);
|
2008-04-02 21:22:16 +00:00
|
|
|
|
2008-06-19 12:01:31 +00:00
|
|
|
// Initialize video subsystem (make sure we get a valid mode)
|
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).
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1323 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2007-06-20 16:33:23 +00:00
|
|
|
VideoMode mode = getSavedVidMode();
|
2008-06-19 12:01:31 +00:00
|
|
|
if(width <= mode.screen_w && height <= mode.screen_h)
|
2008-05-30 19:07:55 +00:00
|
|
|
{
|
2008-06-19 12:01:31 +00:00
|
|
|
// Set window title and icon
|
|
|
|
setWindowTitle(title);
|
|
|
|
if(myInitializedCount == 1) setWindowIcon();
|
|
|
|
|
2010-08-11 21:53:19 +00:00
|
|
|
if(initSubsystem(mode))
|
2008-06-19 12:01:31 +00:00
|
|
|
{
|
2010-09-21 19:39:30 +00:00
|
|
|
centerAppWindow(mode);
|
2010-08-11 21:53:19 +00:00
|
|
|
|
2008-06-19 12:01:31 +00:00
|
|
|
myImageRect.setWidth(mode.image_w);
|
|
|
|
myImageRect.setHeight(mode.image_h);
|
|
|
|
myImageRect.moveTo(mode.image_x, mode.image_y);
|
|
|
|
|
|
|
|
myScreenRect.setWidth(mode.screen_w);
|
|
|
|
myScreenRect.setHeight(mode.screen_h);
|
2009-06-05 14:05:23 +00:00
|
|
|
|
|
|
|
// Did we get the requested fullscreen state?
|
2009-08-07 11:45:14 +00:00
|
|
|
const string& fullscreen = myOSystem->settings().getString("fullscreen");
|
|
|
|
if(fullscreen != "-1")
|
|
|
|
myOSystem->settings().setString("fullscreen", fullScreen() ? "1" : "0");
|
|
|
|
setCursorState();
|
2008-06-19 12:01:31 +00:00
|
|
|
}
|
2010-08-11 21:53:19 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
myOSystem->logMessage("ERROR: Couldn't initialize video subsystem\n", 0);
|
|
|
|
return kFailNotSupported;
|
|
|
|
}
|
2008-05-30 19:07:55 +00:00
|
|
|
}
|
2008-06-19 12:01:31 +00:00
|
|
|
else
|
2010-07-22 15:41:46 +00:00
|
|
|
return kFailTooLarge;
|
2005-05-12 18:45:21 +00:00
|
|
|
|
2005-06-07 21:22:39 +00:00
|
|
|
// Enable unicode so we can see translated key events
|
|
|
|
// (lowercase vs. uppercase characters)
|
|
|
|
SDL_EnableUNICODE(1);
|
|
|
|
|
2005-05-12 18:45:21 +00:00
|
|
|
// Erase any messages from a previous run
|
2008-06-19 12:01:31 +00:00
|
|
|
myMsg.counter = 0;
|
|
|
|
|
|
|
|
// Create surfaces for TIA statistics and general messages
|
|
|
|
myStatsMsg.color = kBtnTextColor;
|
2009-02-01 22:17:09 +00:00
|
|
|
myStatsMsg.w = myOSystem->consoleFont().getMaxCharWidth() * 23 + 2;
|
|
|
|
myStatsMsg.h = (myOSystem->consoleFont().getFontHeight() + 2) * 2;
|
2008-12-25 23:05:16 +00:00
|
|
|
|
2008-12-27 23:27:32 +00:00
|
|
|
if(myStatsMsg.surface == NULL)
|
2008-12-12 15:51:07 +00:00
|
|
|
{
|
|
|
|
myStatsMsg.surfaceID = allocateSurface(myStatsMsg.w, myStatsMsg.h);
|
|
|
|
myStatsMsg.surface = surface(myStatsMsg.surfaceID);
|
|
|
|
}
|
2008-12-25 23:05:16 +00:00
|
|
|
if(myMsg.surface == NULL)
|
2008-12-12 15:51:07 +00:00
|
|
|
{
|
2009-01-03 22:57:12 +00:00
|
|
|
myMsg.surfaceID = allocateSurface(500, myOSystem->font().getFontHeight()+10);
|
2008-12-12 15:51:07 +00:00
|
|
|
myMsg.surface = surface(myMsg.surfaceID);
|
|
|
|
}
|
2006-12-11 00:15:34 +00:00
|
|
|
|
|
|
|
// Finally, show some information about the framebuffer,
|
|
|
|
// but only on the first initialization
|
2010-04-29 12:46:07 +00:00
|
|
|
if(myInitializedCount == 1)
|
|
|
|
myOSystem->logMessage(about() + "\n", 1);
|
2008-05-30 19:07:55 +00:00
|
|
|
|
2010-07-22 15:41:46 +00:00
|
|
|
return kSuccess;
|
2003-10-26 19:40:39 +00:00
|
|
|
}
|
The first version of a GUI for event remapping is here!
Now for the things that aren't finished yet:
- Only the most basic functions can be remapped. If you
erase the mapping for those that can't yet be remapped,
you'll have to delete the 'keymap' line from stellarc and
start over.
- Core events can only be remapped to other keys on the keyboard.
I haven't got the joystick remapping working yet (but it should
be easy to do).
- The TIA needs to be modified to show 320 pixels horizontally.
Right now, I'm using 8 pixel-width fonts on a framebuffer of
160 pixels, so there's not a lot of horizontal real estate.
So text will probably overwrite other stuff. This is cosmetic,
and WILL be fixed.
- Modification of the TIA will break every frontends rendering
code. It had to be done sometime ...
- I haven't yet added any user feedback mechanism for the user. So when
you go into remap mode and are about to remap a key, you won't
know it :) I'll be adding arrows (like in XMAME) ...
I've added a "Game Information" menu, which shows things like Game name,
manufacturer, rarity, type, etc. Basically stuff from the stella.pro file.
It has no purpose other than for coolness :)
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@193 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2003-09-28 21:59:24 +00:00
|
|
|
|
2003-10-26 19:40:39 +00:00
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
|
|
void FrameBuffer::update()
|
|
|
|
{
|
2005-02-27 23:41:19 +00:00
|
|
|
// Determine which mode we are in (from the EventHandler)
|
|
|
|
// Take care of S_EMULATE mode here, otherwise let the GUI
|
|
|
|
// figure out what to draw
|
|
|
|
switch(myOSystem->eventHandler().state())
|
Huge changes across the map. Lets see if I can remember it all ...
There is now an SDL OpenGL port with filtering and alpha-blending.
It's a work in progress right now, but is already quite stable.
It's not as optimized as the software version yet, but this will
change as well. For now, you have to compile the SDL version in
either normal software mode or OpenGL mode. This will change
before the 1.4 release.
When entering menu mode, the emulation is now suspended. And when
pause is pressed, you can't enter menu mode. Because of these changes,
CPU use has dropped dramatically when viewing menus. This will benefit
all ports, since menus are now redrawn only when necessary, instead of
at the current framerate.
For a reference, on a Pentium-IV 2.4GHz, the software SDL version
maxes CPU usage at 9%, and the SDL OpenGL version at 13.5%. This is
at 60 fps and a zoomlevel of 4. While some small improvements can
(possibly) be made to the OpenGL version, I think we'll soon be hitting
the glass ceiling.
Work on the Porting.txt document is progressing, and I estimate it to
be 45% complete.
The Windows version still doesn't compile, and I still haven't looked
at it. Rest assured that it will be done before 1.4. There will be
a simultaneous release, even if the Linux versions are finished.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@200 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2003-11-06 22:22:33 +00:00
|
|
|
{
|
2005-02-27 23:41:19 +00:00
|
|
|
case EventHandler::S_EMULATE:
|
|
|
|
{
|
OK, some huge changes across the board, so lets see if I get it all:
After much request, added ability to access the settings menu from the
ROM browser dialog. This menu now contains almost all items that can
be selected in Stella, and can be accessed in-game as before.
Completely removed pause functionality from the core code. It made
sense back when Stella was a single-mode program: there were two modes;
emulation and pause. Now that there are other event modes, the
EventHandler state machine is getting too complicated. If you want to
pause, you can simply enter one of the in-game menus. Related to this,
when the app is minimized, Stella enters the menu dialog state.
Previously, minimizing the app caused a pause, but since there was no
onscreen feedback, many people assumed the app locked up.
Added centering to all Dialog boxes, which is done dynamically, as they're
placed on the dialog stack to be drawn to the screen.
Cleaned up the API of Console/FrameBuffer/OSystem classes wrt to palettes
and timing. Parts of each were being done in different classes; now it
should be more consistent.
Started infrastructure for user-selectable UI palettes. For now, there's
no way to change it in the GUI, and it defaults to the normal palette.
Eventually, there will be several choices selectable from an in-game
menu.
Removed '-channels' commandline argument, since that feature can be
set from the ROM properties.
Added '128' to the choices for fragment size in AudioDialog.
Tweaked the OpenGL dynamic loading code to test both the given GL
lib, and if that fails to use auto-detection. It seems in the OSX port,
the first approach works for some people, and not the other (and vice-versa),
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1255 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2006-12-30 22:26:29 +00:00
|
|
|
// Run the console for one frame
|
2009-01-12 15:11:55 +00:00
|
|
|
// Note that the debugger can cause a breakpoint to occur, which changes
|
|
|
|
// the EventHandler state 'behind our back' - we need to check for that
|
2009-01-19 16:52:32 +00:00
|
|
|
myOSystem->console().tia().update();
|
2009-01-12 15:11:55 +00:00
|
|
|
#ifdef DEBUGGER_SUPPORT
|
|
|
|
if(myOSystem->eventHandler().state() != EventHandler::S_EMULATE) break;
|
|
|
|
#endif
|
OK, some huge changes across the board, so lets see if I get it all:
After much request, added ability to access the settings menu from the
ROM browser dialog. This menu now contains almost all items that can
be selected in Stella, and can be accessed in-game as before.
Completely removed pause functionality from the core code. It made
sense back when Stella was a single-mode program: there were two modes;
emulation and pause. Now that there are other event modes, the
EventHandler state machine is getting too complicated. If you want to
pause, you can simply enter one of the in-game menus. Related to this,
when the app is minimized, Stella enters the menu dialog state.
Previously, minimizing the app caused a pause, but since there was no
onscreen feedback, many people assumed the app locked up.
Added centering to all Dialog boxes, which is done dynamically, as they're
placed on the dialog stack to be drawn to the screen.
Cleaned up the API of Console/FrameBuffer/OSystem classes wrt to palettes
and timing. Parts of each were being done in different classes; now it
should be more consistent.
Started infrastructure for user-selectable UI palettes. For now, there's
no way to change it in the GUI, and it defaults to the normal palette.
Eventually, there will be several choices selectable from an in-game
menu.
Removed '-channels' commandline argument, since that feature can be
set from the ROM properties.
Added '128' to the choices for fragment size in AudioDialog.
Tweaked the OpenGL dynamic loading code to test both the given GL
lib, and if that fails to use auto-detection. It seems in the OSX port,
the first approach works for some people, and not the other (and vice-versa),
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1255 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2006-12-30 22:26:29 +00:00
|
|
|
if(myOSystem->eventHandler().frying())
|
|
|
|
myOSystem->console().fry();
|
2006-01-11 20:28:07 +00:00
|
|
|
|
OK, some huge changes across the board, so lets see if I get it all:
After much request, added ability to access the settings menu from the
ROM browser dialog. This menu now contains almost all items that can
be selected in Stella, and can be accessed in-game as before.
Completely removed pause functionality from the core code. It made
sense back when Stella was a single-mode program: there were two modes;
emulation and pause. Now that there are other event modes, the
EventHandler state machine is getting too complicated. If you want to
pause, you can simply enter one of the in-game menus. Related to this,
when the app is minimized, Stella enters the menu dialog state.
Previously, minimizing the app caused a pause, but since there was no
onscreen feedback, many people assumed the app locked up.
Added centering to all Dialog boxes, which is done dynamically, as they're
placed on the dialog stack to be drawn to the screen.
Cleaned up the API of Console/FrameBuffer/OSystem classes wrt to palettes
and timing. Parts of each were being done in different classes; now it
should be more consistent.
Started infrastructure for user-selectable UI palettes. For now, there's
no way to change it in the GUI, and it defaults to the normal palette.
Eventually, there will be several choices selectable from an in-game
menu.
Removed '-channels' commandline argument, since that feature can be
set from the ROM properties.
Added '128' to the choices for fragment size in AudioDialog.
Tweaked the OpenGL dynamic loading code to test both the given GL
lib, and if that fails to use auto-detection. It seems in the OSX port,
the first approach works for some people, and not the other (and vice-versa),
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1255 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2006-12-30 22:26:29 +00:00
|
|
|
// And update the screen
|
2009-01-19 16:52:32 +00:00
|
|
|
drawTIA(myRedrawEntireFrame);
|
2003-09-25 16:20:34 +00:00
|
|
|
|
2008-05-20 13:42:50 +00:00
|
|
|
// Show frame statistics
|
2008-06-19 12:01:31 +00:00
|
|
|
if(myStatsMsg.enabled)
|
2008-05-20 13:42:50 +00:00
|
|
|
{
|
2009-01-01 00:08:59 +00:00
|
|
|
const ConsoleInfo& info = myOSystem->console().about();
|
2008-05-20 13:42:50 +00:00
|
|
|
char msg[30];
|
2011-07-13 14:13:49 +00:00
|
|
|
BSPF_snprintf(msg, 29, "%u @ %2.2ffps => %s",
|
2009-01-19 16:52:32 +00:00
|
|
|
myOSystem->console().tia().scanlines(),
|
2009-02-01 22:17:09 +00:00
|
|
|
myOSystem->console().getFramerate(), info.DisplayFormat.c_str());
|
2008-06-19 12:01:31 +00:00
|
|
|
myStatsMsg.surface->fillRect(0, 0, myStatsMsg.w, myStatsMsg.h, kBGColor);
|
2009-01-01 00:08:59 +00:00
|
|
|
myStatsMsg.surface->drawString(&myOSystem->consoleFont(),
|
|
|
|
msg, 1, 1, myStatsMsg.w, myStatsMsg.color, kTextAlignLeft);
|
|
|
|
myStatsMsg.surface->drawString(&myOSystem->consoleFont(),
|
2009-02-01 22:17:09 +00:00
|
|
|
info.BankSwitch, 1, 15, myStatsMsg.w, myStatsMsg.color, kTextAlignLeft);
|
2008-08-04 11:56:12 +00:00
|
|
|
myStatsMsg.surface->addDirtyRect(0, 0, 0, 0); // force a full draw
|
2009-02-01 22:17:09 +00:00
|
|
|
myStatsMsg.surface->setPos(myImageRect.x() + 1, myImageRect.y() + 1);
|
2008-06-19 12:01:31 +00:00
|
|
|
myStatsMsg.surface->update();
|
2008-05-20 13:42:50 +00:00
|
|
|
}
|
2005-02-27 23:41:19 +00:00
|
|
|
break; // S_EMULATE
|
Huge changes across the map. Lets see if I can remember it all ...
There is now an SDL OpenGL port with filtering and alpha-blending.
It's a work in progress right now, but is already quite stable.
It's not as optimized as the software version yet, but this will
change as well. For now, you have to compile the SDL version in
either normal software mode or OpenGL mode. This will change
before the 1.4 release.
When entering menu mode, the emulation is now suspended. And when
pause is pressed, you can't enter menu mode. Because of these changes,
CPU use has dropped dramatically when viewing menus. This will benefit
all ports, since menus are now redrawn only when necessary, instead of
at the current framerate.
For a reference, on a Pentium-IV 2.4GHz, the software SDL version
maxes CPU usage at 9%, and the SDL OpenGL version at 13.5%. This is
at 60 fps and a zoomlevel of 4. While some small improvements can
(possibly) be made to the OpenGL version, I think we'll soon be hitting
the glass ceiling.
Work on the Porting.txt document is progressing, and I estimate it to
be 45% complete.
The Windows version still doesn't compile, and I still haven't looked
at it. Rest assured that it will be done before 1.4. There will be
a simultaneous release, even if the Linux versions are finished.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@200 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2003-11-06 22:22:33 +00:00
|
|
|
}
|
2003-10-26 19:40:39 +00:00
|
|
|
|
2007-01-30 17:13:10 +00:00
|
|
|
case EventHandler::S_PAUSE:
|
|
|
|
{
|
|
|
|
// Only update the screen if it's been invalidated
|
2008-08-04 11:56:12 +00:00
|
|
|
if(myRedrawEntireFrame)
|
2009-01-19 16:52:32 +00:00
|
|
|
drawTIA(true);
|
2007-01-30 17:13:10 +00:00
|
|
|
|
|
|
|
// Show a pause message every 5 seconds
|
|
|
|
if(myPausedCount++ >= 7*myOSystem->frameRate())
|
|
|
|
{
|
|
|
|
myPausedCount = 0;
|
|
|
|
showMessage("Paused", kMiddleCenter);
|
|
|
|
}
|
|
|
|
break; // S_PAUSE
|
|
|
|
}
|
|
|
|
|
2005-03-13 03:38:41 +00:00
|
|
|
case EventHandler::S_MENU:
|
2005-02-27 23:41:19 +00:00
|
|
|
{
|
2009-01-10 18:42:49 +00:00
|
|
|
// When onscreen messages are enabled in double-buffer mode,
|
|
|
|
// a full redraw is required
|
|
|
|
myOSystem->menu().draw(myMsg.enabled && type() == kGLBuffer);
|
2005-07-20 15:52:58 +00:00
|
|
|
break; // S_MENU
|
2005-02-27 23:41:19 +00:00
|
|
|
}
|
Huge changes across the map. Lets see if I can remember it all ...
There is now an SDL OpenGL port with filtering and alpha-blending.
It's a work in progress right now, but is already quite stable.
It's not as optimized as the software version yet, but this will
change as well. For now, you have to compile the SDL version in
either normal software mode or OpenGL mode. This will change
before the 1.4 release.
When entering menu mode, the emulation is now suspended. And when
pause is pressed, you can't enter menu mode. Because of these changes,
CPU use has dropped dramatically when viewing menus. This will benefit
all ports, since menus are now redrawn only when necessary, instead of
at the current framerate.
For a reference, on a Pentium-IV 2.4GHz, the software SDL version
maxes CPU usage at 9%, and the SDL OpenGL version at 13.5%. This is
at 60 fps and a zoomlevel of 4. While some small improvements can
(possibly) be made to the OpenGL version, I think we'll soon be hitting
the glass ceiling.
Work on the Porting.txt document is progressing, and I estimate it to
be 45% complete.
The Windows version still doesn't compile, and I still haven't looked
at it. Rest assured that it will be done before 1.4. There will be
a simultaneous release, even if the Linux versions are finished.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@200 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2003-11-06 22:22:33 +00:00
|
|
|
|
2005-08-29 18:36:42 +00:00
|
|
|
case EventHandler::S_CMDMENU:
|
|
|
|
{
|
2009-01-10 18:42:49 +00:00
|
|
|
// When onscreen messages are enabled in double-buffer mode,
|
|
|
|
// a full redraw is required
|
|
|
|
myOSystem->commandMenu().draw(myMsg.enabled && type() == kGLBuffer);
|
2005-08-29 18:36:42 +00:00
|
|
|
break; // S_CMDMENU
|
|
|
|
}
|
|
|
|
|
Added first pass of the ROM launcher. When you press 'Start' in the ROM
launcher, it launches Frostbite. Then pressing 'Escape' goes back to the
launcher, and you're able to then launch Frostbite again! Success !!!
Still TODO is actually get a ROM listing and use the selected game, but
the fact that it works multiple times for some game means that the
infrastructure is working correctly :)
Changed behaviour of the 'Escape' key. Specifically, it now only acts
as a key to enter ROM launcher mode. In the case where the emulation
was started without the launcher, the key will now do nothing. From now
on, the only way to quit Stella is Ctrl-Q (or equivalent for OSX),
close the window, or from the 'Quit' button.
Also, the 'Enter launcher mode' event will eventually be made remappable,
as will the 'Enter menu mode' event (currently the 'Tab' key).
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@412 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-05-06 18:39:00 +00:00
|
|
|
case EventHandler::S_LAUNCHER:
|
|
|
|
{
|
2009-01-10 18:42:49 +00:00
|
|
|
// When onscreen messages are enabled in double-buffer mode,
|
|
|
|
// a full redraw is required
|
|
|
|
myOSystem->launcher().draw(myMsg.enabled && type() == kGLBuffer);
|
2005-07-20 15:52:58 +00:00
|
|
|
break; // S_LAUNCHER
|
Added first pass of the ROM launcher. When you press 'Start' in the ROM
launcher, it launches Frostbite. Then pressing 'Escape' goes back to the
launcher, and you're able to then launch Frostbite again! Success !!!
Still TODO is actually get a ROM listing and use the selected game, but
the fact that it works multiple times for some game means that the
infrastructure is working correctly :)
Changed behaviour of the 'Escape' key. Specifically, it now only acts
as a key to enter ROM launcher mode. In the case where the emulation
was started without the launcher, the key will now do nothing. From now
on, the only way to quit Stella is Ctrl-Q (or equivalent for OSX),
close the window, or from the 'Quit' button.
Also, the 'Enter launcher mode' event will eventually be made remappable,
as will the 'Enter menu mode' event (currently the 'Tab' key).
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@412 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-05-06 18:39:00 +00:00
|
|
|
}
|
2004-06-23 03:43:47 +00:00
|
|
|
|
2006-12-15 16:43:12 +00:00
|
|
|
#ifdef DEBUGGER_SUPPORT
|
2005-02-27 23:41:19 +00:00
|
|
|
case EventHandler::S_DEBUGGER:
|
2005-06-23 14:33:12 +00:00
|
|
|
{
|
2009-01-10 18:42:49 +00:00
|
|
|
// When onscreen messages are enabled in double-buffer mode,
|
|
|
|
// a full redraw is required
|
|
|
|
myOSystem->debugger().draw(myMsg.enabled && type() == kGLBuffer);
|
2005-05-27 18:00:49 +00:00
|
|
|
break; // S_DEBUGGER
|
2005-06-23 14:33:12 +00:00
|
|
|
}
|
2005-08-24 22:54:30 +00:00
|
|
|
#endif
|
2005-02-27 23:41:19 +00:00
|
|
|
|
2005-08-24 22:54:30 +00:00
|
|
|
default:
|
2005-02-27 23:41:19 +00:00
|
|
|
return;
|
2003-10-26 19:40:39 +00:00
|
|
|
}
|
|
|
|
|
2006-12-18 12:53:33 +00:00
|
|
|
// Draw any pending messages
|
2009-01-10 18:42:49 +00:00
|
|
|
if(myMsg.enabled)
|
2006-12-18 12:53:33 +00:00
|
|
|
drawMessage();
|
|
|
|
|
2008-12-04 16:53:26 +00:00
|
|
|
// Do any post-frame stuff
|
2008-08-04 11:56:12 +00:00
|
|
|
postFrameUpdate();
|
|
|
|
|
2005-07-20 17:33:03 +00:00
|
|
|
// The frame doesn't need to be completely redrawn anymore
|
2008-08-04 11:56:12 +00:00
|
|
|
myRedrawEntireFrame = false;
|
2003-09-25 16:20:34 +00:00
|
|
|
}
|
|
|
|
|
2005-03-13 03:38:41 +00:00
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
2006-03-19 18:17:48 +00:00
|
|
|
void FrameBuffer::showMessage(const string& message, MessagePosition position,
|
Revamped the result on floating pins for TIA reads. Previously, this was
controlled by 'tiafloat', which has now been removed. Now, all
undriven pins take on the last value on the databus. This fixes a bug
in those reads where bit 6 or bits 6 & 7 are also undriven (previously,
these bits would always be zero, and only bits 0-5 were from lastdatabus.
Added new commandline argument 'tiadriven', which defaults to false.
In this default case, relevant bits take on values from the databus.
If true, relevant bits still take on databus values, but some are
randomly driven high as well. This helps to expose bugs when
developers assume the values for undriven/floating bits.
Added 'uimessages' commandline argument and associated UI item. When
disabled, messages which are normally shown in-game are disabled.
Certain messages which indicate a serious error are still shown, however.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1900 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2009-11-10 20:12:50 +00:00
|
|
|
bool force, uInt32 color)
|
2005-03-13 03:38:41 +00:00
|
|
|
{
|
Revamped the result on floating pins for TIA reads. Previously, this was
controlled by 'tiafloat', which has now been removed. Now, all
undriven pins take on the last value on the databus. This fixes a bug
in those reads where bit 6 or bits 6 & 7 are also undriven (previously,
these bits would always be zero, and only bits 0-5 were from lastdatabus.
Added new commandline argument 'tiadriven', which defaults to false.
In this default case, relevant bits take on values from the databus.
If true, relevant bits still take on databus values, but some are
randomly driven high as well. This helps to expose bugs when
developers assume the values for undriven/floating bits.
Added 'uimessages' commandline argument and associated UI item. When
disabled, messages which are normally shown in-game are disabled.
Certain messages which indicate a serious error are still shown, however.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1900 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2009-11-10 20:12:50 +00:00
|
|
|
// Only show messages if they've been enabled
|
|
|
|
if(!(force || myOSystem->settings().getBool("uimessages")))
|
|
|
|
return;
|
|
|
|
|
2005-07-20 18:44:38 +00:00
|
|
|
// Erase old messages on the screen
|
2008-06-19 12:01:31 +00:00
|
|
|
if(myMsg.counter > 0)
|
2005-07-20 18:44:38 +00:00
|
|
|
{
|
2008-08-04 11:56:12 +00:00
|
|
|
myRedrawEntireFrame = true;
|
2008-12-27 23:27:32 +00:00
|
|
|
refresh();
|
2005-07-20 18:44:38 +00:00
|
|
|
}
|
|
|
|
|
2006-03-19 18:17:48 +00:00
|
|
|
// Precompute the message coordinates
|
2008-06-19 12:01:31 +00:00
|
|
|
myMsg.text = message;
|
|
|
|
myMsg.counter = uInt32(myOSystem->frameRate()) << 1; // Show message for 2 seconds
|
|
|
|
myMsg.color = color;
|
2006-03-19 18:17:48 +00:00
|
|
|
|
2008-06-19 12:01:31 +00:00
|
|
|
myMsg.w = myOSystem->font().getStringWidth(myMsg.text) + 10;
|
|
|
|
myMsg.h = myOSystem->font().getFontHeight() + 8;
|
|
|
|
myMsg.surface->setWidth(myMsg.w);
|
|
|
|
myMsg.surface->setHeight(myMsg.h);
|
2009-01-10 18:42:49 +00:00
|
|
|
myMsg.position = position;
|
|
|
|
myMsg.enabled = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
|
|
void FrameBuffer::toggleFrameStats()
|
|
|
|
{
|
|
|
|
showFrameStats(!myOSystem->settings().getBool("stats"));
|
|
|
|
}
|
|
|
|
|
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
|
|
void FrameBuffer::showFrameStats(bool enable)
|
|
|
|
{
|
|
|
|
myOSystem->settings().setBool("stats", enable);
|
|
|
|
myStatsMsg.enabled = enable;
|
|
|
|
refresh();
|
|
|
|
}
|
|
|
|
|
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
|
|
void FrameBuffer::enableMessages(bool enable)
|
|
|
|
{
|
|
|
|
if(enable)
|
|
|
|
{
|
2010-04-14 15:41:42 +00:00
|
|
|
// Only re-enable frame stats if they were already enabled before
|
2009-01-10 18:42:49 +00:00
|
|
|
myStatsMsg.enabled = myOSystem->settings().getBool("stats");
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// Temporarily disable frame stats
|
|
|
|
myStatsMsg.enabled = false;
|
2006-03-19 18:17:48 +00:00
|
|
|
|
2009-01-10 18:42:49 +00:00
|
|
|
// Erase old messages on the screen
|
|
|
|
myMsg.enabled = false;
|
|
|
|
myMsg.counter = 0;
|
|
|
|
|
|
|
|
refresh();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
|
|
inline void FrameBuffer::drawMessage()
|
|
|
|
{
|
|
|
|
// Draw the bounded box and text
|
|
|
|
switch(myMsg.position)
|
2006-03-19 18:17:48 +00:00
|
|
|
{
|
|
|
|
case kTopLeft:
|
2008-06-19 12:01:31 +00:00
|
|
|
myMsg.x = 5;
|
|
|
|
myMsg.y = 5;
|
2006-03-19 18:17:48 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case kTopCenter:
|
2008-06-19 12:01:31 +00:00
|
|
|
myMsg.x = (myImageRect.width() - myMsg.w) >> 1;
|
|
|
|
myMsg.y = 5;
|
2006-03-19 18:17:48 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case kTopRight:
|
2008-06-19 12:01:31 +00:00
|
|
|
myMsg.x = myImageRect.width() - myMsg.w - 5;
|
|
|
|
myMsg.y = 5;
|
2006-03-19 18:17:48 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case kMiddleLeft:
|
2008-06-19 12:01:31 +00:00
|
|
|
myMsg.x = 5;
|
|
|
|
myMsg.y = (myImageRect.height() - myMsg.h) >> 1;
|
2006-03-19 18:17:48 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case kMiddleCenter:
|
2008-06-19 12:01:31 +00:00
|
|
|
myMsg.x = (myImageRect.width() - myMsg.w) >> 1;
|
|
|
|
myMsg.y = (myImageRect.height() - myMsg.h) >> 1;
|
2006-03-19 18:17:48 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case kMiddleRight:
|
2008-06-19 12:01:31 +00:00
|
|
|
myMsg.x = myImageRect.width() - myMsg.w - 5;
|
|
|
|
myMsg.y = (myImageRect.height() - myMsg.h) >> 1;
|
2006-03-19 18:17:48 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case kBottomLeft:
|
2008-06-19 12:01:31 +00:00
|
|
|
myMsg.x = 5;
|
|
|
|
myMsg.y = myImageRect.height() - myMsg.h - 5;
|
2006-03-19 18:17:48 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case kBottomCenter:
|
2008-06-19 12:01:31 +00:00
|
|
|
myMsg.x = (myImageRect.width() - myMsg.w) >> 1;
|
|
|
|
myMsg.y = myImageRect.height() - myMsg.h - 5;
|
2006-03-19 18:17:48 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case kBottomRight:
|
2008-06-19 12:01:31 +00:00
|
|
|
myMsg.x = myImageRect.width() - myMsg.w - 5;
|
|
|
|
myMsg.y = myImageRect.height() - myMsg.h - 5;
|
2006-03-19 18:17:48 +00:00
|
|
|
break;
|
|
|
|
}
|
2005-03-13 03:38:41 +00:00
|
|
|
|
2008-06-19 12:01:31 +00:00
|
|
|
myMsg.surface->setPos(myMsg.x + myImageRect.x(), myMsg.y + myImageRect.y());
|
|
|
|
myMsg.surface->fillRect(0, 0, myMsg.w-2, myMsg.h-4, kBGColor);
|
|
|
|
myMsg.surface->box(0, 0, myMsg.w, myMsg.h-2, kColor, kShadowColor);
|
|
|
|
myMsg.surface->drawString(&myOSystem->font(), myMsg.text, 4, 4,
|
|
|
|
myMsg.w, myMsg.color, kTextAlignLeft);
|
|
|
|
myMsg.counter--;
|
2006-03-18 00:00:30 +00:00
|
|
|
|
|
|
|
// Either erase the entire message (when time is reached),
|
|
|
|
// or show again this frame
|
2008-06-19 12:01:31 +00:00
|
|
|
if(myMsg.counter == 0) // Force an immediate update
|
2009-01-10 18:42:49 +00:00
|
|
|
{
|
|
|
|
myMsg.enabled = false;
|
2008-12-27 23:27:32 +00:00
|
|
|
refresh();
|
2009-01-10 18:42:49 +00:00
|
|
|
}
|
2006-03-18 00:00:30 +00:00
|
|
|
else
|
2008-06-19 12:01:31 +00:00
|
|
|
{
|
2009-01-10 18:42:49 +00:00
|
|
|
myMsg.surface->addDirtyRect(0, 0, 0, 0);
|
2008-06-19 12:01:31 +00:00
|
|
|
myMsg.surface->update();
|
|
|
|
}
|
2006-03-18 00:00:30 +00:00
|
|
|
}
|
|
|
|
|
2006-05-15 12:24:09 +00:00
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
|
|
void FrameBuffer::refresh()
|
|
|
|
{
|
2008-12-27 23:27:32 +00:00
|
|
|
// This method partly duplicates the behaviour in ::update()
|
|
|
|
// Here, however, make sure to redraw *all* surfaces applicable to the
|
|
|
|
// current EventHandler state
|
|
|
|
// We also check for double-buffered modes, and when present
|
|
|
|
// update both buffers accordingly
|
|
|
|
//
|
|
|
|
// This method is in essence a FULL refresh, putting all rendering
|
|
|
|
// buffers in a known, fully redrawn state
|
|
|
|
|
|
|
|
bool doubleBuffered = (type() == kGLBuffer);
|
|
|
|
switch(myOSystem->eventHandler().state())
|
|
|
|
{
|
|
|
|
case EventHandler::S_EMULATE:
|
|
|
|
case EventHandler::S_PAUSE:
|
2010-07-22 15:41:46 +00:00
|
|
|
invalidate();
|
2009-01-19 16:52:32 +00:00
|
|
|
drawTIA(true);
|
2008-12-27 23:27:32 +00:00
|
|
|
if(doubleBuffered)
|
2010-07-22 15:41:46 +00:00
|
|
|
{
|
2010-10-27 14:07:52 +00:00
|
|
|
postFrameUpdate();
|
2010-07-22 15:41:46 +00:00
|
|
|
invalidate();
|
2009-01-19 16:52:32 +00:00
|
|
|
drawTIA(true);
|
2010-07-22 15:41:46 +00:00
|
|
|
}
|
2008-12-27 23:27:32 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case EventHandler::S_MENU:
|
2010-07-22 15:41:46 +00:00
|
|
|
invalidate();
|
2009-01-19 16:52:32 +00:00
|
|
|
drawTIA(true);
|
2008-12-27 23:27:32 +00:00
|
|
|
myOSystem->menu().draw(true);
|
|
|
|
if(doubleBuffered)
|
|
|
|
{
|
|
|
|
postFrameUpdate();
|
2010-07-22 15:41:46 +00:00
|
|
|
invalidate();
|
2009-01-19 16:52:32 +00:00
|
|
|
drawTIA(true);
|
2008-12-27 23:27:32 +00:00
|
|
|
myOSystem->menu().draw(true);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case EventHandler::S_CMDMENU:
|
2010-07-22 15:41:46 +00:00
|
|
|
invalidate();
|
2009-01-19 16:52:32 +00:00
|
|
|
drawTIA(true);
|
2008-12-27 23:27:32 +00:00
|
|
|
myOSystem->commandMenu().draw(true);
|
|
|
|
if(doubleBuffered)
|
|
|
|
{
|
|
|
|
postFrameUpdate();
|
2010-07-22 15:41:46 +00:00
|
|
|
invalidate();
|
2009-01-19 16:52:32 +00:00
|
|
|
drawTIA(true);
|
2008-12-27 23:27:32 +00:00
|
|
|
myOSystem->commandMenu().draw(true);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case EventHandler::S_LAUNCHER:
|
2010-07-22 15:41:46 +00:00
|
|
|
invalidate();
|
2008-12-27 23:27:32 +00:00
|
|
|
myOSystem->launcher().draw(true);
|
|
|
|
if(doubleBuffered)
|
|
|
|
{
|
|
|
|
postFrameUpdate();
|
2010-07-22 15:41:46 +00:00
|
|
|
invalidate();
|
2008-12-27 23:27:32 +00:00
|
|
|
myOSystem->launcher().draw(true);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
#ifdef DEBUGGER_SUPPORT
|
|
|
|
case EventHandler::S_DEBUGGER:
|
2010-07-22 15:41:46 +00:00
|
|
|
invalidate();
|
2008-12-27 23:27:32 +00:00
|
|
|
myOSystem->debugger().draw(true);
|
|
|
|
if(doubleBuffered)
|
|
|
|
{
|
|
|
|
postFrameUpdate();
|
2010-07-22 15:41:46 +00:00
|
|
|
invalidate();
|
2008-12-27 23:27:32 +00:00
|
|
|
myOSystem->debugger().draw(true);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
2006-05-15 12:24:09 +00:00
|
|
|
}
|
|
|
|
|
2008-12-12 15:51:07 +00:00
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
|
|
int FrameBuffer::allocateSurface(int w, int h, bool useBase)
|
|
|
|
{
|
|
|
|
// Create a new surface
|
|
|
|
FBSurface* surface = createSurface(w, h, useBase);
|
|
|
|
|
|
|
|
// Add it to the list
|
2010-04-14 22:35:46 +00:00
|
|
|
mySurfaceList.insert(make_pair(int(mySurfaceList.size()), surface));
|
2008-12-12 15:51:07 +00:00
|
|
|
|
|
|
|
// Return a reference to it
|
2010-04-14 15:41:42 +00:00
|
|
|
return mySurfaceList.size() - 1;
|
2008-12-12 15:51:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
|
|
FBSurface* FrameBuffer::surface(int id) const
|
|
|
|
{
|
|
|
|
map<int,FBSurface*>::const_iterator iter = mySurfaceList.find(id);
|
|
|
|
return iter != mySurfaceList.end() ? iter->second : NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
2011-08-19 14:30:15 +00:00
|
|
|
void FrameBuffer::resetSurfaces(FBSurface* tiasurface)
|
2008-12-12 15:51:07 +00:00
|
|
|
{
|
2008-12-20 23:32:46 +00:00
|
|
|
// Free all resources for each surface, then reload them
|
|
|
|
// Due to possible timing and/or synchronization issues, all free()'s
|
|
|
|
// are done first, then all reload()'s
|
|
|
|
// Any derived FrameBuffer classes that call this method should be
|
|
|
|
// aware of these restrictions, and act accordingly
|
|
|
|
|
2008-12-12 15:51:07 +00:00
|
|
|
map<int,FBSurface*>::iterator iter;
|
|
|
|
for(iter = mySurfaceList.begin(); iter != mySurfaceList.end(); ++iter)
|
2008-12-20 23:32:46 +00:00
|
|
|
iter->second->free();
|
2011-08-19 14:30:15 +00:00
|
|
|
if(tiasurface)
|
|
|
|
tiasurface->free();
|
2008-12-20 23:32:46 +00:00
|
|
|
for(iter = mySurfaceList.begin(); iter != mySurfaceList.end(); ++iter)
|
2008-12-12 15:51:07 +00:00
|
|
|
iter->second->reload();
|
2011-08-19 14:30:15 +00:00
|
|
|
if(tiasurface)
|
|
|
|
tiasurface->reload();
|
2008-12-12 15:51:07 +00:00
|
|
|
}
|
|
|
|
|
2009-01-03 15:44:13 +00:00
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
2009-09-01 11:54:59 +00:00
|
|
|
uInt32 FrameBuffer::tiaPixel(uInt32 idx, uInt8 shift) const
|
2009-01-03 15:44:13 +00:00
|
|
|
{
|
2009-09-01 11:54:59 +00:00
|
|
|
uInt8 c = *(myOSystem->console().tia().currentFrameBuffer() + idx) | shift;
|
|
|
|
uInt8 p = *(myOSystem->console().tia().previousFrameBuffer() + idx) | shift;
|
2009-01-03 15:44:13 +00:00
|
|
|
|
2009-01-03 22:57:12 +00:00
|
|
|
return (!myUsePhosphor ? myDefPalette[c] : myAvgPalette[c][p]);
|
2009-01-03 15:44:13 +00:00
|
|
|
}
|
|
|
|
|
2003-10-26 19:40:39 +00:00
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
OK, some huge changes across the board, so lets see if I get it all:
After much request, added ability to access the settings menu from the
ROM browser dialog. This menu now contains almost all items that can
be selected in Stella, and can be accessed in-game as before.
Completely removed pause functionality from the core code. It made
sense back when Stella was a single-mode program: there were two modes;
emulation and pause. Now that there are other event modes, the
EventHandler state machine is getting too complicated. If you want to
pause, you can simply enter one of the in-game menus. Related to this,
when the app is minimized, Stella enters the menu dialog state.
Previously, minimizing the app caused a pause, but since there was no
onscreen feedback, many people assumed the app locked up.
Added centering to all Dialog boxes, which is done dynamically, as they're
placed on the dialog stack to be drawn to the screen.
Cleaned up the API of Console/FrameBuffer/OSystem classes wrt to palettes
and timing. Parts of each were being done in different classes; now it
should be more consistent.
Started infrastructure for user-selectable UI palettes. For now, there's
no way to change it in the GUI, and it defaults to the normal palette.
Eventually, there will be several choices selectable from an in-game
menu.
Removed '-channels' commandline argument, since that feature can be
set from the ROM properties.
Added '128' to the choices for fragment size in AudioDialog.
Tweaked the OpenGL dynamic loading code to test both the given GL
lib, and if that fails to use auto-detection. It seems in the OSX port,
the first approach works for some people, and not the other (and vice-versa),
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1255 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2006-12-30 22:26:29 +00:00
|
|
|
void FrameBuffer::setTIAPalette(const uInt32* palette)
|
2003-10-26 19:40:39 +00:00
|
|
|
{
|
2006-01-10 02:09:34 +00:00
|
|
|
int i, j;
|
2003-10-26 19:40:39 +00:00
|
|
|
|
2006-01-10 02:09:34 +00:00
|
|
|
// Set palette for normal fill
|
|
|
|
for(i = 0; i < 256; ++i)
|
|
|
|
{
|
OK, some huge changes across the board, so lets see if I get it all:
After much request, added ability to access the settings menu from the
ROM browser dialog. This menu now contains almost all items that can
be selected in Stella, and can be accessed in-game as before.
Completely removed pause functionality from the core code. It made
sense back when Stella was a single-mode program: there were two modes;
emulation and pause. Now that there are other event modes, the
EventHandler state machine is getting too complicated. If you want to
pause, you can simply enter one of the in-game menus. Related to this,
when the app is minimized, Stella enters the menu dialog state.
Previously, minimizing the app caused a pause, but since there was no
onscreen feedback, many people assumed the app locked up.
Added centering to all Dialog boxes, which is done dynamically, as they're
placed on the dialog stack to be drawn to the screen.
Cleaned up the API of Console/FrameBuffer/OSystem classes wrt to palettes
and timing. Parts of each were being done in different classes; now it
should be more consistent.
Started infrastructure for user-selectable UI palettes. For now, there's
no way to change it in the GUI, and it defaults to the normal palette.
Eventually, there will be several choices selectable from an in-game
menu.
Removed '-channels' commandline argument, since that feature can be
set from the ROM properties.
Added '128' to the choices for fragment size in AudioDialog.
Tweaked the OpenGL dynamic loading code to test both the given GL
lib, and if that fails to use auto-detection. It seems in the OSX port,
the first approach works for some people, and not the other (and vice-versa),
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1255 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2006-12-30 22:26:29 +00:00
|
|
|
Uint8 r = (palette[i] >> 16) & 0xff;
|
|
|
|
Uint8 g = (palette[i] >> 8) & 0xff;
|
|
|
|
Uint8 b = palette[i] & 0xff;
|
2003-10-26 19:40:39 +00:00
|
|
|
|
2006-03-25 00:34:17 +00:00
|
|
|
myDefPalette[i] = mapRGB(r, g, b);
|
2009-02-06 23:53:34 +00:00
|
|
|
if(SDL_BYTEORDER == SDL_LIL_ENDIAN)
|
|
|
|
{
|
|
|
|
myDefPalette24[i][0] = b;
|
|
|
|
myDefPalette24[i][1] = g;
|
|
|
|
myDefPalette24[i][2] = r;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
myDefPalette24[i][0] = r;
|
|
|
|
myDefPalette24[i][1] = g;
|
|
|
|
myDefPalette24[i][2] = b;
|
|
|
|
}
|
2005-03-28 00:04:54 +00:00
|
|
|
}
|
|
|
|
|
2006-01-10 02:09:34 +00:00
|
|
|
// Set palette for phosphor effect
|
2006-03-24 19:59:52 +00:00
|
|
|
for(i = 0; i < 256; ++i)
|
2006-01-10 02:09:34 +00:00
|
|
|
{
|
2006-03-24 19:59:52 +00:00
|
|
|
for(j = 0; j < 256; ++j)
|
2006-01-10 02:09:34 +00:00
|
|
|
{
|
OK, some huge changes across the board, so lets see if I get it all:
After much request, added ability to access the settings menu from the
ROM browser dialog. This menu now contains almost all items that can
be selected in Stella, and can be accessed in-game as before.
Completely removed pause functionality from the core code. It made
sense back when Stella was a single-mode program: there were two modes;
emulation and pause. Now that there are other event modes, the
EventHandler state machine is getting too complicated. If you want to
pause, you can simply enter one of the in-game menus. Related to this,
when the app is minimized, Stella enters the menu dialog state.
Previously, minimizing the app caused a pause, but since there was no
onscreen feedback, many people assumed the app locked up.
Added centering to all Dialog boxes, which is done dynamically, as they're
placed on the dialog stack to be drawn to the screen.
Cleaned up the API of Console/FrameBuffer/OSystem classes wrt to palettes
and timing. Parts of each were being done in different classes; now it
should be more consistent.
Started infrastructure for user-selectable UI palettes. For now, there's
no way to change it in the GUI, and it defaults to the normal palette.
Eventually, there will be several choices selectable from an in-game
menu.
Removed '-channels' commandline argument, since that feature can be
set from the ROM properties.
Added '128' to the choices for fragment size in AudioDialog.
Tweaked the OpenGL dynamic loading code to test both the given GL
lib, and if that fails to use auto-detection. It seems in the OSX port,
the first approach works for some people, and not the other (and vice-versa),
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1255 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2006-12-30 22:26:29 +00:00
|
|
|
uInt8 ri = (palette[i] >> 16) & 0xff;
|
|
|
|
uInt8 gi = (palette[i] >> 8) & 0xff;
|
|
|
|
uInt8 bi = palette[i] & 0xff;
|
|
|
|
uInt8 rj = (palette[j] >> 16) & 0xff;
|
|
|
|
uInt8 gj = (palette[j] >> 8) & 0xff;
|
|
|
|
uInt8 bj = palette[j] & 0xff;
|
2006-03-24 19:59:52 +00:00
|
|
|
|
2006-03-25 00:34:17 +00:00
|
|
|
Uint8 r = (Uint8) getPhosphor(ri, rj);
|
|
|
|
Uint8 g = (Uint8) getPhosphor(gi, gj);
|
|
|
|
Uint8 b = (Uint8) getPhosphor(bi, bj);
|
2006-03-24 19:59:52 +00:00
|
|
|
|
2006-03-25 00:34:17 +00:00
|
|
|
myAvgPalette[i][j] = mapRGB(r, g, b);
|
2006-01-10 02:09:34 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-08-04 11:56:12 +00:00
|
|
|
myRedrawEntireFrame = true;
|
2003-10-26 19:40:39 +00:00
|
|
|
}
|
|
|
|
|
OK, some huge changes across the board, so lets see if I get it all:
After much request, added ability to access the settings menu from the
ROM browser dialog. This menu now contains almost all items that can
be selected in Stella, and can be accessed in-game as before.
Completely removed pause functionality from the core code. It made
sense back when Stella was a single-mode program: there were two modes;
emulation and pause. Now that there are other event modes, the
EventHandler state machine is getting too complicated. If you want to
pause, you can simply enter one of the in-game menus. Related to this,
when the app is minimized, Stella enters the menu dialog state.
Previously, minimizing the app caused a pause, but since there was no
onscreen feedback, many people assumed the app locked up.
Added centering to all Dialog boxes, which is done dynamically, as they're
placed on the dialog stack to be drawn to the screen.
Cleaned up the API of Console/FrameBuffer/OSystem classes wrt to palettes
and timing. Parts of each were being done in different classes; now it
should be more consistent.
Started infrastructure for user-selectable UI palettes. For now, there's
no way to change it in the GUI, and it defaults to the normal palette.
Eventually, there will be several choices selectable from an in-game
menu.
Removed '-channels' commandline argument, since that feature can be
set from the ROM properties.
Added '128' to the choices for fragment size in AudioDialog.
Tweaked the OpenGL dynamic loading code to test both the given GL
lib, and if that fails to use auto-detection. It seems in the OSX port,
the first approach works for some people, and not the other (and vice-versa),
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1255 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2006-12-30 22:26:29 +00:00
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
|
|
void FrameBuffer::setUIPalette(const uInt32* palette)
|
|
|
|
{
|
|
|
|
// Set palette for GUI
|
2009-02-06 23:53:34 +00:00
|
|
|
for(int i = 0, j = 256; i < kNumColors-256; ++i, ++j)
|
OK, some huge changes across the board, so lets see if I get it all:
After much request, added ability to access the settings menu from the
ROM browser dialog. This menu now contains almost all items that can
be selected in Stella, and can be accessed in-game as before.
Completely removed pause functionality from the core code. It made
sense back when Stella was a single-mode program: there were two modes;
emulation and pause. Now that there are other event modes, the
EventHandler state machine is getting too complicated. If you want to
pause, you can simply enter one of the in-game menus. Related to this,
when the app is minimized, Stella enters the menu dialog state.
Previously, minimizing the app caused a pause, but since there was no
onscreen feedback, many people assumed the app locked up.
Added centering to all Dialog boxes, which is done dynamically, as they're
placed on the dialog stack to be drawn to the screen.
Cleaned up the API of Console/FrameBuffer/OSystem classes wrt to palettes
and timing. Parts of each were being done in different classes; now it
should be more consistent.
Started infrastructure for user-selectable UI palettes. For now, there's
no way to change it in the GUI, and it defaults to the normal palette.
Eventually, there will be several choices selectable from an in-game
menu.
Removed '-channels' commandline argument, since that feature can be
set from the ROM properties.
Added '128' to the choices for fragment size in AudioDialog.
Tweaked the OpenGL dynamic loading code to test both the given GL
lib, and if that fails to use auto-detection. It seems in the OSX port,
the first approach works for some people, and not the other (and vice-versa),
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1255 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2006-12-30 22:26:29 +00:00
|
|
|
{
|
|
|
|
Uint8 r = (palette[i] >> 16) & 0xff;
|
|
|
|
Uint8 g = (palette[i] >> 8) & 0xff;
|
|
|
|
Uint8 b = palette[i] & 0xff;
|
2009-02-06 23:53:34 +00:00
|
|
|
|
|
|
|
myDefPalette[j] = mapRGB(r, g, b);
|
|
|
|
if(SDL_BYTEORDER == SDL_LIL_ENDIAN)
|
|
|
|
{
|
|
|
|
myDefPalette24[j][0] = b;
|
|
|
|
myDefPalette24[j][1] = g;
|
|
|
|
myDefPalette24[j][2] = r;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
myDefPalette24[j][0] = r;
|
|
|
|
myDefPalette24[j][1] = g;
|
|
|
|
myDefPalette24[j][2] = b;
|
|
|
|
}
|
OK, some huge changes across the board, so lets see if I get it all:
After much request, added ability to access the settings menu from the
ROM browser dialog. This menu now contains almost all items that can
be selected in Stella, and can be accessed in-game as before.
Completely removed pause functionality from the core code. It made
sense back when Stella was a single-mode program: there were two modes;
emulation and pause. Now that there are other event modes, the
EventHandler state machine is getting too complicated. If you want to
pause, you can simply enter one of the in-game menus. Related to this,
when the app is minimized, Stella enters the menu dialog state.
Previously, minimizing the app caused a pause, but since there was no
onscreen feedback, many people assumed the app locked up.
Added centering to all Dialog boxes, which is done dynamically, as they're
placed on the dialog stack to be drawn to the screen.
Cleaned up the API of Console/FrameBuffer/OSystem classes wrt to palettes
and timing. Parts of each were being done in different classes; now it
should be more consistent.
Started infrastructure for user-selectable UI palettes. For now, there's
no way to change it in the GUI, and it defaults to the normal palette.
Eventually, there will be several choices selectable from an in-game
menu.
Removed '-channels' commandline argument, since that feature can be
set from the ROM properties.
Added '128' to the choices for fragment size in AudioDialog.
Tweaked the OpenGL dynamic loading code to test both the given GL
lib, and if that fails to use auto-detection. It seems in the OSX port,
the first approach works for some people, and not the other (and vice-versa),
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1255 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2006-12-30 22:26:29 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-01-10 18:52:55 +00:00
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
|
|
void FrameBuffer::stateChanged(EventHandler::State state)
|
|
|
|
{
|
|
|
|
// Make sure any onscreen messages are removed
|
|
|
|
myMsg.enabled = false;
|
|
|
|
myMsg.counter = 0;
|
|
|
|
|
|
|
|
myRedrawEntireFrame = true;
|
|
|
|
}
|
|
|
|
|
2003-10-26 19:40:39 +00:00
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
2005-05-01 20:11:07 +00:00
|
|
|
void FrameBuffer::toggleFullscreen()
|
2003-10-26 19:40:39 +00:00
|
|
|
{
|
2009-06-05 14:05:23 +00:00
|
|
|
setFullscreen(!fullScreen());
|
2005-05-01 20:11:07 +00:00
|
|
|
}
|
2003-10-26 19:40:39 +00:00
|
|
|
|
2005-05-01 20:11:07 +00:00
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
|
|
void FrameBuffer::setFullscreen(bool enable)
|
|
|
|
{
|
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).
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1323 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2007-06-20 16:33:23 +00:00
|
|
|
#ifdef WINDOWED_SUPPORT
|
2009-08-07 11:45:14 +00:00
|
|
|
// '-1' means fullscreen mode is completely disabled
|
|
|
|
if(enable && myOSystem->settings().getString("fullscreen") != "-1" )
|
2005-03-28 00:04:54 +00:00
|
|
|
mySDLFlags |= SDL_FULLSCREEN;
|
|
|
|
else
|
|
|
|
mySDLFlags &= ~SDL_FULLSCREEN;
|
2003-10-26 19:40:39 +00:00
|
|
|
|
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).
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1323 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2007-06-20 16:33:23 +00:00
|
|
|
// Do a dummy call to getSavedVidMode to set up the modelists
|
|
|
|
// and have it point to the correct 'current' mode
|
|
|
|
getSavedVidMode();
|
2003-10-26 19:40:39 +00:00
|
|
|
|
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).
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1323 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2007-06-20 16:33:23 +00:00
|
|
|
// Do a mode change to the 'current' mode by not passing a '+1' or '-1'
|
|
|
|
// to changeVidMode()
|
|
|
|
changeVidMode(0);
|
|
|
|
#endif
|
2005-03-28 00:04:54 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
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).
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1323 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2007-06-20 16:33:23 +00:00
|
|
|
bool FrameBuffer::changeVidMode(int direction)
|
2005-03-28 00:04:54 +00:00
|
|
|
{
|
2008-06-19 12:01:31 +00:00
|
|
|
EventHandler::State state = myOSystem->eventHandler().state();
|
|
|
|
bool inUIMode = (state == EventHandler::S_DEBUGGER ||
|
|
|
|
state == EventHandler::S_LAUNCHER);
|
|
|
|
|
Reworked 'fullres' argument to also accept the 'auto' option. In this case,
fullscreen resolutions will be automatically chosen based on the required
size for the window. The image will be centered and keep the same aspect
ratio, however, so operation will still work correctly on widescreen
monitors. 'Auto' will be the new default. Otherwise, if a specific
resolution is requested, Stella will try to accomodate it *only* if it fits
into the resolution; otherwise the smallest resolution that fits will be
used.
Removed 'zoom_ui' and 'zoom_tia'. The UI can now only be at 1x mode.
Aded 'tia_filter' commandline argument, which specifies to the filter
to use when rendering the tia image. For now, these accept 'zoom1x',
'zoom2x'..., up to 'zoom10x', and duplicate previous behaviour. Eventually,
Scalexx and HQxx filters may be added. Still TODO is add this to the UI.
First pass at making the standard build use a minimum of zoom2x for the TIA,
so the UI can be larger and use a better looking font. There's still work
to do in this area, especially for those ports with limited hardware that
support zoom1x only.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1544 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-07-22 14:54:39 +00:00
|
|
|
// Ignore any attempts to change video size while in UI mode
|
|
|
|
if(inUIMode && direction != 0)
|
|
|
|
return false;
|
|
|
|
|
2008-06-19 12:01:31 +00:00
|
|
|
// Only save mode changes in TIA mode with a valid selector
|
|
|
|
bool saveModeChange = !inUIMode && (direction == -1 || direction == +1);
|
2007-08-16 16:42:46 +00:00
|
|
|
|
Reworked 'fullres' argument to also accept the 'auto' option. In this case,
fullscreen resolutions will be automatically chosen based on the required
size for the window. The image will be centered and keep the same aspect
ratio, however, so operation will still work correctly on widescreen
monitors. 'Auto' will be the new default. Otherwise, if a specific
resolution is requested, Stella will try to accomodate it *only* if it fits
into the resolution; otherwise the smallest resolution that fits will be
used.
Removed 'zoom_ui' and 'zoom_tia'. The UI can now only be at 1x mode.
Aded 'tia_filter' commandline argument, which specifies to the filter
to use when rendering the tia image. For now, these accept 'zoom1x',
'zoom2x'..., up to 'zoom10x', and duplicate previous behaviour. Eventually,
Scalexx and HQxx filters may be added. Still TODO is add this to the UI.
First pass at making the standard build use a minimum of zoom2x for the TIA,
so the UI can be larger and use a better looking font. There's still work
to do in this area, especially for those ports with limited hardware that
support zoom1x only.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1544 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-07-22 14:54:39 +00:00
|
|
|
if(direction == +1)
|
|
|
|
myCurrentModeList->next();
|
|
|
|
else if(direction == -1)
|
|
|
|
myCurrentModeList->previous();
|
Added preliminary framework for using advanced scalers. Right now,
functionality is exactly the same as before; Alt-Equals goes to the
next valid scaler, and Alt-Minus goes to the previous one.
What were previously zoomed modes are now treated as scalers, named
'Zoom1x', 'Zoom2x', etc. Various scalexx and hqxx modes will also be made
available.
For now, and probably forever, these advanced scaling modes will only
be available for OpenGL, since if you don't have a card that can handle
GL well, the scalers will probably be too much anyway. Also, the advanced
scaling will not be available in UI mode, only OpenGL emulation mode.
The UI (Launcher, Debugger) and emulation modes are now scaled separately,
specified with the new settings 'scale_ui' and 'scale_tia'. The 'zoom'
setting has been removed.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1133 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2006-10-14 20:08:29 +00:00
|
|
|
|
2009-06-05 14:05:23 +00:00
|
|
|
VideoMode vidmode = myCurrentModeList->current(myOSystem->settings(), fullScreen());
|
Reworked 'fullres' argument to also accept the 'auto' option. In this case,
fullscreen resolutions will be automatically chosen based on the required
size for the window. The image will be centered and keep the same aspect
ratio, however, so operation will still work correctly on widescreen
monitors. 'Auto' will be the new default. Otherwise, if a specific
resolution is requested, Stella will try to accomodate it *only* if it fits
into the resolution; otherwise the smallest resolution that fits will be
used.
Removed 'zoom_ui' and 'zoom_tia'. The UI can now only be at 1x mode.
Aded 'tia_filter' commandline argument, which specifies to the filter
to use when rendering the tia image. For now, these accept 'zoom1x',
'zoom2x'..., up to 'zoom10x', and duplicate previous behaviour. Eventually,
Scalexx and HQxx filters may be added. Still TODO is add this to the UI.
First pass at making the standard build use a minimum of zoom2x for the TIA,
so the UI can be larger and use a better looking font. There's still work
to do in this area, especially for those ports with limited hardware that
support zoom1x only.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1544 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-07-22 14:54:39 +00:00
|
|
|
if(setVidMode(vidmode))
|
2008-06-19 12:01:31 +00:00
|
|
|
{
|
2010-09-21 19:39:30 +00:00
|
|
|
centerAppWindow(vidmode);
|
|
|
|
|
Reworked 'fullres' argument to also accept the 'auto' option. In this case,
fullscreen resolutions will be automatically chosen based on the required
size for the window. The image will be centered and keep the same aspect
ratio, however, so operation will still work correctly on widescreen
monitors. 'Auto' will be the new default. Otherwise, if a specific
resolution is requested, Stella will try to accomodate it *only* if it fits
into the resolution; otherwise the smallest resolution that fits will be
used.
Removed 'zoom_ui' and 'zoom_tia'. The UI can now only be at 1x mode.
Aded 'tia_filter' commandline argument, which specifies to the filter
to use when rendering the tia image. For now, these accept 'zoom1x',
'zoom2x'..., up to 'zoom10x', and duplicate previous behaviour. Eventually,
Scalexx and HQxx filters may be added. Still TODO is add this to the UI.
First pass at making the standard build use a minimum of zoom2x for the TIA,
so the UI can be larger and use a better looking font. There's still work
to do in this area, especially for those ports with limited hardware that
support zoom1x only.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1544 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-07-22 14:54:39 +00:00
|
|
|
myImageRect.setWidth(vidmode.image_w);
|
|
|
|
myImageRect.setHeight(vidmode.image_h);
|
|
|
|
myImageRect.moveTo(vidmode.image_x, vidmode.image_y);
|
|
|
|
|
|
|
|
myScreenRect.setWidth(vidmode.screen_w);
|
|
|
|
myScreenRect.setHeight(vidmode.screen_h);
|
2008-06-19 12:01:31 +00:00
|
|
|
|
2009-06-05 14:05:23 +00:00
|
|
|
// Did we get the requested fullscreen state?
|
2009-08-07 11:45:14 +00:00
|
|
|
const string& fullscreen = myOSystem->settings().getString("fullscreen");
|
|
|
|
if(fullscreen != "-1")
|
|
|
|
myOSystem->settings().setString("fullscreen", fullScreen() ? "1" : "0");
|
|
|
|
setCursorState();
|
2009-06-05 14:05:23 +00:00
|
|
|
|
Reworked 'fullres' argument to also accept the 'auto' option. In this case,
fullscreen resolutions will be automatically chosen based on the required
size for the window. The image will be centered and keep the same aspect
ratio, however, so operation will still work correctly on widescreen
monitors. 'Auto' will be the new default. Otherwise, if a specific
resolution is requested, Stella will try to accomodate it *only* if it fits
into the resolution; otherwise the smallest resolution that fits will be
used.
Removed 'zoom_ui' and 'zoom_tia'. The UI can now only be at 1x mode.
Aded 'tia_filter' commandline argument, which specifies to the filter
to use when rendering the tia image. For now, these accept 'zoom1x',
'zoom2x'..., up to 'zoom10x', and duplicate previous behaviour. Eventually,
Scalexx and HQxx filters may be added. Still TODO is add this to the UI.
First pass at making the standard build use a minimum of zoom2x for the TIA,
so the UI can be larger and use a better looking font. There's still work
to do in this area, especially for those ports with limited hardware that
support zoom1x only.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1544 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-07-22 14:54:39 +00:00
|
|
|
if(!inUIMode)
|
|
|
|
{
|
2009-01-06 23:14:34 +00:00
|
|
|
if(direction != 0) // only show message when mode actually changes
|
|
|
|
showMessage(vidmode.gfxmode.description);
|
Reworked 'fullres' argument to also accept the 'auto' option. In this case,
fullscreen resolutions will be automatically chosen based on the required
size for the window. The image will be centered and keep the same aspect
ratio, however, so operation will still work correctly on widescreen
monitors. 'Auto' will be the new default. Otherwise, if a specific
resolution is requested, Stella will try to accomodate it *only* if it fits
into the resolution; otherwise the smallest resolution that fits will be
used.
Removed 'zoom_ui' and 'zoom_tia'. The UI can now only be at 1x mode.
Aded 'tia_filter' commandline argument, which specifies to the filter
to use when rendering the tia image. For now, these accept 'zoom1x',
'zoom2x'..., up to 'zoom10x', and duplicate previous behaviour. Eventually,
Scalexx and HQxx filters may be added. Still TODO is add this to the UI.
First pass at making the standard build use a minimum of zoom2x for the TIA,
so the UI can be larger and use a better looking font. There's still work
to do in this area, especially for those ports with limited hardware that
support zoom1x only.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1544 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-07-22 14:54:39 +00:00
|
|
|
}
|
|
|
|
if(saveModeChange)
|
|
|
|
myOSystem->settings().setString("tia_filter", vidmode.gfxmode.name);
|
2008-12-27 23:27:32 +00:00
|
|
|
|
2008-12-28 21:01:55 +00:00
|
|
|
refresh();
|
2008-06-19 12:01:31 +00:00
|
|
|
}
|
|
|
|
else
|
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).
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1323 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2007-06-20 16:33:23 +00:00
|
|
|
return false;
|
2003-10-26 19:40:39 +00:00
|
|
|
|
Added preliminary framework for using advanced scalers. Right now,
functionality is exactly the same as before; Alt-Equals goes to the
next valid scaler, and Alt-Minus goes to the previous one.
What were previously zoomed modes are now treated as scalers, named
'Zoom1x', 'Zoom2x', etc. Various scalexx and hqxx modes will also be made
available.
For now, and probably forever, these advanced scaling modes will only
be available for OpenGL, since if you don't have a card that can handle
GL well, the scalers will probably be too much anyway. Also, the advanced
scaling will not be available in UI mode, only OpenGL emulation mode.
The UI (Launcher, Debugger) and emulation modes are now scaled separately,
specified with the new settings 'scale_ui' and 'scale_tia'. The 'zoom'
setting has been removed.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1133 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2006-10-14 20:08:29 +00:00
|
|
|
return true;
|
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).
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1323 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2007-06-20 16:33:23 +00:00
|
|
|
/*
|
|
|
|
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;
|
|
|
|
*/
|
2003-10-26 19:40:39 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
2005-03-28 00:04:54 +00:00
|
|
|
void FrameBuffer::setCursorState()
|
2003-10-26 19:40:39 +00:00
|
|
|
{
|
2011-06-02 20:53:01 +00:00
|
|
|
// Always grab mouse in fullscreen or during emulation (if enabled),
|
2011-05-06 14:29:39 +00:00
|
|
|
// and don't show the cursor during emulation
|
|
|
|
bool emulation =
|
|
|
|
myOSystem->eventHandler().state() == EventHandler::S_EMULATE;
|
2011-06-02 20:53:01 +00:00
|
|
|
grabMouse(fullScreen() ||
|
|
|
|
(emulation && myOSystem->settings().getBool("grabmouse")));
|
2011-05-06 14:29:39 +00:00
|
|
|
showCursor(!emulation);
|
2003-10-01 19:01:02 +00:00
|
|
|
}
|
|
|
|
|
2011-06-07 13:40:59 +00:00
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
|
|
void FrameBuffer::toggleGrabMouse()
|
|
|
|
{
|
|
|
|
bool state = myOSystem->settings().getBool("grabmouse");
|
|
|
|
myOSystem->settings().setBool("grabmouse", !state);
|
|
|
|
setCursorState();
|
|
|
|
}
|
|
|
|
|
2003-09-26 17:35:05 +00:00
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
2005-03-28 00:04:54 +00:00
|
|
|
void FrameBuffer::showCursor(bool show)
|
2003-09-26 17:35:05 +00:00
|
|
|
{
|
2008-03-13 22:58:07 +00:00
|
|
|
SDL_ShowCursor(show ? SDL_ENABLE : SDL_DISABLE);
|
2005-03-28 00:04:54 +00:00
|
|
|
}
|
2003-09-26 22:39:36 +00:00
|
|
|
|
2005-03-28 00:04:54 +00:00
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
|
|
void FrameBuffer::grabMouse(bool grab)
|
|
|
|
{
|
2008-03-13 22:58:07 +00:00
|
|
|
SDL_WM_GrabInput(grab ? SDL_GRAB_ON : SDL_GRAB_OFF);
|
2005-03-28 00:04:54 +00:00
|
|
|
}
|
Huge changes across the map. Lets see if I can remember it all ...
There is now an SDL OpenGL port with filtering and alpha-blending.
It's a work in progress right now, but is already quite stable.
It's not as optimized as the software version yet, but this will
change as well. For now, you have to compile the SDL version in
either normal software mode or OpenGL mode. This will change
before the 1.4 release.
When entering menu mode, the emulation is now suspended. And when
pause is pressed, you can't enter menu mode. Because of these changes,
CPU use has dropped dramatically when viewing menus. This will benefit
all ports, since menus are now redrawn only when necessary, instead of
at the current framerate.
For a reference, on a Pentium-IV 2.4GHz, the software SDL version
maxes CPU usage at 9%, and the SDL OpenGL version at 13.5%. This is
at 60 fps and a zoomlevel of 4. While some small improvements can
(possibly) be made to the OpenGL version, I think we'll soon be hitting
the glass ceiling.
Work on the Porting.txt document is progressing, and I estimate it to
be 45% complete.
The Windows version still doesn't compile, and I still haven't looked
at it. Rest assured that it will be done before 1.4. There will be
a simultaneous release, even if the Linux versions are finished.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@200 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2003-11-06 22:22:33 +00:00
|
|
|
|
2005-03-28 00:04:54 +00:00
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
2007-09-03 18:37:24 +00:00
|
|
|
bool FrameBuffer::fullScreen() const
|
2005-03-28 00:04:54 +00:00
|
|
|
{
|
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).
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1323 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2007-06-20 16:33:23 +00:00
|
|
|
#ifdef WINDOWED_SUPPORT
|
2009-06-05 14:05:23 +00:00
|
|
|
return mySDLFlags & SDL_FULLSCREEN;
|
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).
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1323 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2007-06-20 16:33:23 +00:00
|
|
|
#else
|
2009-06-05 14:05:23 +00:00
|
|
|
return true;
|
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).
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1323 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2007-06-20 16:33:23 +00:00
|
|
|
#endif
|
2005-03-28 00:04:54 +00:00
|
|
|
}
|
2003-09-26 22:39:36 +00:00
|
|
|
|
2005-03-28 00:04:54 +00:00
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
|
|
void FrameBuffer::setWindowTitle(const string& title)
|
|
|
|
{
|
|
|
|
SDL_WM_SetCaption(title.c_str(), "stella");
|
|
|
|
}
|
|
|
|
|
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
|
|
void FrameBuffer::setWindowIcon()
|
|
|
|
{
|
2011-12-27 01:57:06 +00:00
|
|
|
#if !defined(BSPF_MAC_OSX) && !defined(BSPF_UNIX)
|
2006-03-06 15:42:27 +00:00
|
|
|
#include "stella.xpm" // The Stella icon
|
|
|
|
|
2005-03-28 00:04:54 +00:00
|
|
|
// Set the window icon
|
|
|
|
uInt32 w, h, ncols, nbytes;
|
|
|
|
uInt32 rgba[256], icon[32 * 32];
|
|
|
|
uInt8 mask[32][4];
|
|
|
|
|
Reworked 'fullres' argument to also accept the 'auto' option. In this case,
fullscreen resolutions will be automatically chosen based on the required
size for the window. The image will be centered and keep the same aspect
ratio, however, so operation will still work correctly on widescreen
monitors. 'Auto' will be the new default. Otherwise, if a specific
resolution is requested, Stella will try to accomodate it *only* if it fits
into the resolution; otherwise the smallest resolution that fits will be
used.
Removed 'zoom_ui' and 'zoom_tia'. The UI can now only be at 1x mode.
Aded 'tia_filter' commandline argument, which specifies to the filter
to use when rendering the tia image. For now, these accept 'zoom1x',
'zoom2x'..., up to 'zoom10x', and duplicate previous behaviour. Eventually,
Scalexx and HQxx filters may be added. Still TODO is add this to the UI.
First pass at making the standard build use a minimum of zoom2x for the TIA,
so the UI can be larger and use a better looking font. There's still work
to do in this area, especially for those ports with limited hardware that
support zoom1x only.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1544 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-07-22 14:54:39 +00:00
|
|
|
sscanf(stella_icon[0], "%u %u %u %u", &w, &h, &ncols, &nbytes);
|
2005-03-28 00:04:54 +00:00
|
|
|
if((w != 32) || (h != 32) || (ncols > 255) || (nbytes > 1))
|
|
|
|
{
|
2010-04-29 12:46:07 +00:00
|
|
|
myOSystem->logMessage("ERROR: Couldn't load the application icon.\n", 0);
|
2005-03-28 00:04:54 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
for(uInt32 i = 0; i < ncols; i++)
|
|
|
|
{
|
|
|
|
unsigned char code;
|
|
|
|
char color[32];
|
|
|
|
uInt32 col;
|
|
|
|
|
|
|
|
sscanf(stella_icon[1 + i], "%c c %s", &code, color);
|
|
|
|
if(!strcmp(color, "None"))
|
|
|
|
col = 0x00000000;
|
|
|
|
else if(!strcmp(color, "black"))
|
|
|
|
col = 0xFF000000;
|
|
|
|
else if (color[0] == '#')
|
|
|
|
{
|
|
|
|
sscanf(color + 1, "%06x", &col);
|
|
|
|
col |= 0xFF000000;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2010-04-29 12:46:07 +00:00
|
|
|
myOSystem->logMessage("ERROR: Couldn't load the application icon.\n", 0);
|
2005-03-28 00:04:54 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
rgba[code] = col;
|
|
|
|
}
|
|
|
|
|
|
|
|
memset(mask, 0, sizeof(mask));
|
|
|
|
for(h = 0; h < 32; h++)
|
|
|
|
{
|
|
|
|
const char* line = stella_icon[1 + ncols + h];
|
|
|
|
for(w = 0; w < 32; w++)
|
|
|
|
{
|
|
|
|
icon[w + 32 * h] = rgba[(int)line[w]];
|
|
|
|
if(rgba[(int)line[w]] & 0xFF000000)
|
|
|
|
mask[h][w >> 3] |= 1 << (7 - (w & 0x07));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
SDL_Surface *surface = SDL_CreateRGBSurfaceFrom(icon, 32, 32, 32,
|
|
|
|
32 * 4, 0xFF0000, 0x00FF00, 0x0000FF, 0xFF000000);
|
|
|
|
SDL_WM_SetIcon(surface, (unsigned char *) mask);
|
|
|
|
SDL_FreeSurface(surface);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2006-01-10 02:09:34 +00:00
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
2011-06-07 13:40:59 +00:00
|
|
|
uInt8 FrameBuffer::getPhosphor(uInt8 c1, uInt8 c2) const
|
2006-01-10 02:09:34 +00:00
|
|
|
{
|
|
|
|
if(c2 > c1)
|
2007-07-31 15:46:21 +00:00
|
|
|
BSPF_swap(c1, c2);
|
2006-01-10 02:09:34 +00:00
|
|
|
|
2006-01-10 20:37:00 +00:00
|
|
|
return ((c1 - c2) * myPhosphorBlend)/100 + c2;
|
2006-01-10 02:09:34 +00:00
|
|
|
}
|
|
|
|
|
Reworked 'fullres' argument to also accept the 'auto' option. In this case,
fullscreen resolutions will be automatically chosen based on the required
size for the window. The image will be centered and keep the same aspect
ratio, however, so operation will still work correctly on widescreen
monitors. 'Auto' will be the new default. Otherwise, if a specific
resolution is requested, Stella will try to accomodate it *only* if it fits
into the resolution; otherwise the smallest resolution that fits will be
used.
Removed 'zoom_ui' and 'zoom_tia'. The UI can now only be at 1x mode.
Aded 'tia_filter' commandline argument, which specifies to the filter
to use when rendering the tia image. For now, these accept 'zoom1x',
'zoom2x'..., up to 'zoom10x', and duplicate previous behaviour. Eventually,
Scalexx and HQxx filters may be added. Still TODO is add this to the UI.
First pass at making the standard build use a minimum of zoom2x for the TIA,
so the UI can be larger and use a better looking font. There's still work
to do in this area, especially for those ports with limited hardware that
support zoom1x only.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1544 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-07-22 14:54:39 +00:00
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
2008-07-25 12:41:41 +00:00
|
|
|
const StringMap& FrameBuffer::supportedTIAFilters(const string& type)
|
Reworked 'fullres' argument to also accept the 'auto' option. In this case,
fullscreen resolutions will be automatically chosen based on the required
size for the window. The image will be centered and keep the same aspect
ratio, however, so operation will still work correctly on widescreen
monitors. 'Auto' will be the new default. Otherwise, if a specific
resolution is requested, Stella will try to accomodate it *only* if it fits
into the resolution; otherwise the smallest resolution that fits will be
used.
Removed 'zoom_ui' and 'zoom_tia'. The UI can now only be at 1x mode.
Aded 'tia_filter' commandline argument, which specifies to the filter
to use when rendering the tia image. For now, these accept 'zoom1x',
'zoom2x'..., up to 'zoom10x', and duplicate previous behaviour. Eventually,
Scalexx and HQxx filters may be added. Still TODO is add this to the UI.
First pass at making the standard build use a minimum of zoom2x for the TIA,
so the UI can be larger and use a better looking font. There's still work
to do in this area, especially for those ports with limited hardware that
support zoom1x only.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1544 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-07-22 14:54:39 +00:00
|
|
|
{
|
2008-07-25 12:41:41 +00:00
|
|
|
uInt32 max_zoom = maxWindowSizeForScreen(320, 210,
|
|
|
|
myOSystem->desktopWidth(), myOSystem->desktopHeight());
|
2008-08-01 12:16:00 +00:00
|
|
|
uInt8 mask = (type == "soft" ? 0x1 : 0x2);
|
|
|
|
|
Reworked 'fullres' argument to also accept the 'auto' option. In this case,
fullscreen resolutions will be automatically chosen based on the required
size for the window. The image will be centered and keep the same aspect
ratio, however, so operation will still work correctly on widescreen
monitors. 'Auto' will be the new default. Otherwise, if a specific
resolution is requested, Stella will try to accomodate it *only* if it fits
into the resolution; otherwise the smallest resolution that fits will be
used.
Removed 'zoom_ui' and 'zoom_tia'. The UI can now only be at 1x mode.
Aded 'tia_filter' commandline argument, which specifies to the filter
to use when rendering the tia image. For now, these accept 'zoom1x',
'zoom2x'..., up to 'zoom10x', and duplicate previous behaviour. Eventually,
Scalexx and HQxx filters may be added. Still TODO is add this to the UI.
First pass at making the standard build use a minimum of zoom2x for the TIA,
so the UI can be larger and use a better looking font. There's still work
to do in this area, especially for those ports with limited hardware that
support zoom1x only.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1544 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-07-22 14:54:39 +00:00
|
|
|
uInt32 firstmode = 1;
|
2009-01-14 20:31:07 +00:00
|
|
|
if(myOSystem->desktopWidth() < 640 || myOSystem->desktopHeight() < 480)
|
|
|
|
firstmode = 0;
|
|
|
|
|
2008-07-25 12:41:41 +00:00
|
|
|
myTIAFilters.clear();
|
Reworked 'fullres' argument to also accept the 'auto' option. In this case,
fullscreen resolutions will be automatically chosen based on the required
size for the window. The image will be centered and keep the same aspect
ratio, however, so operation will still work correctly on widescreen
monitors. 'Auto' will be the new default. Otherwise, if a specific
resolution is requested, Stella will try to accomodate it *only* if it fits
into the resolution; otherwise the smallest resolution that fits will be
used.
Removed 'zoom_ui' and 'zoom_tia'. The UI can now only be at 1x mode.
Aded 'tia_filter' commandline argument, which specifies to the filter
to use when rendering the tia image. For now, these accept 'zoom1x',
'zoom2x'..., up to 'zoom10x', and duplicate previous behaviour. Eventually,
Scalexx and HQxx filters may be added. Still TODO is add this to the UI.
First pass at making the standard build use a minimum of zoom2x for the TIA,
so the UI can be larger and use a better looking font. There's still work
to do in this area, especially for those ports with limited hardware that
support zoom1x only.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1544 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-07-22 14:54:39 +00:00
|
|
|
for(uInt32 i = firstmode; i < GFX_NumModes; ++i)
|
|
|
|
{
|
|
|
|
// For now, just include all filters
|
|
|
|
// This will change once OpenGL-only filters are added
|
2008-08-01 12:16:00 +00:00
|
|
|
if((ourGraphicsModes[i].avail & mask) && ourGraphicsModes[i].zoom <= max_zoom)
|
2008-07-25 12:41:41 +00:00
|
|
|
{
|
|
|
|
myTIAFilters.push_back(ourGraphicsModes[i].description,
|
|
|
|
ourGraphicsModes[i].name);
|
|
|
|
}
|
Reworked 'fullres' argument to also accept the 'auto' option. In this case,
fullscreen resolutions will be automatically chosen based on the required
size for the window. The image will be centered and keep the same aspect
ratio, however, so operation will still work correctly on widescreen
monitors. 'Auto' will be the new default. Otherwise, if a specific
resolution is requested, Stella will try to accomodate it *only* if it fits
into the resolution; otherwise the smallest resolution that fits will be
used.
Removed 'zoom_ui' and 'zoom_tia'. The UI can now only be at 1x mode.
Aded 'tia_filter' commandline argument, which specifies to the filter
to use when rendering the tia image. For now, these accept 'zoom1x',
'zoom2x'..., up to 'zoom10x', and duplicate previous behaviour. Eventually,
Scalexx and HQxx filters may be added. Still TODO is add this to the UI.
First pass at making the standard build use a minimum of zoom2x for the TIA,
so the UI can be larger and use a better looking font. There's still work
to do in this area, especially for those ports with limited hardware that
support zoom1x only.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1544 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-07-22 14:54:39 +00:00
|
|
|
}
|
|
|
|
return myTIAFilters;
|
|
|
|
}
|
|
|
|
|
Added preliminary framework for using advanced scalers. Right now,
functionality is exactly the same as before; Alt-Equals goes to the
next valid scaler, and Alt-Minus goes to the previous one.
What were previously zoomed modes are now treated as scalers, named
'Zoom1x', 'Zoom2x', etc. Various scalexx and hqxx modes will also be made
available.
For now, and probably forever, these advanced scaling modes will only
be available for OpenGL, since if you don't have a card that can handle
GL well, the scalers will probably be too much anyway. Also, the advanced
scaling will not be available in UI mode, only OpenGL emulation mode.
The UI (Launcher, Debugger) and emulation modes are now scaled separately,
specified with the new settings 'scale_ui' and 'scale_tia'. The 'zoom'
setting has been removed.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1133 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2006-10-14 20:08:29 +00:00
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
2008-06-19 12:01:31 +00:00
|
|
|
uInt32 FrameBuffer::maxWindowSizeForScreen(uInt32 baseWidth, uInt32 baseHeight,
|
|
|
|
uInt32 screenWidth, uInt32 screenHeight)
|
Added preliminary framework for using advanced scalers. Right now,
functionality is exactly the same as before; Alt-Equals goes to the
next valid scaler, and Alt-Minus goes to the previous one.
What were previously zoomed modes are now treated as scalers, named
'Zoom1x', 'Zoom2x', etc. Various scalexx and hqxx modes will also be made
available.
For now, and probably forever, these advanced scaling modes will only
be available for OpenGL, since if you don't have a card that can handle
GL well, the scalers will probably be too much anyway. Also, the advanced
scaling will not be available in UI mode, only OpenGL emulation mode.
The UI (Launcher, Debugger) and emulation modes are now scaled separately,
specified with the new settings 'scale_ui' and 'scale_tia'. The 'zoom'
setting has been removed.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1133 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2006-10-14 20:08:29 +00:00
|
|
|
{
|
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).
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1323 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2007-06-20 16:33:23 +00:00
|
|
|
uInt32 multiplier = 1;
|
|
|
|
for(;;)
|
Added preliminary framework for using advanced scalers. Right now,
functionality is exactly the same as before; Alt-Equals goes to the
next valid scaler, and Alt-Minus goes to the previous one.
What were previously zoomed modes are now treated as scalers, named
'Zoom1x', 'Zoom2x', etc. Various scalexx and hqxx modes will also be made
available.
For now, and probably forever, these advanced scaling modes will only
be available for OpenGL, since if you don't have a card that can handle
GL well, the scalers will probably be too much anyway. Also, the advanced
scaling will not be available in UI mode, only OpenGL emulation mode.
The UI (Launcher, Debugger) and emulation modes are now scaled separately,
specified with the new settings 'scale_ui' and 'scale_tia'. The 'zoom'
setting has been removed.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1133 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2006-10-14 20:08:29 +00:00
|
|
|
{
|
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).
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1323 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2007-06-20 16:33:23 +00:00
|
|
|
// Figure out the zoomed size of the window
|
2008-06-19 12:01:31 +00:00
|
|
|
uInt32 width = baseWidth * multiplier;
|
|
|
|
uInt32 height = baseHeight * multiplier;
|
Added preliminary framework for using advanced scalers. Right now,
functionality is exactly the same as before; Alt-Equals goes to the
next valid scaler, and Alt-Minus goes to the previous one.
What were previously zoomed modes are now treated as scalers, named
'Zoom1x', 'Zoom2x', etc. Various scalexx and hqxx modes will also be made
available.
For now, and probably forever, these advanced scaling modes will only
be available for OpenGL, since if you don't have a card that can handle
GL well, the scalers will probably be too much anyway. Also, the advanced
scaling will not be available in UI mode, only OpenGL emulation mode.
The UI (Launcher, Debugger) and emulation modes are now scaled separately,
specified with the new settings 'scale_ui' and 'scale_tia'. The 'zoom'
setting has been removed.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1133 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2006-10-14 20:08:29 +00:00
|
|
|
|
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).
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1323 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2007-06-20 16:33:23 +00:00
|
|
|
if((width > screenWidth) || (height > screenHeight))
|
|
|
|
break;
|
Added preliminary framework for using advanced scalers. Right now,
functionality is exactly the same as before; Alt-Equals goes to the
next valid scaler, and Alt-Minus goes to the previous one.
What were previously zoomed modes are now treated as scalers, named
'Zoom1x', 'Zoom2x', etc. Various scalexx and hqxx modes will also be made
available.
For now, and probably forever, these advanced scaling modes will only
be available for OpenGL, since if you don't have a card that can handle
GL well, the scalers will probably be too much anyway. Also, the advanced
scaling will not be available in UI mode, only OpenGL emulation mode.
The UI (Launcher, Debugger) and emulation modes are now scaled separately,
specified with the new settings 'scale_ui' and 'scale_tia'. The 'zoom'
setting has been removed.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1133 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2006-10-14 20:08:29 +00:00
|
|
|
|
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).
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1323 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2007-06-20 16:33:23 +00:00
|
|
|
++multiplier;
|
|
|
|
}
|
|
|
|
return multiplier > 1 ? multiplier - 1 : 1;
|
Added preliminary framework for using advanced scalers. Right now,
functionality is exactly the same as before; Alt-Equals goes to the
next valid scaler, and Alt-Minus goes to the previous one.
What were previously zoomed modes are now treated as scalers, named
'Zoom1x', 'Zoom2x', etc. Various scalexx and hqxx modes will also be made
available.
For now, and probably forever, these advanced scaling modes will only
be available for OpenGL, since if you don't have a card that can handle
GL well, the scalers will probably be too much anyway. Also, the advanced
scaling will not be available in UI mode, only OpenGL emulation mode.
The UI (Launcher, Debugger) and emulation modes are now scaled separately,
specified with the new settings 'scale_ui' and 'scale_tia'. The 'zoom'
setting has been removed.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1133 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2006-10-14 20:08:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
2008-06-19 12:01:31 +00:00
|
|
|
void FrameBuffer::setAvailableVidModes(uInt32 baseWidth, uInt32 baseHeight)
|
Added preliminary framework for using advanced scalers. Right now,
functionality is exactly the same as before; Alt-Equals goes to the
next valid scaler, and Alt-Minus goes to the previous one.
What were previously zoomed modes are now treated as scalers, named
'Zoom1x', 'Zoom2x', etc. Various scalexx and hqxx modes will also be made
available.
For now, and probably forever, these advanced scaling modes will only
be available for OpenGL, since if you don't have a card that can handle
GL well, the scalers will probably be too much anyway. Also, the advanced
scaling will not be available in UI mode, only OpenGL emulation mode.
The UI (Launcher, Debugger) and emulation modes are now scaled separately,
specified with the new settings 'scale_ui' and 'scale_tia'. The 'zoom'
setting has been removed.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1133 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2006-10-14 20:08:29 +00:00
|
|
|
{
|
2008-06-19 12:01:31 +00:00
|
|
|
// Modelists are different depending on what state we're in
|
|
|
|
EventHandler::State state = myOSystem->eventHandler().state();
|
|
|
|
bool inUIMode = (state == EventHandler::S_DEBUGGER ||
|
|
|
|
state == EventHandler::S_LAUNCHER);
|
|
|
|
|
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).
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1323 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2007-06-20 16:33:23 +00:00
|
|
|
myWindowedModeList.clear();
|
Reworked 'fullres' argument to also accept the 'auto' option. In this case,
fullscreen resolutions will be automatically chosen based on the required
size for the window. The image will be centered and keep the same aspect
ratio, however, so operation will still work correctly on widescreen
monitors. 'Auto' will be the new default. Otherwise, if a specific
resolution is requested, Stella will try to accomodate it *only* if it fits
into the resolution; otherwise the smallest resolution that fits will be
used.
Removed 'zoom_ui' and 'zoom_tia'. The UI can now only be at 1x mode.
Aded 'tia_filter' commandline argument, which specifies to the filter
to use when rendering the tia image. For now, these accept 'zoom1x',
'zoom2x'..., up to 'zoom10x', and duplicate previous behaviour. Eventually,
Scalexx and HQxx filters may be added. Still TODO is add this to the UI.
First pass at making the standard build use a minimum of zoom2x for the TIA,
so the UI can be larger and use a better looking font. There's still work
to do in this area, especially for those ports with limited hardware that
support zoom1x only.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1544 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-07-22 14:54:39 +00:00
|
|
|
myFullscreenModeList.clear();
|
2008-06-19 12:01:31 +00:00
|
|
|
|
|
|
|
// In UI/windowed mode, there's only one valid video mode we can use
|
2009-01-20 21:01:28 +00:00
|
|
|
// We don't use maxWindowSizeForScreen here, since UI mode has to open its
|
|
|
|
// window at the requested size
|
2008-06-19 12:01:31 +00:00
|
|
|
if(inUIMode)
|
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).
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1323 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2007-06-20 16:33:23 +00:00
|
|
|
{
|
|
|
|
VideoMode m;
|
|
|
|
m.image_x = m.image_y = 0;
|
2008-06-19 12:01:31 +00:00
|
|
|
m.image_w = m.screen_w = baseWidth;
|
|
|
|
m.image_h = m.screen_h = baseHeight;
|
2008-07-04 14:27:17 +00:00
|
|
|
m.gfxmode = ourGraphicsModes[0]; // this should be zoom1x
|
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).
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1323 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2007-06-20 16:33:23 +00:00
|
|
|
|
Reworked 'fullres' argument to also accept the 'auto' option. In this case,
fullscreen resolutions will be automatically chosen based on the required
size for the window. The image will be centered and keep the same aspect
ratio, however, so operation will still work correctly on widescreen
monitors. 'Auto' will be the new default. Otherwise, if a specific
resolution is requested, Stella will try to accomodate it *only* if it fits
into the resolution; otherwise the smallest resolution that fits will be
used.
Removed 'zoom_ui' and 'zoom_tia'. The UI can now only be at 1x mode.
Aded 'tia_filter' commandline argument, which specifies to the filter
to use when rendering the tia image. For now, these accept 'zoom1x',
'zoom2x'..., up to 'zoom10x', and duplicate previous behaviour. Eventually,
Scalexx and HQxx filters may be added. Still TODO is add this to the UI.
First pass at making the standard build use a minimum of zoom2x for the TIA,
so the UI can be larger and use a better looking font. There's still work
to do in this area, especially for those ports with limited hardware that
support zoom1x only.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1544 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-07-22 14:54:39 +00:00
|
|
|
addVidMode(m);
|
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).
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1323 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2007-06-20 16:33:23 +00:00
|
|
|
}
|
2008-06-19 12:01:31 +00:00
|
|
|
else
|
|
|
|
{
|
2008-07-04 14:27:17 +00:00
|
|
|
// Scan list of filters, adding only those which are appropriate
|
2008-06-19 12:01:31 +00:00
|
|
|
// for the given dimensions
|
2008-07-04 14:27:17 +00:00
|
|
|
uInt32 max_zoom = maxWindowSizeForScreen(baseWidth, baseHeight,
|
|
|
|
myOSystem->desktopWidth(), myOSystem->desktopHeight());
|
2009-01-14 20:31:07 +00:00
|
|
|
|
|
|
|
// Figure our the smallest zoom level we can use
|
Reworked 'fullres' argument to also accept the 'auto' option. In this case,
fullscreen resolutions will be automatically chosen based on the required
size for the window. The image will be centered and keep the same aspect
ratio, however, so operation will still work correctly on widescreen
monitors. 'Auto' will be the new default. Otherwise, if a specific
resolution is requested, Stella will try to accomodate it *only* if it fits
into the resolution; otherwise the smallest resolution that fits will be
used.
Removed 'zoom_ui' and 'zoom_tia'. The UI can now only be at 1x mode.
Aded 'tia_filter' commandline argument, which specifies to the filter
to use when rendering the tia image. For now, these accept 'zoom1x',
'zoom2x'..., up to 'zoom10x', and duplicate previous behaviour. Eventually,
Scalexx and HQxx filters may be added. Still TODO is add this to the UI.
First pass at making the standard build use a minimum of zoom2x for the TIA,
so the UI can be larger and use a better looking font. There's still work
to do in this area, especially for those ports with limited hardware that
support zoom1x only.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1544 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-07-22 14:54:39 +00:00
|
|
|
uInt32 firstmode = 1;
|
2009-01-14 20:31:07 +00:00
|
|
|
if(myOSystem->desktopWidth() < 640 || myOSystem->desktopHeight() < 480)
|
|
|
|
firstmode = 0;
|
|
|
|
|
Reworked 'fullres' argument to also accept the 'auto' option. In this case,
fullscreen resolutions will be automatically chosen based on the required
size for the window. The image will be centered and keep the same aspect
ratio, however, so operation will still work correctly on widescreen
monitors. 'Auto' will be the new default. Otherwise, if a specific
resolution is requested, Stella will try to accomodate it *only* if it fits
into the resolution; otherwise the smallest resolution that fits will be
used.
Removed 'zoom_ui' and 'zoom_tia'. The UI can now only be at 1x mode.
Aded 'tia_filter' commandline argument, which specifies to the filter
to use when rendering the tia image. For now, these accept 'zoom1x',
'zoom2x'..., up to 'zoom10x', and duplicate previous behaviour. Eventually,
Scalexx and HQxx filters may be added. Still TODO is add this to the UI.
First pass at making the standard build use a minimum of zoom2x for the TIA,
so the UI can be larger and use a better looking font. There's still work
to do in this area, especially for those ports with limited hardware that
support zoom1x only.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1544 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-07-22 14:54:39 +00:00
|
|
|
for(uInt32 i = firstmode; i < GFX_NumModes; ++i)
|
2008-06-19 12:01:31 +00:00
|
|
|
{
|
2008-07-04 14:27:17 +00:00
|
|
|
uInt32 zoom = ourGraphicsModes[i].zoom;
|
|
|
|
if(zoom <= max_zoom)
|
|
|
|
{
|
|
|
|
VideoMode m;
|
|
|
|
m.image_x = m.image_y = 0;
|
|
|
|
m.image_w = m.screen_w = baseWidth * zoom;
|
|
|
|
m.image_h = m.screen_h = baseHeight * zoom;
|
|
|
|
m.gfxmode = ourGraphicsModes[i];
|
|
|
|
|
Reworked 'fullres' argument to also accept the 'auto' option. In this case,
fullscreen resolutions will be automatically chosen based on the required
size for the window. The image will be centered and keep the same aspect
ratio, however, so operation will still work correctly on widescreen
monitors. 'Auto' will be the new default. Otherwise, if a specific
resolution is requested, Stella will try to accomodate it *only* if it fits
into the resolution; otherwise the smallest resolution that fits will be
used.
Removed 'zoom_ui' and 'zoom_tia'. The UI can now only be at 1x mode.
Aded 'tia_filter' commandline argument, which specifies to the filter
to use when rendering the tia image. For now, these accept 'zoom1x',
'zoom2x'..., up to 'zoom10x', and duplicate previous behaviour. Eventually,
Scalexx and HQxx filters may be added. Still TODO is add this to the UI.
First pass at making the standard build use a minimum of zoom2x for the TIA,
so the UI can be larger and use a better looking font. There's still work
to do in this area, especially for those ports with limited hardware that
support zoom1x only.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1544 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-07-22 14:54:39 +00:00
|
|
|
addVidMode(m);
|
2008-07-04 14:27:17 +00:00
|
|
|
}
|
2008-06-19 12:01:31 +00:00
|
|
|
}
|
|
|
|
}
|
Reworked 'fullres' argument to also accept the 'auto' option. In this case,
fullscreen resolutions will be automatically chosen based on the required
size for the window. The image will be centered and keep the same aspect
ratio, however, so operation will still work correctly on widescreen
monitors. 'Auto' will be the new default. Otherwise, if a specific
resolution is requested, Stella will try to accomodate it *only* if it fits
into the resolution; otherwise the smallest resolution that fits will be
used.
Removed 'zoom_ui' and 'zoom_tia'. The UI can now only be at 1x mode.
Aded 'tia_filter' commandline argument, which specifies to the filter
to use when rendering the tia image. For now, these accept 'zoom1x',
'zoom2x'..., up to 'zoom10x', and duplicate previous behaviour. Eventually,
Scalexx and HQxx filters may be added. Still TODO is add this to the UI.
First pass at making the standard build use a minimum of zoom2x for the TIA,
so the UI can be larger and use a better looking font. There's still work
to do in this area, especially for those ports with limited hardware that
support zoom1x only.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1544 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-07-22 14:54:39 +00:00
|
|
|
}
|
Added preliminary framework for using advanced scalers. Right now,
functionality is exactly the same as before; Alt-Equals goes to the
next valid scaler, and Alt-Minus goes to the previous one.
What were previously zoomed modes are now treated as scalers, named
'Zoom1x', 'Zoom2x', etc. Various scalexx and hqxx modes will also be made
available.
For now, and probably forever, these advanced scaling modes will only
be available for OpenGL, since if you don't have a card that can handle
GL well, the scalers will probably be too much anyway. Also, the advanced
scaling will not be available in UI mode, only OpenGL emulation mode.
The UI (Launcher, Debugger) and emulation modes are now scaled separately,
specified with the new settings 'scale_ui' and 'scale_tia'. The 'zoom'
setting has been removed.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1133 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2006-10-14 20:08:29 +00:00
|
|
|
|
Reworked 'fullres' argument to also accept the 'auto' option. In this case,
fullscreen resolutions will be automatically chosen based on the required
size for the window. The image will be centered and keep the same aspect
ratio, however, so operation will still work correctly on widescreen
monitors. 'Auto' will be the new default. Otherwise, if a specific
resolution is requested, Stella will try to accomodate it *only* if it fits
into the resolution; otherwise the smallest resolution that fits will be
used.
Removed 'zoom_ui' and 'zoom_tia'. The UI can now only be at 1x mode.
Aded 'tia_filter' commandline argument, which specifies to the filter
to use when rendering the tia image. For now, these accept 'zoom1x',
'zoom2x'..., up to 'zoom10x', and duplicate previous behaviour. Eventually,
Scalexx and HQxx filters may be added. Still TODO is add this to the UI.
First pass at making the standard build use a minimum of zoom2x for the TIA,
so the UI can be larger and use a better looking font. There's still work
to do in this area, especially for those ports with limited hardware that
support zoom1x only.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1544 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-07-22 14:54:39 +00:00
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
|
|
void FrameBuffer::addVidMode(VideoMode& mode)
|
|
|
|
{
|
2010-02-10 22:55:08 +00:00
|
|
|
// The are minimum size requirements on a screen, no matter is in fullscreen
|
|
|
|
// or windowed mode
|
|
|
|
// Various part of the UI system depend on having at least 320x240 pixels
|
|
|
|
// available, so we must enforce it here
|
|
|
|
|
Reworked 'fullres' argument to also accept the 'auto' option. In this case,
fullscreen resolutions will be automatically chosen based on the required
size for the window. The image will be centered and keep the same aspect
ratio, however, so operation will still work correctly on widescreen
monitors. 'Auto' will be the new default. Otherwise, if a specific
resolution is requested, Stella will try to accomodate it *only* if it fits
into the resolution; otherwise the smallest resolution that fits will be
used.
Removed 'zoom_ui' and 'zoom_tia'. The UI can now only be at 1x mode.
Aded 'tia_filter' commandline argument, which specifies to the filter
to use when rendering the tia image. For now, these accept 'zoom1x',
'zoom2x'..., up to 'zoom10x', and duplicate previous behaviour. Eventually,
Scalexx and HQxx filters may be added. Still TODO is add this to the UI.
First pass at making the standard build use a minimum of zoom2x for the TIA,
so the UI can be larger and use a better looking font. There's still work
to do in this area, especially for those ports with limited hardware that
support zoom1x only.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1544 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-07-22 14:54:39 +00:00
|
|
|
// Windowed modes can be sized exactly as required, since there's normally
|
2010-02-10 22:55:08 +00:00
|
|
|
// no restriction on window size (between the minimum and maximum size)
|
|
|
|
mode.screen_w = BSPF_max(mode.screen_w, 320u);
|
|
|
|
mode.screen_h = BSPF_max(mode.screen_h, 240u);
|
|
|
|
mode.image_x = (mode.screen_w - mode.image_w) >> 1;
|
|
|
|
mode.image_y = (mode.screen_h - mode.image_h) >> 1;
|
Reworked 'fullres' argument to also accept the 'auto' option. In this case,
fullscreen resolutions will be automatically chosen based on the required
size for the window. The image will be centered and keep the same aspect
ratio, however, so operation will still work correctly on widescreen
monitors. 'Auto' will be the new default. Otherwise, if a specific
resolution is requested, Stella will try to accomodate it *only* if it fits
into the resolution; otherwise the smallest resolution that fits will be
used.
Removed 'zoom_ui' and 'zoom_tia'. The UI can now only be at 1x mode.
Aded 'tia_filter' commandline argument, which specifies to the filter
to use when rendering the tia image. For now, these accept 'zoom1x',
'zoom2x'..., up to 'zoom10x', and duplicate previous behaviour. Eventually,
Scalexx and HQxx filters may be added. Still TODO is add this to the UI.
First pass at making the standard build use a minimum of zoom2x for the TIA,
so the UI can be larger and use a better looking font. There's still work
to do in this area, especially for those ports with limited hardware that
support zoom1x only.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1544 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-07-22 14:54:39 +00:00
|
|
|
myWindowedModeList.add(mode);
|
|
|
|
|
|
|
|
// There are often stricter requirements on fullscreen modes, and they're
|
|
|
|
// normally different depending on the OSystem in use
|
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).
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1323 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2007-06-20 16:33:23 +00:00
|
|
|
// As well, we usually can't get fullscreen modes in the exact size
|
|
|
|
// we want, so we need to calculate image offsets
|
Reworked 'fullres' argument to also accept the 'auto' option. In this case,
fullscreen resolutions will be automatically chosen based on the required
size for the window. The image will be centered and keep the same aspect
ratio, however, so operation will still work correctly on widescreen
monitors. 'Auto' will be the new default. Otherwise, if a specific
resolution is requested, Stella will try to accomodate it *only* if it fits
into the resolution; otherwise the smallest resolution that fits will be
used.
Removed 'zoom_ui' and 'zoom_tia'. The UI can now only be at 1x mode.
Aded 'tia_filter' commandline argument, which specifies to the filter
to use when rendering the tia image. For now, these accept 'zoom1x',
'zoom2x'..., up to 'zoom10x', and duplicate previous behaviour. Eventually,
Scalexx and HQxx filters may be added. Still TODO is add this to the UI.
First pass at making the standard build use a minimum of zoom2x for the TIA,
so the UI can be larger and use a better looking font. There's still work
to do in this area, especially for those ports with limited hardware that
support zoom1x only.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1544 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-07-22 14:54:39 +00:00
|
|
|
const ResolutionList& res = myOSystem->supportedResolutions();
|
|
|
|
for(uInt32 i = 0; i < res.size(); ++i)
|
2008-06-19 12:01:31 +00:00
|
|
|
{
|
Reworked 'fullres' argument to also accept the 'auto' option. In this case,
fullscreen resolutions will be automatically chosen based on the required
size for the window. The image will be centered and keep the same aspect
ratio, however, so operation will still work correctly on widescreen
monitors. 'Auto' will be the new default. Otherwise, if a specific
resolution is requested, Stella will try to accomodate it *only* if it fits
into the resolution; otherwise the smallest resolution that fits will be
used.
Removed 'zoom_ui' and 'zoom_tia'. The UI can now only be at 1x mode.
Aded 'tia_filter' commandline argument, which specifies to the filter
to use when rendering the tia image. For now, these accept 'zoom1x',
'zoom2x'..., up to 'zoom10x', and duplicate previous behaviour. Eventually,
Scalexx and HQxx filters may be added. Still TODO is add this to the UI.
First pass at making the standard build use a minimum of zoom2x for the TIA,
so the UI can be larger and use a better looking font. There's still work
to do in this area, especially for those ports with limited hardware that
support zoom1x only.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1544 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-07-22 14:54:39 +00:00
|
|
|
if(mode.screen_w <= res[i].width && mode.screen_h <= res[i].height)
|
2008-06-19 12:01:31 +00:00
|
|
|
{
|
|
|
|
// Auto-calculate 'smart' centering; platform-specific framebuffers are
|
|
|
|
// free to ignore or augment it
|
2010-02-10 22:55:08 +00:00
|
|
|
mode.screen_w = BSPF_max(res[i].width, 320u);
|
|
|
|
mode.screen_h = BSPF_max(res[i].height, 240u);
|
Reworked 'fullres' argument to also accept the 'auto' option. In this case,
fullscreen resolutions will be automatically chosen based on the required
size for the window. The image will be centered and keep the same aspect
ratio, however, so operation will still work correctly on widescreen
monitors. 'Auto' will be the new default. Otherwise, if a specific
resolution is requested, Stella will try to accomodate it *only* if it fits
into the resolution; otherwise the smallest resolution that fits will be
used.
Removed 'zoom_ui' and 'zoom_tia'. The UI can now only be at 1x mode.
Aded 'tia_filter' commandline argument, which specifies to the filter
to use when rendering the tia image. For now, these accept 'zoom1x',
'zoom2x'..., up to 'zoom10x', and duplicate previous behaviour. Eventually,
Scalexx and HQxx filters may be added. Still TODO is add this to the UI.
First pass at making the standard build use a minimum of zoom2x for the TIA,
so the UI can be larger and use a better looking font. There's still work
to do in this area, especially for those ports with limited hardware that
support zoom1x only.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1544 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-07-22 14:54:39 +00:00
|
|
|
mode.image_x = (mode.screen_w - mode.image_w) >> 1;
|
|
|
|
mode.image_y = (mode.screen_h - mode.image_h) >> 1;
|
|
|
|
break;
|
2008-06-19 12:01:31 +00:00
|
|
|
}
|
2006-11-18 13:29:12 +00:00
|
|
|
}
|
Reworked 'fullres' argument to also accept the 'auto' option. In this case,
fullscreen resolutions will be automatically chosen based on the required
size for the window. The image will be centered and keep the same aspect
ratio, however, so operation will still work correctly on widescreen
monitors. 'Auto' will be the new default. Otherwise, if a specific
resolution is requested, Stella will try to accomodate it *only* if it fits
into the resolution; otherwise the smallest resolution that fits will be
used.
Removed 'zoom_ui' and 'zoom_tia'. The UI can now only be at 1x mode.
Aded 'tia_filter' commandline argument, which specifies to the filter
to use when rendering the tia image. For now, these accept 'zoom1x',
'zoom2x'..., up to 'zoom10x', and duplicate previous behaviour. Eventually,
Scalexx and HQxx filters may be added. Still TODO is add this to the UI.
First pass at making the standard build use a minimum of zoom2x for the TIA,
so the UI can be larger and use a better looking font. There's still work
to do in this area, especially for those ports with limited hardware that
support zoom1x only.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1544 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-07-22 14:54:39 +00:00
|
|
|
myFullscreenModeList.add(mode);
|
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).
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1323 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2007-06-20 16:33:23 +00:00
|
|
|
}
|
Added preliminary framework for using advanced scalers. Right now,
functionality is exactly the same as before; Alt-Equals goes to the
next valid scaler, and Alt-Minus goes to the previous one.
What were previously zoomed modes are now treated as scalers, named
'Zoom1x', 'Zoom2x', etc. Various scalexx and hqxx modes will also be made
available.
For now, and probably forever, these advanced scaling modes will only
be available for OpenGL, since if you don't have a card that can handle
GL well, the scalers will probably be too much anyway. Also, the advanced
scaling will not be available in UI mode, only OpenGL emulation mode.
The UI (Launcher, Debugger) and emulation modes are now scaled separately,
specified with the new settings 'scale_ui' and 'scale_tia'. The 'zoom'
setting has been removed.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1133 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2006-10-14 20:08:29 +00:00
|
|
|
|
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).
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1323 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2007-06-20 16:33:23 +00:00
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
2008-07-04 14:27:17 +00:00
|
|
|
FrameBuffer::VideoMode FrameBuffer::getSavedVidMode()
|
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).
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1323 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2007-06-20 16:33:23 +00:00
|
|
|
{
|
2007-07-11 15:08:13 +00:00
|
|
|
EventHandler::State state = myOSystem->eventHandler().state();
|
|
|
|
|
2009-06-05 14:05:23 +00:00
|
|
|
if(fullScreen())
|
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).
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1323 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2007-06-20 16:33:23 +00:00
|
|
|
myCurrentModeList = &myFullscreenModeList;
|
2008-06-19 12:01:31 +00:00
|
|
|
else
|
|
|
|
myCurrentModeList = &myWindowedModeList;
|
|
|
|
|
|
|
|
// Now select the best resolution depending on the state
|
|
|
|
// UI modes (launcher and debugger) have only one supported resolution
|
|
|
|
// so the 'current' one is the only valid one
|
|
|
|
if(state == EventHandler::S_DEBUGGER || state == EventHandler::S_LAUNCHER)
|
|
|
|
{
|
2008-07-04 14:27:17 +00:00
|
|
|
myCurrentModeList->setByGfxMode(GFX_Zoom1x);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
const string& name = myOSystem->settings().getString("tia_filter");
|
|
|
|
myCurrentModeList->setByGfxMode(name);
|
|
|
|
}
|
|
|
|
|
2009-06-05 14:05:23 +00:00
|
|
|
return myCurrentModeList->current(myOSystem->settings(), fullScreen());
|
2008-07-04 14:27:17 +00:00
|
|
|
}
|
|
|
|
|
2010-09-21 19:39:30 +00:00
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
|
|
void FrameBuffer::centerAppWindow(const VideoMode& mode)
|
|
|
|
{
|
|
|
|
// Attempt to center the application window in non-fullscreen mode
|
|
|
|
if(!fullScreen() && myOSystem->settings().getBool("center"))
|
|
|
|
{
|
|
|
|
int x = mode.screen_w >= myOSystem->desktopWidth() ? 0 :
|
|
|
|
((myOSystem->desktopWidth() - mode.screen_w) >> 1);
|
|
|
|
int y = mode.screen_h >= myOSystem->desktopHeight() ? 0 :
|
|
|
|
((myOSystem->desktopHeight() - mode.screen_h) >> 1);
|
|
|
|
myOSystem->setAppWindowPos(x, y, mode.screen_w, mode.screen_h);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-07-04 14:27:17 +00:00
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
|
|
FrameBuffer::VideoModeList::VideoModeList()
|
2009-06-05 14:05:23 +00:00
|
|
|
: myIdx(-1)
|
2008-07-04 14:27:17 +00:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
|
|
FrameBuffer::VideoModeList::~VideoModeList()
|
|
|
|
{
|
|
|
|
clear();
|
|
|
|
}
|
|
|
|
|
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
|
|
void FrameBuffer::VideoModeList::add(VideoMode mode)
|
|
|
|
{
|
|
|
|
myModeList.push_back(mode);
|
|
|
|
}
|
|
|
|
|
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
|
|
void FrameBuffer::VideoModeList::clear()
|
|
|
|
{
|
|
|
|
myModeList.clear();
|
|
|
|
}
|
|
|
|
|
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
|
|
bool FrameBuffer::VideoModeList::isEmpty() const
|
|
|
|
{
|
|
|
|
return myModeList.isEmpty();
|
|
|
|
}
|
|
|
|
|
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
|
|
uInt32 FrameBuffer::VideoModeList::size() const
|
|
|
|
{
|
|
|
|
return myModeList.size();
|
|
|
|
}
|
|
|
|
|
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
Reworked 'fullres' argument to also accept the 'auto' option. In this case,
fullscreen resolutions will be automatically chosen based on the required
size for the window. The image will be centered and keep the same aspect
ratio, however, so operation will still work correctly on widescreen
monitors. 'Auto' will be the new default. Otherwise, if a specific
resolution is requested, Stella will try to accomodate it *only* if it fits
into the resolution; otherwise the smallest resolution that fits will be
used.
Removed 'zoom_ui' and 'zoom_tia'. The UI can now only be at 1x mode.
Aded 'tia_filter' commandline argument, which specifies to the filter
to use when rendering the tia image. For now, these accept 'zoom1x',
'zoom2x'..., up to 'zoom10x', and duplicate previous behaviour. Eventually,
Scalexx and HQxx filters may be added. Still TODO is add this to the UI.
First pass at making the standard build use a minimum of zoom2x for the TIA,
so the UI can be larger and use a better looking font. There's still work
to do in this area, especially for those ports with limited hardware that
support zoom1x only.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1544 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-07-22 14:54:39 +00:00
|
|
|
void FrameBuffer::VideoModeList::previous()
|
2008-07-04 14:27:17 +00:00
|
|
|
{
|
|
|
|
--myIdx;
|
|
|
|
if(myIdx < 0) myIdx = myModeList.size() - 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
Reworked 'fullres' argument to also accept the 'auto' option. In this case,
fullscreen resolutions will be automatically chosen based on the required
size for the window. The image will be centered and keep the same aspect
ratio, however, so operation will still work correctly on widescreen
monitors. 'Auto' will be the new default. Otherwise, if a specific
resolution is requested, Stella will try to accomodate it *only* if it fits
into the resolution; otherwise the smallest resolution that fits will be
used.
Removed 'zoom_ui' and 'zoom_tia'. The UI can now only be at 1x mode.
Aded 'tia_filter' commandline argument, which specifies to the filter
to use when rendering the tia image. For now, these accept 'zoom1x',
'zoom2x'..., up to 'zoom10x', and duplicate previous behaviour. Eventually,
Scalexx and HQxx filters may be added. Still TODO is add this to the UI.
First pass at making the standard build use a minimum of zoom2x for the TIA,
so the UI can be larger and use a better looking font. There's still work
to do in this area, especially for those ports with limited hardware that
support zoom1x only.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1544 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-07-22 14:54:39 +00:00
|
|
|
const FrameBuffer::VideoMode FrameBuffer::
|
2009-06-05 14:05:23 +00:00
|
|
|
VideoModeList::current(const Settings& settings, bool isFullscreen) const
|
2008-07-04 14:27:17 +00:00
|
|
|
{
|
Reworked 'fullres' argument to also accept the 'auto' option. In this case,
fullscreen resolutions will be automatically chosen based on the required
size for the window. The image will be centered and keep the same aspect
ratio, however, so operation will still work correctly on widescreen
monitors. 'Auto' will be the new default. Otherwise, if a specific
resolution is requested, Stella will try to accomodate it *only* if it fits
into the resolution; otherwise the smallest resolution that fits will be
used.
Removed 'zoom_ui' and 'zoom_tia'. The UI can now only be at 1x mode.
Aded 'tia_filter' commandline argument, which specifies to the filter
to use when rendering the tia image. For now, these accept 'zoom1x',
'zoom2x'..., up to 'zoom10x', and duplicate previous behaviour. Eventually,
Scalexx and HQxx filters may be added. Still TODO is add this to the UI.
First pass at making the standard build use a minimum of zoom2x for the TIA,
so the UI can be larger and use a better looking font. There's still work
to do in this area, especially for those ports with limited hardware that
support zoom1x only.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1544 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-07-22 14:54:39 +00:00
|
|
|
// Fullscreen modes are related to the 'fullres' setting
|
|
|
|
// If it's 'auto', we just use the mode as already previously defined
|
|
|
|
// If it's not 'auto', attempt to fit the mode into the resolution
|
|
|
|
// specified by 'fullres' (if possible)
|
2010-06-12 14:13:03 +00:00
|
|
|
if(isFullscreen && !BSPF_equalsIgnoreCase(settings.getString("fullres"), "auto"))
|
Reworked 'fullres' argument to also accept the 'auto' option. In this case,
fullscreen resolutions will be automatically chosen based on the required
size for the window. The image will be centered and keep the same aspect
ratio, however, so operation will still work correctly on widescreen
monitors. 'Auto' will be the new default. Otherwise, if a specific
resolution is requested, Stella will try to accomodate it *only* if it fits
into the resolution; otherwise the smallest resolution that fits will be
used.
Removed 'zoom_ui' and 'zoom_tia'. The UI can now only be at 1x mode.
Aded 'tia_filter' commandline argument, which specifies to the filter
to use when rendering the tia image. For now, these accept 'zoom1x',
'zoom2x'..., up to 'zoom10x', and duplicate previous behaviour. Eventually,
Scalexx and HQxx filters may be added. Still TODO is add this to the UI.
First pass at making the standard build use a minimum of zoom2x for the TIA,
so the UI can be larger and use a better looking font. There's still work
to do in this area, especially for those ports with limited hardware that
support zoom1x only.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1544 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-07-22 14:54:39 +00:00
|
|
|
{
|
|
|
|
// Only use 'fullres' if it's *bigger* than the requested mode
|
|
|
|
int w, h;
|
|
|
|
settings.getSize("fullres", w, h);
|
|
|
|
|
2008-12-27 15:56:36 +00:00
|
|
|
if(w != -1 && h != -1 && (uInt32)w >= myModeList[myIdx].screen_w &&
|
|
|
|
(uInt32)h >= myModeList[myIdx].screen_h)
|
Reworked 'fullres' argument to also accept the 'auto' option. In this case,
fullscreen resolutions will be automatically chosen based on the required
size for the window. The image will be centered and keep the same aspect
ratio, however, so operation will still work correctly on widescreen
monitors. 'Auto' will be the new default. Otherwise, if a specific
resolution is requested, Stella will try to accomodate it *only* if it fits
into the resolution; otherwise the smallest resolution that fits will be
used.
Removed 'zoom_ui' and 'zoom_tia'. The UI can now only be at 1x mode.
Aded 'tia_filter' commandline argument, which specifies to the filter
to use when rendering the tia image. For now, these accept 'zoom1x',
'zoom2x'..., up to 'zoom10x', and duplicate previous behaviour. Eventually,
Scalexx and HQxx filters may be added. Still TODO is add this to the UI.
First pass at making the standard build use a minimum of zoom2x for the TIA,
so the UI can be larger and use a better looking font. There's still work
to do in this area, especially for those ports with limited hardware that
support zoom1x only.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1544 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-07-22 14:54:39 +00:00
|
|
|
{
|
|
|
|
VideoMode mode = myModeList[myIdx];
|
|
|
|
mode.screen_w = w;
|
|
|
|
mode.screen_h = h;
|
|
|
|
mode.image_x = (mode.screen_w - mode.image_w) >> 1;
|
|
|
|
mode.image_y = (mode.screen_h - mode.image_h) >> 1;
|
|
|
|
|
|
|
|
return mode;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Otherwise, we just use the mode has it was defined in ::addVidMode()
|
2008-07-04 14:27:17 +00:00
|
|
|
return myModeList[myIdx];
|
|
|
|
}
|
|
|
|
|
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
Reworked 'fullres' argument to also accept the 'auto' option. In this case,
fullscreen resolutions will be automatically chosen based on the required
size for the window. The image will be centered and keep the same aspect
ratio, however, so operation will still work correctly on widescreen
monitors. 'Auto' will be the new default. Otherwise, if a specific
resolution is requested, Stella will try to accomodate it *only* if it fits
into the resolution; otherwise the smallest resolution that fits will be
used.
Removed 'zoom_ui' and 'zoom_tia'. The UI can now only be at 1x mode.
Aded 'tia_filter' commandline argument, which specifies to the filter
to use when rendering the tia image. For now, these accept 'zoom1x',
'zoom2x'..., up to 'zoom10x', and duplicate previous behaviour. Eventually,
Scalexx and HQxx filters may be added. Still TODO is add this to the UI.
First pass at making the standard build use a minimum of zoom2x for the TIA,
so the UI can be larger and use a better looking font. There's still work
to do in this area, especially for those ports with limited hardware that
support zoom1x only.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1544 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-07-22 14:54:39 +00:00
|
|
|
void FrameBuffer::VideoModeList::next()
|
2008-07-04 14:27:17 +00:00
|
|
|
{
|
|
|
|
myIdx = (myIdx + 1) % myModeList.size();
|
|
|
|
}
|
|
|
|
|
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
|
|
void FrameBuffer::VideoModeList::setByGfxMode(GfxID id)
|
|
|
|
{
|
|
|
|
// First we determine which graphics mode is being requested
|
|
|
|
bool found = false;
|
|
|
|
GraphicsMode gfxmode;
|
|
|
|
for(uInt32 i = 0; i < GFX_NumModes; ++i)
|
|
|
|
{
|
|
|
|
if(ourGraphicsModes[i].type == id)
|
|
|
|
{
|
|
|
|
gfxmode = ourGraphicsModes[i];
|
|
|
|
found = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if(!found) gfxmode = ourGraphicsModes[0];
|
|
|
|
|
|
|
|
// Now we scan the list for the applicable video mode
|
|
|
|
set(gfxmode);
|
|
|
|
}
|
|
|
|
|
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
|
|
void FrameBuffer::VideoModeList::setByGfxMode(const string& name)
|
|
|
|
{
|
|
|
|
// First we determine which graphics mode is being requested
|
|
|
|
bool found = false;
|
|
|
|
GraphicsMode gfxmode;
|
|
|
|
for(uInt32 i = 0; i < GFX_NumModes; ++i)
|
|
|
|
{
|
2010-06-12 14:13:03 +00:00
|
|
|
if(BSPF_equalsIgnoreCase(ourGraphicsModes[i].name, name) ||
|
|
|
|
BSPF_equalsIgnoreCase(ourGraphicsModes[i].description, name))
|
2008-07-04 14:27:17 +00:00
|
|
|
{
|
|
|
|
gfxmode = ourGraphicsModes[i];
|
|
|
|
found = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if(!found) gfxmode = ourGraphicsModes[0];
|
|
|
|
|
|
|
|
// Now we scan the list for the applicable video mode
|
|
|
|
set(gfxmode);
|
|
|
|
}
|
|
|
|
|
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
|
|
void FrameBuffer::VideoModeList::set(const GraphicsMode& gfxmode)
|
|
|
|
{
|
|
|
|
// Attempt to point the current mode to the one given
|
|
|
|
myIdx = -1;
|
|
|
|
|
|
|
|
// First search for the given gfx id
|
|
|
|
for(unsigned int i = 0; i < myModeList.size(); ++i)
|
|
|
|
{
|
|
|
|
if(myModeList[i].gfxmode.type == gfxmode.type)
|
|
|
|
{
|
|
|
|
myIdx = i;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// If we get here, then the gfx type couldn't be found, so we search
|
2009-04-12 17:04:29 +00:00
|
|
|
// for the first mode with the same zoomlevel (making sure that the
|
|
|
|
// requested mode can fit inside the current screen)
|
|
|
|
if(gfxmode.zoom > myModeList[myModeList.size()-1].gfxmode.zoom)
|
|
|
|
{
|
|
|
|
myIdx = myModeList.size()-1;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
else
|
2006-11-18 13:29:12 +00:00
|
|
|
{
|
2009-04-12 17:04:29 +00:00
|
|
|
for(unsigned int i = 0; i < myModeList.size(); ++i)
|
2008-07-04 14:27:17 +00:00
|
|
|
{
|
2009-04-12 17:04:29 +00:00
|
|
|
if(myModeList[i].gfxmode.zoom == gfxmode.zoom)
|
|
|
|
{
|
|
|
|
myIdx = i;
|
|
|
|
return;
|
|
|
|
}
|
2008-07-04 14:27:17 +00:00
|
|
|
}
|
Added preliminary framework for using advanced scalers. Right now,
functionality is exactly the same as before; Alt-Equals goes to the
next valid scaler, and Alt-Minus goes to the previous one.
What were previously zoomed modes are now treated as scalers, named
'Zoom1x', 'Zoom2x', etc. Various scalexx and hqxx modes will also be made
available.
For now, and probably forever, these advanced scaling modes will only
be available for OpenGL, since if you don't have a card that can handle
GL well, the scalers will probably be too much anyway. Also, the advanced
scaling will not be available in UI mode, only OpenGL emulation mode.
The UI (Launcher, Debugger) and emulation modes are now scaled separately,
specified with the new settings 'scale_ui' and 'scale_tia'. The 'zoom'
setting has been removed.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1133 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2006-10-14 20:08:29 +00:00
|
|
|
}
|
|
|
|
|
2009-02-06 23:53:34 +00:00
|
|
|
// Finally, just pick the lowest video mode
|
2008-07-04 14:27:17 +00:00
|
|
|
myIdx = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
|
|
void FrameBuffer::VideoModeList::print()
|
|
|
|
{
|
|
|
|
cerr << "VideoModeList: " << endl << endl;
|
|
|
|
for(Common::Array<VideoMode>::const_iterator i = myModeList.begin();
|
|
|
|
i != myModeList.end(); ++i)
|
|
|
|
{
|
2010-11-07 16:19:26 +00:00
|
|
|
cerr << " Mode " << i << endl;
|
|
|
|
print(*i);
|
2008-07-04 14:27:17 +00:00
|
|
|
}
|
Added preliminary framework for using advanced scalers. Right now,
functionality is exactly the same as before; Alt-Equals goes to the
next valid scaler, and Alt-Minus goes to the previous one.
What were previously zoomed modes are now treated as scalers, named
'Zoom1x', 'Zoom2x', etc. Various scalexx and hqxx modes will also be made
available.
For now, and probably forever, these advanced scaling modes will only
be available for OpenGL, since if you don't have a card that can handle
GL well, the scalers will probably be too much anyway. Also, the advanced
scaling will not be available in UI mode, only OpenGL emulation mode.
The UI (Launcher, Debugger) and emulation modes are now scaled separately,
specified with the new settings 'scale_ui' and 'scale_tia'. The 'zoom'
setting has been removed.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1133 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2006-10-14 20:08:29 +00:00
|
|
|
}
|
2008-06-13 13:14:52 +00:00
|
|
|
|
2010-11-07 16:19:26 +00:00
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
|
|
void FrameBuffer::VideoModeList::print(const VideoMode& mode)
|
|
|
|
{
|
|
|
|
cerr << " screen w = " << mode.screen_w << endl
|
|
|
|
<< " screen h = " << mode.screen_h << endl
|
|
|
|
<< " image x = " << mode.image_x << endl
|
|
|
|
<< " image y = " << mode.image_y << endl
|
|
|
|
<< " image w = " << mode.image_w << endl
|
|
|
|
<< " image h = " << mode.image_h << endl
|
|
|
|
<< " gfx id = " << mode.gfxmode.type << endl
|
|
|
|
<< " gfx name = " << mode.gfxmode.name << endl
|
|
|
|
<< " gfx desc = " << mode.gfxmode.description << endl
|
|
|
|
<< " gfx zoom = " << mode.gfxmode.zoom << endl
|
|
|
|
<< endl;
|
|
|
|
}
|
|
|
|
|
2008-06-13 13:14:52 +00:00
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
|
|
void FBSurface::box(uInt32 x, uInt32 y, uInt32 w, uInt32 h,
|
2009-01-03 22:57:12 +00:00
|
|
|
uInt32 colorA, uInt32 colorB)
|
2008-06-13 13:14:52 +00:00
|
|
|
{
|
|
|
|
hLine(x + 1, y, x + w - 2, colorA);
|
|
|
|
hLine(x, y + 1, x + w - 1, colorA);
|
|
|
|
vLine(x, y + 1, y + h - 2, colorA);
|
|
|
|
vLine(x + 1, y, y + h - 1, colorA);
|
|
|
|
|
|
|
|
hLine(x + 1, y + h - 2, x + w - 1, colorB);
|
|
|
|
hLine(x + 1, y + h - 1, x + w - 2, colorB);
|
|
|
|
vLine(x + w - 1, y + 1, y + h - 2, colorB);
|
|
|
|
vLine(x + w - 2, y + 1, y + h - 1, colorB);
|
|
|
|
}
|
|
|
|
|
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
|
|
void FBSurface::frameRect(uInt32 x, uInt32 y, uInt32 w, uInt32 h,
|
2009-01-03 22:57:12 +00:00
|
|
|
uInt32 color, FrameStyle style)
|
2008-06-13 13:14:52 +00:00
|
|
|
{
|
|
|
|
switch(style)
|
|
|
|
{
|
|
|
|
case kSolidLine:
|
|
|
|
hLine(x, y, x + w - 1, color);
|
|
|
|
hLine(x, y + h - 1, x + w - 1, color);
|
|
|
|
vLine(x, y, y + h - 1, color);
|
|
|
|
vLine(x + w - 1, y, y + h - 1, color);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case kDashLine:
|
|
|
|
unsigned int i, skip, lwidth = 1;
|
|
|
|
|
|
|
|
for(i = x, skip = 1; i < x+w-1; i=i+lwidth+1, ++skip)
|
|
|
|
{
|
|
|
|
if(skip % 2)
|
|
|
|
{
|
|
|
|
hLine(i, y, i + lwidth, color);
|
|
|
|
hLine(i, y + h - 1, i + lwidth, color);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
for(i = y, skip = 1; i < y+h-1; i=i+lwidth+1, ++skip)
|
|
|
|
{
|
|
|
|
if(skip % 2)
|
|
|
|
{
|
|
|
|
vLine(x, i, i + lwidth, color);
|
|
|
|
vLine(x + w - 1, i, i + lwidth, color);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
|
|
void FBSurface::drawString(const GUI::Font* font, const string& s,
|
|
|
|
int x, int y, int w,
|
2009-01-03 22:57:12 +00:00
|
|
|
uInt32 color, TextAlignment align,
|
2008-06-13 13:14:52 +00:00
|
|
|
int deltax, bool useEllipsis)
|
|
|
|
{
|
|
|
|
const int leftX = x, rightX = x + w;
|
|
|
|
unsigned int i;
|
|
|
|
int width = font->getStringWidth(s);
|
|
|
|
string str;
|
|
|
|
|
|
|
|
if(useEllipsis && width > w)
|
|
|
|
{
|
|
|
|
// String is too wide. So we shorten it "intelligently", by replacing
|
|
|
|
// parts of it by an ellipsis ("..."). There are three possibilities
|
|
|
|
// for this: replace the start, the end, or the middle of the string.
|
|
|
|
// What is best really depends on the context; but unless we want to
|
|
|
|
// make this configurable, replacing the middle probably is a good
|
|
|
|
// compromise.
|
|
|
|
const int ellipsisWidth = font->getStringWidth("...");
|
|
|
|
|
|
|
|
// SLOW algorithm to remove enough of the middle. But it is good enough for now.
|
|
|
|
const int halfWidth = (w - ellipsisWidth) / 2;
|
|
|
|
int w2 = 0;
|
|
|
|
|
|
|
|
for(i = 0; i < s.size(); ++i)
|
|
|
|
{
|
|
|
|
int charWidth = font->getCharWidth(s[i]);
|
|
|
|
if(w2 + charWidth > halfWidth)
|
|
|
|
break;
|
|
|
|
|
|
|
|
w2 += charWidth;
|
|
|
|
str += s[i];
|
|
|
|
}
|
|
|
|
|
|
|
|
// At this point we know that the first 'i' chars are together 'w2'
|
|
|
|
// pixels wide. We took the first i-1, and add "..." to them.
|
|
|
|
str += "...";
|
|
|
|
|
|
|
|
// The original string is width wide. Of those we already skipped past
|
|
|
|
// w2 pixels, which means (width - w2) remain.
|
|
|
|
// The new str is (w2+ellipsisWidth) wide, so we can accomodate about
|
|
|
|
// (w - (w2+ellipsisWidth)) more pixels.
|
|
|
|
// Thus we skip ((width - w2) - (w - (w2+ellipsisWidth))) =
|
|
|
|
// (width + ellipsisWidth - w)
|
|
|
|
int skip = width + ellipsisWidth - w;
|
|
|
|
for(; i < s.size() && skip > 0; ++i)
|
|
|
|
skip -= font->getCharWidth(s[i]);
|
|
|
|
|
|
|
|
// Append the remaining chars, if any
|
|
|
|
for(; i < s.size(); ++i)
|
|
|
|
str += s[i];
|
|
|
|
|
|
|
|
width = font->getStringWidth(str);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
str = s;
|
|
|
|
|
|
|
|
if(align == kTextAlignCenter)
|
|
|
|
x = x + (w - width - 1)/2;
|
|
|
|
else if(align == kTextAlignRight)
|
|
|
|
x = x + w - width;
|
|
|
|
|
|
|
|
x += deltax;
|
|
|
|
for(i = 0; i < str.size(); ++i)
|
|
|
|
{
|
|
|
|
w = font->getCharWidth(str[i]);
|
|
|
|
if(x+w > rightX)
|
|
|
|
break;
|
|
|
|
if(x >= leftX)
|
|
|
|
drawChar(font, str[i], x, y, color);
|
|
|
|
|
|
|
|
x += w;
|
|
|
|
}
|
|
|
|
}
|
2008-07-04 14:27:17 +00:00
|
|
|
|
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
|
|
FrameBuffer::GraphicsMode FrameBuffer::ourGraphicsModes[GFX_NumModes] = {
|
2008-07-25 12:41:41 +00:00
|
|
|
{ GFX_Zoom1x, "zoom1x", "Zoom 1x", 1, 0x3 },
|
|
|
|
{ GFX_Zoom2x, "zoom2x", "Zoom 2x", 2, 0x3 },
|
|
|
|
{ GFX_Zoom3x, "zoom3x", "Zoom 3x", 3, 0x3 },
|
|
|
|
{ GFX_Zoom4x, "zoom4x", "Zoom 4x", 4, 0x3 },
|
|
|
|
{ GFX_Zoom5x, "zoom5x", "Zoom 5x", 5, 0x3 },
|
|
|
|
{ GFX_Zoom6x, "zoom6x", "Zoom 6x", 6, 0x3 },
|
|
|
|
{ GFX_Zoom7x, "zoom7x", "Zoom 7x", 7, 0x3 },
|
|
|
|
{ GFX_Zoom8x, "zoom8x", "Zoom 8x", 8, 0x3 },
|
|
|
|
{ GFX_Zoom9x, "zoom9x", "Zoom 9x", 9, 0x3 },
|
|
|
|
{ GFX_Zoom10x, "zoom10x", "Zoom 10x", 10, 0x3 }
|
2008-07-04 14:27:17 +00:00
|
|
|
};
|