X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/0e5307c51280792394948716d5e3ecef7d87c295..57ff47aa9d84ac5502a6d1bebcb10780997c3134:/lib/gdi/font.h

diff --git a/lib/gdi/font.h b/lib/gdi/font.h
index 0f3bf714..2643fda2 100644
--- a/lib/gdi/font.h
+++ b/lib/gdi/font.h
@@ -8,6 +8,11 @@
 #include FT_CACHE_H
 #include FT_CACHE_IMAGE_H
 #include FT_CACHE_SMALL_BITMAPS_H
+#ifdef HAVE_FREETYPE2
+typedef FTC_ImageCache FTC_Image_Cache;
+typedef FTC_ImageTypeRec FTC_Image_Desc;
+typedef FTC_SBitCache FTC_SBit_Cache;
+#endif
 #include <vector>
 
 #include <lib/gdi/fb.h>
@@ -17,6 +22,8 @@
 #include <string>
 #include <lib/base/object.h> 
 
+#include <set>
+
 class FontRenderClass;
 class Font;
 class gDC;
@@ -46,6 +53,9 @@ class fontRenderClass
 	FTC_FaceID getFaceID(const std::string &face);
 	FT_Error getGlyphBitmap(FTC_Image_Desc *font, FT_ULong glyph_index, FTC_SBit *sbit);
 	static fontRenderClass *instance;
+#else
+	fontRenderClass();
+	~fontRenderClass();
 #endif
 public:
 	float getLineHeight(const gFont& font);
@@ -54,9 +64,9 @@ public:
 	std::string AddFont(const std::string &filename, const std::string &name, int scale);
 	FT_Error FTC_Face_Requester(FTC_FaceID	face_id, FT_Face* aface);
 	int getFont(ePtr<Font> &font, const std::string &face, int size, int tabwidth=-1);
-#endif
 	fontRenderClass();
 	~fontRenderClass();
+#endif
 };
 
 #ifndef SWIG
@@ -69,8 +79,10 @@ public:
 #define GS_ISSPACE  1
 #define GS_ISFIRST  2
 #define GS_USED			4
-
 #define GS_INVERT   8
+#define GS_SOFTHYPHEN 16
+#define GS_HYPHEN   32
+#define GS_CANBREAK (GS_ISSPACE|GS_SOFTHYPHEN|GS_HYPHEN)
 
 struct pGlyph
 {
@@ -88,13 +100,13 @@ class eLCD;
 
 class eTextPara: public iObject
 {
-DECLARE_REF(eTextPara);
-private:
- 	ePtr<Font> current_font, replacement_font;
+	DECLARE_REF(eTextPara);
+	ePtr<Font> current_font, replacement_font;
 	FT_Face current_face, replacement_face;
 	int use_kerning;
 	int previous;
 	static std::string replacement_facename;
+	static std::set<int> forced_replaces;
 
 	eRect area;
 	ePoint cursor;
@@ -117,9 +129,10 @@ public:
 	virtual ~eTextPara();
 	
 	static void setReplacementFont(std::string font) { replacement_facename=font; }
+	static void forceReplacementGlyph(int unicode) { forced_replaces.insert(unicode); }
 
 	void setFont(const gFont *font);
-	int renderString(const std::string &string, int flags=0);
+	int renderString(const char *string, int flags=0);
 
 	void clear();
 
@@ -147,30 +160,33 @@ public:
 
 	const eRect& getGlyphBBox(int num) const
 	{
-		assert(num >= 0);
-		assert(num < (int)glyphs.size());
+		ASSERT(num >= 0);
+		ASSERT(num < (int)glyphs.size());
 		return glyphs[num].bbox;
 	}
 	
 	void setGlyphFlag(int g, int f)
 	{
-		assert(g >= 0);
-		assert(g < (int)glyphs.size());
+		ASSERT(g >= 0);
+		ASSERT(g < (int)glyphs.size());
 		glyphs[g].flags |= f;
 	}
 
 	void clearGlyphFlag(int g, int f)
 	{
-		assert(g >= 0);
-		assert(g < (int)glyphs.size());
+		ASSERT(g >= 0);
+		ASSERT(g < (int)glyphs.size());
 		glyphs[g].flags |= f;
 	}
 };
 
 class Font: public iObject
 {
-DECLARE_REF(Font);
+	DECLARE_REF(Font);
 public:
+#ifdef HAVE_FREETYPE2
+	FTC_ScalerRec scaler;
+#endif
 	FTC_Image_Desc font;
 	fontRenderClass *renderer;
 	FT_Error getGlyphBitmap(FT_ULong glyph_index, FTC_SBit *sbit);