X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fvideo%2Ffont.cpp;h=90b32afbf33da80bcffda85a0e248de4797389e0;hb=101b0a78b682a8b6b87407edc625adaf7c51da40;hp=db0633eedcec8d82263c9c2e954862bf5d0ab3f0;hpb=a99e13623a367ffcd0a4f125d16f90b928237f34;p=supertux.git

diff --git a/src/video/font.cpp b/src/video/font.cpp
index db0633eed..90b32afbf 100644
--- a/src/video/font.cpp
+++ b/src/video/font.cpp
@@ -1,13 +1,11 @@
-//  $Id$
-//
 //  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 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,163 +13,249 @@
 //  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 <http://www.gnu.org/licenses/>.
 
 #include <config.h>
 
-#include <cstdlib>
-#include <cstring>
+#include <sstream>
+#include <stdlib.h>
+#include <string.h>
 #include <stdexcept>
-
 #include <SDL_image.h>
-#include "physfs/physfs_sdl.hpp"
+#include <physfs.h>
 
+#include "lisp/list_iterator.hpp"
 #include "lisp/parser.hpp"
-#include "lisp/lisp.hpp"
-#include "screen.hpp"
-#include "font.hpp"
-#include "drawing_context.hpp"
-#include "log.hpp"
+#include "physfs/physfs_sdl.hpp"
+#include "supertux/screen.hpp"
+#include "util/file_system.hpp"
+#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"
 
 namespace {
-bool     has_multibyte_mark(unsigned char c);
-uint32_t decode_utf8(const std::string& text, size_t& p);
 
-struct UTF8Iterator
+bool vline_empty(SDL_Surface* surface, int x, int start_y, int end_y, Uint8 threshold)
 {
-  const std::string&     text;
-  std::string::size_type pos;
-  uint32_t chr;
-
-  UTF8Iterator(const std::string& text_)
-    : text(text_),
-      pos(0)
-  {
-    chr = decode_utf8(text, pos);
-  }
+  Uint8* pixels = (Uint8*)surface->pixels;
 
-  bool done() const
+  for(int y = start_y; y < end_y; ++y)
   {
-    return pos > text.size();
-  }
-
-  UTF8Iterator& operator++() {
-    try {
-      chr = decode_utf8(text, pos);
-    } catch (std::runtime_error) {
-      log_debug << "Malformed utf-8 sequence beginning with " << *((uint32_t*)(text.c_str() + pos)) << " found " << std::endl;
-      chr = 0;
-      ++pos;
+    const Uint8& p = pixels[surface->pitch*y + x*surface->format->BytesPerPixel + 3];
+    if (p > threshold)
+    {
+      return false;
     }
-
-    return *this;
   }
+  return true;
+}
 
-  uint32_t operator*() const {
-    return chr;
-  }
-};
+} // namespace
 
-bool vline_empty(SDL_Surface* surface, int x, int start_y, int end_y, Uint8 threshold)
+Font::Font(GlyphWidth glyph_width_,
+           const std::string& filename,
+           int shadowsize_) :
+  glyph_width(glyph_width_),
+  glyph_surfaces(),
+  shadow_surfaces(),
+  char_height(),
+  shadowsize(shadowsize_),
+  border(0),
+  rtl(false),
+  glyphs(65536)
 {
-  Uint8* pixels = (Uint8*)surface->pixels;
+  for(unsigned int i=0; i<65536;i++) glyphs[i].surface_idx = -1;
 
-  for(int y = start_y; y < end_y; ++y)
-    {
-      const Uint8& p = pixels[surface->pitch*y + x*surface->format->BytesPerPixel + 3];
-      if (p > threshold)
-        {
-          return false;
-        }
+  const std::string fontdir = FileSystem::dirname(filename);
+  const std::string fontname = FileSystem::basename(filename);
+
+  // 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_);
     }
-  return true;
+  }
+  PHYSFS_freeList(rc);
 }
