X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/adef5abc91835e6c9e06b446c1bd3e3a42ec03bc..32c942bb429ba650aeeed2887f6caed7deed0e39:/lib/gdi/font.h

diff --git a/lib/gdi/font.h b/lib/gdi/font.h
index 2643fda2..6b821838 100644
--- a/lib/gdi/font.h
+++ b/lib/gdi/font.h
@@ -8,12 +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 <list>
 
 #include <lib/gdi/fb.h>
 #include <lib/gdi/esize.h>
@@ -113,6 +112,10 @@ class eTextPara: public iObject
 	eSize maximum;
 	int left;
 	glyphString glyphs;
+	std::list<int> lineOffsets;
+	std::list<int> lineChars;
+	int charCount;
+	bool doTopBottomReordering;
 
 	int appendGlyph(Font *current_font, FT_Face current_face, FT_UInt glyphIndex, int flags, int rflags);
 	void newLine(int flags);
@@ -120,10 +123,12 @@ class eTextPara: public iObject
 	eRect boundBox;
 	void calc_bbox();
 	int bboxValid;
+	void clear();
 public:
 	eTextPara(eRect area, ePoint start=ePoint(-1, -1))
-		: current_font(0), replacement_font(0), current_face(0), replacement_face(0),
-			area(area), cursor(start), maximum(0, 0), left(start.x()), bboxValid(0)
+		:current_font(0), replacement_font(0), current_face(0), replacement_face(0)
+		,area(area), cursor(start), maximum(0, 0), left(start.x()), charCount(0)
+		,doTopBottomReordering(false), bboxValid(0)
 	{
 	}
 	virtual ~eTextPara();
@@ -134,7 +139,7 @@ public:
 	void setFont(const gFont *font);
 	int renderString(const char *string, int flags=0);
 
-	void clear();
+
 
 	void blit(gDC &dc, const ePoint &offset, const gRGB &background, const gRGB &foreground);
 
@@ -184,9 +189,7 @@ class Font: public iObject
 {
 	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);