Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/modules/engines/buffer
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/buffer/evas_engine.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- evas_engine.c 23 Jan 2006 07:57:30 -0000 1.3
+++ evas_engine.c 28 Feb 2006 04:07:48 -0000 1.4
@@ -3,99 +3,102 @@
#include "evas_engine.h"
#include "Evas_Engine_Buffer.h"
-static void *evas_engine_buffer_info(Evas *e);
-static void evas_engine_buffer_info_free(Evas *e, void *info);
-static void evas_engine_buffer_setup(Evas *e, void *info);
-static void *evas_engine_buffer_output_setup(int w,
- int h,
- void *dest_buffer,
- int dest_buffer_row_bytes,
- int depth_type,
- int use_color_key,
- int alpha_threshold,
- int color_key_r,
- int color_key_g,
- int color_key_b,
- void * (*new_update_region) (int
x, int y, int w, int h, int *row_bytes),
- void (*free_update_region) (int
x, int y, int w, int h, void *data)
- );
-static void evas_engine_buffer_output_free(void *data);
-static void evas_engine_buffer_output_resize(void *data, int w, int h);
-static void evas_engine_buffer_output_tile_size_set(void *data, int w, int h);
-static void evas_engine_buffer_output_redraws_rect_add(void *data, int x, int
y, int w, int h);
-static void evas_engine_buffer_output_redraws_rect_del(void *data, int x, int
y, int w, int h);
-static void evas_engine_buffer_output_redraws_clear(void *data);
-static void *evas_engine_buffer_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_buffer_output_redraws_next_update_push(void *data,
void *surface, int x, int y, int w, int h);
-static void evas_engine_buffer_output_flush(void *data);
-static void *evas_engine_buffer_context_new(void *data);
-static void evas_engine_buffer_context_free(void *data, void *context);
-static void evas_engine_buffer_context_clip_set(void *data, void *context, int
x, int y, int w, int h);
-static void evas_engine_buffer_context_clip_clip(void *data, void *context,
int x, int y, int w, int h);
-static void evas_engine_buffer_context_clip_unset(void *data, void *context);
-static int evas_engine_buffer_context_clip_get(void *data, void *context, int
*x, int *y, int *w, int *h);
-static void evas_engine_buffer_context_color_set(void *data, void *context,
int r, int g, int b, int a);
-static int evas_engine_buffer_context_color_get(void *data, void *context, int
*r, int *g, int *b, int *a);
-static void evas_engine_buffer_context_multiplier_set(void *data, void
*context, int r, int g, int b, int a);
-static void evas_engine_buffer_context_multiplier_unset(void *data, void
*context);
-static int evas_engine_buffer_context_multiplier_get(void *data, void
*context, int *r, int *g, int *b, int *a);
-static void evas_engine_buffer_context_cutout_add(void *data, void *context,
int x, int y, int w, int h);
-static void evas_engine_buffer_context_cutout_clear(void *data, void *context);
-static void evas_engine_buffer_context_anti_alias_set(void *data, void
*context, unsigned char aa);
-static unsigned char evas_engine_buffer_context_anti_alias_get(void *data,
void *context);
-static void evas_engine_buffer_context_color_interpolation_set(void *data,
void *context, int color_space);
-static int evas_engine_buffer_context_color_interpolation_get(void *data, void
*context);
-static void evas_engine_buffer_rectangle_draw(void *data, void *context, void
*surface, int x, int y, int w, int h);
-static void evas_engine_buffer_line_draw(void *data, void *context, void
*surface, int x1, int y1, int x2, int y2);
-static void *evas_engine_buffer_polygon_point_add(void *data, void *context,
void *polygon, int x, int y);
-static void *evas_engine_buffer_polygon_points_clear(void *data, void
*context, void *polygon);
-static void evas_engine_buffer_polygon_draw(void *data, void *context, void
*surface, void *polygon);
-static void *evas_engine_buffer_gradient_color_add(void *data, void *context,
void *gradient, int r, int g, int b, int a, int distance);
-static void *evas_engine_buffer_gradient_colors_clear(void *data, void
*context, void *gradient);
-static void evas_engine_buffer_gradient_free(void *data, void *gradient);
-static void evas_engine_buffer_gradient_fill_set(void *data, void *gradient,
int x, int y, int w, int h);
-static void evas_engine_buffer_gradient_type_set(void *data, void *gradient,
char *name);
-static void evas_engine_buffer_gradient_type_params_set(void *data, void
*gradient, char *params);
-static void *evas_engine_buffer_gradient_geometry_init(void *data, void
*gradient, int spread);
-static int evas_engine_buffer_gradient_alpha_get(void *data, void *gradient,
int spread);
-static void evas_engine_buffer_gradient_map(void *data, void *context, void
*gradient, int spread);
-static void evas_engine_buffer_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_buffer_image_load(void *data, char *file, char *key,
int *error);
-static void *evas_engine_buffer_image_new_from_data(void *data, int w, int h,
DATA32 *image_data);
-static void *evas_engine_buffer_image_new_from_copied_data(void *data, int w,
int h, DATA32 *image_data);
-static void evas_engine_buffer_image_free(void *data, void *image);
-static void evas_engine_buffer_image_size_get(void *data, void *image, int *w,
int *h);
-static void *evas_engine_buffer_image_size_set(void *data, void *image, int w,
int h);
-static void *evas_engine_buffer_image_dirty_region(void *data, void *image,
int x, int y, int w, int h);
-static void *evas_engine_buffer_image_data_get(void *data, void *image, int
to_write, DATA32 **image_data);
-static void *evas_engine_buffer_image_data_put(void *data, void *image, DATA32
*image_data);
-static void *evas_engine_buffer_image_alpha_set(void *data, void *image, int
has_alpha);
-static int evas_engine_buffer_image_alpha_get(void *data, void *image);
-static void evas_engine_buffer_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_buffer_image_comment_get(void *data, void *image,
char *key);
-static char *evas_engine_buffer_image_format_get(void *data, void *image);
-static void evas_engine_buffer_image_cache_flush(void *data);
-static void evas_engine_buffer_image_cache_set(void *data, int bytes);
-static int evas_engine_buffer_image_cache_get(void *data);
-static void *evas_engine_buffer_font_load(void *data, char *name, int size);
-static void *evas_engine_buffer_font_memory_load(void *data, char *name, int
size, const void *fdata, int fdata_size);
-static void *evas_engine_buffer_font_add(void *data, void *font, char *name,
int size);
-static void *evas_engine_buffer_font_memory_add(void *data, void *font, char
*name, int size, const void *fdata, int fdata_size);
-static void evas_engine_buffer_font_free(void *data, void *font);
-static int evas_engine_buffer_font_ascent_get(void *data, void *font);
-static int evas_engine_buffer_font_descent_get(void *data, void *font);
-static int evas_engine_buffer_font_max_ascent_get(void *data, void *font);
-static int evas_engine_buffer_font_max_descent_get(void *data, void *font);
-static void evas_engine_buffer_font_string_size_get(void *data, void *font,
char *text, int *w, int *h);
-static int evas_engine_buffer_font_inset_get(void *data, void *font, char
*text);
-static int evas_engine_buffer_font_h_advance_get(void *data, void *font, char
*text);
-static int evas_engine_buffer_font_v_advance_get(void *data, void *font, char
*text);
-static int evas_engine_buffer_font_char_coords_get(void *data, void *font,
char *text, int pos, int *cx, int *cy, int *cw, int *ch);
-static int evas_engine_buffer_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_buffer_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_buffer_font_cache_flush(void *data);
-static void evas_engine_buffer_font_cache_set(void *data, int bytes);
-static int evas_engine_buffer_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,
+ void *dest_buffer,
+ int dest_buffer_row_bytes,
+ int depth_type,
+ int use_color_key,
+ int alpha_threshold,
+ int color_key_r,
+ int color_key_g,
+ int color_key_b,
+ void * (*new_update_region) (int x, int y, int w,
int h, int *row_bytes),
+ void (*free_update_region) (int x, int y, int
w, int h, void *data)
+ );
+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;
@@ -108,101 +111,104 @@
int end : 1;
};
-Evas_Func evas_engine_buffer_func =
+static Evas_Func eng_func =
{
- evas_engine_buffer_info,
- evas_engine_buffer_info_free,
- evas_engine_buffer_setup,
- evas_engine_buffer_output_free,
- evas_engine_buffer_output_resize,
- evas_engine_buffer_output_tile_size_set,
- evas_engine_buffer_output_redraws_rect_add,
- evas_engine_buffer_output_redraws_rect_del,
- evas_engine_buffer_output_redraws_clear,
- evas_engine_buffer_output_redraws_next_update_get,
- evas_engine_buffer_output_redraws_next_update_push,
- evas_engine_buffer_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_buffer_context_new,
- evas_engine_buffer_context_free,
- evas_engine_buffer_context_clip_set,
- evas_engine_buffer_context_clip_clip,
- evas_engine_buffer_context_clip_unset,
- evas_engine_buffer_context_clip_get,
- evas_engine_buffer_context_color_set,
- evas_engine_buffer_context_color_get,
- evas_engine_buffer_context_multiplier_set,
- evas_engine_buffer_context_multiplier_unset,
- evas_engine_buffer_context_multiplier_get,
- evas_engine_buffer_context_cutout_add,
- evas_engine_buffer_context_cutout_clear,
- evas_engine_buffer_context_anti_alias_set,
- evas_engine_buffer_context_anti_alias_get,
- evas_engine_buffer_context_color_interpolation_set,
- evas_engine_buffer_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,
/* rect draw funcs */
- evas_engine_buffer_rectangle_draw,
+ eng_rectangle_draw,
/* line draw funcs */
- evas_engine_buffer_line_draw,
+ eng_line_draw,
/* polygon draw funcs */
- evas_engine_buffer_polygon_point_add,
- evas_engine_buffer_polygon_points_clear,
- evas_engine_buffer_polygon_draw,
+ eng_polygon_point_add,
+ eng_polygon_points_clear,
+ eng_polygon_draw,
/* gradient draw funcs */
- evas_engine_buffer_gradient_color_add,
- evas_engine_buffer_gradient_colors_clear,
- evas_engine_buffer_gradient_free,
- evas_engine_buffer_gradient_fill_set,
- evas_engine_buffer_gradient_type_set,
- evas_engine_buffer_gradient_type_params_set,
- evas_engine_buffer_gradient_geometry_init,
- evas_engine_buffer_gradient_alpha_get,
- evas_engine_buffer_gradient_map,
- evas_engine_buffer_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_buffer_image_load,
- evas_engine_buffer_image_new_from_data,
- evas_engine_buffer_image_new_from_copied_data,
- evas_engine_buffer_image_free,
- evas_engine_buffer_image_size_get,
- evas_engine_buffer_image_size_set,
- evas_engine_buffer_image_dirty_region,
- evas_engine_buffer_image_data_get,
- evas_engine_buffer_image_data_put,
- evas_engine_buffer_image_alpha_set,
- evas_engine_buffer_image_alpha_get,
- evas_engine_buffer_image_draw,
- evas_engine_buffer_image_comment_get,
- evas_engine_buffer_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_buffer_image_cache_flush,
- evas_engine_buffer_image_cache_set,
- evas_engine_buffer_image_cache_get,
+ eng_image_cache_flush,
+ eng_image_cache_set,
+ eng_image_cache_get,
/* font draw functions */
- evas_engine_buffer_font_load,
- evas_engine_buffer_font_memory_load,
- evas_engine_buffer_font_add,
- evas_engine_buffer_font_memory_add,
- evas_engine_buffer_font_free,
- evas_engine_buffer_font_ascent_get,
- evas_engine_buffer_font_descent_get,
- evas_engine_buffer_font_max_ascent_get,
- evas_engine_buffer_font_max_descent_get,
- evas_engine_buffer_font_string_size_get,
- evas_engine_buffer_font_inset_get,
- evas_engine_buffer_font_h_advance_get,
- evas_engine_buffer_font_v_advance_get,
- evas_engine_buffer_font_char_coords_get,
- evas_engine_buffer_font_char_at_coords_get,
- evas_engine_buffer_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_buffer_font_cache_flush,
- evas_engine_buffer_font_cache_set,
- evas_engine_buffer_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_buffer_info(Evas *e)
+eng_info(Evas *e)
{
Evas_Engine_Info_Buffer *info;
@@ -214,7 +220,7 @@
}
static void
-evas_engine_buffer_info_free(Evas *e, void *info)
+eng_info_free(Evas *e, void *info)
{
Evas_Engine_Info_Buffer *in;
@@ -223,15 +229,15 @@
}
static void
-evas_engine_buffer_setup(Evas *e, void *in)
+eng_setup(Evas *e, void *in)
{
Render_Engine *re;
Evas_Engine_Info_Buffer *info;
info = (Evas_Engine_Info_Buffer *)in;
if (e->engine.data.output)
- evas_engine_buffer_output_free(e->engine.data.output);
- re = evas_engine_buffer_output_setup(e->output.w,
+ eng_output_free(e->engine.data.output);
+ re = eng_output_setup(e->output.w,
e->output.h,
info->info.dest_buffer,
info->info.dest_buffer_row_bytes,
@@ -250,7 +256,7 @@
}
static void *
-evas_engine_buffer_output_setup(int w,
+eng_output_setup(int w,
int h,
void *dest_buffer,
int dest_buffer_row_bytes,
@@ -321,7 +327,7 @@
}
static void
-evas_engine_buffer_output_free(void *data)
+eng_output_free(void *data)
{
Render_Engine *re;
@@ -336,7 +342,7 @@
}
static void
-evas_engine_buffer_output_resize(void *data, int w, int h)
+eng_output_resize(void *data, int w, int h)
{
Render_Engine *re;
@@ -378,7 +384,7 @@
}
static void
-evas_engine_buffer_output_tile_size_set(void *data, int w, int h)
+eng_output_tile_size_set(void *data, int w, int h)
{
Render_Engine *re;
@@ -387,7 +393,7 @@
}
static void
-evas_engine_buffer_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;
@@ -396,7 +402,7 @@
}
static void
-evas_engine_buffer_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;
@@ -405,7 +411,7 @@
}
static void
-evas_engine_buffer_output_redraws_clear(void *data)
+eng_output_redraws_clear(void *data)
{
Render_Engine *re;
@@ -414,7 +420,7 @@
}
static void *
-evas_engine_buffer_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;
@@ -454,7 +460,7 @@
}
static void
-evas_engine_buffer_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;
@@ -465,7 +471,7 @@
}
static void
-evas_engine_buffer_output_flush(void *data)
+eng_output_flush(void *data)
{
Render_Engine *re;
@@ -473,7 +479,7 @@
}
static void *
-evas_engine_buffer_context_new(void *data)
+eng_context_new(void *data)
{
Render_Engine *re;
@@ -482,7 +488,7 @@
}
static void
-evas_engine_buffer_context_free(void *data, void *context)
+eng_context_free(void *data, void *context)
{
Render_Engine *re;
@@ -491,7 +497,7 @@
}
static void
-evas_engine_buffer_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;
@@ -500,7 +506,7 @@
}
static void
-evas_engine_buffer_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;
@@ -509,7 +515,7 @@
}
static void
-evas_engine_buffer_context_clip_unset(void *data, void *context)
+eng_context_clip_unset(void *data, void *context)
{
Render_Engine *re;
@@ -518,7 +524,7 @@
}
static int
-evas_engine_buffer_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;
@@ -531,7 +537,7 @@
}
static void
-evas_engine_buffer_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;
@@ -540,7 +546,7 @@
}
static int
-evas_engine_buffer_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;
@@ -553,7 +559,7 @@
}
static void
-evas_engine_buffer_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;
@@ -562,7 +568,7 @@
}
static void
-evas_engine_buffer_context_multiplier_unset(void *data, void *context)
+eng_context_multiplier_unset(void *data, void *context)
{
Render_Engine *re;
@@ -571,7 +577,7 @@
}
static int
-evas_engine_buffer_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;
@@ -584,7 +590,7 @@
}
static void
-evas_engine_buffer_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;
@@ -593,7 +599,7 @@
}
static void
-evas_engine_buffer_context_cutout_clear(void *data, void *context)
+eng_context_cutout_clear(void *data, void *context)
{
Render_Engine *re;
@@ -602,7 +608,7 @@
}
static void
-evas_engine_buffer_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;
@@ -611,7 +617,7 @@
}
static unsigned char
-evas_engine_buffer_context_anti_alias_get(void *data, void *context)
+eng_context_anti_alias_get(void *data, void *context)
{
Render_Engine *re;
@@ -620,7 +626,7 @@
}
static void
-evas_engine_buffer_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;
@@ -629,7 +635,7 @@
}
static int
-evas_engine_buffer_context_color_interpolation_get(void *data, void *context)
+eng_context_color_interpolation_get(void *data, void *context)
{
Render_Engine *re;
@@ -640,7 +646,7 @@
static void
-evas_engine_buffer_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;
@@ -650,7 +656,7 @@
}
static void
-evas_engine_buffer_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;
@@ -660,7 +666,7 @@
}
static void *
-evas_engine_buffer_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;
@@ -670,7 +676,7 @@
}
static void *
-evas_engine_buffer_polygon_points_clear(void *data, void *context, void
*polygon)
+eng_polygon_points_clear(void *data, void *context, void *polygon)
{
Render_Engine *re;
@@ -680,7 +686,7 @@
}
static void
-evas_engine_buffer_polygon_draw(void *data, void *context, void *surface, void
*polygon)
+eng_polygon_draw(void *data, void *context, void *surface, void *polygon)
{
Render_Engine *re;
@@ -690,7 +696,7 @@
}
static void *
-evas_engine_buffer_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;
@@ -703,7 +709,7 @@
}
static void *
-evas_engine_buffer_gradient_colors_clear(void *data, void *context, void
*gradient)
+eng_gradient_colors_clear(void *data, void *context, void *gradient)
{
Render_Engine *re;
@@ -714,7 +720,7 @@
}
static void
-evas_engine_buffer_gradient_free(void *data, void *gradient)
+eng_gradient_free(void *data, void *gradient)
{
Render_Engine *re;
@@ -723,7 +729,7 @@
}
static void
-evas_engine_buffer_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;
@@ -732,7 +738,7 @@
}
static void
-evas_engine_buffer_gradient_type_set(void *data, void *gradient, char *name)
+eng_gradient_type_set(void *data, void *gradient, char *name)
{
Render_Engine *re;
@@ -741,7 +747,7 @@
}
static void
-evas_engine_buffer_gradient_type_params_set(void *data, void *gradient, char
*params)
+eng_gradient_type_params_set(void *data, void *gradient, char *params)
{
Render_Engine *re;
@@ -750,7 +756,7 @@
}
static void *
-evas_engine_buffer_gradient_geometry_init(void *data, void *gradient, int
spread)
+eng_gradient_geometry_init(void *data, void *gradient, int spread)
{
Render_Engine *re;
@@ -760,7 +766,7 @@
}
static int
-evas_engine_buffer_gradient_alpha_get(void *data, void *gradient, int spread)
+eng_gradient_alpha_get(void *data, void *gradient, int spread)
{
Render_Engine *re;
@@ -769,7 +775,7 @@
}
static void
-evas_engine_buffer_gradient_map(void *data, void *context, void *gradient, int
spread)
+eng_gradient_map(void *data, void *context, void *gradient, int spread)
{
Render_Engine *re;
@@ -779,7 +785,7 @@
}
static void
-evas_engine_buffer_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;
@@ -789,7 +795,7 @@
}
static void *
-evas_engine_buffer_image_load(void *data, char *file, char *key, int *error)
+eng_image_load(void *data, char *file, char *key, int *error)
{
Render_Engine *re;
@@ -799,7 +805,7 @@
}
static void *
-evas_engine_buffer_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;
@@ -820,7 +826,7 @@
}
static void *
-evas_engine_buffer_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;
@@ -834,7 +840,7 @@
}
static void
-evas_engine_buffer_image_free(void *data, void *image)
+eng_image_free(void *data, void *image)
{
Render_Engine *re;
@@ -843,7 +849,7 @@
}
static void
-evas_engine_buffer_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;
@@ -855,7 +861,7 @@
}
static void *
-evas_engine_buffer_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;
@@ -878,7 +884,7 @@
}
static void *
-evas_engine_buffer_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;
@@ -892,7 +898,7 @@
}
static void *
-evas_engine_buffer_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;
@@ -921,7 +927,7 @@
}
static void *
-evas_engine_buffer_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;
@@ -935,7 +941,7 @@
w = im->image->w;
h = im->image->h;
evas_common_image_unref(im);
- return evas_engine_buffer_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); */
@@ -943,7 +949,7 @@
}
static void *
-evas_engine_buffer_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;
@@ -973,7 +979,7 @@
static int
-evas_engine_buffer_image_alpha_get(void *data, void *image)
+eng_image_alpha_get(void *data, void *image)
{
Render_Engine *re;
RGBA_Image *im;
@@ -985,7 +991,7 @@
}
static void
-evas_engine_buffer_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;
@@ -1003,7 +1009,7 @@
}
static char *
-evas_engine_buffer_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;
@@ -1015,7 +1021,7 @@
}
static char *
-evas_engine_buffer_image_format_get(void *data, void *image)
+eng_image_format_get(void *data, void *image)
{
Render_Engine *re;
RGBA_Image *im;
@@ -1027,7 +1033,7 @@
}
static void
-evas_engine_buffer_image_cache_flush(void *data)
+eng_image_cache_flush(void *data)
{
Render_Engine *re;
int tmp_size;
@@ -1039,7 +1045,7 @@
}
static void
-evas_engine_buffer_image_cache_set(void *data, int bytes)
+eng_image_cache_set(void *data, int bytes)
{
Render_Engine *re;
@@ -1048,7 +1054,7 @@
}
static int
-evas_engine_buffer_image_cache_get(void *data)
+eng_image_cache_get(void *data)
{
Render_Engine *re;
@@ -1057,7 +1063,7 @@
}
static void *
-evas_engine_buffer_font_load(void *data, char *name, int size)
+eng_font_load(void *data, char *name, int size)
{
Render_Engine *re;
@@ -1066,7 +1072,7 @@
}
static void *
-evas_engine_buffer_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;
@@ -1075,7 +1081,7 @@
}
static void *
-evas_engine_buffer_font_add(void *data, void *font, char *name, int size)
+eng_font_add(void *data, void *font, char *name, int size)
{
Render_Engine *re;
@@ -1084,7 +1090,7 @@
}
static void *
-evas_engine_buffer_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;
@@ -1093,7 +1099,7 @@
}
static void
-evas_engine_buffer_font_free(void *data, void *font)
+eng_font_free(void *data, void *font)
{
Render_Engine *re;
@@ -1102,7 +1108,7 @@
}
static int
-evas_engine_buffer_font_ascent_get(void *data, void *font)
+eng_font_ascent_get(void *data, void *font)
{
Render_Engine *re;
@@ -1111,7 +1117,7 @@
}
static int
-evas_engine_buffer_font_descent_get(void *data, void *font)
+eng_font_descent_get(void *data, void *font)
{
Render_Engine *re;
@@ -1120,7 +1126,7 @@
}
static int
-evas_engine_buffer_font_max_ascent_get(void *data, void *font)
+eng_font_max_ascent_get(void *data, void *font)
{
Render_Engine *re;
@@ -1129,7 +1135,7 @@
}
static int
-evas_engine_buffer_font_max_descent_get(void *data, void *font)
+eng_font_max_descent_get(void *data, void *font)
{
Render_Engine *re;
@@ -1138,7 +1144,7 @@
}
static void
-evas_engine_buffer_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;
@@ -1147,7 +1153,7 @@
}
static int
-evas_engine_buffer_font_inset_get(void *data, void *font, char *text)
+eng_font_inset_get(void *data, void *font, char *text)
{
Render_Engine *re;
@@ -1156,7 +1162,7 @@
}
static int
-evas_engine_buffer_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;
@@ -1167,7 +1173,7 @@
}
static int
-evas_engine_buffer_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;
@@ -1178,7 +1184,7 @@
}
static int
-evas_engine_buffer_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;
@@ -1187,7 +1193,7 @@
}
static int
-evas_engine_buffer_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;
@@ -1196,7 +1202,7 @@
}
static void
-evas_engine_buffer_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;
@@ -1244,7 +1250,7 @@
}
static void
-evas_engine_buffer_font_cache_flush(void *data)
+eng_font_cache_flush(void *data)
{
Render_Engine *re;
@@ -1253,7 +1259,7 @@
}
static void
-evas_engine_buffer_font_cache_set(void *data, int bytes)
+eng_font_cache_set(void *data, int bytes)
{
Render_Engine *re;
@@ -1262,7 +1268,7 @@
}
static int
-evas_engine_buffer_font_cache_get(void *data)
+eng_font_cache_get(void *data)
{
Render_Engine *re;
@@ -1270,12 +1276,29 @@
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_buffer_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
