Changeset 5125 in orxonox.OLD for trunk

Timestamp:

Aug 25, 2005, 3:04:49 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: a first command can be executed 'clear'
also improved the seg-fault-protection of the TextEngine

Location:

trunk/src

Files:

• lib/graphics/text_engine.cc (modified) (3 diffs)
• util/shell.cc (modified) (4 diffs)

trunk/src/lib/graphics/text_engine.cc

@@ -120 +120 @@
     }
     else
-    {
-      this->text = new char[1];
-      *this->text = '\0';
-    }
+      this->text = NULL;
   }
 
@@ -135 +132 @@
       if (this->externText == NULL)
         tmpText = this->text;
-      while (*tmpText != '\0')
+      if (tmpText != NULL)
+      {
+        while (*tmpText != '\0')
         {
           if(glyphArray[*tmpText])
-            {
-              width += glyphArray[*tmpText]->width;
-            }
+          {
+            width += glyphArray[*tmpText]->width;
+          }
           tmpText++;
         }
-      this->width = width;
+        this->width = width;
+      }
     }
 }
@@ -205 +205 @@
       if (this->externText == NULL)
         tmpText = this->text;
-      while (*tmpText != '\0')
+      if (likely(tmpText != NULL))
       {
-        if(glyphArray[*tmpText])
+        while (*tmpText != '\0')
         {
-          glCallList(glyphArray[*tmpText]->displayList);
-          glTranslatef(glyphArray[*tmpText]->width, 0, 0);
+          if(glyphArray[*tmpText])
+          {
+            glCallList(glyphArray[*tmpText]->displayList);
+            glTranslatef(glyphArray[*tmpText]->width, 0, 0);
+          }
+          tmpText++;
         }
-        tmpText++;
-      }    }
+      }
+    }
   else //(if type & TEXT_RENDER_STATIC)
     {

trunk/src/util/shell.cc

@@ -203 +203 @@
   // remove all chars from the BufferTexts.
   if (this->bufferText)
-    for (int i; i < this->bufferDisplaySize; i++)
-    {
-      this->bufferText[i]->setText(NULL);
-    }
-
+    for (int i = 0; i < this->bufferDisplaySize; i++)
+    {
+      this->bufferText[i]->setText(NULL, true);
+    }
 
   // delete all the Chars in the Buffers
   tIterator<char>* charIterator = this->buffer->getIterator();
   char* charElem = charIterator->firstElement();
-
   while (charElem != NULL)
   {
@@ -220 +218 @@
   }
   delete charIterator;
+  delete this->buffer;
+  this->buffer = new tList<char>;
 }
 
@@ -343 +343 @@
   if (likely(this->inputLine != NULL))
   {
-    delete [] this->inputLine;
+    delete[] this->inputLine;
   }
   this->inputLine = new char[1];
   *this->inputLine = '\0';
+  this->inputLineText->setText(this->inputLine, true);
 }
 
@@ -405 +406 @@
 {
   this->addBufferLineStatic("Execute Command: %s\n", this->inputLine);
-  delete this->inputLine;
-  this->inputLine = new char[1];
-  this->inputLine[0]='\0';
-  this->inputLineText->setText(this->inputLine);
+
+  if (!strcmp(this->inputLine, "clear"))
+  {
+    this->flushBuffers();
+  }
+
+  this->flushInputLine();
+
   return false;
 }