X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fvideo%2Ffont.cpp;h=05a8286d6d86d52b8a8d499cab9f3cd30b35203e;hb=d9ec4134c6d3a1c444199ba894bf5e9c084185f3;hp=f938279f6d334f71def6bd3a84ddffdf196f5a1c;hpb=2f6318d5598f33ce0dd19017148053518521bd0a;p=supertux.git diff --git a/src/video/font.cpp b/src/video/font.cpp index f938279f6..05a8286d6 100644 --- a/src/video/font.cpp +++ b/src/video/font.cpp @@ -1,13 +1,11 @@ -// $Id$ -// // SuperTux // Copyright (C) 2006 Matthias Braun // Ingo Ruhnke // -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -15,28 +13,28 @@ // GNU General Public License for more details. // // You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// along with this program. If not, see . #include #include #include #include - #include -#include "physfs/physfs_sdl.hpp" #include -#include "file_system.hpp" + +#include "physfs/physfs_sdl.hpp" + +#include "util/file_system.hpp" #include "lisp/lisp.hpp" -#include "lisp/parser.hpp" #include "lisp/list_iterator.hpp" -#include "screen.hpp" -#include "font.hpp" -#include "renderer.hpp" -#include "drawing_context.hpp" -#include "log.hpp" +#include "lisp/parser.hpp" +#include "supertux/screen.hpp" +#include "util/log.hpp" +#include "video/drawing_context.hpp" +#include "video/font.hpp" +#include "video/renderer.hpp" namespace { bool has_multibyte_mark(unsigned char c); @@ -49,9 +47,10 @@ struct UTF8Iterator std::string::size_type pos; uint32_t chr; - UTF8Iterator(const std::string& text_) - : text(text_), - pos(0) + UTF8Iterator(const std::string& text_) : + text(text_), + pos(0), + chr() { try { chr = decode_utf8(text, pos); @@ -88,23 +87,26 @@ bool vline_empty(SDL_Surface* surface, int x, int start_y, int end_y, Uint8 thre Uint8* pixels = (Uint8*)surface->pixels; for(int y = start_y; y < end_y; ++y) + { + const Uint8& p = pixels[surface->pitch*y + x*surface->format->BytesPerPixel + 3]; + if (p > threshold) { - const Uint8& p = pixels[surface->pitch*y + x*surface->format->BytesPerPixel + 3]; - if (p > threshold) - { - return false; - } + return false; } + } return true; } } // namespace Font::Font(GlyphWidth glyph_width_, const std::string& filename, - int shadowsize_) -: glyph_width(glyph_width_), - shadowsize(shadowsize_), - glyphs(65536) + int shadowsize_) : + glyph_width(glyph_width_), + glyph_surfaces(), + shadow_surfaces(), + char_height(), + shadowsize(shadowsize_), + glyphs(65536) { for(unsigned int i=0; i<65536;i++) glyphs[i].surface_idx = -1; @@ -117,8 +119,8 @@ Font::Font(GlyphWidth glyph_width_, std::string filename(*i); if( filename.rfind(fontname) != std::string::npos ) { loadFontFile(fontdir + filename); - } } + } PHYSFS_freeList(rc); } @@ -134,19 +136,19 @@ Font::loadFontFile(const std::string &filename) std::ostringstream msg; msg << "Font file:" << filename << ": is not a supertux-font file"; throw std::runtime_error(msg.str()); - } + } int def_char_width=0; if( !config_l->get("glyph-width",def_char_width) ) { log_warning << "Font:"<< filename << ": misses default glyph-width" << std::endl; - } + } if( !config_l->get("glyph-height",char_height) ) { std::ostringstream msg; msg << "Font:" << filename << ": misses glyph-height"; throw std::runtime_error(msg.str()); - } + } lisp::ListIterator iter(config_l); while(iter.next()) { @@ -161,40 +163,40 @@ Font::loadFontFile(const std::string &filename) std::vector chars; if( ! glyphs_val->get("glyph-width", local_char_width) ) { local_char_width = def_char_width; - } + } if( ! glyphs_val->get("monospace", monospaced ) ) { local_glyph_width = glyph_width; - } + } else { if( monospaced ) local_glyph_width = FIXED; else local_glyph_width = VARIABLE; - } + } if( ! glyphs_val->get("glyphs", glyph_image) ) { std::ostringstream msg; msg << "Font:" << filename << ": missing glyphs image"; throw std::runtime_error(msg.str()); - } + } if( ! glyphs_val->get("shadows", shadow_image) ) { std::ostringstream msg; msg << "Font:" << filename << ": missing shadows image"; throw std::runtime_error(msg.str()); - } - if( ! glyphs_val->get_vector("chars", chars) || chars.size() == 0) { + } + if( ! glyphs_val->get("chars", chars) || chars.size() == 0) { std::ostringstream msg; msg << "Font:" << filename << ": missing chars definition"; throw std::runtime_error(msg.str()); - } + } if( local_char_width==0 ) { std::ostringstream msg; msg << "Font:" << filename << ": misses glyph-width for some surface"; throw std::runtime_error(msg.str()); - } + } loadFontSurface(glyph_image, shadow_image, chars, - local_glyph_width, local_char_width); - } + local_glyph_width, local_char_width); } + } } void @@ -206,8 +208,8 @@ Font::loadFontSurface( int char_width ) { - Surface glyph_surface = Surface("images/engine/fonts/" + glyphimage); - Surface shadow_surface = Surface("images/engine/fonts/" + shadowimage); + Surface glyph_surface("images/engine/fonts/" + glyphimage); + Surface shadow_surface("images/engine/fonts/" + shadowimage); int surface_idx = glyph_surfaces.size(); glyph_surfaces.push_back(glyph_surface); @@ -226,9 +228,9 @@ Font::loadFontSurface( std::ostringstream msg; msg << "Couldn't load image '" << glyphimage << "' :" << SDL_GetError(); throw std::runtime_error(msg.str()); - } - SDL_LockSurface(surface); } + SDL_LockSurface(surface); + } for( unsigned int i = 0; i < chars.size(); i++) { for(UTF8Iterator chr(chars[i]); !chr.done(); ++chr) { @@ -244,7 +246,7 @@ Font::loadFontSurface( glyph.rect = Rect(x, y, x + char_width, y + char_height); glyph.offset = Vector(0, 0); glyph.advance = char_width; - } + } else { int left = x; while (left < x + char_width && vline_empty(surface, left, y, y + char_height, 64)) @@ -260,20 +262,20 @@ Font::loadFontSurface( glyph.offset = Vector(0, 0); glyph.advance = glyph.rect.get_width() + 1; // FIXME: might be useful to make spacing configurable - } + } glyphs[*chr] = glyph; - } + } if( col>0 && col <= wrap ) { col = 0; row++; - } } + } if( surface != NULL ) { SDL_UnlockSurface(surface); SDL_FreeSurface(surface); - } + } } Font::~Font() @@ -287,20 +289,20 @@ Font::get_text_width(const std::string& text) const float last_width = 0; for(UTF8Iterator it(text); !it.done(); ++it) + { + if (*it == '\n') + { + last_width = std::max(last_width, curr_width); + curr_width = 0; + } + else { - if (*it == '\n') - { - last_width = std::max(last_width, curr_width); - curr_width = 0; - } - else - { - if( glyphs.at(*it).surface_idx != -1 ) - curr_width += glyphs[*it].advance; - else - curr_width += glyphs[0x20].advance; - } + if( glyphs.at(*it).surface_idx != -1 ) + curr_width += glyphs[*it].advance; + else + curr_width += glyphs[0x20].advance; } + } return std::max(curr_width, last_width); } @@ -311,12 +313,12 @@ Font::get_text_height(const std::string& text) const std::string::size_type text_height = char_height; for(std::string::const_iterator it = text.begin(); it != text.end(); ++it) - { // since UTF8 multibyte characters are decoded with values - // outside the ASCII range there is no risk of overlapping and - // thus we don't need to decode the utf-8 string - if (*it == '\n') - text_height += char_height + 2; - } + { // since UTF8 multibyte characters are decoded with values + // outside the ASCII range there is no risk of overlapping and + // thus we don't need to decode the utf-8 string + if (*it == '\n') + text_height += char_height + 2; + } return text_height; } @@ -385,32 +387,32 @@ Font::draw(Renderer *renderer, const std::string& text, const Vector& pos_, std::string::size_type last = 0; for(std::string::size_type i = 0;; ++i) + { + if (text[i] == '\n' || i == text.size()) { - if (text[i] == '\n' || i == text.size()) - { - std::string temp = text.substr(last, i - last); + std::string temp = text.substr(last, i - last); - // calculate X positions based on the alignment type - Vector pos = Vector(x, y); + // calculate X positions based on the alignment type + Vector pos = Vector(x, y); - if(alignment == ALIGN_CENTER) - pos.x -= get_text_width(temp) / 2; - else if(alignment == ALIGN_RIGHT) - pos.x -= get_text_width(temp); + if(alignment == ALIGN_CENTER) + pos.x -= get_text_width(temp) / 2; + else if(alignment == ALIGN_RIGHT) + pos.x -= get_text_width(temp); - // Cast font position to integer to get a clean drawing result and - // no blurring as we would get with subpixel positions - pos.x = static_cast(pos.x); + // Cast font position to integer to get a clean drawing result and + // no blurring as we would get with subpixel positions + pos.x = static_cast(pos.x); - draw_text(renderer, temp, pos, drawing_effect, color, alpha); + draw_text(renderer, temp, pos, drawing_effect, color, alpha); - if (i == text.size()) - break; + if (i == text.size()) + break; - y += char_height + 2; - last = i + 1; - } + y += char_height + 2; + last = i + 1; } + } } void @@ -418,8 +420,8 @@ Font::draw_text(Renderer *renderer, const std::string& text, const Vector& pos, DrawingEffect drawing_effect, Color color, float alpha) const { if(shadowsize > 0) - draw_chars(renderer, false, text, - pos + Vector(shadowsize, shadowsize), drawing_effect, Color(1,1,1), alpha); + draw_chars(renderer, false, text, + pos + Vector(shadowsize, shadowsize), drawing_effect, Color(1,1,1), alpha); draw_chars(renderer, true, text, pos, drawing_effect, color, alpha); } @@ -432,44 +434,43 @@ Font::draw_chars(Renderer *renderer, bool notshadow, const std::string& text, Vector p = pos; for(UTF8Iterator it(text); !it.done(); ++it) + { + if(*it == '\n') { - if(*it == '\n') - { - p.x = pos.x; - p.y += char_height + 2; - } - else if(*it == ' ') - { - p.x += glyphs[0x20].advance; - } - else - { - Glyph glyph; - if( glyphs.at(*it).surface_idx != -1 ) - glyph = glyphs[*it]; - else - glyph = glyphs[0x20]; - - DrawingRequest request; - - request.pos = p + glyph.offset; - request.drawing_effect = drawing_effect; - request.color = color; - request.alpha = alpha; - - SurfacePartRequest surfacepartrequest; - surfacepartrequest.size = glyph.rect.p2 - glyph.rect.p1; - surfacepartrequest.source = glyph.rect.p1; - surfacepartrequest.surface = notshadow ? &(glyph_surfaces[glyph.surface_idx]) : &(shadow_surfaces[glyph.surface_idx]); - - request.request_data = &surfacepartrequest; - renderer->draw_surface_part(request); - - p.x += glyph.advance; - } + p.x = pos.x; + p.y += char_height + 2; } -} + else if(*it == ' ') + { + p.x += glyphs[0x20].advance; + } + else + { + Glyph glyph; + if( glyphs.at(*it).surface_idx != -1 ) + glyph = glyphs[*it]; + else + glyph = glyphs[0x20]; + + DrawingRequest request; + request.pos = p + glyph.offset; + request.drawing_effect = drawing_effect; + request.color = color; + request.alpha = alpha; + + SurfacePartRequest surfacepartrequest; + surfacepartrequest.size = glyph.rect.p2 - glyph.rect.p1; + surfacepartrequest.source = glyph.rect.p1; + surfacepartrequest.surface = notshadow ? &(glyph_surfaces[glyph.surface_idx]) : &(shadow_surfaces[glyph.surface_idx]); + + request.request_data = &surfacepartrequest; + renderer->draw_surface_part(request); + + p.x += glyph.advance; + } + } +} namespace { @@ -532,3 +533,5 @@ uint32_t decode_utf8(const std::string& text, size_t& p) } } // namespace + +/* EOF */