diff options
author | Alejandro Marzini | 2010-07-15 01:21:20 +0000 |
---|---|---|
committer | Alejandro Marzini | 2010-07-15 01:21:20 +0000 |
commit | f53028d4a2d53238fb92e56bea6c737c57ffb123 (patch) | |
tree | 84f473bce0f643519a0ef7985619c25f731d8421 /backends/graphics/sdl | |
parent | 84ceae932852fe684ea553daee712b52da83add6 (diff) | |
download | scummvm-rg350-f53028d4a2d53238fb92e56bea6c737c57ffb123.tar.gz scummvm-rg350-f53028d4a2d53238fb92e56bea6c737c57ffb123.tar.bz2 scummvm-rg350-f53028d4a2d53238fb92e56bea6c737c57ffb123.zip |
Replaced the extra SDL functions added to GraphicsManager with an EventObserver in SdlGraphicsManager.
svn-id: r50900
Diffstat (limited to 'backends/graphics/sdl')
-rw-r--r-- | backends/graphics/sdl/sdl-graphics.cpp | 83 | ||||
-rw-r--r-- | backends/graphics/sdl/sdl-graphics.h | 21 |
2 files changed, 85 insertions, 19 deletions
diff --git a/backends/graphics/sdl/sdl-graphics.cpp b/backends/graphics/sdl/sdl-graphics.cpp index e8251a779d..8a95d757cc 100644 --- a/backends/graphics/sdl/sdl-graphics.cpp +++ b/backends/graphics/sdl/sdl-graphics.cpp @@ -184,6 +184,9 @@ SdlGraphicsManager::SdlGraphicsManager() #else _videoMode.fullscreen = true; #endif + + // Register the graphics manager as a event observer + g_system->getEventManager()->getEventDispatcher()->registerObserver(this, 2, false); } SdlGraphicsManager::~SdlGraphicsManager() { @@ -2087,16 +2090,17 @@ bool SdlGraphicsManager::isScalerHotkey(const Common::Event &event) { return false; } -void SdlGraphicsManager::forceFullRedraw() { - _forceFull = true; -} - -void SdlGraphicsManager::adjustMouseEvent(Common::Event &event) { - if (!_overlayVisible) { - event.mouse.x /= _videoMode.scaleFactor; - event.mouse.y /= _videoMode.scaleFactor; - if (_videoMode.aspectRatioCorrection) - event.mouse.y = aspect2Real(event.mouse.y); +void SdlGraphicsManager::adjustMouseEvent(const Common::Event &event) { + if (!event.synthetic) { + Common::Event newEvent(event); + newEvent.synthetic = true; + if (!_overlayVisible) { + newEvent.mouse.x /= _videoMode.scaleFactor; + newEvent.mouse.y /= _videoMode.scaleFactor; + if (_videoMode.aspectRatioCorrection) + newEvent.mouse.y = aspect2Real(newEvent.mouse.y); + } + g_system->getEventManager()->pushEvent(newEvent); } } @@ -2112,4 +2116,63 @@ void SdlGraphicsManager::toggleFullScreen() { #endif } +bool SdlGraphicsManager::notifyEvent(const Common::Event &event) { + switch (event.type) { + case Common::EVENT_KEYDOWN: + // Alt-Return and Alt-Enter toggle full screen mode + if (event.kbd.hasFlags(Common::KBD_ALT) && + (event.kbd.keycode == Common::KEYCODE_RETURN || + event.kbd.keycode == SDLK_KP_ENTER)) { + toggleFullScreen(); + return true; + } + + // Alt-S: Create a screenshot + if (event.kbd.hasFlags(Common::KBD_ALT) && event.kbd.keycode == 's') { + char filename[20]; + + for (int n = 0;; n++) { + SDL_RWops *file; + + sprintf(filename, "scummvm%05d.bmp", n); + file = SDL_RWFromFile(filename, "r"); + if (!file) + break; + SDL_RWclose(file); + } + if (saveScreenshot(filename)) + printf("Saved '%s'\n", filename); + else + printf("Could not save screenshot!\n"); + return true; + } + + // Ctrl-Alt-<key> will change the GFX mode + if ((event.kbd.flags & (Common::KBD_CTRL|Common::KBD_ALT)) == (Common::KBD_CTRL|Common::KBD_ALT)) { + if (handleScalerHotkeys(event.kbd.keycode)) + return true; + } + case Common::EVENT_KEYUP: + return isScalerHotkey(event); + case Common::EVENT_MOUSEMOVE: + if (event.synthetic) + setMousePos(event.mouse.x, event.mouse.y); + case Common::EVENT_LBUTTONDOWN: + case Common::EVENT_RBUTTONDOWN: + case Common::EVENT_WHEELUP: + case Common::EVENT_WHEELDOWN: + case Common::EVENT_MBUTTONDOWN: + case Common::EVENT_LBUTTONUP: + case Common::EVENT_RBUTTONUP: + case Common::EVENT_MBUTTONUP: + adjustMouseEvent(event); + return !event.synthetic; + /*case SDL_VIDEOEXPOSE: + _forceFull = true; + return false;*/ + } + + return false; +} + #endif diff --git a/backends/graphics/sdl/sdl-graphics.h b/backends/graphics/sdl/sdl-graphics.h index 0218be55dc..157c754a5f 100644 --- a/backends/graphics/sdl/sdl-graphics.h +++ b/backends/graphics/sdl/sdl-graphics.h @@ -27,8 +27,9 @@ #define BACKENDS_GRAPHICS_SDL_H #include "backends/graphics/graphics.h" -#include "common/system.h" #include "graphics/scaler.h" +#include "common/events.h" +#include "common/system.h" #if defined(__SYMBIAN32__) #include <esdl\SDL.h> @@ -72,7 +73,7 @@ public: /** * SDL graphics manager */ -class SdlGraphicsManager : public GraphicsManager { +class SdlGraphicsManager : public GraphicsManager, public Common::EventObserver { public: SdlGraphicsManager(); virtual ~SdlGraphicsManager(); @@ -127,13 +128,8 @@ public: virtual void displayMessageOnOSD(const char *msg); #endif - virtual void forceFullRedraw(); - virtual bool handleScalerHotkeys(Common::KeyCode key); - virtual bool isScalerHotkey(const Common::Event &event); - virtual void adjustMouseEvent(Common::Event &event); - virtual void setMousePos(int x, int y); - virtual void toggleFullScreen(); - virtual bool saveScreenshot(const char *filename); + // Override from Common::EventObserver + bool notifyEvent(const Common::Event &event); protected: #ifdef USE_OSD @@ -313,6 +309,13 @@ protected: virtual int effectiveScreenHeight() const; virtual void setGraphicsModeIntern(); + + virtual bool handleScalerHotkeys(Common::KeyCode key); + virtual bool isScalerHotkey(const Common::Event &event); + virtual void adjustMouseEvent(const Common::Event &event); + virtual void setMousePos(int x, int y); + virtual void toggleFullScreen(); + virtual bool saveScreenshot(const char *filename); }; #endif |