Enlightenment CVS committal Author : raster Project : e17 Module : libs/evas
Dir : e17/libs/evas/src/lib/include Modified Files: evas_cairo_common.h evas_common.h evas_gl_common.h evas_private.h Log Message: whitespace =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/include/evas_cairo_common.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- evas_cairo_common.h 17 Aug 2004 06:03:39 -0000 1.1 +++ evas_cairo_common.h 22 May 2005 02:49:50 -0000 1.2 @@ -38,20 +38,20 @@ char buf : 1; char other : 1; } change; - + struct { char active : 1; int x, y, w, h; } clip; - + struct { int checked : 1; int sgis_generate_mipmap : 1; int nv_texture_rectangle : 1; } ext; - + int references; - + Evas_List *images; }; @@ -99,20 +99,20 @@ void evas_gl_common_texture_update(Evas_GL_Texture *tex, RGBA_Image *im, int smooth); void evas_gl_common_texture_free(Evas_GL_Texture *tex); void evas_gl_common_texture_mipmaps_build(Evas_GL_Texture *tex, RGBA_Image *im, int smooth); - + Evas_GL_Image *evas_gl_common_image_load(Evas_GL_Context *gc, char *file, char *key); Evas_GL_Image *evas_gl_common_image_new_from_data(Evas_GL_Context *gc, int w, int h, int *data); Evas_GL_Image *evas_gl_common_image_new_from_copied_data(Evas_GL_Context *gc, int w, int h, int *data); Evas_GL_Image *evas_gl_common_image_new(Evas_GL_Context *gc, int w, int h); void evas_gl_common_image_free(Evas_GL_Image *im); -void evas_gl_common_image_dirty(Evas_GL_Image *im); +void evas_gl_common_image_dirty(Evas_GL_Image *im); Evas_GL_Polygon *evas_gl_common_poly_point_add(Evas_GL_Polygon *poly, int x, int y); Evas_GL_Polygon *evas_gl_common_poly_points_clear(Evas_GL_Polygon *poly); Evas_GL_Gradient *evas_gl_common_gradient_color_add(Evas_GL_Gradient *gr, int r, int g, int b, int a, int distance); Evas_GL_Gradient *evas_gl_common_gradient_colors_clear(Evas_GL_Gradient *gr); - + void evas_gl_common_swap_rect(Evas_GL_Context *gc, int x, int y, int w, int h); void evas_gl_common_rect_draw(Evas_GL_Context *gc, RGBA_Draw_Context *dc, int x, int y, int w, int h); =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/include/evas_common.h,v retrieving revision 1.37 retrieving revision 1.38 diff -u -3 -r1.37 -r1.38 --- evas_common.h 28 Mar 2005 02:27:16 -0000 1.37 +++ evas_common.h 22 May 2005 02:49:50 -0000 1.38 @@ -268,7 +268,7 @@ int x, y, w, h; } clip; struct { - Cutout_Rect *rects; + Cutout_Rect *rects; } cutout; struct { struct { @@ -293,7 +293,7 @@ Evas_Object_List _list_data; RGBA_Surface *image; RGBA_Image_Flags flags; - struct + struct { int format; char *file; @@ -332,7 +332,7 @@ struct _RGBA_Font_Int { Evas_Object_List _list_data; - + RGBA_Font_Source *src; int size; @@ -341,36 +341,36 @@ struct { FT_Size size; } ft; - + Evas_Hash *glyphs; int usage; - + int references; }; struct _RGBA_Font_Source { Evas_Object_List _list_data; - + char *name; char *file; - + void *data; int data_size; - + int current_size; - + struct { int orig_upem; FT_Face face; } ft; - + int references; }; struct _RGBA_Font_Glyph -{ +{ FT_Glyph glyph; FT_BitmapGlyph glyph_out; void *ext_dat; @@ -381,7 +381,7 @@ { int outbuf_w; int outbuf_h; - + struct { int w, h; } tile_size; @@ -400,11 +400,11 @@ { int redraw : 1; /* FIXME: need these flags later - but not now */ -/* +/* int done : 1; int edge : 1; int from : 1; - + struct { int dx, dy; } vector; @@ -559,11 +559,11 @@ /* thanks to some chats with Mirek Fidler... the new blender code for C * blender fallbacks is faster. benchmarks (for the blending code only): - * + * * OLD BLENDER: * MMX: 0.606 * C: 1.026 - * + * * NEW BLENDER: * MMX: 0.549 * C: 0.716 @@ -630,7 +630,7 @@ #ifdef __cplusplus extern "C" { #endif - + Evas_List *evas_list_append (Evas_List *list, const void *data); Evas_List *evas_list_prepend (Evas_List *list, const void *data); Evas_List *evas_list_append_relative (Evas_List *list, const void *data, const void *relative); @@ -649,7 +649,7 @@ Evas_List *evas_list_nth_list (Evas_List *list, int n); Evas_List *evas_list_reverse (Evas_List *list); int evas_list_alloc_error (void); - + Evas_Hash *evas_hash_add (Evas_Hash *hash, const char *key, const void *data); Evas_Hash *evas_hash_del (Evas_Hash *hash, const char *key, const void *data); void *evas_hash_find (Evas_Hash *hash, const char *key); @@ -657,14 +657,14 @@ void evas_hash_free (Evas_Hash *hash); void evas_hash_foreach (Evas_Hash *hash, Evas_Bool (*func) (Evas_Hash *hash, const char *key, void *data, void *fdata), const void *fdata); int evas_hash_alloc_error (void); - + void *evas_object_list_append (void *in_list, void *in_item); void *evas_object_list_prepend (void *in_list, void *in_item); void *evas_object_list_append_relative (void *in_list, void *in_item, void *in_relative); void *evas_object_list_prepend_relative (void *in_list, void *in_item, void *in_relative); void *evas_object_list_remove (void *in_list, void *in_item); void *evas_object_list_find (void *in_list, void *in_item); - + /****/ void evas_common_cpu_init (void); @@ -672,11 +672,11 @@ int evas_common_cpu_has_feature (unsigned int feature); void evas_common_cpu_can_do (int *mmx, int *sse, int *sse2); void evas_common_cpu_end_opt (void); - + /****/ void evas_common_blend_init (void); void evas_common_blend_init_evas_pow_lut (void); - + void evas_common_blend_pixels_rgba_to_rgb_c (DATA32 *src, DATA32 *dst, int len); void evas_common_blend_pixels_rgba_to_rgb_mmx (DATA32 *src, DATA32 *dst, int len); void evas_common_blend_pixels_rgba_to_rgba_c (DATA32 *src, DATA32 *dst, int len); @@ -781,7 +781,7 @@ void evas_common_convert_rgba_to_1bpp_gry_1_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); void evas_common_convert_yuv_420p_601_rgba (DATA8 **src, DATA8 *dst, int w, int h); - + /****/ void evas_common_scale_init (void); @@ -795,7 +795,7 @@ void evas_common_scale_rgba_mipmap_down_2x2_mmx (DATA32 *src, DATA32 *dst, int src_w, int src_h); void evas_common_scale_rgba_mipmap_down_2x1_mmx (DATA32 *src, DATA32 *dst, int src_w, int src_h); void evas_common_scale_rgba_mipmap_down_1x2_mmx (DATA32 *src, DATA32 *dst, int src_w, int src_h); - + void evas_common_scale_rgba_in_to_out_clip_smooth_mmx (RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, int src_region_x, int src_region_y, int src_region_w, int src_region_h, int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h); void evas_common_scale_rgba_in_to_out_clip_smooth_c (RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, int src_region_x, int src_region_y, int src_region_w, int src_region_h, int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h); @@ -805,12 +805,12 @@ /****/ void evas_common_image_init (void); void evas_common_image_shutdown (void); - + RGBA_Surface *evas_common_image_surface_new (RGBA_Image *im); void evas_common_image_surface_free (RGBA_Surface *is); void evas_common_image_surface_alloc (RGBA_Surface *is); void evas_common_image_surface_dealloc (RGBA_Surface *is); - + RGBA_Image *evas_common_image_create (int w, int h); RGBA_Image *evas_common_image_new (void); void evas_common_image_free (RGBA_Image *im); @@ -820,7 +820,7 @@ void evas_common_image_uncache (RGBA_Image *im); void evas_common_image_flush_cache (void); void evas_common_image_set_cache (int size); -int evas_common_image_get_cache (void); +int evas_common_image_get_cache (void); void evas_common_image_store (RGBA_Image *im); void evas_common_image_unstore (RGBA_Image *im); RGBA_Image *evas_common_image_find (const char *filename, const char *key, DATA64 timestamp); @@ -871,7 +871,7 @@ RGBA_Font_Source *evas_common_font_source_load (const char *name); RGBA_Font_Source *evas_common_font_source_find (const char *name); void evas_common_font_source_free (RGBA_Font_Source *fs); -void evas_common_font_size_use (RGBA_Font *fn); +void evas_common_font_size_use (RGBA_Font *fn); RGBA_Font *evas_common_font_memory_load (const char *name, int size, const void *data, int data_size); RGBA_Font *evas_common_font_load (const char *name, int size); RGBA_Font *evas_common_font_add (RGBA_Font *fn, const char *name, int size); @@ -900,7 +900,7 @@ int evas_common_font_utf8_get_next (unsigned char *buf, int *iindex); int evas_common_font_utf8_get_prev (unsigned char *buf, int *iindex); int evas_common_font_utf8_get_last (unsigned char *buf, int buflen); - + /****/ void evas_common_tilebuf_init (void); @@ -922,7 +922,7 @@ void evas_common_regionbuf_span_add (Regionbuf *rb, int x1, int x2, int y); void evas_common_regionbuf_span_del (Regionbuf *rb, int x1, int x2, int y); Tilebuf_Rect *evas_common_regionbuf_rects_get (Regionbuf *rb); - + /****/ void evas_common_draw_init (void); =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/include/evas_gl_common.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- evas_gl_common.h 10 Sep 2003 14:33:39 -0000 1.7 +++ evas_gl_common.h 22 May 2005 02:49:50 -0000 1.8 @@ -40,7 +40,7 @@ struct _Evas_GL_Context { int w, h; - + char dither : 1; char blend : 1; unsigned char r, g, b, a; @@ -55,30 +55,30 @@ char buf : 1; char other : 1; } change; - + struct { char active : 1; int x, y, w, h; } clip; - + struct { int checked : 1; int sgis_generate_mipmap : 1; int nv_texture_rectangle : 1; } ext; - + GLenum read_buf; GLenum write_buf; - + Evas_GL_Texture *texture; GLuint font_texture; char font_texture_not_power_of_two : 1; - + int max_texture_depth; int max_texture_size; - + int references; - + Evas_List *images; Evas_List *tex_pool; }; @@ -89,15 +89,15 @@ int w, h; int tw, th; int uw, uh; - + GLuint texture; - + char smooth : 1; char changed : 1; char have_mipmaps : 1; - char not_power_of_two : 1; + char not_power_of_two : 1; char opt : 1; - + int references; }; @@ -133,7 +133,7 @@ int x, y, w, h; double tx1, ty1, tx2, ty2; int aw, ah; - GLuint texture; + GLuint texture; Evas_GL_Font_Texture_Pool *pool; Evas_GL_Font_Texture_Pool_Allocation *alloc; }; @@ -143,8 +143,8 @@ Evas_GL_Context *gc; int w, h; GLuint texture; - int references; - char not_power_of_two : 1; + int references; + char not_power_of_two : 1; Evas_List *allocations; }; @@ -171,20 +171,20 @@ void evas_gl_common_texture_update(Evas_GL_Texture *tex, RGBA_Image *im, int smooth); void evas_gl_common_texture_free(Evas_GL_Texture *tex); void evas_gl_common_texture_mipmaps_build(Evas_GL_Texture *tex, RGBA_Image *im, int smooth); - + Evas_GL_Image *evas_gl_common_image_load(Evas_GL_Context *gc, char *file, char *key); Evas_GL_Image *evas_gl_common_image_new_from_data(Evas_GL_Context *gc, int w, int h, int *data); Evas_GL_Image *evas_gl_common_image_new_from_copied_data(Evas_GL_Context *gc, int w, int h, int *data); Evas_GL_Image *evas_gl_common_image_new(Evas_GL_Context *gc, int w, int h); void evas_gl_common_image_free(Evas_GL_Image *im); -void evas_gl_common_image_dirty(Evas_GL_Image *im); +void evas_gl_common_image_dirty(Evas_GL_Image *im); Evas_GL_Polygon *evas_gl_common_poly_point_add(Evas_GL_Polygon *poly, int x, int y); Evas_GL_Polygon *evas_gl_common_poly_points_clear(Evas_GL_Polygon *poly); Evas_GL_Gradient *evas_gl_common_gradient_color_add(Evas_GL_Gradient *gr, int r, int g, int b, int a, int distance); Evas_GL_Gradient *evas_gl_common_gradient_colors_clear(Evas_GL_Gradient *gr); - + void evas_gl_common_swap_rect(Evas_GL_Context *gc, int x, int y, int w, int h); void evas_gl_common_rect_draw(Evas_GL_Context *gc, RGBA_Draw_Context *dc, int x, int y, int w, int h); @@ -198,11 +198,11 @@ void evas_gl_font_texture_draw(Evas_GL_Context *gc, void *surface, RGBA_Draw_Context *dc, RGBA_Font_Glyph *fg, int x, int y); /* FIXME: - * + * * for images: * speculative cache for textures too * texture mesh support - * + * * for text/fonts: * need to not render to a texture each time.... this is sloooooow. * but its a "bootstrap" for just right now. =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/include/evas_private.h,v retrieving revision 1.41 retrieving revision 1.42 diff -u -3 -r1.41 -r1.42 --- evas_private.h 3 Apr 2005 14:22:17 -0000 1.41 +++ evas_private.h 22 May 2005 02:49:50 -0000 1.42 @@ -28,7 +28,7 @@ EVAS_CALLBACK_MOUSE_DOWN, EVAS_CALLBACK_MOUSE_UP, EVAS_CALLBACK_MOUSE_MOVE, - EVAS_CALLBACK_MOUSE_WHEEL, + EVAS_CALLBACK_MOUSE_WHEEL, EVAS_CALLBACK_FREE, EVAS_CALLBACK_KEY_DOWN, EVAS_CALLBACK_KEY_UP, @@ -231,24 +231,24 @@ Evas_Intercept_Func_Obj stack_above; Evas_Intercept_Func_Obj stack_below; Evas_Intercept_Func_Int layer_set; -}; +}; struct _Evas_Smart { DATA32 magic; int usage; - + char delete_me : 1; char class_allocated : 1; - + Evas_Smart_Class *smart_class; }; struct _Evas_Smart_Class /** a smart object class */ { const char *name; /** the string name of the class */ - + void (*add) (Evas_Object *o); void (*del) (Evas_Object *o); void (*layer_set) (Evas_Object *o, int l); @@ -263,7 +263,7 @@ void (*color_set) (Evas_Object *o, int r, int g, int b, int a); void (*clip_set) (Evas_Object *o, Evas_Object *clip); void (*clip_unset) (Evas_Object *o); - + const void *data; }; @@ -310,9 +310,9 @@ struct _Evas { Evas_Object_List _list_data; - + DATA32 magic; - + struct { char inside : 1; int mouse_grabbed; @@ -320,46 +320,46 @@ int x, y; Evas_Coord canvas_x, canvas_y; - + struct { Evas_List *in; } object; - + } pointer; - + struct { Evas_Coord x, y, w, h; char changed : 1; } viewport; - + struct { int w, h; DATA32 render_method; char changed : 1; } output; - + int output_validity; - + Evas_List *damages; Evas_List *obscures; - + Evas_Layer *layers; - + Evas_Hash *name_hash; - + char changed : 1; char walking_layers : 1; - + int events_frozen; - + struct { Evas_Func *func; struct { void *output; - + void *context; } data; - + void *info; int info_magic; } engine; @@ -367,9 +367,9 @@ int delete_grabs; int walking_grabs; Evas_List *grabs; - + Evas_List *font_path; - + Evas_Object *focused; Evas_Modifier modifiers; Evas_Lock locks; @@ -378,10 +378,10 @@ struct _Evas_Layer { Evas_Object_List _list_data; - + int layer; Evas_Object *objects; - + Evas *evas; void *engine_data; @@ -391,12 +391,12 @@ struct _Evas_Object { Evas_Object_List _list_data; - + DATA32 magic; - - const char *type; - Evas_Layer *layer; - + + const char *type; + Evas_Layer *layer; + struct { struct { struct { @@ -415,24 +415,24 @@ } geometry; struct { unsigned char r, g, b, a; - } color; - char visible : 1; - int layer; - Evas_Object *clipper; + } color; + char visible : 1; + int layer; + Evas_Object *clipper; } cur, prev; - + char *name; - + Evas_Intercept_Func *interceptors; - + struct { Evas_List *elements; } data; - + Evas_List *grabs; Evas_Callbacks *callbacks; - + struct { Evas_List *clipees; Evas_List *changes; @@ -441,7 +441,7 @@ Evas_Object_Func *func; void *object_data; - + struct { int walking_list; Evas_Smart *smart; @@ -451,9 +451,9 @@ Evas_List *callbacks; char deletions_waiting : 1; } smart; - + int mouse_grabbed; - + short store : 1; short pass_events : 1; short repeat_events : 1; @@ -464,12 +464,12 @@ short intercepted : 1; short focused : 1; - unsigned char delete_me; + unsigned char delete_me; }; struct _Evas_Func_Node { - Evas_Object_List _list_data; + Evas_Object_List _list_data; char delete_me : 1; void (*func) (void *data, Evas *e, Evas_Object *obj, void *event_info); void *data; @@ -515,19 +515,19 @@ void (*render) (Evas_Object *obj, void *output, void *context, void *surface, int x, int y); void (*render_pre) (Evas_Object *obj); void (*render_post) (Evas_Object *obj); - + void (*store) (Evas_Object *obj); void (*unstore) (Evas_Object *obj); - + int (*is_visible) (Evas_Object *obj); int (*was_visible) (Evas_Object *obj); - + int (*is_opaque) (Evas_Object *obj); int (*was_opaque) (Evas_Object *obj); - + int (*is_inside) (Evas_Object *obj, Evas_Coord x, Evas_Coord y); int (*was_inside) (Evas_Object *obj, Evas_Coord x, Evas_Coord y); - + void (*coords_recalc) (Evas_Object *obj); }; @@ -536,7 +536,7 @@ void *(*info) (Evas *e); void (*info_free) (Evas *e, void *info); void (*setup) (Evas *e, void *info); - + void (*output_free) (void *data); void (*output_resize) (void *data, int w, int h); void (*output_tile_size_set) (void *data, int w, int h); @@ -546,7 +546,7 @@ void *(*output_redraws_next_update_get) (void *data, int *x, int *y, int *w, int *h, int *cx, int *cy, int *cw, int *ch); void (*output_redraws_next_update_push) (void *data, void *surface, int x, int y, int w, int h); void (*output_flush) (void *data); - + void *(*context_new) (void *data); void (*context_free) (void *data, void *context); void (*context_clip_set) (void *data, void *context, int x, int y, int w, int h); @@ -560,20 +560,20 @@ int (*context_multiplier_get) (void *data, void *context, int *r, int *g, int *b, int *a); void (*context_cutout_add) (void *data, void *context, int x, int y, int w, int h); void (*context_cutout_clear) (void *data, void *context); - + void (*rectangle_draw) (void *data, void *context, void *surface, int x, int y, int w, int h); void (*line_draw) (void *data, void *context, void *surface, int x1, int y1, int x2, int y2); - + void *(*polygon_point_add) (void *data, void *context, void *polygon, int x, int y); void *(*polygon_points_clear) (void *data, void *context, void *polygon); void (*polygon_draw) (void *data, void *context, void *surface, void *polygon); - + void *(*gradient_color_add) (void *data, void *context, void *gradient, int r, int g, int b, int a, int distance); void *(*gradient_colors_clear) (void *data, void *context, void *gradient); void (*gradient_draw) (void *data, void *context, void *surface, void *gradient, int x, int y, int w, int h, double angle); - + void *(*image_load) (void *data, char *file, char *key, int *error); void *(*image_new_from_data) (void *data, int w, int h, DATA32 *image_data); void *(*image_new_from_copied_data) (void *data, int w, int h, DATA32 *image_data); @@ -588,11 +588,11 @@ void (*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); char *(*image_comment_get) (void *data, void *image, char *key); char *(*image_format_get) (void *data, void *image); - + void (*image_cache_flush) (void *data); void (*image_cache_set) (void *data, int bytes); int (*image_cache_get) (void *data); - + void *(*font_load) (void *data, char *name, int size); void *(*font_memory_load) (void *data, char *name, int size, const void *fdata, int fdata_size); void *(*font_add) (void *data, void *font, char *name, int size); @@ -609,18 +609,18 @@ int (*font_char_coords_get) (void *data, void *font, char *text, int pos, int *cx, int *cy, int *cw, int *ch); int (*font_char_at_coords_get) (void *data, void *font, char *text, int x, int y, int *cx, int *cy, int *cw, int *ch); void (*font_draw) (void *data, void *context, void *surface, void *font, int x, int y, int w, int h, int ow, int oh, char *text); - + void (*font_cache_flush) (void *data); void (*font_cache_set) (void *data, int bytes); int (*font_cache_get) (void *data); - + /* Engine functions will over time expand from here */ }; #ifdef __cplusplus extern "C" { #endif - + Evas_Object *evas_object_new(void); void evas_object_free(Evas_Object *obj, int clean_layer); void evas_object_inject(Evas_Object *obj, Evas *e); @@ -670,11 +670,11 @@ void evas_debug_generic(const char *str); char *evas_debug_magic_string_get(DATA32 magic); void evas_object_smart_use(Evas_Smart *s); -void evas_object_smart_unuse(Evas_Smart *s); +void evas_object_smart_unuse(Evas_Smart *s); void evas_object_smart_del(Evas_Object *obj); void evas_object_smart_cleanup(Evas_Object *obj); void *evas_mem_calloc(int size); -void evas_object_event_callback_cleanup(Evas_Object *obj); +void evas_object_event_callback_cleanup(Evas_Object *obj); void evas_object_inform_call_show(Evas_Object *obj); void evas_object_inform_call_hide(Evas_Object *obj); void evas_object_inform_call_move(Evas_Object *obj); @@ -696,7 +696,7 @@ char *evas_font_dir_cache_find(char *dir, char *font); void evas_font_free(Evas *evas, void *font); void *evas_font_load(Evas *evas, char *name, char *source, int size); - + extern int _evas_alloc_error; typedef struct _Evas_Imaging_Image Evas_Imaging_Image; @@ -711,7 +711,7 @@ { RGBA_Font *font; }; - + #ifdef __cplusplus } #endif ------------------------------------------------------- This SF.Net email is sponsored by Oracle Space Sweepstakes Want to be the first software developer in space? Enter now for the Oracle Space Sweepstakes! http://ads.osdn.com/?ad_id=7412&alloc_id=16344&op=click _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs