Revert "Upstream merge"
[framework/uifw/evas.git] / src / lib / engines / common / evas_font_ot.c
index 6a6a4e4..a907831 100644 (file)
@@ -1,6 +1,6 @@
 #include "evas_font_ot.h"
 
-#ifdef OT_SUPPORT
+#ifdef USE_HARFBUZZ
 # include <hb.h>
 # include <hb-ft.h>
 #endif
 #include <Eina.h>
 #include "evas_font_private.h"
 
+#ifdef USE_HARFBUZZ
+static const hb_script_t
+_evas_script_to_harfbuzz[] =
+{
+  HB_SCRIPT_COMMON,
+  HB_SCRIPT_INHERITED,
+  HB_SCRIPT_ARABIC,
+  HB_SCRIPT_ARMENIAN,
+  HB_SCRIPT_BENGALI,
+  HB_SCRIPT_BOPOMOFO,
+  HB_SCRIPT_CHEROKEE,
+  HB_SCRIPT_COPTIC,
+  HB_SCRIPT_CYRILLIC,
+  HB_SCRIPT_DESERET,
+  HB_SCRIPT_DEVANAGARI,
+  HB_SCRIPT_ETHIOPIC,
+  HB_SCRIPT_GEORGIAN,
+  HB_SCRIPT_GOTHIC,
+  HB_SCRIPT_GREEK,
+  HB_SCRIPT_GUJARATI,
+  HB_SCRIPT_GURMUKHI,
+  HB_SCRIPT_HAN,
+  HB_SCRIPT_HANGUL,
+  HB_SCRIPT_HEBREW,
+  HB_SCRIPT_HIRAGANA,
+  HB_SCRIPT_KANNADA,
+  HB_SCRIPT_KATAKANA,
+  HB_SCRIPT_KHMER,
+  HB_SCRIPT_LAO,
+  HB_SCRIPT_LATIN,
+  HB_SCRIPT_MALAYALAM,
+  HB_SCRIPT_MONGOLIAN,
+  HB_SCRIPT_MYANMAR,
+  HB_SCRIPT_OGHAM,
+  HB_SCRIPT_OLD_ITALIC,
+  HB_SCRIPT_ORIYA,
+  HB_SCRIPT_RUNIC,
+  HB_SCRIPT_SINHALA,
+  HB_SCRIPT_SYRIAC,
+  HB_SCRIPT_TAMIL,
+  HB_SCRIPT_TELUGU,
+  HB_SCRIPT_THAANA,
+  HB_SCRIPT_THAI,
+  HB_SCRIPT_TIBETAN,
+  HB_SCRIPT_CANADIAN_ABORIGINAL,
+  HB_SCRIPT_YI,
+  HB_SCRIPT_TAGALOG,
+  HB_SCRIPT_HANUNOO,
+  HB_SCRIPT_BUHID,
+  HB_SCRIPT_TAGBANWA,
+
+  /* Unicode-4.0 additions */
+  HB_SCRIPT_BRAILLE,
+  HB_SCRIPT_CYPRIOT,
+  HB_SCRIPT_LIMBU,
+  HB_SCRIPT_OSMANYA,
+  HB_SCRIPT_SHAVIAN,
+  HB_SCRIPT_LINEAR_B,
+  HB_SCRIPT_TAI_LE,
+  HB_SCRIPT_UGARITIC,
+
+  /* Unicode-4.1 additions */
+  HB_SCRIPT_NEW_TAI_LUE,
+  HB_SCRIPT_BUGINESE,
+  HB_SCRIPT_GLAGOLITIC,
+  HB_SCRIPT_TIFINAGH,
+  HB_SCRIPT_SYLOTI_NAGRI,
+  HB_SCRIPT_OLD_PERSIAN,
+  HB_SCRIPT_KHAROSHTHI,
+
+  /* Unicode-5.0 additions */
+  HB_SCRIPT_UNKNOWN,
+  HB_SCRIPT_BALINESE,
+  HB_SCRIPT_CUNEIFORM,
+  HB_SCRIPT_PHOENICIAN,
+  HB_SCRIPT_PHAGS_PA,
+  HB_SCRIPT_NKO,
+
+  /* Unicode-5.1 additions */
+  HB_SCRIPT_KAYAH_LI,
+  HB_SCRIPT_LEPCHA,
+  HB_SCRIPT_REJANG,
+  HB_SCRIPT_SUNDANESE,
+  HB_SCRIPT_SAURASHTRA,
+  HB_SCRIPT_CHAM,
+  HB_SCRIPT_OL_CHIKI,
+  HB_SCRIPT_VAI,
+  HB_SCRIPT_CARIAN,
+  HB_SCRIPT_LYCIAN,
+  HB_SCRIPT_LYDIAN,
+
+  /* Unicode-5.2 additions */
+  HB_SCRIPT_AVESTAN,
+  HB_SCRIPT_BAMUM,
+  HB_SCRIPT_EGYPTIAN_HIEROGLYPHS,
+  HB_SCRIPT_IMPERIAL_ARAMAIC,
+  HB_SCRIPT_INSCRIPTIONAL_PAHLAVI,
+  HB_SCRIPT_INSCRIPTIONAL_PARTHIAN,
+  HB_SCRIPT_JAVANESE,
+  HB_SCRIPT_KAITHI,
+  HB_SCRIPT_TAI_THAM,
+  HB_SCRIPT_LISU,
+  HB_SCRIPT_MEETEI_MAYEK,
+  HB_SCRIPT_OLD_SOUTH_ARABIAN,
+  HB_SCRIPT_OLD_TURKIC,
+  HB_SCRIPT_SAMARITAN,
+  HB_SCRIPT_TAI_VIET,
+
+  /* Unicode-6.0 additions */
+  HB_SCRIPT_BATAK,
+  HB_SCRIPT_BRAHMI,
+  HB_SCRIPT_MANDAIC
+};
+#endif
+
 #ifdef OT_SUPPORT
 /* FIXME: doc. returns #items */
 EAPI int
