From 43d942c015b080055d77de66b213dba36bbf4556 Mon Sep 17 00:00:00 2001
From: stephena <stephena@8b62c5a3-ac7e-4cc8-8f21-d9a121418aba>
Date: Mon, 18 Dec 2006 12:53:33 +0000
Subject: [PATCH] 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
---
 stella/src/emucore/FrameBuffer.cxx | 20 +++++---------------
 stella/src/unix/SettingsUNIX.cxx   |  3 ++-
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/stella/src/emucore/FrameBuffer.cxx b/stella/src/emucore/FrameBuffer.cxx
index 2791314a8..ca065171b 100644
--- a/stella/src/emucore/FrameBuffer.cxx
+++ b/stella/src/emucore/FrameBuffer.cxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: 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>
@@ -152,11 +152,6 @@ void FrameBuffer::update()
       // Only update the screen if it's been invalidated
       if(mediaSourceChanged || theRedrawTIAIndicator)
         drawMediaSource();
-
-      // Draw any pending messages
-      if(myMessage.counter > 0 && !myOSystem->eventHandler().isPaused())
-        drawMessage();
-
       break;  // S_EMULATE
     }
 
@@ -177,21 +172,12 @@ void FrameBuffer::update()
         drawMediaSource();
 
       myOSystem->commandMenu().draw();
-
-      // Draw any pending messages
-      if(myMessage.counter > 0 && !myOSystem->eventHandler().isPaused())
-        drawMessage();
       break;  // S_CMDMENU
     }
 
     case EventHandler::S_LAUNCHER:
     {
       myOSystem->launcher().draw();
-
-      // Draw any pending messages
-      if(myMessage.counter > 0)
-        drawMessage();
-
       break;  // S_LAUNCHER
     }
 
@@ -208,6 +194,10 @@ void FrameBuffer::update()
       break;
   }
 
+  // Draw any pending messages
+  if(myMessage.counter > 0)
+    drawMessage();
+
   // Do any post-frame stuff
   postFrameUpdate();
 
diff --git a/stella/src/unix/SettingsUNIX.cxx b/stella/src/unix/SettingsUNIX.cxx
index df3e4dcfe..480390a2d 100644
--- a/stella/src/unix/SettingsUNIX.cxx
+++ b/stella/src/unix/SettingsUNIX.cxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: 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"
@@ -27,6 +27,7 @@ SettingsUNIX::SettingsUNIX(OSystem* osystem)
   // This argument is only valid for Linux/UNIX, and will eventually be removed
   setInternal("accurate", "false");
   setInternal("gl_lib", "libGL.so");
+  setInternal("gl_vsync", "false");  // Most Linux GL implementations don't support this yet
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -