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

Timestamp:

May 17, 2008, 3:58:19 AM (17 years ago)

Author:

landauf

Message:

• implemented Shell, but not yet linked with the graphical console
• added new features (cursor, OIS::KeyCode listener) to InputBuffer
• changed some includes to avoid circular header-dependencies in OrxonoxClass and Shell

File:

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

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

@@ -45 +45 @@
         this->keyboard_ = InputManager::getSingleton().getKeyboard();
         this->buffer_ = "";
+        this->cursor_ = 0;
     }
 
@@ -52 +53 @@
         this->keyboard_ = InputManager::getSingleton().getKeyboard();
         this->buffer_ = "";
-    }
-
-    void InputBuffer::set(const std::string& input)
+        this->cursor_ = 0;
+    }
+
+    void InputBuffer::unregisterListener(InputBufferListener* listener)
+    {
+        for (std::list<InputBufferListenerTuple>::iterator it = this->listeners_.begin(); it != this->listeners_.end(); )
+        {
+            if ((*it).listener_ == listener)
+                this->listeners_.erase(it++);
+            else
+                ++it;
+        }
+    }
+
+    void InputBuffer::set(const std::string& input, bool update)
+    {
+        this->clear(false);
+        this->insert(input, update);
+    }
+
+    void InputBuffer::insert(const std::string& input, bool update)
+    {
+        for (unsigned int i = 0; i < input.size(); ++i)
+        {
+            this->insert(input[i], false);
+
+            if (update)
+                this->updated(input[i], false);
+        }
+
+        if (update)
+            this->updated();
+    }
+
+    void InputBuffer::insert(const char& input, bool update)
+    {
+        if (this->charIsAllowed(input))
+        {
+            this->buffer_.insert(this->cursor_, 1, input);
+            ++this->cursor_;
+        }
+
+        if (update)
+            this->updated(input, true);
+    }
+
+    void InputBuffer::clear(bool update)
     {
         this->buffer_ = "";
-        this->append(input);
-    }
-
-    void InputBuffer::append(const std::string& input)
-    {
-        for (unsigned int i = 0; i < input.size(); i++)
-        {
-            if (this->charIsAllowed(input[i]))
-                this->buffer_ += input[i];
-
-            this->updated(input[i], false);
-        }
-        this->updated();
-    }
-
-    void InputBuffer::append(const char& input)
-    {
-        if (this->charIsAllowed(input))
-            this->buffer_ += input;
-
-        this->updated(input, true);
-    }
-
-    void InputBuffer::clear()
-    {
-        this->buffer_ = "";
-        this->updated();
-    }
-
-    void InputBuffer::removeLast()
-    {
-        this->buffer_ = this->buffer_.substr(0, this->buffer_.size() - 1);
-        this->updated();
+        this->cursor_ = 0;
+
+        if (update)
+            this->updated();
+    }
+
+    void InputBuffer::removeBehindCursor(bool update)
+    {
+        if (this->cursor_ > 0)
+        {
+            --this->cursor_;
+            this->buffer_.erase(this->cursor_, 1);
+
+            if (update)
+                this->updated();
+        }
+    }
+
+    void InputBuffer::removeAtCursor(bool update)
+    {
+        if (this->cursor_ < this->buffer_.size())
+        {
+            this->buffer_.erase(this->cursor_, 1);
+
+            if (update)
+                this->updated();
+        }
     }
 
@@ -130 +169 @@
             if (e.key == OIS::KC_V)
             {
-                this->append(fromClipboard());
+                this->insert(fromClipboard());
                 return true;
             }
@@ -149 +188 @@
             if (e.key == OIS::KC_INSERT)
             {
-                this->append(fromClipboard());
+                this->insert(fromClipboard());
                 return true;
             }
@@ -160 +199 @@
         }
 
-        this->append((char)e.text);
+        this->insert((char)e.text);
         return true;
     }