@@ -63,131 +178,93 @@ evas_common_font_ot_cluster_size_get(const Evas_Text_Props *props, size_t char_i
    return (items > 0) ? items : 1;
 }
 
-EAPI void
-evas_common_font_ot_load_face(void *_font)
-{
-   RGBA_Font_Source *font = (RGBA_Font_Source *) _font;
-   /* Unload the face if by any chance it's already loaded */
-   evas_common_font_ot_unload_face(font);
-   font->hb.face = hb_ft_face_create(font->ft.face, NULL);
-}
-
-EAPI void
-evas_common_font_ot_unload_face(void *_font)
-{
-   RGBA_Font_Source *font = (RGBA_Font_Source *) _font;
-   if (!font->hb.face) return;
-   hb_face_destroy(font->hb.face);
-   font->hb.face = NULL;
-}
-
 /* Harfbuzz font functions */
-static hb_font_funcs_t *_ft_font_funcs = NULL;
-
-static hb_codepoint_t
-_evas_common_font_ot_hb_get_glyph(hb_font_t *font, hb_face_t *face,
-    const void *user_data, hb_codepoint_t unicode,
-    hb_codepoint_t variation_selector)
-{
-   RGBA_Font_Int *fi = (RGBA_Font_Int *) user_data;
-   return hb_font_funcs_get_glyph_func(_ft_font_funcs)(font, face,
-      fi->src->ft.face, unicode, variation_selector);
-}
 
-static void
-_evas_common_font_ot_hb_get_glyph_advance(hb_font_t *font, hb_face_t *face,
-   const void *user_data, hb_codepoint_t glyph,
-   hb_position_t *x_advance, hb_position_t *y_advance)
+static hb_position_t
+_evas_common_font_ot_hb_get_glyph_advance(hb_font_t *font,
+      void *font_data, hb_codepoint_t glyph,
+      void *user_data)
 {
    /* Use our cache*/
-   RGBA_Font_Int *fi = (RGBA_Font_Int *) user_data;
+   RGBA_Font_Int *fi = (RGBA_Font_Int *) font_data;
    RGBA_Font_Glyph *fg;
    (void) font;
-   (void) face;
+   (void) user_data;
    fg = evas_common_font_int_cache_glyph_get(fi, glyph);
    if (fg)
      {
-        *x_advance = fg->glyph->advance.x >> 10;
-        *y_advance = fg->glyph->advance.y >> 10;
+        return fg->glyph->advance.x >> 10;
      }
-}
-
-static void
-_evas_common_font_ot_hb_get_glyph_extents(hb_font_t *font, hb_face_t *face,
-   const void *user_data, hb_codepoint_t glyph, hb_glyph_extents_t *extents)
-{
-   RGBA_Font_Int *fi = (RGBA_Font_Int *) user_data;
-   hb_font_funcs_get_glyph_extents_func(_ft_font_funcs)(font, face,
-      fi->src->ft.face, glyph, extents);
-}
-
-static hb_bool_t
-_evas_common_font_ot_hb_get_contour_point(hb_font_t *font, hb_face_t *face,
-   const void *user_data, unsigned int point_index, hb_codepoint_t glyph,
-   hb_position_t *x, hb_position_t *y)
-{
-   RGBA_Font_Int *fi = (RGBA_Font_Int *) user_data;
-   return hb_font_funcs_get_contour_point_func(_ft_font_funcs)(font, face,
-      fi->src->ft.face, point_index, glyph, x, y);
+   return 0;
 }
 
 static hb_position_t
