Support for right-to-left fonts. Set (rtl #t) in

[supertux.git] / src / video / font.hpp

diff --git a/src/video/font.hpp b/src/video/font.hpp
index f521797..bfde874 100644 (file)
--- a/src/video/font.hpp
+++ b/src/video/font.hpp
@@ -1,6 +1,6 @@
 //  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
@@ -21,7 +21,7 @@
 #include <stdint.h>
 #include <string>
 
-#include "math/rect.hpp"
+#include "math/rectf.hpp"
 #include "math/vector.hpp"
 #include "video/color.hpp"
 #include "video/surface.hpp"
@@ -43,6 +43,7 @@ public:
     VARIABLE
   };
 
+public:
   /** Construct a fixed-width font
    *
    *  @param glyph_width  VARIABLE for proportional fonts, VARIABLE for monospace ones
@@ -100,13 +101,13 @@ private:
                   const Vector& position, DrawingEffect drawing_effect, Color color,
                   float alpha) const;
 
-  GlyphWidth glyph_width;
-
-  std::vector<Surface>  glyph_surfaces;
-  std::vector<Surface>  shadow_surfaces;
-  int char_height;
-  int shadowsize;
-
+  void loadFontFile(const std::string &filename);
+  void loadFontSurface(const std::string &glyphimage,
+                       const std::string &shadowimage,
+                       const std::vector<std::string> &chars,
+                       GlyphWidth glyph_width,
+                       int char_width);
+private:
   struct Glyph {
     /** How many pixels should the cursor advance after printing the
         glyph */
@@ -119,18 +120,28 @@ private:
     int surface_idx;
 
     /** Position of the glyph inside the surface */
-    Rect rect;
+    Rectf rect;
+
+    Glyph() :
+      advance(),
+      offset(),
+      surface_idx(),
+      rect()
+    {}
   };
 
+private:
+  GlyphWidth glyph_width;
+
+  std::vector<SurfacePtr>  glyph_surfaces;
+  std::vector<SurfacePtr>  shadow_surfaces;
+  int char_height;
+  int shadowsize;
+  int border;
+  bool rtl;
+
   /** 65536 of glyphs */
   std::vector<Glyph> glyphs;
- 
-  void loadFontFile(const std::string &filename);
-  void loadFontSurface(const std::string &glyphimage,
-                       const std::string &shadowimage,
-                       const std::vector<std::string> &chars,
-                       GlyphWidth glyph_width,
-                       int char_width);
 };
 
 #endif