-} // namespace
 
-Font::Font(GlyphWidth glyph_width_, 
-           const std::string& filename, 
-           const std::string& shadowfile,
-           int char_width, int char_height_,
-           int shadowsize_)
-  : glyph_width(glyph_width_),
-    glyph_surface(0), shadow_glyph_surface(0), 
-    char_height(char_height_), 
-    shadowsize(shadowsize_)
+void
+Font::loadFontFile(const std::string &filename)
 {
-  glyph_surface = new Surface(filename);
-  shadow_glyph_surface  = new Surface(shadowfile);
+  lisp::Parser parser;
+  log_debug << "Loading font: " << filename << std::endl;
+  const lisp::Lisp* root = parser.parse(filename);
+  const lisp::Lisp* config_l = root->get_lisp("supertux-font");
+
+  if(!config_l) {
+    std::ostringstream msg;
+    msg << "Font file:" << filename << ": is not a supertux-font file";
+    throw std::runtime_error(msg.str());
+  }
 
-  first_char = 32;
-  char_count = ((int) glyph_surface->get_height() / char_height) * 16;
+  int def_char_width=0;
 
-  if (glyph_width == FIXED)
-    {
-      for(uint32_t i = 0; i < char_count; ++i)
-        {
-          float x = (i % 16) * char_width;
-          float y = (i / 16) * char_height;
-          
-          Glyph glyph;
-          glyph.advance = char_width;
-          glyph.offset  = Vector(0, 0);
-          glyph.rect    = Rect(x, y, x + char_width, y + char_height);
+  if( !config_l->get("glyph-width",def_char_width) ) {
+    log_warning << "Font:"<< filename << ": misses default glyph-width" << std::endl;
+  }
 
-          glyphs.push_back(glyph);
-          shadow_glyphs.push_back(glyph);
-        }
-    }
-  else // glyph_width == VARIABLE
-    {
-      // Load the surface into RAM and scan the pixel data for characters
-      SDL_Surface* surface = IMG_Load_RW(get_physfs_SDLRWops(filename), 1);
-      if(surface == NULL) {
+  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();
+    if( token == "surface" ) {
+      const lisp::Lisp * glyphs_val = iter.lisp();
+      int local_char_width;
+      bool monospaced;
+      GlyphWidth local_glyph_width;
+      std::string glyph_image;
+      std::string shadow_image;
+      std::vector<std::string> 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 << "Couldn't load image '" << filename << "' :" << SDL_GetError();
+        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("chars", chars) || chars.size() == 0) {
+        std::ostringstream msg;
+        msg << "Font:" << filename << ": missing chars definition";
         throw std::runtime_error(msg.str());
       }
 
-      SDL_LockSurface(surface);
-
-      for(uint32_t i = 0; i < char_count; ++i)
-        {
-          int x = (i % 16) * char_width;
-          int y = (i / 16) * char_height;
-
-          int left = x;
-          while (left < x + char_width &&
-                 vline_empty(surface, left, y, y + char_height, 64))
-            left += 1;
+      if( local_char_width==0 ) {
+        std::ostringstream msg;
+        msg << "Font:" << filename << ": misses glyph-width for some surface";
+        throw std::runtime_error(msg.str());
+      }
 
-          int right = x + char_width - 1;
-          while (right > left && 
-                 vline_empty(surface, right, y, y + char_height, 64))
-            right -= 1;
+      loadFontSurface(glyph_image, shadow_image, chars,
+                      local_glyph_width, local_char_width);
+    }
+  }
+}
 
-          Glyph glyph;
-          glyph.offset = Vector(0, 0);
+void
+Font::loadFontSurface(
+  const std::string &glyphimage,
+  const std::string &shadowimage,
+  const std::vector<std::string> &chars,
+  GlyphWidth glyph_width_,
+  int char_width
+  )
+{
+  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;
+
+  SDL_Surface *surface = NULL;
+
+  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);
+    if(surface == NULL) {
+      std::ostringstream msg;
+      msg << "Couldn't load image '" << glyphimage << "' :" << SDL_GetError();
+      throw std::runtime_error(msg.str());
+    }
+    SDL_LockSurface(surface);
+  }
 
