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 some FIXMEEE's
[enigma2.git]
/
lib
/
gdi
/
font.h
diff --git
a/lib/gdi/font.h
b/lib/gdi/font.h
index c55b8f46dee102245d6abd45702648baa1dae561..6cc238d788307009c2b254a87ba55991c6d4795a 100644
(file)
--- a/
lib/gdi/font.h
+++ b/
lib/gdi/font.h
@@
-1,6
+1,8
@@
#ifndef __FONT_H
#define __FONT_H
#ifndef __FONT_H
#define __FONT_H
+#ifndef SWIG
+
#include <ft2build.h>
#include FT_FREETYPE_H
#include FT_CACHE_H
#include <ft2build.h>
#include FT_FREETYPE_H
#include FT_CACHE_H
@@
-8,7
+10,6
@@
#include FT_CACHE_SMALL_BITMAPS_H
#include <vector>
#include FT_CACHE_SMALL_BITMAPS_H
#include <vector>
-
#include <lib/gdi/fb.h>
#include <lib/gdi/esize.h>
#include <lib/gdi/epoint.h>
#include <lib/gdi/fb.h>
#include <lib/gdi/esize.h>
#include <lib/gdi/epoint.h>
@@
-16,14
+17,18
@@
#include <string>
#include <lib/base/object.h>
#include <string>
#include <lib/base/object.h>
+#include <set>
+
class FontRenderClass;
class Font;
class gDC;
class gFont;
class gRGB;
class FontRenderClass;
class Font;
class gDC;
class gFont;
class gRGB;
+#endif
class fontRenderClass
{
class fontRenderClass
{
+#ifndef SWIG
friend class Font;
friend class eTextPara;
fbClass *fb;
friend class Font;
friend class eTextPara;
fbClass *fb;
@@
-43,17
+48,24
@@
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;
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);
public:
float getLineHeight(const gFont& font);
- std::string AddFont(const std::string &filename, const std::string &name, int scale);
static fontRenderClass *getInstance();
static fontRenderClass *getInstance();
- FT_Error FTC_Face_Requester(FTC_FaceID face_id,
- FT_Face* aface);
+#ifndef SWIG
+ 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);
fontRenderClass();
~fontRenderClass();
int getFont(ePtr<Font> &font, const std::string &face, int size, int tabwidth=-1);
fontRenderClass();
~fontRenderClass();
+#endif
};
};
+#ifndef SWIG
+
#define RS_WRAP 1
#define RS_DOT 2
#define RS_DIRECT 4
#define RS_WRAP 1
#define RS_DOT 2
#define RS_DIRECT 4
@@
-63,6
+75,8
@@
public:
#define GS_ISFIRST 2
#define GS_USED 4
#define GS_ISFIRST 2
#define GS_USED 4
+#define GS_INVERT 8
+
struct pGlyph
{
int x, y, w;
struct pGlyph
{
int x, y, w;
@@
-86,6
+100,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;
@@
-108,9
+123,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();
@@
-142,6
+158,20
@@
public:
assert(num < (int)glyphs.size());
return glyphs[num].bbox;
}
assert(num < (int)glyphs.size());
return glyphs[num].bbox;
}
+
+ void setGlyphFlag(int g, int f)
+ {
+ 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());
+ glyphs[g].flags |= f;
+ }
};
class Font: public iObject
};
class Font: public iObject
@@
-162,4
+192,6
@@
public:
extern fontRenderClass *font;
extern fontRenderClass *font;
+#endif // !SWIG
+
#endif
#endif