Evas font-engine: Remove most of the passing of strings.
We have string objects, we don't really need them. Draw still uses strings for metric cache, but that will be removed soon as well. SVN revision: 58460
This commit is contained in:
parent
c9290ef41d
commit
5d4f6d3cbe
|
@ -116,7 +116,7 @@ _evas_object_text_char_coords_get(const Evas_Object *obj,
|
||||||
if ((it->text_pos <= pos) &&
|
if ((it->text_pos <= pos) &&
|
||||||
(pos < it->text_pos + eina_unicode_strlen(it->text)))
|
(pos < it->text_pos + eina_unicode_strlen(it->text)))
|
||||||
{
|
{
|
||||||
return ENFN->font_char_coords_get(ENDT, o->engine_data, it->text,
|
return ENFN->font_char_coords_get(ENDT, o->engine_data,
|
||||||
&it->text_props, pos - it->text_pos, x, y, w, h);
|
&it->text_props, pos - it->text_pos, x, y, w, h);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -193,7 +193,7 @@ _evas_object_text_last_up_to_pos(const Evas_Object *obj,
|
||||||
{
|
{
|
||||||
return it->text_pos + ENFN->font_last_up_to_pos(ENDT,
|
return it->text_pos + ENFN->font_last_up_to_pos(ENDT,
|
||||||
o->engine_data,
|
o->engine_data,
|
||||||
it->text, &it->text_props,
|
&it->text_props,
|
||||||
cx - x,
|
cx - x,
|
||||||
cy);
|
cy);
|
||||||
}
|
}
|
||||||
|
@ -210,7 +210,7 @@ _evas_object_text_last_up_to_pos(const Evas_Object *obj,
|
||||||
{
|
{
|
||||||
return it->text_pos + ENFN->font_last_up_to_pos(ENDT,
|
return it->text_pos + ENFN->font_last_up_to_pos(ENDT,
|
||||||
o->engine_data,
|
o->engine_data,
|
||||||
it->text, &it->text_props,
|
&it->text_props,
|
||||||
cx - it->x,
|
cx - it->x,
|
||||||
cy);
|
cy);
|
||||||
}
|
}
|
||||||
|
@ -233,7 +233,7 @@ _evas_object_text_char_at_coords(const Evas_Object *obj,
|
||||||
{
|
{
|
||||||
return it->text_pos + ENFN->font_char_at_coords_get(ENDT,
|
return it->text_pos + ENFN->font_char_at_coords_get(ENDT,
|
||||||
o->engine_data,
|
o->engine_data,
|
||||||
it->text, &it->text_props,
|
&it->text_props,
|
||||||
cx,
|
cx,
|
||||||
cy,
|
cy,
|
||||||
rx, ry,
|
rx, ry,
|
||||||
|
@ -535,7 +535,7 @@ _evas_object_text_item_new(Evas_Object *obj, Evas_Object_Text *o,
|
||||||
o->bidi_par_props, it->text_pos, len);
|
o->bidi_par_props, it->text_pos, len);
|
||||||
ENFN->font_string_size_get(ENDT,
|
ENFN->font_string_size_get(ENDT,
|
||||||
o->engine_data,
|
o->engine_data,
|
||||||
it->text, &it->text_props,
|
&it->text_props,
|
||||||
&it->w, &it->h);
|
&it->w, &it->h);
|
||||||
it->adv = it->w + ENFN->font_right_inset_get(ENDT, o->engine_data,
|
it->adv = it->w + ENFN->font_right_inset_get(ENDT, o->engine_data,
|
||||||
&it->text_props);
|
&it->text_props);
|
||||||
|
|
|
@ -2376,7 +2376,7 @@ _layout_text_cutoff_get(Ctxt *c, Evas_Object_Textblock_Format *fmt,
|
||||||
c->marginr - c->x - ti->x_adjustment;
|
c->marginr - c->x - ti->x_adjustment;
|
||||||
if (x < 0)
|
if (x < 0)
|
||||||
x = 0;
|
x = 0;
|
||||||
return c->ENFN->font_last_up_to_pos(c->ENDT, fmt->font.font, ti->text,
|
return c->ENFN->font_last_up_to_pos(c->ENDT, fmt->font.font,
|
||||||
&ti->text_props, x, 0);
|
&ti->text_props, x, 0);
|
||||||
}
|
}
|
||||||
return -1;
|
return -1;
|
||||||
|
@ -2591,7 +2591,7 @@ _text_item_update_sizes(Ctxt *c, Evas_Object_Textblock_Text_Item *ti)
|
||||||
|
|
||||||
tw = th = 0;
|
tw = th = 0;
|
||||||
if (fmt->font.font)
|
if (fmt->font.font)
|
||||||
c->ENFN->font_string_size_get(c->ENDT, fmt->font.font, ti->text,
|
c->ENFN->font_string_size_get(c->ENDT, fmt->font.font,
|
||||||
&ti->text_props, &tw, &th);
|
&ti->text_props, &tw, &th);
|
||||||
inset = 0;
|
inset = 0;
|
||||||
if (fmt->font.font)
|
if (fmt->font.font)
|
||||||
|
@ -7424,7 +7424,7 @@ evas_textblock_cursor_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord
|
||||||
* @return line number of the char on success, -1 on error.
|
* @return line number of the char on success, -1 on error.
|
||||||
*/
|
*/
|
||||||
static int
|
static int
|
||||||
_evas_textblock_cursor_char_pen_geometry_common_get(int (*query_func) (void *data, void *font, const Eina_Unicode *text, const Evas_Text_Props *intl_props, int pos, int *cx, int *cy, int *cw, int *ch), const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch)
|
_evas_textblock_cursor_char_pen_geometry_common_get(int (*query_func) (void *data, void *font, const Evas_Text_Props *intl_props, int pos, int *cx, int *cy, int *cw, int *ch), const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch)
|
||||||
{
|
{
|
||||||
Evas_Object_Textblock *o;
|
Evas_Object_Textblock *o;
|
||||||
Evas_Object_Textblock_Line *ln = NULL;
|
Evas_Object_Textblock_Line *ln = NULL;
|
||||||
|
@ -7479,7 +7479,7 @@ _evas_textblock_cursor_char_pen_geometry_common_get(int (*query_func) (void *dat
|
||||||
{
|
{
|
||||||
ret = query_func(cur->ENDT,
|
ret = query_func(cur->ENDT,
|
||||||
ti->parent.format->font.font,
|
ti->parent.format->font.font,
|
||||||
ti->text, &ti->text_props,
|
&ti->text_props,
|
||||||
pos,
|
pos,
|
||||||
&x, &y, &w, &h);
|
&x, &y, &w, &h);
|
||||||
}
|
}
|
||||||
|
@ -7673,7 +7673,7 @@ evas_textblock_cursor_char_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord x, E
|
||||||
pos = cur->ENFN->font_char_at_coords_get(
|
pos = cur->ENFN->font_char_at_coords_get(
|
||||||
cur->ENDT,
|
cur->ENDT,
|
||||||
ti->parent.format->font.font,
|
ti->parent.format->font.font,
|
||||||
ti->text, &ti->text_props,
|
&ti->text_props,
|
||||||
x - it->x - ln->par->x - ln->x, 0,
|
x - it->x - ln->par->x - ln->x, 0,
|
||||||
&cx, &cy, &cw, &ch);
|
&cx, &cy, &cw, &ch);
|
||||||
if (pos < 0)
|
if (pos < 0)
|
||||||
|
@ -7894,7 +7894,7 @@ _evas_textblock_cursor_range_in_line_geometry_get(
|
||||||
ti = _ITEM_TEXT(it1);
|
ti = _ITEM_TEXT(it1);
|
||||||
ret = cur->ENFN->font_pen_coords_get(cur->ENDT,
|
ret = cur->ENFN->font_pen_coords_get(cur->ENDT,
|
||||||
ti->parent.format->font.font,
|
ti->parent.format->font.font,
|
||||||
ti->text, &ti->text_props,
|
&ti->text_props,
|
||||||
start,
|
start,
|
||||||
&x1, &y, &w1, &h);
|
&x1, &y, &w1, &h);
|
||||||
if (!ret)
|
if (!ret)
|
||||||
|
@ -7903,7 +7903,7 @@ _evas_textblock_cursor_range_in_line_geometry_get(
|
||||||
}
|
}
|
||||||
ret = cur->ENFN->font_pen_coords_get(cur->ENDT,
|
ret = cur->ENFN->font_pen_coords_get(cur->ENDT,
|
||||||
ti->parent.format->font.font,
|
ti->parent.format->font.font,
|
||||||
ti->text, &ti->text_props,
|
&ti->text_props,
|
||||||
end,
|
end,
|
||||||
&x2, &y, &w2, &h);
|
&x2, &y, &w2, &h);
|
||||||
if (!ret)
|
if (!ret)
|
||||||
|
@ -7963,7 +7963,7 @@ _evas_textblock_cursor_range_in_line_geometry_get(
|
||||||
|
|
||||||
ret = cur->ENFN->font_pen_coords_get(cur->ENDT,
|
ret = cur->ENFN->font_pen_coords_get(cur->ENDT,
|
||||||
ti->parent.format->font.font,
|
ti->parent.format->font.font,
|
||||||
ti->text, &ti->text_props,
|
&ti->text_props,
|
||||||
start,
|
start,
|
||||||
&x, &y, &w, &h);
|
&x, &y, &w, &h);
|
||||||
if (!ret)
|
if (!ret)
|
||||||
|
@ -8017,7 +8017,7 @@ _evas_textblock_cursor_range_in_line_geometry_get(
|
||||||
|
|
||||||
ret = cur->ENFN->font_pen_coords_get(cur->ENDT,
|
ret = cur->ENFN->font_pen_coords_get(cur->ENDT,
|
||||||
ti->parent.format->font.font,
|
ti->parent.format->font.font,
|
||||||
ti->text, &ti->text_props,
|
&ti->text_props,
|
||||||
end,
|
end,
|
||||||
&x, &y, &w, &h);
|
&x, &y, &w, &h);
|
||||||
if (!ret)
|
if (!ret)
|
||||||
|
|
|
@ -56,14 +56,14 @@ EAPI void evas_common_font_all_clear (void);
|
||||||
/* query */
|
/* query */
|
||||||
|
|
||||||
EAPI int evas_common_font_query_kerning (RGBA_Font_Int* fi, FT_UInt left, FT_UInt right, int* kerning);
|
EAPI int evas_common_font_query_kerning (RGBA_Font_Int* fi, FT_UInt left, FT_UInt right, int* kerning);
|
||||||
EAPI void evas_common_font_query_size (RGBA_Font *fn, const Eina_Unicode *text, const Evas_Text_Props *intl_props, int *w, int *h);
|
EAPI void evas_common_font_query_size (RGBA_Font *fn, const Evas_Text_Props *intl_props, int *w, int *h);
|
||||||
EAPI int evas_common_font_query_inset (RGBA_Font *fn __UNUSED__, const Evas_Text_Props *text_props);
|
EAPI int evas_common_font_query_inset (RGBA_Font *fn __UNUSED__, const Evas_Text_Props *text_props);
|
||||||
EAPI int evas_common_font_query_right_inset (RGBA_Font *fn __UNUSED__, const Evas_Text_Props *text_props);
|
EAPI int evas_common_font_query_right_inset (RGBA_Font *fn __UNUSED__, const Evas_Text_Props *text_props);
|
||||||
EAPI void evas_common_font_query_advance (RGBA_Font *fn, const Eina_Unicode *text, const Evas_Text_Props *intl_props, int *h_adv, int *v_adv);
|
EAPI void evas_common_font_query_advance (RGBA_Font *fn, const Evas_Text_Props *intl_props, int *h_adv, int *v_adv);
|
||||||
EAPI int evas_common_font_query_char_coords (RGBA_Font *fn, const Eina_Unicode *text, const Evas_Text_Props *intl_props, int pos, int *cx, int *cy, int *cw, int *ch);
|
EAPI int evas_common_font_query_char_coords (RGBA_Font *fn, const Evas_Text_Props *intl_props, int pos, int *cx, int *cy, int *cw, int *ch);
|
||||||
EAPI int evas_common_font_query_pen_coords (RGBA_Font *fn, const Eina_Unicode *text, const Evas_Text_Props *intl_props, int pos, int *cpen_x, int *cy, int *cadv, int *ch);
|
EAPI int evas_common_font_query_pen_coords (RGBA_Font *fn, const Evas_Text_Props *intl_props, int pos, int *cpen_x, int *cy, int *cadv, int *ch);
|
||||||
EAPI int evas_common_font_query_char_at_coords (RGBA_Font *fn, const Eina_Unicode *text, const Evas_Text_Props *intl_props, int x, int y, int *cx, int *cy, int *cw, int *ch);
|
EAPI int evas_common_font_query_char_at_coords (RGBA_Font *fn, const Evas_Text_Props *intl_props, int x, int y, int *cx, int *cy, int *cw, int *ch);
|
||||||
EAPI int evas_common_font_query_last_up_to_pos (RGBA_Font *fn, const Eina_Unicode *text, const Evas_Text_Props *intl_props, int x, int y);
|
EAPI int evas_common_font_query_last_up_to_pos (RGBA_Font *fn, const Evas_Text_Props *intl_props, int x, int y);
|
||||||
|
|
||||||
#ifdef EVAS_FRAME_QUEUING
|
#ifdef EVAS_FRAME_QUEUING
|
||||||
EAPI void evas_common_font_draw_finish(void);
|
EAPI void evas_common_font_draw_finish(void);
|
||||||
|
|
|
@ -95,7 +95,7 @@ evas_common_font_query_right_inset(RGBA_Font *fn __UNUSED__, const Evas_Text_Pro
|
||||||
*/
|
*/
|
||||||
|
|
||||||
EAPI void
|
EAPI void
|
||||||
evas_common_font_query_size(RGBA_Font *fn, const Eina_Unicode *text __UNUSED__, const Evas_Text_Props *text_props, int *w, int *h)
|
evas_common_font_query_size(RGBA_Font *fn, const Evas_Text_Props *text_props, int *w, int *h)
|
||||||
{
|
{
|
||||||
int keep_width = 0;
|
int keep_width = 0;
|
||||||
int prev_pen_x = 0;
|
int prev_pen_x = 0;
|
||||||
|
@ -133,7 +133,7 @@ evas_common_font_query_size(RGBA_Font *fn, const Eina_Unicode *text __UNUSED__,
|
||||||
* this way, we are safe.
|
* this way, we are safe.
|
||||||
*/
|
*/
|
||||||
EAPI void
|
EAPI void
|
||||||
evas_common_font_query_advance(RGBA_Font *fn, const Eina_Unicode *text __UNUSED__, const Evas_Text_Props *text_props, int *h_adv, int *v_adv)
|
evas_common_font_query_advance(RGBA_Font *fn, const Evas_Text_Props *text_props, int *h_adv, int *v_adv)
|
||||||
{
|
{
|
||||||
EVAS_FONT_WALK_TEXT_INIT();
|
EVAS_FONT_WALK_TEXT_INIT();
|
||||||
|
|
||||||
|
@ -159,7 +159,7 @@ evas_common_font_query_advance(RGBA_Font *fn, const Eina_Unicode *text __UNUSED_
|
||||||
*/
|
*/
|
||||||
|
|
||||||
EAPI int
|
EAPI int
|
||||||
evas_common_font_query_char_coords(RGBA_Font *fn, const Eina_Unicode *text __UNUSED__, const Evas_Text_Props *text_props, int pos, int *cx, int *cy, int *cw, int *ch)
|
evas_common_font_query_char_coords(RGBA_Font *fn, const Evas_Text_Props *text_props, int pos, int *cx, int *cy, int *cw, int *ch)
|
||||||
{
|
{
|
||||||
int asc, desc;
|
int asc, desc;
|
||||||
size_t position = 0;
|
size_t position = 0;
|
||||||
|
@ -184,7 +184,7 @@ evas_common_font_query_char_coords(RGBA_Font *fn, const Eina_Unicode *text __UNU
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
evas_common_font_query_advance(fn, text, text_props, cx, ch);
|
evas_common_font_query_advance(fn, text_props, cx, ch);
|
||||||
}
|
}
|
||||||
if (cy) *cy = 0;
|
if (cy) *cy = 0;
|
||||||
if (cw) *cw = 0;
|
if (cw) *cw = 0;
|
||||||
|
@ -283,7 +283,7 @@ end:
|
||||||
*/
|
*/
|
||||||
|
|
||||||
EAPI int
|
EAPI int
|
||||||
evas_common_font_query_pen_coords(RGBA_Font *fn, const Eina_Unicode *text __UNUSED__, const Evas_Text_Props *text_props, int pos, int *cpen_x, int *cy, int *cadv, int *ch)
|
evas_common_font_query_pen_coords(RGBA_Font *fn, const Evas_Text_Props *text_props, int pos, int *cpen_x, int *cy, int *cadv, int *ch)
|
||||||
{
|
{
|
||||||
int asc, desc;
|
int asc, desc;
|
||||||
size_t position;
|
size_t position;
|
||||||
|
@ -308,7 +308,7 @@ evas_common_font_query_pen_coords(RGBA_Font *fn, const Eina_Unicode *text __UNUS
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
evas_common_font_query_advance(fn, text, text_props, cpen_x, ch);
|
evas_common_font_query_advance(fn, text_props, cpen_x, ch);
|
||||||
}
|
}
|
||||||
if (cy) *cy = 0;
|
if (cy) *cy = 0;
|
||||||
if (cadv) *cadv = 0;
|
if (cadv) *cadv = 0;
|
||||||
|
@ -399,7 +399,7 @@ end:
|
||||||
*/
|
*/
|
||||||
|
|
||||||
EAPI int
|
EAPI int
|
||||||
evas_common_font_query_char_at_coords(RGBA_Font *fn, const Eina_Unicode *text __UNUSED__, const Evas_Text_Props *text_props, int x, int y, int *cx, int *cy, int *cw, int *ch)
|
evas_common_font_query_char_at_coords(RGBA_Font *fn, const Evas_Text_Props *text_props, int x, int y, int *cx, int *cy, int *cw, int *ch)
|
||||||
{
|
{
|
||||||
int asc, desc;
|
int asc, desc;
|
||||||
int ret_val = -1;
|
int ret_val = -1;
|
||||||
|
@ -482,7 +482,7 @@ end:
|
||||||
*/
|
*/
|
||||||
|
|
||||||
EAPI int
|
EAPI int
|
||||||
evas_common_font_query_last_up_to_pos(RGBA_Font *fn, const Eina_Unicode *text __UNUSED__, const Evas_Text_Props *text_props, int x, int y)
|
evas_common_font_query_last_up_to_pos(RGBA_Font *fn, const Evas_Text_Props *text_props, int x, int y)
|
||||||
{
|
{
|
||||||
int asc, desc;
|
int asc, desc;
|
||||||
int ret=-1;
|
int ret=-1;
|
||||||
|
|
|
@ -656,12 +656,12 @@ struct _Evas_Func
|
||||||
int (*font_descent_get) (void *data, void *font);
|
int (*font_descent_get) (void *data, void *font);
|
||||||
int (*font_max_ascent_get) (void *data, void *font);
|
int (*font_max_ascent_get) (void *data, void *font);
|
||||||
int (*font_max_descent_get) (void *data, void *font);
|
int (*font_max_descent_get) (void *data, void *font);
|
||||||
void (*font_string_size_get) (void *data, void *font, const Eina_Unicode *text, const Evas_Text_Props *intl_props, int *w, int *h);
|
void (*font_string_size_get) (void *data, void *font, const Evas_Text_Props *intl_props, int *w, int *h);
|
||||||
int (*font_inset_get) (void *data, void *font, const Evas_Text_Props *text_props);
|
int (*font_inset_get) (void *data, void *font, const Evas_Text_Props *text_props);
|
||||||
int (*font_h_advance_get) (void *data, void *font, const Eina_Unicode *text, const Evas_Text_Props *intl_props);
|
int (*font_h_advance_get) (void *data, void *font, const Evas_Text_Props *intl_props);
|
||||||
int (*font_v_advance_get) (void *data, void *font, const Eina_Unicode *text, const Evas_Text_Props *intl_props);
|
int (*font_v_advance_get) (void *data, void *font, const Evas_Text_Props *intl_props);
|
||||||
int (*font_char_coords_get) (void *data, void *font, const Eina_Unicode *text, const Evas_Text_Props *intl_props, int pos, int *cx, int *cy, int *cw, int *ch);
|
int (*font_char_coords_get) (void *data, void *font, const Evas_Text_Props *intl_props, int pos, int *cx, int *cy, int *cw, int *ch);
|
||||||
int (*font_char_at_coords_get) (void *data, void *font, const Eina_Unicode *text, const Evas_Text_Props *intl_props, int x, int y, int *cx, int *cy, int *cw, int *ch);
|
int (*font_char_at_coords_get) (void *data, void *font, const Evas_Text_Props *intl_props, int x, int y, int *cx, int *cy, int *cw, int *ch);
|
||||||
void (*font_draw) (void *data, void *context, void *surface, void *font, int x, int y, int w, int h, int ow, int oh, const Eina_Unicode *text, const Evas_Text_Props *intl_props);
|
void (*font_draw) (void *data, void *context, void *surface, void *font, int x, int y, int w, int h, int ow, int oh, const Eina_Unicode *text, const Evas_Text_Props *intl_props);
|
||||||
|
|
||||||
void (*font_cache_flush) (void *data);
|
void (*font_cache_flush) (void *data);
|
||||||
|
@ -677,7 +677,7 @@ struct _Evas_Func
|
||||||
|
|
||||||
void (*image_scale_hint_set) (void *data, void *image, int hint);
|
void (*image_scale_hint_set) (void *data, void *image, int hint);
|
||||||
int (*image_scale_hint_get) (void *data, void *image);
|
int (*image_scale_hint_get) (void *data, void *image);
|
||||||
int (*font_last_up_to_pos) (void *data, void *font, const Eina_Unicode *text, const Evas_Text_Props *intl_props, int x, int y);
|
int (*font_last_up_to_pos) (void *data, void *font, const Evas_Text_Props *intl_props, int x, int y);
|
||||||
|
|
||||||
void (*image_map_draw) (void *data, void *context, void *surface, void *image, int npoints, RGBA_Map_Point *p, int smooth, int level);
|
void (*image_map_draw) (void *data, void *context, void *surface, void *image, int npoints, RGBA_Map_Point *p, int smooth, int level);
|
||||||
void *(*image_map_surface_new) (void *data, int w, int h, int alpha);
|
void *(*image_map_surface_new) (void *data, int w, int h, int alpha);
|
||||||
|
@ -685,7 +685,7 @@ struct _Evas_Func
|
||||||
|
|
||||||
void (*image_content_hint_set) (void *data, void *surface, int hint);
|
void (*image_content_hint_set) (void *data, void *surface, int hint);
|
||||||
int (*image_content_hint_get) (void *data, void *surface);
|
int (*image_content_hint_get) (void *data, void *surface);
|
||||||
int (*font_pen_coords_get) (void *data, void *font, const Eina_Unicode *text, const Evas_Text_Props *intl_props, int pos, int *cpen_x, int *cy, int *cadv, int *ch);
|
int (*font_pen_coords_get) (void *data, void *font, const Evas_Text_Props *intl_props, int pos, int *cpen_x, int *cy, int *cadv, int *ch);
|
||||||
Eina_Bool (*font_text_props_info_create) (void *data __UNUSED__, void *font, Eina_Unicode *text, Evas_Text_Props *intl_props, const Evas_BiDi_Paragraph_Props *par_props, size_t pos, size_t len);
|
Eina_Bool (*font_text_props_info_create) (void *data __UNUSED__, void *font, Eina_Unicode *text, Evas_Text_Props *intl_props, const Evas_BiDi_Paragraph_Props *par_props, size_t pos, size_t len);
|
||||||
int (*font_right_inset_get) (void *data, void *font, const Evas_Text_Props *text_props);
|
int (*font_right_inset_get) (void *data, void *font, const Evas_Text_Props *text_props);
|
||||||
|
|
||||||
|
|
|
@ -505,9 +505,9 @@ eng_font_max_descent_get(void *data __UNUSED__, void *font)
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
eng_font_string_size_get(void *data __UNUSED__, void *font, const Eina_Unicode *text, const Evas_Text_Props *text_props, int *w, int *h)
|
eng_font_string_size_get(void *data __UNUSED__, void *font, const Evas_Text_Props *text_props, int *w, int *h)
|
||||||
{
|
{
|
||||||
evas_common_font_query_size(font, text, text_props, w, h);
|
evas_common_font_query_size(font, text_props, w, h);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
|
@ -523,27 +523,27 @@ eng_font_right_inset_get(void *data __UNUSED__, void *font, const Evas_Text_Prop
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
eng_font_h_advance_get(void *data __UNUSED__, void *font, const Eina_Unicode *text, const Evas_Text_Props *text_props)
|
eng_font_h_advance_get(void *data __UNUSED__, void *font, const Evas_Text_Props *text_props)
|
||||||
{
|
{
|
||||||
int h, v;
|
int h, v;
|
||||||
|
|
||||||
evas_common_font_query_advance(font, text, text_props, &h, &v);
|
evas_common_font_query_advance(font, text_props, &h, &v);
|
||||||
return h;
|
return h;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
eng_font_v_advance_get(void *data __UNUSED__, void *font, const Eina_Unicode *text, const Evas_Text_Props *text_props)
|
eng_font_v_advance_get(void *data __UNUSED__, void *font, const Evas_Text_Props *text_props)
|
||||||
{
|
{
|
||||||
int h, v;
|
int h, v;
|
||||||
|
|
||||||
evas_common_font_query_advance(font, text, text_props, &h, &v);
|
evas_common_font_query_advance(font, text_props, &h, &v);
|
||||||
return v;
|
return v;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
eng_font_pen_coords_get(void *data __UNUSED__, void *font, const Eina_Unicode *text, const Evas_Text_Props *text_props, int pos, int *cpen_x, int *cy, int *cadv, int *ch)
|
eng_font_pen_coords_get(void *data __UNUSED__, void *font, const Evas_Text_Props *text_props, int pos, int *cpen_x, int *cy, int *cadv, int *ch)
|
||||||
{
|
{
|
||||||
return evas_common_font_query_pen_coords(font, text, text_props, pos, cpen_x, cy, cadv, ch);
|
return evas_common_font_query_pen_coords(font, text_props, pos, cpen_x, cy, cadv, ch);
|
||||||
}
|
}
|
||||||
|
|
||||||
static Eina_Bool
|
static Eina_Bool
|
||||||
|
@ -562,21 +562,21 @@ eng_font_text_props_info_create(void *data __UNUSED__, void *font, Eina_Unicode
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
eng_font_char_coords_get(void *data __UNUSED__, void *font, const Eina_Unicode *text, const Evas_Text_Props *text_props, int pos, int *cx, int *cy, int *cw, int *ch)
|
eng_font_char_coords_get(void *data __UNUSED__, void *font, const Evas_Text_Props *text_props, int pos, int *cx, int *cy, int *cw, int *ch)
|
||||||
{
|
{
|
||||||
return evas_common_font_query_char_coords(font, text, text_props, pos, cx, cy, cw, ch);
|
return evas_common_font_query_char_coords(font, text_props, pos, cx, cy, cw, ch);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
eng_font_char_at_coords_get(void *data __UNUSED__, void *font, const Eina_Unicode *text, const Evas_Text_Props *text_props, int x, int y, int *cx, int *cy, int *cw, int *ch)
|
eng_font_char_at_coords_get(void *data __UNUSED__, void *font, const Evas_Text_Props *text_props, int x, int y, int *cx, int *cy, int *cw, int *ch)
|
||||||
{
|
{
|
||||||
return evas_common_font_query_char_at_coords(font, text, text_props, x, y, cx, cy, cw, ch);
|
return evas_common_font_query_char_at_coords(font, text_props, x, y, cx, cy, cw, ch);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
eng_font_last_up_to_pos(void *data __UNUSED__, void *font, const Eina_Unicode *text, const Evas_Text_Props *text_props, int x, int y)
|
eng_font_last_up_to_pos(void *data __UNUSED__, void *font, const Evas_Text_Props *text_props, int x, int y)
|
||||||
{
|
{
|
||||||
return evas_common_font_query_last_up_to_pos(font, text, text_props, x, y);
|
return evas_common_font_query_last_up_to_pos(font, text_props, x, y);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
|
@ -561,10 +561,10 @@ eng_font_max_descent_get(void *data __UNUSED__, void *font)
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
eng_font_string_size_get(void *data __UNUSED__, void *font, const Eina_Unicode *text, const Evas_Text_Props *text_props,
|
eng_font_string_size_get(void *data __UNUSED__, void *font, const Evas_Text_Props *text_props,
|
||||||
int *w, int *h)
|
int *w, int *h)
|
||||||
{
|
{
|
||||||
evas_common_font_query_size(font, text, text_props, w, h);
|
evas_common_font_query_size(font, text_props, w, h);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
|
@ -580,39 +580,35 @@ eng_font_right_inset_get(void *data __UNUSED__, void *font, const Evas_Text_Prop
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
eng_font_h_advance_get(void *data __UNUSED__, void *font, const Eina_Unicode *text, const Evas_Text_Props *text_props)
|
eng_font_h_advance_get(void *data __UNUSED__, void *font, const Evas_Text_Props *text_props)
|
||||||
{
|
{
|
||||||
int h, v;
|
int h, v;
|
||||||
|
|
||||||
evas_common_font_query_advance(font, text, text_props, &h, &v);
|
evas_common_font_query_advance(font, text_props, &h, &v);
|
||||||
return h;
|
return h;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
eng_font_v_advance_get(void *data __UNUSED__, void *font, const Eina_Unicode *text, const Evas_Text_Props *text_props)
|
eng_font_v_advance_get(void *data __UNUSED__, void *font, const Evas_Text_Props *text_props)
|
||||||
{
|
{
|
||||||
int h, v;
|
int h, v;
|
||||||
|
|
||||||
evas_common_font_query_advance(font, text, text_props, &h, &v);
|
evas_common_font_query_advance(font, text_props, &h, &v);
|
||||||
return v;
|
return v;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
eng_font_pen_coords_get(void *data __UNUSED__, void *font, const Eina_Unicode *text, const Evas_Text_Props *text_props,
|
eng_font_pen_coords_get(void *data __UNUSED__, void *fontt, const Evas_Text_Props *text_props,
|
||||||
int pos, int *cpen, int *cy, int *cadv, int *ch)
|
int pos, int *cpen, int *cy, int *cadv, int *ch)
|
||||||
{
|
{
|
||||||
return evas_common_font_query_pen_coords(font, text, text_props, pos, cpen, cy, cadv, ch);
|
return evas_common_font_query_pen_coords(font, text_props, pos, cpen, cy, cadv, ch);
|
||||||
}
|
}
|
||||||
|
|
||||||
static Eina_Bool
|
static Eina_Bool
|
||||||
eng_font_text_props_info_create(void *data __UNUSED__, void *font, Eina_Unicode *text, Evas_Text_Props *text_props, const Evas_BiDi_Paragraph_Props *par_props, size_t pos, size_t len)
|
eng_font_text_props_info_create(void *data __UNUSED__, void *font, Eina_Unicode *text, Evas_Text_Props *text_props, const Evas_BiDi_Paragraph_Props *par_props, size_t pos, size_t len)
|
||||||
{
|
{
|
||||||
(void) font;
|
|
||||||
(void) text;
|
|
||||||
(void) text_props;
|
|
||||||
(void) par_props;
|
(void) par_props;
|
||||||
(void) pos;
|
(void) pos;
|
||||||
(void) len;
|
|
||||||
#if !defined(OT_SUPPORT) && defined(BIDI_SUPPORT)
|
#if !defined(OT_SUPPORT) && defined(BIDI_SUPPORT)
|
||||||
evas_bidi_shape_string(text, par_props, pos, len);
|
evas_bidi_shape_string(text, par_props, pos, len);
|
||||||
#endif
|
#endif
|
||||||
|
@ -620,24 +616,24 @@ eng_font_text_props_info_create(void *data __UNUSED__, void *font, Eina_Unicode
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
eng_font_char_coords_get(void *data __UNUSED__, void *font, const Eina_Unicode *text, const Evas_Text_Props *text_props,
|
eng_font_char_coords_get(void *data __UNUSED__, void *font, const Evas_Text_Props *text_props,
|
||||||
int pos, int *cx, int *cy, int *cw, int *ch)
|
int pos, int *cx, int *cy, int *cw, int *ch)
|
||||||
{
|
{
|
||||||
return evas_common_font_query_char_coords(font, text, text_props, pos, cx, cy, cw, ch);
|
return evas_common_font_query_char_coords(font, text_props, pos, cx, cy, cw, ch);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
eng_font_char_at_coords_get(void *data __UNUSED__, void *font, const Eina_Unicode *text, const Evas_Text_Props *text_props,
|
eng_font_char_at_coords_get(void *data __UNUSED__, void *font, const Evas_Text_Props *text_props,
|
||||||
int x, int y, int *cx, int *cy, int *cw, int *ch)
|
int x, int y, int *cx, int *cy, int *cw, int *ch)
|
||||||
{
|
{
|
||||||
return evas_common_font_query_char_at_coords(font, text, text_props, x, y, cx, cy, cw, ch);
|
return evas_common_font_query_char_at_coords(font, text_props, x, y, cx, cy, cw, ch);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
eng_font_last_up_to_pos(void *data __UNUSED__, void *font, const Eina_Unicode *text, const Evas_Text_Props *text_props,
|
eng_font_last_up_to_pos(void *data __UNUSED__, void *font, const Evas_Text_Props *text_props,
|
||||||
int x, int y)
|
int x, int y)
|
||||||
{
|
{
|
||||||
return evas_common_font_query_last_up_to_pos(font, text, text_props, x, y);
|
return evas_common_font_query_last_up_to_pos(font, text_props, x, y);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
|
@ -727,9 +727,9 @@ eng_font_max_descent_get(void *data __UNUSED__, void *font)
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
eng_font_string_size_get(void *data __UNUSED__, void *font, const Eina_Unicode *text, const Evas_Text_Props *text_props, int *w, int *h)
|
eng_font_string_size_get(void *data __UNUSED__, void *font, const Evas_Text_Props *text_props, int *w, int *h)
|
||||||
{
|
{
|
||||||
evas_common_font_query_size(font, text, text_props, w, h);
|
evas_common_font_query_size(font, text_props, w, h);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
|
@ -745,27 +745,27 @@ eng_font_right_inset_get(void *data __UNUSED__, void *font, const Evas_Text_Prop
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
eng_font_h_advance_get(void *data __UNUSED__, void *font, const Eina_Unicode *text, const Evas_Text_Props *text_props)
|
eng_font_h_advance_get(void *data __UNUSED__, void *font, const Evas_Text_Props *text_props)
|
||||||
{
|
{
|
||||||
int h, v;
|
int h, v;
|
||||||
|
|
||||||
evas_common_font_query_advance(font, text, text_props, &h, &v);
|
evas_common_font_query_advance(font, text_props, &h, &v);
|
||||||
return h;
|
return h;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
eng_font_v_advance_get(void *data __UNUSED__, void *font, const Eina_Unicode *text, const Evas_Text_Props *text_props)
|
eng_font_v_advance_get(void *data __UNUSED__, void *font, const Evas_Text_Props *text_props)
|
||||||
{
|
{
|
||||||
int h, v;
|
int h, v;
|
||||||
|
|
||||||
evas_common_font_query_advance(font, text, text_props, &h, &v);
|
evas_common_font_query_advance(font, text_props, &h, &v);
|
||||||
return v;
|
return v;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
eng_font_pen_coords_get(void *data __UNUSED__, void *font, const Eina_Unicode *text, const Evas_Text_Props *text_props, int pos, int *cpen_x, int *cy, int *cadv, int *ch)
|
eng_font_pen_coords_get(void *data __UNUSED__, void *font, const Evas_Text_Props *text_props, int pos, int *cpen_x, int *cy, int *cadv, int *ch)
|
||||||
{
|
{
|
||||||
return evas_common_font_query_pen_coords(font, text, text_props, pos, cpen_x, cy, cadv, ch);
|
return evas_common_font_query_pen_coords(font, text_props, pos, cpen_x, cy, cadv, ch);
|
||||||
}
|
}
|
||||||
|
|
||||||
static Eina_Bool
|
static Eina_Bool
|
||||||
|
@ -784,21 +784,21 @@ eng_font_text_props_info_create(void *data __UNUSED__, void *font, Eina_Unicode
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
eng_font_char_coords_get(void *data __UNUSED__, void *font, const Eina_Unicode *text, const Evas_Text_Props *text_props, int pos, int *cx, int *cy, int *cw, int *ch)
|
eng_font_char_coords_get(void *data __UNUSED__, void *font, const Evas_Text_Props *text_props, int pos, int *cx, int *cy, int *cw, int *ch)
|
||||||
{
|
{
|
||||||
return evas_common_font_query_char_coords(font, text, text_props, pos, cx, cy, cw, ch);
|
return evas_common_font_query_char_coords(font, text_props, pos, cx, cy, cw, ch);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
eng_font_char_at_coords_get(void *data __UNUSED__, void *font, const Eina_Unicode *text, const Evas_Text_Props *text_props, int x, int y, int *cx, int *cy, int *cw, int *ch)
|
eng_font_char_at_coords_get(void *data __UNUSED__, void *font, const Evas_Text_Props *text_props, int x, int y, int *cx, int *cy, int *cw, int *ch)
|
||||||
{
|
{
|
||||||
return evas_common_font_query_char_at_coords(font, text, text_props, x, y, cx, cy, cw, ch);
|
return evas_common_font_query_char_at_coords(font, text_props, x, y, cx, cy, cw, ch);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
eng_font_last_up_to_pos(void *data __UNUSED__, void *font, const Eina_Unicode *text, const Evas_Text_Props *text_props, int x, int y)
|
eng_font_last_up_to_pos(void *data __UNUSED__, void *font, const Evas_Text_Props *text_props, int x, int y)
|
||||||
{
|
{
|
||||||
return evas_common_font_query_last_up_to_pos(font, text, text_props, x, y);
|
return evas_common_font_query_last_up_to_pos(font, text_props, x, y);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
Loading…
Reference in New Issue