[Scummvm-cvs-logs] scummvm master -> dabea2b5151b5f220fb06a93e50a3eb43903385c

tsoliman tarek at bashasoliman.com
Tue Nov 29 18:33:53 CET 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
dabea2b515 MAMEO: Add GMM keybinding for N900 (fix bug #3443043)


Commit: dabea2b5151b5f220fb06a93e50a3eb43903385c
    https://github.com/scummvm/scummvm/commit/dabea2b5151b5f220fb06a93e50a3eb43903385c
Author: Tarek Soliman (tsoliman at scummvm.org)
Date: 2011-11-29T09:25:58-08:00

Commit Message:
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.

Changed paths:
    backends/events/maemosdl/maemosdl-events.cpp



diff --git a/backends/events/maemosdl/maemosdl-events.cpp b/backends/events/maemosdl/maemosdl-events.cpp
index 32d5cfb..07af368 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) {






More information about the Scummvm-git-logs mailing list