thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SDL: Change refs to SdlEventManager to SdlEventSource

Browse source 
svn-id: r54544
This commit is contained in:
Max Horn 2010-11-28 18:39:04 +00:00
parent 06df4459c7
commit 364382cf9f
11 changed files with 29 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

22
backends/events/gp2xsdl/gp2xsdl-events.cpp
View file

@ -84,14 +84,12 @@ enum {
TAPMODE_HOVER = 2 TAPMODE_HOVER = 2
}; };
GP2XSdlEventManager::GP2XSdlEventManager(Common::EventSource *boss) GP2XSdlEventSource::GP2XSdlEventSource()
: : _buttonStateL(false){
_buttonStateL(false),
SdlEventManager(boss) {
} }
void GP2XSdlEventManager::SDLModToOSystemKeyFlags(SDLMod mod, Common::Event &event) { void GP2XSdlEventSource::SDLModToOSystemKeyFlags(SDLMod mod, Common::Event &event) {
event.kbd.flags = 0; event.kbd.flags = 0;
if (mod & KMOD_SHIFT) if (mod & KMOD_SHIFT)
@ -108,7 +106,7 @@ void GP2XSdlEventManager::SDLModToOSystemKeyFlags(SDLMod mod, Common::Event &eve
event.kbd.flags |= Common::KBD_CAPS; event.kbd.flags |= Common::KBD_CAPS;
} }
void GP2XSdlEventManager::moveStick() { void GP2XSdlEventSource::moveStick() {
bool stickBtn[32]; bool stickBtn[32];
memcpy(stickBtn, _stickBtn, sizeof(stickBtn)); memcpy(stickBtn, _stickBtn, sizeof(stickBtn));
@ -189,7 +187,7 @@ GP2X_BUTTON_L & GP2X_BUTTON_A Common::EVENT_PREDICTIVE_DIALOG for predictive
GP2X_BUTTON_L & GP2X_BUTTON_Y Toggles setZoomOnMouse() for larger then 320*240 games to scale to the point + raduis. (GP2X only) GP2X_BUTTON_L & GP2X_BUTTON_Y Toggles setZoomOnMouse() for larger then 320*240 games to scale to the point + raduis. (GP2X only)
*/ */
bool GP2XSdlEventManager::handleKeyDown(SDL_Event &ev, Common::Event &event) { bool GP2XSdlEventSource::handleKeyDown(SDL_Event &ev, Common::Event &event) {
SDLModToOSystemKeyFlags(SDL_GetModState(), event); SDLModToOSystemKeyFlags(SDL_GetModState(), event);
if (remapKey(ev, event)) if (remapKey(ev, event))
@ -202,7 +200,7 @@ bool GP2XSdlEventManager::handleKeyDown(SDL_Event &ev, Common::Event &event) {
return true; return true;
} }
bool GP2XSdlEventManager::handleKeyUp(SDL_Event &ev, Common::Event &event) { bool GP2XSdlEventSource::handleKeyUp(SDL_Event &ev, Common::Event &event) {
if (remapKey(ev, event)) if (remapKey(ev, event))
return true; return true;
@ -224,7 +222,7 @@ bool GP2XSdlEventManager::handleKeyUp(SDL_Event &ev, Common::Event &event) {
return true; return true;
} }
bool GP2XSdlEventManager::handleJoyButtonDown(SDL_Event &ev, Common::Event &event) { bool GP2XSdlEventSource::handleJoyButtonDown(SDL_Event &ev, Common::Event &event) {
_stickBtn[ev.jbutton.button] = 1; _stickBtn[ev.jbutton.button] = 1;
event.kbd.flags = 0; event.kbd.flags = 0;
@ -353,7 +351,7 @@ bool GP2XSdlEventManager::handleJoyButtonDown(SDL_Event &ev, Common::Event &even
return true; return true;
} }
bool GP2XSdlEventManager::handleJoyButtonUp(SDL_Event &ev, Common::Event &event) { bool GP2XSdlEventSource::handleJoyButtonUp(SDL_Event &ev, Common::Event &event) {
_stickBtn[ev.jbutton.button] = 0; _stickBtn[ev.jbutton.button] = 0;
event.kbd.flags = 0; event.kbd.flags = 0;
@ -439,7 +437,7 @@ bool GP2XSdlEventManager::handleJoyButtonUp(SDL_Event &ev, Common::Event &event)
return true; return true;
} }
bool GP2XSdlEventManager::handleJoyAxisMotion(SDL_Event &ev, Common::Event &event) { bool GP2XSdlEventSource::handleJoyAxisMotion(SDL_Event &ev, Common::Event &event) {
int axis = ev.jaxis.value; int axis = ev.jaxis.value;
if ( axis > JOY_DEADZONE) { if ( axis > JOY_DEADZONE) {
axis -= JOY_DEADZONE; axis -= JOY_DEADZONE;
@ -486,7 +484,7 @@ bool GP2XSdlEventManager::handleJoyAxisMotion(SDL_Event &ev, Common::Event &even
return true; return true;
} }
bool GP2XSdlEventManager::remapKey(SDL_Event &ev, Common::Event &event) { bool GP2XSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) {
return false; return false;
} }

8
backends/events/gp2xsdl/gp2xsdl-events.h
View file

@ -31,9 +31,9 @@
/** /**
* SDL events manager for GP2X and GP2XWIZ * SDL events manager for GP2X and GP2XWIZ
*/ */
class GP2XSdlEventManager : public SdlEventManager { class GP2XSdlEventSource : public SdlEventSource {
public: public:
GP2XSdlEventManager(Common::EventSource *boss); GP2XSdlEventSource();
protected: protected:
bool _stickBtn[32]; bool _stickBtn[32];
@ -50,11 +50,11 @@ protected:
virtual bool handleKeyUp(SDL_Event &ev, Common::Event &event); virtual bool handleKeyUp(SDL_Event &ev, Common::Event &event);
virtual bool handleJoyButtonDown(SDL_Event &ev, Common::Event &event); virtual bool handleJoyButtonDown(SDL_Event &ev, Common::Event &event);
virtual bool handleJoyButtonUp(SDL_Event &ev, Common::Event &event); virtual bool handleJoyButtonUp(SDL_Event &ev, Common::Event &event);
virtual bool GP2XSdlEventManager::handleJoyAxisMotion(SDL_Event &ev, Common::Event &event); virtual bool handleJoyAxisMotion(SDL_Event &ev, Common::Event &event);
virtual void SDLModToOSystemKeyFlags(SDLMod mod, Common::Event &event); virtual void SDLModToOSystemKeyFlags(SDLMod mod, Common::Event &event);
virtual bool GP2XSdlEventManager::remapKey(SDL_Event &ev, Common::Event &event); virtual bool remapKey(SDL_Event &ev, Common::Event &event);
}; };
#endif #endif

10
backends/events/samsungtvsdl/samsungtvsdl-events.cpp
View file

@ -27,13 +27,7 @@
#include "backends/events/samsungtvsdl/samsungtvsdl-events.h" #include "backends/events/samsungtvsdl/samsungtvsdl-events.h"
SamsungTVSdlEventManager::SamsungTVSdlEventManager(Common::EventSource *boss) bool SamsungTVSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) {
:
SdlEventManager(boss) {
}
bool SamsungTVSdlEventManager::remapKey(SDL_Event &ev, Common::Event &event) {
switch (ev.type) { switch (ev.type) {
case SDL_KEYDOWN:{ case SDL_KEYDOWN:{
if (ev.key.keysym.sym == SDLK_POWER) { if (ev.key.keysym.sym == SDLK_POWER) {
@ -72,7 +66,7 @@ bool SamsungTVSdlEventManager::remapKey(SDL_Event &ev, Common::Event &event) {
} }
// Invoke parent implementation of this method // Invoke parent implementation of this method
return SdlEventManager::remapKey(ev, event); return SdlEventSource::remapKey(ev, event);
} }
#endif #endif

5
backends/events/samsungtvsdl/samsungtvsdl-events.h
View file

@ -31,10 +31,7 @@
/** /**
* SDL events manager for Samsung TV * SDL events manager for Samsung TV
*/ */
class SamsungTVSdlEventManager : public SdlEventManager { class SamsungTVSdlEventSource : public SdlEventSource {
public:
SamsungTVSdlEventManager(Common::EventSource *boss);
protected: protected:
virtual bool remapKey(SDL_Event &ev, Common::Event &event); virtual bool remapKey(SDL_Event &ev, Common::Event &event);
}; };

4
backends/events/sdl/sdl-events.h
View file

@ -94,10 +94,10 @@ protected:
/** @name Event Handlers /** @name Event Handlers
* Handlers for specific SDL events, called by SdlEventManager::dispatchSDLEvent(). * Handlers for specific SDL events, called by SdlEventSource::dispatchSDLEvent().
* This way, if a managers inherits fromt this SDL events manager, it can * This way, if a managers inherits fromt this SDL events manager, it can
* change the behavior of only a single event, without having to override all * change the behavior of only a single event, without having to override all
* of SdlEventManager::dispatchSDLEvent(). * of SdlEventSource::dispatchSDLEvent().
*/ */
//@{ //@{

10
backends/events/symbiansdl/symbiansdl-events.cpp
View file

@ -32,23 +32,21 @@
#include <bautils.h> #include <bautils.h>
SymbianSdlEventManager::zoneDesc SymbianSdlEventManager::_zones[TOTAL_ZONES] = { SymbianSdlEventSource::zoneDesc SymbianSdlEventSource::_zones[TOTAL_ZONES] = {
{ 0, 0, 320, 145 }, { 0, 0, 320, 145 },
{ 0, 145, 150, 55 }, { 0, 145, 150, 55 },
{ 150, 145, 170, 55 } { 150, 145, 170, 55 }
}; };
SymbianSdlEventManager::SymbianSdlEventManager(Common::EventSource *boss) SymbianSdlEventSource::SymbianSdlEventSource(Common::EventSource *boss)
: : _currentZone(0) {
_currentZone(0),
SdlEventManager(boss) {
for (int i = 0; i < TOTAL_ZONES; i++) { for (int i = 0; i < TOTAL_ZONES; i++) {
_mouseXZone[i] = (_zones[i].x + (_zones[i].width / 2)); _mouseXZone[i] = (_zones[i].x + (_zones[i].width / 2));
_mouseYZone[i] = (_zones[i].y + (_zones[i].height / 2)); _mouseYZone[i] = (_zones[i].y + (_zones[i].height / 2));
} }
} }
bool SymbianSdlEventManager::remapKey(SDL_Event &ev, Common::Event &event) { bool SymbianSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) {
if (GUI::Actions::Instance()->mappingActive() || ev.key.keysym.sym <= SDLK_UNKNOWN) if (GUI::Actions::Instance()->mappingActive() || ev.key.keysym.sym <= SDLK_UNKNOWN)
return false; return false;

4
backends/events/symbiansdl/symbiansdl-events.h
View file

@ -33,9 +33,9 @@
/** /**
* SDL events manager for Symbian * SDL events manager for Symbian
*/ */
class SymbianSdlEventManager : public SdlEventManager { class SymbianSdlEventSource : public SdlEventSource {
public: public:
SymbianSdlEventManager(Common::EventSource *boss); SymbianSdlEventSource();
protected: protected:
// Used to handle joystick navi zones // Used to handle joystick navi zones

2
backends/platform/gp2x/gp2x.cpp
View file

@ -137,7 +137,7 @@ void OSystem_GP2X::initBackend() {
// Create the events manager // Create the events manager
if (_eventManager == 0) if (_eventManager == 0)
_eventManager = new GP2XSdlEventManager(this); _eventManager = new GP2XSdlEventSource(this);
// Create the graphics manager // Create the graphics manager
if (_graphicsManager == 0) if (_graphicsManager == 0)

2
backends/platform/linuxmoto/linuxmoto-sdl.cpp
View file

@ -31,7 +31,7 @@
void OSystem_LINUXMOTO::initBackend() { void OSystem_LINUXMOTO::initBackend() {
// Create the backend custom managers // Create the backend custom managers
if (_eventManager == 0) if (_eventManager == 0)
_eventManager = new LinuxmotoSdlEventManager(this); _eventManager = new LinuxmotoSdlEventSource(this);
if (_graphicsManager == 0) if (_graphicsManager == 0)
_graphicsManager = new LinuxmotoSdlGraphicsManager(); _graphicsManager = new LinuxmotoSdlGraphicsManager();

2
backends/platform/samsungtv/samsungtv.cpp
View file

@ -42,7 +42,7 @@ bool OSystem_SDL_SamsungTV::hasFeature(Feature f) {
void OSystem_SDL_SamsungTV::initBackend() { void OSystem_SDL_SamsungTV::initBackend() {
// Create the events manager // Create the events manager
if (_eventManager == 0) if (_eventManager == 0)
_eventManager = new SamsungTVSdlEventManager(this); _eventManager = new SamsungTVSdlEventSource(this);
// Call parent implementation of this method // Call parent implementation of this method
OSystem_SDL::initBackend(); OSystem_SDL::initBackend();

2
backends/platform/symbian/src/SymbianOS.cpp
View file

@ -102,7 +102,7 @@ void OSystem_SDL_Symbian::initBackend() {
// Creates the backend managers // Creates the backend managers
if (_eventManager == 0) if (_eventManager == 0)
_eventManager = new SymbianSdlEventManager(this); _eventManager = new SymbianSdlEventSource(this);
if (_mixerManager == 0) { if (_mixerManager == 0) {
_mixerManager = new SymbianSdlMixerManager(); _mixerManager = new SymbianSdlMixerManager();