-          if (left <= right)
-            glyph.rect = Rect(left,  y, right+1, y + char_height);
-          else // glyph is completly transparent
-            glyph.rect = Rect(x,  y, x + char_width, y + char_height);
+  for( unsigned int i = 0; i < chars.size(); i++) {
+    for(UTF8Iterator chr(chars[i]); !chr.done(); ++chr) {
+      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 || isdigit(*chr) )
+      {
+        glyph.rect    = Rectf(x, y, x + char_width, y + char_height);
+        glyph.offset  = Vector(0, 0);
+        glyph.advance = char_width;
+      }
+      else
+      {
+        if (y + char_height > surface->h)
+        {
+          log_warning << "error: font definition contains more letter then the images: " << glyphimage << std::endl;
+          goto abort;
+        }
 
-          glyph.advance = glyph.rect.get_width() + 1; // FIXME: might be usefull to make spacing configurable
+        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;
 
-          glyphs.push_back(glyph);
-          shadow_glyphs.push_back(glyph);
+        if (left <= right)
+        {
+          glyph.offset  = Vector(x-left, 0);
+          glyph.advance = right - left + 1 + 1; // FIXME: might be useful to make spacing configurable
         }
-  
-      SDL_UnlockSurface(surface);
+        else
+        { // glyph is completly transparent
+          glyph.offset  = Vector(0, 0);
+          glyph.advance = char_width + 1; // FIXME: might be useful to make spacing configurable
+        }
+
+        glyph.rect = Rectf(x,  y, x + char_width, y + char_height);
+      }
 
-      SDL_FreeSurface(surface);
+      glyphs[*chr] = glyph;
     }
+    if( col>0 && col <= wrap ) {
+      col = 0;
+      row++;
+    }
+  }
+abort:
+
+  if( surface != NULL ) {
+    SDL_UnlockSurface(surface);
+    SDL_FreeSurface(surface);
+  }
 }
 
 Font::~Font()
 {
-  delete glyph_surface;
-  delete shadow_glyph_surface;
 }
 
 float
@@ -181,18 +265,20 @@ Font::get_text_width(const std::string& text) const
   float last_width = 0;
 
   for(UTF8Iterator it(text); !it.done(); ++it)
+  {
+    if (*it == '\n')
     {
-      if (*it == '\n')
-        {
-          last_width = std::max(last_width, curr_width);
-          curr_width = 0;
-        }
+      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
-        {
-          int idx = chr2glyph(*it);
-          curr_width += glyphs[idx].advance;
-        }
+        curr_width += glyphs[0x20].advance;
     }
+  }
 
   return std::max(curr_width, last_width);
 }
@@ -201,14 +287,14 @@ float
 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;
 }
@@ -216,7 +302,7 @@ Font::get_text_height(const std::string& text) const
 float
 Font::get_height() const
 {
-  return char_height; 
+  return char_height;
 }
 
 std::string
@@ -241,173 +327,125 @@ Font::wrap_to_chars(const std::string& s, int line_length, std::string* overflow
   return s;
 }
 
+std::string
+Font::wrap_to_width(const std::string& s_, float width, std::string* overflow)
+{
+  std::string s = s_;
+
+  // if text is already smaller, return full text
+  if (get_text_width(s) <= width) {
+    if (overflow) *overflow = "";
+    return s;
+  }
+
+  // if we can find a whitespace character to break at, return text up to this character
+  for (int i = s.length()-1; i >= 0; i--) {
+    std::string s2 = s.substr(0,i);
+    if (s[i] != ' ') continue;
+    if (get_text_width(s2) <= width) {
+      if (overflow) *overflow = s.substr(i+1);
+      return s.substr(0, i);
+    }
+  }
+
+  // FIXME: hard-wrap at width, taking care of multibyte characters
+  if (overflow) *overflow = "";
+  return s;
+}
+
 void
