From 72ea51356367f2cb1291b35aee67f4467cc380b3 Mon Sep 17 00:00:00 2001 From: Tarek Soliman Date: Tue, 29 Nov 2011 11:19:47 -0600 Subject: [PATCH] MAMEO: Add GMM keybinding for N900 (fix bug #3443043) The keybinding is Ctrl-Shift-m. Ctrl-m is more desirable but is toggling mouse capture. (cherry picked from commit dabea2b5151b5f220fb06a93e50a3eb43903385c) --- backends/events/maemosdl/maemosdl-events.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/backends/events/maemosdl/maemosdl-events.cpp b/backends/events/maemosdl/maemosdl-events.cpp index 32d5cfb5ace..07af3680648 100644 --- a/backends/events/maemosdl/maemosdl-events.cpp +++ b/backends/events/maemosdl/maemosdl-events.cpp @@ -47,7 +47,11 @@ bool MaemoSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) { switch (ev.type) { case SDL_KEYDOWN:{ - if (ev.key.keysym.sym == SDLK_F4) { + if (ev.key.keysym.sym == SDLK_F4 + || (model.modelType == kModelTypeN900 + && ev.key.keysym.sym == SDLK_m + && (ev.key.keysym.mod & KMOD_CTRL) + && (ev.key.keysym.mod & KMOD_SHIFT))) { event.type = Common::EVENT_MAINMENU; debug(9, "remapping to main menu"); return true; @@ -83,7 +87,11 @@ bool MaemoSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) { break; } case SDL_KEYUP: { - if (ev.key.keysym.sym == SDLK_F4) { + if (ev.key.keysym.sym == SDLK_F4 + || (model.modelType == kModelTypeN900 + && ev.key.keysym.sym == SDLK_m + && (ev.key.keysym.mod & KMOD_CTRL) + && (ev.key.keysym.mod & KMOD_SHIFT))) { event.type = Common::EVENT_MAINMENU; return true; } else if (ev.key.keysym.sym == SDLK_F6) {