enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

Make evas build again (here at least). 

Added missing unicode & bidi opts to necessary places.
Fixes lots of compiler warnings.

NB - Not all engines tested. If you spot a problem wrt any specific
engine, please report it.



SVN revision: 50601
This commit is contained in:
Christopher Michael 2010-07-28 17:57:18 +00:00
parent 713354b764
commit 28a5e44f7d
5 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
legacy/evas/src/lib/engines/common/evas_pipe.c
View File

@ -1411,7 +1411,7 @@ evas_common_pipe_text_draw_do(RGBA_Image *dst, RGBA_Pipe_Op *op, RGBA_Pipe_Threa
EAPI void
evas_common_pipe_text_draw(RGBA_Image *dst, RGBA_Draw_Context *dc,
RGBA_Font *fn, int x, int y, const char *text, const Evas_BiDi_Props *intl_props)
RGBA_Font *fn, int x, int y, const Eina_Unicode *text, const Evas_BiDi_Props *intl_props)
{
RGBA_Pipe_Op *op;
@ -1420,7 +1420,7 @@ evas_common_pipe_text_draw(RGBA_Image *dst, RGBA_Draw_Context *dc,
if (!dst->cache_entry.pipe) return;
op->op.text.x = x;
op->op.text.y = y;
op->op.text.text = strdup(text);
op->op.text.text = eina_unicode_strdup(text);
op->op.text.intl_props = intl_props;
#ifdef EVAS_FRAME_QUEUING
LKL(fn->ref_fq_add);

2
legacy/evas/src/lib/engines/common/evas_pipe.h
View File

@ -89,7 +89,7 @@ EAPI void evas_common_pipe_line_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, int
EAPI void evas_common_pipe_poly_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Polygon_Point *points, int x, int y);
EAPI void evas_common_pipe_grad_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, int w, int h, RGBA_Gradient *gr);
EAPI void evas_common_pipe_grad2_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, int w, int h, RGBA_Gradient2 *gr);
EAPI void evas_common_pipe_text_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Font *fn, int x, int y, const char *text, const Evas_BiDi_Props *intl_props);
EAPI void evas_common_pipe_text_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Font *fn, int x, int y, const Eina_Unicode *text, const Evas_BiDi_Props *intl_props);
EAPI void evas_common_pipe_image_load(RGBA_Image *im);
EAPI void evas_common_pipe_image_draw(RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, int smooth, int src_region_x, int src_region_y, int src_region_w, int src_region_h, int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h);
EAPI void evas_common_pipe_map4_draw(RGBA_Image *src, RGBA_Image *dst,

2
legacy/evas/src/lib/include/evas_common.h
View File

@ -702,7 +702,7 @@ struct _RGBA_Pipe_Op
RGBA_Font *font;
int x, y;
Eina_Unicode *text;
Evas_BiDi_Props *intl_props;
const Evas_BiDi_Props *intl_props;
} text;
struct {
RGBA_Image *src;

4
legacy/evas/src/lib/include/evas_common_soft8.h
View File

@ -1,5 +1,5 @@
#ifndef EVAS_COMMON_SOFT16_H
#define EVAS_COMMON_SOFT16_H
#ifndef EVAS_COMMON_SOFT8_H
#define EVAS_COMMON_SOFT8_H
#include "evas_common.h"
#include "evas_private.h"

30
legacy/evas/src/modules/engines/software_8/evas_engine.c
View File

@ -876,60 +876,60 @@ eng_font_max_descent_get(void *data __UNUSED__, void *font)
}
static void
eng_font_string_size_get(void *data __UNUSED__, void *font, const char *text,
eng_font_string_size_get(void *data __UNUSED__, void *font, const Eina_Unicode *text, const Evas_BiDi_Props *intl_props,
int *w, int *h)
{
evas_common_font_query_size(font, text, w, h);
evas_common_font_query_size(font, text, intl_props, w, h);
}
static int
eng_font_inset_get(void *data __UNUSED__, void *font, const char *text)
eng_font_inset_get(void *data __UNUSED__, void *font, const Eina_Unicode *text)
{
return evas_common_font_query_inset(font, text);
}
static int
eng_font_h_advance_get(void *data __UNUSED__, void *font, const char *text)
eng_font_h_advance_get(void *data __UNUSED__, void *font, const Eina_Unicode *text, const Evas_BiDi_Props *intl_props)
{
int h, v;
evas_common_font_query_advance(font, text, &h, &v);
evas_common_font_query_advance(font, text, intl_props, &h, &v);
return h;
}
static int
eng_font_v_advance_get(void *data __UNUSED__, void *font, const char *text)
eng_font_v_advance_get(void *data __UNUSED__, void *font, const Eina_Unicode *text, const Evas_BiDi_Props *intl_props)
{
int h, v;
evas_common_font_query_advance(font, text, &h, &v);
evas_common_font_query_advance(font, text, intl_props, &h, &v);
return v;
}
static int
eng_font_char_coords_get(void *data __UNUSED__, void *font, const char *text,
eng_font_char_coords_get(void *data __UNUSED__, void *font, const Eina_Unicode *text, const Evas_BiDi_Props *intl_props,
int pos, int *cx, int *cy, int *cw, int *ch)
{
return evas_common_font_query_char_coords(font, text, pos, cx, cy, cw, ch);
return evas_common_font_query_char_coords(font, text, intl_props, pos, cx, cy, cw, ch);
}
static int
eng_font_char_at_coords_get(void *data __UNUSED__, void *font, const char *text,
eng_font_char_at_coords_get(void *data __UNUSED__, void *font, const Eina_Unicode *text, const Evas_BiDi_Props *intl_props,
int x, int y, int *cx, int *cy, int *cw, int *ch)
{
return evas_common_font_query_text_at_pos(font, text, x, y, cx, cy, cw, ch);
return evas_common_font_query_char_at_coords(font, text, intl_props, x, y, cx, cy, cw, ch);
}
static int
eng_font_last_up_to_pos(void *data __UNUSED__, void *font, const char *text,
eng_font_last_up_to_pos(void *data __UNUSED__, void *font, const Eina_Unicode *text, const Evas_BiDi_Props *intl_props,
int x, int y)
{
return evas_common_font_query_last_up_to_pos(font, text, x, y);
return evas_common_font_query_last_up_to_pos(font, text, intl_props, x, y);
}
static void
eng_font_draw(void *data __UNUSED__, void *context, void *surface, void *font,
int x, int y, int w, int h, int ow, int oh, const char *text)
int x, int y, int w, int h, int ow, int oh, const Eina_Unicode *text, const Evas_BiDi_Props *intl_props)
{
static RGBA_Image *im = NULL;
Soft8_Image *dst = surface;
@ -942,7 +942,7 @@ eng_font_draw(void *data __UNUSED__, void *context, void *surface, void *font,
evas_common_draw_context_font_ext_set(context, surface, soft8_font_glyph_new,
soft8_font_glyph_free,
soft8_font_glyph_draw);
evas_common_font_draw(im, context, font, x, y, text);
evas_common_font_draw(im, context, font, x, y, text, intl_props);
evas_common_draw_context_font_ext_set(context, NULL, NULL, NULL, NULL);
}