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

Made onscreen messages appear in any event mode. 

Tweaked the settings for Unix/Linux.  Most GL implementations for those
systems use Mesa, which is currently broken wrt vsync support.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1221 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2006-12-18 12:53:33 +00:00
parent e2184561e9
commit 43d942c015
2 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
stella/src/emucore/FrameBuffer.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of // See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
// //
// $Id: FrameBuffer.cxx,v 1.110 2006-12-15 16:42:57 stephena Exp $ // $Id: FrameBuffer.cxx,v 1.111 2006-12-18 12:53:32 stephena Exp $
//============================================================================ //============================================================================
#include <sstream> #include <sstream>
@ -152,11 +152,6 @@ void FrameBuffer::update()
// Only update the screen if it's been invalidated // Only update the screen if it's been invalidated
if(mediaSourceChanged || theRedrawTIAIndicator) if(mediaSourceChanged || theRedrawTIAIndicator)
drawMediaSource(); drawMediaSource();
// Draw any pending messages
if(myMessage.counter > 0 && !myOSystem->eventHandler().isPaused())
drawMessage();
break; // S_EMULATE break; // S_EMULATE
} }
@ -177,21 +172,12 @@ void FrameBuffer::update()
drawMediaSource(); drawMediaSource();
myOSystem->commandMenu().draw(); myOSystem->commandMenu().draw();
// Draw any pending messages
if(myMessage.counter > 0 && !myOSystem->eventHandler().isPaused())
drawMessage();
break; // S_CMDMENU break; // S_CMDMENU
} }
case EventHandler::S_LAUNCHER: case EventHandler::S_LAUNCHER:
{ {
myOSystem->launcher().draw(); myOSystem->launcher().draw();
// Draw any pending messages
if(myMessage.counter > 0)
drawMessage();
break; // S_LAUNCHER break; // S_LAUNCHER
} }
@ -208,6 +194,10 @@ void FrameBuffer::update()
break; break;
} }
// Draw any pending messages
if(myMessage.counter > 0)
drawMessage();
// Do any post-frame stuff // Do any post-frame stuff
postFrameUpdate(); postFrameUpdate();

3
stella/src/unix/SettingsUNIX.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of // See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
// //
// $Id: SettingsUNIX.cxx,v 1.18 2006-12-08 16:49:41 stephena Exp $ // $Id: SettingsUNIX.cxx,v 1.19 2006-12-18 12:53:33 stephena Exp $
//============================================================================ //============================================================================
#include "bspf.hxx" #include "bspf.hxx"
@ -27,6 +27,7 @@ SettingsUNIX::SettingsUNIX(OSystem* osystem)
// This argument is only valid for Linux/UNIX, and will eventually be removed // This argument is only valid for Linux/UNIX, and will eventually be removed
setInternal("accurate", "false"); setInternal("accurate", "false");
setInternal("gl_lib", "libGL.so"); setInternal("gl_lib", "libGL.so");
setInternal("gl_vsync", "false"); // Most Linux GL implementations don't support this yet
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -