Enlightenment CVS committal Author : raster Project : e17 Module : libs/evas
Dir : e17/libs/evas/src/lib Modified Files: Evas.h Evas_Engine_Buffer.h Evas_Engine_Cairo_X11.h Evas_Engine_DirectFB.h Evas_Engine_FB.h Evas_Engine_GL_X11.h Evas_Engine_Software_Qtopia.h Evas_Engine_Software_Win32_GDI.h Evas_Engine_Software_X11.h Evas_Engine_Software_Xcb.h main.c Log Message: whitespace =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/Evas.h,v retrieving revision 1.47 retrieving revision 1.48 diff -u -3 -r1.47 -r1.48 --- Evas.h 3 May 2005 08:02:26 -0000 1.47 +++ Evas.h 22 May 2005 02:49:35 -0000 1.48 @@ -1,4 +1,4 @@ -#ifndef _EVAS_H +#ifndef _EVAS_H #define _EVAS_H #ifdef EAPI @@ -83,7 +83,7 @@ void *data; /**< Pointer to list element payload */ Evas_List *next; /**< Next member in the list */ Evas_List *prev; /**< Previous member in the list */ - + Evas_List *last; /**< Private member. Don't use this */ int count; /**< Private member. Don't use this */ }; @@ -99,7 +99,7 @@ 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); @@ -114,7 +114,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; }; #endif @@ -262,7 +262,7 @@ void *data; Evas_Modifier *modifiers; Evas_Lock *locks; - + char *key; /**< The logical key : (eg shift+1 == exclamation) */ char *string; /**< A UTF8 string if this keystroke has produced a visible string to be ADDED */ char *compose; /**< A UTF8 string if this keystroke has modified a string in the middle of being composed - this string replaces the previous one */ @@ -274,7 +274,7 @@ void *data; Evas_Modifier *modifiers; Evas_Lock *locks; - + char *key; /**< The logical key : (eg shift+1 == exclamation) */ char *string; /**< A UTF8 string if this keystroke has produced a visible string to be ADDED */ char *compose; /**< A UTF8 string if this keystroke has modified a string in the middle of being composed - this string replaces the previous one */ @@ -303,11 +303,11 @@ EAPI Evas_List *evas_list_reverse (Evas_List *list); EAPI Evas_List *evas_list_sort (Evas_List *list, int size, int(*func)(void*,void*)); EAPI int evas_list_alloc_error (void); - + /* FIXME: add: * api to add find, del members by data, size not just string and also * provide hash generation functions settable by the app - * + * * do we really need this? hmmm - let me think... there may be a better way */ EAPI Evas_Hash *evas_hash_add (Evas_Hash *hash, const char *key, const void*data); @@ -317,35 +317,35 @@ EAPI void evas_hash_free (Evas_Hash *hash); EAPI void evas_hash_foreach (Evas_Hash *hash, Evas_Bool (*func) (Evas_Hash *hash, const char *key, void *data, void *fdata), const void *fdata); EAPI int evas_hash_alloc_error (void); - + EAPI int evas_alloc_error (void); EAPI int evas_init (void); EAPI int evas_shutdown (void); - + EAPI Evas *evas_new (void); EAPI void evas_free (Evas *e); EAPI int evas_render_method_lookup (const char *name); EAPI Evas_List *evas_render_method_list (void); EAPI void evas_render_method_list_free (Evas_List *list); - + EAPI void evas_output_method_set (Evas *e, int render_method); EAPI int evas_output_method_get (Evas *e); - + EAPI Evas_Engine_Info *evas_engine_info_get (Evas *e); EAPI void evas_engine_info_set (Evas *e, Evas_Engine_Info *info); - + EAPI void evas_output_size_set (Evas *e, int w, int h); EAPI void evas_output_size_get (Evas *e, int *w, int *h); EAPI void evas_output_viewport_set (Evas *e, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h); EAPI void evas_output_viewport_get (Evas *e, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h); - + EAPI Evas_Coord evas_coord_screen_x_to_world (Evas *e, int x); - EAPI Evas_Coord evas_coord_screen_y_to_world (Evas *e, int y); + EAPI Evas_Coord evas_coord_screen_y_to_world (Evas *e, int y); EAPI int evas_coord_world_x_to_screen (Evas *e, Evas_Coord x); EAPI int evas_coord_world_y_to_screen (Evas *e, Evas_Coord y); - + EAPI void evas_pointer_output_xy_get (Evas *e, int *x, int *y); EAPI void evas_pointer_canvas_xy_get (Evas *e, Evas_Coord *x, Evas_Coord *y); EAPI int evas_pointer_button_down_mask_get (Evas *e); @@ -357,24 +357,24 @@ EAPI Evas_List *evas_render_updates (Evas *e); EAPI void evas_render_updates_free (Evas_List *updates); EAPI void evas_render (Evas *e); - + EAPI Evas_Object *evas_object_rectangle_add (Evas *e); - + EAPI Evas_Object *evas_object_line_add (Evas *e); EAPI void evas_object_line_xy_set (Evas_Object *obj, Evas_Coord x1, Evas_Coord y1, Evas_Coord x2, Evas_Coord y2); EAPI void evas_object_line_xy_get (Evas_Object *obj, Evas_Coord *x1, Evas_Coord *y1, Evas_Coord *x2, Evas_Coord *y2); - + EAPI Evas_Object *evas_object_gradient_add (Evas *e); EAPI void evas_object_gradient_color_add (Evas_Object *obj, int r, int g, int b, int a, int distance); EAPI void evas_object_gradient_colors_clear (Evas_Object *obj); EAPI void evas_object_gradient_angle_set (Evas_Object *obj, Evas_Angle angle); EAPI Evas_Angle evas_object_gradient_angle_get (Evas_Object *obj); - + EAPI Evas_Object *evas_object_polygon_add (Evas *e); EAPI void evas_object_polygon_point_add (Evas_Object *obj, Evas_Coord x, Evas_Coord y); EAPI void evas_object_polygon_points_clear (Evas_Object *obj); - - EAPI Evas_Object *evas_object_image_add (Evas *e); + + EAPI Evas_Object *evas_object_image_add (Evas *e); EAPI void evas_object_image_file_set (Evas_Object *obj, const char *file, const char *key); EAPI void evas_object_image_file_get (Evas_Object *obj, char **file, char **key); EAPI void evas_object_image_border_set (Evas_Object *obj, int l, int r, int t, int b); @@ -398,13 +398,13 @@ EAPI Evas_Bool evas_object_image_pixels_import (Evas_Object *obj, Evas_Pixel_Import_Source *pixels); EAPI void evas_object_image_pixels_get_callback_set(Evas_Object *obj, void (*func) (void *data, Evas_Object *o), void *data); EAPI void evas_object_image_pixels_dirty_set (Evas_Object *obj, Evas_Bool dirty); - EAPI Evas_Bool evas_object_image_pixels_dirty_get (Evas_Object *obj); - + EAPI Evas_Bool evas_object_image_pixels_dirty_get (Evas_Object *obj); + EAPI void evas_image_cache_flush (Evas *e); EAPI void evas_image_cache_reload (Evas *e); EAPI void evas_image_cache_set (Evas *e, int size); EAPI int evas_image_cache_get (Evas *e); - + EAPI Evas_Object *evas_object_text_add (Evas *e); EAPI void evas_object_text_font_source_set (Evas_Object *obj, const char *font); EAPI const char *evas_object_text_font_source_get (Evas_Object *obj); @@ -421,7 +421,7 @@ EAPI Evas_Coord evas_object_text_inset_get (Evas_Object *obj); EAPI int evas_object_text_char_pos_get (Evas_Object *obj, int pos, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch); EAPI int evas_object_text_char_coords_get (Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch); - + EAPI int evas_string_char_next_get (const char *str, int pos, int *decoded); EAPI int evas_string_char_prev_get (const char *str, int pos, int *decoded); @@ -429,11 +429,11 @@ EAPI void evas_font_path_append (Evas *e, const char *path); EAPI void evas_font_path_prepend (Evas *e, const char *path); EAPI const Evas_List *evas_font_path_list (Evas *e); - + EAPI void evas_font_cache_flush (Evas *e); EAPI void evas_font_cache_set (Evas *e, int size); EAPI int evas_font_cache_get (Evas *e); - + EAPI Evas_Object *evas_object_textblock_add (Evas *e); EAPI void evas_object_textblock_clear (Evas_Object *obj); EAPI void evas_object_textblock_cursor_pos_set (Evas_Object *obj, int pos); @@ -462,14 +462,14 @@ EAPI void evas_object_textblock_format_size_get (Evas_Object *obj, Evas_Coord *w, Evas_Coord *h); EAPI void evas_object_textblock_native_size_get (Evas_Object *obj, Evas_Coord *w, Evas_Coord *h); EAPI int evas_object_textblock_native_lines_get (Evas_Object *obj); - + EAPI void evas_object_del (Evas_Object *obj); EAPI const char *evas_object_type_get (Evas_Object *obj); - + EAPI void evas_object_layer_set (Evas_Object *obj, int l); EAPI int evas_object_layer_get (Evas_Object *obj); - + EAPI void evas_object_raise (Evas_Object *obj); EAPI void evas_object_lower (Evas_Object *obj); EAPI void evas_object_stack_above (Evas_Object *obj, Evas_Object *above); @@ -478,37 +478,37 @@ EAPI Evas_Object *evas_object_below_get (Evas_Object *obj); EAPI Evas_Object *evas_object_bottom_get (Evas *e); EAPI Evas_Object *evas_object_top_get (Evas *e); - + EAPI void evas_object_move (Evas_Object *obj, Evas_Coord x, Evas_Coord y); EAPI void evas_object_resize (Evas_Object *obj, Evas_Coord w, Evas_Coord h); - EAPI void evas_object_geometry_get (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h); + EAPI void evas_object_geometry_get (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h); EAPI void evas_object_show (Evas_Object *obj); EAPI void evas_object_hide (Evas_Object *obj); EAPI Evas_Bool evas_object_visible_get (Evas_Object *obj); - + EAPI void evas_object_color_set (Evas_Object *obj, int r, int g, int b, int a); EAPI void evas_object_color_get (Evas_Object *obj, int *r, int *g, int *b, int *a); - + EAPI void evas_object_clip_set (Evas_Object *obj, Evas_Object *clip); EAPI Evas_Object *evas_object_clip_get (Evas_Object *obj); EAPI void evas_object_clip_unset (Evas_Object *obj); EAPI const Evas_List *evas_object_clipees_get (Evas_Object *obj); - + EAPI void evas_object_data_set (Evas_Object *obj, const char *key, const void *data); EAPI void *evas_object_data_get (Evas_Object *obj, const char *key); EAPI void *evas_object_data_del (Evas_Object *obj, const char *key); - + EAPI void evas_object_name_set (Evas_Object *obj, const char *name); EAPI const char *evas_object_name_get (Evas_Object *obj); - EAPI Evas_Object *evas_object_name_find (Evas *e, const char *name); - + EAPI Evas_Object *evas_object_name_find (Evas *e, const char *name); + EAPI Evas *evas_object_evas_get (Evas_Object *obj); - + EAPI Evas_Object *evas_object_top_at_xy_get (Evas *e, Evas_Coord x, Evas_Coord y, Evas_Bool include_pass_events_objects, Evas_Bool include_hidden_objects); EAPI Evas_Object *evas_object_top_at_pointer_get (Evas *e); EAPI Evas_Object *evas_object_top_in_rectangle_get (Evas *e, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, Evas_Bool include_pass_events_objects, Evas_Bool include_hidden_objects); - + EAPI Evas_List *evas_objects_at_xy_get (Evas *e, Evas_Coord x, Evas_Coord y, Evas_Bool include_pass_events_objects, Evas_Bool include_hidden_objects); EAPI Evas_List *evas_objects_in_rectangle_get (Evas *e, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, Evas_Bool include_pass_events_objects, Evas_Bool include_hidden_objects); @@ -516,9 +516,9 @@ EAPI void evas_smart_free (Evas_Smart *s); EAPI Evas_Smart *evas_smart_class_new (Evas_Smart_Class *sc); EAPI Evas_Smart_Class *evas_smart_class_get (Evas_Smart *s); - + EAPI void *evas_smart_data_get (Evas_Smart *s); - + EAPI Evas_Object *evas_object_smart_add (Evas *e, Evas_Smart *s); EAPI void evas_object_smart_member_add (Evas_Object *obj, Evas_Object *smart_obj); EAPI void evas_object_smart_member_del (Evas_Object *obj); @@ -528,7 +528,7 @@ EAPI void evas_object_smart_callback_add (Evas_Object *obj, const char *event, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data); EAPI void *evas_object_smart_callback_del (Evas_Object *obj, const char *event, void (*func) (void *data, Evas_Object *obj, void *event_info)); EAPI void evas_object_smart_callback_call (Evas_Object *obj, const char *event, void *event_info); - + EAPI void evas_event_freeze (Evas *e); EAPI void evas_event_thaw (Evas *e); EAPI int evas_event_freeze_get (Evas *e); @@ -540,7 +540,7 @@ EAPI void evas_event_feed_mouse_wheel (Evas *e, int direction, int z, const void *data); EAPI void evas_event_feed_key_down (Evas *e, const char *keyname, const char *key, const char *string, const char *compose, const void *data); EAPI void evas_event_feed_key_up (Evas *e, const char *keyname, const char *key, const char *string, const char *compose, const void *data); - + EAPI void evas_object_focus_set (Evas_Object *obj, Evas_Bool focus); EAPI Evas_Bool evas_object_focus_get (Evas_Object *obj); @@ -552,22 +552,22 @@ EAPI Evas_Bool evas_key_modifier_is_set (Evas_Modifier *m, const char *keyname); EAPI Evas_Bool evas_key_lock_is_set (Evas_Lock *l, const char *keyname); - + EAPI void evas_key_modifier_add (Evas *e, const char *keyname); EAPI void evas_key_modifier_del (Evas *e, const char *keyname); EAPI void evas_key_lock_add (Evas *e, const char *keyname); EAPI void evas_key_lock_del (Evas *e, const char *keyname); - + EAPI void evas_key_modifier_on (Evas *e, const char *keyname); EAPI void evas_key_modifier_off (Evas *e, const char *keyname); EAPI void evas_key_lock_on (Evas *e, const char *keyname); EAPI void evas_key_lock_off (Evas *e, const char *keyname); - + EAPI Evas_Modifier_Mask evas_key_modifier_mask_get (Evas *e, const char *keyname); EAPI Evas_Bool evas_object_key_grab (Evas_Object *obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers, Evas_Bool exclusive); EAPI void evas_object_key_ungrab (Evas_Object *obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers); - + EAPI void evas_object_pass_events_set (Evas_Object *obj, Evas_Bool pass); EAPI Evas_Bool evas_object_pass_events_get (Evas_Object *obj); EAPI void evas_object_repeat_events_set (Evas_Object *obj, Evas_Bool repeat); @@ -595,13 +595,13 @@ EAPI void evas_object_intercept_layer_set_callback_add (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj, int l), const void *data); EAPI void *evas_object_intercept_layer_set_callback_del (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj, int l)); -/* Evas imaging api - exports some of the comon gfx engine routines */ +/* Evas imaging api - exports some of the comon gfx engine routines */ /* this is not complete and should be considered experimental. use at your */ /* own risk */ - + #ifndef EVAS_COMMON_H #ifndef EVAS_PRIVATE_H - + typedef struct _Evas_Imaging_Image Evas_Imaging_Image; typedef struct _Evas_Imaging_Font Evas_Imaging_Font; @@ -614,7 +614,7 @@ EAPI Evas_Bool evas_imaging_image_alpha_get (Evas_Imaging_Image *im); EAPI void evas_imaging_image_cache_set (int bytes); EAPI int evas_imaging_image_cache_get (void); - + EAPI Evas_Imaging_Font *evas_imaging_font_load (const char *file, const char *key, int size); EAPI void evas_imaging_font_free (Evas_Imaging_Font *fn); EAPI int evas_imaging_font_ascent_get (Evas_Imaging_Font *fn); @@ -627,10 +627,10 @@ EAPI int evas_imaging_font_string_inset_get (Evas_Imaging_Font *fn, char *str); EAPI int evas_imaging_font_string_char_coords_get (Evas_Imaging_Font *fn, char *str, int pos, int *cx, int *cy, int *cw, int *ch); EAPI int evas_imaging_font_string_char_at_coords_get (Evas_Imaging_Font *fn, char *str, int x, int y, int *cx, int *cy, int *cw, int *ch); - + EAPI void evas_imaging_font_cache_set (int bytes); EAPI int evas_imaging_font_cache_get (void); - + #ifdef __cplusplus } #endif =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/Evas_Engine_Buffer.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- Evas_Engine_Buffer.h 9 Apr 2003 06:52:13 -0000 1.3 +++ Evas_Engine_Buffer.h 22 May 2005 02:49:35 -0000 1.4 @@ -1,5 +1,5 @@ -#ifndef _EVAS_ENGINE_BUFFER_H -#define _EVAS_ENGINE_BUFFER_H +#ifndef _EVAS_ENGINE_BUFFER_H +#define _EVAS_ENGINE_BUFFER_H #define EVAS_ENGINE_BUFFER_DEPTH_ARGB32 0 #define EVAS_ENGINE_BUFFER_DEPTH_BGRA32 1 @@ -12,14 +12,14 @@ { /* PRIVATE - don't mess with this baby or evas will poke its tongue out */ /* at you and make nasty noises */ - Evas_Engine_Info magic; - + Evas_Engine_Info magic; + struct { int depth_type; - + void *dest_buffer; int dest_buffer_row_bytes; - + char use_color_key : 1; int alpha_threshold; int color_key_r; =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/Evas_Engine_Cairo_X11.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Evas_Engine_Cairo_X11.h 17 Aug 2004 06:03:38 -0000 1.1 +++ Evas_Engine_Cairo_X11.h 22 May 2005 02:49:35 -0000 1.2 @@ -1,5 +1,5 @@ -#ifndef _EVAS_ENGINE_CAIRO_X11_H -#define _EVAS_ENGINE_CAIRO_X11_H +#ifndef _EVAS_ENGINE_CAIRO_X11_H +#define _EVAS_ENGINE_CAIRO_X11_H #include <X11/Xlib.h> @@ -10,7 +10,7 @@ /* PRIVATE - don't mess with this baby or evas will poke its tongue out */ /* at you and make nasty noises */ Evas_Engine_Info magic; - + /* engine specific data & parameters it needs to set up */ struct { Display *display; =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/Evas_Engine_DirectFB.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Evas_Engine_DirectFB.h 25 Nov 2002 02:11:39 -0000 1.2 +++ Evas_Engine_DirectFB.h 22 May 2005 02:49:35 -0000 1.3 @@ -1,5 +1,5 @@ -#ifndef _EVAS_ENGINE_DIRECTFB_H -#define _EVAS_ENGINE_DIRECTFB_H +#ifndef _EVAS_ENGINE_DIRECTFB_H +#define _EVAS_ENGINE_DIRECTFB_H #include <Evas.h> #include <directfb/directfb.h> @@ -10,8 +10,8 @@ { /* PRIVATE - don't mess with this baby or evas will poke its tongue out */ /* at you and make nasty noises */ - Evas_Engine_Info magic; - + Evas_Engine_Info magic; + struct { IDirectFB *dfb; IDirectFBSurface *surface; =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/Evas_Engine_FB.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Evas_Engine_FB.h 8 Nov 2002 08:02:13 -0000 1.1 +++ Evas_Engine_FB.h 22 May 2005 02:49:36 -0000 1.2 @@ -1,5 +1,5 @@ -#ifndef _EVAS_ENGINE_FB_H -#define _EVAS_ENGINE_FB_H +#ifndef _EVAS_ENGINE_FB_H +#define _EVAS_ENGINE_FB_H typedef struct _Evas_Engine_Info_FB Evas_Engine_Info_FB; @@ -7,8 +7,8 @@ { /* PRIVATE - don't mess with this baby or evas will poke its tongue out */ /* at you and make nasty noises */ - Evas_Engine_Info magic; - + Evas_Engine_Info magic; + struct { int virtual_terminal; =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/Evas_Engine_GL_X11.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Evas_Engine_GL_X11.h 8 Nov 2002 08:02:13 -0000 1.1 +++ Evas_Engine_GL_X11.h 22 May 2005 02:49:36 -0000 1.2 @@ -1,5 +1,5 @@ -#ifndef _EVAS_ENGINE_GL_X11_H -#define _EVAS_ENGINE_GL_X11_H +#ifndef _EVAS_ENGINE_GL_X11_H +#define _EVAS_ENGINE_GL_X11_H #include <X11/Xlib.h> #include <GL/gl.h> @@ -13,7 +13,7 @@ /* PRIVATE - don't mess with this baby or evas will poke its tongue out */ /* at you and make nasty noises */ Evas_Engine_Info magic; - + /* engine specific data & parameters it needs to set up */ struct { Display *display; =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/Evas_Engine_Software_Qtopia.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Evas_Engine_Software_Qtopia.h 8 Nov 2002 08:02:13 -0000 1.1 +++ Evas_Engine_Software_Qtopia.h 22 May 2005 02:49:36 -0000 1.2 @@ -1,5 +1,5 @@ -#ifndef _EVAS_ENGINE_SOFTWARE_QTOPIA_H -#define _EVAS_ENGINE_SOFTWARE_QTOPIA_H +#ifndef _EVAS_ENGINE_SOFTWARE_QTOPIA_H +#define _EVAS_ENGINE_SOFTWARE_QTOPIA_H #ifdef EVAS_COMMON_H #ifdef EVAS_PRIVATE_H @@ -20,7 +20,7 @@ /* PRIVATE - don't mess with this baby or evas will poke its tongue out */ /* at you and make nasty noises */ Evas_Engine_Info magic; - + struct { QWidget *target; int rotation; =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/Evas_Engine_Software_Win32_GDI.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Evas_Engine_Software_Win32_GDI.h 8 Nov 2002 08:02:13 -0000 1.1 +++ Evas_Engine_Software_Win32_GDI.h 22 May 2005 02:49:36 -0000 1.2 @@ -1,5 +1,5 @@ -#ifndef _EVAS_ENGINE_SOFTWARE_WIN32_GDI_H -#define _EVAS_ENGINE_SOFTWARE_WIN32_GDI_H +#ifndef _EVAS_ENGINE_SOFTWARE_WIN32_GDI_H +#define _EVAS_ENGINE_SOFTWARE_WIN32_GDI_H typedef struct _Evas_Engine_Info_Software_Win32_GDI Evas_Engine_Info_Software_Win32_GDI; @@ -9,7 +9,7 @@ /* PRIVATE - don't mess with this baby or evas will poke its tongue out */ /* at you and make nasty noises */ Evas_Engine_Info magic; - + /* engine specific data & parameters it needs to set up */ struct { HWND hwnd; @@ -19,7 +19,7 @@ int depth; int rotation; - + } info; /* engine specific function calls to query stuff about the destination */ /* engine (what visual & colormap & depth to use, performance info etc. */ =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/Evas_Engine_Software_X11.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Evas_Engine_Software_X11.h 8 Nov 2002 08:02:13 -0000 1.1 +++ Evas_Engine_Software_X11.h 22 May 2005 02:49:36 -0000 1.2 @@ -1,5 +1,5 @@ -#ifndef _EVAS_ENGINE_SOFTWARE_X11_H -#define _EVAS_ENGINE_SOFTWARE_X11_H +#ifndef _EVAS_ENGINE_SOFTWARE_X11_H +#define _EVAS_ENGINE_SOFTWARE_X11_H #include <X11/Xlib.h> @@ -10,7 +10,7 @@ /* PRIVATE - don't mess with this baby or evas will poke its tongue out */ /* at you and make nasty noises */ Evas_Engine_Info magic; - + /* engine specific data & parameters it needs to set up */ struct { Display *display; @@ -20,7 +20,7 @@ Colormap colormap; int depth; int rotation; - + int alloc_grayscale : 1; int debug : 1; int shape_dither : 1; @@ -33,7 +33,7 @@ Visual * (*best_visual_get) (Display *disp, int screen); Colormap (*best_colormap_get) (Display *disp, int screen); int (*best_depth_get) (Display *disp, int screen); - + Evas_Performance *(*performance_test) (Evas *e, Display *disp, Visual *vis, Colormap cmap, Drawable draw, int depth); void (*performance_free) (Evas_Performance *perf); char * (*performance_data_get) (Evas_Performance *perf); =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/Evas_Engine_Software_Xcb.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Evas_Engine_Software_Xcb.h 20 Mar 2005 23:44:21 -0000 1.1 +++ Evas_Engine_Software_Xcb.h 22 May 2005 02:49:36 -0000 1.2 @@ -1,5 +1,5 @@ -#ifndef _EVAS_ENGINE_SOFTWARE_XCB_H -#define _EVAS_ENGINE_SOFTWARE_XCB_H +#ifndef _EVAS_ENGINE_SOFTWARE_XCB_H +#define _EVAS_ENGINE_SOFTWARE_XCB_H #include <X11/XCB/xcb.h> @@ -10,7 +10,7 @@ /* PRIVATE - don't mess with this baby or evas will poke its tongue out */ /* at you and make nasty noises */ Evas_Engine_Info magic; - + /* engine specific data & parameters it needs to set up */ struct { XCBConnection *conn; @@ -20,7 +20,7 @@ XCBCOLORMAP colormap; int depth; int rotation; - + int alloc_grayscale : 1; int debug : 1; int shape_dither : 1; @@ -33,7 +33,7 @@ XCBVISUALTYPE * (*best_visual_get) (XCBConnection *conn, int screen); XCBCOLORMAP (*best_colormap_get) (XCBConnection *conn, int screen); int (*best_depth_get) (XCBConnection *conn, int screen); - + Evas_Performance *(*performance_test) (Evas *e, XCBConnection *conn, XCBVISUALTYPE *vis, =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/main.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- main.c 8 Mar 2004 02:42:08 -0000 1.6 +++ main.c 22 May 2005 02:49:36 -0000 1.7 @@ -10,21 +10,21 @@ /** * Return if any allocation errors have occured during the prior function * @return The allocation error flag - * + * * This function will return if any memory allocation errors occured during, - * and what kind they were. The return value will be one of + * and what kind they were. The return value will be one of * EVAS_ALLOC_ERROR_NONE, EVAS_ALLOC_ERROR_FATAL or EVAS_ALLOC_ERROR_RECOVERED * with each meaning something different. - * + * * EVAS_ALLOC_ERROR_NONE means that no errors occured at all and the function * worked as expected. - * + * * EVAS_ALLOC_ERROR_FATAL means the function was completely unable to perform * its job and will have exited as cleanly as possible. The programmer * should consider this as a sign of very low memory and should try and safely * recover from the prior functions failure (or try free up memory elsewhere * and try again after more memory is freed). - * + * * EVAS_ALLOC_ERROR_RECOVERED means that an allocation error occured, but was * recovered from by evas finding memory of its own it has allocated and * freeing what it sees as not really usefully allocated memory. What is freed @@ -33,12 +33,12 @@ * etc. Evas and the program will function as per normal after this, but this * is a sign of low memory, and it is suggested that the program try and * identify memory it doesn't need, and free it. - * + * * Example: * @code * extern Evas_Object *object; * void callback (void *data, Evas *e, Evas_Object *obj, void *event_info); - * + * * evas_object_event_callback_add(object, EVAS_CALLBACK_MOUSE_DOWN, callback, NULL); * if (evas_alloc_error() == EVAS_ALLOC_ERROR_FATAL) * { @@ -80,13 +80,13 @@ evas_mem_calloc(int size) { void *ptr; - + ptr = calloc(1, size); if (ptr) return ptr; MERR_BAD(); while ((!ptr) && (evas_mem_free(size))) ptr = calloc(1, size); if (ptr) return ptr; - while ((!ptr) && (evas_mem_degrade(size))) ptr = calloc(1, size); + while ((!ptr) && (evas_mem_degrade(size))) ptr = calloc(1, size); if (ptr) return ptr; MERR_FATAL(); return NULL; @@ -102,7 +102,7 @@ _evas_debug_init = 1; } if (_evas_debug_show) - fprintf(stderr, + fprintf(stderr, "*** EVAS ERROR: Evas Magic Check Failed!!!\n"); } @@ -116,7 +116,7 @@ _evas_debug_init = 1; } if (_evas_debug_show) - fprintf(stderr, + fprintf(stderr, " Input object pointer is NULL!\n"); if (_evas_debug_abort) abort(); } @@ -131,7 +131,7 @@ _evas_debug_init = 1; } if (_evas_debug_show) - fprintf(stderr, + fprintf(stderr, " Input object is zero'ed out (maybe a freed object or zero-filled RAM)!\n"); if (_evas_debug_abort) abort(); } @@ -146,7 +146,7 @@ _evas_debug_init = 1; } if (_evas_debug_show) - fprintf(stderr, + fprintf(stderr, " Input object is wrong type\n" " Expected: %08x - %s\n" " Supplied: %08x - %s\n", @@ -165,7 +165,7 @@ _evas_debug_init = 1; } if (_evas_debug_show) - fprintf(stderr, + fprintf(stderr, "*** EVAS ERROR:\n" "%s", (char *)str); if (_evas_debug_abort) abort(); ------------------------------------------------------- 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