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

Timestamp:

Aug 19, 2005, 3:21:27 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: redirected all printf-output to the shell
This is just for testing purposes, and will be changed again in the future (perhaps)

Location:

trunk/src/util

Files:

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

trunk/src/util/shell.cc

@@ -21 +21 @@
 #include "list.h"
 
+#include <stdarg.h>
+#include <stdio.h>
+
 using namespace std;
 
@@ -41 +44 @@
 
 
-  this->addBufferLine("asjflksjdvklasmv", NULL);
-  TextEngine::getInstance()->debug();
+  //this->addBufferLineStatic("asjflksjdvklasmv %s", "doom");
+  //TextEngine::getInstance()->debug();
   //exit(-1);
 }
@@ -73 +76 @@
   while(bufferDisplaySize > this->bufferText->getSize())
   {
-    Text* newText = TextEngine::getInstance()->createText("fonts/earth.ttf", 30, TEXT_DYNAMIC, 0, 255, 0);
+    Text* newText = TextEngine::getInstance()->createText("fonts/earth.ttf", 10, TEXT_DYNAMIC, 0, 255, 0);
     newText->setAlignment(TEXT_ALIGN_LEFT);
     newText->setPosition2D(5, 5);
@@ -120 +123 @@
  * @todo optimize
  */
-void Shell::addBufferLine(const char* line, va_list args)
-{
-  char tmp[1024];// = new char*
-  vsprintf(tmp, line, args);
-
-  char* newLine = new char[strlen(tmp)+1];
-  strcpy(newLine, tmp);
-
-  this->buffer->addAtBeginning(newLine);
-
-  if (this->buffer->getSize() > this->bufferSize)
-  {
-    delete this->buffer->firstElement();
-    this->buffer->remove(this->buffer->firstElement());
-  }
+bool Shell::addBufferLineStatic(const char* line, ...)
+{
+  va_list arguments;
+  va_start(arguments, line);
+
+  if (Shell::singletonRef == NULL)
+   vprintf(line, arguments);
+  else
+    Shell::singletonRef->addBufferLine(line, arguments);
+  return true;
+}
+
+void Shell::addBufferLine(const char* line, va_list arguments)
+{
+  vsprintf(this->bufferArray, line, arguments);
+
+  char* newLine = new char[strlen(this->bufferArray)+1];
+  strcpy(newLine, this->bufferArray);
+
+//  this->buffer->add(newLine);
+
+//    if (this->buffer->getSize() > this->bufferSize)
+//    {
+//      delete this->buffer->firstElement();
+//      this->buffer->remove(this->buffer->firstElement());
+//    }
 
   this->bufferText->firstElement()->setText(newLine);
-
 }
 

trunk/src/util/shell.h

@@ -10 +10 @@
 #include "event_listener.h"
 
-#include <stdio.h>
 #include <stdarg.h>
-
 
 // FORWARD DECLARATION
@@ -44 +42 @@
     // BUFFER //
     void flushBuffers();
-    void addBufferLine(const char* Line, va_list args);
+    static bool addBufferLineStatic(const char* line, ...);
+    void addBufferLine(const char* line, va_list arg);
     void moveBuffer(int lineCount);
     const char* getBufferLine(unsigned int lineNumber);
@@ -81 +80 @@
     tList<Text>*           bufferText;             //!< A list of stored bufferTexts for the display of the buffer
     Text*                  inputLineText;          //!< The inputLine of the Shell
+
+    char                   bufferArray[10000];     //!< a BUFFER for fast writing
+
 };