Revert "KEYMAPPER: Make global keymap that is always active"

This reverts commit ac85d134b31f770f27d085c0fe4c307e278c1875.

4 files changed, 3 insertions, 30 deletions

diff --git a/backends/keymapper/keymapper.cpp b/backends/keymapper/keymapper.cpp
index f9d6e7a60f..29f495cd53 100644
--- a/backends/keymapper/keymapper.cpp
+++ b/backends/keymapper/keymapper.cpp
@@ -54,7 +54,7 @@ Keymap *Keymapper::Domain::getKeymap(const String& name) {
 }
 
 Keymapper::Keymapper(EventManager *evtMgr)
-	: _eventMan(evtMgr), _enabled(true), _hardwareKeys(0), _globalKeymap(0) {
+	: _eventMan(evtMgr), _enabled(true), _hardwareKeys(0) {
 	ConfigManager::Domain *confDom = ConfMan.getDomain(ConfigManager::kKeymapperDomain);
 
 	_globalDomain.setConfigDomain(confDom);
@@ -199,10 +199,6 @@ bool Keymapper::mapKey(const KeyState& key, bool keyDown) {
 				break;
 		}
 
-		// fallback to the global keymap
-		if (!action && _globalKeymap)
-			action = _globalKeymap->getMappedAction(key);
-
 		if (action)
 			_keysDown[key] = action;
 	} else {
diff --git a/backends/keymapper/keymapper.h b/backends/keymapper/keymapper.h
index 4722de5774..c5a2558964 100644
--- a/backends/keymapper/keymapper.h
+++ b/backends/keymapper/keymapper.h
@@ -173,9 +173,6 @@ public:
 	Domain& getGameDomain() { return _gameDomain; }
 	const Stack<MapRecord>& getActiveStack() const { return _activeMaps; }
 
-	void setGlobalKeymap(Keymap *keymap) { _globalKeymap = keymap; }
-	Keymap* getGlobalKeymap() const { return _globalKeymap; }
-
 private:
 
 	void initKeymap(Domain &domain, Keymap *keymap);
@@ -195,7 +192,6 @@ private:
 	bool _enabled;
 
 	Stack<MapRecord> _activeMaps;
-	Keymap *_globalKeymap;
 	HashMap<KeyState, Action*> _keysDown;
 
 };
diff --git a/backends/keymapper/remap-dialog.cpp b/backends/keymapper/remap-dialog.cpp
index 8edc5c5d39..b0f42fe426 100644
--- a/backends/keymapper/remap-dialog.cpp
+++ b/backends/keymapper/remap-dialog.cpp
@@ -357,26 +357,6 @@ void RemapDialog::loadKeymap() {
 			}
 		}
 
-		// get the mapping out of the global keymap
-		if (_keymapper->getGlobalKeymap()) {
-			List<const HardwareKey*>::iterator keyIt = freeKeys.begin();
-			Keymap *globalKeymap = _keymapper->getGlobalKeymap();
-			while (keyIt != freeKeys.end()) {
-				Action *act = globalKeymap->getMappedAction((*keyIt)->key);
-
-				if (act) {
-					ActionInfo info = {act, true, act->description + " (" + globalKeymap->getName() + ")"};
-					_currentActions.push_back(info);
-					freeKeys.erase(keyIt++);
-				} else {
-					++keyIt;
-				}
-				if (freeKeys.empty())
-					break;
-			}
-
-		}
-
 	} else if (_kmPopUp->getSelected() != -1) {
 		Keymap *km = _keymapTable[_kmPopUp->getSelectedTag()];
 
diff --git a/base/main.cpp b/base/main.cpp
index 352b5e9b33..61a05154c1 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -287,7 +287,8 @@ static void setupKeymapper(OSystem &system) {
 	act->addKeyEvent(KeyState(KEYCODE_F8, ASCII_F8, 0));
 
 	mapper->addGlobalKeymap(globalMap);
-	mapper->setGlobalKeymap(globalMap);
+
+	mapper->pushKeymap("global", true);
 #endif
 
 }