move more callbacks to typedefs.

git-svn-id: http://svn.enlightenment.org/svn/e/trunk/evas@51705 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/Evas.h b/src/lib/Evas.h
index b358541..2daba5f 100644 (file)
--- a/src/lib/Evas.h
+++ b/src/lib/Evas.h
@@ -610,6 +610,7 @@ typedef void      (*Evas_Smart_Cb) (void *data, Evas_Object *obj, void *event_in
 typedef void      (*Evas_Event_Cb) (void *data, Evas *e, void *event_info);
 typedef Eina_Bool (*Evas_Object_Event_Post_Cb) (void *data, Evas *e);
 typedef void      (*Evas_Object_Event_Cb) (void *data, Evas *e, Evas_Object *obj, void *event_info);
+typedef void      (*Evas_Async_Events_Put_Cb)(void *target, Evas_Callback_Type type, void *event_info);
 
 /**
  * @defgroup Evas_Group Top Level Functions
@@ -623,7 +624,7 @@ typedef void      (*Evas_Object_Event_Cb) (void *data, Evas *e, Evas_Object *obj
 
    EAPI int               evas_async_events_fd_get          (void) EINA_WARN_UNUSED_RESULT EINA_PURE;
    EAPI int               evas_async_events_process         (void);
-   EAPI Eina_Bool         evas_async_events_put             (const void *target, Evas_Callback_Type type, void *event_info, void (*func)(void *target, Evas_Callback_Type type, void *event_info)) EINA_ARG_NONNULL(1, 4);
+   EAPI Eina_Bool         evas_async_events_put             (const void *target, Evas_Callback_Type type, void *event_info, Evas_Async_Events_Put_Cb func) EINA_ARG_NONNULL(1, 4);
 
 /**
  * @defgroup Evas_Canvas Canvas Functions
@@ -1055,30 +1056,43 @@ typedef void      (*Evas_Object_Event_Cb) (void *data, Evas *e, Evas_Object *obj
  *
  * @ingroup Evas_Object_Group
  */
-   EAPI void              evas_object_intercept_show_callback_add        (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj), const void *data) EINA_ARG_NONNULL(1, 2);
-   EAPI void             *evas_object_intercept_show_callback_del        (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj)) EINA_ARG_NONNULL(1, 2);
-   EAPI void              evas_object_intercept_hide_callback_add        (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj), const void *data) EINA_ARG_NONNULL(1, 2);
-   EAPI void             *evas_object_intercept_hide_callback_del        (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj)) EINA_ARG_NONNULL(1, 2);
-   EAPI void              evas_object_intercept_move_callback_add        (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj, Evas_Coord x, Evas_Coord y), const void *data) EINA_ARG_NONNULL(1, 2);
-   EAPI void             *evas_object_intercept_move_callback_del        (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj, Evas_Coord x, Evas_Coord y)) EINA_ARG_NONNULL(1, 2);
-   EAPI void              evas_object_intercept_resize_callback_add      (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj, Evas_Coord w, Evas_Coord h), const void *data) EINA_ARG_NONNULL(1, 2);
-   EAPI void             *evas_object_intercept_resize_callback_del      (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj, Evas_Coord w, Evas_Coord h)) EINA_ARG_NONNULL(1, 2);
-   EAPI void              evas_object_intercept_raise_callback_add       (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj), const void *data) EINA_ARG_NONNULL(1, 2);
-   EAPI void             *evas_object_intercept_raise_callback_del       (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj)) EINA_ARG_NONNULL(1, 2);
-   EAPI void              evas_object_intercept_lower_callback_add       (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj), const void *data) EINA_ARG_NONNULL(1, 2);
-   EAPI void             *evas_object_intercept_lower_callback_del       (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj)) EINA_ARG_NONNULL(1, 2);
-   EAPI void              evas_object_intercept_stack_above_callback_add (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj, Evas_Object *above), const void *data) EINA_ARG_NONNULL(1, 2);
-   EAPI void             *evas_object_intercept_stack_above_callback_del (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj, Evas_Object *above)) EINA_ARG_NONNULL(1, 2);
-   EAPI void              evas_object_intercept_stack_below_callback_add (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj, Evas_Object *below), const void *data) EINA_ARG_NONNULL(1, 2);
-   EAPI void             *evas_object_intercept_stack_below_callback_del (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj, Evas_Object *below)) EINA_ARG_NONNULL(1, 2);
-   EAPI void              evas_object_intercept_layer_set_callback_add   (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj, int l), const void *data) EINA_ARG_NONNULL(1, 2);
-   EAPI void             *evas_object_intercept_layer_set_callback_del   (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj, int l)) EINA_ARG_NONNULL(1, 2);
-   EAPI void              evas_object_intercept_color_set_callback_add   (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj, int r, int g, int b, int a), const void *data) EINA_ARG_NONNULL(1, 2);
-   EAPI void             *evas_object_intercept_color_set_callback_del   (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj, int r, int g, int b, int a)) EINA_ARG_NONNULL(1, 2);
-   EAPI void              evas_object_intercept_clip_set_callback_add    (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj, Evas_Object *clip), const void *data) EINA_ARG_NONNULL(1, 2);
-   EAPI void             *evas_object_intercept_clip_set_callback_del    (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj, Evas_Object *clip)) EINA_ARG_NONNULL(1, 2);
-   EAPI void              evas_object_intercept_clip_unset_callback_add  (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj), const void *data) EINA_ARG_NONNULL(1, 2);
-   EAPI void             *evas_object_intercept_clip_unset_callback_del  (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj)) EINA_ARG_NONNULL(1, 2);
+typedef void (*Evas_Object_Intercept_Show_Cb) (void *data, Evas_Object *obj);
+typedef void (*Evas_Object_Intercept_Hide_Cb) (void *data, Evas_Object *obj);
+typedef void (*Evas_Object_Intercept_Move_Cb) (void *data, Evas_Object *obj, Evas_Coord x, Evas_Coord y);
+typedef void (*Evas_Object_Intercept_Resize_Cb) (void *data, Evas_Object *obj, Evas_Coord w, Evas_Coord h);
+typedef void (*Evas_Object_Intercept_Raise_Cb) (void *data, Evas_Object *obj);
+typedef void (*Evas_Object_Intercept_Lower_Cb) (void *data, Evas_Object *obj);
+typedef void (*Evas_Object_Intercept_Stack_Above_Cb) (void *data, Evas_Object *obj, Evas_Object *above);
+typedef void (*Evas_Object_Intercept_Stack_Below_Cb) (void *data, Evas_Object *obj, Evas_Object *above);
+typedef void (*Evas_Object_Intercept_Layer_Set_Cb) (void *data, Evas_Object *obj, int l);
+typedef void (*Evas_Object_Intercept_Color_Set_Cb) (void *data, Evas_Object *obj, int r, int g, int b, int a);
+typedef void (*Evas_Object_Intercept_Clip_Set_Cb) (void *data, Evas_Object *obj, Evas_Object *clip);
+typedef void (*Evas_Object_Intercept_Clip_Unset_Cb) (void *data, Evas_Object *obj);
+   
+   EAPI void              evas_object_intercept_show_callback_add        (Evas_Object *obj, Evas_Object_Intercept_Show_Cb func, const void *data) EINA_ARG_NONNULL(1, 2);
+   EAPI void             *evas_object_intercept_show_callback_del        (Evas_Object *obj, Evas_Object_Intercept_Show_Cb func) EINA_ARG_NONNULL(1, 2);
+   EAPI void              evas_object_intercept_hide_callback_add        (Evas_Object *obj, Evas_Object_Intercept_Hide_Cb func, const void *data) EINA_ARG_NONNULL(1, 2);
+   EAPI void             *evas_object_intercept_hide_callback_del        (Evas_Object *obj, Evas_Object_Intercept_Hide_Cb func) EINA_ARG_NONNULL(1, 2);
+   EAPI void              evas_object_intercept_move_callback_add        (Evas_Object *obj, Evas_Object_Intercept_Move_Cb func, const void *data) EINA_ARG_NONNULL(1, 2);
+   EAPI void             *evas_object_intercept_move_callback_del        (Evas_Object *obj, Evas_Object_Intercept_Move_Cb func) EINA_ARG_NONNULL(1, 2);
+   EAPI void              evas_object_intercept_resize_callback_add      (Evas_Object *obj, Evas_Object_Intercept_Resize_Cb func, const void *data) EINA_ARG_NONNULL(1, 2);
+   EAPI void             *evas_object_intercept_resize_callback_del      (Evas_Object *obj, Evas_Object_Intercept_Resize_Cb func) EINA_ARG_NONNULL(1, 2);
+   EAPI void              evas_object_intercept_raise_callback_add       (Evas_Object *obj, Evas_Object_Intercept_Raise_Cb func, const void *data) EINA_ARG_NONNULL(1, 2);
+   EAPI void             *evas_object_intercept_raise_callback_del       (Evas_Object *obj, Evas_Object_Intercept_Raise_Cb func) EINA_ARG_NONNULL(1, 2);
+   EAPI void              evas_object_intercept_lower_callback_add       (Evas_Object *obj, Evas_Object_Intercept_Lower_Cb func, const void *data) EINA_ARG_NONNULL(1, 2);
+   EAPI void             *evas_object_intercept_lower_callback_del       (Evas_Object *obj, Evas_Object_Intercept_Lower_Cb func) EINA_ARG_NONNULL(1, 2);
+   EAPI void              evas_object_intercept_stack_above_callback_add (Evas_Object *obj, Evas_Object_Intercept_Stack_Above_Cb func, const void *data) EINA_ARG_NONNULL(1, 2);
+   EAPI void             *evas_object_intercept_stack_above_callback_del (Evas_Object *obj, Evas_Object_Intercept_Stack_Above_Cb func) EINA_ARG_NONNULL(1, 2);
+   EAPI void              evas_object_intercept_stack_below_callback_add (Evas_Object *obj, Evas_Object_Intercept_Stack_Below_Cb func, const void *data) EINA_ARG_NONNULL(1, 2);
+   EAPI void             *evas_object_intercept_stack_below_callback_del (Evas_Object *obj, Evas_Object_Intercept_Stack_Below_Cb func) EINA_ARG_NONNULL(1, 2);
+   EAPI void              evas_object_intercept_layer_set_callback_add   (Evas_Object *obj, Evas_Object_Intercept_Layer_Set_Cb func, const void *data) EINA_ARG_NONNULL(1, 2);
+   EAPI void             *evas_object_intercept_layer_set_callback_del   (Evas_Object *obj, Evas_Object_Intercept_Layer_Set_Cb func) EINA_ARG_NONNULL(1, 2);
+   EAPI void              evas_object_intercept_color_set_callback_add   (Evas_Object *obj, Evas_Object_Intercept_Color_Set_Cb func, const void *data) EINA_ARG_NONNULL(1, 2);
+   EAPI void             *evas_object_intercept_color_set_callback_del   (Evas_Object *obj, Evas_Object_Intercept_Color_Set_Cb func) EINA_ARG_NONNULL(1, 2);
+   EAPI void              evas_object_intercept_clip_set_callback_add    (Evas_Object *obj, Evas_Object_Intercept_Clip_Set_Cb func, const void *data) EINA_ARG_NONNULL(1, 2);
+   EAPI void             *evas_object_intercept_clip_set_callback_del    (Evas_Object *obj, Evas_Object_Intercept_Clip_Set_Cb func) EINA_ARG_NONNULL(1, 2);
+   EAPI void              evas_object_intercept_clip_unset_callback_add  (Evas_Object *obj, Evas_Object_Intercept_Clip_Unset_Cb func, const void *data) EINA_ARG_NONNULL(1, 2);
+   EAPI void             *evas_object_intercept_clip_unset_callback_del  (Evas_Object *obj, Evas_Object_Intercept_Clip_Unset_Cb func) EINA_ARG_NONNULL(1, 2);
 
 
 
