Changeset 7455 in orxonox.OLD

Timestamp:

Apr 29, 2006, 10:38:12 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: fixed a SegFault (that this worked before is some wonder

Location:

trunk/src/lib

Files:

• BuildLibs.am (modified) (1 diff)
• graphics/text_engine/multi_line_text.cc (modified) (2 diffs)
• graphics/text_engine/text.cc (modified) (3 diffs)
• shell/shell_input.cc (modified) (1 diff)
• shell/shell_input.h (modified) (2 diffs)

trunk/src/lib/BuildLibs.am

@@ -2 +2 @@
 libORXlibs_a_LIBRARIES_ = \
                 $(LIB_PREFIX)/libORXlibs.a \
+                $(LIB_PREFIX)/shell/libORXshell.a \
                 $(LIB_PREFIX)/gui/gtk_gui/libORXgui.a \
                 $(LIB_PREFIX)/gui/gl_gui/libORXglgui.a \

trunk/src/lib/graphics/text_engine/multi_line_text.cc

@@ -91 +91 @@
   for (unsigned int i = 0; i < this->getText().size(); ++i)
   {
-    if (unlikely(this->getText()[i] == '\n' || i == this->lineEnds[lineNumber]))
+    if (unlikely(!this->lineEnds.empty() && i == this->lineEnds[lineNumber]))
     {
       // go to the next Line.
@@ -140 +140 @@
       width += this->getFont()->getGlyphArray()[this->getText()[i]]->advance;
   }
-  this->setSizeY2D(this->lineEnds.size() * (this->lineSpacing+this->getFont()->getMaxHeight()));
+  this->setSizeY2D(this->lineEnds.size() * (this->lineSpacing + this->getFont()->getMaxHeight()));
 }

trunk/src/lib/graphics/text_engine/text.cc

@@ -35 +35 @@
   // initialize this Text
   this->font = NULL;
-  this->text = "";
-  this->setAlignment(TEXT_DEFAULT_ALIGNMENT);
+
+  this->setFont(fontFile, FONT_DEFAULT_RENDER_SIZE);
+
   this->blending = TEXT_DEFAULT_BLENDING;
   this->color = TEXT_DEFAULT_COLOR;
-
-  if (!fontFile.empty())
-    this->setFont(fontFile, FONT_DEFAULT_RENDER_SIZE);
-
+  this->setAlignment(TEXT_DEFAULT_ALIGNMENT);
   this->setSize(TEXT_DEFAULT_SIZE);
 }
@@ -63 +61 @@
 void Text::setFont(const std::string& fontFile, unsigned int fontSize)
 {
-  Font* newFont;
+  Font* newFont = NULL;
   Font* oldFont = this->font;
 
@@ -76 +74 @@
     }
   }
-  else
+  if (newFont == NULL)
     newFont = Font::getDefaultFont();
+  assert(newFont != NULL);
 
   // unloading the Font if we alrady have one loaded.

trunk/src/lib/shell/shell_input.cc

@@ -46 +46 @@
   */
   ShellInput::ShellInput ()
-      : Text ("")
-  {
+      : MultiLineText ("")
+  {
+    this->setLineWidth(100);
+
     this->pressedKey = SDLK_FIRST;
     this->setClassID(CL_SHELL_INPUT, "ShellInput");

trunk/src/lib/shell/shell_input.h

@@ -10 +10 @@
 #define _SHELL_INPUT_H
 
-#include "text.h"
+#include "multi_line_text.h"
 #include "event_listener.h"
 #include "shell_completion.h"
@@ -28 +28 @@
    * [UP] and [DOWN] move through the history of allready given commands.
    */
-  class ShellInput : public Text,  public EventListener
+  class ShellInput : public MultiLineText,  public EventListener
   {