Changeset 1887 for code/trunk/src/core/input/KeyDetector.cc

Timestamp:

Oct 6, 2008, 12:31:32 AM (16 years ago)

Author:

rgrieder

Message:

FIRST THINGS FIRST: Delete or rename your keybindings.ini (def_keybindings.ini already has the most important bindings) or else you won't be able to do anything!

Changes:

• Multiple joy stick support should now fully work with KeyBinder too (only tested with 0/1 joystick)
• Reloading the OIS Devices now works with KeyBinder too
• Modified ConfigValueContainer to accept arbitrary section names
• added tkeybind to temporary bind a command to a key
• Fixed dlleport issue in ArgumentCompletionFunctions.h

Internal changes:

• General cleanup in initialisation of KeyBinder
• All names of keys/buttons/axes are now statically saved in InputInterfaces.h
• Move a magic value in KeyBinder to a configValue (MouseWheelStepSize_)
• Separated ConfigValues from Keybinding ConfigValueContainer in KeyBinder (looks much nicer now )
• Moved some performance critical small function to the inline section
• Removed the ugly keybind function construct from the InputManager
• More 'harmonising' work in KeyBinder

File:

• code/trunk/src/core/input/KeyDetector.cc (modified) (1 diff)

code/trunk/src/core/input/KeyDetector.cc

@@ -62 +62 @@
     /**
     @brief
-        Loads the key and button bindings.
-    @return
-        True if loading succeeded.
+        Assigns all the buttons 'command' plus the button's name.
     */
-    void KeyDetector::loadBindings(const std::string& command)
+    void KeyDetector::setCallbackCommand(const std::string& command)
     {
-        this->command_ = command;
+        callbackCommand_ = command;
         clearBindings();
-        setConfigValues();
+        for (std::map<std::string, Button*>::const_iterator it = allButtons_.begin(); it != allButtons_.end(); ++it)
+        {
+            it->second->bindingString_ = callbackCommand_ + it->second->name_;
+            it->second->parse();
+        }
     }
 
-    void KeyDetector::readTrigger(Button& button)
+    void KeyDetector::JoyStickDeviceNumberChanged(unsigned int value)
     {
-        SimpleCommand* cmd = new SimpleCommand();
-        cmd->evaluation_ = CommandExecutor::evaluate(this->command_ + " " + button.name_);
-        button.commands_[KeybindMode::OnPress] = new BaseCommand*[1];
-        button.commands_[KeybindMode::OnPress][0] = cmd;
-        button.nCommands_[KeybindMode::OnPress] = 1;
+        KeyBinder::JoyStickDeviceNumberChanged(value);
+        setCallbackCommand(callbackCommand_);
     }
 }