@@ -1183,6 +1197,8 @@ typedef void      (*Evas_Object_Event_Cb) (void *data, Evas *e, Evas_Object *obj
  *
  * @ingroup Evas_Object_Specific
  */
+typedef void (*Evas_Object_Image_Pixels_Get_Cb) (void *data, Evas_Object *o);
+   
    EAPI Evas_Object      *evas_object_image_add             (Evas *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_MALLOC;
    EAPI Evas_Object      *evas_object_image_filled_add      (Evas *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_MALLOC;
 
@@ -1217,7 +1233,7 @@ typedef void      (*Evas_Object_Event_Cb) (void *data, Evas *e, Evas_Object *obj
    EAPI void              evas_object_image_reload          (Evas_Object *obj) EINA_ARG_NONNULL(1);
    EAPI Eina_Bool         evas_object_image_save            (const Evas_Object *obj, const char *file, const char *key, const char *flags)  EINA_ARG_NONNULL(1, 2);
    EAPI Eina_Bool         evas_object_image_pixels_import          (Evas_Object *obj, Evas_Pixel_Import_Source *pixels) EINA_ARG_NONNULL(1, 2);
-   EAPI void              evas_object_image_pixels_get_callback_set(Evas_Object *obj, void (*func) (void *data, Evas_Object *o), void *data) EINA_ARG_NONNULL(1, 2);
+   EAPI void              evas_object_image_pixels_get_callback_set(Evas_Object *obj, Evas_Object_Image_Pixels_Get_Cb func, void *data) EINA_ARG_NONNULL(1, 2);
    EAPI void              evas_object_image_pixels_dirty_set       (Evas_Object *obj, Eina_Bool dirty) EINA_ARG_NONNULL(1);
    EAPI Eina_Bool         evas_object_image_pixels_dirty_get       (const Evas_Object *obj) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_PURE;
    EAPI void              evas_object_image_load_dpi_set           (Evas_Object *obj, double dpi) EINA_ARG_NONNULL(1);
@@ -1277,7 +1293,7 @@ typedef void      (*Evas_Object_Event_Cb) (void *data, Evas *e, Evas_Object *obj
    EAPI Evas_Coord        evas_object_text_inset_get        (const Evas_Object *obj) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_PURE;
    EAPI Eina_Bool         evas_object_text_char_pos_get     (const Evas_Object *obj, int pos, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch) EINA_ARG_NONNULL(1);
    EAPI int               evas_object_text_char_coords_get  (const Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch) EINA_ARG_NONNULL(1);
-   EAPI int               evas_object_text_last_up_to_pos(const Evas_Object *obj, Evas_Coord x, Evas_Coord y) EINA_ARG_NONNULL(1);
+   EAPI int               evas_object_text_last_up_to_pos   (const Evas_Object *obj, Evas_Coord x, Evas_Coord y) EINA_ARG_NONNULL(1);
    EAPI Evas_Text_Style_Type evas_object_text_style_get     (const Evas_Object *obj) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_PURE;
    EAPI void              evas_object_text_style_set        (Evas_Object *obj, Evas_Text_Style_Type type) EINA_ARG_NONNULL(1);
    EAPI void              evas_object_text_shadow_color_set (Evas_Object *obj, int r, int g, int b, int a) EINA_ARG_NONNULL(1);
@@ -2143,6 +2159,8 @@ struct _Evas_Smart_Cb_Description
    EAPI int               evas_string_char_prev_get         (const char *str, int pos, int *decoded) EINA_ARG_NONNULL(1);
    EAPI int               evas_string_char_len_get          (const char *str) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_PURE;
 
+/* FIXME: kill off!! evas_imaging before 1.0.0 !!!! */
+   
 /**
  * @defgroup Evas_Imaging Imaging and Commong GFX
  *

diff --git a/src/lib/canvas/evas_async_events.c b/src/lib/canvas/evas_async_events.c
index 76a3787..7a69826 100644 (file)
--- a/src/lib/canvas/evas_async_events.c
+++ b/src/lib/canvas/evas_async_events.c
@@ -16,10 +16,10 @@ typedef struct _Evas_Event_Async    Evas_Event_Async;
 
 struct _Evas_Event_Async
 {
-   const void           *target;
-   void                         *event_info;
-   void                        (*func)(void *target, Evas_Callback_Type type, void *event_info);
-   Evas_Callback_Type    type;
+   const void              *target;
+   void                            *event_info;
+   Evas_Async_Events_Put_Cb  func;
+   Evas_Callback_Type       type;
 };
 
 int
@@ -161,7 +161,7 @@ evas_async_events_process(void)
  * @ingroup Evas_Group
  */
 EAPI Eina_Bool
-evas_async_events_put(const void *target, Evas_Callback_Type type, void *event_info, void (*func)(void *target, Evas_Callback_Type type, void *event_info))
+evas_async_events_put(const void *target, Evas_Callback_Type type, void *event_info, Evas_Async_Events_Put_Cb func)
 {
 #ifdef BUILD_ASYNC_EVENTS
    Evas_Event_Async *ev;

diff --git a/src/lib/canvas/evas_object_image.c b/src/lib/canvas/evas_object_image.c
index ca04c5a..48c664b 100644 (file)
--- a/src/lib/canvas/evas_object_image.c
+++ b/src/lib/canvas/evas_object_image.c
@@ -50,8 +50,8 @@ struct _Evas_Object_Image
    } load_opts;
 
    struct {
-      void            (*get_pixels) (void *data, Evas_Object *o);
-      void             *get_pixels_data;
+      Evas_Object_Image_Pixels_Get_Cb  get_pixels;
+      void                            *get_pixels_data;
    } func;
 
    Evas_Image_Scale_Hint   scale_hint;
@@ -1534,7 +1534,7 @@ evas_object_image_pixels_import(Evas_Object *obj, Evas_Pixel_Import_Source *pixe
  *
  */
 EAPI void
-evas_object_image_pixels_get_callback_set(Evas_Object *obj, void (*func) (void *data, Evas_Object *o), void *data)
+evas_object_image_pixels_get_callback_set(Evas_Object *obj, Evas_Object_Image_Pixels_Get_Cb func, void *data)
 {
    Evas_Object_Image *o;
 

diff --git a/src/lib/canvas/evas_object_intercept.c b/src/lib/canvas/evas_object_intercept.c
index 0e94f74..ae94293 100644 (file)
--- a/src/lib/canvas/evas_object_intercept.c
+++ b/src/lib/canvas/evas_object_intercept.c
@@ -258,7 +258,7 @@ evas_object_intercept_call_clip_unset(Evas_Object *obj)
  *
  */
 EAPI void
-evas_object_intercept_show_callback_add(Evas_Object *obj, void (*func) (void *data, Evas_Object *obj), const void *data)
+evas_object_intercept_show_callback_add(Evas_Object *obj, Evas_Object_Intercept_Show_Cb func, const void *data)
 {
    /* MEM OK */
 
@@ -286,7 +286,7 @@ evas_object_intercept_show_callback_add(Evas_Object *obj, void (*func) (void *da
  *
  */
 EAPI void *
-evas_object_intercept_show_callback_del(Evas_Object *obj, void (*func) (void *data, Evas_Object *obj))
+evas_object_intercept_show_callback_del(Evas_Object *obj, Evas_Object_Intercept_Show_Cb func)
 {
    /* MEM OK */
    void *data;
@@ -317,7 +317,7 @@ evas_object_intercept_show_callback_del(Evas_Object *obj, void (*func) (void *da
  *
  */
 EAPI void
-evas_object_intercept_hide_callback_add(Evas_Object *obj, void (*func) (void *data, Evas_Object *obj), const void *data)
+evas_object_intercept_hide_callback_add(Evas_Object *obj, Evas_Object_Intercept_Hide_Cb func, const void *data)
 {
    /* MEM OK */
    MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
@@ -344,7 +344,7 @@ evas_object_intercept_hide_callback_add(Evas_Object *obj, void (*func) (void *da
  *
  */
 EAPI void *
-evas_object_intercept_hide_callback_del(Evas_Object *obj, void (*func) (void *data, Evas_Object *obj))
+evas_object_intercept_hide_callback_del(Evas_Object *obj, Evas_Object_Intercept_Hide_Cb func)
 {
    /* MEM OK */
    void *data;
@@ -375,7 +375,7 @@ evas_object_intercept_hide_callback_del(Evas_Object *obj, void (*func) (void *da
  *
  */
 EAPI void
-evas_object_intercept_move_callback_add(Evas_Object *obj, void (*func) (void *data, Evas_Object *obj, Evas_Coord x, Evas_Coord y), const void *data)
+evas_object_intercept_move_callback_add(Evas_Object *obj, Evas_Object_Intercept_Move_Cb func, const void *data)
 {
    /* MEM OK */
    MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
@@ -402,7 +402,7 @@ evas_object_intercept_move_callback_add(Evas_Object *obj, void (*func) (void *da
  *
  */
 EAPI void *
-evas_object_intercept_move_callback_del(Evas_Object *obj, void (*func) (void *data, Evas_Object *obj, Evas_Coord x, Evas_Coord y))
+evas_object_intercept_move_callback_del(Evas_Object *obj, Evas_Object_Intercept_Move_Cb func)
 {
    /* MEM OK */
    void *data;
@@ -426,7 +426,7 @@ evas_object_intercept_move_callback_del(Evas_Object *obj, void (*func) (void *da
  *
  */
 EAPI void
-evas_object_intercept_resize_callback_add(Evas_Object *obj, void (*func) (void *data, Evas_Object *obj, Evas_Coord w, Evas_Coord h), const void *data)
+evas_object_intercept_resize_callback_add(Evas_Object *obj, Evas_Object_Intercept_Resize_Cb func, const void *data)
 {
    /* MEM OK */
    MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
@@ -446,7 +446,7 @@ evas_object_intercept_resize_callback_add(Evas_Object *obj, void (*func) (void *
  *
  */
 EAPI void *
-evas_object_intercept_resize_callback_del(Evas_Object *obj, void (*func) (void *data, Evas_Object *obj, Evas_Coord w, Evas_Coord h))
+evas_object_intercept_resize_callback_del(Evas_Object *obj, Evas_Object_Intercept_Resize_Cb func)
 {
    /* MEM OK */
    void *data;
@@ -470,7 +470,7 @@ evas_object_intercept_resize_callback_del(Evas_Object *obj, void (*func) (void *
  *
  */
 EAPI void
-evas_object_intercept_raise_callback_add(Evas_Object *obj, void (*func) (void *data, Evas_Object *obj), const void *data)
+evas_object_intercept_raise_callback_add(Evas_Object *obj, Evas_Object_Intercept_Raise_Cb func, const void *data)
 {
    /* MEM OK */
    MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
@@ -490,7 +490,7 @@ evas_object_intercept_raise_callback_add(Evas_Object *obj, void (*func) (void *d
  *
  */
 EAPI void *
-evas_object_intercept_raise_callback_del(Evas_Object *obj, void (*func) (void *data, Evas_Object *obj))
+evas_object_intercept_raise_callback_del(Evas_Object *obj, Evas_Object_Intercept_Raise_Cb func)
 {
    /* MEM OK */
    void *data;
@@ -514,7 +514,7 @@ evas_object_intercept_raise_callback_del(Evas_Object *obj, void (*func) (void *d
  *
  */
 EAPI void
-evas_object_intercept_lower_callback_add(Evas_Object *obj, void (*func) (void *data, Evas_Object *obj), const void *data)
+evas_object_intercept_lower_callback_add(Evas_Object *obj, Evas_Object_Intercept_Lower_Cb func, const void *data)
 {
    /* MEM OK */
    MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
@@ -534,7 +534,7 @@ evas_object_intercept_lower_callback_add(Evas_Object *obj, void (*func) (void *d
  *
  */
 EAPI void *
-evas_object_intercept_lower_callback_del(Evas_Object *obj, void (*func) (void *data, Evas_Object *obj))
+evas_object_intercept_lower_callback_del(Evas_Object *obj, Evas_Object_Intercept_Lower_Cb func)
 {
    /* MEM OK */
    void *data;
@@ -558,7 +558,7 @@ evas_object_intercept_lower_callback_del(Evas_Object *obj, void (*func) (void *d
  *
  */
 EAPI void
-evas_object_intercept_stack_above_callback_add(Evas_Object *obj, void (*func) (void *data, Evas_Object *obj, Evas_Object *above), const void *data)
+evas_object_intercept_stack_above_callback_add(Evas_Object *obj, Evas_Object_Intercept_Stack_Above_Cb func, const void *data)
 {
    /* MEM OK */
    MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
@@ -578,7 +578,7 @@ evas_object_intercept_stack_above_callback_add(Evas_Object *obj, void (*func) (v
  *
  */
 EAPI void *
-evas_object_intercept_stack_above_callback_del(Evas_Object *obj, void (*func) (void *data, Evas_Object *obj, Evas_Object *above))
+evas_object_intercept_stack_above_callback_del(Evas_Object *obj, Evas_Object_Intercept_Stack_Above_Cb func)
 {
    /* MEM OK */
    void *data;
@@ -602,7 +602,7 @@ evas_object_intercept_stack_above_callback_del(Evas_Object *obj, void (*func) (v
  *
  */
 EAPI void
-evas_object_intercept_stack_below_callback_add(Evas_Object *obj, void (*func) (void *data, Evas_Object *obj, Evas_Object *below), const void *data)
+evas_object_intercept_stack_below_callback_add(Evas_Object *obj, Evas_Object_Intercept_Stack_Below_Cb func, const void *data)
 {
    /* MEM OK */
    MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
@@ -622,7 +622,7 @@ evas_object_intercept_stack_below_callback_add(Evas_Object *obj, void (*func) (v
  *
  */
 EAPI void *
-evas_object_intercept_stack_below_callback_del(Evas_Object *obj, void (*func) (void *data, Evas_Object *obj, Evas_Object *below))
+evas_object_intercept_stack_below_callback_del(Evas_Object *obj, Evas_Object_Intercept_Stack_Below_Cb func)
 {
    /* MEM OK */
    void *data;
@@ -646,7 +646,7 @@ evas_object_intercept_stack_below_callback_del(Evas_Object *obj, void (*func) (v
  *
  */
 EAPI void
-evas_object_intercept_layer_set_callback_add(Evas_Object *obj, void (*func) (void *data, Evas_Object *obj, int l), const void *data)
+evas_object_intercept_layer_set_callback_add(Evas_Object *obj, Evas_Object_Intercept_Layer_Set_Cb func, const void *data)
 {
    /* MEM OK */
    MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
@@ -666,7 +666,7 @@ evas_object_intercept_layer_set_callback_add(Evas_Object *obj, void (*func) (voi
  *
  */
 EAPI void *
-evas_object_intercept_layer_set_callback_del(Evas_Object *obj, void (*func) (void *data, Evas_Object *obj, int l))
+evas_object_intercept_layer_set_callback_del(Evas_Object *obj, Evas_Object_Intercept_Layer_Set_Cb func)
 {
    /* MEM OK */
    void *data;
@@ -690,7 +690,7 @@ evas_object_intercept_layer_set_callback_del(Evas_Object *obj, void (*func) (voi
  *
  */
 EAPI void
-evas_object_intercept_color_set_callback_add(Evas_Object *obj, void (*func) (void *data, Evas_Object *obj, int r, int g, int b, int a), const void *data)
+evas_object_intercept_color_set_callback_add(Evas_Object *obj, Evas_Object_Intercept_Color_Set_Cb func, const void *data)
 {
    /* MEM OK */
    MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
@@ -710,7 +710,7 @@ evas_object_intercept_color_set_callback_add(Evas_Object *obj, void (*func) (voi
  *
  */
 EAPI void *
-evas_object_intercept_color_set_callback_del(Evas_Object *obj, void (*func) (void *data, Evas_Object *obj, int r, int g, int b, int a))
+evas_object_intercept_color_set_callback_del(Evas_Object *obj, Evas_Object_Intercept_Color_Set_Cb func)
 {
    /* MEM OK */
    void *data;
@@ -734,7 +734,7 @@ evas_object_intercept_color_set_callback_del(Evas_Object *obj, void (*func) (voi
  *
  */
 EAPI void
-evas_object_intercept_clip_set_callback_add(Evas_Object *obj, void (*func) (void *data, Evas_Object *obj, Evas_Object *clip), const void *data)
+evas_object_intercept_clip_set_callback_add(Evas_Object *obj, Evas_Object_Intercept_Clip_Set_Cb func, const void *data)
 {
    /* MEM OK */
    MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
@@ -754,7 +754,7 @@ evas_object_intercept_clip_set_callback_add(Evas_Object *obj, void (*func) (void
  *
  */
 EAPI void *
-evas_object_intercept_clip_set_callback_del(Evas_Object *obj, void (*func) (void *data, Evas_Object *obj, Evas_Object *clip))
+evas_object_intercept_clip_set_callback_del(Evas_Object *obj, Evas_Object_Intercept_Clip_Set_Cb func)
 {
    /* MEM OK */
    void *data;
@@ -778,7 +778,7 @@ evas_object_intercept_clip_set_callback_del(Evas_Object *obj, void (*func) (void
  *
  */
 EAPI void
-evas_object_intercept_clip_unset_callback_add(Evas_Object *obj, void (*func) (void *data, Evas_Object *obj), const void *data)
+evas_object_intercept_clip_unset_callback_add(Evas_Object *obj, Evas_Object_Intercept_Clip_Unset_Cb func, const void *data)
 {
    /* MEM OK */
    MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
@@ -798,7 +798,7 @@ evas_object_intercept_clip_unset_callback_add(Evas_Object *obj, void (*func) (vo
  *
  */
 EAPI void *
-evas_object_intercept_clip_unset_callback_del(Evas_Object *obj, void (*func) (void *data, Evas_Object *obj))
+evas_object_intercept_clip_unset_callback_del(Evas_Object *obj, Evas_Object_Intercept_Clip_Unset_Cb func)
 {
    /* MEM OK */
    void *data;

diff --git a/src/lib/include/evas_private.h b/src/lib/include/evas_private.h
index 99540a6..842e7f0 100644 (file)
--- a/src/lib/include/evas_private.h
+++ b/src/lib/include/evas_private.h
@@ -41,11 +41,6 @@ typedef struct _Evas_Image_Load_Func        Evas_Image_Load_Func;
 typedef struct _Evas_Image_Save_Func        Evas_Image_Save_Func;
 typedef struct _Evas_Object_Func            Evas_Object_Func;
 typedef struct _Evas_Intercept_Func         Evas_Intercept_Func;
-typedef struct _Evas_Intercept_Func_Basic   Evas_Intercept_Func_Basic;
-typedef struct _Evas_Intercept_Func_SizePos Evas_Intercept_Func_SizePos;
-typedef struct _Evas_Intercept_Func_Obj     Evas_Intercept_Func_Obj;
-typedef struct _Evas_Intercept_Func_Int     Evas_Intercept_Func_Int;
-typedef struct _Evas_Intercept_Func_Color   Evas_Intercept_Func_Color;
 typedef struct _Evas_Key_Grab               Evas_Key_Grab;
 typedef struct _Evas_Callbacks              Evas_Callbacks;
 typedef struct _Evas_Format                 Evas_Format;
@@ -116,36 +111,6 @@ MAGIC_CHECK_FAILED(o, t, m)
         (o)->prev.key = NULL;                                              \
      }
 
-struct _Evas_Intercept_Func_Basic
-{
-   void (*func) (void *data, Evas_Object *obj);
-   void *data;
-};
-
-struct _Evas_Intercept_Func_SizePos
-{
-   void (*func) (void *data, Evas_Object *obj, Evas_Coord x, Evas_Coord y);
-   void *data;
-};
-
-struct _Evas_Intercept_Func_Obj
-{
-   void (*func) (void *data, Evas_Object *obj, Evas_Object *obj2);
-   void *data;
-};
-
-struct _Evas_Intercept_Func_Int
-{
-   void (*func) (void *data, Evas_Object *obj, int n);
-   void *data;
-};
-
-struct _Evas_Intercept_Func_Color
-{
-   void (*func) (void *data, Evas_Object *obj, int r, int g, int b, int a);
-   void *data;
-};
-
 struct _Evas_Key_Grab
 {
    char               *keyname;
@@ -159,18 +124,54 @@ struct _Evas_Key_Grab
 
 struct _Evas_Intercept_Func
 {
-   Evas_Intercept_Func_Basic   show;
-   Evas_Intercept_Func_Basic   hide;
-   Evas_Intercept_Func_SizePos move;
-   Evas_Intercept_Func_SizePos resize;
-   Evas_Intercept_Func_Basic   raise;
-   Evas_Intercept_Func_Basic   lower;
-   Evas_Intercept_Func_Obj     stack_above;
-   Evas_Intercept_Func_Obj     stack_below;
-   Evas_Intercept_Func_Int     layer_set;
-   Evas_Intercept_Func_Color   color_set;
-   Evas_Intercept_Func_Obj     clip_set;
-   Evas_Intercept_Func_Basic   clip_unset;
+   struct {
+      Evas_Object_Intercept_Show_Cb func;
+      void *data;
+   } show;
+   struct {
+      Evas_Object_Intercept_Hide_Cb func;
+      void *data;
+   } hide;
+   struct {
+      Evas_Object_Intercept_Move_Cb func;
+      void *data;
+   } move;
+   struct {
+      Evas_Object_Intercept_Resize_Cb func;
+      void *data;
+   } resize;
+   struct {
+      Evas_Object_Intercept_Raise_Cb func;
+      void *data;
+   } raise;
+   struct {
+      Evas_Object_Intercept_Lower_Cb func;
+      void *data;
+   } lower;
+   struct {
+      Evas_Object_Intercept_Stack_Above_Cb func;
+      void *data;
+   } stack_above;
+   struct {
+      Evas_Object_Intercept_Stack_Below_Cb func;
+      void *data;
+   } stack_below;
+   struct {
+      Evas_Object_Intercept_Layer_Set_Cb func;
+      void *data;
+   } layer_set;
+   struct {
+      Evas_Object_Intercept_Color_Set_Cb func;
+      void *data;
+   } color_set;
+   struct {
+      Evas_Object_Intercept_Clip_Set_Cb func;
+      void *data;
+   } clip_set;
+   struct {
+      Evas_Object_Intercept_Clip_Unset_Cb func;
+      void *data;
+   } clip_unset;
 };
 
 struct _Evas_Smart_Cb_Description_Array
@@ -501,7 +502,7 @@ struct _Evas_Object
 struct _Evas_Func_Node
 {
    EINA_INLIST;
-   void (*func) ();
+   void (*func) (void);
    void *data;
    Evas_Callback_Type type;
    unsigned char delete_me : 1;