From dfd7faf45475da515e5d081a6ee6eb896c095787 Mon Sep 17 00:00:00 2001
From: stephena <stephena@8b62c5a3-ac7e-4cc8-8f21-d9a121418aba>
Date: Thu, 16 Mar 2006 16:10:47 +0000
Subject: [PATCH] Fixed crash when exiting from the debugger while in OpenGL
 mode.

Temporarily changed colour of hightlighted text from pure green to
pure blue for the GP2X port.  The next major release (2.2) will have
a GUI palette selector for this.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1049 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
---
 stella/src/common/FrameBufferGL.cxx   | 4 ++--
 stella/src/common/FrameBufferSoft.cxx | 5 +++--
 stella/src/emucore/Console.cxx        | 4 ++--
 stella/src/emucore/FrameBuffer.cxx    | 6 +++++-
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/stella/src/common/FrameBufferGL.cxx b/stella/src/common/FrameBufferGL.cxx
index 9b232b13e..91bab3a89 100644
--- a/stella/src/common/FrameBufferGL.cxx
+++ b/stella/src/common/FrameBufferGL.cxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: FrameBufferGL.cxx,v 1.55 2006-01-16 01:23:55 stephena Exp $
+// $Id: FrameBufferGL.cxx,v 1.56 2006-03-16 16:10:47 stephena Exp $
 //============================================================================
 
 #ifdef DISPLAY_OPENGL
@@ -305,7 +305,7 @@ bool FrameBufferGL::createScreen()
   SDL_GL_SwapBuffers();
   p_glClear(GL_COLOR_BUFFER_BIT);
 
-  myOSystem->eventHandler().refreshDisplay();
+  cls();
 
   return true;
 }
diff --git a/stella/src/common/FrameBufferSoft.cxx b/stella/src/common/FrameBufferSoft.cxx
index 880a5e126..56dcb844d 100644
--- a/stella/src/common/FrameBufferSoft.cxx
+++ b/stella/src/common/FrameBufferSoft.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: FrameBufferSoft.cxx,v 1.47 2006-02-15 03:22:34 azaballa Exp $
+// $Id: FrameBufferSoft.cxx,v 1.48 2006-03-16 16:10:47 stephena Exp $
 //============================================================================
 
 #include <SDL.h>
@@ -107,7 +107,8 @@ bool FrameBufferSoft::createScreen()
       myPitch = myScreen->pitch/4;
       break;
   }
-  myOSystem->eventHandler().refreshDisplay();
+
+  cls();
 
   return true;
 }
diff --git a/stella/src/emucore/Console.cxx b/stella/src/emucore/Console.cxx
index b5543812c..ef7dbb8ba 100644
--- a/stella/src/emucore/Console.cxx
+++ b/stella/src/emucore/Console.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: Console.cxx,v 1.85 2006-03-15 23:14:01 stephena Exp $
+// $Id: Console.cxx,v 1.86 2006-03-16 16:10:47 stephena Exp $
 //============================================================================
 
 #include <assert.h>
@@ -94,7 +94,7 @@ Console::Console(const uInt8* image, uInt32 size, const string& md5,
   iHeight = atoi(myProperties.get(Display_Height).c_str());
   if(iWidth > sWidth || iHeight > sHeight)
   {
-    myOSystem->frameBuffer().showMessage("ROM image dimensions larger than screen");
+    myOSystem->frameBuffer().showMessage("PAL ROMS not supported, screen too small");
     return;
   }
 
diff --git a/stella/src/emucore/FrameBuffer.cxx b/stella/src/emucore/FrameBuffer.cxx
index 274d263c3..128a07640 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.80 2006-03-15 23:14:01 stephena Exp $
+// $Id: FrameBuffer.cxx,v 1.81 2006-03-16 16:10:47 stephena Exp $
 //============================================================================
 
 #include <sstream>
@@ -686,6 +686,10 @@ const uInt8 FrameBuffer::ourGUIColors[kNumColors-256][3] = {
   {  64,  64,  64 },  // kShadowColor
   { 200, 200, 255 },  // kHiliteColor
   {  32, 160,  32 },  // kTextColor
+#if !defined(GP2X)  // Quick GP2X hack to change colours, until an in-game GUI is added
   {   0, 255,   0 },  // kTextColorHi
+#else
+  {   0,   0, 255 },  // kTextColorHi
+#endif
   { 200,   0,   0 }   // kTextColorEm
 };