[Scummvm-cvs-logs] SF.net SVN: scummvm:[45808] scummvm/trunk/backends/platform/samsungtv

[aquadran at users.sourceforge.net]

Revision: 45808
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45808&view=rev
Author:   aquadran
Date:     2009-11-10 19:15:30 +0000 (Tue, 10 Nov 2009)

Log Message:
-----------
fix warpMouse(), add missing setMousePos on cursor events

Modified Paths:
--------------
    scummvm/trunk/backends/platform/samsungtv/events.cpp
    scummvm/trunk/backends/platform/samsungtv/graphics.cpp

Modified: scummvm/trunk/backends/platform/samsungtv/events.cpp
===================================================================
--- scummvm/trunk/backends/platform/samsungtv/events.cpp	2009-11-10 19:13:02 UTC (rev 45807)
+++ scummvm/trunk/backends/platform/samsungtv/events.cpp	2009-11-10 19:15:30 UTC (rev 45808)
@@ -124,24 +124,28 @@
 				_km.y_down_count = 1;
 				event.type = Common::EVENT_MOUSEMOVE;
 				fillMouseEvent(event, _km.x, _km.y);
+				setMousePos(event.mouse.x, event.mouse.y);
 				return true;
 			} else if (ev.key.keysym.sym == SDLK_DOWN) {
 				_km.y_vel = 1;
 				_km.y_down_count = 1;
 				event.type = Common::EVENT_MOUSEMOVE;
 				fillMouseEvent(event, _km.x, _km.y);
+				setMousePos(event.mouse.x, event.mouse.y);
 				return true;
 			} else if (ev.key.keysym.sym == SDLK_LEFT) {
 				_km.x_vel = -1;
 				_km.x_down_count = 1;
 				event.type = Common::EVENT_MOUSEMOVE;
 				fillMouseEvent(event, _km.x, _km.y);
+				setMousePos(event.mouse.x, event.mouse.y);
 				return true;
 			} else if (ev.key.keysym.sym == SDLK_RIGHT) {
 				_km.x_vel = 1;
 				_km.x_down_count = 1;
 				event.type = Common::EVENT_MOUSEMOVE;
 				fillMouseEvent(event, _km.x, _km.y);
+				setMousePos(event.mouse.x, event.mouse.y);
 				return true;
 			} else if (ev.key.keysym.sym == SDLK_z) {
 				event.type = Common::EVENT_LBUTTONDOWN;

Modified: scummvm/trunk/backends/platform/samsungtv/graphics.cpp
===================================================================
--- scummvm/trunk/backends/platform/samsungtv/graphics.cpp	2009-11-10 19:13:02 UTC (rev 45807)
+++ scummvm/trunk/backends/platform/samsungtv/graphics.cpp	2009-11-10 19:15:30 UTC (rev 45808)
@@ -541,6 +541,11 @@
 	}
 }
 
+void OSystem_SDL_SamsungTV::warpMouse(int x, int y) {
+	if (_mouseCurState.x != x || _mouseCurState.y != y)
+		setMousePos(x, y);
+}
+
 void OSystem_SDL_SamsungTV::setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, uint32 keycolor, int cursorTargetScale, const Graphics::PixelFormat *format) {
 	if (!format)
 		_cursorFormat = Graphics::PixelFormat::createFormatCLUT8();
@@ -837,8 +842,4 @@
 	addDirtyRect(dst.x, dst.y, dst.w, dst.h, true);
 }
 
-void OSystem_SDL_SamsungTV::warpMouse(int x, int y) {
-	setMousePos(x, y);
-}
-
 #endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.