From 91b889e2d36baf8a8e1f56f05f4d063e5ae79849 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Fri, 3 Jun 2011 23:30:55 +0200
Subject: COMMON: Rename kFeatureCursorHasPalette -> kFeatureCursorPalette

---
 backends/graphics/opengl/opengl-graphics.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'backends/graphics/opengl/opengl-graphics.cpp')

diff --git a/backends/graphics/opengl/opengl-graphics.cpp b/backends/graphics/opengl/opengl-graphics.cpp
index 32c0fbca6f..03f959381b 100644
--- a/backends/graphics/opengl/opengl-graphics.cpp
+++ b/backends/graphics/opengl/opengl-graphics.cpp
@@ -91,7 +91,7 @@ void OpenGLGraphicsManager::initEventObserver() {
 bool OpenGLGraphicsManager::hasFeature(OSystem::Feature f) {
 	return
 		(f == OSystem::kFeatureAspectRatioCorrection) ||
-		(f == OSystem::kFeatureCursorHasPalette);
+		(f == OSystem::kFeatureCursorPalette);
 }
 
 void OpenGLGraphicsManager::setFeatureState(OSystem::Feature f, bool enable) {
-- 
cgit v1.2.3


From ce32745d9c26a0b97dce6a137a46ff2004c7be02 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sat, 4 Jun 2011 00:14:09 +0200
Subject: BACKENDS: Replace OSystem::disableCursorPalette by setFeatureState
 calls

---
 backends/graphics/opengl/opengl-graphics.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'backends/graphics/opengl/opengl-graphics.cpp')

diff --git a/backends/graphics/opengl/opengl-graphics.cpp b/backends/graphics/opengl/opengl-graphics.cpp
index 03f959381b..c1bbdb2724 100644
--- a/backends/graphics/opengl/opengl-graphics.cpp
+++ b/backends/graphics/opengl/opengl-graphics.cpp
@@ -105,6 +105,11 @@ void OpenGLGraphicsManager::setFeatureState(OSystem::Feature f, bool enable) {
 		_transactionDetails.needRefresh = true;
 		break;
 
+	case OSystem::kFeatureCursorPalette:
+		_cursorPaletteDisabled = !enable;
+		_cursorNeedsRedraw = true;
+		break;
+
 	default:
 		break;
 	}
@@ -118,6 +123,9 @@ bool OpenGLGraphicsManager::getFeatureState(OSystem::Feature f) {
 	case OSystem::kFeatureAspectRatioCorrection:
 		return _videoMode.aspectRatioCorrection;
 
+	case OSystem::kFeatureCursorPalette:
+		return !_cursorPaletteDisabled;
+
 	default:
 		return false;
 	}
@@ -642,11 +650,6 @@ void OpenGLGraphicsManager::setCursorPalette(const byte *colors, uint start, uin
 	_cursorNeedsRedraw = true;
 }
 
-void OpenGLGraphicsManager::disableCursorPalette(bool disable) {
-	_cursorPaletteDisabled = disable;
-	_cursorNeedsRedraw = true;
-}
-
 //
 // Misc
 //
-- 
cgit v1.2.3


From 592cca5402f9162fc70b48f40b95faec44341bd0 Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Sun, 22 May 2011 15:15:15 +0100
Subject: GRAPHICS: Get rid of kSODFont (ScummFont)

OSD is now using the kGUIFont instead. The main advantage is that
the kGUIFont can be used for translated text while only ASCII
characters were present in ScummFont.
---
 backends/graphics/opengl/opengl-graphics.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'backends/graphics/opengl/opengl-graphics.cpp')

diff --git a/backends/graphics/opengl/opengl-graphics.cpp b/backends/graphics/opengl/opengl-graphics.cpp
index c1bbdb2724..66b1651f81 100644
--- a/backends/graphics/opengl/opengl-graphics.cpp
+++ b/backends/graphics/opengl/opengl-graphics.cpp
@@ -1385,7 +1385,7 @@ const char *OpenGLGraphicsManager::getCurrentModeName() {
 #ifdef USE_OSD
 void OpenGLGraphicsManager::updateOSD() {
 	// The font we are going to use:
-	const Graphics::Font *font = FontMan.getFontByUsage(Graphics::FontManager::kOSDFont);
+	const Graphics::Font *font = FontMan.getFontByUsage(Graphics::FontManager::kGUIFont);
 
 	if (_osdSurface.w != _osdTexture->getWidth() || _osdSurface.h != _osdTexture->getHeight())
 		_osdSurface.create(_osdTexture->getWidth(), _osdTexture->getHeight(), _overlayFormat);
-- 
cgit v1.2.3


From a605c7fd69e7ecb3e63b2ba8eb420e21ec71ce4a Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Sun, 22 May 2011 21:57:53 +0100
Subject: OSYSTEM: displayMessageOnOSD() now accepts non-ASCII strings

It should now accept strings encoded using the current
TranslationManaged charset (e.g. translated text).
---
 backends/graphics/opengl/opengl-graphics.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'backends/graphics/opengl/opengl-graphics.cpp')

diff --git a/backends/graphics/opengl/opengl-graphics.cpp b/backends/graphics/opengl/opengl-graphics.cpp
index 66b1651f81..c0551de386 100644
--- a/backends/graphics/opengl/opengl-graphics.cpp
+++ b/backends/graphics/opengl/opengl-graphics.cpp
@@ -1385,7 +1385,7 @@ const char *OpenGLGraphicsManager::getCurrentModeName() {
 #ifdef USE_OSD
 void OpenGLGraphicsManager::updateOSD() {
 	// The font we are going to use:
-	const Graphics::Font *font = FontMan.getFontByUsage(Graphics::FontManager::kGUIFont);
+	const Graphics::Font *font = FontMan.getFontByUsage(Graphics::FontManager::kLocalizedFont);
 
 	if (_osdSurface.w != _osdTexture->getWidth() || _osdSurface.h != _osdTexture->getHeight())
 		_osdSurface.create(_osdTexture->getWidth(), _osdTexture->getHeight(), _overlayFormat);
-- 
cgit v1.2.3