forked from enlightenment/efl
This reverts commit 521198281e4ac616fee48d27aae9e6983d5950c3. SVN revision: 56556devs/devilhorns/wayland_egl
Tom Hacohen
12 years ago
parent
ead10d70f7
commit
cdb54ed92d
16 changed files with 1137 additions and 804 deletions
@ -1,166 +0,0 @@ |
||||
#include "evas_common.h" |
||||
#include "evas_font_private.h" /* for Frame-Queuing support */ |
||||
#include "evas_font_ot.h" |
||||
#include "evas_font_glyph_info.h" |
||||
|
||||
EAPI Eina_Bool |
||||
evas_common_font_glyph_info_create(void *_fn, const Eina_Unicode *text, |
||||
Evas_Text_Props *text_props, int len) |
||||
{ |
||||
RGBA_Font *fn = (RGBA_Font *) _fn; |
||||
RGBA_Font_Int *fi; |
||||
size_t char_index; |
||||
|
||||
if (text_props->info) |
||||
{ |
||||
evas_common_text_props_content_unref(text_props); |
||||
} |
||||
text_props->info = calloc(1, sizeof(Evas_Text_Props_Info)); |
||||
|
||||
fi = fn->fonts->data; |
||||
/* evas_common_font_size_use(fn); */ |
||||
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; |
||||
} |
||||
|
||||
#ifdef OT_SUPPORT |
||||
if (evas_common_font_ot_is_enabled()) |
||||
{ |
||||
evas_common_font_ot_populate_text_props(fn, text, text_props, len); |
||||
|
||||
/* Load the glyph according to the first letter of the script, preety
|
||||
* bad, but will have to do */ |
||||
{ |
||||
/* 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); |
||||
} |
||||
|
||||
for (char_index = 0 ; char_index < text_props->len ; char_index++) |
||||
{ |
||||
FT_UInt index; |
||||
RGBA_Font_Glyph *fg; |
||||
index = text_props->info->glyph[char_index].index; |
||||
LKL(fi->ft_mutex); |
||||
fg = evas_common_font_int_cache_glyph_get(fi, index); |
||||
if (!fg) |
||||
{ |
||||
LKU(fi->ft_mutex); |
||||
continue; |
||||
} |
||||
LKU(fi->ft_mutex); |
||||
text_props->info->glyph[char_index].x_bear = |
||||
fg->glyph_out->left; |
||||
text_props->info->glyph[char_index].width = |
||||
fg->glyph_out->bitmap.width; |
||||
/* text_props->info->glyph[char_index].advance =
|
||||
* text_props->info->glyph[char_index].index = |
||||
* already done by the ot function */ |
||||
|
||||
/* FIXME add visible handling */ |
||||
} |
||||
} |
||||
else |
||||
#endif |
||||
{ |
||||
/* We are walking the string in visual ordering */ |
||||
Eina_Bool use_kerning; |
||||
FT_UInt prev_index; |
||||
FT_Face pface = NULL; |
||||
int adv_d, i; |
||||
FTLOCK(); |
||||
use_kerning = FT_HAS_KERNING(fi->src->ft.face); |
||||
FTUNLOCK(); |
||||
prev_index = 0; |
||||
|
||||
i = len; |
||||
text_props->info->glyph = calloc(len, |
||||
sizeof(Evas_Font_Glyph_Info)); |
||||
|
||||
if (text_props->bidi.dir == EVAS_BIDI_DIRECTION_RTL) |
||||
{ |
||||
text += len - 1; |
||||
adv_d = -1; |
||||
} |
||||
else |
||||
{ |
||||
adv_d = 1; |
||||
} |
||||
char_index = 0; |
||||
for ( ; i > 0 ; char_index++, text += adv_d, i--) |
||||
{ |
||||
FT_UInt index; |
||||
RGBA_Font_Glyph *fg; |
||||
int _gl, kern; |
||||
_gl = *text; |
||||
if (_gl == 0) break; |
||||
|
||||
index = evas_common_font_glyph_search(fn, &fi, _gl); |
||||
LKL(fi->ft_mutex); |
||||
fg = evas_common_font_int_cache_glyph_get(fi, index); |
||||
if (!fg) |
||||
{ |
||||
LKU(fi->ft_mutex); |
||||
continue; |
||||
} |
||||
kern = 0; |
||||
|
||||
if ((use_kerning) && (prev_index) && (index) && |
||||
(pface == fi->src->ft.face)) |
||||
{ |
||||
#ifdef BIDI_SUPPORT |
||||
/* if it's rtl, the kerning matching should be reversed, */ |
||||
/* i.e prev index is now the index and the other way */ |
||||
/* around. There is a slight exception when there are */ |
||||
/* compositing chars involved.*/ |
||||
if (text_props && |
||||
(text_props->bidi.dir != EVAS_BIDI_DIRECTION_RTL)) |
||||
{ |
||||
if (evas_common_font_query_kerning(fi, index, prev_index, &kern)) |
||||
{ |
||||
text_props->info->glyph[char_index - 1].advance += |
||||
kern; |
||||
} |
||||
} |
||||
else |
||||
#endif |
||||
{ |
||||
if (evas_common_font_query_kerning(fi, prev_index, index, &kern)) |
||||
{ |
||||
text_props->info->glyph[char_index - 1].advance += |
||||
kern; |
||||
} |
||||
} |
||||
} |
||||
|
||||
pface = fi->src->ft.face; |
||||
LKU(fi->ft_mutex); |
||||
|
||||
text_props->info->glyph[char_index].index = index; |
||||
text_props->info->glyph[char_index].x_bear = |
||||
fg->glyph_out->left; |
||||
text_props->info->glyph[char_index].advance = |
||||
fg->glyph->advance.x >> 10; |
||||
text_props->info->glyph[char_index].width = |
||||
fg->glyph_out->bitmap.width; |
||||
|
||||
prev_index = index; |
||||
} |
||||
text_props->len = len; |
||||
} |
||||
text_props->info->refcount = 1; |
||||
return EINA_TRUE; |
||||
} |
||||
|
||||
@ -1,25 +0,0 @@ |
||||
#ifndef _EVAS_FONT_METRICS_H |
||||
# define _EVAS_FONT_METRICS_H |
||||
/* Sorted in visual order when created */ |
||||
struct _Evas_Font_Glyph_Info |
||||
{ |
||||
unsigned int index; /* Should conform to FT */ |
||||
Evas_Coord x_bear; |
||||
#if 0 |
||||
/* This one is rarely used, only in draw, in which we already get the glyph
|
||||
* so it doesn't really save time. Leaving it here just so no one will |
||||
* add it thinking it was accidentally skipped */ |
||||
Evas_Coord y_bear; |
||||
#endif |
||||
Evas_Coord width; |
||||
Evas_Coord advance; |
||||
}; |
||||
|
||||
typedef struct _Evas_Font_Glyph_Info Evas_Font_Glyph_Info; |
||||
|
||||
EAPI Eina_Bool |
||||
evas_common_font_glyph_info_create(void *_fn, const Eina_Unicode *text, |
||||
Evas_Text_Props *text_props, int len); |
||||
|
||||
#endif |
||||
|
||||