diff options
author | Johannes Schickel | 2011-03-08 19:48:34 +0100 |
---|---|---|
committer | Johannes Schickel | 2011-03-08 19:49:10 +0100 |
commit | aebd9c6ea03593abb409a5eb2e9ef15b5cb42c72 (patch) | |
tree | 45d95329c565d568c4db92a1c9c3e1983a52fba9 /backends/events/wincesdl | |
parent | 689b87a3e8944bc9a5ae759032ff530b50370021 (diff) | |
download | scummvm-rg350-aebd9c6ea03593abb409a5eb2e9ef15b5cb42c72.tar.gz scummvm-rg350-aebd9c6ea03593abb409a5eb2e9ef15b5cb42c72.tar.bz2 scummvm-rg350-aebd9c6ea03593abb409a5eb2e9ef15b5cb42c72.zip |
WINCE: Run astyle over WinCE related event and graphics source files.
Diffstat (limited to 'backends/events/wincesdl')
-rw-r--r-- | backends/events/wincesdl/wincesdl-events.cpp | 15 | ||||
-rw-r--r-- | backends/events/wincesdl/wincesdl-events.h | 6 |
2 files changed, 11 insertions, 10 deletions
diff --git a/backends/events/wincesdl/wincesdl-events.cpp b/backends/events/wincesdl/wincesdl-events.cpp index 86b2fd6917..d89f83d6a4 100644 --- a/backends/events/wincesdl/wincesdl-events.cpp +++ b/backends/events/wincesdl/wincesdl-events.cpp @@ -39,7 +39,7 @@ WINCESdlEventSource::WINCESdlEventSource() : _tapTime(0), _closeClick(false), _rbutton(false), - _freeLook(false) { + _freeLook(false) { } void WINCESdlEventSource::fillMouseEvent(Common::Event &event, int x, int y) { @@ -102,7 +102,8 @@ bool WINCESdlEventSource::pollEvent(Common::Event &event) { ((WINCESdlGraphicsManager *)((OSystem_SDL *)g_system)->getGraphicsManager())->_lastKeyPressed = 0; event.type = Common::EVENT_PREDICTIVE_DIALOG; return true; - } event.type = Common::EVENT_KEYDOWN; + } + event.type = Common::EVENT_KEYDOWN; if (!GUI::Actions::Instance()->mappingActive()) event.kbd.keycode = (Common::KeyCode)ev.key.keysym.sym; else @@ -131,7 +132,7 @@ bool WINCESdlEventSource::pollEvent(Common::Event &event) { event.kbd.flags = 0xFF; else if (ev.key.keysym.sym == SDLK_PAUSE) { ((WINCESdlGraphicsManager *)((OSystem_SDL *)g_system)->getGraphicsManager())->_lastKeyPressed = 0; - return false; // chew up the show agi dialog key up event + return false; // chew up the show agi dialog key up event } event.type = Common::EVENT_KEYUP; @@ -177,10 +178,10 @@ bool WINCESdlEventSource::pollEvent(Common::Event &event) { if (!_isSmartphone) { // handle double-taps - if (_tapTime) { // second tap + if (_tapTime) { // second tap if (_closeClick && (GetTickCount() - _tapTime < 1000)) { - if ( event.mouse.y <= 20 && - ((WINCESdlGraphicsManager *)((OSystem_SDL *)g_system)->getGraphicsManager())->_panelInitialized) { + if (event.mouse.y <= 20 && + ((WINCESdlGraphicsManager *)((OSystem_SDL *)g_system)->getGraphicsManager())->_panelInitialized) { // top of screen (show panel) ((WINCESdlGraphicsManager *)((OSystem_SDL *)g_system)->getGraphicsManager())->swap_panel_visibility(); } else if (!((WINCESdlGraphicsManager *)((OSystem_SDL *)g_system)->getGraphicsManager())->_noDoubleTapRMB) { @@ -212,7 +213,7 @@ bool WINCESdlEventSource::pollEvent(Common::Event &event) { ((WINCESdlGraphicsManager *)((OSystem_SDL *)g_system)->getGraphicsManager())->_toolbarHighDrawn = false; ((WINCESdlGraphicsManager *)((OSystem_SDL *)g_system)->getGraphicsManager())->internUpdateScreen(); } - if (((WINCESdlGraphicsManager *)((OSystem_SDL *)g_system)->getGraphicsManager())->_newOrientation != ((WINCESdlGraphicsManager *)((OSystem_SDL *)g_system)->getGraphicsManager())->_orientationLandscape){ + if (((WINCESdlGraphicsManager *)((OSystem_SDL *)g_system)->getGraphicsManager())->_newOrientation != ((WINCESdlGraphicsManager *)((OSystem_SDL *)g_system)->getGraphicsManager())->_orientationLandscape) { ((WINCESdlGraphicsManager *)((OSystem_SDL *)g_system)->getGraphicsManager())->_orientationLandscape = ((WINCESdlGraphicsManager *)((OSystem_SDL *)g_system)->getGraphicsManager())->_newOrientation; ((WINCESdlGraphicsManager *)((OSystem_SDL *)g_system)->getGraphicsManager())->_toolbarHighDrawn = false; ConfMan.setInt("landscape", ((WINCESdlGraphicsManager *)((OSystem_SDL *)g_system)->getGraphicsManager())->_orientationLandscape); diff --git a/backends/events/wincesdl/wincesdl-events.h b/backends/events/wincesdl/wincesdl-events.h index 4c5b194abd..da15b96fe1 100644 --- a/backends/events/wincesdl/wincesdl-events.h +++ b/backends/events/wincesdl/wincesdl-events.h @@ -53,9 +53,9 @@ private: int _tapY; long _tapTime; - bool _closeClick; // flag when taps are spatially close together - bool _rbutton; // double tap -> right button simulation - bool _freeLook; // freeLook mode (do not send mouse button events) + bool _closeClick; // flag when taps are spatially close together + bool _rbutton; // double tap -> right button simulation + bool _freeLook; // freeLook mode (do not send mouse button events) }; |