tenative font glyph workaround for fonts not containing gfx drawing

chars.



SVN revision: 72604

1 files changed, 52 insertions, 1 deletions

diff --git a/legacy/evas/src/lib/engines/common/evas_font_main.c b/legacy/evas/src/lib/engines/common/evas_font_main.c
index d2373ff71d..c09c46b83d 100644
--- a/legacy/evas/src/lib/engines/common/evas_font_main.c
+++ b/legacy/evas/src/lib/engines/common/evas_font_main.c
@@ -366,7 +366,6 @@ evas_common_font_int_cache_glyph_get(RGBA_Font_Int *fi, FT_UInt idx)
         if (fg == (void *)(-1)) return NULL;
         else if (fg) return fg;
      }
-
 //   fg = eina_hash_find(fi->glyphs, &hindex);
 //   if (fg) return fg;
 
@@ -467,6 +466,42 @@ struct _Font_Char_Index
 EAPI FT_UInt
 evas_common_get_char_index(RGBA_Font_Int* fi, Eina_Unicode gl)
 {
+   static const Eina_Unicode mapfix[] =
+     {
+        0x25c6, 0x1,
+        0x2592, 0x2,
+        0x2409, 0x3,
+        0x240c, 0x4,
+        0x240d, 0x5,
+        0x240a, 0x6,
+        0x00b0, 0x7,
+        0x00b1, 0x8,
+        0x2424, 0x9,
+        0x240b, 0xa,
+        0x2518, 0xb,
+        0x2510, 0xc,
+        0x250c, 0xd,
+        0x2514, 0xe,
+        0x253c, 0xf,
+        0x23ba, 0x10,
+        0x23bb, 0x11,
+        0x2500, 0x12,
+        0x23bc, 0x13,
+        0x23bd, 0x14,
+        0x251c, 0x15,
+        0x2524, 0x16,
+        0x2534, 0x17,
+        0x252c, 0x18,
+        0x2502, 0x19,
+        0x2264, 0x1a,
+        0x2265, 0x1b,
+        0x03c0, 0x1c,
+        0x2260, 0x1d,
+        0x00a3, 0xa3,
+        0x00b7, 0x1f,
+        0x20a4, 0xa3,
+        0x0000, 0x0
+     };
    Font_Char_Index result;
    //FT_UInt ret;
 
@@ -498,6 +533,22 @@ evas_common_get_char_index(RGBA_Font_Int* fi, Eina_Unicode gl)
 #ifdef HAVE_PTHREAD
 //   pthread_mutex_unlock(&fi->ft_mutex);
 #endif
+   if (result.index <= 0)
+     {
+        int i;
+        
+        for (i = 0; mapfix[i]; i += 2)
+          {
+             if (gl == mapfix[i])
+               {
+                  gl = mapfix[i + 1];
+                  FTLOCK();
+                  result.index = FT_Get_Char_Index(fi->src->ft.face, gl);
+                  FTUNLOCK();
+                  break;
+               }
+          }
+     }
    return result.index;
 }