-_evas_common_font_ot_hb_get_kerning(hb_font_t *font, hb_face_t *face,
-   const void *user_data, hb_codepoint_t first_glyph,
-   hb_codepoint_t second_glyph)
+_evas_common_font_ot_hb_get_kerning(hb_font_t *font, void *font_data,
+   hb_codepoint_t first_glyph, hb_codepoint_t second_glyph, void *user_data)
 {
-   RGBA_Font_Int *fi = (RGBA_Font_Int *) user_data;
+   RGBA_Font_Int *fi = (RGBA_Font_Int *) font_data;
    int kern;
    (void) font;
-   (void) face;
+   (void) user_data;
    if (evas_common_font_query_kerning(fi, first_glyph, second_glyph, &kern))
       return kern;
-   else
-      return 0;
+
+   return 0;
 }
 
 /* End of harfbuzz font funcs */
 
-static hb_font_funcs_t *
+static inline hb_font_funcs_t *
 _evas_common_font_ot_font_funcs_get(void)
 {
    static hb_font_funcs_t *font_funcs = NULL;
    if (!font_funcs)
      {
-        _ft_font_funcs = hb_ft_get_font_funcs();
         font_funcs = hb_font_funcs_create();
-        hb_font_funcs_set_glyph_func(font_funcs,
-            _evas_common_font_ot_hb_get_glyph);
-        hb_font_funcs_set_glyph_advance_func(font_funcs,
-            _evas_common_font_ot_hb_get_glyph_advance);
-        hb_font_funcs_set_glyph_extents_func(font_funcs,
-            _evas_common_font_ot_hb_get_glyph_extents);
-        hb_font_funcs_set_contour_point_func(font_funcs,
-            _evas_common_font_ot_hb_get_contour_point);
-        hb_font_funcs_set_kerning_func(font_funcs,
-            _evas_common_font_ot_hb_get_kerning);
+        hb_font_funcs_set_glyph_h_advance_func(font_funcs,
+            _evas_common_font_ot_hb_get_glyph_advance, NULL, NULL);
+        hb_font_funcs_set_glyph_h_kerning_func(font_funcs,
+            _evas_common_font_ot_hb_get_kerning, NULL, NULL);
      }
 
    return font_funcs;
 }
 
+static inline hb_unicode_funcs_t *
+_evas_common_font_ot_unicode_funcs_get(void)
+{
+   static hb_unicode_funcs_t *unicode_funcs = NULL;
+   if (!unicode_funcs)
+     {
+        unicode_funcs = hb_unicode_funcs_get_default();
+     }
+
+   return unicode_funcs;
+}
+
 static void
 _evas_common_font_ot_shape(hb_buffer_t *buffer, RGBA_Font_Int *fi)
 {
-   hb_font_t   *hb_font;
+   /* Create hb_font if not previously created */
+   if (!fi->ft.hb_font)
+     {
+        hb_font_t *hb_ft_font;
+
+        hb_ft_font = hb_ft_font_create(fi->src->ft.face, NULL);
+        fi->ft.hb_font = hb_font_create_sub_font(hb_ft_font);
+        hb_font_destroy(hb_ft_font);
 
-   hb_font = hb_ft_font_create(fi->src->ft.face, NULL);
-   hb_font_set_funcs(hb_font, _evas_common_font_ot_font_funcs_get(), NULL, fi);
+        hb_font_set_funcs(fi->ft.hb_font,
+              _evas_common_font_ot_font_funcs_get(), fi, NULL);
+     }
 
-   hb_shape(hb_font, fi->src->hb.face, buffer, NULL, 0);
-   hb_font_destroy(hb_font);
+   hb_shape(fi->ft.hb_font, buffer, NULL, 0);
 }
 
 EAPI Eina_Bool
