From: <enl...@li...> - 2006-02-28 04:08:25
|
Enlightenment CVS committal Author : raster Project : e17 Module : libs/evas Dir : e17/libs/evas/src/modules/engines/software_x11 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/software_x11/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:05 -0000 1.2 +++ evas_engine.c 28 Feb 2006 04:07:48 -0000 1.3 @@ -3,99 +3,101 @@ #include "evas_engine.h" #include "Evas_Engine_Software_X11.h" -static void *evas_engine_software_x11_info(Evas *e); -static void evas_engine_software_x11_info_free(Evas *e, void *info); -static void evas_engine_software_x11_setup(Evas *e, void *info); -static void *evas_engine_software_x11_output_setup(int w, int h, int rot, Display *disp, Drawable draw, Visual *vis, Colormap cmap, int depth, int debug, int grayscale, int max_colors, Pixmap mask, int shape_dither); -static void evas_engine_software_x11_output_free(void *data); -static void evas_engine_software_x11_output_resize(void *data, int w, int h); -static void evas_engine_software_x11_output_tile_size_set(void *data, int w, int h); -static void evas_engine_software_x11_output_redraws_rect_add(void *data, int x, int y, int w, int h); -static void evas_engine_software_x11_output_redraws_rect_del(void *data, int x, int y, int w, int h); -static void evas_engine_software_x11_output_redraws_clear(void *data); -static void *evas_engine_software_x11_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_software_x11_output_redraws_next_update_push(void *data, void *surface, int x, int y, int w, int h); -static void evas_engine_software_x11_output_flush(void *data); -static void *evas_engine_software_x11_context_new(void *data); -static void evas_engine_software_x11_context_free(void *data, void *context); -static void evas_engine_software_x11_context_clip_set(void *data, void *context, int x, int y, int w, int h); -static void evas_engine_software_x11_context_clip_clip(void *data, void *context, int x, int y, int w, int h); -static void evas_engine_software_x11_context_clip_unset(void *data, void *context); -static int evas_engine_software_x11_context_clip_get(void *data, void *context, int *x, int *y, int *w, int *h); -static void evas_engine_software_x11_context_color_set(void *data, void *context, int r, int g, int b, int a); -static int evas_engine_software_x11_context_color_get(void *data, void *context, int *r, int *g, int *b, int *a); -static void evas_engine_software_x11_context_multiplier_set(void *data, void *context, int r, int g, int b, int a); -static void evas_engine_software_x11_context_multiplier_unset(void *data, void *context); -static int evas_engine_software_x11_context_multiplier_get(void *data, void *context, int *r, int *g, int *b, int *a); -static void evas_engine_software_x11_context_cutout_add(void *data, void *context, int x, int y, int w, int h); -static void evas_engine_software_x11_context_cutout_clear(void *data, void *context); -static void evas_engine_software_x11_context_anti_alias_set(void *data, void *context, unsigned char aa); -static unsigned char evas_engine_software_x11_context_anti_alias_get(void *data, void *context); -static void evas_engine_software_x11_context_color_interpolation_set(void *data, void *context, int color_space); -static int evas_engine_software_x11_context_color_interpolation_get(void *data, void *context); -static void evas_engine_software_x11_rectangle_draw(void *data, void *context, void *surface, int x, int y, int w, int h); -static void evas_engine_software_x11_line_draw(void *data, void *context, void *surface, int x1, int y1, int x2, int y2); -static void *evas_engine_software_x11_polygon_point_add(void *data, void *context, void *polygon, int x, int y); -static void *evas_engine_software_x11_polygon_points_clear(void *data, void *context, void *polygon); -static void evas_engine_software_x11_polygon_draw(void *data, void *context, void *surface, void *polygon); -static void *evas_engine_software_x11_gradient_color_add(void *data, void *context, void *gradient, int r, int g, int b, int a, int distance); -static void *evas_engine_software_x11_gradient_colors_clear(void *data, void *context, void *gradient); -static void evas_engine_software_x11_gradient_free(void *data, void *gradient); -static void evas_engine_software_x11_gradient_fill_set(void *data, void *gradient, int x, int y, int w, int h); -static void evas_engine_software_x11_gradient_type_set(void *data, void *gradient, char *name); -static void evas_engine_software_x11_gradient_type_params_set(void *data, void *gradient, char *params); -static void *evas_engine_software_x11_gradient_geometry_init(void *data, void *gradient, int spread); -static int evas_engine_software_x11_gradient_alpha_get(void *data, void *gradient, int spread); -static void evas_engine_software_x11_gradient_map(void *data, void *context, void *gradient, int spread); -static void evas_engine_software_x11_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_software_x11_image_load(void *data, char *file, char *key, int *error); -static void *evas_engine_software_x11_image_new_from_data(void *data, int w, int h, DATA32 *image_data); -static void *evas_engine_software_x11_image_new_from_copied_data(void *data, int w, int h, DATA32 *image_data); -static void evas_engine_software_x11_image_free(void *data, void *image); -static void evas_engine_software_x11_image_size_get(void *data, void *image, int *w, int *h); -static void *evas_engine_software_x11_image_size_set(void *data, void *image, int w, int h); -static void *evas_engine_software_x11_image_dirty_region(void *data, void *image, int x, int y, int w, int h); -static void *evas_engine_software_x11_image_data_get(void *data, void *image, int to_write, DATA32 **image_data); -static void *evas_engine_software_x11_image_data_put(void *data, void *image, DATA32 *image_data); -static void *evas_engine_software_x11_image_alpha_set(void *data, void *image, int has_alpha); -static int evas_engine_software_x11_image_alpha_get(void *data, void *image); -static void evas_engine_software_x11_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_software_x11_image_comment_get(void *data, void *image, char *key); -static char *evas_engine_software_x11_image_format_get(void *data, void *image); -static void evas_engine_software_x11_image_cache_flush(void *data); -static void evas_engine_software_x11_image_cache_set(void *data, int bytes); -static int evas_engine_software_x11_image_cache_get(void *data); -static void *evas_engine_software_x11_font_load(void *data, char *name, int size); -static void *evas_engine_software_x11_font_memory_load(void *data, char *name, int size, const void *fdata, int fdata_size); -static void *evas_engine_software_x11_font_add(void *data, void *font, char *name, int size); -static void *evas_engine_software_x11_font_memory_add(void *data, void *font, char *name, int size, const void *fdata, int fdata_size); -static void evas_engine_software_x11_font_free(void *data, void *font); -static int evas_engine_software_x11_font_ascent_get(void *data, void *font); -static int evas_engine_software_x11_font_descent_get(void *data, void *font); -static int evas_engine_software_x11_font_max_ascent_get(void *data, void *font); -static int evas_engine_software_x11_font_max_descent_get(void *data, void *font); -static void evas_engine_software_x11_font_string_size_get(void *data, void *font, char *text, int *w, int *h); -static int evas_engine_software_x11_font_inset_get(void *data, void *font, char *text); -static int evas_engine_software_x11_font_h_advance_get(void *data, void *font, char *text); -static int evas_engine_software_x11_font_v_advance_get(void *data, void *font, char *text); -static int evas_engine_software_x11_font_char_coords_get(void *data, void *font, char *text, int pos, int *cx, int *cy, int *cw, int *ch); -static int evas_engine_software_x11_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_software_x11_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_software_x11_font_cache_flush(void *data); -static void evas_engine_software_x11_font_cache_set(void *data, int bytes); -static int evas_engine_software_x11_font_cache_get(void *data); - - -static Visual *evas_engine_software_x11_best_visual_get(Display *disp, int screen); -static Colormap evas_engine_software_x11_best_colormap_get(Display *disp, int screen); -static int evas_engine_software_x11_best_depth_get(Display *disp, int screen); -static Evas_Performance *evas_engine_software_x11_output_perf_new(Evas *e, Display *disp, Visual *vis, Colormap cmap, Drawable draw, int depth); -static Evas_Performance *evas_engine_software_x11_output_perf_test(Evas *e, Display *disp, Visual *vis, Colormap cmap, Drawable draw, int depth); -static char *evas_engine_software_x11_output_perf_data(Evas_Performance *perf); -static char *evas_engine_software_x11_output_perf_key(Evas_Performance *perf); -static void evas_engine_software_x11_output_perf_free(Evas_Performance *perf); -static void evas_engine_software_x11_output_perf_build(Evas_Performance *perf, const char *data); -static void evas_engine_software_x11_output_perf_device_store(Evas_Performance *perf); +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, Display *disp, Drawable draw, Visual *vis, Colormap cmap, int depth, int debug, int grayscale, int max_colors, Pixmap mask, int shape_dither); +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); + +static Visual *eng_best_visual_get(Display *disp, int screen); +static Colormap eng_best_colormap_get(Display *disp, int screen); +static int eng_best_depth_get(Display *disp, int screen); +static Evas_Performance *eng_output_perf_new(Evas *e, Display *disp, Visual *vis, Colormap cmap, Drawable draw, int depth); +static Evas_Performance *eng_output_perf_test(Evas *e, Display *disp, Visual *vis, Colormap cmap, Drawable draw, int depth); +static char *eng_output_perf_data(Evas_Performance *perf); +static char *eng_output_perf_key(Evas_Performance *perf); +static void eng_output_perf_free(Evas_Performance *perf); +static void eng_output_perf_build(Evas_Performance *perf, const char *data); +static void eng_output_perf_device_store(Evas_Performance *perf); typedef struct _Render_Engine Render_Engine; @@ -108,101 +110,104 @@ int end : 1; }; -Evas_Func evas_engine_software_x11_func = +static Evas_Func eng_func = { - evas_engine_software_x11_info, - evas_engine_software_x11_info_free, - evas_engine_software_x11_setup, - evas_engine_software_x11_output_free, - evas_engine_software_x11_output_resize, - evas_engine_software_x11_output_tile_size_set, - evas_engine_software_x11_output_redraws_rect_add, - evas_engine_software_x11_output_redraws_rect_del, - evas_engine_software_x11_output_redraws_clear, - evas_engine_software_x11_output_redraws_next_update_get, - evas_engine_software_x11_output_redraws_next_update_push, - evas_engine_software_x11_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_software_x11_context_new, - evas_engine_software_x11_context_free, - evas_engine_software_x11_context_clip_set, - evas_engine_software_x11_context_clip_clip, - evas_engine_software_x11_context_clip_unset, - evas_engine_software_x11_context_clip_get, - evas_engine_software_x11_context_color_set, - evas_engine_software_x11_context_color_get, - evas_engine_software_x11_context_multiplier_set, - evas_engine_software_x11_context_multiplier_unset, - evas_engine_software_x11_context_multiplier_get, - evas_engine_software_x11_context_cutout_add, - evas_engine_software_x11_context_cutout_clear, - evas_engine_software_x11_context_anti_alias_set, - evas_engine_software_x11_context_anti_alias_get, - evas_engine_software_x11_context_color_interpolation_set, - evas_engine_software_x11_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_software_x11_rectangle_draw, + eng_rectangle_draw, /* line draw funcs */ - evas_engine_software_x11_line_draw, + eng_line_draw, /* polygon draw funcs */ - evas_engine_software_x11_polygon_point_add, - evas_engine_software_x11_polygon_points_clear, - evas_engine_software_x11_polygon_draw, + eng_polygon_point_add, + eng_polygon_points_clear, + eng_polygon_draw, /* gradient draw funcs */ - evas_engine_software_x11_gradient_color_add, - evas_engine_software_x11_gradient_colors_clear, - evas_engine_software_x11_gradient_free, - evas_engine_software_x11_gradient_fill_set, - evas_engine_software_x11_gradient_type_set, - evas_engine_software_x11_gradient_type_params_set, - evas_engine_software_x11_gradient_geometry_init, - evas_engine_software_x11_gradient_alpha_get, - evas_engine_software_x11_gradient_map, - evas_engine_software_x11_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_software_x11_image_load, - evas_engine_software_x11_image_new_from_data, - evas_engine_software_x11_image_new_from_copied_data, - evas_engine_software_x11_image_free, - evas_engine_software_x11_image_size_get, - evas_engine_software_x11_image_size_set, - evas_engine_software_x11_image_dirty_region, - evas_engine_software_x11_image_data_get, - evas_engine_software_x11_image_data_put, - evas_engine_software_x11_image_alpha_set, - evas_engine_software_x11_image_alpha_get, - evas_engine_software_x11_image_draw, - evas_engine_software_x11_image_comment_get, - evas_engine_software_x11_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_software_x11_image_cache_flush, - evas_engine_software_x11_image_cache_set, - evas_engine_software_x11_image_cache_get, + eng_image_cache_flush, + eng_image_cache_set, + eng_image_cache_get, /* font draw functions */ - evas_engine_software_x11_font_load, - evas_engine_software_x11_font_memory_load, - evas_engine_software_x11_font_add, - evas_engine_software_x11_font_memory_add, - evas_engine_software_x11_font_free, - evas_engine_software_x11_font_ascent_get, - evas_engine_software_x11_font_descent_get, - evas_engine_software_x11_font_max_ascent_get, - evas_engine_software_x11_font_max_descent_get, - evas_engine_software_x11_font_string_size_get, - evas_engine_software_x11_font_inset_get, - evas_engine_software_x11_font_h_advance_get, - evas_engine_software_x11_font_v_advance_get, - evas_engine_software_x11_font_char_coords_get, - evas_engine_software_x11_font_char_at_coords_get, - evas_engine_software_x11_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_software_x11_font_cache_flush, - evas_engine_software_x11_font_cache_set, - evas_engine_software_x11_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_software_x11_info(Evas *e) +eng_info(Evas *e) { Evas_Engine_Info_Software_X11 *info; @@ -212,22 +217,22 @@ info->info.debug = 0; info->info.alloc_grayscale = 0; info->info.alloc_colors_max = 216; - info->func.best_visual_get = evas_engine_software_x11_best_visual_get; - info->func.best_colormap_get = evas_engine_software_x11_best_colormap_get; - info->func.best_depth_get = evas_engine_software_x11_best_depth_get; - info->func.performance_test = evas_engine_software_x11_output_perf_test; - info->func.performance_free = evas_engine_software_x11_output_perf_free; - info->func.performance_data_get = evas_engine_software_x11_output_perf_data; - info->func.performance_key_get = evas_engine_software_x11_output_perf_key; - info->func.performance_new = evas_engine_software_x11_output_perf_new; - info->func.performance_build = evas_engine_software_x11_output_perf_build; - info->func.performance_device_store = evas_engine_software_x11_output_perf_device_store; + info->func.best_visual_get = eng_best_visual_get; + info->func.best_colormap_get = eng_best_colormap_get; + info->func.best_depth_get = eng_best_depth_get; + info->func.performance_test = eng_output_perf_test; + info->func.performance_free = eng_output_perf_free; + info->func.performance_data_get = eng_output_perf_data; + info->func.performance_key_get = eng_output_perf_key; + info->func.performance_new = eng_output_perf_new; + info->func.performance_build = eng_output_perf_build; + info->func.performance_device_store = eng_output_perf_device_store; return info; e = NULL; } static void -evas_engine_software_x11_info_free(Evas *e, void *info) +eng_info_free(Evas *e, void *info) { Evas_Engine_Info_Software_X11 *in; @@ -236,7 +241,7 @@ } static void -evas_engine_software_x11_setup(Evas *e, void *in) +eng_setup(Evas *e, void *in) { Render_Engine *re; Evas_Engine_Info_Software_X11 *info; @@ -244,7 +249,7 @@ info = (Evas_Engine_Info_Software_X11 *)in; if (!e->engine.data.output) e->engine.data.output = - evas_engine_software_x11_output_setup(e->output.w, + eng_output_setup(e->output.w, e->output.h, info->info.rotation, info->info.display, @@ -269,7 +274,7 @@ } static void * -evas_engine_software_x11_output_setup(int w, int h, int rot, Display *disp, Drawable draw, Visual *vis, Colormap cmap, int depth, int debug, int grayscale, int max_colors, Pixmap mask, int shape_dither) +eng_output_setup(int w, int h, int rot, Display *disp, Drawable draw, Visual *vis, Colormap cmap, int depth, int debug, int grayscale, int max_colors, Pixmap mask, int shape_dither) { Render_Engine *re; Outbuf_Perf *perf; @@ -317,7 +322,7 @@ } static void -evas_engine_software_x11_output_free(void *data) +eng_output_free(void *data) { Render_Engine *re; @@ -332,7 +337,7 @@ } static void -evas_engine_software_x11_output_resize(void *data, int w, int h) +eng_output_resize(void *data, int w, int h) { Render_Engine *re; @@ -347,7 +352,7 @@ } static void -evas_engine_software_x11_output_tile_size_set(void *data, int w, int h) +eng_output_tile_size_set(void *data, int w, int h) { Render_Engine *re; @@ -356,7 +361,7 @@ } static void -evas_engine_software_x11_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; @@ -365,7 +370,7 @@ } static void -evas_engine_software_x11_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; @@ -374,7 +379,7 @@ } static void -evas_engine_software_x11_output_redraws_clear(void *data) +eng_output_redraws_clear(void *data) { Render_Engine *re; @@ -383,7 +388,7 @@ } static void * -evas_engine_software_x11_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; @@ -419,7 +424,7 @@ } static void -evas_engine_software_x11_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; @@ -430,7 +435,7 @@ } static void -evas_engine_software_x11_output_flush(void *data) +eng_output_flush(void *data) { Render_Engine *re; @@ -439,7 +444,7 @@ } static void * -evas_engine_software_x11_context_new(void *data) +eng_context_new(void *data) { Render_Engine *re; @@ -448,7 +453,7 @@ } static void -evas_engine_software_x11_context_free(void *data, void *context) +eng_context_free(void *data, void *context) { Render_Engine *re; @@ -457,7 +462,7 @@ } static void -evas_engine_software_x11_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; @@ -466,7 +471,7 @@ } static void -evas_engine_software_x11_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; @@ -475,7 +480,7 @@ } static void -evas_engine_software_x11_context_clip_unset(void *data, void *context) +eng_context_clip_unset(void *data, void *context) { Render_Engine *re; @@ -484,7 +489,7 @@ } static int -evas_engine_software_x11_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; @@ -497,7 +502,7 @@ } static void -evas_engine_software_x11_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; @@ -506,7 +511,7 @@ } static int -evas_engine_software_x11_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; @@ -519,7 +524,7 @@ } static void -evas_engine_software_x11_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; @@ -528,7 +533,7 @@ } static void -evas_engine_software_x11_context_multiplier_unset(void *data, void *context) +eng_context_multiplier_unset(void *data, void *context) { Render_Engine *re; @@ -537,7 +542,7 @@ } static int -evas_engine_software_x11_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; @@ -550,7 +555,7 @@ } static void -evas_engine_software_x11_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; @@ -559,7 +564,7 @@ } static void -evas_engine_software_x11_context_cutout_clear(void *data, void *context) +eng_context_cutout_clear(void *data, void *context) { Render_Engine *re; @@ -568,7 +573,7 @@ } static void -evas_engine_software_x11_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; @@ -577,7 +582,7 @@ } static unsigned char -evas_engine_software_x11_context_anti_alias_get(void *data, void *context) +eng_context_anti_alias_get(void *data, void *context) { Render_Engine *re; @@ -586,7 +591,7 @@ } static void -evas_engine_software_x11_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; @@ -595,7 +600,7 @@ } static int -evas_engine_software_x11_context_color_interpolation_get(void *data, void *context) +eng_context_color_interpolation_get(void *data, void *context) { Render_Engine *re; @@ -609,7 +614,7 @@ static void -evas_engine_software_x11_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; @@ -622,7 +627,7 @@ } static void -evas_engine_software_x11_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; @@ -635,7 +640,7 @@ } static void * -evas_engine_software_x11_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; @@ -645,7 +650,7 @@ } static void * -evas_engine_software_x11_polygon_points_clear(void *data, void *context, void *polygon) +eng_polygon_points_clear(void *data, void *context, void *polygon) { Render_Engine *re; @@ -655,7 +660,7 @@ } static void -evas_engine_software_x11_polygon_draw(void *data, void *context, void *surface, void *polygon) +eng_polygon_draw(void *data, void *context, void *surface, void *polygon) { Render_Engine *re; @@ -668,7 +673,7 @@ } static void * -evas_engine_software_x11_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; @@ -681,7 +686,7 @@ } static void * -evas_engine_software_x11_gradient_colors_clear(void *data, void *context, void *gradient) +eng_gradient_colors_clear(void *data, void *context, void *gradient) { Render_Engine *re; @@ -692,7 +697,7 @@ } static void -evas_engine_software_x11_gradient_free(void *data, void *gradient) +eng_gradient_free(void *data, void *gradient) { Render_Engine *re; @@ -701,7 +706,7 @@ } static void -evas_engine_software_x11_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; @@ -710,7 +715,7 @@ } static void -evas_engine_software_x11_gradient_type_set(void *data, void *gradient, char *name) +eng_gradient_type_set(void *data, void *gradient, char *name) { Render_Engine *re; @@ -719,7 +724,7 @@ } static void -evas_engine_software_x11_gradient_type_params_set(void *data, void *gradient, char *params) +eng_gradient_type_params_set(void *data, void *gradient, char *params) { Render_Engine *re; @@ -728,7 +733,7 @@ } static void * -evas_engine_software_x11_gradient_geometry_init(void *data, void *gradient, int spread) +eng_gradient_geometry_init(void *data, void *gradient, int spread) { Render_Engine *re; @@ -738,7 +743,7 @@ } static int -evas_engine_software_x11_gradient_alpha_get(void *data, void *gradient, int spread) +eng_gradient_alpha_get(void *data, void *gradient, int spread) { Render_Engine *re; @@ -747,7 +752,7 @@ } static void -evas_engine_software_x11_gradient_map(void *data, void *context, void *gradient, int spread) +eng_gradient_map(void *data, void *context, void *gradient, int spread) { Render_Engine *re; @@ -757,7 +762,7 @@ } static void -evas_engine_software_x11_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; @@ -770,7 +775,7 @@ } static void * -evas_engine_software_x11_image_load(void *data, char *file, char *key, int *error) +eng_image_load(void *data, char *file, char *key, int *error) { Render_Engine *re; @@ -780,7 +785,7 @@ } static void * -evas_engine_software_x11_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; @@ -801,7 +806,7 @@ } static void * -evas_engine_software_x11_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; @@ -815,7 +820,7 @@ } static void -evas_engine_software_x11_image_free(void *data, void *image) +eng_image_free(void *data, void *image) { Render_Engine *re; @@ -824,7 +829,7 @@ } static void -evas_engine_software_x11_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; @@ -836,7 +841,7 @@ } static void * -evas_engine_software_x11_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; @@ -859,7 +864,7 @@ } static void * -evas_engine_software_x11_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; @@ -873,7 +878,7 @@ } static void * -evas_engine_software_x11_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; @@ -902,7 +907,7 @@ } static void * -evas_engine_software_x11_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; @@ -916,7 +921,7 @@ w = im->image->w; h = im->image->h; evas_common_image_unref(im); - return evas_engine_software_x11_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); */ @@ -924,7 +929,7 @@ } static void * -evas_engine_software_x11_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; @@ -954,7 +959,7 @@ static int -evas_engine_software_x11_image_alpha_get(void *data, void *image) +eng_image_alpha_get(void *data, void *image) { Render_Engine *re; RGBA_Image *im; @@ -966,7 +971,7 @@ } static void -evas_engine_software_x11_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; @@ -984,7 +989,7 @@ } static char * -evas_engine_software_x11_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; @@ -996,7 +1001,7 @@ } static char * -evas_engine_software_x11_image_format_get(void *data, void *image) +eng_image_format_get(void *data, void *image) { Render_Engine *re; RGBA_Image *im; @@ -1008,7 +1013,7 @@ } static void -evas_engine_software_x11_image_cache_flush(void *data) +eng_image_cache_flush(void *data) { Render_Engine *re; int tmp_size; @@ -1020,7 +1025,7 @@ } static void -evas_engine_software_x11_image_cache_set(void *data, int bytes) +eng_image_cache_set(void *data, int bytes) { Render_Engine *re; @@ -1029,7 +1034,7 @@ } static int -evas_engine_software_x11_image_cache_get(void *data) +eng_image_cache_get(void *data) { Render_Engine *re; @@ -1038,7 +1043,7 @@ } static void * -evas_engine_software_x11_font_load(void *data, char *name, int size) +eng_font_load(void *data, char *name, int size) { Render_Engine *re; @@ -1047,7 +1052,7 @@ } static void * -evas_engine_software_x11_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; @@ -1056,7 +1061,7 @@ } static void * -evas_engine_software_x11_font_add(void *data, void *font, char *name, int size) +eng_font_add(void *data, void *font, char *name, int size) { Render_Engine *re; @@ -1065,7 +1070,7 @@ } static void * -evas_engine_software_x11_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; @@ -1074,7 +1079,7 @@ } static void -evas_engine_software_x11_font_free(void *data, void *font) +eng_font_free(void *data, void *font) { Render_Engine *re; @@ -1083,7 +1088,7 @@ } static int -evas_engine_software_x11_font_ascent_get(void *data, void *font) +eng_font_ascent_get(void *data, void *font) { Render_Engine *re; @@ -1092,7 +1097,7 @@ } static int -evas_engine_software_x11_font_descent_get(void *data, void *font) +eng_font_descent_get(void *data, void *font) { Render_Engine *re; @@ -1101,7 +1106,7 @@ } static int -evas_engine_software_x11_font_max_ascent_get(void *data, void *font) +eng_font_max_ascent_get(void *data, void *font) { Render_Engine *re; @@ -1110,7 +1115,7 @@ } static int -evas_engine_software_x11_font_max_descent_get(void *data, void *font) +eng_font_max_descent_get(void *data, void *font) { Render_Engine *re; @@ -1119,7 +1124,7 @@ } static void -evas_engine_software_x11_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; @@ -1128,7 +1133,7 @@ } static int -evas_engine_software_x11_font_inset_get(void *data, void *font, char *text) +eng_font_inset_get(void *data, void *font, char *text) { Render_Engine *re; @@ -1137,7 +1142,7 @@ } static int -evas_engine_software_x11_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; @@ -1148,7 +1153,7 @@ } static int -evas_engine_software_x11_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; @@ -1159,7 +1164,7 @@ } static int -evas_engine_software_x11_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; @@ -1168,7 +1173,7 @@ } static int -evas_engine_software_x11_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; @@ -1177,7 +1182,7 @@ } static void -evas_engine_software_x11_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; @@ -1228,7 +1233,7 @@ } static void -evas_engine_software_x11_font_cache_flush(void *data) +eng_font_cache_flush(void *data) { Render_Engine *re; @@ -1237,7 +1242,7 @@ } static void -evas_engine_software_x11_font_cache_set(void *data, int bytes) +eng_font_cache_set(void *data, int bytes) { Render_Engine *re; @@ -1246,7 +1251,7 @@ } static int -evas_engine_software_x11_font_cache_get(void *data) +eng_font_cache_get(void *data) { Render_Engine *re; @@ -1254,6 +1259,24 @@ 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); +} + @@ -1265,66 +1288,66 @@ /* private engine functions the calling prog can use */ static Visual * -evas_engine_software_x11_best_visual_get(Display *disp, int screen) +eng_best_visual_get(Display *disp, int screen) { if (!disp) return NULL; return DefaultVisual(disp, screen); } static Colormap -evas_engine_software_x11_best_colormap_get(Display *disp, int screen) +eng_best_colormap_get(Display *disp, int screen) { if (!disp) return 0; return DefaultColormap(disp, screen); } static int -evas_engine_software_x11_best_depth_get(Display *disp, int screen) +eng_best_depth_get(Display *disp, int screen) { if (!disp) return 0; return DefaultDepth(disp, screen); } static Evas_Performance * -evas_engine_software_x11_output_perf_new(Evas *e, Display *disp, Visual *vis, Colormap cmap, Drawable draw, int depth) +eng_output_perf_new(Evas *e, Display *disp, Visual *vis, Colormap cmap, Drawable draw, int depth) { return evas_software_x11_outbuf_perf_new_x(disp, draw, vis, cmap, depth); e = NULL; } static Evas_Performance * -evas_engine_software_x11_output_perf_test(Evas *e, Display *disp, Visual *vis, Colormap cmap, Drawable draw, int depth) +eng_output_perf_test(Evas *e, Display *disp, Visual *vis, Colormap cmap, Drawable draw, int depth) { return evas_software_x11_outbuf_perf_x(disp, draw, vis, cmap, depth); e = NULL; } static char * -evas_engine_software_x11_output_perf_data(Evas_Performance *perf) +eng_output_perf_data(Evas_Performance *perf) { return evas_software_x11_outbuf_perf_serialize_x(perf); } static char * -evas_engine_software_x11_output_perf_key(Evas_Performance *perf) +eng_output_perf_key(Evas_Performance *perf) { return evas_software_x11_outbuf_perf_serialize_info_x(perf); } static void -evas_engine_software_x11_output_perf_free(Evas_Performance *perf) +eng_output_perf_free(Evas_Performance *perf) { evas_software_x11_outbuf_perf_free(perf); } static void -evas_engine_software_x11_output_perf_build(Evas_Performance *perf, const char *data) +eng_output_perf_build(Evas_Performance *perf, const char *data) { evas_software_x11_outbuf_perf_deserialize_x(perf, data); } static void -evas_engine_software_x11_output_perf_device_store(Evas_Performance *perf) +eng_output_perf_device_store(Evas_Performance *perf) { evas_software_x11_outbuf_perf_store_x(perf); } @@ -1332,7 +1355,7 @@ int module_open(Evas_Module *em) { if (!em) return 0; - em->functions = (void *)(&evas_engine_software_x11_func); + em->functions = (void *)(&eng_func); return 1; } |