-Font::draw(const std::string& text, const Vector& pos_, FontAlignment alignment,
-           DrawingEffect drawing_effect, float alpha) const
+Font::draw(Renderer *renderer, const std::string& text, const Vector& pos_,
+           FontAlignment alignment, DrawingEffect drawing_effect, Color color,
+           float alpha) const
 {
   float x = pos_.x;
   float y = pos_.y;
 
   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);
-
-          // 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);
-          
-          // Cast font position to integer to get a clean drawing result and
-          // no bluring as we would get with subpixel positions
-          pos.x = static_cast<int>(pos.x);
-
-          draw_text(temp, pos, drawing_effect, alpha);
-
-          if (i == text.size())
-            break;
-
-          y += char_height + 2;      
-          last = i + 1;
-        }
+      std::string temp = text.substr(last, i - last);
+
+      // 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);
+
+      // 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<int>(pos.x);
+
+      draw_text(renderer, temp, pos, drawing_effect, color, alpha);
+
+      if (i == text.size())
+        break;
+
+      y += char_height + 2;
+      last = i + 1;
     }
+  }
 }
 
 void
-Font::draw_text(const std::string& text, const Vector& pos,
-                DrawingEffect drawing_effect, float alpha) const
+Font::draw_text(Renderer *renderer, const std::string& text, const Vector& pos,
+                DrawingEffect drawing_effect, Color color, float alpha) const
 {
   if(shadowsize > 0)
-    {
-      // FIXME: shadow_glyph_surface and glyph_surface do currently
-      // share the same glyph array, this is incorrect and should be
-      // fixed, it is however hardly noticable
-      draw_chars(shadow_glyph_surface, text, pos + Vector(shadowsize, shadowsize),
-                 drawing_effect, alpha);
-    }
-
-  draw_chars(glyph_surface, text, pos, drawing_effect, alpha);
-}
-
-int
-Font::chr2glyph(uint32_t chr) const
-{
-  int glyph_index = chr - first_char;
-  
-  // we don't have the control chars 0x80-0xa0 in the font
-  if (chr >= 0x80) { // non-ascii character
-    glyph_index -= 32;
-    if(chr <= 0xa0) {
-      log_debug << "Unsupported utf-8 character '" << chr << "' found" << std::endl;
-      glyph_index = 0;
-    }
-  }
+    draw_chars(renderer, false, rtl ? std::string(text.rbegin(), text.rend()) : text,
+               pos + Vector(shadowsize, shadowsize), drawing_effect, Color(1,1,1), alpha);
 
-  if(glyph_index < 0 || glyph_index >= (int) char_count) {
-    log_debug << "Unsupported utf-8 character found" << std::endl;
-    glyph_index = 0;
-  }
-  
-  return glyph_index;
+  draw_chars(renderer, true, rtl ? std::string(text.rbegin(), text.rend()) : text, pos, drawing_effect, color, alpha);
 }
 
 void
