Qt: cache "no-art" pixmap as well

[vlc] / modules / gui / skins2 / src / bitmap_font.hpp

diff --git a/modules/gui/skins2/src/bitmap_font.hpp b/modules/gui/skins2/src/bitmap_font.hpp
index 436abd087532a3c82d1f26d0847044a323262eed..15f2bcd0fa3661fff41f3b0f9390e76b809464ad 100644 (file)
--- a/modules/gui/skins2/src/bitmap_font.hpp
+++ b/modules/gui/skins2/src/bitmap_font.hpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * bitmap_font.hpp
  *****************************************************************************
- * Copyright (C) 2004 VideoLAN
+ * Copyright (C) 2004 the VideoLAN team
  * $Id$
  *
  * Authors: Cyril Deguet     <asmax@via.ecp.fr>
@@ -16,15 +16,16 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * 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, USA.
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef BITMAP_FONT_HPP
 #define BITMAP_FONT_HPP
 
 #include "generic_font.hpp"
+#include <string>
 
 class GenericBitmap;
 
@@ -32,23 +33,39 @@ class GenericBitmap;
 /// Class to handle bitmap fonts
 class BitmapFont: public GenericFont
 {
-    public:
-        BitmapFont( intf_thread_t *pIntf, const GenericBitmap &rBitmap );
-        virtual ~BitmapFont() {}
+public:
+    BitmapFont( intf_thread_t *pIntf, const GenericBitmap &rBitmap,
+                const string &rType );
+    virtual ~BitmapFont() { }
 
-        virtual bool init() { return true; }
+    virtual bool init() { return true; }
 
-        /// Render a string on a bitmap.
-        /// If maxWidth != -1, the text is truncated with '...'
-        virtual GenericBitmap *drawString( const UString &rString,
-            uint32_t color, int maxWidth = -1 ) const;
+    /// Render a string on a bitmap.
+    /// If maxWidth != -1, the text is truncated with '...'
+    virtual GenericBitmap *drawString( const UString &rString,
+        uint32_t color, int maxWidth = -1 ) const;
 
-        /// Get the font size
-        virtual int getSize() const { return 12; }
+    /// Get the font size
+    virtual int getSize() const { return m_height; }
 
-    private:
-        /// Bitmap
-        const GenericBitmap &m_rBitmap;
+private:
+    /// Description of a glyph
+    struct Glyph_t
+    {
+        Glyph_t(): m_xPos( -1 ), m_yPos( 0 ) { }
+        int m_xPos, m_yPos;
+    };
+
+    /// Bitmap
+    const GenericBitmap &m_rBitmap;
+    /// Glyph size
+    int m_width, m_height;
+    /// Horizontal advance between two characters
+    int m_advance;
+    /// Horizontal advance for non-displayable characters
+    int m_skip;
+    /// Character table
+    Glyph_t m_table[256];
 };
 
 #endif