summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2019-07-30 19:09:12 +0200
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-07-30 19:09:12 +0200
commit6883087ac7dac530062b24b5ea918904589a89c2 (patch)
tree2cf7d27776a5dfe4833812391b8b5b1efe3ae584
parent29d24aa409371bd0252b34eb54b1adcb256ca2a1 (diff)
Revert "evas_object_textblock: add support for variation sequences"
This reverts commit f7ce771e3243e19f8a12672ea2be752dedccbcf6.
-rw-r--r--src/bin/elementary/test.c2
-rw-r--r--src/bin/elementary/test_label.c24
-rw-r--r--src/lib/evas/common/evas_font.h53
-rw-r--r--src/lib/evas/common/evas_font_load.c6
-rw-r--r--src/lib/evas/common/evas_font_main.c296
-rw-r--r--src/lib/evas/common/evas_font_query.c54
-rw-r--r--src/lib/evas/common/evas_text_utils.c6
-rw-r--r--src/tests/evas/evas_test_textblock.c19
8 files changed, 49 insertions, 411 deletions
diff --git a/src/bin/elementary/test.c b/src/bin/elementary/test.c
index 1a332575da..5264ab146a 100644
--- a/src/bin/elementary/test.c
+++ b/src/bin/elementary/test.c
@@ -243,7 +243,6 @@ void test_label_wrap(void *data, Evas_Object *obj, void *event_info);
243void test_label_ellipsis(void *data, Evas_Object *obj, void *event_info); 243void test_label_ellipsis(void *data, Evas_Object *obj, void *event_info);
244void test_label_colors(void *data, Evas_Object *obj, void *event_info); 244void test_label_colors(void *data, Evas_Object *obj, void *event_info);
245void test_label_emoji(void *data, Evas_Object *obj, void *event_info); 245void test_label_emoji(void *data, Evas_Object *obj, void *event_info);
246void test_label_variation_sequence(void *data, Evas_Object *obj, void *event_info);
247void test_conformant(void *data, Evas_Object *obj, void *event_info); 246void test_conformant(void *data, Evas_Object *obj, void *event_info);
248void test_conformant2(void *data, Evas_Object *obj, void *event_info); 247void test_conformant2(void *data, Evas_Object *obj, void *event_info);
249void test_conformant_indicator(void *data, Evas_Object *obj, void *event_info); 248void test_conformant_indicator(void *data, Evas_Object *obj, void *event_info);
@@ -1204,7 +1203,6 @@ add_tests:
1204 ADD_TEST(NULL, "Text", "Label Ellipsis", test_label_ellipsis); 1203 ADD_TEST(NULL, "Text", "Label Ellipsis", test_label_ellipsis);
1205 ADD_TEST(NULL, "Text", "Label Colors", test_label_colors); 1204 ADD_TEST(NULL, "Text", "Label Colors", test_label_colors);
1206 ADD_TEST(NULL, "Text", "Label Emoji", test_label_emoji); 1205 ADD_TEST(NULL, "Text", "Label Emoji", test_label_emoji);
1207 ADD_TEST(NULL, "Text", "Label Variation Sequnece", test_label_variation_sequence);
1208 ADD_TEST_EO(NULL, "Text", "Efl.Ui.Textpath", test_ui_textpath); 1206 ADD_TEST_EO(NULL, "Text", "Efl.Ui.Textpath", test_ui_textpath);
1209 1207
1210 //------------------------------// 1208 //------------------------------//
diff --git a/src/bin/elementary/test_label.c b/src/bin/elementary/test_label.c
index f49255f21e..c00ae7986e 100644
--- a/src/bin/elementary/test_label.c
+++ b/src/bin/elementary/test_label.c
@@ -401,30 +401,6 @@ test_label_colors(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *ev
401 evas_object_show(win); 401 evas_object_show(win);
402} 402}
403 403
404/*** Label variation sequence **************************************************************/
405void
406test_label_variation_sequence(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
407{
408 Evas_Object *win, *lb;
409
410 win = elm_win_util_standard_add("label-variation sequence", "Label variation sequnece");
411 elm_win_autodel_set(win, EINA_TRUE);
412
413 lb = elm_label_add(win);
414 elm_object_text_set(lb,
415 "You need to have at least on font contains variation sequence<br>"
416 "Three different 8 glyphs : <br>"
417 "8<tab>8&#xfe0f;<tab>8&#xfe0f;&#x20E3;<br>"
418 "line with 3 variation glyphs : <br>"
419 "8&#xfe0f;&#x20E3;&#x262a;&#xfe0f;AAA&#x262a;&#xfe0E;1234567&#xfe0f;&#x20E3;"
420 );
421 evas_object_size_hint_weight_set(lb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
422 elm_win_resize_object_add(win, lb);
423 evas_object_show(lb);
424
425 evas_object_show(win);
426}
427
428/*** Label Emoji *************************************************************/ 404/*** Label Emoji *************************************************************/
429static char * 405static char *
430_fontlist_text_get(void *data, Evas_Object *obj EINA_UNUSED, const char *part EINA_UNUSED) 406_fontlist_text_get(void *data, Evas_Object *obj EINA_UNUSED, const char *part EINA_UNUSED)
diff --git a/src/lib/evas/common/evas_font.h b/src/lib/evas/common/evas_font.h
index 5e79026ca3..ab6e6fbd17 100644
--- a/src/lib/evas/common/evas_font.h
+++ b/src/lib/evas/common/evas_font.h
@@ -56,32 +56,7 @@ typedef unsigned long long DATA64;
56#define LKU(x) eina_lock_release(&(x)) 56#define LKU(x) eina_lock_release(&(x))
57#define LKDBG(x) eina_lock_debug(&(x)) 57#define LKDBG(x) eina_lock_debug(&(x))
58 58
59/**
60 * See explanation of variation_sequences at:
61 * https://unicode.org/Public/UCD/latest/ucd/StandardizedVariants.txt
62 * https://unicode.org/reports/tr37/
63 * https://unicode.org/ivd/
64 * https://www.freetype.org/freetype2/docs/reference/ft2-glyph_variants.html
65*/
66#define VAR_SEQ(x) GENERIC_VARIATION_SEQUENCES(x) | IDEOGRAPHICS_VARIATION_SEQUENCES(x) | MANGOLIAN_VARIATION_SEQUENCES(x)
67#define GENERIC_VARIATION_SEQUENCES(x) (x>=0xFE00 && x<=0xFE0F) ? x : 0
68#define IDEOGRAPHICS_VARIATION_SEQUENCES(x) (x>=0xE0100 && x<=0xE01EF) ? x : 0
69#define MANGOLIAN_VARIATION_SEQUENCES(x) (x>=0x180B && x<=0x180D) ? x : 0
70/**
71 * http://unicode.org/emoji/charts/emoji-variants.html
72*/
73#define VARIATION_EMOJI_PRESENTATION 0xFE0F
74#define VARIATION_TEXT_PRESENTATION 0xFE0E
75
76/**
77 * These Options (Flags) are used with evas_common_font_glyph_search function
78 */
79#define EVAS_FONT_SEARCH_OPTION_NONE 0x0000
80#define EVAS_FONT_SEARCH_OPTION_SKIP_COLOR 0x0001
81
82 59
83#define FASH_INT_MAGIC 0x01012345
84#define FASH_GLYPH_MAGIC 0x02012345
85 60
86enum _Evas_Font_Style 61enum _Evas_Font_Style
87{ 62{
@@ -153,10 +128,6 @@ typedef struct _RGBA_Font_Source RGBA_Font_Source;
153typedef struct _RGBA_Font_Glyph RGBA_Font_Glyph; 128typedef struct _RGBA_Font_Glyph RGBA_Font_Glyph;
154typedef struct _RGBA_Font_Glyph_Out RGBA_Font_Glyph_Out; 129typedef struct _RGBA_Font_Glyph_Out RGBA_Font_Glyph_Out;
155 130
156typedef struct _Fash_Item_variation_Index_Item Fash_Item_variation_Index_Item;
157typedef struct _Fash_Item_variation_List Fash_Item_variation_List;
158typedef struct _Fash_Item_Index_Map_Variations Fash_Item_Index_Map_Variations;
159
160typedef struct _Fash_Item_Index_Map Fash_Item_Index_Map; 131typedef struct _Fash_Item_Index_Map Fash_Item_Index_Map;
161typedef struct _Fash_Int_Map Fash_Int_Map; 132typedef struct _Fash_Int_Map Fash_Int_Map;
162typedef struct _Fash_Int_Map2 Fash_Int_Map2; 133typedef struct _Fash_Int_Map2 Fash_Int_Map2;
@@ -168,25 +139,9 @@ struct _Fash_Item_Index_Map
168 RGBA_Font_Int *fint; 139 RGBA_Font_Int *fint;
169 int index; 140 int index;
170}; 141};
171struct _Fash_Item_variation_Index_Item
172{
173 Fash_Item_Index_Map item;
174 Eina_Unicode variation_sequence;
175};
176struct _Fash_Item_variation_List
177{
178 Fash_Item_variation_Index_Item *list;
179 size_t length;
180 size_t capacity;
181};
182struct _Fash_Item_Index_Map_Variations
183{
184 Fash_Item_Index_Map item;
185 Fash_Item_variation_List *variations;
186};
187struct _Fash_Int_Map 142struct _Fash_Int_Map
188{ 143{
189 Fash_Item_Index_Map_Variations items[256]; 144 Fash_Item_Index_Map item[256];
190}; 145};
191struct _Fash_Int_Map2 146struct _Fash_Int_Map2
192{ 147{
@@ -194,7 +149,6 @@ struct _Fash_Int_Map2
194}; 149};
195struct _Fash_Int 150struct _Fash_Int
196{ 151{
197 unsigned int MAGIC;
198 Fash_Int_Map2 *bucket[256]; 152 Fash_Int_Map2 *bucket[256];
199 void (*freeme) (Fash_Int *fash); 153 void (*freeme) (Fash_Int *fash);
200}; 154};
@@ -212,7 +166,6 @@ struct _Fash_Glyph_Map2
212}; 166};
213struct _Fash_Glyph 167struct _Fash_Glyph
214{ 168{
215 unsigned int MAGIC;
216 Fash_Glyph_Map2 *bucket[256]; 169 Fash_Glyph_Map2 *bucket[256];
217 void (*freeme) (Fash_Glyph *fash); 170 void (*freeme) (Fash_Glyph *fash);
218}; 171};
@@ -393,7 +346,7 @@ void *evas_common_font_freetype_face_get(RGBA_Font *font); /* XXX: Not EAPI on p
393 346
394EAPI RGBA_Font_Glyph *evas_common_font_int_cache_glyph_get (RGBA_Font_Int *fi, FT_UInt index); 347EAPI RGBA_Font_Glyph *evas_common_font_int_cache_glyph_get (RGBA_Font_Int *fi, FT_UInt index);
395EAPI Eina_Bool evas_common_font_int_cache_glyph_render(RGBA_Font_Glyph *fg); 348EAPI Eina_Bool evas_common_font_int_cache_glyph_render(RGBA_Font_Glyph *fg);
396EAPI FT_UInt evas_common_get_char_index (RGBA_Font_Int* fi, Eina_Unicode gl, Eina_Unicode variation_sequence); 349EAPI FT_UInt evas_common_get_char_index (RGBA_Font_Int* fi, Eina_Unicode gl);
397 350
398/* load */ 351/* load */
399EAPI void evas_common_font_dpi_set (int dpi_h, int dpi_v); 352EAPI void evas_common_font_dpi_set (int dpi_h, int dpi_v);
@@ -443,7 +396,7 @@ EAPI void evas_common_font_ascent_descent_get(RGBA_Font *fn, const
443 396
444EAPI void *evas_common_font_glyph_compress(void *data, int num_grays, int pixel_mode, int pitch_data, int w, int h, int *size_ret); 397EAPI void *evas_common_font_glyph_compress(void *data, int num_grays, int pixel_mode, int pitch_data, int w, int h, int *size_ret);
445EAPI DATA8 *evas_common_font_glyph_uncompress(RGBA_Font_Glyph *fg, int *wret, int *hret); 398EAPI DATA8 *evas_common_font_glyph_uncompress(RGBA_Font_Glyph *fg, int *wret, int *hret);
446EAPI int evas_common_font_glyph_search (RGBA_Font *fn, RGBA_Font_Int **fi_ret, Eina_Unicode gl, Eina_Unicode variation_sequence, uint32_t evas_font_search_options); 399EAPI int evas_common_font_glyph_search (RGBA_Font *fn, RGBA_Font_Int **fi_ret, Eina_Unicode gl);
447 400
448void evas_common_font_load_init(void); 401void evas_common_font_load_init(void);
449void evas_common_font_load_shutdown(void); 402void evas_common_font_load_shutdown(void);
diff --git a/src/lib/evas/common/evas_font_load.c b/src/lib/evas/common/evas_font_load.c
index 6a7edac300..15d1017b1f 100644
--- a/src/lib/evas/common/evas_font_load.c
+++ b/src/lib/evas/common/evas_font_load.c
@@ -686,11 +686,7 @@ evas_common_font_free(RGBA_Font *fn)
686 evas_common_font_int_unref(fi); 686 evas_common_font_int_unref(fi);
687 evas_common_font_flush(); 687 evas_common_font_flush();
688 eina_list_free(fn->fonts); 688 eina_list_free(fn->fonts);
689 if (fn->fash) 689 if (fn->fash) fn->fash->freeme(fn->fash);
690 {
691 fn->fash->freeme(fn->fash);
692 fn->fash = NULL;
693 }
694 LKD(fn->lock); 690 LKD(fn->lock);
695 free(fn); 691 free(fn);
696} 692}
diff --git a/src/lib/evas/common/evas_font_main.c b/src/lib/evas/common/evas_font_main.c
index 31076132fd..b99df9a927 100644
--- a/src/lib/evas/common/evas_font_main.c
+++ b/src/lib/evas/common/evas_font_main.c
@@ -355,182 +355,33 @@ end:
355/* Set of common functions that are used in a couple of places. */ 355/* Set of common functions that are used in a couple of places. */
356 356
357static void 357static void
358_fash_int_map_and_variations_free(Fash_Int_Map *map)
359 {
360 if(!map)
361 return;
362 int i;
363
364 for (i = 0; i < 256; i++)
365 {
366 if (map->items[i].variations)
367 {
368 if (map->items[i].variations->list)
369 {
370 free(map->items[i].variations->list);
371 map->items[i].variations->list = NULL;
372 map->items[i].variations->capacity = 0;
373 map->items[i].variations->length = 0;
374 }
375 free(map->items[i].variations);
376 map->items[i].variations = NULL;
377 }
378 }
379
380 free(map);
381}
382
383static void
384_fash_int2_free(Fash_Int_Map2 *fash) 358_fash_int2_free(Fash_Int_Map2 *fash)
385 { 359{
386 int i; 360 int i;
387 if (fash) 361
388 { 362 for (i = 0; i < 256; i++) if (fash->bucket[i]) free(fash->bucket[i]);
389 for (i = 0; i < 256; i++) 363 free(fash);
390 if (fash->bucket[i])
391 {
392 _fash_int_map_and_variations_free(fash->bucket[i]);
393 fash->bucket[i] = NULL;
394 }
395 free(fash);
396 fash = NULL;
397 }
398} 364}
399 365
400static void 366static void
401_fash_int_free(Fash_Int *fash) 367_fash_int_free(Fash_Int *fash)
402{ 368{
403 int i; 369 int i;
404 if (fash)
405 {
406 if (fash->MAGIC != FASH_INT_MAGIC)
407 {
408 return;
409 }
410 370
411 for (i = 0; i < 256; i++) 371 for (i = 0; i < 256; i++) if (fash->bucket[i]) _fash_int2_free(fash->bucket[i]);
412 { 372 free(fash);
413 if (fash->bucket[i])
414 {
415 _fash_int2_free(fash->bucket[i]);
416 fash->bucket[i] = NULL;
417 }
418 }
419 free(fash);
420 }
421} 373}
422 374
423static Fash_Int * 375static Fash_Int *
424_fash_int_new(void) 376_fash_int_new(void)
425{ 377{
426 Fash_Int *fash = calloc(1, sizeof(Fash_Int)); 378 Fash_Int *fash = calloc(1, sizeof(Fash_Int));
427 EINA_SAFETY_ON_NULL_RETURN_VAL(fash, NULL);
428 fash->MAGIC = FASH_INT_MAGIC;
429 fash->freeme = _fash_int_free; 379 fash->freeme = _fash_int_free;
430 return fash; 380 return fash;
431} 381}
432 382
433static Fash_Item_variation_List *
434_variations_list_new(void)
435{
436 Fash_Item_variation_List *variations = calloc(1, sizeof(Fash_Item_variation_List));
437 EINA_SAFETY_ON_NULL_RETURN_VAL(variations, NULL);
438 variations->capacity = 0;
439 variations->length = 0;
440 variations->list = 0;
441 return variations;
442}
443
444static void
445_variations_list_add(Fash_Item_variation_List *variations,RGBA_Font_Int *fint, int index, Eina_Unicode variation_sequence)
446{
447 Fash_Item_variation_Index_Item *list = variations->list;
448 if (variations->capacity == variations->length)
449 {
450 list = (Fash_Item_variation_Index_Item *) realloc(list, (variations->capacity + 4) * sizeof(Fash_Item_variation_Index_Item));
451 if (list)
452 {
453 variations->list = list;
454 variations->capacity += 4;
455 }
456 }
457
458 EINA_SAFETY_ON_NULL_RETURN(list);
459
460 int start = 0;
461 int end = variations->length;
462 if (end == 0)
463 {
464 // if only on element just add it in 0 index
465 variations->list[0].item.fint = fint;
466 variations->list[0].item.index = index;
467 variations->list[0].variation_sequence = variation_sequence;
468 variations->length++;
469 }
470 else
471 {
472 // find lower bound
473 while (end > start)
474 {
475 int middle = start + (end - start) / 2;
476 if (variations->list[middle].variation_sequence >= variation_sequence)
477 end = middle;
478 else
479 start = middle + 1;
480 }
481
482 // if passed value founded in list, just replace it
483 if (start < (int)variations->length && variations->list[start].variation_sequence == variation_sequence)
484 {
485 variations->list[start].item.fint = fint;
486 variations->list[start].item.index = index;
487 variations->list[start].variation_sequence = variation_sequence;
488 return;
489 }
490
491 // shift array to insert item
492 for (int i = (variations->length - 1) ; i >= start; i--)
493 {
494 variations->list[i + 1] = variations->list[i];
495 }
496
497 // insert new item and keep array sorted
498 variations->list[start].item.fint = fint;
499 variations->list[start].item.index = index;
500 variations->list[start].variation_sequence = variation_sequence;
501 variations->length++;
502 }
503}
504
505
506static Fash_Item_Index_Map * 383static Fash_Item_Index_Map *
507_variations_list_find(Fash_Item_variation_List * variations, Eina_Unicode variation_sequence) 384_fash_int_find(Fash_Int *fash, int item)
508{
509 if (!variations)
510 return NULL;
511
512 if (!variations->list)
513 return NULL;
514
515 int start = 0;
516 int end = variations->length;
517
518 while(end > start)
519 {
520 int middle = start + (end - start) / 2;
521 if (variations->list[middle].variation_sequence == variation_sequence)
522 return &(variations->list[middle].item);
523 else if (variations->list[middle].variation_sequence < variation_sequence)
524 start = middle + 1;
525 else
526 end = middle - 1;
527 }
528
529 return NULL;
530}
531
532static const Fash_Item_Index_Map *
533_fash_int_find(Fash_Int *fash, int item, Eina_Unicode variation_sequence)
534{ 385{
535 int grp, maj, min; 386 int grp, maj, min;
536 387
@@ -540,22 +391,14 @@ _fash_int_find(Fash_Int *fash, int item, Eina_Unicode variation_sequence)
540 min = item & 0xff; 391 min = item & 0xff;
541 if (!fash->bucket[grp]) return NULL; 392 if (!fash->bucket[grp]) return NULL;
542 if (!fash->bucket[grp]->bucket[maj]) return NULL; 393 if (!fash->bucket[grp]->bucket[maj]) return NULL;
543 if (!variation_sequence) 394 return &(fash->bucket[grp]->bucket[maj]->item[min]);
544 return &(fash->bucket[grp]->bucket[maj]->items[min].item);
545 else
546 return _variations_list_find(fash->bucket[grp]->bucket[maj]->items[min].variations, variation_sequence);
547} 395}
548 396
549static void 397static void
550_fash_int_add(Fash_Int *fash, int item, RGBA_Font_Int *fint, int idx, Eina_Unicode variation_sequence) 398_fash_int_add(Fash_Int *fash, int item, RGBA_Font_Int *fint, int idx)
551{ 399{
552 int grp, maj, min; 400 int grp, maj, min;
553 401
554 // If we already have cached passed item, skip adding it again
555 const Fash_Item_Index_Map *fm = _fash_int_find(fash, item, variation_sequence);
556 if (fm && fm->fint)
557 return;
558
559 // 24bits for unicode - v6 up to E01EF (chrs) & 10FFFD for private use (plane 16) 402 // 24bits for unicode - v6 up to E01EF (chrs) & 10FFFD for private use (plane 16)
560 grp = (item >> 16) & 0xff; 403 grp = (item >> 16) & 0xff;
561 maj = (item >> 8) & 0xff; 404 maj = (item >> 8) & 0xff;
@@ -566,20 +409,8 @@ _fash_int_add(Fash_Int *fash, int item, RGBA_Font_Int *fint, int idx, Eina_Unico
566 if (!fash->bucket[grp]->bucket[maj]) 409 if (!fash->bucket[grp]->bucket[maj])
567 fash->bucket[grp]->bucket[maj] = calloc(1, sizeof(Fash_Int_Map)); 410 fash->bucket[grp]->bucket[maj] = calloc(1, sizeof(Fash_Int_Map));
568 EINA_SAFETY_ON_NULL_RETURN(fash->bucket[grp]->bucket[maj]); 411 EINA_SAFETY_ON_NULL_RETURN(fash->bucket[grp]->bucket[maj]);
569 if (variation_sequence) 412 fash->bucket[grp]->bucket[maj]->item[min].fint = fint;
570 { 413 fash->bucket[grp]->bucket[maj]->item[min].index = idx;
571 if (!fash->bucket[grp]->bucket[maj]->items[min].variations)
572 {
573 fash->bucket[grp]->bucket[maj]->items[min].variations =_variations_list_new();
574 EINA_SAFETY_ON_NULL_RETURN(fash->bucket[grp]->bucket[maj]->items[min].variations);
575 }
576 _variations_list_add(fash->bucket[grp]->bucket[maj]->items[min].variations, fint, idx, variation_sequence);
577 }
578 else
579 {
580 fash->bucket[grp]->bucket[maj]->items[min].item.fint = fint;
581 fash->bucket[grp]->bucket[maj]->items[min].item.index = idx;
582 }
583} 414}
584 415
585static void 416static void
@@ -630,45 +461,24 @@ _fash_gl2_free(Fash_Glyph_Map2 *fash)
630 int i; 461 int i;
631 462
632 // 24bits for unicode - v6 up to E01EF (chrs) & 10FFFD for private use (plane 16) 463 // 24bits for unicode - v6 up to E01EF (chrs) & 10FFFD for private use (plane 16)
633 for (i = 0; i < 256; i++) 464 for (i = 0; i < 256; i++) if (fash->bucket[i]) _fash_glyph_free(fash->bucket[i]);
634 {
635 if (fash->bucket[i])
636 {
637 _fash_glyph_free(fash->bucket[i]);
638 fash->bucket[i] = NULL;
639 }
640 }
641 free(fash); 465 free(fash);
642} 466}
643 467
644static void 468static void
645_fash_gl_free(Fash_Glyph *fash) 469_fash_gl_free(Fash_Glyph *fash)
646{ 470{
647 if (fash) 471 int i;
648 {
649 if (fash->MAGIC != FASH_GLYPH_MAGIC)
650 return;
651 472
652 int i; 473 // 24bits for unicode - v6 up to E01EF (chrs) & 10FFFD for private use (plane 16)
653 // 24bits for unicode - v6 up to E01EF (chrs) & 10FFFD for private use (plane 16) 474 for (i = 0; i < 256; i++) if (fash->bucket[i]) _fash_gl2_free(fash->bucket[i]);
654 for (i = 0; i < 256; i++) 475 free(fash);
655 {
656 if (fash->bucket[i])
657 {
658 _fash_gl2_free(fash->bucket[i]);
659 fash->bucket[i] = NULL;
660 }
661 }
662 free(fash);
663 }
664} 476}
665 477
666static Fash_Glyph * 478static Fash_Glyph *
667_fash_gl_new(void) 479_fash_gl_new(void)
668{ 480{
669 Fash_Glyph *fash = calloc(1, sizeof(Fash_Glyph)); 481 Fash_Glyph *fash = calloc(1, sizeof(Fash_Glyph));
670 EINA_SAFETY_ON_NULL_RETURN_VAL(fash, NULL);
671 fash->MAGIC = FASH_GLYPH_MAGIC;
672 fash->freeme = _fash_gl_free; 482 fash->freeme = _fash_gl_free;
673 return fash; 483 return fash;
674} 484}
@@ -869,7 +679,7 @@ struct _Font_Char_Index
869}; 679};
870 680
871EAPI FT_UInt 681EAPI FT_UInt
872evas_common_get_char_index(RGBA_Font_Int* fi, Eina_Unicode gl, Eina_Unicode variation_sequence) 682evas_common_get_char_index(RGBA_Font_Int* fi, Eina_Unicode gl)
873{ 683{
874 static const unsigned short mapfix[] = 684 static const unsigned short mapfix[] =
875 { 685 {
@@ -931,10 +741,7 @@ evas_common_get_char_index(RGBA_Font_Int* fi, Eina_Unicode gl, Eina_Unicode vari
931 * that something else try to use it. 741 * that something else try to use it.
932 */ 742 */
933 /* FTLOCK(); */ 743 /* FTLOCK(); */
934 if (variation_sequence) 744 result.index = FT_Get_Char_Index(fi->src->ft.face, gl);
935 result.index = FT_Face_GetCharVariantIndex(fi->src->ft.face, gl, variation_sequence);
936 else
937 result.index = FT_Get_Char_Index(fi->src->ft.face, gl);
938 /* FTUNLOCK(); */ 745 /* FTUNLOCK(); */
939 result.gl = gl; 746 result.gl = gl;
940 747
@@ -966,10 +773,7 @@ evas_common_get_char_index(RGBA_Font_Int* fi, Eina_Unicode gl, Eina_Unicode vari
966 { 773 {
967 gl = mapfix[(i << 1) + 1]; 774 gl = mapfix[(i << 1) + 1];
968 FTLOCK(); 775 FTLOCK();
969 if (variation_sequence) 776 result.index = FT_Get_Char_Index(fi->src->ft.face, gl);
970 result.index = FT_Face_GetCharVariantIndex(fi->src->ft.face, gl, variation_sequence);
971 else
972 result.index = FT_Get_Char_Index(fi->src->ft.face, gl);
973 FTUNLOCK(); 777 FTUNLOCK();
974 break; 778 break;
975 } 779 }
@@ -994,49 +798,20 @@ evas_common_get_char_index(RGBA_Font_Int* fi, Eina_Unicode gl, Eina_Unicode vari
994 return result.index; 798 return result.index;
995} 799}
996 800
997
998/*
999 * @internal
1000 * Search for unicode glyph inside all font files, and return font and glyph index
1001 *
1002 * @param[in] fn the font to use.
1003 * @param[out] fi_ret founded font.
1004 * @param[in] gl unicode glyph to search for
1005 * @param[in] variation_sequence for the gl glyph
1006 * @param[in] evas_font_search_options search options when searching font files
1007 *
1008 */
1009
1010EAPI int 801EAPI int
1011evas_common_font_glyph_search(RGBA_Font *fn, RGBA_Font_Int **fi_ret, Eina_Unicode gl, Eina_Unicode variation_sequence, uint32_t evas_font_search_options) 802evas_common_font_glyph_search(RGBA_Font *fn, RGBA_Font_Int **fi_ret, Eina_Unicode gl)
1012{ 803{
1013 Eina_List *l; 804 Eina_List *l;
1014 805
1015 if (fn->fash) 806 if (fn->fash)
1016 { 807 {
1017 const Fash_Item_Index_Map *fm = _fash_int_find(fn->fash, gl, variation_sequence); 808 Fash_Item_Index_Map *fm = _fash_int_find(fn->fash, gl);
1018 if (fm) 809 if (fm)
1019 { 810 {
1020 if (fm->fint) 811 if (fm->fint)
1021 { 812 {
1022 if (evas_font_search_options == EVAS_FONT_SEARCH_OPTION_NONE) 813 *fi_ret = fm->fint;
1023 { 814 return fm->index;
1024 *fi_ret = fm->fint;
1025 return fm->index;
1026 }
1027 else if( (evas_font_search_options & EVAS_FONT_SEARCH_OPTION_SKIP_COLOR) == EVAS_FONT_SEARCH_OPTION_SKIP_COLOR)
1028 {
1029 if (!fm->fint->src->ft.face)
1030 {
1031 evas_common_font_int_reload(fm->fint);
1032 }
1033
1034 if (fm->fint->src->ft.face && !FT_HAS_COLOR(fm->fint->src->ft.face))
1035 {
1036 *fi_ret = fm->fint;
1037 return fm->index;
1038 }
1039 }
1040 } 815 }
1041 else if (fm->index == -1) return 0; 816 else if (fm->index == -1) return 0;
1042 } 817 }
@@ -1075,35 +850,20 @@ evas_common_font_glyph_search(RGBA_Font *fn, RGBA_Font_Int **fi_ret, Eina_Unicod
1075 } 850 }
1076 if (fi->src->ft.face) 851 if (fi->src->ft.face)
1077 { 852 {
1078 Eina_Bool is_color_only = (evas_font_search_options & EVAS_FONT_SEARCH_OPTION_SKIP_COLOR) == EVAS_FONT_SEARCH_OPTION_SKIP_COLOR && 853 idx = evas_common_get_char_index(fi, gl);
1079 FT_HAS_COLOR(fi->src->ft.face);
1080
1081 if (is_color_only)
1082 {
1083 /* This is color font ignore it */
1084 continue;
1085 }
1086
1087 idx = (int) evas_common_get_char_index(fi, gl, variation_sequence);
1088 if (idx != 0) 854 if (idx != 0)
1089 { 855 {
1090 if (!fi->ft.size) 856 if (!fi->ft.size)
1091 evas_common_font_int_load_complete(fi); 857 evas_common_font_int_load_complete(fi);
1092 if (!is_color_only) 858 if (!fn->fash) fn->fash = _fash_int_new();
1093 { 859 if (fn->fash) _fash_int_add(fn->fash, gl, fi, idx);
1094 if (!fn->fash) fn->fash = _fash_int_new();
1095 if (fn->fash) _fash_int_add(fn->fash, gl, fi, idx, variation_sequence);
1096 }
1097 *fi_ret = fi; 860 *fi_ret = fi;
1098 return idx; 861 return idx;
1099 } 862 }
1100 else 863 else
1101 { 864 {
1102 if (!is_color_only) 865 if (!fn->fash) fn->fash = _fash_int_new();
1103 { 866 if (fn->fash) _fash_int_add(fn->fash, gl, NULL, -1);
1104 if (!fn->fash) fn->fash = _fash_int_new();
1105 if (fn->fash) _fash_int_add(fn->fash, gl, NULL, -1, variation_sequence);
1106 }
1107 } 867 }
1108 } 868 }
1109 } 869 }
diff --git a/src/lib/evas/common/evas_font_query.c b/src/lib/evas/common/evas_font_query.c
index 7b50a74e62..1ff0447963 100644
--- a/src/lib/evas/common/evas_font_query.c
+++ b/src/lib/evas/common/evas_font_query.c
@@ -32,9 +32,6 @@ evas_common_font_query_run_font_end_get(RGBA_Font *fn, RGBA_Font_Int **script_fi
32 (evas_common_language_char_script_get(*base_char) != script) ; 32 (evas_common_language_char_script_get(*base_char) != script) ;
33 base_char++) 33 base_char++)
34 ; 34 ;
35 /* If counter reach variation sequence it is safe to pick default font */
36 if(VAR_SEQ(*base_char) || (base_char != run_end && VAR_SEQ(*(base_char+1)))) goto get_top_font;
37
38 if (base_char == run_end) base_char = text; 35 if (base_char == run_end) base_char = text;
39 36
40 /* Find the first renderable char */ 37 /* Find the first renderable char */
@@ -43,7 +40,7 @@ evas_common_font_query_run_font_end_get(RGBA_Font *fn, RGBA_Font_Int **script_fi
43 /* 0x1F is the last ASCII contral char, just a hack in 40 /* 0x1F is the last ASCII contral char, just a hack in
44 * the meanwhile. */ 41 * the meanwhile. */
45 if ((*base_char > 0x1F) && 42 if ((*base_char > 0x1F) &&
46 evas_common_font_glyph_search(fn, &fi, *base_char, 0, EVAS_FONT_SEARCH_OPTION_NONE)) 43 evas_common_font_glyph_search(fn, &fi, *base_char))
47 break; 44 break;
48 base_char++; 45 base_char++;
49 } 46 }
@@ -52,8 +49,7 @@ evas_common_font_query_run_font_end_get(RGBA_Font *fn, RGBA_Font_Int **script_fi
52 /* If everything else fails, at least try to find a font for the 49 /* If everything else fails, at least try to find a font for the
53 * replacement char */ 50 * replacement char */
54 if (base_char == run_end) 51 if (base_char == run_end)
55 evas_common_font_glyph_search(fn, &fi, REPLACEMENT_CHAR, 0, EVAS_FONT_SEARCH_OPTION_NONE); 52 evas_common_font_glyph_search(fn, &fi, REPLACEMENT_CHAR);
56get_top_font:
57 53
58 if (!fi) 54 if (!fi)
59 fi = fn->fonts->data; 55 fi = fn->fonts->data;
@@ -84,17 +80,15 @@ get_top_font:
84 if (evas_common_language_char_script_get(*itr) == EVAS_SCRIPT_INHERITED) 80 if (evas_common_language_char_script_get(*itr) == EVAS_SCRIPT_INHERITED)
85 continue; 81 continue;
86 82
87 Eina_Unicode variation_sequence = VAR_SEQ(*(itr+1));
88
89 /* Break if either it's not in the font, or if it is in the 83 /* Break if either it's not in the font, or if it is in the
90 * script's font. */ 84 * script's font. */
91 if (!evas_common_get_char_index(fi, *itr, variation_sequence)) 85 if (!evas_common_get_char_index(fi, *itr))
92 break; 86 break;
93 87
94 if (fi != *script_fi) 88 if (fi != *script_fi)
95 { 89 {
96 if (evas_common_get_char_index(*script_fi, *itr, variation_sequence)) 90 if (evas_common_get_char_index(*script_fi, *itr))
97 break; 91 break;
98 } 92 }
99 } 93 }
100 94
@@ -108,25 +102,10 @@ get_top_font:
108 /* If we can find a font, use it. Otherwise, find the first 102 /* If we can find a font, use it. Otherwise, find the first
109 * char the run of chars that can't be rendered until the first 103 * char the run of chars that can't be rendered until the first
110 * one that can. */ 104 * one that can. */
111 Eina_Unicode variation_sequence = VAR_SEQ(*(itr+1)); 105 if (evas_common_font_glyph_search(fn, &tmp_fi, *itr))
112 if (evas_common_font_glyph_search(fn, &tmp_fi, *itr, variation_sequence, EVAS_FONT_SEARCH_OPTION_NONE))
113 { 106 {
114 fi = tmp_fi; 107 fi = tmp_fi;
115 } 108 }
116 else if ( (variation_sequence == VARIATION_TEXT_PRESENTATION) && evas_common_font_glyph_search(fn, &tmp_fi, *itr, 0, EVAS_FONT_SEARCH_OPTION_SKIP_COLOR))
117 {
118 /* If we can not find unicode with variation sequence, then we will
119 Search and find for non color glyph because variation sequence is Text
120 */
121 fi = tmp_fi;
122 }
123 else if ( variation_sequence && evas_common_font_glyph_search(fn, &tmp_fi, *itr, 0, EVAS_FONT_SEARCH_OPTION_NONE))
124 {
125 /* If we can not find unicode with variation sequence, then we will
126 Search and find glyph without the variation sequence
127 */
128 fi = tmp_fi;
129 }
130 else 109 else
131 { 110 {
132 itr++; 111 itr++;
@@ -134,13 +113,9 @@ get_top_font:
134 * font */ 113 * font */
135 for ( ; itr < run_end ; itr++) 114 for ( ; itr < run_end ; itr++)
136 { 115 {
137 if(VAR_SEQ(*itr))
138 continue;
139
140 Eina_Unicode variation_sequence = VAR_SEQ(*(itr+1));
141 tmp_fi = fi; 116 tmp_fi = fi;
142 if (evas_common_get_char_index(fi, *itr, variation_sequence) || 117 if (evas_common_get_char_index(fi, *itr) ||
143 evas_common_font_glyph_search(fn, &tmp_fi, *itr, variation_sequence, EVAS_FONT_SEARCH_OPTION_NONE)) 118 evas_common_font_glyph_search(fn, &tmp_fi, *itr))
144 { 119 {
145 fi = tmp_fi; 120 fi = tmp_fi;
146 break; 121 break;
@@ -152,9 +127,9 @@ get_top_font:
152 * find a font most suitable for the replacement char and 127 * find a font most suitable for the replacement char and
153 * break */ 128 * break */
154 if ((itr == run_end) || 129 if ((itr == run_end) ||
155 !evas_common_get_char_index(fi, REPLACEMENT_CHAR, 0)) 130 !evas_common_get_char_index(fi, REPLACEMENT_CHAR))
156 { 131 {
157 evas_common_font_glyph_search(fn, &fi, REPLACEMENT_CHAR, 0, EVAS_FONT_SEARCH_OPTION_NONE); 132 evas_common_font_glyph_search(fn, &fi, REPLACEMENT_CHAR);
158 break; 133 break;
159 } 134 }
160 } 135 }
@@ -165,11 +140,8 @@ get_top_font:
165 /* If this char is not renderable by any font, but the replacement 140 /* If this char is not renderable by any font, but the replacement
166 * char can be rendered using the currentfont, continue this 141 * char can be rendered using the currentfont, continue this
167 * run. */ 142 * run. */
168 Eina_Unicode variation_sequence = VAR_SEQ(*(itr+1)); 143 if (!evas_common_font_glyph_search(fn, &tmp_fi, *itr) &&
169 144 evas_common_get_char_index(fi, REPLACEMENT_CHAR))
170 if (!evas_common_font_glyph_search(fn, &tmp_fi, *itr, variation_sequence, EVAS_FONT_SEARCH_OPTION_NONE) &&
171 (variation_sequence ? !evas_common_font_glyph_search(fn, &tmp_fi, *itr, 0, EVAS_FONT_SEARCH_OPTION_NONE) : 1) &&
172 evas_common_get_char_index(fi, REPLACEMENT_CHAR, 0))
173 { 145 {
174 itr++; 146 itr++;
175 } 147 }
diff --git a/src/lib/evas/common/evas_text_utils.c b/src/lib/evas/common/evas_text_utils.c
index 7edc73226d..b7cbe1b219 100644
--- a/src/lib/evas/common/evas_text_utils.c
+++ b/src/lib/evas/common/evas_text_utils.c
@@ -1066,7 +1066,7 @@ _content_create_ot(RGBA_Font_Int *fi, const Eina_Unicode *text,
1066 /* If we got a malformed index, show the replacement char instead */ 1066 /* If we got a malformed index, show the replacement char instead */
1067 if (gl_itr->index == 0) 1067 if (gl_itr->index == 0)
1068 { 1068 {
1069 gl_itr->index = evas_common_get_char_index(fi, REPLACEMENT_CHAR, 0); 1069 gl_itr->index = evas_common_get_char_index(fi, REPLACEMENT_CHAR);
1070 is_replacement = EINA_TRUE; 1070 is_replacement = EINA_TRUE;
1071 } 1071 }
1072 idx = gl_itr->index; 1072 idx = gl_itr->index;
@@ -1172,10 +1172,10 @@ _content_create_regular(RGBA_Font_Int *fi, const Eina_Unicode *text,
1172 _gl = *text; 1172 _gl = *text;
1173 if (_gl == 0) break; 1173 if (_gl == 0) break;
1174 1174
1175 idx = evas_common_get_char_index(fi, _gl, 0); 1175 idx = evas_common_get_char_index(fi, _gl);
1176 if (idx == 0) 1176 if (idx == 0)
1177 { 1177 {
1178 idx = evas_common_get_char_index(fi, REPLACEMENT_CHAR, 0); 1178 idx = evas_common_get_char_index(fi, REPLACEMENT_CHAR);
1179 } 1179 }
1180 1180
1181 fg = evas_common_font_int_cache_glyph_get(fi, idx); 1181 fg = evas_common_font_int_cache_glyph_get(fi, idx);
diff --git a/src/tests/evas/evas_test_textblock.c b/src/tests/evas/evas_test_textblock.c
index f826a481c7..dc3f22d136 100644
--- a/src/tests/evas/evas_test_textblock.c
+++ b/src/tests/evas/evas_test_textblock.c
@@ -1,6 +1,6 @@
1/* 1/*
2 * TODO: 2 * TODO:
3 * * Test different font loading mechanisms. 3 * * Test different font lodaing mechanisms.
4 */ 4 */
5 5
6#ifdef HAVE_CONFIG_H 6#ifdef HAVE_CONFIG_H
@@ -4129,22 +4129,6 @@ EFL_START_TEST(evas_textblock_obstacle)
4129} 4129}
4130EFL_END_TEST; 4130EFL_END_TEST;
4131 4131
4132EFL_START_TEST(evas_textblock_variation_sequence)
4133{
4134 START_TB_TEST();
4135 const char *str1 = "8&#xfe0f;&#x1f603;&#xfe0f;";
4136 const char *str2 = "8&#xfe0e;&#x1f603;&#xfe0e;";
4137 Evas_Coord fw, fh,fw_new, fh_new;
4138 evas_object_textblock_text_markup_set(tb, str1);
4139 evas_object_textblock_size_formatted_get(tb, &fw, &fh);
4140 evas_object_textblock_text_markup_set(tb, str2);
4141 evas_object_textblock_size_formatted_get(tb, &fw_new, &fh_new);
4142 fail_if(fw_new == fw && fh_new == fh);
4143
4144 END_TB_TEST();
4145}
4146EFL_END_TEST;
4147
4148#ifdef HAVE_HYPHEN 4132#ifdef HAVE_HYPHEN
4149static void 4133static void
4150_hyphenation_width_stress(Evas_Object *tb, Evas_Textblock_Cursor *cur) 4134_hyphenation_width_stress(Evas_Object *tb, Evas_Textblock_Cursor *cur)
@@ -4693,7 +4677,6 @@ void evas_test_textblock(TCase *tc)
4693 tcase_add_test(tc, evas_textblock_items); 4677 tcase_add_test(tc, evas_textblock_items);
4694 tcase_add_test(tc, evas_textblock_delete); 4678 tcase_add_test(tc, evas_textblock_delete);
4695 tcase_add_test(tc, evas_textblock_obstacle); 4679 tcase_add_test(tc, evas_textblock_obstacle);
4696 tcase_add_test(tc, evas_textblock_variation_sequence);
4697#ifdef HAVE_HYPHEN 4680#ifdef HAVE_HYPHEN
4698 tcase_add_test(tc, evas_textblock_hyphenation); 4681 tcase_add_test(tc, evas_textblock_hyphenation);
4699#endif 4682#endif