Changeset 5253 in orxonox.OLD

Timestamp:

Sep 25, 2005, 1:31:18 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: real safe, and smooth now in the resize-mode of the Shell
→ no more segfaults
→ more dynamic

Location:

trunk/src/lib/shell

Files:

• shell.cc (modified) (9 diffs)
• shell.h (modified) (1 diff)

trunk/src/lib/shell/shell.cc

@@ -42 +42 @@
     ->setAlias("hide");
 SHELL_COMMAND(textsize, Shell, setTextSize)
-    ->describe("Sets the size of the Text (size, linespacing)");
+    ->describe("Sets the size of the Text (size, linespacing)")
+    ->defaultValues(15, 0);
 
 /**
@@ -64 +65 @@
   this->lineSpacing = 0;
   this->bActive = false;
-  this->fontFile = NULL;
-  this->setFont("fonts/dpquake_.ttf");
+  this->fontFile = new char[strlen(SHELL_DEFAULT_FONT)+1];
+  strcpy(this->fontFile, SHELL_DEFAULT_FONT);
 
   // BUFFER
@@ -125 +126 @@
 void Shell::deactivate()
 {
-   this->setFont("fonts/dark_crystal.ttf");
-   this->rebuildText();
-
   if (this->bActive == false)
     PRINTF(3)("The shell is already inactive\n");
@@ -133 +131 @@
 
   EventHandler::getInstance()->setState(ES_GAME);
-  this->setRelCoorSoft2D(0, -400, 1, 5);
+  this->setRelCoorSoft2D(0, -(int)this->shellHeight, 1, 5);
 
   tIterator<char>* bufferIT = ShellBuffer::getInstance()->getBuffer()->getIterator();
@@ -159 +157 @@
   strcpy(this->fontFile, fontFile);
 
+  this->rebuildText();
 }
 
@@ -175 +174 @@
   this->shellInput->setFont(this->fontFile, this->textSize);
 
-//  this->rebuildText();
+  this->rebuildText();
 }
 
@@ -188 +187 @@
   this->shellInput->setColor(1, 0, 0);
   this->shellInput->setAlignment(TEXT_ALIGN_LEFT);
-  this->shellInput->setParent2D(this);
+  if (shellInput->getParent() != this)
+    this->shellInput->setParent2D(this);
   this->shellInput->setRelCoor2D(5, (this->textSize + this->lineSpacing)*this->bufferDisplaySize + this->textSize);
 
@@ -209 +209 @@
   }
 
+  tIterator<char>* it = ShellBuffer::getInstance()->getBuffer()->getIterator();
+  char* text = it->lastElement();
   bufferText = new Text*[bufferDisplaySize];
   for (unsigned int i = 0; i < bufferDisplaySize; i++)
@@ -216 +218 @@
     bufferText[i]->setAlignment(TEXT_ALIGN_LEFT);
     bufferText[i]->setRelCoor2D(calculateLinePosition(i));
-    bufferText[i]->setText(NULL);
+    bufferText[i]->setText(text);
     bufferText[i]->setParent2D(this);
-  }
+    text = it->prevElement();
+  }
+  delete it;
   this->bufferDisplaySize = bufferDisplaySize;
 

trunk/src/lib/shell/shell.h

@@ -13 +13 @@
 
 #include <stdarg.h>
+
+#define         SHELL_DEFAULT_FONT      "fonts/dpquake_.ttf"
 
 // FORWARD DECLARATION