diff options
| author | Johannes Schickel | 2010-01-25 01:39:44 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-01-25 01:39:44 +0000 |
| commit | aed02365ec81e77b3c8aa4f4ecd9a9d3893326f2 (patch) | |
| tree | 95f119e687a666f65aad5041910c43bdfd4f2929 /backends/platform/linuxmoto | |
| parent | ec14cd6e6add76ce4f719edd7ce508d67ebd9f14 (diff) | |
| download | scummvm-rg350-aed02365ec81e77b3c8aa4f4ecd9a9d3893326f2.tar.gz scummvm-rg350-aed02365ec81e77b3c8aa4f4ecd9a9d3893326f2.tar.bz2 scummvm-rg350-aed02365ec81e77b3c8aa4f4ecd9a9d3893326f2.zip | |
Strip trailing spaces/tabs.
svn-id: r47541
Diffstat (limited to 'backends/platform/linuxmoto')
| -rw-r--r-- | backends/platform/linuxmoto/linuxmoto-events.cpp | 20 | ||||
| -rw-r--r-- | backends/platform/linuxmoto/linuxmoto-sdl.cpp | 4 |
2 files changed, 12 insertions, 12 deletions
diff --git a/backends/platform/linuxmoto/linuxmoto-events.cpp b/backends/platform/linuxmoto/linuxmoto-events.cpp index 50daa12d5b..007f7c732b 100644 --- a/backends/platform/linuxmoto/linuxmoto-events.cpp +++ b/backends/platform/linuxmoto/linuxmoto-events.cpp @@ -110,7 +110,7 @@ bool OSystem_LINUXMOTO::remapKey(SDL_Event &ev, Common::Event &event) { ev.key.keysym.sym = SDLK_RIGHTBRACKET; } // mod+vol'-' -> volume'-' - else if (ev.key.keysym.sym == SDLK_d) { + else if (ev.key.keysym.sym == SDLK_d) { ev.key.keysym.sym = SDLK_LEFTBRACKET; } #endif @@ -175,33 +175,33 @@ bool OSystem_LINUXMOTO::remapKey(SDL_Event &ev, Common::Event &event) { fillMouseEvent(event, _km.x, _km.y); return true; - } else if (ev.key.keysym.sym == SDLK_RETURN) { - // Joystick center to pressing Left Mouse + } else if (ev.key.keysym.sym == SDLK_RETURN) { + // Joystick center to pressing Left Mouse if (ev.key.type == SDL_KEYDOWN) { event.type = Common::EVENT_LBUTTONDOWN; } else { - event.type = Common::EVENT_LBUTTONUP; + event.type = Common::EVENT_LBUTTONUP; } fillMouseEvent(event, _km.x, _km.y); return true; - } else if (ev.key.keysym.sym == SDLK_PLUS) { + } else if (ev.key.keysym.sym == SDLK_PLUS) { // Volume Up to pressing Right Mouse if (ev.key.type == SDL_KEYDOWN ) { event.type = Common::EVENT_RBUTTONDOWN; } else { - event.type = Common::EVENT_RBUTTONUP; + event.type = Common::EVENT_RBUTTONUP; } fillMouseEvent(event, _km.x, _km.y); return true; - } else if (ev.key.keysym.sym == SDLK_MINUS) { - // Volume Down to pressing Left Mouse + } else if (ev.key.keysym.sym == SDLK_MINUS) { + // Volume Down to pressing Left Mouse if (ev.key.type == SDL_KEYDOWN) { event.type = Common::EVENT_LBUTTONDOWN; } else { - event.type = Common::EVENT_LBUTTONUP; + event.type = Common::EVENT_LBUTTONUP; } fillMouseEvent(event, _km.x, _km.y); @@ -214,7 +214,7 @@ bool OSystem_LINUXMOTO::remapKey(SDL_Event &ev, Common::Event &event) { event.type = Common::EVENT_KEYDOWN; event.kbd.keycode = (Common::KeyCode)ev.key.keysym.sym; event.kbd.ascii = mapKey(ev.key.keysym.sym, ev.key.keysym.mod, ev.key.keysym.unicode); - } + } return false; } diff --git a/backends/platform/linuxmoto/linuxmoto-sdl.cpp b/backends/platform/linuxmoto/linuxmoto-sdl.cpp index 91b4f08e82..ad1af455c3 100644 --- a/backends/platform/linuxmoto/linuxmoto-sdl.cpp +++ b/backends/platform/linuxmoto/linuxmoto-sdl.cpp @@ -28,7 +28,7 @@ void OSystem_LINUXMOTO::preprocessEvents(SDL_Event *event) { if (event->type == SDL_ACTIVEEVENT) { if (event->active.state == SDL_APPINPUTFOCUS && !event->active.gain) { - suspendAudio(); + suspendAudio(); for (;;) { if (!SDL_WaitEvent(event)) { SDL_Delay(10); @@ -61,7 +61,7 @@ int OSystem_LINUXMOTO::resumeAudio() { SDL_PauseAudio(0); _audioSuspended = false; return 0; -} +} void OSystem_LINUXMOTO::setupMixer() { OSystem_SDL::setupMixer(); |