Changeset 1312 for code/branches/console/src/core/InputBuffer.cc

Timestamp:

May 16, 2008, 6:03:46 PM (17 years ago)

Author:

landauf

Message:

changed InputBuffer, added OutputBuffer and made a first sketch of Shell.

File:

• code/branches/console/src/core/InputBuffer.cc (modified) (4 diffs)

code/branches/console/src/core/InputBuffer.cc

@@ -38 +38 @@
     InputBuffer::InputBuffer()
     {
-        //this->bActivated_ = false;
-        this->allowedChars_ = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZäöüÄÖÜ0123456789 \\\"(){}[]<>.:,;_-+*/=!?|$&%^~#";
+        this->allowedChars_ = "abcdefghijklmnopqrstuvwxyz \
+                               ABCDEFGHIJKLMNOPQRSTUVWXYZ \
+                               äëïöüÄËÏÖÜáâàéêèíîìóôòúûù \
+                               0123456789 \
+                               \\\"(){}[]<>.:,;_-+*/=!?|$&%^~#";
         this->keyboard_ = InputManager::getSingleton().getKeyboard();
         this->buffer_ = "";
-
-        //this->keyboard_->setEventCallback(this);
     }
 
     InputBuffer::InputBuffer(const std::string allowedChars)
     {
-        //this->bActivated_ = false;
         this->allowedChars_ = allowedChars;
         this->keyboard_ = InputManager::getSingleton().getKeyboard();
         this->buffer_ = "";
     }
-/*
-    void InputBuffer::registerListener(InputBufferListener* listener, void (InputBufferListener::*function)(), bool bOnlySingleInput)
-    {
-        struct InputBufferListenerTuple newListener = {listener, function, true, bOnlySingleInput, ' '};
-        this->listeners_.insert(this->listeners_.end(), newListener);
-    }
 
-    void InputBuffer::registerListener(InputBufferListener* listener, void (InputBufferListener::*function)(), char char_, bool bOnlySingleInput)
-    {
-        struct InputBufferListenerTuple newListener = {listener, function, false, bOnlySingleInput, char_};
-        this->listeners_.insert(this->listeners_.end(), newListener);
-    }
-*/
     void InputBuffer::set(const std::string& input)
     {
@@ -117 +105 @@
         for (std::list<InputBufferListenerTuple>::iterator it = this->listeners_.begin(); it != this->listeners_.end(); ++it)
         {
-            if (((*it).bListenToAllChanges_ || ((*it).char_ == update)) && (!(*it).bOnlySingleInput_ || bSingleInput))
+            if ((!(*it).trueKeyFalseChar_) && ((*it).bListenToAllChanges_ || ((*it).char_ == update)) && (!(*it).bOnlySingleInput_ || bSingleInput))
                 (*(*it).listener_.*(*it).function_)();
         }
     }
-
-    /*void InputBuffer::activityChanged() const
-    {
-    }*/
 
     bool InputBuffer::charIsAllowed(const char& input)
@@ -136 +120 @@
     bool InputBuffer::keyPressed(const OIS::KeyEvent &e)
     {
-        /*if (e.key == OIS::KC_NUMPADENTER)
+        for (std::list<InputBufferListenerTuple>::iterator it = this->listeners_.begin(); it != this->listeners_.end(); ++it)
         {
-            this->setActivated(!this->isActivated());
-            this->clear();
-            return true;
-        }*/
+            if ((*it).trueKeyFalseChar_ && ((*it).key_ == e.key))
+                (*(*it).listener_.*(*it).function_)();
+        }
 
         if (this->keyboard_->isModifierDown(OIS::Keyboard::Ctrl))
@@ -177 +160 @@
         }
 
-        //std::cout << this->keyboard_->getAsString(e.key) << " / " << (char)e.text << std::endl;
-
-        std::string input = this->keyboard_->getAsString(e.key);
-        /*if (input.size() >= 1)
-            this->append(input[0]);*/
-
         this->append((char)e.text);
         return true;