Changeset 7762 in orxonox.OLD for trunk/src/lib/shell/shell.cc

Timestamp:

May 22, 2006, 6:20:35 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: ShellBuffer gets polled from the Shell, and does not put the other way round

File:

• trunk/src/lib/shell/shell.cc (modified) (16 diffs)

trunk/src/lib/shell/shell.cc

@@ -62 +62 @@
     this->setName("Shell");
 
+    this->shellBuffer = ShellBuffer::getInstance();
+
     // EVENT-Handler subscription of '`' to all States.
     EventHandler::getInstance()->subscribe(this, ES_ALL, SDLK_BACKQUOTE);
@@ -70 +72 @@
 
     // BUFFER
-    this->bufferIterator = ShellBuffer::getInstance()->getBuffer().begin();
+    this->bufferIterator = this->shellBuffer->getBuffer().begin();
 
     // INPUT LINE
@@ -91 +93 @@
 
     this->deactivate();
-    // register the shell at the ShellBuffer
-    ShellBuffer::getInstance()->registerShell(this);
   }
 
@@ -100 +100 @@
   Shell::~Shell ()
   {
-    ShellBuffer::getInstance()->unregisterShell(this);
-
     // delete the displayable Buffers
     while (!this->bufferText.empty())
@@ -120 +118 @@
       PRINTF(3)("The shell is already active\n");
     this->bActive = true;
+    this->activate2D();
 
     EventHandler::getInstance()->pushState(ES_SHELL);
@@ -126 +125 @@
     this->setRelCoorSoft2D(0, 0, 5);
 
-    std::list<std::string>::const_iterator textLine = ShellBuffer::getInstance()->getBuffer().begin();
+    this->linesProcessed = this->shellBuffer->getLineCount();
+    std::list<std::string>::const_iterator textLine = this->bufferIterator = this->shellBuffer->getBuffer().begin();
     for (std::list<MultiLineText*>::iterator text = this->bufferText.begin(); text != this->bufferText.end(); ++text)
     {
       (*text)->setVisibility(true);
-      if (textLine !=  ShellBuffer::getInstance()->getBuffer().end())
+      if (textLine !=  this->shellBuffer->getBuffer().end())
       {
         (*text)->setText((*textLine));
@@ -150 +150 @@
       PRINTF(3)("The shell is already inactive\n");
     this->bActive = false;
+    this->deactivate2D();
 
     EventHandler::getInstance()->withUNICODE(false);
@@ -159 +160 @@
       (*text)->setVisibility(false);
     // Go to the End again.
-    this->bufferIterator = ShellBuffer::getInstance()->getBuffer().begin();
+    this->bufferIterator = this->shellBuffer->getBuffer().begin();
   }
 
@@ -337 +338 @@
       (*textIt)->setText("");  // remove all chars from the BufferTexts.
     }
-    ShellBuffer::getInstance()->flush();
+    this->shellBuffer->flush();
     // BUFFER FLUSHING
   }
@@ -353 +354 @@
     // Set the new Text.
     this->bufferText.front()->setText(text);
+    this->bufferIterator = this->shellBuffer->getBuffer().begin();
 
     // The LineCount will be started here.
@@ -358 +360 @@
     // The First Line gets a special Animation
     this->bufferText.front()->setRelCoor2D(this->calculateLinePosition(0)- Vector2D(-1000,0));
+
 
     // Move all lines one Entry up.
@@ -378 +381 @@
       if (moves < lineCount)
       {
-        if(this->bufferIterator == --ShellBuffer::getInstance()->getBuffer().end())
+        if(this->bufferIterator == --this->shellBuffer->getBuffer().end())
           break;
         ++moves;
@@ -385 +388 @@
       else
       {
-        if (this->bufferIterator == ShellBuffer::getInstance()->getBuffer().begin())
+        if (this->bufferIterator == this->shellBuffer->getBuffer().begin())
           break;
         --moves;
@@ -414 +417 @@
     for (textIt = this->bufferText.begin(); textIt != this->bufferText.end(); ++textIt, ++it)
     {
-      if (it == ShellBuffer::getInstance()->getBuffer().end())
+      if (it == this->shellBuffer->getBuffer().end())
       {
         PRINTF(1)("LAST LINE REACHED\n");
@@ -473 +476 @@
   }
 
+  void Shell::tick(float dt)
+  {
+    if (this->linesProcessed < this->shellBuffer->getLineCount())
+    {
+      unsigned int pollLines = this->shellBuffer->getLineCount() - this->linesProcessed;
+      if (this->bufferText.size() < pollLines)
+        pollLines = this->bufferText.size();
+      if (unlikely(this->shellBuffer->getBuffer().size() < pollLines))
+        pollLines = this->shellBuffer->getBuffer().size();
+
+      std::list<std::string>::const_iterator line = this->shellBuffer->getBuffer().begin();
+      unsigned int i;
+      for(i = 0; i < pollLines; i++)
+        line ++;
+      for (i = 0; i < pollLines; i++)
+      {
+        this->printToDisplayBuffer((*--line));
+      }
+    }
+    this->linesProcessed = this->shellBuffer->getLineCount();
+  }
+
+
   /**
    * displays the Shell
@@ -527 +553 @@
 
 
-    ShellBuffer::getInstance()->debug();
+    this->shellBuffer->debug();
   }