[Scummvm-cvs-logs] SF.net SVN: scummvm:[54553] scummvm/trunk/backends
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Sun Nov 28 23:04:40 CET 2010
Revision: 54553
http://scummvm.svn.sourceforge.net/scummvm/?rev=54553&view=rev
Author: fingolfin
Date: 2010-11-28 22:04:39 +0000 (Sun, 28 Nov 2010)
Log Message:
-----------
SDL: Various more SdlEventSource related fixes
Modified Paths:
--------------
scummvm/trunk/backends/events/symbiansdl/symbiansdl-events.cpp
scummvm/trunk/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp
scummvm/trunk/backends/graphics/dinguxsdl/dinguxsdl-graphics.h
scummvm/trunk/backends/graphics/gp2xsdl/gp2xsdl-graphics.cpp
scummvm/trunk/backends/graphics/gp2xsdl/gp2xsdl-graphics.h
scummvm/trunk/backends/graphics/symbiansdl/symbiansdl-graphics.cpp
scummvm/trunk/backends/graphics/symbiansdl/symbiansdl-graphics.h
scummvm/trunk/backends/platform/gp2x/gp2x.cpp
scummvm/trunk/backends/platform/linuxmoto/linuxmoto-sdl.cpp
scummvm/trunk/backends/platform/samsungtv/samsungtv.cpp
scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp
Modified: scummvm/trunk/backends/events/symbiansdl/symbiansdl-events.cpp
===================================================================
--- scummvm/trunk/backends/events/symbiansdl/symbiansdl-events.cpp 2010-11-28 21:33:52 UTC (rev 54552)
+++ scummvm/trunk/backends/events/symbiansdl/symbiansdl-events.cpp 2010-11-28 22:04:39 UTC (rev 54553)
@@ -38,7 +38,7 @@
{ 150, 145, 170, 55 }
};
-SymbianSdlEventSource::SymbianSdlEventSource(Common::EventSource *boss)
+SymbianSdlEventSource::SymbianSdlEventSource()
: _currentZone(0) {
for (int i = 0; i < TOTAL_ZONES; i++) {
_mouseXZone[i] = (_zones[i].x + (_zones[i].width / 2));
Modified: scummvm/trunk/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp
===================================================================
--- scummvm/trunk/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp 2010-11-28 21:33:52 UTC (rev 54552)
+++ scummvm/trunk/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp 2010-11-28 22:04:39 UTC (rev 54553)
@@ -38,8 +38,8 @@
{0, 0, 0}
};
-DINGUXSdlGraphicsManager::DINGUXSdlGraphicsManager(SdlEventSource *boss) : SdlGraphicsManager(boss) {
- _evSrc = boss;
+DINGUXSdlGraphicsManager::DINGUXSdlGraphicsManager(SdlEventSource *boss)
+ : SdlGraphicsManager(boss) {
}
const OSystem::GraphicsMode *DINGUXSdlGraphicsManager::getSupportedGraphicsModes() const {
@@ -125,7 +125,7 @@
if (w > 320 || h > 240) {
setGraphicsMode(GFX_HALF);
setGraphicsModeIntern();
- _evSrc->toggleMouseGrab();
+ _sdlEventSource->toggleMouseGrab();
}
_transactionDetails.sizeChanged = true;
Modified: scummvm/trunk/backends/graphics/dinguxsdl/dinguxsdl-graphics.h
===================================================================
--- scummvm/trunk/backends/graphics/dinguxsdl/dinguxsdl-graphics.h 2010-11-28 21:33:52 UTC (rev 54552)
+++ scummvm/trunk/backends/graphics/dinguxsdl/dinguxsdl-graphics.h 2010-11-28 22:04:39 UTC (rev 54553)
@@ -61,9 +61,6 @@
SdlGraphicsManager::VideoState *getVideoMode();
virtual void adjustMouseEvent(const Common::Event &event);
-
-protected:
- SdlEventSource *_evSrc;
};
#endif /* BACKENDS_GRAPHICS_SDL_DINGUX_H */
Modified: scummvm/trunk/backends/graphics/gp2xsdl/gp2xsdl-graphics.cpp
===================================================================
--- scummvm/trunk/backends/graphics/gp2xsdl/gp2xsdl-graphics.cpp 2010-11-28 21:33:52 UTC (rev 54552)
+++ scummvm/trunk/backends/graphics/gp2xsdl/gp2xsdl-graphics.cpp 2010-11-28 22:04:39 UTC (rev 54553)
@@ -34,10 +34,8 @@
{0, 0, 0}
};
-GP2XSdlGraphicsManager::GP2XSdlGraphicsManager()
- :
- _adjustZoomOnMouse(false) {
-
+GP2XSdlGraphicsManager::GP2XSdlGraphicsManager(SdlEventSource *sdlEventSource)
+ : SdlGraphicsManager(sdlEventSource), _adjustZoomOnMouse(false) {
}
const OSystem::GraphicsMode *GP2XSdlGraphicsManager::getSupportedGraphicsModes() const {
Modified: scummvm/trunk/backends/graphics/gp2xsdl/gp2xsdl-graphics.h
===================================================================
--- scummvm/trunk/backends/graphics/gp2xsdl/gp2xsdl-graphics.h 2010-11-28 21:33:52 UTC (rev 54552)
+++ scummvm/trunk/backends/graphics/gp2xsdl/gp2xsdl-graphics.h 2010-11-28 22:04:39 UTC (rev 54553)
@@ -30,7 +30,8 @@
class GP2XSdlGraphicsManager : public SdlGraphicsManager {
public:
-
+ GP2XSdlGraphicsManager(SdlEventSource *sdlEventSource);
+
virtual const OSystem::GraphicsMode *getSupportedGraphicsModes() const;
virtual int getDefaultGraphicsMode() const;
virtual void drawMouse();
Modified: scummvm/trunk/backends/graphics/symbiansdl/symbiansdl-graphics.cpp
===================================================================
--- scummvm/trunk/backends/graphics/symbiansdl/symbiansdl-graphics.cpp 2010-11-28 21:33:52 UTC (rev 54552)
+++ scummvm/trunk/backends/graphics/symbiansdl/symbiansdl-graphics.cpp 2010-11-28 22:04:39 UTC (rev 54553)
@@ -28,6 +28,10 @@
#include "backends/graphics/symbiansdl/symbiansdl-graphics.h"
#include "backends/platform/symbian/src/SymbianActions.h"
+SymbianSdlGraphicsManager::SymbianSdlGraphicsManager(SdlEventSource *sdlEventSource)
+ : SdlGraphicsManager(sdlEventSource) {
+}
+
int SymbianSdlGraphicsManager::getDefaultGraphicsMode() const {
return GFX_NORMAL;
}
Modified: scummvm/trunk/backends/graphics/symbiansdl/symbiansdl-graphics.h
===================================================================
--- scummvm/trunk/backends/graphics/symbiansdl/symbiansdl-graphics.h 2010-11-28 21:33:52 UTC (rev 54552)
+++ scummvm/trunk/backends/graphics/symbiansdl/symbiansdl-graphics.h 2010-11-28 22:04:39 UTC (rev 54553)
@@ -30,6 +30,9 @@
class SymbianSdlGraphicsManager : public SdlGraphicsManager {
public:
+ SymbianSdlGraphicsManager(SdlEventSource *sdlEventSource);
+
+public:
virtual bool hasFeature(OSystem::Feature f);
virtual void setFeatureState(OSystem::Feature f, bool enable);
Modified: scummvm/trunk/backends/platform/gp2x/gp2x.cpp
===================================================================
--- scummvm/trunk/backends/platform/gp2x/gp2x.cpp 2010-11-28 21:33:52 UTC (rev 54552)
+++ scummvm/trunk/backends/platform/gp2x/gp2x.cpp 2010-11-28 22:04:39 UTC (rev 54553)
@@ -136,12 +136,12 @@
GP2X_HW::mixerMoveVolume(0);
// Create the events manager
- if (_eventManager == 0)
- _eventManager = new GP2XSdlEventSource(this);
+ if (_eventSource == 0)
+ _eventSource = new GP2XSdlEventSource();
// Create the graphics manager
if (_graphicsManager == 0)
- _graphicsManager = new GP2XSdlGraphicsManager();
+ _graphicsManager = new GP2XSdlGraphicsManager(_eventSource);
// Call parent implementation of this method
OSystem_POSIX::initBackend();
Modified: scummvm/trunk/backends/platform/linuxmoto/linuxmoto-sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/linuxmoto/linuxmoto-sdl.cpp 2010-11-28 21:33:52 UTC (rev 54552)
+++ scummvm/trunk/backends/platform/linuxmoto/linuxmoto-sdl.cpp 2010-11-28 22:04:39 UTC (rev 54553)
@@ -30,11 +30,11 @@
void OSystem_LINUXMOTO::initBackend() {
// Create the backend custom managers
- if (_eventManager == 0)
- _eventManager = new LinuxmotoSdlEventSource(this);
+ if (_eventSource == 0)
+ _eventSource = new LinuxmotoSdlEventSource();
if (_graphicsManager == 0)
- _graphicsManager = new LinuxmotoSdlGraphicsManager();
+ _graphicsManager = new LinuxmotoSdlGraphicsManager(_eventSource);
// Call parent implementation of this method
OSystem_POSIX::initBackend();
Modified: scummvm/trunk/backends/platform/samsungtv/samsungtv.cpp
===================================================================
--- scummvm/trunk/backends/platform/samsungtv/samsungtv.cpp 2010-11-28 21:33:52 UTC (rev 54552)
+++ scummvm/trunk/backends/platform/samsungtv/samsungtv.cpp 2010-11-28 22:04:39 UTC (rev 54553)
@@ -41,8 +41,8 @@
void OSystem_SDL_SamsungTV::initBackend() {
// Create the events manager
- if (_eventManager == 0)
- _eventManager = new SamsungTVSdlEventSource(this);
+ if (_eventSource == 0)
+ _eventSource = new SamsungTVSdlEventSource();
// Call parent implementation of this method
OSystem_SDL::initBackend();
Modified: scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp 2010-11-28 21:33:52 UTC (rev 54552)
+++ scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp 2010-11-28 22:04:39 UTC (rev 54553)
@@ -101,8 +101,8 @@
GUI::Actions::init();
// Creates the backend managers
- if (_eventManager == 0)
- _eventManager = new SymbianSdlEventSource(this);
+ if (_eventSource == 0)
+ _eventSource = new SymbianSdlEventSource();
if (_mixerManager == 0) {
_mixerManager = new SymbianSdlMixerManager();
@@ -110,7 +110,7 @@
_mixerManager->init();
}
if (_graphicsManager == 0)
- _graphicsManager = new SymbianSdlGraphicsManager();
+ _graphicsManager = new SymbianSdlGraphicsManager(_eventSource);
// Call parent implementation of this method
OSystem_SDL::initBackend();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list