From 26dc4c24256472898f4388de73699a5f54f4a2cf Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Thu, 19 Aug 2010 12:43:37 +0000
Subject: DINGOO: new port. Patch #3039277

svn-id: r52210
---
 backends/platform/sdl/graphics.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'backends/platform/sdl/graphics.cpp')

diff --git a/backends/platform/sdl/graphics.cpp b/backends/platform/sdl/graphics.cpp
index a97a153f3c..80bfca4514 100644
--- a/backends/platform/sdl/graphics.cpp
+++ b/backends/platform/sdl/graphics.cpp
@@ -537,7 +537,7 @@ bool OSystem_SDL::loadGFXMode() {
 	assert(_inited);
 	_forceFull = true;
 
-#if !defined(__MAEMO__) && !defined(GP2XWIZ) && !defined(LINUXMOTO)
+#if !defined(__MAEMO__) && !defined(GP2XWIZ) && !defined(LINUXMOTO) && !defined(DINGUX)
 	_videoMode.overlayWidth = _videoMode.screenWidth * _videoMode.scaleFactor;
 	_videoMode.overlayHeight = _videoMode.screenHeight * _videoMode.scaleFactor;
 
-- 
cgit v1.2.3


From 37027d653128796434b47a327ae99d96c078088d Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Mon, 30 Aug 2010 22:24:40 +0000
Subject: I18N: Add "lowres" context for several GUI strings when in 1x mode.

This enables translators to use a different translation for these strings in
1x mode (e.g. 320x200 or 320x240) and in 2x or 3x modes.

svn-id: r52461
---
 backends/platform/sdl/graphics.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'backends/platform/sdl/graphics.cpp')

diff --git a/backends/platform/sdl/graphics.cpp b/backends/platform/sdl/graphics.cpp
index 80bfca4514..865d3a5738 100644
--- a/backends/platform/sdl/graphics.cpp
+++ b/backends/platform/sdl/graphics.cpp
@@ -56,6 +56,8 @@ static const OSystem::GraphicsMode s_supportedGraphicsModes[] = {
 	{0, 0, 0}
 };
 
+DECLARE_TRANSLATION_ADDITIONAL_CONTEXT("Normal (no scaling)", "lowres")
+
 // Table of relative scalers magnitudes
 // [definedScale - 1][scaleFactor - 1]
 static ScalerProc *scalersMagn[3][3] = {
-- 
cgit v1.2.3


From c0b119feda86ea4bc3246868e59e583354656d70 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Tue, 31 Aug 2010 13:05:15 +0000
Subject: SCI: still set game cursor, when mouse outside

of ScummVM window. Just don't change actual mouse position

svn-id: r52472
---
 backends/platform/sdl/graphics.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'backends/platform/sdl/graphics.cpp')

diff --git a/backends/platform/sdl/graphics.cpp b/backends/platform/sdl/graphics.cpp
index 865d3a5738..9bf71d1c33 100644
--- a/backends/platform/sdl/graphics.cpp
+++ b/backends/platform/sdl/graphics.cpp
@@ -1395,9 +1395,11 @@ void OSystem_SDL::setMousePos(int x, int y) {
 void OSystem_SDL::warpMouse(int x, int y) {
 	int y1 = y;
 
-	// Don't change mouse position, when mouse is outside of our window (in case of windowed mode)
-	if (!(SDL_GetAppState( ) & SDL_APPMOUSEFOCUS))
+	// Don't change actual mouse position, when mouse is outside of our window (in case of windowed mode)
+	if (!(SDL_GetAppState( ) & SDL_APPMOUSEFOCUS)) {
+		setMousePos(x, y); // but change game cursor position
 		return;
+	}
 
 	if (_videoMode.aspectRatioCorrection && !_overlayVisible)
 		y1 = real2Aspect(y);
-- 
cgit v1.2.3