Changeset 6311 for code/branches/presentation2/src/libraries/core/input/KeyBinder.h

Timestamp:

Dec 9, 2009, 11:17:14 PM (14 years ago)

Author:

dafrick

Message:

The KeyBindMenu now shows all Keybindings and allows for various manipulations.
For this the bookkeeping in KeyBinder has ben improved.
Also KeyEscape now can't be bound to other commands.

File:

• code/branches/presentation2/src/libraries/core/input/KeyBinder.h (modified) (4 diffs)

code/branches/presentation2/src/libraries/core/input/KeyBinder.h

@@ -35 +35 @@
 #include <string>
 #include <vector>
+#include <map>
 #include <boost/shared_ptr.hpp>
 
@@ -66 +67 @@
         bool setBinding(const std::string& binding, const std::string& name, bool bTemporary = false);
         std::string getBinding(std::string commandName); //tolua_export
+        std::string getBinding(std::string commandName, unsigned int index); //tolua_export
+        unsigned int getNumberOfBindings(std::string commandName); //tolua_export
+        
         const std::string& getBindingsFilename()
             { return this->filename_; }
@@ -135 +139 @@
         std::vector<HalfAxis*> allHalfAxes_;
         //! Maps input commands to all Button names, including half axes
-        std::map<std::string, std::string> allCommands_;
+        std::map< std::string, std::vector<std::string> > allCommands_;
 
         /**
@@ -156 +160 @@
 
     private:
+        void addButtonToCommand(std::string command, Button* button);
+        
         //##### ConfigValues #####
         //! Whether to filter small value analog input