diff options
| author | Max Horn | 2009-11-10 22:12:10 +0000 |
|---|---|---|
| committer | Max Horn | 2009-11-10 22:12:10 +0000 |
| commit | 58ed9271f52c61a077a2235181fc821e77e96ff0 (patch) | |
| tree | d8a8dc92ed4d26fe4b2fa90bef2064e2c3264e39 /backends/platform/sdl/events.cpp | |
| parent | 8b8f1548919b39458b7a682b8ef67f2d69c9ce02 (diff) | |
| download | scummvm-rg350-58ed9271f52c61a077a2235181fc821e77e96ff0.tar.gz scummvm-rg350-58ed9271f52c61a077a2235181fc821e77e96ff0.tar.bz2 scummvm-rg350-58ed9271f52c61a077a2235181fc821e77e96ff0.zip | |
SDL: cleanup
svn-id: r45817
Diffstat (limited to 'backends/platform/sdl/events.cpp')
| -rw-r--r-- | backends/platform/sdl/events.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/backends/platform/sdl/events.cpp b/backends/platform/sdl/events.cpp index b7fe40adb7..3da3958738 100644 --- a/backends/platform/sdl/events.cpp +++ b/backends/platform/sdl/events.cpp @@ -301,9 +301,8 @@ bool OSystem_SDL::handleKeyDown(SDL_Event &ev, Common::Event &event) { handleScalerHotkeys(ev.key); return false; } - const bool event_complete = remapKey(ev, event); - if (event_complete) + if (remapKey(ev, event)) return true; event.type = Common::EVENT_KEYDOWN; @@ -314,18 +313,15 @@ bool OSystem_SDL::handleKeyDown(SDL_Event &ev, Common::Event &event) { } bool OSystem_SDL::handleKeyUp(SDL_Event &ev, Common::Event &event) { - byte b = 0; - const bool event_complete = remapKey(ev, event); - - if (event_complete) + if (remapKey(ev, event)) return true; event.type = Common::EVENT_KEYUP; 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); - b = event.kbd.flags = SDLModToOSystemKeyFlags(SDL_GetModState()); // Ctrl-Alt-<key> will change the GFX mode + byte b = event.kbd.flags = SDLModToOSystemKeyFlags(SDL_GetModState()); if ((b & (Common::KBD_CTRL|Common::KBD_ALT)) == (Common::KBD_CTRL|Common::KBD_ALT)) { // Swallow these key up events return false; |