Changeset 1317 for code/branches/console/src/core

Timestamp:

May 18, 2008, 1:28:08 AM (17 years ago)

Author:

landauf

Message:

changed some parts of InGameConsole to make it work with Shell, but I couldn't test it yet as there seems to be a bug in InputBuffer.

Location:

code/branches/console/src/core

Files:

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

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

@@ -46 +46 @@
         this->buffer_ = "";
         this->cursor_ = 0;
+
+        InputManager::getSingleton().feedInputBuffer(this);
     }
 
@@ -54 +56 @@
         this->buffer_ = "";
         this->cursor_ = 0;
+
+        InputManager::getSingleton().feedInputBuffer(this);
     }
 

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

@@ -48 +48 @@
 
         this->clearLines();
-
+/*
         this->inputBuffer_.registerListener(this, &Shell::inputChanged, true);
         this->inputBuffer_.registerListener(this, &Shell::execute, '\r', false);
@@ -63 +63 @@
         this->inputBuffer_.registerListener(this, &Shell::scroll_up, OIS::KC_PGUP);
         this->inputBuffer_.registerListener(this, &Shell::scroll_down, OIS::KC_PGDOWN);
-
+*/
         this->setConfigValues();
     }
@@ -141 +141 @@
     {
         if (this->scrollPosition_)
+        {
             return this->scrollIterator_;
+        }
         else
-            return this->lines_.begin();
+        {
+            if ((*this->lines_.begin()) == "" && this->lines_.size() > 1)
+                return (++this->lines_.begin());
+            else
+                return this->lines_.begin();
+        }
     }
 
@@ -169 +176 @@
         while (this->outputBuffer_.getLine(&output))
         {
+            bool newline = false;
+            if ((*this->lines_.begin()) == "")
+                newline = true;
+
             (*this->lines_.begin()) += output;
+
+            SHELL_UPDATE_LISTENERS(onlyLastLineChanged);
+
             this->lines_.insert(this->lines_.begin(), "");
 
@@ -177 +191 @@
                 this->scrollIterator_ = this->lines_.begin();
 
-            SHELL_UPDATE_LISTENERS(linesChanged);
-            SHELL_UPDATE_LISTENERS(lineAdded);
+            if (newline)
+            {
+                SHELL_UPDATE_LISTENERS(lineAdded);
+            }
         }
 

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

@@ -79 +79 @@
                 { return this->inputBuffer_.get(); }
 
-            inline std::list<std::string>::const_iterator getNewestLineIterator() const;
-            inline std::list<std::string>::const_iterator getEndIterator() const;
+            std::list<std::string>::const_iterator getNewestLineIterator() const;
+            std::list<std::string>::const_iterator getEndIterator() const;
 
             void addLine(const std::string& line, unsigned int level);