1 files changed, 46 insertions, 3 deletions

diff --git a/backends/platform/maemo/maemo.cpp b/backends/platform/maemo/maemo.cpp
index 77d630fc30..209e527e3f 100644
--- a/backends/platform/maemo/maemo.cpp
+++ b/backends/platform/maemo/maemo.cpp
@@ -32,6 +32,7 @@
 #include "backends/events/maemosdl/maemosdl-events.h"
 #include "backends/graphics/maemosdl/maemosdl-graphics.h"
 #include "backends/keymapper/keymapper.h"
+#include "backends/keymapper/keymapper-defaults.h"
 #include "common/textconsole.h"
 #include "common/translation.h"
 
@@ -48,8 +49,41 @@ OSystem_SDL_Maemo::OSystem_SDL_Maemo()
 
 OSystem_SDL_Maemo::~OSystem_SDL_Maemo() {
 	delete _eventObserver;
+#ifdef ENABLE_KEYMAPPER
+	delete _keymapperDefaultBindings;
+#endif
 }
 
+#ifdef ENABLE_KEYMAPPER
+static void registerDefaultKeyBindings(Common::KeymapperDefaultBindings *_keymapperDefaultBindings, Model _model) {
+	_keymapperDefaultBindings->setDefaultBinding("gui", "REM", "HOME");
+	_keymapperDefaultBindings->setDefaultBinding("global", "REM", "HOME");
+
+	if (_model.hasMenuKey && _model.hasHwKeyboard) {
+		_keymapperDefaultBindings->setDefaultBinding("gui", "FUL", "FULLSCREEN");
+		_keymapperDefaultBindings->setDefaultBinding("global", "FUL", "FULLSCREEN");
+	}
+
+	if (_model.hasHwKeyboard) {
+		_keymapperDefaultBindings->setDefaultBinding("gui", "VIR", "C+ZOOMMINUS");
+		_keymapperDefaultBindings->setDefaultBinding("global", "VIR", "C+ZOOMMINUS");
+	} else {
+		_keymapperDefaultBindings->setDefaultBinding("gui", "VIR", "FULLSCREEN");
+		_keymapperDefaultBindings->setDefaultBinding("global", "VIR", "FULLSCREEN");
+	}
+
+	if (_model.hasMenuKey )
+		_keymapperDefaultBindings->setDefaultBinding("global", "MEN", "MENU");
+	else
+		_keymapperDefaultBindings->setDefaultBinding("global", "MEN", "S+C+M");
+
+	_keymapperDefaultBindings->setDefaultBinding("gui", "CLO", "ESCAPE");
+
+	_keymapperDefaultBindings->setDefaultBinding("maemo", "RCL", "ZOOMPLUS");
+	_keymapperDefaultBindings->setDefaultBinding("maemo", "CLK", "ZOOMMINUS");
+}
+#endif
+
 void OSystem_SDL_Maemo::initBackend() {
 	// Create the events manager
 	if (_eventSource == 0)
@@ -61,9 +95,18 @@ void OSystem_SDL_Maemo::initBackend() {
 	if (_eventObserver == 0)
 		_eventObserver = new MaemoSdlEventObserver((MaemoSdlEventSource *)_eventSource);
 
+#ifdef ENABLE_KEYMAPPER
+	if (_keymapperDefaultBindings == 0)
+		_keymapperDefaultBindings = new Common::KeymapperDefaultBindings();
+#endif
+
 	ConfMan.set("vkeybdpath", DATA_PATH);
 
-	_model = Model(detectModel());
+	_model = detectModel();
+
+#ifdef ENABLE_KEYMAPPER
+	registerDefaultKeyBindings(_keymapperDefaultBindings, _model);
+#endif
 
 	// Call parent implementation of this method
 	OSystem_POSIX::initBackend();
@@ -146,13 +189,13 @@ Common::Keymap *OSystem_SDL_Maemo::getGlobalKeymap() {
 	evt.customType = Maemo::kEventClickMode;
 	act->addEvent(evt);
 
-	act = new Action(globalMap, "LCLK", _("Left Click"), kLeftClickActionType);
+	act = new Action(globalMap, "LCLK", _("Left Click"));
 	act->addLeftClickEvent();
 
 	act = new Action(globalMap, "MCLK", _("Middle Click"));
 	act->addMiddleClickEvent();
 
-	act = new Action(globalMap, "RCLK", _("Right Click"), kRightClickActionType);
+	act = new Action(globalMap, "RCLK", _("Right Click"));
 	act->addRightClickEvent();
 
 	return globalMap;