diff options
author | Max Horn | 2004-12-30 14:48:21 +0000 |
---|---|---|
committer | Max Horn | 2004-12-30 14:48:21 +0000 |
commit | 989ae4040299c87a2dcb747adb422dbe1458572e (patch) | |
tree | 62b55a10c90045c41587a75f5c147d406aa69974 /backends/sdl/events.cpp | |
parent | f0d0ce7979d89ab67cb702326f900dc721aa01a4 (diff) | |
download | scummvm-rg350-989ae4040299c87a2dcb747adb422dbe1458572e.tar.gz scummvm-rg350-989ae4040299c87a2dcb747adb422dbe1458572e.tar.bz2 scummvm-rg350-989ae4040299c87a2dcb747adb422dbe1458572e.zip |
Swallow ctrl-alt keyup events, too
svn-id: r16384
Diffstat (limited to 'backends/sdl/events.cpp')
-rw-r--r-- | backends/sdl/events.cpp | 59 |
1 files changed, 5 insertions, 54 deletions
diff --git a/backends/sdl/events.cpp b/backends/sdl/events.cpp index e5cdc89280..c7fe006e5b 100644 --- a/backends/sdl/events.cpp +++ b/backends/sdl/events.cpp @@ -392,69 +392,20 @@ bool OSystem_SDL::pollEvent(Event &event) { event.kbd.keycode = ev.key.keysym.sym; event.kbd.ascii = mapKey(ev.key.keysym.sym, ev.key.keysym.mod, ev.key.keysym.unicode); #endif - -/* Disabled mouse emulation code (fingolfin, 2004-12-18). - I am keeping the rest of the code in for now, since the joystick - code (or rather, "hack") uses it, too. - switch(ev.key.keysym.sym) { - case SDLK_LEFT: - _km.x_vel = -1; - _km.x_down_count = 1; - break; - case SDLK_RIGHT: - _km.x_vel = 1; - _km.x_down_count = 1; - break; - case SDLK_UP: - _km.y_vel = -1; - _km.y_down_count = 1; - break; - case SDLK_DOWN: - _km.y_vel = 1; - _km.y_down_count = 1; - break; - default: - break; - } -*/ return true; case SDL_KEYUP: event.type = EVENT_KEYUP; event.kbd.keycode = ev.key.keysym.sym; event.kbd.ascii = mapKey(ev.key.keysym.sym, ev.key.keysym.mod, ev.key.keysym.unicode); - event.kbd.flags = SDLModToOSystemKeyFlags(SDL_GetModState());; + event.kbd.flags = SDLModToOSystemKeyFlags(SDL_GetModState()); -/* - switch(ev.key.keysym.sym) { - case SDLK_LEFT: - if (_km.x_vel < 0) { - _km.x_vel = 0; - _km.x_down_count = 0; - } - break; - case SDLK_RIGHT: - if (_km.x_vel > 0) { - _km.x_vel = 0; - _km.x_down_count = 0; - } - break; - case SDLK_UP: - if (_km.y_vel < 0) { - _km.y_vel = 0; - _km.y_down_count = 0; - } - break; - case SDLK_DOWN: - if (_km.y_vel > 0) { - _km.y_vel = 0; - _km.y_down_count = 0; - } - break; - default: + // Ctrl-Alt-<key> will change the GFX mode + if ((b & (KBD_CTRL|KBD_ALT)) == (KBD_CTRL|KBD_ALT)) { + // Swallow these key up events break; } -*/ + return true; case SDL_MOUSEMOTION: |