diff options
4 files changed, 13 insertions, 16 deletions
diff --git a/backends/events/linuxmotosdl/linuxmotosdl-events.cpp b/backends/events/linuxmotosdl/linuxmotosdl-events.cpp index abd8ad2da8..5e570f99dd 100644 --- a/backends/events/linuxmotosdl/linuxmotosdl-events.cpp +++ b/backends/events/linuxmotosdl/linuxmotosdl-events.cpp @@ -25,6 +25,9 @@ #if defined(LINUXMOTO) +// Disable symbol overrides so that we can use system headers. +#define FORBIDDEN_SYMBOL_EXCEPTION_FILE + #include "backends/events/linuxmotosdl/linuxmotosdl-events.h" #include "backends/platform/linuxmoto/linuxmoto-sdl.h" @@ -32,13 +35,7 @@ enum { GFX_HALF = 12 }; -LinuxmotoSdlEventManager::LinuxmotoSdlEventManager(Common::EventSource *boss) - : - SdlEventManager(boss) { - -} - -void LinuxmotoSdlEventManager::preprocessEvents(SDL_Event *event) { +void LinuxmotoSdlEventSource::preprocessEvents(SDL_Event *event) { if (event->type == SDL_ACTIVEEVENT) { if (event->active.state == SDL_APPINPUTFOCUS && !event->active.gain) { ((OSystem_SDL* )g_system)->getMixerManager()->suspendAudio(); @@ -60,7 +57,7 @@ void LinuxmotoSdlEventManager::preprocessEvents(SDL_Event *event) { } } -bool LinuxmotoSdlEventManager::remapKey(SDL_Event &ev, Common::Event &event) { +bool LinuxmotoSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) { if (false) {} // Motorol A1200/E6/A1600 remapkey by Lubomyr diff --git a/backends/events/linuxmotosdl/linuxmotosdl-events.h b/backends/events/linuxmotosdl/linuxmotosdl-events.h index 414db080ed..3b59f09245 100644 --- a/backends/events/linuxmotosdl/linuxmotosdl-events.h +++ b/backends/events/linuxmotosdl/linuxmotosdl-events.h @@ -31,10 +31,7 @@ /** * SDL events manager for LINUXMOTO */ -class LinuxmotoSdlEventManager : public SdlEventManager { -public: - LinuxmotoSdlEventManager(Common::EventSource *boss); - +class LinuxmotoSdlEventSource : public SdlEventSource { protected: virtual void preprocessEvents(SDL_Event *event); virtual bool remapKey(SDL_Event &ev, Common::Event &event); diff --git a/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp b/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp index be4dbe74c3..bf3330db4c 100644 --- a/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp +++ b/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp @@ -23,7 +23,7 @@ * */ -#ifdef LINUXMOTO +#if defined(LINUXMOTO) #include "backends/graphics/linuxmotosdl/linuxmotosdl-graphics.h" #include "backends/events/linuxmotosdl/linuxmotosdl-events.h" @@ -134,7 +134,7 @@ void LinuxmotoSdlGraphicsManager::initSize(uint w, uint h) { if (w > 320 || h > 240) { setGraphicsMode(GFX_HALF); setGraphicsModeIntern(); - ((LinuxmotoSdlEventManager *)g_system->getEventManager())->toggleMouseGrab(); + _sdlEventSource->toggleMouseGrab(); } _transactionDetails.sizeChanged = true; @@ -484,8 +484,8 @@ void LinuxmotoSdlGraphicsManager::adjustMouseEvent(const Common::Event &event) { newEvent.synthetic = true; if (!_overlayVisible) { if (_videoMode.mode == GFX_HALF) { - event.mouse.x *= 2; - event.mouse.y *= 2; + newEvent.mouse.x *= 2; + newEvent.mouse.y *= 2; } newEvent.mouse.x /= _videoMode.scaleFactor; newEvent.mouse.y /= _videoMode.scaleFactor; diff --git a/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.h b/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.h index 8124aca778..2a928ed7e1 100644 --- a/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.h +++ b/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.h @@ -26,6 +26,9 @@ #ifndef BACKENDS_GRAPHICS_SDL_LINUXMOTO_H #define BACKENDS_GRAPHICS_SDL_LINUXMOTO_H +// Disable symbol overrides so that we can use system headers. +#define FORBIDDEN_SYMBOL_EXCEPTION_FILE + #include "backends/graphics/sdl/sdl-graphics.h" class LinuxmotoSdlGraphicsManager : public SdlGraphicsManager { |