lisp::Parser parser;
try {
- std::auto_ptr<lisp::Lisp> root (parser.parse(filename));
+ const lisp::Lisp* root = parser.parse(filename);
const lisp::Lisp* text_lisp = root->get_lisp("supertux-text");
if(!text_lisp)
}
// Split text string lines into a vector
- lines = InfoBoxLine::split(text, 40);
+ lines = InfoBoxLine::split(text, SCREEN_WIDTH - 2*LEFT_BORDER);
// load background image
background.reset(new Surface("images/background/" + background_file));
TextScroller::setup()
{
sound_manager->play_music(music);
- Menu::set_current(NULL);
}
void
float y = SCREEN_HEIGHT - scroll;
for(size_t i = 0; i < lines.size(); i++) {
- lines[i]->draw(context, Vector(LEFT_BORDER, y), LAYER_GUI);
+ if (y + lines[i]->get_height() >= 0 && SCREEN_HEIGHT - y >= 0) {
+ lines[i]->draw(context, Rect(LEFT_BORDER, y, SCREEN_WIDTH - 2*LEFT_BORDER, y), LAYER_GUI);
+ }
+
y += lines[i]->get_height();
}
: firstline(0)
{
// Split text string lines into a vector
- lines = InfoBoxLine::split(text, 23);
+ lines = InfoBoxLine::split(text, 400);
try
{
Color(0.6f, 0.7f, 0.8f, 0.5f), LAYER_GUI-1);
float y = y1;
+ bool linesLeft = false;
for(size_t i = firstline; i < lines.size(); ++i) {
- if(y >= y1 + height) break;
+ if(y >= y1 + height) {
+ linesLeft = true;
+ break;
+ }
- lines[i]->draw(context, Vector(x1, y), LAYER_GUI);
+ lines[i]->draw(context, Rect(x1, y, x1+width, y), LAYER_GUI);
y += lines[i]->get_height();
+ }
+ {
// draw the scrolling arrows
if (arrow_scrollup && firstline > 0)
context.draw_surface(arrow_scrollup,
Vector( x1 + width - arrow_scrollup->get_width(), // top-right corner of box
y1), LAYER_GUI);
- if (arrow_scrolldown && firstline < lines.size()-1)
+ if (arrow_scrolldown && linesLeft && firstline < lines.size()-1)
context.draw_surface(arrow_scrolldown,
Vector( x1 + width - arrow_scrolldown->get_width(), // bottom-light corner of box
y1 + height - arrow_scrolldown->get_height()),
{
}
-InfoBoxLine::InfoBoxLine(char format_char, const std::string& text) : lineType(NORMAL), font(white_text), text(text), image(0)
-{
+namespace {
+Font* get_font_by_format_char(char format_char) {
+ switch(format_char)
+ {
+ case ' ':
+ return small_font;
+ break;
+ case '-':
+ return big_font;
+ break;
+ case '\t':
+ case '*':
+ case '#':
+ case '!':
+ return normal_font;
+ break;
+ default:
+ return normal_font;
+ log_warning << "Unknown format_char: '" << format_char << "'" << std::endl;
+ break;
+ }
+}
+
+Color get_color_by_format_char(char format_char) {
switch(format_char)
{
case ' ':
- lineType = SMALL;
- font = white_small_text;
+ return TextScroller::small_color;
+ break;
+ case '-':
+ return TextScroller::heading_color;
break;
+ case '*':
+ return TextScroller::reference_color;
case '\t':
- lineType = NORMAL;
- font = white_text;
+ case '#':
+ case '!':
+ return TextScroller::normal_color;
+ break;
+ default:
+ return Color(0,0,0);
+ log_warning << "Unknown format_char: '" << format_char << "'" << std::endl;
+ break;
+ }
+}
+
+InfoBoxLine::LineType get_linetype_by_format_char(char format_char) {
+ switch(format_char)
+ {
+ case ' ':
+ return InfoBoxLine::SMALL;
+ break;
+ case '\t':
+ return InfoBoxLine::NORMAL;
break;
case '-':
- lineType = HEADING;
- font = white_big_text;
+ return InfoBoxLine::HEADING;
break;
case '*':
- lineType = REFERENCE;
- font = blue_text;
+ return InfoBoxLine::REFERENCE;
break;
case '#':
- lineType = NORMAL_LEFT;
- font = white_text;
+ return InfoBoxLine::NORMAL_LEFT;
break;
case '!':
- lineType = IMAGE;
- image = new Surface(text);
+ return InfoBoxLine::IMAGE;
break;
default:
+ return InfoBoxLine::SMALL;
log_warning << "Unknown format_char: '" << format_char << "'" << std::endl;
break;
}
}
+}
+
+InfoBoxLine::InfoBoxLine(char format_char, const std::string& text) : lineType(NORMAL), font(normal_font), text(text), image(0)
+{
+ font = get_font_by_format_char(format_char);
+ lineType = get_linetype_by_format_char(format_char);
+ color = get_color_by_format_char(format_char);
+ if (lineType == IMAGE) image = new Surface(text);
+}
InfoBoxLine::~InfoBoxLine()
{
}
const std::vector<InfoBoxLine*>
-InfoBoxLine::split(const std::string& text, int line_length)
+InfoBoxLine::split(const std::string& text, float width)
{
std::vector<InfoBoxLine*> lines;
// 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)));
+ Font* font = get_font_by_format_char(format_char);
+ std::string s2 = s;
+ if (font) s2 = font->wrap_to_width(s2, width, &overflow);
+ lines.push_back(new InfoBoxLine(format_char, s2));
s = overflow;
} while (s.length() > 0);
-
}
return lines;
}
void
-InfoBoxLine::draw(DrawingContext& context, const Vector& position, int layer)
+InfoBoxLine::draw(DrawingContext& context, const Rect& bbox, int layer)
{
+ Vector position = bbox.p1;
switch (lineType) {
case IMAGE:
- context.draw_surface(image, Vector( (SCREEN_WIDTH - image->get_width()) / 2, position.y), layer);
+ context.draw_surface(image, Vector( (bbox.p1.x + bbox.p2.x - image->get_width()) / 2, position.y), layer);
break;
case NORMAL_LEFT:
- context.draw_text(font, text, Vector(position.x, position.y), ALIGN_LEFT, layer);
+ context.draw_text(font, text, Vector(position.x, position.y), ALIGN_LEFT, layer, color);
break;
default:
- context.draw_text(font, text, Vector(SCREEN_WIDTH/2, position.y), ALIGN_CENTER, layer);
+ context.draw_text(font, text, Vector((bbox.p1.x + bbox.p2.x) / 2, position.y), ALIGN_CENTER, layer, color);
break;
}
}
projects / supertux.git / blobdiff