summaryrefslogtreecommitdiff
path: root/src/lib/evas/common/evas_font_main.c
diff options
context:
space:
mode:
authorAli Alzyod <ali198724@gmail.com>2019-07-18 08:51:28 +0000
committerCedric BAIL <cedric.bail@free.fr>2019-07-29 11:17:35 -0700
commitf7ce771e3243e19f8a12672ea2be752dedccbcf6 (patch)
tree46ea86bbb22e62e5f26af489151c8d145318e98e /src/lib/evas/common/evas_font_main.c
parent7927023fc7a3aeebbb570f4e5cc0be36b99218c9 (diff)
evas_object_textblock: add support for variation sequences
update font processing to handle variation sequences unicodes to select proper glypg in respect to variation seqences Reviewed-by: Cedric BAIL <cedric.bail@free.fr> Differential Revision: https://phab.enlightenment.org/D9053
Diffstat (limited to '')
-rw-r--r--src/lib/evas/common/evas_font_main.c296
1 files changed, 268 insertions, 28 deletions
diff --git a/src/lib/evas/common/evas_font_main.c b/src/lib/evas/common/evas_font_main.c
index b99df9a927..31076132fd 100644
--- a/src/lib/evas/common/evas_font_main.c
+++ b/src/lib/evas/common/evas_font_main.c
@@ -355,33 +355,182 @@ 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_int2_free(Fash_Int_Map2 *fash) 358_fash_int_map_and_variations_free(Fash_Int_Map *map)
359{ 359 {
360 if(!map)
361 return;
360 int i; 362 int i;
361 363
362 for (i = 0; i < 256; i++) if (fash->bucket[i]) free(fash->bucket[i]); 364 for (i = 0; i < 256; i++)
363 free(fash); 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)
385 {
386 int i;
387 if (fash)
388 {
389 for (i = 0; i < 256; i++)
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 }
364} 398}
365 399
366static void 400static void
367_fash_int_free(Fash_Int *fash) 401_fash_int_free(Fash_Int *fash)
368{ 402{
369 int i; 403 int i;
404 if (fash)
405 {
406 if (fash->MAGIC != FASH_INT_MAGIC)
407 {
408 return;
409 }
370 410
371 for (i = 0; i < 256; i++) if (fash->bucket[i]) _fash_int2_free(fash->bucket[i]); 411 for (i = 0; i < 256; i++)
372 free(fash); 412 {
413 if (fash->bucket[i])
414 {
415 _fash_int2_free(fash->bucket[i]);
416 fash->bucket[i] = NULL;
417 }
418 }
419 free(fash);
420 }
373} 421}
374 422
375static Fash_Int * 423static Fash_Int *
376_fash_int_new(void) 424_fash_int_new(void)
377{ 425{
378 Fash_Int *fash = calloc(1, sizeof(Fash_Int)); 426 Fash_Int *fash = calloc(1, sizeof(Fash_Int));
427 EINA_SAFETY_ON_NULL_RETURN_VAL(fash, NULL);
428 fash->MAGIC = FASH_INT_MAGIC;
379 fash->freeme = _fash_int_free; 429 fash->freeme = _fash_int_free;
380 return fash; 430 return fash;
381} 431}
382 432
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
383static Fash_Item_Index_Map * 506static Fash_Item_Index_Map *
384_fash_int_find(Fash_Int *fash, int item) 507_variations_list_find(Fash_Item_variation_List * variations, Eina_Unicode variation_sequence)
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)
385{ 534{
386 int grp, maj, min; 535 int grp, maj, min;
387 536
@@ -391,14 +540,22 @@ _fash_int_find(Fash_Int *fash, int item)
391 min = item & 0xff; 540 min = item & 0xff;
392 if (!fash->bucket[grp]) return NULL; 541 if (!fash->bucket[grp]) return NULL;
393 if (!fash->bucket[grp]->bucket[maj]) return NULL; 542 if (!fash->bucket[grp]->bucket[maj]) return NULL;
394 return &(fash->bucket[grp]->bucket[maj]->item[min]); 543 if (!variation_sequence)
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);
395} 547}
396 548
397static void 549static void
398_fash_int_add(Fash_Int *fash, int item, RGBA_Font_Int *fint, int idx) 550_fash_int_add(Fash_Int *fash, int item, RGBA_Font_Int *fint, int idx, Eina_Unicode variation_sequence)
399{ 551{
400 int grp, maj, min; 552 int grp, maj, min;
401 553
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
402 // 24bits for unicode - v6 up to E01EF (chrs) & 10FFFD for private use (plane 16) 559 // 24bits for unicode - v6 up to E01EF (chrs) & 10FFFD for private use (plane 16)
403 grp = (item >> 16) & 0xff; 560 grp = (item >> 16) & 0xff;
404 maj = (item >> 8) & 0xff; 561 maj = (item >> 8) & 0xff;
@@ -409,8 +566,20 @@ _fash_int_add(Fash_Int *fash, int item, RGBA_Font_Int *fint, int idx)
409 if (!fash->bucket[grp]->bucket[maj]) 566 if (!fash->bucket[grp]->bucket[maj])
410 fash->bucket[grp]->bucket[maj] = calloc(1, sizeof(Fash_Int_Map)); 567 fash->bucket[grp]->bucket[maj] = calloc(1, sizeof(Fash_Int_Map));
411 EINA_SAFETY_ON_NULL_RETURN(fash->bucket[grp]->bucket[maj]); 568 EINA_SAFETY_ON_NULL_RETURN(fash->bucket[grp]->bucket[maj]);
412 fash->bucket[grp]->bucket[maj]->item[min].fint = fint; 569 if (variation_sequence)
413 fash->bucket[grp]->bucket[maj]->item[min].index = idx; 570 {
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 }
414} 583}
415 584
416static void 585static void
@@ -461,24 +630,45 @@ _fash_gl2_free(Fash_Glyph_Map2 *fash)
461 int i; 630 int i;
462 631
463 // 24bits for unicode - v6 up to E01EF (chrs) & 10FFFD for private use (plane 16) 632 // 24bits for unicode - v6 up to E01EF (chrs) & 10FFFD for private use (plane 16)
464 for (i = 0; i < 256; i++) if (fash->bucket[i]) _fash_glyph_free(fash->bucket[i]); 633 for (i = 0; i < 256; i++)
634 {
635 if (fash->bucket[i])
636 {
637 _fash_glyph_free(fash->bucket[i]);
638 fash->bucket[i] = NULL;
639 }
640 }
465 free(fash); 641 free(fash);
466} 642}
467 643
468static void 644static void
469_fash_gl_free(Fash_Glyph *fash) 645_fash_gl_free(Fash_Glyph *fash)
470{ 646{
471 int i; 647 if (fash)
648 {
649 if (fash->MAGIC != FASH_GLYPH_MAGIC)
650 return;
472 651
473 // 24bits for unicode - v6 up to E01EF (chrs) & 10FFFD for private use (plane 16) 652 int i;
474 for (i = 0; i < 256; i++) if (fash->bucket[i]) _fash_gl2_free(fash->bucket[i]); 653 // 24bits for unicode - v6 up to E01EF (chrs) & 10FFFD for private use (plane 16)
475 free(fash); 654 for (i = 0; i < 256; i++)
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 }
476} 664}
477 665
478static Fash_Glyph * 666static Fash_Glyph *
479_fash_gl_new(void) 667_fash_gl_new(void)
480{ 668{
481 Fash_Glyph *fash = calloc(1, sizeof(Fash_Glyph)); 669 Fash_Glyph *fash = calloc(1, sizeof(Fash_Glyph));
670 EINA_SAFETY_ON_NULL_RETURN_VAL(fash, NULL);
671 fash->MAGIC = FASH_GLYPH_MAGIC;
482 fash->freeme = _fash_gl_free; 672 fash->freeme = _fash_gl_free;
483 return fash; 673 return fash;
484} 674}
@@ -679,7 +869,7 @@ struct _Font_Char_Index
679}; 869};
680 870
681EAPI FT_UInt 871EAPI FT_UInt
682evas_common_get_char_index(RGBA_Font_Int* fi, Eina_Unicode gl) 872evas_common_get_char_index(RGBA_Font_Int* fi, Eina_Unicode gl, Eina_Unicode variation_sequence)
683{ 873{
684 static const unsigned short mapfix[] = 874 static const unsigned short mapfix[] =
685 { 875 {
@@ -741,7 +931,10 @@ evas_common_get_char_index(RGBA_Font_Int* fi, Eina_Unicode gl)
741 * that something else try to use it. 931 * that something else try to use it.
742 */ 932 */
743 /* FTLOCK(); */ 933 /* FTLOCK(); */
744 result.index = FT_Get_Char_Index(fi->src->ft.face, gl); 934 if (variation_sequence)
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);
745 /* FTUNLOCK(); */ 938 /* FTUNLOCK(); */
746 result.gl = gl; 939 result.gl = gl;
747 940
@@ -773,7 +966,10 @@ evas_common_get_char_index(RGBA_Font_Int* fi, Eina_Unicode gl)
773 { 966 {
774 gl = mapfix[(i << 1) + 1]; 967 gl = mapfix[(i << 1) + 1];
775 FTLOCK(); 968 FTLOCK();
776 result.index = FT_Get_Char_Index(fi->src->ft.face, gl); 969 if (variation_sequence)
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);
777 FTUNLOCK(); 973 FTUNLOCK();
778 break; 974 break;
779 } 975 }
@@ -798,20 +994,49 @@ evas_common_get_char_index(RGBA_Font_Int* fi, Eina_Unicode gl)
798 return result.index; 994 return result.index;
799} 995}
800 996
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
801EAPI int 1010EAPI int
802evas_common_font_glyph_search(RGBA_Font *fn, RGBA_Font_Int **fi_ret, Eina_Unicode gl) 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)
803{ 1012{
804 Eina_List *l; 1013 Eina_List *l;
805 1014
806 if (fn->fash) 1015 if (fn->fash)
807 { 1016 {
808 Fash_Item_Index_Map *fm = _fash_int_find(fn->fash, gl); 1017 const Fash_Item_Index_Map *fm = _fash_int_find(fn->fash, gl, variation_sequence);
809 if (fm) 1018 if (fm)
810 { 1019 {
811 if (fm->fint) 1020 if (fm->fint)
812 { 1021 {
813 *fi_ret = fm->fint; 1022 if (evas_font_search_options == EVAS_FONT_SEARCH_OPTION_NONE)
814 return fm->index; 1023 {
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 }
815 } 1040 }
816 else if (fm->index == -1) return 0; 1041 else if (fm->index == -1) return 0;
817 } 1042 }
@@ -850,20 +1075,35 @@ evas_common_font_glyph_search(RGBA_Font *fn, RGBA_Font_Int **fi_ret, Eina_Unicod
850 } 1075 }
851 if (fi->src->ft.face) 1076 if (fi->src->ft.face)
852 { 1077 {
853 idx = evas_common_get_char_index(fi, gl); 1078 Eina_Bool is_color_only = (evas_font_search_options & EVAS_FONT_SEARCH_OPTION_SKIP_COLOR) == EVAS_FONT_SEARCH_OPTION_SKIP_COLOR &&
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);
854 if (idx != 0) 1088 if (idx != 0)
855 { 1089 {
856 if (!fi->ft.size) 1090 if (!fi->ft.size)
857 evas_common_font_int_load_complete(fi); 1091 evas_common_font_int_load_complete(fi);
858 if (!fn->fash) fn->fash = _fash_int_new(); 1092 if (!is_color_only)
859 if (fn->fash) _fash_int_add(fn->fash, gl, fi, idx); 1093 {
1094 if (!fn->fash) fn->fash = _fash_int_new();
1095 if (fn->fash) _fash_int_add(fn->fash, gl, fi, idx, variation_sequence);
1096 }
860 *fi_ret = fi; 1097 *fi_ret = fi;
861 return idx; 1098 return idx;
862 } 1099 }
863 else 1100 else
864 { 1101 {
865 if (!fn->fash) fn->fash = _fash_int_new(); 1102 if (!is_color_only)
866 if (fn->fash) _fash_int_add(fn->fash, gl, NULL, -1); 1103 {
1104 if (!fn->fash) fn->fash = _fash_int_new();
1105 if (fn->fash) _fash_int_add(fn->fash, gl, NULL, -1, variation_sequence);
1106 }
867 } 1107 }
868 } 1108 }
869 } 1109 }