Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/modules/engines/cairo_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/cairo_x11/evas_engine.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- evas_engine.c 16 Jan 2006 03:37:34 -0000 1.2
+++ evas_engine.c 28 Feb 2006 04:07:48 -0000 1.3
@@ -8,87 +8,90 @@
#include "Evas_Engine_Cairo_X11.h"
#include "evas_cairo_common.h"
-static void *evas_engine_cairo_x11_info(Evas *e);
-static void evas_engine_cairo_x11_info_free(Evas *e, void *info);
-static void evas_engine_cairo_x11_setup(Evas *e, void *info);
-static void *evas_engine_cairo_x11_output_setup(int w, int h, Display *disp,
Drawable draw, Visual *vis, Colormap cmap, int depth);
-static void evas_engine_cairo_x11_output_free(void *data);
-static void evas_engine_cairo_x11_output_resize(void *data, int w, int h);
-static void evas_engine_cairo_x11_output_tile_size_set(void *data, int w, int
h);
-static void evas_engine_cairo_x11_output_redraws_rect_add(void *data, int x,
int y, int w, int h);
-static void evas_engine_cairo_x11_output_redraws_rect_del(void *data, int x,
int y, int w, int h);
-static void evas_engine_cairo_x11_output_redraws_clear(void *data);
-static void *evas_engine_cairo_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_cairo_x11_output_redraws_next_update_push(void *data,
void *surface, int x, int y, int w, int h);
-static void evas_engine_cairo_x11_output_flush(void *data);
-static void *evas_engine_cairo_x11_context_new(void *data);
-static void evas_engine_cairo_x11_context_free(void *data, void *context);
-static void evas_engine_cairo_x11_context_clip_set(void *data, void *context,
int x, int y, int w, int h);
-static void evas_engine_cairo_x11_context_clip_clip(void *data, void *context,
int x, int y, int w, int h);
-static void evas_engine_cairo_x11_context_clip_unset(void *data, void
*context);
-static int evas_engine_cairo_x11_context_clip_get(void *data, void *context,
int *x, int *y, int *w, int *h);
-static void evas_engine_cairo_x11_context_color_set(void *data, void *context,
int r, int g, int b, int a);
-static int evas_engine_cairo_x11_context_color_get(void *data, void *context,
int *r, int *g, int *b, int *a);
-static void evas_engine_cairo_x11_context_multiplier_set(void *data, void
*context, int r, int g, int b, int a);
-static void evas_engine_cairo_x11_context_multiplier_unset(void *data, void
*context);
-static int evas_engine_cairo_x11_context_multiplier_get(void *data, void
*context, int *r, int *g, int *b, int *a);
-static void evas_engine_cairo_x11_context_cutout_add(void *data, void
*context, int x, int y, int w, int h);
-static void evas_engine_cairo_x11_context_cutout_clear(void *data, void
*context);
-static void evas_engine_cairo_x11_context_anti_alias_set(void *data, void
*context, unsigned char aa);
-static unsigned char evas_engine_cairo_x11_context_anti_alias_get(void *data,
void *context);
-static void evas_engine_cairo_x11_context_color_interpolation_set(void *data,
void *context, int color_space);
-static int evas_engine_cairo_x11_context_color_interpolation_get(void *data,
void *context);
-static void evas_engine_cairo_x11_rectangle_draw(void *data, void *context,
void *surface, int x, int y, int w, int h);
-static void evas_engine_cairo_x11_line_draw(void *data, void *context, void
*surface, int x1, int y1, int x2, int y2);
-static void *evas_engine_cairo_x11_polygon_point_add(void *data, void
*context, void *polygon, int x, int y);
-static void *evas_engine_cairo_x11_polygon_points_clear(void *data, void
*context, void *polygon);
-static void evas_engine_cairo_x11_polygon_draw(void *data, void *context, void
*surface, void *polygon);
-static void *evas_engine_cairo_x11_gradient_color_add(void *data, void
*context, void *gradient, int r, int g, int b, int a, int distance);
-static void *evas_engine_cairo_x11_gradient_colors_clear(void *data, void
*context, void *gradient);
-static void evas_engine_cairo_x11_gradient_free(void *data, void *gradient);
-static void evas_engine_cairo_x11_gradient_fill_set(void *data, void
*gradient, int x, int y, int w, int h);
-static void evas_engine_cairo_x11_gradient_type_set(void *data, void
*gradient, char *name);
-static void evas_engine_cairo_x11_gradient_type_params_set(void *data, void
*gradient, char *params);
-static void *evas_engine_cairo_x11_gradient_geometry_init(void *data, void
*gradient, int spread);
-static int evas_engine_cairo_x11_gradient_alpha_get(void *data, void
*gradient, int spread);
-static void evas_engine_cairo_x11_gradient_map(void *data, void *context, void
*gradient, int spread);
-static void evas_engine_cairo_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_cairo_x11_image_load(void *data, char *file, char
*key, int *error);
-static void *evas_engine_cairo_x11_image_new_from_data(void *data, int w, int
h, DATA32 *image_data);
-static void *evas_engine_cairo_x11_image_new_from_copied_data(void *data, int
w, int h, DATA32 *image_data);
-static void evas_engine_cairo_x11_image_free(void *data, void *image);
-static void evas_engine_cairo_x11_image_size_get(void *data, void *image, int
*w, int *h);
-static void *evas_engine_cairo_x11_image_size_set(void *data, void *image, int
w, int h);
-static void *evas_engine_cairo_x11_image_dirty_region(void *data, void *image,
int x, int y, int w, int h);
-static void *evas_engine_cairo_x11_image_data_get(void *data, void *image, int
to_write, DATA32 **image_data);
-static void *evas_engine_cairo_x11_image_data_put(void *data, void *image,
DATA32 *image_data);
-static void *evas_engine_cairo_x11_image_alpha_set(void *data, void *image,
int has_alpha);
-static int evas_engine_cairo_x11_image_alpha_get(void *data, void *image);
-static void evas_engine_cairo_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_cairo_x11_image_comment_get(void *data, void *image,
char *key);
-static char *evas_engine_cairo_x11_image_format_get(void *data, void *image);
-static void evas_engine_cairo_x11_image_cache_flush(void *data);
-static void evas_engine_cairo_x11_image_cache_set(void *data, int bytes);
-static int evas_engine_cairo_x11_image_cache_get(void *data);
-static void *evas_engine_cairo_x11_font_load(void *data, char *name, int size);
-static void *evas_engine_cairo_x11_font_memory_load(void *data, char *name,
int size, const void *fdata, int fdata_size);
-static void *evas_engine_cairo_x11_font_add(void *data, void *font, char
*name, int size);
-static void *evas_engine_cairo_x11_font_memory_add(void *data, void *font,
char *name, int size, const void *fdata, int fdata_size);
-static void evas_engine_cairo_x11_font_free(void *data, void *font);
-static int evas_engine_cairo_x11_font_ascent_get(void *data, void *font);
-static int evas_engine_cairo_x11_font_descent_get(void *data, void *font);
-static int evas_engine_cairo_x11_font_max_ascent_get(void *data, void *font);
-static int evas_engine_cairo_x11_font_max_descent_get(void *data, void *font);
-static void evas_engine_cairo_x11_font_string_size_get(void *data, void *font,
char *text, int *w, int *h);
-static int evas_engine_cairo_x11_font_inset_get(void *data, void *font, char
*text);
-static int evas_engine_cairo_x11_font_h_advance_get(void *data, void *font,
char *text);
-static int evas_engine_cairo_x11_font_v_advance_get(void *data, void *font,
char *text);
-static int evas_engine_cairo_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_cairo_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_cairo_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_cairo_x11_font_cache_flush(void *data);
-static void evas_engine_cairo_x11_font_cache_set(void *data, int bytes);
-static int evas_engine_cairo_x11_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, Display *disp, Drawable draw,
Visual *vis, Colormap cmap, int depth);
+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;
@@ -97,101 +100,104 @@
Evas_Cairo_X11_Window *win;
};
-Evas_Func evas_engine_cairo_x11_func =
+static Evas_Func eng_func =
{
- evas_engine_cairo_x11_info,
- evas_engine_cairo_x11_info_free,
- evas_engine_cairo_x11_setup,
- evas_engine_cairo_x11_output_free,
- evas_engine_cairo_x11_output_resize,
- evas_engine_cairo_x11_output_tile_size_set,
- evas_engine_cairo_x11_output_redraws_rect_add,
- evas_engine_cairo_x11_output_redraws_rect_del,
- evas_engine_cairo_x11_output_redraws_clear,
- evas_engine_cairo_x11_output_redraws_next_update_get,
- evas_engine_cairo_x11_output_redraws_next_update_push,
- evas_engine_cairo_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_cairo_x11_context_new,
- evas_engine_cairo_x11_context_free,
- evas_engine_cairo_x11_context_clip_set,
- evas_engine_cairo_x11_context_clip_clip,
- evas_engine_cairo_x11_context_clip_unset,
- evas_engine_cairo_x11_context_clip_get,
- evas_engine_cairo_x11_context_color_set,
- evas_engine_cairo_x11_context_color_get,
- evas_engine_cairo_x11_context_multiplier_set,
- evas_engine_cairo_x11_context_multiplier_unset,
- evas_engine_cairo_x11_context_multiplier_get,
- evas_engine_cairo_x11_context_cutout_add,
- evas_engine_cairo_x11_context_cutout_clear,
- evas_engine_cairo_x11_context_anti_alias_set,
- evas_engine_cairo_x11_context_anti_alias_get,
- evas_engine_cairo_x11_context_color_interpolation_set,
- evas_engine_cairo_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_cairo_x11_rectangle_draw,
+ eng_rectangle_draw,
/* line draw funcs */
- evas_engine_cairo_x11_line_draw,
+ eng_line_draw,
/* polygon draw funcs */
- evas_engine_cairo_x11_polygon_point_add,
- evas_engine_cairo_x11_polygon_points_clear,
- evas_engine_cairo_x11_polygon_draw,
+ eng_polygon_point_add,
+ eng_polygon_points_clear,
+ eng_polygon_draw,
/* gradient draw funcs */
- evas_engine_cairo_x11_gradient_color_add,
- evas_engine_cairo_x11_gradient_colors_clear,
- evas_engine_cairo_x11_gradient_free,
- evas_engine_cairo_x11_gradient_fill_set,
- evas_engine_cairo_x11_gradient_type_set,
- evas_engine_cairo_x11_gradient_type_params_set,
- evas_engine_cairo_x11_gradient_geometry_init,
- evas_engine_cairo_x11_gradient_alpha_get,
- evas_engine_cairo_x11_gradient_map,
- evas_engine_cairo_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_cairo_x11_image_load,
- evas_engine_cairo_x11_image_new_from_data,
- evas_engine_cairo_x11_image_new_from_copied_data,
- evas_engine_cairo_x11_image_free,
- evas_engine_cairo_x11_image_size_get,
- evas_engine_cairo_x11_image_size_set,
- evas_engine_cairo_x11_image_dirty_region,
- evas_engine_cairo_x11_image_data_get,
- evas_engine_cairo_x11_image_data_put,
- evas_engine_cairo_x11_image_alpha_set,
- evas_engine_cairo_x11_image_alpha_get,
- evas_engine_cairo_x11_image_draw,
- evas_engine_cairo_x11_image_comment_get,
- evas_engine_cairo_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_cairo_x11_image_cache_flush,
- evas_engine_cairo_x11_image_cache_set,
- evas_engine_cairo_x11_image_cache_get,
+ eng_image_cache_flush,
+ eng_image_cache_set,
+ eng_image_cache_get,
/* font draw functions */
- evas_engine_cairo_x11_font_load,
- evas_engine_cairo_x11_font_memory_load,
- evas_engine_cairo_x11_font_add,
- evas_engine_cairo_x11_font_memory_add,
- evas_engine_cairo_x11_font_free,
- evas_engine_cairo_x11_font_ascent_get,
- evas_engine_cairo_x11_font_descent_get,
- evas_engine_cairo_x11_font_max_ascent_get,
- evas_engine_cairo_x11_font_max_descent_get,
- evas_engine_cairo_x11_font_string_size_get,
- evas_engine_cairo_x11_font_inset_get,
- evas_engine_cairo_x11_font_h_advance_get,
- evas_engine_cairo_x11_font_v_advance_get,
- evas_engine_cairo_x11_font_char_coords_get,
- evas_engine_cairo_x11_font_char_at_coords_get,
- evas_engine_cairo_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_cairo_x11_font_cache_flush,
- evas_engine_cairo_x11_font_cache_set,
- evas_engine_cairo_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_cairo_x11_info(Evas *e)
+eng_info(Evas *e)
{
Evas_Engine_Info_Cairo_X11 *info;
@@ -204,7 +210,7 @@
}
static void
-evas_engine_cairo_x11_info_free(Evas *e, void *info)
+eng_info_free(Evas *e, void *info)
{
Evas_Engine_Info_Cairo_X11 *in;
@@ -213,7 +219,7 @@
}
static void
-evas_engine_cairo_x11_setup(Evas *e, void *in)
+eng_setup(Evas *e, void *in)
{
Render_Engine *re;
Evas_Engine_Info_Cairo_X11 *info;
@@ -222,7 +228,7 @@
printf("CAIRO: setup info...\n");
if (!e->engine.data.output)
e->engine.data.output =
- evas_engine_cairo_x11_output_setup(e->output.w,
+ eng_output_setup(e->output.w,
e->output.h,
info->info.display,
info->info.drawable,
@@ -238,12 +244,12 @@
}
static void *
-evas_engine_cairo_x11_output_setup(int w, int h, Display *disp, Drawable draw,
Visual *vis, Colormap cmap, int depth)
+eng_output_setup(int w, int h, Display *disp, Drawable draw, Visual *vis,
Colormap cmap, int depth)
{
Render_Engine *re;
re = calloc(1, sizeof(Render_Engine));
- re->win = evas_engine_cairo_x11_window_new(disp, draw,
+ re->win = eng_window_new(disp, draw,
0 /* FIXME: screen 0 assumption
*/,
vis, cmap, depth, w, h);
if (!re->win)
@@ -270,13 +276,13 @@
}
static void
-evas_engine_cairo_x11_output_free(void *data)
+eng_output_free(void *data)
{
Render_Engine *re;
re = (Render_Engine *)data;
- evas_engine_cairo_x11_window_free(re->win);
+ eng_window_free(re->win);
free(re);
@@ -285,7 +291,7 @@
}
static void
-evas_engine_cairo_x11_output_resize(void *data, int w, int h)
+eng_output_resize(void *data, int w, int h)
{
Render_Engine *re;
@@ -293,11 +299,11 @@
re->win->w = w;
re->win->h = h;
- evas_engine_cairo_x11_window_size_set(re->win, w, h);
+ eng_window_size_set(re->win, w, h);
}
static void
-evas_engine_cairo_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;
@@ -306,7 +312,7 @@
}
static void
-evas_engine_cairo_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;
/* FIXME? cairo_surface_mark_dirty_rectangle */
@@ -330,7 +336,7 @@
}
static void
-evas_engine_cairo_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;
@@ -339,7 +345,7 @@
}
static void
-evas_engine_cairo_x11_output_redraws_clear(void *data)
+eng_output_redraws_clear(void *data)
{
Render_Engine *re;
@@ -348,7 +354,7 @@
}
static void *
-evas_engine_cairo_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;
@@ -367,7 +373,7 @@
}
static void
-evas_engine_cairo_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;
@@ -376,7 +382,7 @@
}
static void
-evas_engine_cairo_x11_output_flush(void *data)
+eng_output_flush(void *data)
{
Render_Engine *re;
Evas_Cairo_Context *ctxt;
@@ -386,7 +392,7 @@
}
static void *
-evas_engine_cairo_x11_context_new(void *data)
+eng_context_new(void *data)
{
Render_Engine *re;
Evas_Cairo_Context *ctxt;
@@ -401,7 +407,7 @@
}
static void
-evas_engine_cairo_x11_context_free(void *data, void *context)
+eng_context_free(void *data, void *context)
{
Render_Engine *re;
Evas_Cairo_Context *ctxt;
@@ -414,7 +420,7 @@
}
static void
-evas_engine_cairo_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;
@@ -423,7 +429,7 @@
}
static void
-evas_engine_cairo_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;
@@ -432,7 +438,7 @@
}
static void
-evas_engine_cairo_x11_context_clip_unset(void *data, void *context)
+eng_context_clip_unset(void *data, void *context)
{
Render_Engine *re;
@@ -441,7 +447,7 @@
}
static int
-evas_engine_cairo_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;
@@ -451,7 +457,7 @@
}
static void
-evas_engine_cairo_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;
Evas_Cairo_Context *ctxt;
@@ -466,7 +472,7 @@
}
static int
-evas_engine_cairo_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;
Evas_Cairo_Context *ctxt;
@@ -482,7 +488,7 @@
}
static void
-evas_engine_cairo_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;
Evas_Cairo_Context *ctxt;
@@ -498,7 +504,7 @@
}
static void
-evas_engine_cairo_x11_context_multiplier_unset(void *data, void *context)
+eng_context_multiplier_unset(void *data, void *context)
{
Render_Engine *re;
Evas_Cairo_Context *ctxt;
@@ -509,7 +515,7 @@
}
static int
-evas_engine_cairo_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;
Evas_Cairo_Context *ctxt;
@@ -525,7 +531,7 @@
}
static void
-evas_engine_cairo_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;
@@ -534,7 +540,7 @@
}
static void
-evas_engine_cairo_x11_context_cutout_clear(void *data, void *context)
+eng_context_cutout_clear(void *data, void *context)
{
Render_Engine *re;
@@ -543,7 +549,7 @@
}
static void
-evas_engine_cairo_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;
@@ -551,7 +557,7 @@
}
static unsigned char
-evas_engine_cairo_x11_context_anti_alias_get(void *data, void *context)
+eng_context_anti_alias_get(void *data, void *context)
{
Render_Engine *re;
@@ -560,7 +566,7 @@
}
static void
-evas_engine_cairo_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;
@@ -568,7 +574,7 @@
}
static int
-evas_engine_cairo_x11_context_color_interpolation_get(void *data, void
*context)
+eng_context_color_interpolation_get(void *data, void *context)
{
Render_Engine *re;
@@ -577,7 +583,7 @@
}
static void
-evas_engine_cairo_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;
Evas_Cairo_Context *ctxt;
@@ -603,7 +609,7 @@
}
static void
-evas_engine_cairo_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;
Evas_Cairo_Context *ctxt;
@@ -630,7 +636,7 @@
}
static void *
-evas_engine_cairo_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;
Evas_Cairo_Context *ctxt;
@@ -653,7 +659,7 @@
}
static void *
-evas_engine_cairo_x11_polygon_points_clear(void *data, void *context, void
*polygon)
+eng_polygon_points_clear(void *data, void *context, void *polygon)
{
Render_Engine *re;
Evas_Cairo_Context *ctxt;
@@ -675,7 +681,7 @@
}
static void
-evas_engine_cairo_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;
Evas_Cairo_Context *ctxt;
@@ -714,7 +720,7 @@
}
static void *
-evas_engine_cairo_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;
@@ -723,7 +729,7 @@
}
static void *
-evas_engine_cairo_x11_gradient_colors_clear(void *data, void *context, void
*gradient)
+eng_gradient_colors_clear(void *data, void *context, void *gradient)
{
Render_Engine *re;
@@ -732,7 +738,7 @@
}
static void
-evas_engine_cairo_x11_gradient_free(void *data, void *gradient)
+eng_gradient_free(void *data, void *gradient)
{
Render_Engine *re;
@@ -740,7 +746,7 @@
}
static void
-evas_engine_cairo_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;
@@ -748,7 +754,7 @@
}
static void
-evas_engine_cairo_x11_gradient_type_set(void *data, void *gradient, char *name)
+eng_gradient_type_set(void *data, void *gradient, char *name)
{
Render_Engine *re;
@@ -756,7 +762,7 @@
}
static void
-evas_engine_cairo_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;
@@ -764,7 +770,7 @@
}
static void *
-evas_engine_cairo_x11_gradient_geometry_init(void *data, void *gradient, int
spread)
+eng_gradient_geometry_init(void *data, void *gradient, int spread)
{
Render_Engine *re;
@@ -773,7 +779,7 @@
}
static int
-evas_engine_cairo_x11_gradient_alpha_get(void *data, void *gradient, int
spread)
+eng_gradient_alpha_get(void *data, void *gradient, int spread)
{
Render_Engine *re;
@@ -782,7 +788,7 @@
}
static void
-evas_engine_cairo_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;
@@ -790,7 +796,7 @@
}
static void
-evas_engine_cairo_x11_gradient_draw(void *data, void *context, void *surface,
void *gradient, int x, int y, int w, int h, double angle)
+eng_gradient_draw(void *data, void *context, void *surface, void *gradient,
int x, int y, int w, int h, double angle)
{
Render_Engine *re;
@@ -798,7 +804,7 @@
}
static void *
-evas_engine_cairo_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;
Evas_Cairo_Image *im;
@@ -820,7 +826,7 @@
}
static void *
-evas_engine_cairo_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;
Evas_Cairo_Image *im;
@@ -854,7 +860,7 @@
}
static void *
-evas_engine_cairo_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;
Evas_Cairo_Image *im;
@@ -877,7 +883,7 @@
}
static void
-evas_engine_cairo_x11_image_free(void *data, void *image)
+eng_image_free(void *data, void *image)
{
Render_Engine *re;
Evas_Cairo_Image *im;
@@ -891,7 +897,7 @@
}
static void
-evas_engine_cairo_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;
@@ -912,7 +918,7 @@
}
static void *
-evas_engine_cairo_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;
@@ -922,7 +928,7 @@
}
static void *
-evas_engine_cairo_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;
@@ -932,7 +938,7 @@
}
static void *
-evas_engine_cairo_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;
@@ -943,7 +949,7 @@
}
static void *
-evas_engine_cairo_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;
@@ -953,7 +959,7 @@
}
static void *
-evas_engine_cairo_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;
@@ -963,7 +969,7 @@
}
static int
-evas_engine_cairo_x11_image_alpha_get(void *data, void *image)
+eng_image_alpha_get(void *data, void *image)
{
Render_Engine *re;
Evas_Cairo_Image *im;
@@ -977,7 +983,7 @@
}
static void
-evas_engine_cairo_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;
Evas_Cairo_Context *ctxt;
@@ -1050,7 +1056,7 @@
}
static char *
-evas_engine_cairo_x11_image_comment_get(void *data, void *image, char *key)
+eng_image_comment_get(void *data, void *image, char *key)
{
Render_Engine *re;
@@ -1060,7 +1066,7 @@
}
static char *
-evas_engine_cairo_x11_image_format_get(void *data, void *image)
+eng_image_format_get(void *data, void *image)
{
Render_Engine *re;
@@ -1070,7 +1076,7 @@
}
static void
-evas_engine_cairo_x11_image_cache_flush(void *data)
+eng_image_cache_flush(void *data)
{
Render_Engine *re;
int tmp_size;
@@ -1082,7 +1088,7 @@
}
static void
-evas_engine_cairo_x11_image_cache_set(void *data, int bytes)
+eng_image_cache_set(void *data, int bytes)
{
Render_Engine *re;
@@ -1091,7 +1097,7 @@
}
static int
-evas_engine_cairo_x11_image_cache_get(void *data)
+eng_image_cache_get(void *data)
{
Render_Engine *re;
@@ -1100,7 +1106,7 @@
}
static void *
-evas_engine_cairo_x11_font_load(void *data, char *name, int size)
+eng_font_load(void *data, char *name, int size)
{
Render_Engine *re;
@@ -1110,7 +1116,7 @@
}
static void *
-evas_engine_cairo_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;
@@ -1120,7 +1126,7 @@
}
static void *
-evas_engine_cairo_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;
@@ -1130,7 +1136,7 @@
}
static void *
-evas_engine_cairo_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;
@@ -1140,7 +1146,7 @@
}
static void
-evas_engine_cairo_x11_font_free(void *data, void *font)
+eng_font_free(void *data, void *font)
{
Render_Engine *re;
@@ -1149,7 +1155,7 @@
}
static int
-evas_engine_cairo_x11_font_ascent_get(void *data, void *font)
+eng_font_ascent_get(void *data, void *font)
{
Render_Engine *re;
@@ -1159,7 +1165,7 @@
}
static int
-evas_engine_cairo_x11_font_descent_get(void *data, void *font)
+eng_font_descent_get(void *data, void *font)
{
Render_Engine *re;
@@ -1169,7 +1175,7 @@
}
static int
-evas_engine_cairo_x11_font_max_ascent_get(void *data, void *font)
+eng_font_max_ascent_get(void *data, void *font)
{
Render_Engine *re;
@@ -1179,7 +1185,7 @@
}
static int
-evas_engine_cairo_x11_font_max_descent_get(void *data, void *font)
+eng_font_max_descent_get(void *data, void *font)
{
Render_Engine *re;
@@ -1189,7 +1195,7 @@
}
static void
-evas_engine_cairo_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;
@@ -1198,7 +1204,7 @@
}
static int
-evas_engine_cairo_x11_font_inset_get(void *data, void *font, char *text)
+eng_font_inset_get(void *data, void *font, char *text)
{
Render_Engine *re;
@@ -1208,7 +1214,7 @@
}
static int
-evas_engine_cairo_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;
@@ -1219,7 +1225,7 @@
}
static int
-evas_engine_cairo_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;
@@ -1230,7 +1236,7 @@
}
static int
-evas_engine_cairo_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;
@@ -1240,7 +1246,7 @@
}
static int
-evas_engine_cairo_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;
@@ -1250,7 +1256,7 @@
}
static void
-evas_engine_cairo_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;
@@ -1259,7 +1265,7 @@
}
static void
-evas_engine_cairo_x11_font_cache_flush(void *data)
+eng_font_cache_flush(void *data)
{
Render_Engine *re;
@@ -1268,7 +1274,7 @@
}
static void
-evas_engine_cairo_x11_font_cache_set(void *data, int bytes)
+eng_font_cache_set(void *data, int bytes)
{
Render_Engine *re;
@@ -1277,7 +1283,7 @@
}
static int
-evas_engine_cairo_x11_font_cache_get(void *data)
+eng_font_cache_get(void *data)
{
Render_Engine *re;
@@ -1286,10 +1292,28 @@
return 0;
}
+static void
+eng_font_hinting_set(void *data, void *font, int hinting)
+{
+ Render_Engine *re;
+
+ /* FIXME, use cairo font subsystem */
+ re = (Render_Engine *)data;
+}
+
+static int
+eng_font_hinting_can_hint(void *data, int hinting)
+{
+ Render_Engine *re;
+
+ /* FIXME, use cairo font subsystem */
+ re = (Render_Engine *)data;
+}
+
int module_open(Evas_Module *em)
{
if (!em) return 0;
- em->functions = (void *)(&evas_engine_cairo_x11_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