-evas_common_font_ot_populate_text_props(void *_fn, const Eina_Unicode *text,
+evas_common_font_ot_populate_text_props(const Eina_Unicode *text,
       Evas_Text_Props *props, int len)
 {
-   RGBA_Font *fn = (RGBA_Font *) _fn;
    RGBA_Font_Int *fi;
    hb_buffer_t *buffer;
    hb_glyph_position_t *positions;
@@ -196,28 +273,9 @@ evas_common_font_ot_populate_text_props(void *_fn, const Eina_Unicode *text,
    unsigned int i;
    Evas_Font_Glyph_Info *gl_itr;
    Evas_Font_OT_Info *ot_itr;
+   Evas_Coord pen_x = 0;
 
-   fi = fn->fonts->data;
-   /* Load the font needed for this script */
-     {
-        /* Skip common chars */
-        const Eina_Unicode *tmp;
-        for (tmp = text ;
-              *tmp &&
-              evas_common_language_char_script_get(*tmp) == EVAS_SCRIPT_COMMON ;
-              tmp++)
-          ;
-        if (!*tmp && (tmp > text)) tmp--;
-        evas_common_font_glyph_search(fn, &fi, *tmp);
-     }
-   evas_common_font_int_reload(fi);
-   if (fi->src->current_size != fi->size)
-     {
-        FTLOCK();
-        FT_Activate_Size(fi->ft.size);
-        FTUNLOCK();
-        fi->src->current_size = fi->size;
-     }
+   fi = props->font_instance;
 
    if (len < 0)
      {
@@ -228,11 +286,20 @@ evas_common_font_ot_populate_text_props(void *_fn, const Eina_Unicode *text,
         slen = len;
      }
 
+#if HB_VERSION_CHECK(0,7,0)
    buffer = hb_buffer_create(slen);
-   hb_buffer_set_unicode_funcs(buffer, evas_common_language_unicode_funcs_get());
+#else
+   buffer = hb_buffer_create();
+#endif
+   hb_buffer_set_unicode_funcs(buffer, _evas_common_font_ot_unicode_funcs_get());
+#if HB_VERSION_CHECK(0,7,0)
    hb_buffer_set_language(buffer, hb_language_from_string(
             evas_common_language_from_locale_get()));
-   hb_buffer_set_script(buffer, props->script);
+#else
+   hb_buffer_set_language(buffer, hb_language_from_string(
+            evas_common_language_from_locale_get(), -1));
+#endif
+   hb_buffer_set_script(buffer, _evas_script_to_harfbuzz[props->script]);
    hb_buffer_set_direction(buffer,
          (props->bidi.dir == EVAS_BIDI_DIRECTION_RTL) ?
          HB_DIRECTION_RTL : HB_DIRECTION_LTR);
@@ -246,17 +313,21 @@ evas_common_font_ot_populate_text_props(void *_fn, const Eina_Unicode *text,
          sizeof(Evas_Font_OT_Info));
    props->info->glyph = calloc(props->len,
               sizeof(Evas_Font_Glyph_Info));
-   positions = hb_buffer_get_glyph_positions(buffer);
-   infos = hb_buffer_get_glyph_infos(buffer);
+   positions = hb_buffer_get_glyph_positions(buffer, NULL);
+   infos = hb_buffer_get_glyph_infos(buffer, NULL);
    gl_itr = props->info->glyph;
    ot_itr = props->info->ot;
    for (i = 0 ; i < props->len ; i++)
      {
+        Evas_Coord adv;
         ot_itr->source_cluster = infos->cluster;
         ot_itr->x_offset = positions->x_offset;
         ot_itr->y_offset = positions->y_offset;
         gl_itr->index = infos->codepoint;
-        gl_itr->advance = positions->x_advance;
+        adv = positions->x_advance;
+
+        pen_x += adv;
+        gl_itr->pen_after = EVAS_FONT_ROUND_26_6_TO_INT(pen_x);
 
         ot_itr++;
         gl_itr++;