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

KEYMAPPER: Add non-key inputs to HardwareInput

Browse source
This commit is contained in:
Tarek Soliman 2012-02-24 13:55:48 -06:00
parent 101ec2b885
commit 4ee1a3acea
6 changed files with 97 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -354,9 +354,13 @@ void RemapDialog::loadKeymap() {
Keymapper::MapRecord mr = activeKeymaps[i];
debug(3, "RemapDialog::loadKeymap keymap: %s", mr.keymap->getName().c_str());
List<const HardwareInput *>::iterator inputIt = freeInputs.begin();
const HardwareInput *input = *inputIt;
while (inputIt != freeInputs.end()) {
Action *act = mr.keymap->getMappedAction((*inputIt)->key);
Action *act = 0;
// FIXME: Add support for kHardwareInputTypeGeneric
if (input->type == kHardwareInputTypeKeyboard)
act = mr.keymap->getMappedAction(input->key);
if (act) {
ActionInfo info = {act, true, act->description + " (" + mr.keymap->getName() + ")"};