Changeset 5248 in orxonox.OLD for trunk

Timestamp:

Sep 24, 2005, 10:30:08 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: moving up and down through the buffer with [PageUp] and [PageDown] enabled

Location:

trunk/src/lib

Files:

• shell/shell.cc (modified) (5 diffs)
• shell/shell.h (modified) (1 diff)
• shell/shell_input.cc (modified) (2 diffs)
• util/list.h (modified) (3 diffs)

trunk/src/lib/shell/shell.cc

@@ -69 +69 @@
   this->bufferDisplaySize = 10;
   this->bufferOffset = 0;
+  this->bufferIterator = ShellBuffer::getInstance()->getBuffer()->getIterator();
 
   // INPUT LINE
@@ -86 +87 @@
     delete this->bufferText[i];
   delete[] this->bufferText;
+  delete this->bufferIterator;
 
   // delete the inputLine
@@ -136 +138 @@
   }
   delete bufferIT;
+
+  this->bufferOffset = 0;
 }
 
@@ -246 +250 @@
  * moves the Display buffer (up or down)
  * @param lineCount the count by which to shift the InputBuffer.
+ *
+ * @todo
  */
 void Shell::moveDisplayBuffer(int lineCount)
 {
-
-
+  if (!this->bufferIterator->compareListPointer(ShellBuffer::getInstance()->getBuffer()))
+  {
+    delete this->bufferIterator;
+    this->bufferIterator = ShellBuffer::getInstance()->getBuffer()->getIterator();
+  }
+
+  if (this->bufferOffset == 0)
+   {
+     this->bufferIterator->lastElement();
+//     for (unsigned int i = 0; i < this->bufferDisplaySize; i++)
+//       this->bufferIterator->prevStep();
+   }
+
+  // boundraries
+  if (this->bufferOffset + lineCount > (int)ShellBuffer::getInstance()->getBuffer()->getSize())
+    lineCount = (int)ShellBuffer::getInstance()->getBuffer()->getSize()- this->bufferOffset;
+  else if (this->bufferOffset + lineCount < 0)
+    lineCount = -bufferOffset;
+  this->bufferOffset += lineCount;
+
+  // moving the iterator to the right position
+  int move = 0;
+  while (move != lineCount)
+  {
+    if (move < lineCount)
+    {
+      ++move;
+      this->bufferIterator->prevStep();
+    }
+    else
+    {
+      --move;
+      this->bufferIterator->nextStep();
+    }
+  }
+  // redisplay the buffers
+  tIterator<char> it = *this->bufferIterator;
+  for (unsigned int i = 0; i < this->bufferDisplaySize; i++)
+  {
+    this->bufferText[i]->setText(it.getCurrent(), false);
+    it.prevStep();
+  }
 }
 
@@ -279 +325 @@
     else if (event.type == SDLK_PAGEUP)
     {
-
+      this->moveDisplayBuffer(+this->bufferDisplaySize-1);
     }
     else if (event.type == SDLK_PAGEDOWN)
     {
-
+      this->moveDisplayBuffer(-this->bufferDisplaySize+1);
     }
   }

trunk/src/lib/shell/shell.h

@@ -4 +4 @@
  *
  * @todo Buffer Display in different Colors for different debug mode.
- * @todo move up and down in Buffer
  */
 

trunk/src/lib/shell/shell_input.cc

@@ -285 +285 @@
   {
     PRINT(0)("Help for the most important Shell-commands\n");
-    PRINT(0)("F1 - HELP; F2 - DEBUG; ` - open/close shell\n");
+    PRINT(0)("F1 - HELP; F2 - DEBUG; '`' - open/close shell\n");
     PRINT(0)("input order:\n");
     PRINT(0)("ClassName [objectName] function [parameter1, [parameter2 ...]]  or\n");
@@ -328 +328 @@
       this->help();
     else if (event.type == SDLK_F2)
-      this->debug();
+      ;//this->debug();
     else if (event.type == SDLK_UP)
       this->historyMoveUp();

trunk/src/lib/util/list.h

@@ -348 +348 @@
     T* seekElement(const T* element);
     T* iteratorElement(const tIterator<T>* iterator);
+    bool compareListPointer(const tList<T>* list);
 
     /** another way to iterate through the list
@@ -520 +521 @@
 }
 
+template<class T>
+    bool tIterator<T>::compareListPointer(const tList<T>* list)
+{
+  return (this->list == list)?true:false;
+}
+
+
 /**
  *  use it to move through the list without interfering with the iteration
@@ -538 +546 @@
 }
 
-
 /**
  *  use it to move backwards through the list without interfering with the itereation