thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
This reverts commit ac85d134b3.
This commit is contained in:
Tarek Soliman 2011-11-02 10:16:16 -05:00
parent 6523454db5
commit b708d6de79
4 changed files with 3 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

6
backends/keymapper/keymapper.cpp
View file

@ -54,7 +54,7 @@ Keymap *Keymapper::Domain::getKeymap(const String& name) {
} }
Keymapper::Keymapper(EventManager *evtMgr) 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); ConfigManager::Domain *confDom = ConfMan.getDomain(ConfigManager::kKeymapperDomain);
_globalDomain.setConfigDomain(confDom); _globalDomain.setConfigDomain(confDom);
@ -199,10 +199,6 @@ bool Keymapper::mapKey(const KeyState& key, bool keyDown) {
break; break;
} }
// fallback to the global keymap
if (!action && _globalKeymap)
action = _globalKeymap->getMappedAction(key);
if (action) if (action)
_keysDown[key] = action; _keysDown[key] = action;
} else { } else {

4
backends/keymapper/keymapper.h
View file

@ -173,9 +173,6 @@ public:
Domain& getGameDomain() { return _gameDomain; } Domain& getGameDomain() { return _gameDomain; }
const Stack<MapRecord>& getActiveStack() const { return _activeMaps; } const Stack<MapRecord>& getActiveStack() const { return _activeMaps; }
void setGlobalKeymap(Keymap *keymap) { _globalKeymap = keymap; }
Keymap* getGlobalKeymap() const { return _globalKeymap; }
private: private:
void initKeymap(Domain &domain, Keymap *keymap); void initKeymap(Domain &domain, Keymap *keymap);
@ -195,7 +192,6 @@ private:
bool _enabled; bool _enabled;
Stack<MapRecord> _activeMaps; Stack<MapRecord> _activeMaps;
Keymap *_globalKeymap;
HashMap<KeyState, Action*> _keysDown; HashMap<KeyState, Action*> _keysDown;
}; };

20
backends/keymapper/remap-dialog.cpp
View file

@ -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) { } else if (_kmPopUp->getSelected() != -1) {
Keymap *km = _keymapTable[_kmPopUp->getSelectedTag()]; Keymap *km = _keymapTable[_kmPopUp->getSelectedTag()];

3
base/main.cpp
View file

@ -287,7 +287,8 @@ static void setupKeymapper(OSystem &system) {
act->addKeyEvent(KeyState(KEYCODE_F8, ASCII_F8, 0)); act->addKeyEvent(KeyState(KEYCODE_F8, ASCII_F8, 0));
mapper->addGlobalKeymap(globalMap); mapper->addGlobalKeymap(globalMap);
mapper->setGlobalKeymap(globalMap);
mapper->pushKeymap("global", true);
#endif #endif
} }