WLAN: fix inversed logic for WPA2 vs. WPA/WPA2

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

diff --git a/lib/gdi/font.cpp b/lib/gdi/font.cpp
index a5db43a9e3af99765f12ae4e91d933c5d38c1899..9e175476688d31c9a9308a63ed3d58bec7bd9b37 100644 (file)
--- a/lib/gdi/font.cpp
+++ b/lib/gdi/font.cpp
@@ -15,12 +15,10 @@
 // use this for init Freetype...
 #include <ft2build.h>
 #include FT_FREETYPE_H
 // use this for init Freetype...
 #include <ft2build.h>
 #include FT_FREETYPE_H

-#ifdef HAVE_FREETYPE2

 #define FTC_Image_Cache_New(a,b)       FTC_ImageCache_New(a,b)
 #define FTC_Image_Cache_Lookup(a,b,c,d)        FTC_ImageCache_Lookup(a,b,c,d,NULL)
 #define FTC_SBit_Cache_New(a,b)                FTC_SBitCache_New(a,b)
 #define FTC_SBit_Cache_Lookup(a,b,c,d) FTC_SBitCache_Lookup(a,b,c,d,NULL)
 #define FTC_Image_Cache_New(a,b)       FTC_ImageCache_New(a,b)
 #define FTC_Image_Cache_Lookup(a,b,c,d)        FTC_ImageCache_Lookup(a,b,c,d,NULL)
 #define FTC_SBit_Cache_New(a,b)                FTC_SBitCache_New(a,b)
 #define FTC_SBit_Cache_Lookup(a,b,c,d) FTC_SBitCache_Lookup(a,b,c,d,NULL)

-#endif

 
 #include <lib/base/eerror.h>
 #include <lib/gdi/lcd.h>
 
 #include <lib/base/eerror.h>
 #include <lib/gdi/lcd.h>


@@ -29,12 +27,7 @@
 #include <lib/base/init.h>
 #include <lib/base/init_num.h>
 
 #include <lib/base/init.h>
 #include <lib/base/init_num.h>
 

-#define HAVE_FRIBIDI
-// until we have it in the cdk
-
-#ifdef HAVE_FRIBIDI

 #include <fribidi/fribidi.h>
 #include <fribidi/fribidi.h>

-#endif

 
 #include <map>
 
 
 #include <map>
 


@@ -42,10 +35,6 @@ fontRenderClass *fontRenderClass::instance;
 
 static pthread_mutex_t ftlock=PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP;
 
 
 static pthread_mutex_t ftlock=PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP;
 

