From 657206bc5b840006ea9f98767ade937f9fc0fab0 Mon Sep 17 00:00:00 2001
From: Tarek Soliman
Date: Tue, 28 Feb 2012 06:39:09 -0600
Subject: MAEMO: Define only special keys to Keymapper

Also get rid of static tables in headers.
---
 backends/platform/maemo/maemo.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'backends/platform/maemo/maemo.cpp')

diff --git a/backends/platform/maemo/maemo.cpp b/backends/platform/maemo/maemo.cpp
index d1cdbc96c0..e296d4787c 100644
--- a/backends/platform/maemo/maemo.cpp
+++ b/backends/platform/maemo/maemo.cpp
@@ -28,7 +28,6 @@
 #include "common/config-manager.h"
 
 #include "backends/platform/maemo/maemo.h"
-#include "backends/platform/maemo/maemo-keys.h"
 #include "backends/events/maemosdl/maemosdl-events.h"
 #include "backends/graphics/maemosdl/maemosdl-graphics.h"
 #include "backends/keymapper/keymapper.h"
@@ -181,9 +180,20 @@ void OSystem_SDL_Maemo::setupIcon() {
 	// http://bugzilla.libsdl.org/show_bug.cgi?id=586
 }
 
+static const Common::KeyTableEntry maemoKeys[] = {
+	// Function keys
+	{"MENU", Common::KEYCODE_F11, 0, "Menu", false},
+	{"HOME", Common::KEYCODE_F12, 0, "Home", false},
+	{"FULLSCREEN", Common::KEYCODE_F13, 0, "FullScreen", false},
+	{"ZOOMPLUS", Common::KEYCODE_F14, 0, "Zoom+", false},
+	{"ZOOMMINUS", Common::KEYCODE_F15, 0, "Zoom-", false},
+
+	{0, Common::KEYCODE_INVALID, 0, 0, false}
+};
+
 #ifdef ENABLE_KEYMAPPER
 Common::HardwareInputSet *OSystem_SDL_Maemo::getHardwareInputSet() {
-	return new Common::HardwareInputSet(false, Common::maemoKeys, Common::maemoModifiers);
+	return new Common::HardwareInputSet(true, maemoKeys);
 }
 
 Common::Keymap *OSystem_SDL_Maemo::getGlobalKeymap() {
-- 
cgit v1.2.3