Changeset 1312

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.

Location:

code/branches/console/src/core

Files:

• CMakeLists.txt (modified) (2 diffs)
• CorePrereqs.h (modified) (1 diff)
• InputBuffer.cc (modified) (4 diffs)
• InputBuffer.h (modified) (5 diffs)
• OutputBuffer.cc (added)
• OutputBuffer.h (added)
• Shell.cc (added)
• Shell.h (added)

code/branches/console/src/core/CMakeLists.txt

@@ -15 +15 @@
   CoreSettings.cc
   OutputHandler.cc
+  OutputBuffer.cc
+  InputBuffer.cc
+  CommandExecutor.cc
   Language.cc
   ClassTreeMask.cc
@@ -22 +25 @@
   Namespace.cc
   NamespaceNode.cc
-  CommandExecutor.cc
-  InputBuffer.cc
   Tickable.cc
   Script.cc

code/branches/console/src/core/CorePrereqs.h

@@ -137 +137 @@
   class OrxonoxClass;
   class OutputBuffer;
+  class OutputBufferListener;
   class OutputHandler;
   class Shell;

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;

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

@@ -54 +54 @@
             bool bListenToAllChanges_;
             bool bOnlySingleInput_;
+            bool trueKeyFalseChar_;
             char char_;
+            OIS::KeyCode key_;
         };
 
@@ -64 +66 @@
             void registerListener(T* listener, void (T::*function)(), bool bOnlySingleInput)
             {
-                struct InputBufferListenerTuple newListener = {listener, (void (InputBufferListener::*)())function, true, bOnlySingleInput, ' '};
+                struct InputBufferListenerTuple newListener = {listener, (void (InputBufferListener::*)())function, true, bOnlySingleInput, false, '\0', OIS::KC_UNASSIGNED};
                 this->listeners_.insert(this->listeners_.end(), newListener);
             }
@@ -70 +72 @@
             void registerListener(T* listener, void (T::*function)() const, bool bOnlySingleInput)
             {
-                struct InputBufferListenerTuple newListener = {listener, (void (InputBufferListener::*)())function, true, bOnlySingleInput, ' '};
+                struct InputBufferListenerTuple newListener = {listener, (void (InputBufferListener::*)())function, true, bOnlySingleInput, false, '\0', OIS::KC_UNASSIGNED};
                 this->listeners_.insert(this->listeners_.end(), newListener);
             }
 
             template <class T>
-            void registerListener(T* listener, void (T::*function)(), char char_, bool bOnlySingleInput)
+            void registerListener(T* listener, void (T::*function)(), char _char, bool bOnlySingleInput)
             {
-                struct InputBufferListenerTuple newListener = {listener, (void (InputBufferListener::*)())function, false, bOnlySingleInput, char_};
+                struct InputBufferListenerTuple newListener = {listener, (void (InputBufferListener::*)())function, false, bOnlySingleInput, false, _char, OIS::KC_UNASSIGNED};
                 this->listeners_.insert(this->listeners_.end(), newListener);
             }
             template <class T>
-            void registerListener(T* listener, void (T::*function)() const, char char_, bool bOnlySingleInput)
+            void registerListener(T* listener, void (T::*function)() const, char _char, bool bOnlySingleInput)
             {
-                struct InputBufferListenerTuple newListener = {listener, (void (InputBufferListener::*)())function, false, bOnlySingleInput, char_};
+                struct InputBufferListenerTuple newListener = {listener, (void (InputBufferListener::*)())function, false, bOnlySingleInput, false, _char, OIS::KC_UNASSIGNED};
+                this->listeners_.insert(this->listeners_.end(), newListener);
+            }
+
+            template <class T>
+            void registerListener(T* listener, void (T::*function)(), OIS::KeyCode key)
+            {
+                struct InputBufferListenerTuple newListener = {listener, (void (InputBufferListener::*)())function, false, true, true, '\0', key};
+                this->listeners_.insert(this->listeners_.end(), newListener);
+            }
+            template <class T>
+            void registerListener(T* listener, void (T::*function)() const, OIS::KeyCode key)
+            {
+                struct InputBufferListenerTuple newListener = {listener, (void (InputBufferListener::*)())function, false, true, true, '\0', key};
                 this->listeners_.insert(this->listeners_.end(), newListener);
             }
@@ -99 +114 @@
                 { return this->buffer_; }
 
-            /*inline void activate()
-                { this->setActivated(true); }
-            inline void deactivate()
-                { this->setActivated(false); }
-            inline void setActivated(bool bActivated)
-                { if (this->bActivated_ != bActivated) { this->bActivated_ = bActivated; this->activityChanged(); } else { this->bActivated_ = bActivated; } }
-            inline bool isActivated() const
-                { return this->bActivated_; }
-
-            void activityChanged() const;*/
-
         private:
             bool charIsAllowed(const char& input);
@@ -117 +121 @@
 
             OIS::Keyboard* keyboard_;
-            //bool bActivated_;
             std::string buffer_;
             std::list<InputBufferListenerTuple> listeners_;