fix cr/lfs and remove trailing whitespaces...

[supertux.git] / src / textscroller.cpp

diff --git a/src/textscroller.cpp b/src/textscroller.cpp
index 85b7c08..972a29d 100644 (file)
--- a/src/textscroller.cpp
+++ b/src/textscroller.cpp
@@ -41,13 +41,11 @@ static const float LEFT_BORDER = 50;
 static const float SCROLL = 60;
 static const float ITEMS_SPACE = 4;
 
-
-
 TextScroller::TextScroller(const std::string& filename)
 {
   defaultspeed = DEFAULT_SPEED;
   speed = defaultspeed;
-  
+
   std::string text;
   std::string background_file;
 
@@ -58,7 +56,7 @@ TextScroller::TextScroller(const std::string& filename)
     const lisp::Lisp* text_lisp = root->get_lisp("supertux-text");
     if(!text_lisp)
       throw std::runtime_error("File isn't a supertux-text file");
-    
+
     if(!text_lisp->get("text", text))
       throw std::runtime_error("file doesn't contain a text field");
     if(!text_lisp->get("background", background_file))
@@ -78,6 +76,7 @@ TextScroller::TextScroller(const std::string& filename)
   background.reset(new Surface("images/background/" + background_file));
 
   scroll = 0;
+  fading = false;
 }
 
 TextScroller::~TextScroller()
@@ -105,13 +104,13 @@ TextScroller::update(float elapsed_time)
   if(main_controller->pressed(Controller::JUMP)
       || main_controller->pressed(Controller::ACTION)
       || main_controller->pressed(Controller::MENU_SELECT))
-    scroll += SCROLL;    
+    scroll += SCROLL;
   if(main_controller->pressed(Controller::PAUSE_MENU)) {
     main_loop->exit_screen(new FadeOut(0.5));
   }
 
   scroll += speed * elapsed_time;
-    
+
   if(scroll < 0)
     scroll = 0;
 }
@@ -127,7 +126,8 @@ TextScroller::draw(DrawingContext& context)
     y += lines[i]->get_height();
   }
 
-  if(y < 0) {
+  if(y < 0 && !fading ) {
+    fading = true;
     main_loop->exit_screen(new FadeOut(0.5));
   }
 }
@@ -154,7 +154,9 @@ InfoBox::InfoBox(const std::string& text)
 
 InfoBox::~InfoBox()
 {
-  for(std::vector<InfoBoxLine*>::iterator i = lines.begin(); i != lines.end(); i++) delete *i;
+  for(std::vector<InfoBoxLine*>::iterator i = lines.begin();
+      i != lines.end(); i++)
+    delete *i;
   delete arrow_scrollup;
   delete arrow_scrolldown;
 }
@@ -219,27 +221,27 @@ InfoBoxLine::InfoBoxLine(char format_char, const std::string& text) : lineType(N
 {
   switch(format_char)
   {
-    case ' ': 
+    case ' ':
       lineType = SMALL;
       font = white_small_text;
       break;
-    case '\t': 
+    case '\t':
       lineType = NORMAL;
       font = white_text;
       break;
-    case '-': 
+    case '-':
       lineType = HEADING;
       font = white_big_text;
       break;
-    case '*': 
+    case '*':
       lineType = REFERENCE;
       font = blue_text;
       break;
-    case '#': 
+    case '#':
       lineType = NORMAL_LEFT;
       font = white_text;
       break;
-    case '!': 
+    case '!':
       lineType = IMAGE;
       image = new Surface(text);
       break;
@@ -254,7 +256,7 @@ InfoBoxLine::~InfoBoxLine()
   delete image;
 }
 
-const std::vector<InfoBoxLine*> 
+const std::vector<InfoBoxLine*>
 InfoBoxLine::split(const std::string& text, int line_length)
 {
   std::vector<InfoBoxLine*> lines;
@@ -263,7 +265,14 @@ InfoBoxLine::split(const std::string& text, int line_length)
   std::string::size_type l;
   char format_char = '#';
   while(i < text.size()) {
+    // take care of empty lines - represent them as blank lines of normal text
+    if (text[i] == '\n') {
+      lines.push_back(new InfoBoxLine('\t', ""));
+      i++;
+      continue;
+    }
 
+    // extract the format_char
     format_char = text[i];
     i++;
     if (i >= text.size()) break;
@@ -278,37 +287,31 @@ InfoBoxLine::split(const std::string& text, int line_length)
     if (format_char == '!') {
       lines.push_back(new InfoBoxLine(format_char, s));
       continue;
-    } 
-
-    // if we are dealing with text, wrap long lines
-    while ((int)s.length() > line_length) {
-      int split_at = line_length;
-      while ((split_at > 0) && (s[split_at] != ' ')) split_at--;
-      if (split_at == 0) split_at = line_length;
-
-      lines.push_back(new InfoBoxLine(format_char, s.substr(0, split_at)));
-      if (s[split_at] == ' ') split_at++;
-      s = s.substr(split_at);
     }
-    lines.push_back(new InfoBoxLine(format_char, s));
+
+    // append wrapped parts of line into list
+    std::string overflow;
+    do {
+      lines.push_back(new InfoBoxLine(format_char, Font::wrap_to_chars(s, line_length, &overflow)));
+      s = overflow;
+    } while (s.length() > 0);
 
   }
 
   return lines;
 }
 
-void 
+void
 InfoBoxLine::draw(DrawingContext& context, const Vector& position, int layer)
 {
   switch (lineType) {
-    case SPACER:
     case IMAGE:
       context.draw_surface(image, Vector( (SCREEN_WIDTH - image->get_width()) / 2, position.y), layer);
       break;
     case NORMAL_LEFT:
       context.draw_text(font, text, Vector(position.x, position.y), LEFT_ALLIGN, layer);
       break;
-    default: 
+    default:
       context.draw_text(font, text, Vector(SCREEN_WIDTH/2, position.y), CENTER_ALLIGN, layer);
       break;
   }
@@ -318,14 +321,11 @@ float
 InfoBoxLine::get_height()
 {
   switch (lineType) {
-    case SPACER:
-      return font->get_height() + ITEMS_SPACE;    
     case IMAGE:
       return image->get_height() + ITEMS_SPACE;
     case NORMAL_LEFT:
       return font->get_height() + ITEMS_SPACE;
-    default: 
+    default:
       return font->get_height() + ITEMS_SPACE;
   }
 }
-