WillOWisp badguys can now be trapped inside empty Lanterns.

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

diff --git a/src/video/font.hpp b/src/video/font.hpp
index c8973b0..1cf38eb 100644 (file)
--- a/src/video/font.hpp
+++ b/src/video/font.hpp
@@ -42,23 +42,17 @@ public:
     VARIABLE
   };
 
-  /** Construct a fixed-width font 
-   * 
-   *  @param file image file containing the characters
-   *  @param shadowfile image file containing the characters shadows
-   *  @param w width of a character
-   *  @param h height of a character
+  /** Construct a fixed-width font
+   *
+   *  @param glyph_width  VARIABLE for proportional fonts, VARIABLE for monospace ones
+   *  @param filename     image file containing the characters
+   *  @param shadowfile   image file containing the characters shadows
+   *  @param char_width   width of a character
+   *  @param char_height  height of a character
    */
-  Font(GlyphWidth glyph_width, const std::string& file, const std::string& shadowfile,
-       int w, int h, int shadowsize = 2);
-
-  /** Construct a variable-width font 
-   * 
-   *  @param file image file containing the characters
-   */
-  Font(GlyphWidth glyph_width, const std::string& filename, 
-       int char_width, int char_height);
-
+  Font(GlyphWidth glyph_width,
+       const std::string& filename, const std::string& shadowfile,
+       int char_width, int char_height, int shadowsize = 2);
   ~Font();
 
   /** returns the width of a given text. (Note that I won't add a normal
@@ -84,6 +78,11 @@ public:
    */
   static std::string wrap_to_chars(const std::string& text, int max_chars, std::string* overflow);
 
+  /**
+   * returns the given string, truncated (preferrably at whitespace) to be at most "width" pixels wide
+   */
+  std::string wrap_to_width(const std::string& text, float width, std::string* overflow);
+
   /** Draws the given text to the screen. Also needs the position.
    * Type of alignment, drawing effect and alpha are optional. */
   void draw(const std::string& text, const Vector& pos,
@@ -107,7 +106,7 @@ private:
 
   GlyphWidth glyph_width;
   Surface*   glyph_surface;
-  Surface*   shadow_chars;
+  Surface*   shadow_glyph_surface;
   int char_height;
   int shadowsize;
 
@@ -115,9 +114,22 @@ private:
   uint32_t first_char;
   /// the number of the last character that is represented in the font
   uint32_t char_count;
-  
+
+  struct Glyph {
+    /** How many pixels should the cursor advance after printing the
+        glyph */
+    float advance;
+
+    /** Offset that is used when drawing the glyph */
+    Vector offset;
+
+    /** Position of the glyph inside the surface */
+    Rect rect;
+  };
+
   /** Location of the characters inside the surface */
-  std::vector<Rect> glyphs;
+  std::vector<Glyph> glyphs;
+  std::vector<Glyph> shadow_glyphs;
 };
 
 #endif