// SuperTux
// Copyright (C) 2006 Matthias Braun <matze@braunis.de>
-// Ingo Ruhnke <grumbel@gmx.de>
+// Ingo Ruhnke <grumbel@gmail.com>
//
// 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
#include <config.h>
+#include <sstream>
#include <stdlib.h>
#include <string.h>
#include <stdexcept>
#include "util/log.hpp"
#include "util/utf8_iterator.hpp"
#include "video/drawing_context.hpp"
+#include "video/drawing_request.hpp"
#include "video/font.hpp"
#include "video/renderer.hpp"
shadow_surfaces(),
char_height(),
shadowsize(shadowsize_),
+ border(0),
+ rtl(false),
glyphs(65536)
{
for(unsigned int i=0; i<65536;i++) glyphs[i].surface_idx = -1;
// scan for prefix-filename in addons search path
char **rc = PHYSFS_enumerateFiles(fontdir.c_str());
for (char **i = rc; *i != NULL; i++) {
- std::string filename(*i);
- if( filename.rfind(fontname) != std::string::npos ) {
- loadFontFile(fontdir + filename);
+ std::string filename_(*i);
+ if( filename_.rfind(fontname) != std::string::npos ) {
+ loadFontFile(fontdir + filename_);
}
}
PHYSFS_freeList(rc);
}
-void
+void
Font::loadFontFile(const std::string &filename)
{
lisp::Parser parser;
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());
}
+ config_l->get("glyph-border", border);
+ config_l->get("rtl", rtl);
+
lisp::ListIterator iter(config_l);
while(iter.next()) {
const std::string& token = iter.item();
}
}
-void
+void
Font::loadFontSurface(
const std::string &glyphimage,
const std::string &shadowimage,
const std::vector<std::string> &chars,
- GlyphWidth glyph_width,
+ GlyphWidth glyph_width_,
int char_width
)
{
- Surface glyph_surface("images/engine/fonts/" + glyphimage);
- Surface shadow_surface("images/engine/fonts/" + shadowimage);
+ SurfacePtr glyph_surface = Surface::create("images/engine/fonts/" + glyphimage);
+ SurfacePtr shadow_surface = Surface::create("images/engine/fonts/" + shadowimage);
int surface_idx = glyph_surfaces.size();
glyph_surfaces.push_back(glyph_surface);
shadow_surfaces.push_back(shadow_surface);
int row=0, col=0;
- int wrap = glyph_surface.get_width() / char_width;
-
+ int wrap = glyph_surface->get_width() / char_width;
+
SDL_Surface *surface = NULL;
-
- if( glyph_width == VARIABLE ) {
+
+ if( glyph_width_ == VARIABLE ) {
//this does not work:
// surface = ((SDL::Texture *)glyph_surface.get_texture())->get_texture();
surface = IMG_Load_RW(get_physfs_SDLRWops("images/engine/fonts/"+glyphimage), 1);
for( unsigned int i = 0; i < chars.size(); i++) {
for(UTF8Iterator chr(chars[i]); !chr.done(); ++chr) {
- int y = row * char_height;
- int x = col * char_width;
+ int y = row * (char_height + 2*border) + border;
+ int x = col * (char_width + 2*border) + border;
if( ++col == wrap ) { col=0; row++; }
if( *chr == 0x0020 && glyphs[0x20].surface_idx != -1) continue;
-
+
Glyph glyph;
glyph.surface_idx = surface_idx;
-
- if( glyph_width == FIXED )
+
+ if( glyph_width_ == FIXED || isdigit(*chr) )
{
glyph.rect = Rectf(x, y, x + char_width, y + char_height);
glyph.offset = Vector(0, 0);
glyph.advance = char_width;
}
- else
+ else
{
+ if (y + char_height > surface->h)
+ {
+ log_warning << "error: font definition contains more letter then the images: " << glyphimage << std::endl;
+ goto abort;
+ }
+
int left = x;
while (left < x + char_width && vline_empty(surface, left, y, y + char_height, 64))
left += 1;
int right = x + char_width - 1;
while (right > left && vline_empty(surface, right, y, y + char_height, 64))
right -= 1;
-
- if (left <= right)
+
+ if (left <= right)
{
glyph.offset = Vector(x-left, 0);
glyph.advance = right - left + 1 + 1; // FIXME: might be useful to make spacing configurable
- }
- else
+ }
+ else
{ // glyph is completly transparent
glyph.offset = Vector(0, 0);
glyph.advance = char_width + 1; // FIXME: might be useful to make spacing configurable
glyphs[*chr] = glyph;
}
- if( col>0 && col <= wrap ) {
+ if( col>0 && col <= wrap ) {
col = 0;
row++;
}
}
-
+abort:
+
if( surface != NULL ) {
SDL_UnlockSurface(surface);
SDL_FreeSurface(surface);
{
if( glyphs.at(*it).surface_idx != -1 )
curr_width += glyphs[*it].advance;
- else
+ else
curr_width += glyphs[0x20].advance;
}
}
return s.substr(0, i);
}
}
-
+
// FIXME: hard-wrap at width, taking care of multibyte characters
if (overflow) *overflow = "";
return s;
DrawingEffect drawing_effect, Color color, float alpha) const
{
if(shadowsize > 0)
- draw_chars(renderer, false, text,
+ draw_chars(renderer, false, rtl ? std::string(text.rbegin(), text.rend()) : text,
pos + Vector(shadowsize, shadowsize), drawing_effect, Color(1,1,1), alpha);
- draw_chars(renderer, true, text, pos, drawing_effect, color, alpha);
+ draw_chars(renderer, true, rtl ? std::string(text.rbegin(), text.rend()) : text, pos, drawing_effect, color, alpha);
}
void
Glyph glyph;
if( glyphs.at(*it).surface_idx != -1 )
glyph = glyphs[*it];
- else
+ else
glyph = glyphs[0x20];
DrawingRequest request;
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]);
+ surfacepartrequest.srcrect = glyph.rect;
+ surfacepartrequest.dstsize = glyph.rect.get_size();
+ surfacepartrequest.surface = notshadow ? glyph_surfaces[glyph.surface_idx].get() : shadow_surfaces[glyph.surface_idx].get();
request.request_data = &surfacepartrequest;
renderer->draw_surface_part(request);
projects / supertux.git / blobdiff