Changeset 5787 in orxonox.OLD for trunk

Timestamp:

Nov 26, 2005, 10:18:28 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: safer shell, better key-handling

Location:

trunk/src/lib/shell

Files:

• shell.cc (modified) (4 diffs)
• shell_input.cc (modified) (1 diff)

trunk/src/lib/shell/shell.cc

@@ -133 +133 @@
   this->setRelCoorSoft2D(0, 0, 1, 5);
 
-  list<char*>::const_reverse_iterator textLine = ShellBuffer::getInstance()->getBuffer()->rbegin();
+  list<char*>::const_iterator textLine = --ShellBuffer::getInstance()->getBuffer()->end();
+  bool top = false;
   for (int i = 0; i < this->bufferDisplaySize; i++)
   {
-    this->bufferText[i]->setText((*textLine), true);
     this->bufferText[i]->setVisibility(true);
-    textLine--;
+    if (!top)
+    {
+      this->bufferText[i]->setText((*textLine), true);
+    if (textLine != ShellBuffer::getInstance()->getBuffer()->begin())
+      top = true;
+      textLine--;
+    }
   }
 }
@@ -156 +162 @@
   this->setRelCoorSoft2D(0, -(int)this->shellHeight, 1, 5);
 
-  list<char*>::const_reverse_iterator textLine = ShellBuffer::getInstance()->getBuffer()->rbegin();
+  list<char*>::const_iterator textLine = --ShellBuffer::getInstance()->getBuffer()->end();
   for (int i = 0; i < this->bufferDisplaySize; i++)
   {
-    this->bufferText[i]->setText((*textLine), false);
     this->bufferText[i]->setVisibility(false);
-    textLine--;
+    if (textLine != ShellBuffer::getInstance()->getBuffer()->begin())
+    {
+      this->bufferText[i]->setText((*textLine), false);
+      textLine--;
+    }
   }
   this->bufferOffset = 0;
@@ -304 +313 @@
   }
 
-  list<char*>::const_reverse_iterator textLine = ShellBuffer::getInstance()->getBuffer()->rbegin();
+  list<char*>::const_iterator textLine = --ShellBuffer::getInstance()->getBuffer()->end();
   bufferText = new Text*[bufferDisplaySize];
   for (unsigned int i = 0; i < bufferDisplaySize; i++)
@@ -310 +319 @@
     bufferText[i] = new Text(this->fontFile, this->textSize);
     bufferText[i]->setAlignment(TEXT_ALIGN_LEFT);
-    bufferText[i]->setText(*textLine);
     bufferText[i]->setParent2D(this);
-    textLine--;
+    if(textLine != ShellBuffer::getInstance()->getBuffer()->begin())
+    {
+      bufferText[i]->setText(*textLine);
+      textLine--;
+    }
   }
   this->bufferDisplaySize = bufferDisplaySize;

trunk/src/lib/shell/shell_input.cc

@@ -385 +385 @@
   else // if(!event.bPressed)
   {
-    if (this->pressedKey == event.x)
+    if (this->pressedKey == event.x || this->pressedKey == event.type)
     {
       this->pressedKey = 0;