[Scummvm-cvs-logs] SF.net SVN: scummvm:[34478] residual/trunk/engine/backend

[aquadran at users.sourceforge.net]

Revision: 34478
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34478&view=rev
Author:   aquadran
Date:     2008-09-10 11:47:02 +0000 (Wed, 10 Sep 2008)

Log Message:
-----------
added warpMouse to able fully compile event manager

Modified Paths:
--------------
    residual/trunk/engine/backend/events/default/default-events.cpp
    residual/trunk/engine/backend/platform/driver.h
    residual/trunk/engine/backend/platform/sdl/driver_sdl.cpp
    residual/trunk/engine/backend/platform/sdl/driver_sdl.h

Modified: residual/trunk/engine/backend/events/default/default-events.cpp
===================================================================
--- residual/trunk/engine/backend/events/default/default-events.cpp	2008-09-10 11:40:16 UTC (rev 34477)
+++ residual/trunk/engine/backend/events/default/default-events.cpp	2008-09-10 11:47:02 UTC (rev 34478)
@@ -265,7 +265,7 @@
 			case Common::EVENT_RBUTTONUP:
 			case Common::EVENT_WHEELUP:
 			case Common::EVENT_WHEELDOWN:
-//				_boss->warpMouse(_playbackEvent.mouse.x, _playbackEvent.mouse.y);
+				_boss->warpMouse(_playbackEvent.mouse.x, _playbackEvent.mouse.y);
 				break;
 			default:
 				break;
@@ -345,7 +345,7 @@
 	uint32 time = _boss->getMillis();
 	bool result;
 
-	result = false;//_boss->pollEvent(event);
+	result = _boss->pollEvent(event);
 
 	if (_recordMode != kPassthrough)  {
 

Modified: residual/trunk/engine/backend/platform/driver.h
===================================================================
--- residual/trunk/engine/backend/platform/driver.h	2008-09-10 11:40:16 UTC (rev 34477)
+++ residual/trunk/engine/backend/platform/driver.h	2008-09-10 11:47:02 UTC (rev 34478)
@@ -142,6 +142,8 @@
 
 	virtual void getTimeAndDate(struct tm &t) const = 0;
 
+	virtual void warpMouse(int x, int y) = 0;
+
 	friend class DefaultEventManager;
 	/**
 	 * Get the next event in the event queue.

Modified: residual/trunk/engine/backend/platform/sdl/driver_sdl.cpp
===================================================================
--- residual/trunk/engine/backend/platform/sdl/driver_sdl.cpp	2008-09-10 11:40:16 UTC (rev 34477)
+++ residual/trunk/engine/backend/platform/sdl/driver_sdl.cpp	2008-09-10 11:47:02 UTC (rev 34478)
@@ -186,6 +186,10 @@
 	}
 }
 
+void DriverSDL::warpMouse(int x, int y) {
+	SDL_WarpMouse(x, y);
+}
+
 bool DriverSDL::pollEvent(Common::Event &event) {
 	SDL_Event ev;
 	int axis;

Modified: residual/trunk/engine/backend/platform/sdl/driver_sdl.h
===================================================================
--- residual/trunk/engine/backend/platform/sdl/driver_sdl.h	2008-09-10 11:40:16 UTC (rev 34477)
+++ residual/trunk/engine/backend/platform/sdl/driver_sdl.h	2008-09-10 11:47:02 UTC (rev 34478)
@@ -58,6 +58,7 @@
 
 	const char *getVideoDeviceName();
 
+	void warpMouse(int x, int y);
 	bool pollEvent(Common::Event &event);
 	uint32 getMillis();
 	void delayMillis(uint msecs);


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