Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/modules/engines/fb
Modified Files:
evas_engine.c
Log Message:
make hinting an engine api thnig - engine apis need to be mroe easily updated
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/modules/engines/fb/evas_engine.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- evas_engine.c 15 Jan 2006 06:21:04 -0000 1.2
+++ evas_engine.c 28 Feb 2006 04:07:48 -0000 1.3
@@ -3,87 +3,90 @@
#include "evas_engine.h"
#include "Evas_Engine_FB.h"
-static void *evas_engine_fb_info(Evas *e);
-static void evas_engine_fb_info_free(Evas *e, void *info);
-static void evas_engine_fb_setup(Evas *e, void *info);
-static void *evas_engine_fb_output_setup(int w, int h, int rot, int vt, int
dev, int refresh);
-static void evas_engine_fb_output_free(void *data);
-static void evas_engine_fb_output_resize(void *data, int w, int h);
-static void evas_engine_fb_output_tile_size_set(void *data, int w, int h);
-static void evas_engine_fb_output_redraws_rect_add(void *data, int x, int y,
int w, int h);
-static void evas_engine_fb_output_redraws_rect_del(void *data, int x, int y,
int w, int h);
-static void evas_engine_fb_output_redraws_clear(void *data);
-static void *evas_engine_fb_output_redraws_next_update_get(void *data, int *x,
int *y, int *w, int *h, int *cx, int *cy, int *cw, int *ch);
-static void evas_engine_fb_output_redraws_next_update_push(void *data, void
*surface, int x, int y, int w, int h);
-static void evas_engine_fb_output_flush(void *data);
-static void *evas_engine_fb_context_new(void *data);
-static void evas_engine_fb_context_free(void *data, void *context);
-static void evas_engine_fb_context_clip_set(void *data, void *context, int x,
int y, int w, int h);
-static void evas_engine_fb_context_clip_clip(void *data, void *context, int x,
int y, int w, int h);
-static void evas_engine_fb_context_clip_unset(void *data, void *context);
-static int evas_engine_fb_context_clip_get(void *data, void *context, int *x,
int *y, int *w, int *h);
-static void evas_engine_fb_context_color_set(void *data, void *context, int r,
int g, int b, int a);
-static int evas_engine_fb_context_color_get(void *data, void *context, int *r,
int *g, int *b, int *a);
-static void evas_engine_fb_context_multiplier_set(void *data, void *context,
int r, int g, int b, int a);
-static void evas_engine_fb_context_multiplier_unset(void *data, void *context);
-static int evas_engine_fb_context_multiplier_get(void *data, void *context,
int *r, int *g, int *b, int *a);
-static void evas_engine_fb_context_cutout_add(void *data, void *context, int
x, int y, int w, int h);
-static void evas_engine_fb_context_cutout_clear(void *data, void *context);
-static void evas_engine_fb_context_anti_alias_set(void *data, void *context,
unsigned char aa);
-static unsigned char evas_engine_fb_context_anti_alias_get(void *data, void
*context);
-static void evas_engine_fb_context_color_interpolation_set(void *data, void
*context, int color_space);
-static int evas_engine_fb_context_color_interpolation_get(void *data, void
*context);
-static void evas_engine_fb_rectangle_draw(void *data, void *context, void
*surface, int x, int y, int w, int h);
-static void evas_engine_fb_line_draw(void *data, void *context, void *surface,
int x1, int y1, int x2, int y2);
-static void *evas_engine_fb_polygon_point_add(void *data, void *context, void
*polygon, int x, int y);
-static void *evas_engine_fb_polygon_points_clear(void *data, void *context,
void *polygon);
-static void evas_engine_fb_polygon_draw(void *data, void *context, void
*surface, void *polygon);
-static void *evas_engine_fb_gradient_color_add(void *data, void *context, void
*gradient, int r, int g, int b, int a, int distance);
-static void *evas_engine_fb_gradient_colors_clear(void *data, void *context,
void *gradient);
-static void evas_engine_fb_gradient_free(void *data, void *gradient);
-static void evas_engine_fb_gradient_fill_set(void *data, void *gradient, int
x, int y, int w, int h);
-static void evas_engine_fb_gradient_type_set(void *data, void *gradient, char
*name);
-static void evas_engine_fb_gradient_type_params_set(void *data, void
*gradient, char *params);
-static void *evas_engine_fb_gradient_geometry_init(void *data, void *gradient,
int spread);
-static int evas_engine_fb_gradient_alpha_get(void *data, void *gradient, int
spread);
-static void evas_engine_fb_gradient_map(void *data, void *context, void
*gradient, int spread);
-static void evas_engine_fb_gradient_draw(void *data, void *context, void
*surface, void *gradient, int x, int y, int w, int h, double angle, int spread);
-static void *evas_engine_fb_image_load(void *data, char *file, char *key, int
*error);
-static void *evas_engine_fb_image_new_from_data(void *data, int w, int h,
DATA32 *image_data);
-static void *evas_engine_fb_image_new_from_copied_data(void *data, int w, int
h, DATA32 *image_data);
-static void evas_engine_fb_image_free(void *data, void *image);
-static void evas_engine_fb_image_size_get(void *data, void *image, int *w, int
*h);
-static void *evas_engine_fb_image_size_set(void *data, void *image, int w, int
h);
-static void *evas_engine_fb_image_dirty_region(void *data, void *image, int x,
int y, int w, int h);
-static void *evas_engine_fb_image_data_get(void *data, void *image, int
to_write, DATA32 **image_data);
-static void *evas_engine_fb_image_data_put(void *data, void *image, DATA32
*image_data);
-static void *evas_engine_fb_image_alpha_set(void *data, void *image, int
has_alpha);
-static int evas_engine_fb_image_alpha_get(void *data, void *image);
-static void evas_engine_fb_image_draw(void *data, void *context, void
*surface, void *image, int src_x, int src_y, int src_w, int src_h, int dst_x,
int dst_y, int dst_w, int dst_h, int smooth);
-static char *evas_engine_fb_image_comment_get(void *data, void *image, char
*key);
-static char *evas_engine_fb_image_format_get(void *data, void *image);
-static void evas_engine_fb_image_cache_flush(void *data);
-static void evas_engine_fb_image_cache_set(void *data, int bytes);
-static int evas_engine_fb_image_cache_get(void *data);
-static void *evas_engine_fb_font_load(void *data, char *name, int size);
-static void *evas_engine_fb_font_memory_load(void *data, char *name, int size,
const void *fdata, int fdata_size);
-static void *evas_engine_fb_font_add(void *data, void *font, char *name, int
size);
-static void *evas_engine_fb_font_memory_add(void *data, void *font, char
*name, int size, const void *fdata, int fdata_size);
-static void evas_engine_fb_font_free(void *data, void *font);
-static int evas_engine_fb_font_ascent_get(void *data, void *font);
-static int evas_engine_fb_font_descent_get(void *data, void *font);
-static int evas_engine_fb_font_max_ascent_get(void *data, void *font);
-static int evas_engine_fb_font_max_descent_get(void *data, void *font);
-static void evas_engine_fb_font_string_size_get(void *data, void *font, char
*text, int *w, int *h);
-static int evas_engine_fb_font_inset_get(void *data, void *font, char *text);
-static int evas_engine_fb_font_h_advance_get(void *data, void *font, char
*text);
-static int evas_engine_fb_font_v_advance_get(void *data, void *font, char
*text);
-static int evas_engine_fb_font_char_coords_get(void *data, void *font, char
*text, int pos, int *cx, int *cy, int *cw, int *ch);
-static int evas_engine_fb_font_char_at_coords_get(void *data, void *font, char
*text, int x, int y, int *cx, int *cy, int *cw, int *ch);
-static void evas_engine_fb_font_draw(void *data, void *context, void *surface,
void *font, int x, int y, int w, int h, int ow, int oh, char *text);
-static void evas_engine_fb_font_cache_flush(void *data);
-static void evas_engine_fb_font_cache_set(void *data, int bytes);
-static int evas_engine_fb_font_cache_get(void *data);
+static void *eng_info(Evas *e);
+static void eng_info_free(Evas *e, void *info);
+static void eng_setup(Evas *e, void *info);
+static void *eng_output_setup(int w, int h, int rot, int vt, int dev, int
refresh);
+static void eng_output_free(void *data);
+static void eng_output_resize(void *data, int w, int h);
+static void eng_output_tile_size_set(void *data, int w, int h);
+static void eng_output_redraws_rect_add(void *data, int x, int y, int w, int
h);
+static void eng_output_redraws_rect_del(void *data, int x, int y, int w, int
h);
+static void eng_output_redraws_clear(void *data);
+static void *eng_output_redraws_next_update_get(void *data, int *x, int *y,
int *w, int *h, int *cx, int *cy, int *cw, int *ch);
+static void eng_output_redraws_next_update_push(void *data, void *surface, int
x, int y, int w, int h);
+static void eng_output_flush(void *data);
+static void *eng_context_new(void *data);
+static void eng_context_free(void *data, void *context);
+static void eng_context_clip_set(void *data, void *context, int x, int y, int
w, int h);
+static void eng_context_clip_clip(void *data, void *context, int x, int y, int
w, int h);
+static void eng_context_clip_unset(void *data, void *context);
+static int eng_context_clip_get(void *data, void *context, int *x, int *y, int
*w, int *h);
+static void eng_context_color_set(void *data, void *context, int r, int g, int
b, int a);
+static int eng_context_color_get(void *data, void *context, int *r, int *g,
int *b, int *a);
+static void eng_context_multiplier_set(void *data, void *context, int r, int
g, int b, int a);
+static void eng_context_multiplier_unset(void *data, void *context);
+static int eng_context_multiplier_get(void *data, void *context, int *r, int
*g, int *b, int *a);
+static void eng_context_cutout_add(void *data, void *context, int x, int y,
int w, int h);
+static void eng_context_cutout_clear(void *data, void *context);
+static void eng_context_anti_alias_set(void *data, void *context, unsigned
char aa);
+static unsigned char eng_context_anti_alias_get(void *data, void *context);
+static void eng_context_color_interpolation_set(void *data, void *context, int
color_space);
+static int eng_context_color_interpolation_get(void *data, void *context);
+static void eng_rectangle_draw(void *data, void *context, void *surface, int
x, int y, int w, int h);
+static void eng_line_draw(void *data, void *context, void *surface, int x1,
int y1, int x2, int y2);
+static void *eng_polygon_point_add(void *data, void *context, void *polygon,
int x, int y);
+static void *eng_polygon_points_clear(void *data, void *context, void
*polygon);
+static void eng_polygon_draw(void *data, void *context, void *surface, void
*polygon);
+static void *eng_gradient_color_add(void *data, void *context, void *gradient,
int r, int g, int b, int a, int distance);
+static void *eng_gradient_colors_clear(void *data, void *context, void
*gradient);
+static void eng_gradient_free(void *data, void *gradient);
+static void eng_gradient_fill_set(void *data, void *gradient, int x, int y,
int w, int h);
+static void eng_gradient_type_set(void *data, void *gradient, char *name);
+static void eng_gradient_type_params_set(void *data, void *gradient, char
*params);
+static void *eng_gradient_geometry_init(void *data, void *gradient, int
spread);
+static int eng_gradient_alpha_get(void *data, void *gradient, int spread);
+static void eng_gradient_map(void *data, void *context, void *gradient, int
spread);
+static void eng_gradient_draw(void *data, void *context, void *surface, void
*gradient, int x, int y, int w, int h, double angle, int spread);
+static void *eng_image_load(void *data, char *file, char *key, int *error);
+static void *eng_image_new_from_data(void *data, int w, int h, DATA32
*image_data);
+static void *eng_image_new_from_copied_data(void *data, int w, int h, DATA32
*image_data);
+static void eng_image_free(void *data, void *image);
+static void eng_image_size_get(void *data, void *image, int *w, int *h);
+static void *eng_image_size_set(void *data, void *image, int w, int h);
+static void *eng_image_dirty_region(void *data, void *image, int x, int y, int
w, int h);
+static void *eng_image_data_get(void *data, void *image, int to_write, DATA32
**image_data);
+static void *eng_image_data_put(void *data, void *image, DATA32 *image_data);
+static void *eng_image_alpha_set(void *data, void *image, int has_alpha);
+static int eng_image_alpha_get(void *data, void *image);
+static void eng_image_draw(void *data, void *context, void *surface, void
*image, int src_x, int src_y, int src_w, int src_h, int dst_x, int dst_y, int
dst_w, int dst_h, int smooth);
+static char *eng_image_comment_get(void *data, void *image, char *key);
+static char *eng_image_format_get(void *data, void *image);
+static void eng_image_cache_flush(void *data);
+static void eng_image_cache_set(void *data, int bytes);
+static int eng_image_cache_get(void *data);
+static void *eng_font_load(void *data, char *name, int size);
+static void *eng_font_memory_load(void *data, char *name, int size, const void
*fdata, int fdata_size);
+static void *eng_font_add(void *data, void *font, char *name, int size);
+static void *eng_font_memory_add(void *data, void *font, char *name, int size,
const void *fdata, int fdata_size);
+static void eng_font_free(void *data, void *font);
+static int eng_font_ascent_get(void *data, void *font);
+static int eng_font_descent_get(void *data, void *font);
+static int eng_font_max_ascent_get(void *data, void *font);
+static int eng_font_max_descent_get(void *data, void *font);
+static void eng_font_string_size_get(void *data, void *font, char *text, int
*w, int *h);
+static int eng_font_inset_get(void *data, void *font, char *text);
+static int eng_font_h_advance_get(void *data, void *font, char *text);
+static int eng_font_v_advance_get(void *data, void *font, char *text);
+static int eng_font_char_coords_get(void *data, void *font, char *text, int
pos, int *cx, int *cy, int *cw, int *ch);
+static int eng_font_char_at_coords_get(void *data, void *font, char *text, int
x, int y, int *cx, int *cy, int *cw, int *ch);
+static void eng_font_draw(void *data, void *context, void *surface, void
*font, int x, int y, int w, int h, int ow, int oh, char *text);
+static void eng_font_cache_flush(void *data);
+static void eng_font_cache_set(void *data, int bytes);
+static int eng_font_cache_get(void *data);
+
+static void eng_font_hinting_set(void *data, void *font, int hinting);
+static int eng_font_hinting_can_hint(void *data, int hinting);
typedef struct _Render_Engine Render_Engine;
@@ -96,101 +99,104 @@
int end : 1;
};
-Evas_Func evas_engine_fb_func =
+static Evas_Func eng_func =
{
- evas_engine_fb_info,
- evas_engine_fb_info_free,
- evas_engine_fb_setup,
- evas_engine_fb_output_free,
- evas_engine_fb_output_resize,
- evas_engine_fb_output_tile_size_set,
- evas_engine_fb_output_redraws_rect_add,
- evas_engine_fb_output_redraws_rect_del,
- evas_engine_fb_output_redraws_clear,
- evas_engine_fb_output_redraws_next_update_get,
- evas_engine_fb_output_redraws_next_update_push,
- evas_engine_fb_output_flush,
+ eng_info,
+ eng_info_free,
+ eng_setup,
+ eng_output_free,
+ eng_output_resize,
+ eng_output_tile_size_set,
+ eng_output_redraws_rect_add,
+ eng_output_redraws_rect_del,
+ eng_output_redraws_clear,
+ eng_output_redraws_next_update_get,
+ eng_output_redraws_next_update_push,
+ eng_output_flush,
/* draw context virtual methods */
- evas_engine_fb_context_new,
- evas_engine_fb_context_free,
- evas_engine_fb_context_clip_set,
- evas_engine_fb_context_clip_clip,
- evas_engine_fb_context_clip_unset,
- evas_engine_fb_context_clip_get,
- evas_engine_fb_context_color_set,
- evas_engine_fb_context_color_get,
- evas_engine_fb_context_multiplier_set,
- evas_engine_fb_context_multiplier_unset,
- evas_engine_fb_context_multiplier_get,
- evas_engine_fb_context_cutout_add,
- evas_engine_fb_context_cutout_clear,
- evas_engine_fb_context_anti_alias_set,
- evas_engine_fb_context_anti_alias_get,
- evas_engine_fb_context_color_interpolation_set,
- evas_engine_fb_context_color_interpolation_get,
+ eng_context_new,
+ eng_context_free,
+ eng_context_clip_set,
+ eng_context_clip_clip,
+ eng_context_clip_unset,
+ eng_context_clip_get,
+ eng_context_color_set,
+ eng_context_color_get,
+ eng_context_multiplier_set,
+ eng_context_multiplier_unset,
+ eng_context_multiplier_get,
+ eng_context_cutout_add,
+ eng_context_cutout_clear,
+ eng_context_anti_alias_set,
+ eng_context_anti_alias_get,
+ eng_context_color_interpolation_set,
+ eng_context_color_interpolation_get,
/* rectangle draw funcs */
- evas_engine_fb_rectangle_draw,
+ eng_rectangle_draw,
/* line draw funcs */
- evas_engine_fb_line_draw,
+ eng_line_draw,
/* polygon draw funcs */
- evas_engine_fb_polygon_point_add,
- evas_engine_fb_polygon_points_clear,
- evas_engine_fb_polygon_draw,
+ eng_polygon_point_add,
+ eng_polygon_points_clear,
+ eng_polygon_draw,
/* gradient draw funcs */
- evas_engine_fb_gradient_color_add,
- evas_engine_fb_gradient_colors_clear,
- evas_engine_fb_gradient_free,
- evas_engine_fb_gradient_fill_set,
- evas_engine_fb_gradient_type_set,
- evas_engine_fb_gradient_type_params_set,
- evas_engine_fb_gradient_geometry_init,
- evas_engine_fb_gradient_alpha_get,
- evas_engine_fb_gradient_map,
- evas_engine_fb_gradient_draw,
+ eng_gradient_color_add,
+ eng_gradient_colors_clear,
+ eng_gradient_free,
+ eng_gradient_fill_set,
+ eng_gradient_type_set,
+ eng_gradient_type_params_set,
+ eng_gradient_geometry_init,
+ eng_gradient_alpha_get,
+ eng_gradient_map,
+ eng_gradient_draw,
/* image draw funcs */
- evas_engine_fb_image_load,
- evas_engine_fb_image_new_from_data,
- evas_engine_fb_image_new_from_copied_data,
- evas_engine_fb_image_free,
- evas_engine_fb_image_size_get,
- evas_engine_fb_image_size_set,
- evas_engine_fb_image_dirty_region,
- evas_engine_fb_image_data_get,
- evas_engine_fb_image_data_put,
- evas_engine_fb_image_alpha_set,
- evas_engine_fb_image_alpha_get,
- evas_engine_fb_image_draw,
- evas_engine_fb_image_comment_get,
- evas_engine_fb_image_format_get,
+ eng_image_load,
+ eng_image_new_from_data,
+ eng_image_new_from_copied_data,
+ eng_image_free,
+ eng_image_size_get,
+ eng_image_size_set,
+ eng_image_dirty_region,
+ eng_image_data_get,
+ eng_image_data_put,
+ eng_image_alpha_set,
+ eng_image_alpha_get,
+ eng_image_draw,
+ eng_image_comment_get,
+ eng_image_format_get,
/* image cache funcs */
- evas_engine_fb_image_cache_flush,
- evas_engine_fb_image_cache_set,
- evas_engine_fb_image_cache_get,
+ eng_image_cache_flush,
+ eng_image_cache_set,
+ eng_image_cache_get,
/* font draw functions */
- evas_engine_fb_font_load,
- evas_engine_fb_font_memory_load,
- evas_engine_fb_font_add,
- evas_engine_fb_font_memory_add,
- evas_engine_fb_font_free,
- evas_engine_fb_font_ascent_get,
- evas_engine_fb_font_descent_get,
- evas_engine_fb_font_max_ascent_get,
- evas_engine_fb_font_max_descent_get,
- evas_engine_fb_font_string_size_get,
- evas_engine_fb_font_inset_get,
- evas_engine_fb_font_h_advance_get,
- evas_engine_fb_font_v_advance_get,
- evas_engine_fb_font_char_coords_get,
- evas_engine_fb_font_char_at_coords_get,
- evas_engine_fb_font_draw,
+ eng_font_load,
+ eng_font_memory_load,
+ eng_font_add,
+ eng_font_memory_add,
+ eng_font_free,
+ eng_font_ascent_get,
+ eng_font_descent_get,
+ eng_font_max_ascent_get,
+ eng_font_max_descent_get,
+ eng_font_string_size_get,
+ eng_font_inset_get,
+ eng_font_h_advance_get,
+ eng_font_v_advance_get,
+ eng_font_char_coords_get,
+ eng_font_char_at_coords_get,
+ eng_font_draw,
/* font cache functions */
- evas_engine_fb_font_cache_flush,
- evas_engine_fb_font_cache_set,
- evas_engine_fb_font_cache_get
+ eng_font_cache_flush,
+ eng_font_cache_set,
+ eng_font_cache_get,
+
+ eng_font_hinting_set,
+ eng_font_hinting_can_hint
};
static void *
-evas_engine_fb_info(Evas *e)
+eng_info(Evas *e)
{
Evas_Engine_Info_FB *info;
@@ -202,7 +208,7 @@
}
static void
-evas_engine_fb_info_free(Evas *e, void *info)
+eng_info_free(Evas *e, void *info)
{
Evas_Engine_Info_FB *in;
@@ -211,13 +217,13 @@
}
static void
-evas_engine_fb_setup(Evas *e, void *in)
+eng_setup(Evas *e, void *in)
{
Render_Engine *re;
Evas_Engine_Info_FB *info;
info = (Evas_Engine_Info_FB *)in;
- re = evas_engine_fb_output_setup(e->output.w,
+ re = eng_output_setup(e->output.w,
e->output.h,
info->info.rotation,
info->info.virtual_terminal,
@@ -229,7 +235,7 @@
}
static void *
-evas_engine_fb_output_setup(int w, int h, int rot, int vt, int dev, int
refresh)
+eng_output_setup(int w, int h, int rot, int vt, int dev, int refresh)
{
Render_Engine *re;
@@ -262,7 +268,7 @@
}
static void
-evas_engine_fb_output_free(void *data)
+eng_output_free(void *data)
{
Render_Engine *re;
@@ -277,7 +283,7 @@
}
static void
-evas_engine_fb_output_resize(void *data, int w, int h)
+eng_output_resize(void *data, int w, int h)
{
Render_Engine *re;
@@ -292,7 +298,7 @@
}
static void
-evas_engine_fb_output_tile_size_set(void *data, int w, int h)
+eng_output_tile_size_set(void *data, int w, int h)
{
Render_Engine *re;
@@ -301,7 +307,7 @@
}
static void
-evas_engine_fb_output_redraws_rect_add(void *data, int x, int y, int w, int h)
+eng_output_redraws_rect_add(void *data, int x, int y, int w, int h)
{
Render_Engine *re;
@@ -310,7 +316,7 @@
}
static void
-evas_engine_fb_output_redraws_rect_del(void *data, int x, int y, int w, int h)
+eng_output_redraws_rect_del(void *data, int x, int y, int w, int h)
{
Render_Engine *re;
@@ -319,7 +325,7 @@
}
static void
-evas_engine_fb_output_redraws_clear(void *data)
+eng_output_redraws_clear(void *data)
{
Render_Engine *re;
@@ -328,7 +334,7 @@
}
static void *
-evas_engine_fb_output_redraws_next_update_get(void *data, int *x, int *y, int
*w, int *h, int *cx, int *cy, int *cw, int *ch)
+eng_output_redraws_next_update_get(void *data, int *x, int *y, int *w, int *h,
int *cx, int *cy, int *cw, int *ch)
{
Render_Engine *re;
RGBA_Image *surface;
@@ -365,7 +371,7 @@
}
static void
-evas_engine_fb_output_redraws_next_update_push(void *data, void *surface, int
x, int y, int w, int h)
+eng_output_redraws_next_update_push(void *data, void *surface, int x, int y,
int w, int h)
{
Render_Engine *re;
@@ -376,7 +382,7 @@
}
static void
-evas_engine_fb_output_flush(void *data)
+eng_output_flush(void *data)
{
Render_Engine *re;
@@ -384,7 +390,7 @@
}
static void *
-evas_engine_fb_context_new(void *data)
+eng_context_new(void *data)
{
Render_Engine *re;
@@ -393,7 +399,7 @@
}
static void
-evas_engine_fb_context_free(void *data, void *context)
+eng_context_free(void *data, void *context)
{
Render_Engine *re;
@@ -402,7 +408,7 @@
}
static void
-evas_engine_fb_context_clip_set(void *data, void *context, int x, int y, int
w, int h)
+eng_context_clip_set(void *data, void *context, int x, int y, int w, int h)
{
Render_Engine *re;
@@ -411,7 +417,7 @@
}
static void
-evas_engine_fb_context_clip_clip(void *data, void *context, int x, int y, int
w, int h)
+eng_context_clip_clip(void *data, void *context, int x, int y, int w, int h)
{
Render_Engine *re;
@@ -420,7 +426,7 @@
}
static void
-evas_engine_fb_context_clip_unset(void *data, void *context)
+eng_context_clip_unset(void *data, void *context)
{
Render_Engine *re;
@@ -429,7 +435,7 @@
}
static int
-evas_engine_fb_context_clip_get(void *data, void *context, int *x, int *y, int
*w, int *h)
+eng_context_clip_get(void *data, void *context, int *x, int *y, int *w, int *h)
{
Render_Engine *re;
@@ -442,7 +448,7 @@
}
static void
-evas_engine_fb_context_color_set(void *data, void *context, int r, int g, int
b, int a)
+eng_context_color_set(void *data, void *context, int r, int g, int b, int a)
{
Render_Engine *re;
@@ -451,7 +457,7 @@
}
static int
-evas_engine_fb_context_color_get(void *data, void *context, int *r, int *g,
int *b, int *a)
+eng_context_color_get(void *data, void *context, int *r, int *g, int *b, int
*a)
{
Render_Engine *re;
@@ -464,7 +470,7 @@
}
static void
-evas_engine_fb_context_multiplier_set(void *data, void *context, int r, int g,
int b, int a)
+eng_context_multiplier_set(void *data, void *context, int r, int g, int b, int
a)
{
Render_Engine *re;
@@ -473,7 +479,7 @@
}
static void
-evas_engine_fb_context_multiplier_unset(void *data, void *context)
+eng_context_multiplier_unset(void *data, void *context)
{
Render_Engine *re;
@@ -482,7 +488,7 @@
}
static int
-evas_engine_fb_context_multiplier_get(void *data, void *context, int *r, int
*g, int *b, int *a)
+eng_context_multiplier_get(void *data, void *context, int *r, int *g, int *b,
int *a)
{
Render_Engine *re;
@@ -495,7 +501,7 @@
}
static void
-evas_engine_fb_context_cutout_add(void *data, void *context, int x, int y, int
w, int h)
+eng_context_cutout_add(void *data, void *context, int x, int y, int w, int h)
{
Render_Engine *re;
@@ -504,7 +510,7 @@
}
static void
-evas_engine_fb_context_cutout_clear(void *data, void *context)
+eng_context_cutout_clear(void *data, void *context)
{
Render_Engine *re;
@@ -513,7 +519,7 @@
}
static void
-evas_engine_fb_context_anti_alias_set(void *data, void *context, unsigned char
aa)
+eng_context_anti_alias_set(void *data, void *context, unsigned char aa)
{
Render_Engine *re;
@@ -522,7 +528,7 @@
}
static unsigned char
-evas_engine_fb_context_anti_alias_get(void *data, void *context)
+eng_context_anti_alias_get(void *data, void *context)
{
Render_Engine *re;
@@ -531,7 +537,7 @@
}
static void
-evas_engine_fb_context_color_interpolation_set(void *data, void *context, int
color_space)
+eng_context_color_interpolation_set(void *data, void *context, int color_space)
{
Render_Engine *re;
@@ -540,7 +546,7 @@
}
static int
-evas_engine_fb_context_color_interpolation_get(void *data, void *context)
+eng_context_color_interpolation_get(void *data, void *context)
{
Render_Engine *re;
@@ -549,7 +555,7 @@
}
static void
-evas_engine_fb_rectangle_draw(void *data, void *context, void *surface, int x,
int y, int w, int h)
+eng_rectangle_draw(void *data, void *context, void *surface, int x, int y, int
w, int h)
{
Render_Engine *re;
@@ -559,7 +565,7 @@
}
static void
-evas_engine_fb_line_draw(void *data, void *context, void *surface, int x1, int
y1, int x2, int y2)
+eng_line_draw(void *data, void *context, void *surface, int x1, int y1, int
x2, int y2)
{
Render_Engine *re;
@@ -569,7 +575,7 @@
}
static void *
-evas_engine_fb_polygon_point_add(void *data, void *context, void *polygon, int
x, int y)
+eng_polygon_point_add(void *data, void *context, void *polygon, int x, int y)
{
Render_Engine *re;
@@ -579,7 +585,7 @@
}
static void *
-evas_engine_fb_polygon_points_clear(void *data, void *context, void *polygon)
+eng_polygon_points_clear(void *data, void *context, void *polygon)
{
Render_Engine *re;
@@ -589,7 +595,7 @@
}
static void
-evas_engine_fb_polygon_draw(void *data, void *context, void *surface, void
*polygon)
+eng_polygon_draw(void *data, void *context, void *surface, void *polygon)
{
Render_Engine *re;
@@ -599,7 +605,7 @@
}
static void *
-evas_engine_fb_gradient_color_add(void *data, void *context, void *gradient,
int r, int g, int b, int a, int distance)
+eng_gradient_color_add(void *data, void *context, void *gradient, int r, int
g, int b, int a, int distance)
{
Render_Engine *re;
@@ -612,7 +618,7 @@
}
static void *
-evas_engine_fb_gradient_colors_clear(void *data, void *context, void *gradient)
+eng_gradient_colors_clear(void *data, void *context, void *gradient)
{
Render_Engine *re;
@@ -623,7 +629,7 @@
}
static void
-evas_engine_fb_gradient_free(void *data, void *gradient)
+eng_gradient_free(void *data, void *gradient)
{
Render_Engine *re;
@@ -632,7 +638,7 @@
}
static void
-evas_engine_fb_gradient_fill_set(void *data, void *gradient, int x, int y, int
w, int h)
+eng_gradient_fill_set(void *data, void *gradient, int x, int y, int w, int h)
{
Render_Engine *re;
@@ -641,7 +647,7 @@
}
static void
-evas_engine_fb_gradient_type_set(void *data, void *gradient, char *name)
+eng_gradient_type_set(void *data, void *gradient, char *name)
{
Render_Engine *re;
@@ -650,7 +656,7 @@
}
static void
-evas_engine_fb_gradient_type_params_set(void *data, void *gradient, char
*params)
+eng_gradient_type_params_set(void *data, void *gradient, char *params)
{
Render_Engine *re;
@@ -659,7 +665,7 @@
}
static void *
-evas_engine_fb_gradient_geometry_init(void *data, void *gradient, int spread)
+eng_gradient_geometry_init(void *data, void *gradient, int spread)
{
Render_Engine *re;
@@ -669,7 +675,7 @@
}
static int
-evas_engine_fb_gradient_alpha_get(void *data, void *gradient, int spread)
+eng_gradient_alpha_get(void *data, void *gradient, int spread)
{
Render_Engine *re;
@@ -678,7 +684,7 @@
}
static void
-evas_engine_fb_gradient_map(void *data, void *context, void *gradient, int
spread)
+eng_gradient_map(void *data, void *context, void *gradient, int spread)
{
Render_Engine *re;
@@ -688,7 +694,7 @@
}
static void
-evas_engine_fb_gradient_draw(void *data, void *context, void *surface, void
*gradient, int x, int y, int w, int h, double angle, int spread)
+eng_gradient_draw(void *data, void *context, void *surface, void *gradient,
int x, int y, int w, int h, double angle, int spread)
{
Render_Engine *re;
@@ -698,7 +704,7 @@
}
static void *
-evas_engine_fb_image_load(void *data, char *file, char *key, int *error)
+eng_image_load(void *data, char *file, char *key, int *error)
{
Render_Engine *re;
@@ -708,7 +714,7 @@
}
static void *
-evas_engine_fb_image_new_from_data(void *data, int w, int h, DATA32
*image_data)
+eng_image_new_from_data(void *data, int w, int h, DATA32 *image_data)
{
Render_Engine *re;
RGBA_Image *im;
@@ -729,7 +735,7 @@
}
static void *
-evas_engine_fb_image_new_from_copied_data(void *data, int w, int h, DATA32
*image_data)
+eng_image_new_from_copied_data(void *data, int w, int h, DATA32 *image_data)
{
Render_Engine *re;
RGBA_Image *im;
@@ -743,7 +749,7 @@
}
static void
-evas_engine_fb_image_free(void *data, void *image)
+eng_image_free(void *data, void *image)
{
Render_Engine *re;
@@ -752,7 +758,7 @@
}
static void
-evas_engine_fb_image_size_get(void *data, void *image, int *w, int *h)
+eng_image_size_get(void *data, void *image, int *w, int *h)
{
Render_Engine *re;
RGBA_Image *im;
@@ -764,7 +770,7 @@
}
static void *
-evas_engine_fb_image_size_set(void *data, void *image, int w, int h)
+eng_image_size_set(void *data, void *image, int w, int h)
{
Render_Engine *re;
RGBA_Image *im, *im_old;
@@ -787,7 +793,7 @@
}
static void *
-evas_engine_fb_image_dirty_region(void *data, void *image, int x, int y, int
w, int h)
+eng_image_dirty_region(void *data, void *image, int x, int y, int w, int h)
{
Render_Engine *re;
@@ -801,7 +807,7 @@
}
static void *
-evas_engine_fb_image_data_get(void *data, void *image, int to_write, DATA32
**image_data)
+eng_image_data_get(void *data, void *image, int to_write, DATA32 **image_data)
{
Render_Engine *re;
RGBA_Image *im;
@@ -830,7 +836,7 @@
}
static void *
-evas_engine_fb_image_data_put(void *data, void *image, DATA32 *image_data)
+eng_image_data_put(void *data, void *image, DATA32 *image_data)
{
Render_Engine *re;
RGBA_Image *im;
@@ -844,7 +850,7 @@
w = im->image->w;
h = im->image->h;
evas_common_image_unref(im);
- return evas_engine_fb_image_new_from_data(data, w, h, image_data);
+ return eng_image_new_from_data(data, w, h, image_data);
}
/* hmmm - but if we wrote... why bother? */
/* evas_common_image_dirty(im); */
@@ -852,7 +858,7 @@
}
static void *
-evas_engine_fb_image_alpha_set(void *data, void *image, int has_alpha)
+eng_image_alpha_set(void *data, void *image, int has_alpha)
{
Render_Engine *re;
RGBA_Image *im;
@@ -882,7 +888,7 @@
static int
-evas_engine_fb_image_alpha_get(void *data, void *image)
+eng_image_alpha_get(void *data, void *image)
{
Render_Engine *re;
RGBA_Image *im;
@@ -894,7 +900,7 @@
}
static void
-evas_engine_fb_image_draw(void *data, void *context, void *surface, void
*image, int src_x, int src_y, int src_w, int src_h, int dst_x, int dst_y, int
dst_w, int dst_h, int smooth)
+eng_image_draw(void *data, void *context, void *surface, void *image, int
src_x, int src_y, int src_w, int src_h, int dst_x, int dst_y, int dst_w, int
dst_h, int smooth)
{
Render_Engine *re;
@@ -912,7 +918,7 @@
}
static char *
-evas_engine_fb_image_comment_get(void *data, void *image, char *key)
+eng_image_comment_get(void *data, void *image, char *key)
{
Render_Engine *re;
RGBA_Image *im;
@@ -924,7 +930,7 @@
}
static char *
-evas_engine_fb_image_format_get(void *data, void *image)
+eng_image_format_get(void *data, void *image)
{
Render_Engine *re;
RGBA_Image *im;
@@ -936,7 +942,7 @@
}
static void
-evas_engine_fb_image_cache_flush(void *data)
+eng_image_cache_flush(void *data)
{
Render_Engine *re;
int tmp_size;
@@ -948,7 +954,7 @@
}
static void
-evas_engine_fb_image_cache_set(void *data, int bytes)
+eng_image_cache_set(void *data, int bytes)
{
Render_Engine *re;
@@ -957,7 +963,7 @@
}
static int
-evas_engine_fb_image_cache_get(void *data)
+eng_image_cache_get(void *data)
{
Render_Engine *re;
@@ -966,7 +972,7 @@
}
static void *
-evas_engine_fb_font_load(void *data, char *name, int size)
+eng_font_load(void *data, char *name, int size)
{
Render_Engine *re;
@@ -975,7 +981,7 @@
}
static void *
-evas_engine_fb_font_memory_load(void *data, char *name, int size, const void
*fdata, int fdata_size)
+eng_font_memory_load(void *data, char *name, int size, const void *fdata, int
fdata_size)
{
Render_Engine *re;
@@ -984,7 +990,7 @@
}
static void *
-evas_engine_fb_font_add(void *data, void *font, char *name, int size)
+eng_font_add(void *data, void *font, char *name, int size)
{
Render_Engine *re;
@@ -993,7 +999,7 @@
}
static void *
-evas_engine_fb_font_memory_add(void *data, void *font, char *name, int size,
const void *fdata, int fdata_size)
+eng_font_memory_add(void *data, void *font, char *name, int size, const void
*fdata, int fdata_size)
{
Render_Engine *re;
@@ -1002,7 +1008,7 @@
}
static void
-evas_engine_fb_font_free(void *data, void *font)
+eng_font_free(void *data, void *font)
{
Render_Engine *re;
@@ -1011,7 +1017,7 @@
}
static int
-evas_engine_fb_font_ascent_get(void *data, void *font)
+eng_font_ascent_get(void *data, void *font)
{
Render_Engine *re;
@@ -1020,7 +1026,7 @@
}
static int
-evas_engine_fb_font_descent_get(void *data, void *font)
+eng_font_descent_get(void *data, void *font)
{
Render_Engine *re;
@@ -1029,7 +1035,7 @@
}
static int
-evas_engine_fb_font_max_ascent_get(void *data, void *font)
+eng_font_max_ascent_get(void *data, void *font)
{
Render_Engine *re;
@@ -1038,7 +1044,7 @@
}
static int
-evas_engine_fb_font_max_descent_get(void *data, void *font)
+eng_font_max_descent_get(void *data, void *font)
{
Render_Engine *re;
@@ -1047,7 +1053,7 @@
}
static void
-evas_engine_fb_font_string_size_get(void *data, void *font, char *text, int
*w, int *h)
+eng_font_string_size_get(void *data, void *font, char *text, int *w, int *h)
{
Render_Engine *re;
@@ -1056,7 +1062,7 @@
}
static int
-evas_engine_fb_font_inset_get(void *data, void *font, char *text)
+eng_font_inset_get(void *data, void *font, char *text)
{
Render_Engine *re;
@@ -1065,7 +1071,7 @@
}
static int
-evas_engine_fb_font_h_advance_get(void *data, void *font, char *text)
+eng_font_h_advance_get(void *data, void *font, char *text)
{
Render_Engine *re;
int h, v;
@@ -1076,7 +1082,7 @@
}
static int
-evas_engine_fb_font_v_advance_get(void *data, void *font, char *text)
+eng_font_v_advance_get(void *data, void *font, char *text)
{
Render_Engine *re;
int h, v;
@@ -1087,7 +1093,7 @@
}
static int
-evas_engine_fb_font_char_coords_get(void *data, void *font, char *text, int
pos, int *cx, int *cy, int *cw, int *ch)
+eng_font_char_coords_get(void *data, void *font, char *text, int pos, int *cx,
int *cy, int *cw, int *ch)
{
Render_Engine *re;
@@ -1096,7 +1102,7 @@
}
static int
-evas_engine_fb_font_char_at_coords_get(void *data, void *font, char *text, int
x, int y, int *cx, int *cy, int *cw, int *ch)
+eng_font_char_at_coords_get(void *data, void *font, char *text, int x, int y,
int *cx, int *cy, int *cw, int *ch)
{
Render_Engine *re;
@@ -1105,7 +1111,7 @@
}
static void
-evas_engine_fb_font_draw(void *data, void *context, void *surface, void *font,
int x, int y, int w, int h, int ow, int oh, char *text)
+eng_font_draw(void *data, void *context, void *surface, void *font, int x, int
y, int w, int h, int ow, int oh, char *text)
{
Render_Engine *re;
@@ -1153,7 +1159,7 @@
}
static void
-evas_engine_fb_font_cache_flush(void *data)
+eng_font_cache_flush(void *data)
{
Render_Engine *re;
@@ -1162,7 +1168,7 @@
}
static void
-evas_engine_fb_font_cache_set(void *data, int bytes)
+eng_font_cache_set(void *data, int bytes)
{
Render_Engine *re;
@@ -1171,7 +1177,7 @@
}
static int
-evas_engine_fb_font_cache_get(void *data)
+eng_font_cache_get(void *data)
{
Render_Engine *re;
@@ -1179,10 +1185,28 @@
return evas_common_font_cache_get();
}
+static void
+eng_font_hinting_set(void *data, void *font, int hinting)
+{
+ Render_Engine *re;
+
+ re = (Render_Engine *)data;
+ evas_common_font_hinting_set(font, hinting);
+}
+
+static int
+eng_font_hinting_can_hint(void *data, int hinting)
+{
+ Render_Engine *re;
+
+ re = (Render_Engine *)data;
+ return evas_common_hinting_available(hinting);
+}
+
int module_open(Evas_Module *em)
{
if (!em) return 0;
- em->functions = (void *)(&evas_engine_fb_func);
+ em->functions = (void *)(&eng_func);
return 1;
}
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
