- add python, missing gui

[enigma2.git] / lib / gdi / font.cpp

diff --git a/lib/gdi/font.cpp b/lib/gdi/font.cpp
index a0b6d2e76185e1c95d3b08341765e3e545a56d14..ee228576bfb9852bfb495159a46919c35199f44e 100644 (file)
--- a/lib/gdi/font.cpp
+++ b/lib/gdi/font.cpp
@@ -101,7 +101,7 @@ FT_Error fontRenderClass::FTC_Face_Requester(FTC_FaceID     face_id, FT_Face* aface)
        return 0;
 }                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
 
-FTC_FaceID fontRenderClass::getFaceID(const eString &face)
+FTC_FaceID fontRenderClass::getFaceID(const std::string &face)
 {
        for (fontListEntry *f=font; f; f=f->next)
        {
@@ -117,7 +117,7 @@ FT_Error fontRenderClass::getGlyphBitmap(FTC_Image_Desc *font, FT_ULong glyph_in
        return res;
 }
 
-eString fontRenderClass::AddFont(const eString &filename, const eString &name, int scale)
+std::string fontRenderClass::AddFont(const std::string &filename, const std::string &name, int scale)
 {
        eDebugNoNewLine("[FONT] adding font %s...", filename.c_str());
        fflush(stdout);
@@ -225,7 +225,7 @@ fontRenderClass::~fontRenderClass()
 //     FT_Done_FreeType(library);
 }
 
-int fontRenderClass::getFont(ePtr<Font> &font, const eString &face, int size, int tabwidth)
+int fontRenderClass::getFont(ePtr<Font> &font, const std::string &face, int size, int tabwidth)
 {
        FTC_FaceID id=getFaceID(face);
        if (!id)
@@ -239,7 +239,7 @@ int fontRenderClass::getFont(ePtr<Font> &font, const eString &face, int size, in
 
 DEFINE_REF(Font);
 
-Font::Font(fontRenderClass *render, FTC_FaceID faceid, int isize, int tw): ref(0), tabwidth(tw)
+Font::Font(fontRenderClass *render, FTC_FaceID faceid, int isize, int tw): tabwidth(tw)
 {
        renderer=render;
        font.font.face_id=faceid;
@@ -249,7 +249,6 @@ Font::Font(fontRenderClass *render, FTC_FaceID faceid, int isize, int tw): ref(0
        height=isize;
        if (tabwidth==-1)
                tabwidth=8*isize;
-       ref=0;
 //     font.image_type |= ftc_image_flag_autohinted;
 }
 
@@ -262,6 +261,8 @@ Font::~Font()
 {
 }
 
+DEFINE_REF(eTextPara);
+
 int eTextPara::appendGlyph(Font *current_font, FT_Face current_face, FT_UInt glyphIndex, int flags, int rflags)
 {
        FTC_SBit glyph;
@@ -387,30 +388,10 @@ void eTextPara::newLine(int flags)
 eTextPara::~eTextPara()
 {
        clear();
-       if (refcnt>=0)
-               eFatal("verdammt man der war noch gelockt :/\n");
-}
-
-void eTextPara::destroy()
-{
-       singleLock s(refcntlck);
-
-       if (!refcnt--)
-               delete this;
-}
-
-eTextPara *eTextPara::grab()
-{
-       singleLock s(refcntlck);
-
-       refcnt++;
-       return this;
 }
 
 void eTextPara::setFont(const gFont *font)
 {
-       if (refcnt)
-               eFatal("mod. after lock");
        ePtr<Font> fnt, replacement;
        fontRenderClass::getInstance()->getFont(fnt, font->family.c_str(), font->pointSize);
        if (!fnt)
@@ -419,12 +400,10 @@ void eTextPara::setFont(const gFont *font)
        setFont(fnt, replacement);
 }
 
-eString eTextPara::replacement_facename;
+std::string eTextPara::replacement_facename;
 
 void eTextPara::setFont(Font *fnt, Font *replacement)
 {
-       if (refcnt)
-               eFatal("mod. after lock");
        if (!fnt)
                return;
        current_font=fnt;
@@ -458,13 +437,10 @@ void eTextPara::setFont(Font *fnt, Font *replacement)
 void
 shape (std::vector<unsigned long> &string, const std::vector<unsigned long> &text);
 
-int eTextPara::renderString(const eString &string, int rflags)
+int eTextPara::renderString(const std::string &string, int rflags)
 {
        singleLock s(ftlock);
        
-       if (refcnt)
-               eFatal("mod. after lock");
-
        if (!current_font)
                return -1;
                
@@ -487,7 +463,7 @@ int eTextPara::renderString(const eString &string, int rflags)
        std::vector<unsigned long> uc_string, uc_visual;
        uc_string.reserve(string.length());
        
-       eString::const_iterator p(string.begin());
+       std::string::const_iterator p(string.begin());
 
        while(p != string.end())
        {
@@ -688,8 +664,7 @@ void eTextPara::blit(gDC &dc, const ePoint &offset, const gRGB &background, cons
        }
        
        gRegion area(eRect(0, 0, surface->x, surface->y));
-       gRegion clip;
-       clip.intersect(area, dc.getClip());
+       gRegion clip = dc.getClip() & area;
 
        int buffer_stride=surface->stride;