-Font::draw_chars(Surface* pchars, const std::string& text, const Vector& pos,
-                 DrawingEffect drawing_effect, float alpha) const
+Font::draw_chars(Renderer *renderer, bool notshadow, const std::string& text,
+                 const Vector& pos, DrawingEffect drawing_effect, Color color,
+                 float alpha) const
 {
   Vector p = pos;
 
   for(UTF8Iterator it(text); !it.done(); ++it)
+  {
+    if(*it == '\n')
     {
-      int font_index = chr2glyph(*it);
-
-      if(*it == '\n') 
-        { 
-          p.x = pos.x;
-          p.y += char_height + 2;
-        }
-      else if(*it == ' ') 
-        {
-          p.x += glyphs[font_index].advance;
-        } 
-      else 
-        {
-          const Glyph& glyph = glyphs[font_index];
-          pchars->draw_part(glyph.rect.get_left(),
-                            glyph.rect.get_top(),
-                            p.x + glyph.offset.y,
-                            p.y + glyph.offset.y,
-                            glyph.rect.get_width(), glyph.rect.get_height(),
-                            alpha, drawing_effect);
-          p.x += glyphs[font_index].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;
 
-namespace {
+      request.pos = p + glyph.offset;
+      request.drawing_effect = drawing_effect;
+      request.color = color;
+      request.alpha = alpha;
 
-/**
- * returns true if this byte matches a bitmask of 10xx.xxxx, i.e. it is the 2nd, 3rd or 4th byte of a multibyte utf8 string
- */
-bool has_multibyte_mark(unsigned char c) {
-  return ((c & 0300) == 0200);
-}
-
-/**
- * gets unicode character at byte position @a p of UTF-8 encoded @a
- * text, then advances @a p to the next character.
- *
- * @throws std::runtime_error if decoding fails.
- * See unicode standard section 3.10 table 3-5 and 3-6 for details.
- */
-uint32_t decode_utf8(const std::string& text, size_t& p)
-{
-  uint32_t c1 = (unsigned char) text[p+0];
+      SurfacePartRequest surfacepartrequest;
+      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();
 
-  if (has_multibyte_mark(c1)) std::runtime_error("Malformed utf-8 sequence");
+      request.request_data = &surfacepartrequest;
+      renderer->draw_surface_part(request);
 
-  if ((c1 & 0200) == 0000) {
-    // 0xxx.xxxx: 1 byte sequence
-    p+=1;
-    return c1;
-  }
-  else if ((c1 & 0340) == 0300) {
-    // 110x.xxxx: 2 byte sequence
-    if(p+1 >= text.size()) throw std::range_error("Malformed utf-8 sequence");
-    uint32_t c2 = (unsigned char) text[p+1];
-    if (!has_multibyte_mark(c2)) throw std::runtime_error("Malformed utf-8 sequence");
-    p+=2;
-    return (c1 & 0037) << 6 | (c2 & 0077);
-  }
-  else if ((c1 & 0360) == 0340) {
-    // 1110.xxxx: 3 byte sequence
-    if(p+2 >= text.size()) throw std::range_error("Malformed utf-8 sequence");
-    uint32_t c2 = (unsigned char) text[p+1];
-    uint32_t c3 = (unsigned char) text[p+2];
-    if (!has_multibyte_mark(c2)) throw std::runtime_error("Malformed utf-8 sequence");
-    if (!has_multibyte_mark(c3)) throw std::runtime_error("Malformed utf-8 sequence");
-    p+=3;
-    return (c1 & 0017) << 12 | (c2 & 0077) << 6 | (c3 & 0077);
-  }
-  else if ((c1 & 0370) == 0360) {
-    // 1111.0xxx: 4 byte sequence
-    if(p+3 >= text.size()) throw std::range_error("Malformed utf-8 sequence");
-    uint32_t c2 = (unsigned char) text[p+1];
-    uint32_t c3 = (unsigned char) text[p+2];
-    uint32_t c4 = (unsigned char) text[p+4];
-    if (!has_multibyte_mark(c2)) throw std::runtime_error("Malformed utf-8 sequence");
-    if (!has_multibyte_mark(c3)) throw std::runtime_error("Malformed utf-8 sequence");
-    if (!has_multibyte_mark(c4)) throw std::runtime_error("Malformed utf-8 sequence");
-    p+=4;
-    return (c1 & 0007) << 18 | (c2 & 0077) << 12 | (c3 & 0077) << 6 | (c4 & 0077);
+      p.x += glyph.advance;
+    }
   }
-  throw std::runtime_error("Malformed utf-8 sequence");
 }
 
-} // namespace
+/* EOF */