diff options
author | Bastien Bouclet | 2018-01-03 06:40:49 +0100 |
---|---|---|
committer | GitHub | 2018-01-03 06:40:49 +0100 |
commit | bb5e8d3a11711d409f89739cf3f054cd5bac8c4f (patch) | |
tree | 65148b8639cc0f93ff91559b0b9cb40d872cdb9c /backends/events | |
parent | 0c26da90bb7538fb8bbf866013993185467b194b (diff) | |
parent | 60a1100beba00d26ba2e53bbe5e1dd4de6b40a4b (diff) | |
download | scummvm-rg350-bb5e8d3a11711d409f89739cf3f054cd5bac8c4f.tar.gz scummvm-rg350-bb5e8d3a11711d409f89739cf3f054cd5bac8c4f.tar.bz2 scummvm-rg350-bb5e8d3a11711d409f89739cf3f054cd5bac8c4f.zip |
Merge pull request #1090 from bgK/remove-zaurus-yopy
PORTS: Remove the Zaurus and Yopy ports
Diffstat (limited to 'backends/events')
-rw-r--r-- | backends/events/sdl/sdl-events.cpp | 70 |
1 files changed, 0 insertions, 70 deletions
diff --git a/backends/events/sdl/sdl-events.cpp b/backends/events/sdl/sdl-events.cpp index 258f51a310..a3dee67f22 100644 --- a/backends/events/sdl/sdl-events.cpp +++ b/backends/events/sdl/sdl-events.cpp @@ -304,17 +304,10 @@ void SdlEventSource::SDLModToOSystemKeyFlags(SDLMod mod, Common::Event &event) { event.kbd.flags = 0; -#ifdef LINUPY - // Yopy has no ALT key, steal the SHIFT key - // (which isn't used much anyway) - if (mod & KMOD_SHIFT) - event.kbd.flags |= Common::KBD_ALT; -#else if (mod & KMOD_SHIFT) event.kbd.flags |= Common::KBD_SHIFT; if (mod & KMOD_ALT) event.kbd.flags |= Common::KBD_ALT; -#endif if (mod & KMOD_CTRL) event.kbd.flags |= Common::KBD_CTRL; if (mod & KMOD_META) @@ -1094,69 +1087,6 @@ bool SdlEventSource::handleAxisToMouseMotion(int16 xAxis, int16 yAxis) { } bool SdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) { -#ifdef LINUPY - // On Yopy map the End button to quit - if ((ev.key.keysym.sym == 293)) { - event.type = Common::EVENT_QUIT; - return true; - } - // Map menu key to f5 (scumm menu) - if (ev.key.keysym.sym == 306) { - event.type = Common::EVENT_KEYDOWN; - event.kbd.keycode = Common::KEYCODE_F5; - event.kbd.ascii = mapKey(SDLK_F5, ev.key.keysym.mod, 0); - return true; - } - // Map action key to action - if (ev.key.keysym.sym == 291) { - event.type = Common::EVENT_KEYDOWN; - event.kbd.keycode = Common::KEYCODE_TAB; - event.kbd.ascii = mapKey(SDLK_TAB, ev.key.keysym.mod, 0); - return true; - } - // Map OK key to skip cinematic - if (ev.key.keysym.sym == 292) { - event.type = Common::EVENT_KEYDOWN; - event.kbd.keycode = Common::KEYCODE_ESCAPE; - event.kbd.ascii = mapKey(SDLK_ESCAPE, ev.key.keysym.mod, 0); - return true; - } -#endif - -#ifdef QTOPIA - // Quit on fn+backspace on zaurus - if (ev.key.keysym.sym == 127) { - event.type = Common::EVENT_QUIT; - return true; - } - - // Map menu key (f11) to f5 (scumm menu) - if (ev.key.keysym.sym == SDLK_F11) { - event.type = Common::EVENT_KEYDOWN; - event.kbd.keycode = Common::KEYCODE_F5; - event.kbd.ascii = mapKey(SDLK_F5, ev.key.keysym.mod, 0); - } - // Map center (space) to tab (default action) - // I wanted to map the calendar button but the calendar comes up - else if (ev.key.keysym.sym == SDLK_SPACE) { - event.type = Common::EVENT_KEYDOWN; - event.kbd.keycode = Common::KEYCODE_TAB; - event.kbd.ascii = mapKey(SDLK_TAB, ev.key.keysym.mod, 0); - } - // Since we stole space (pause) above we'll rebind it to the tab key on the keyboard - else if (ev.key.keysym.sym == SDLK_TAB) { - event.type = Common::EVENT_KEYDOWN; - event.kbd.keycode = Common::KEYCODE_SPACE; - event.kbd.ascii = mapKey(SDLK_SPACE, ev.key.keysym.mod, 0); - } else { - // Let the events fall through if we didn't change them, this may not be the best way to - // set it up, but i'm not sure how sdl would like it if we let if fall through then redid it though. - // and yes i have an huge terminal size so i dont wrap soon enough. - event.type = Common::EVENT_KEYDOWN; - event.kbd.keycode = ev.key.keysym.sym; - event.kbd.ascii = mapKey(ev.key.keysym.sym, ev.key.keysym.mod, ev.key.keysym.unicode); - } -#endif return false; } |