Changeset 8027

Timestamp:

Mar 6, 2011, 1:16:56 AM (14 years ago)

Author:

landauf

Message:

added translator map to InputBuffer for numpad keys - now they can also be used to type text into the ingame console

Location:

code/branches/usability/src/libraries/core/input

Files:

• InputBuffer.cc (modified) (2 diffs)
• InputBuffer.h (modified) (1 diff)

code/branches/usability/src/libraries/core/input/InputBuffer.cc

@@ -47 +47 @@
                                \\\"(){}[]<>.:,;_-+*/=!?|$&%^~#";
 
+        this->keyTranslator_[KeyCode::Numpad0]      = '0';
+        this->keyTranslator_[KeyCode::Numpad1]      = '1';
+        this->keyTranslator_[KeyCode::Numpad2]      = '2';
+        this->keyTranslator_[KeyCode::Numpad3]      = '3';
+        this->keyTranslator_[KeyCode::Numpad4]      = '4';
+        this->keyTranslator_[KeyCode::Numpad5]      = '5';
+        this->keyTranslator_[KeyCode::Numpad6]      = '6';
+        this->keyTranslator_[KeyCode::Numpad7]      = '7';
+        this->keyTranslator_[KeyCode::Numpad8]      = '8';
+        this->keyTranslator_[KeyCode::Numpad9]      = '9';
+        this->keyTranslator_[KeyCode::NumpadPeriod] = '.';
+        this->keyTranslator_[KeyCode::Divide]       = '/';
+        this->keyTranslator_[KeyCode::NumpadEnter]  = '\n';
+
         this->lastKey_ = KeyCode::Unassigned;
         this->timeSinceKeyPressed_ = 0.0f;
@@ -228 +242 @@
         }
 
-        this->insert(static_cast<char>(evt.getText()));
+        std::map<KeyCode::ByEnum, char>::iterator it = this->keyTranslator_.find(evt.getKeyCode());
+        if (it != this->keyTranslator_.end())
+            this->insert(it->second);
+        else
+            this->insert(static_cast<char>(evt.getText()));
     }
 

code/branches/usability/src/libraries/core/input/InputBuffer.h

@@ -178 +178 @@
             std::list<BaseInputBufferListenerTuple*> listeners_;
             std::string allowedChars_;
+            std::map<KeyCode::ByEnum, char> keyTranslator_;
             unsigned int maxLength_;
             unsigned int cursor_;