-#ifndef HAVE_FREETYPE2
-static FTC_Font cache_current_font=0;
-#endif
-

 struct fntColorCacheKey
 {
        gRGB start, end;
 struct fntColorCacheKey
 {
        gRGB start, end;


@@ -210,12 +199,8 @@ float fontRenderClass::getLineHeight(const gFont& font)
                return 0;
        singleLock s(ftlock);
        FT_Face current_face;
                return 0;
        singleLock s(ftlock);
        FT_Face current_face;

-#ifdef HAVE_FREETYPE2

        if ((FTC_Manager_LookupFace(cacheManager, fnt->scaler.face_id, &current_face) < 0) ||
            (FTC_Manager_LookupSize(cacheManager, &fnt->scaler, &fnt->size) < 0))
        if ((FTC_Manager_LookupFace(cacheManager, fnt->scaler.face_id, &current_face) < 0) ||
            (FTC_Manager_LookupSize(cacheManager, &fnt->scaler, &fnt->size) < 0))

-#else
-       if (FTC_Manager_Lookup_Size(cacheManager, &fnt->font.font, &current_face, &fnt->size)<0)
-#endif

        {
                eDebug("FTC_Manager_Lookup_Size failed!");
                return 0;
        {
                eDebug("FTC_Manager_Lookup_Size failed!");
                return 0;


@@ -263,7 +248,6 @@ DEFINE_REF(Font);
 Font::Font(fontRenderClass *render, FTC_FaceID faceid, int isize, int tw): tabwidth(tw)
 {
        renderer=render;
 Font::Font(fontRenderClass *render, FTC_FaceID faceid, int isize, int tw): tabwidth(tw)
 {
        renderer=render;

-#ifdef HAVE_FREETYPE2

        font.face_id = faceid;
        font.width = isize;
        font.height = isize;
        font.face_id = faceid;
        font.width = isize;
        font.height = isize;


@@ -272,12 +256,6 @@ Font::Font(fontRenderClass *render, FTC_FaceID faceid, int isize, int tw): tabwi
        scaler.width = isize;
        scaler.height = isize;
        scaler.pixel = 1;
        scaler.width = isize;
        scaler.height = isize;
        scaler.pixel = 1;

-#else
-       font.font.face_id=faceid;
-       font.font.pix_width     = isize;
-       font.font.pix_height = isize;
-       font.image_type = ftc_image_grays;
-#endif

        height=isize;
        if (tabwidth==-1)
                tabwidth=8*isize;
        height=isize;
        if (tabwidth==-1)
                tabwidth=8*isize;


@@ -474,18 +452,12 @@ void eTextPara::setFont(Font *fnt, Font *replacement)
                        // we ask for replacment_font first becauseof the cache
        if (replacement_font)
        {
                        // we ask for replacment_font first becauseof the cache
        if (replacement_font)
        {

-#ifdef HAVE_FREETYPE2

                if ((FTC_Manager_LookupFace(fontRenderClass::instance->cacheManager,
                                            replacement_font->scaler.face_id,
                                            &replacement_face) < 0) ||
                    (FTC_Manager_LookupSize(fontRenderClass::instance->cacheManager,
                                            &replacement_font->scaler,
                                            &replacement_font->size) < 0))
                if ((FTC_Manager_LookupFace(fontRenderClass::instance->cacheManager,
                                            replacement_font->scaler.face_id,
                                            &replacement_face) < 0) ||
                    (FTC_Manager_LookupSize(fontRenderClass::instance->cacheManager,
                                            &replacement_font->scaler,
                                            &replacement_font->size) < 0))

-#else
-               if (FTC_Manager_Lookup_Size(fontRenderClass::instance->cacheManager, 
-                               &replacement_font->font.font, &replacement_face, 
-                               &replacement_font->size)<0)
-#endif

                {
                        eDebug("FTC_Manager_Lookup_Size failed!");
                        return;
                {
                        eDebug("FTC_Manager_Lookup_Size failed!");
                        return;


@@ -493,24 +465,17 @@ void eTextPara::setFont(Font *fnt, Font *replacement)
        }
        if (current_font)
        {
        }
        if (current_font)
        {

-#ifdef HAVE_FREETYPE2

                if ((FTC_Manager_LookupFace(fontRenderClass::instance->cacheManager,
                                            current_font->scaler.face_id,
                                            &current_face) < 0) ||
                    (FTC_Manager_LookupSize(fontRenderClass::instance->cacheManager,
                                            &current_font->scaler,
                                            &current_font->size) < 0))
                if ((FTC_Manager_LookupFace(fontRenderClass::instance->cacheManager,
                                            current_font->scaler.face_id,
                                            &current_face) < 0) ||
                    (FTC_Manager_LookupSize(fontRenderClass::instance->cacheManager,
                                            &current_font->scaler,
                                            &current_font->size) < 0))

-#else
-               if (FTC_Manager_Lookup_Size(fontRenderClass::instance->cacheManager, &current_font->font.font, &current_face, &current_font->size)<0)
-#endif

                {
                        eDebug("FTC_Manager_Lookup_Size failed!");
                        return;
                }
        }
                {
                        eDebug("FTC_Manager_Lookup_Size failed!");
                        return;
                }
        }

-#ifndef HAVE_FREETYPE2
-       cache_current_font=&current_font->font.font;
-#endif

        previous=0;
        use_kerning=FT_HAS_KERNING(current_face);
 }
        previous=0;
        use_kerning=FT_HAS_KERNING(current_face);
 }


@@ -525,7 +490,6 @@ int eTextPara::renderString(const char *string, int rflags)
        if (!current_font)
                return -1;
 
        if (!current_font)
                return -1;
 

-#ifdef HAVE_FREETYPE2

        if ((FTC_Manager_LookupFace(fontRenderClass::instance->cacheManager,
                                    current_font->scaler.face_id,
                                    &current_face) < 0) ||
        if ((FTC_Manager_LookupFace(fontRenderClass::instance->cacheManager,
                                    current_font->scaler.face_id,
                                    &current_face) < 0) ||


@@ -536,17 +500,6 @@ int eTextPara::renderString(const char *string, int rflags)
                eDebug("FTC_Manager_Lookup_Size failed!");
                return -1;
        }
                eDebug("FTC_Manager_Lookup_Size failed!");
                return -1;
        }

-#else
-       if (&current_font->font.font != cache_current_font)
-       {
-               if (FTC_Manager_Lookup_Size(fontRenderClass::instance->cacheManager, &current_font->font.font, &current_face, &current_font->size)<0)
-               {
-                       eDebug("FTC_Manager_Lookup_Size failed!");
-                       return -1;
-               }
-               cache_current_font=&current_font->font.font;
-       }
-#endif

 
        if (!current_face)
                eFatal("eTextPara::renderString: no current_face");
 
        if (!current_face)
                eFatal("eTextPara::renderString: no current_face");


@@ -610,7 +563,6 @@ int eTextPara::renderString(const char *string, int rflags)
        
                // now do the usual logical->visual reordering
        int size=uc_shape.size();
        
                // now do the usual logical->visual reordering
        int size=uc_shape.size();

-#ifdef HAVE_FRIBIDI

        FriBidiCharType dir=FRIBIDI_TYPE_ON;
        uc_visual.resize(size);
        // gaaanz lahm, aber anders geht das leider nicht, sorry.
        FriBidiCharType dir=FRIBIDI_TYPE_ON;
        uc_visual.resize(size);
        // gaaanz lahm, aber anders geht das leider nicht, sorry.


@@ -618,9 +570,6 @@ int eTextPara::renderString(const char *string, int rflags)
        std::copy(uc_shape.begin(), uc_shape.end(), array);
        fribidi_log2vis(array, size, &dir, target, 0, 0, 0);
        uc_visual.assign(target, target+size);
        std::copy(uc_shape.begin(), uc_shape.end(), array);
        fribidi_log2vis(array, size, &dir, target, 0, 0, 0);
        uc_visual.assign(target, target+size);

-#else
-       uc_visual=uc_shape;
-#endif

 
        glyphs.reserve(size);
        
 
        glyphs.reserve(size);
        


@@ -714,13 +663,11 @@ nprint:   isprintable=0;
        }
        bboxValid=false;
        calc_bbox();
        }
        bboxValid=false;
        calc_bbox();

-#ifdef HAVE_FRIBIDI

        if (dir & FRIBIDI_MASK_RTL)
        {
                realign(dirRight);
                doTopBottomReordering=true;
        }
        if (dir & FRIBIDI_MASK_RTL)
        {
                realign(dirRight);
                doTopBottomReordering=true;
        }

-#endif

 
        if (charCount)
        {
 
        if (charCount)
        {


@@ -739,7 +686,6 @@ void eTextPara::blit(gDC &dc, const ePoint &offset, const gRGB &background, cons
        if (!current_font)
                return;
 
        if (!current_font)
                return;
 

-#ifdef HAVE_FREETYPE2

        if ((FTC_Manager_LookupFace(fontRenderClass::instance->cacheManager,
                                    current_font->scaler.face_id,
                                    &current_face) < 0) ||
        if ((FTC_Manager_LookupFace(fontRenderClass::instance->cacheManager,
                                    current_font->scaler.face_id,
                                    &current_face) < 0) ||


@@ -750,17 +696,6 @@ void eTextPara::blit(gDC &dc, const ePoint &offset, const gRGB &background, cons
                eDebug("FTC_Manager_Lookup_Size failed!");
                return;
        }
                eDebug("FTC_Manager_Lookup_Size failed!");
                return;
        }

-#else
-       if (&current_font->font.font != cache_current_font)
-       {
-               if (FTC_Manager_Lookup_Size(fontRenderClass::instance->cacheManager, &current_font->font.font, &current_face, &current_font->size)<0)
-               {
-                       eDebug("FTC_Manager_Lookup_Size failed!");
-                       return;
-               }
-               cache_current_font=&current_font->font.font;
-       }
-#endif

 
        ePtr<gPixmap> target;
        dc.getPixmap(target);
 
        ePtr<gPixmap> target;
        dc.getPixmap(target);