git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix for previous commit
[enigma2.git]
/
lib
/
gdi
/
font.h
diff --git
a/lib/gdi/font.h
b/lib/gdi/font.h
index 7c8211b8581e275888add3e638ad950a57abc46d..3cdfc299c0d64f6b853970e6c235bbd3f4e0669e 100644
(file)
--- 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
#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>
#include <vector>
#include <lib/gdi/fb.h>
@@
-17,6
+22,8
@@
#include <string>
#include <lib/base/object.h>
#include <string>
#include <lib/base/object.h>
+#include <set>
+
class FontRenderClass;
class Font;
class gDC;
class FontRenderClass;
class Font;
class gDC;
@@
-72,8
+79,10
@@
public:
#define GS_ISSPACE 1
#define GS_ISFIRST 2
#define GS_USED 4
#define GS_ISSPACE 1
#define GS_ISFIRST 2
#define GS_USED 4
-
#define GS_INVERT 8
#define GS_INVERT 8
+#define GS_SOFTHYPHEN 16
+#define GS_HYPHEN 32
+#define GS_CANBREAK (GS_ISSPACE|GS_SOFTHYPHEN|GS_HYPHEN)
struct pGlyph
{
struct pGlyph
{
@@
-98,6
+107,7
@@
private:
int use_kerning;
int previous;
static std::string replacement_facename;
int use_kerning;
int previous;
static std::string replacement_facename;
+ static std::set<int> forced_replaces;
eRect area;
ePoint cursor;
eRect area;
ePoint cursor;
@@
-120,9
+130,10
@@
public:
virtual ~eTextPara();
static void setReplacementFont(std::string font) { replacement_facename=font; }
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);
void setFont(const gFont *font);
- int renderString(const
std::string &
string, int flags=0);
+ int renderString(const
char *
string, int flags=0);
void clear();
void clear();
@@
-174,6
+185,9
@@
class Font: public iObject
{
DECLARE_REF(Font);
public:
{
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);
FTC_Image_Desc font;
fontRenderClass *renderer;
FT_Error getGlyphBitmap(FT_ULong glyph_index, FTC_SBit *sbit);