Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/evas

Dir     : e17/libs/evas/src/modules/engines/xrender_x11


Modified Files:
        evas_engine.c 


Log Message:


1. add new api calls to 1. set a "native surface" for image objects. this
currently does nothing and i have kept it VEEERY generic it's a pointer to a
native surface which can be just about anything - each engine will probably
define a format of its own you need to use VIA the native surface type.
2. add calls to set/get colorspace - moving this down into the engine level.
so far engines do nothing at all with it - but api is there.
3. clean up gl engine a bit - make it more standard.

===================================================================
RCS file: /cvs/e/e17/libs/evas/src/modules/engines/xrender_x11/evas_engine.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- evas_engine.c       30 Sep 2006 10:18:36 -0000      1.13
+++ evas_engine.c       9 Dec 2006 08:52:08 -0000       1.14
@@ -36,68 +36,6 @@
    Evas_List            *updates;
 };
 
-/* prototypes we will use here */
-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_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_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_draw(void *data, void *context, void *surface, void 
*polygon);
-
-static void *eng_gradient_new(void *data);
-static void eng_gradient_free(void *data, void *gradient);
-static void eng_gradient_color_stop_add(void *data, void *gradient, int r, int 
g, int b, int a, int delta);
-static void eng_gradient_alpha_stop_add(void *data, void *gradient, int a, int 
delta);
-static void eng_gradient_color_data_set(void *data, void *gradient, void *map, 
int len, int has_alpha);
-static void eng_gradient_alpha_data_set(void *data, void *gradient, void 
*alpha_map, int len);
-static void eng_gradient_clear(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_fill_angle_set(void *data, void *gradient, double 
angle);
-static void eng_gradient_fill_spread_set(void *data, void *gradient, int 
spread);
-static void eng_gradient_angle_set(void *data, void *gradient, double angle);
-static void eng_gradient_offset_set(void *data, void *gradient, float offset);
-static void eng_gradient_direction_set(void *data, void *gradient, int 
direction);
-static void eng_gradient_type_set(void *data, void *gradient, char *name, char 
*params);
-static int eng_gradient_is_opaque(void *data, void *context, void *gradient, 
int x, int y, int w, int h);
-static int eng_gradient_is_visible(void *data, void *context, void *gradient, 
int x, int y, int w, int h);
-static void eng_gradient_render_pre(void *data, void *context, void *gradient);
-static void eng_gradient_render_post(void *data, void *gradient);
-static void eng_gradient_draw(void *data, void *context, void *surface, void 
*gradient, int x, int y, int w, int h);
-
-static void *eng_image_load(void *data, const char *file, const char *key, int 
*error, Evas_Image_Load_Opts *lo);
-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_border_set(void *data, void *image, int l, int r, int 
t, int b);
-static void eng_image_border_get(void *data, void *image, int *l, int *r, int 
*t, int *b);
-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 const 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_draw(void *data, void *context, void *surface, void 
*font, int x, int y, int w, int h, int ow, int oh, const char *text);
-
 /* internal engine routines */
 
 /* engine api this module provides */
@@ -752,6 +690,28 @@
 }
 
 static void
+eng_image_colorspace_set(void *data, void *image, int cspace)
+{
+}
+
+static int
+eng_image_colorspace_get(void *data, void *image)
+{
+   return EVAS_COLORSPACE_ARGB8888;
+}
+
+static void
+eng_image_native_set(void *data, void *image, void *native)
+{
+}
+
+static void *
+eng_image_native_get(void *data, void *image)
+{
+   return NULL;
+}
+
+static void
 eng_image_cache_flush(void *data)
 {
    int tmp_size;
@@ -870,6 +830,10 @@
    ORD(image_draw);
    ORD(image_comment_get);
    ORD(image_format_get);
+   ORD(image_colorspace_set);
+   ORD(image_colorspace_get);
+   ORD(image_native_set);
+   ORD(image_native_get);
    ORD(image_cache_flush);
    ORD(image_cache_set);
    ORD(image_cache_get);



-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to