Changeset 5127 in orxonox.OLD for trunk/src/util

Timestamp:

Aug 25, 2005, 3:43:23 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: now it is possible to add multi-non-newLine printf's into the Shell.
This is especially good, to print multiple entities from a loop onto the same line

Location:

trunk/src/util

Files:

• shell.cc (modified) (4 diffs)
• shell.h (modified) (2 diffs)

trunk/src/util/shell.cc

@@ -42 +42 @@
   this->setName("Shell");
 
-  this->shellHeight = 400;
+  this->keepBufferArray[0] = '\0';
+  this->keepBuffer = false;
+
   this->bActive = false;
   this->buffer = new tList<char>;
@@ -154 +156 @@
 }
 
+/**
+ * rebuilds the Text's
+ *
+ * use this function, if you changed the Font/Size or something else.
+ */
 void Shell::rebuildText()
 {
@@ -258 +265 @@
    vsprintf(this->bufferArray, line, arguments);
 
-   unsigned int inputLength = strlen(this->bufferArray);
-   char* newLineBegin = this->bufferArray;
+   char* inputEnd;
+   char* newLineBegin;
    char* newLineEnd;
 
-   while (newLineBegin < this->bufferArray + inputLength)
+   // check if we have something left in the buffers
+   if (unlikely(this->keepBuffer))
+   {
+     strcat(this->keepBufferArray, this->bufferArray);
+     inputEnd = this->keepBufferArray + strlen(this->keepBufferArray);
+     newLineBegin = this->keepBufferArray;
+     this->keepBuffer = false;
+   }
+   else
+   {
+     inputEnd = this->bufferArray + strlen(this->bufferArray);
+     newLineBegin = this->bufferArray;
+   }
+
+   // adding all the new Lines
+   while (newLineBegin < inputEnd)
    {
      newLineEnd = strchr(newLineBegin, '\n');
@@ -268 +290 @@
        *newLineEnd = '\0';
      else
+     {
+//       newLineEnd = newLineBegin + strlen(newLineBegin);
+       strcpy(this->keepBufferArray, newLineBegin);
+       this->keepBuffer = true;
        break;
+     }
 
      char* addLine = new char[strlen(newLineBegin)+1];

trunk/src/util/shell.h

@@ -11 +11 @@
 
 #include <stdarg.h>
+
+#define      SHELL_BUFFER_SIZE       16384         //!< The Size of the input-buffers (should be large enough to carry any kind of input)
 
 // FORWARD DECLARATION
@@ -110 +112 @@
     bool                   bActive;                //!< if the shell is active;
 
-    char                   bufferArray[10000];     //!< a BUFFER for fast writing
+    char                   bufferArray[SHELL_BUFFER_SIZE];     //!< a BUFFER for fast writing
+    char                   keepBufferArray[SHELL_BUFFER_SIZE]; //!< a BUFFER to have multi-non-newLine commands be copied into the shell.
+    bool                   keepBuffer;
 
     // completion