From af38880451152514ffe72f34026276364472e35d Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Fri, 7 Oct 2016 11:37:00 +0900 Subject: [PATCH] evas: Move intercept function types to legacy header --- src/lib/evas/Evas_Common.h | 190 --------------------------------------------- src/lib/evas/Evas_Legacy.h | 181 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 181 insertions(+), 190 deletions(-) diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h index 902aca0..6025c5c 100644 --- a/src/lib/evas/Evas_Common.h +++ b/src/lib/evas/Evas_Common.h @@ -1544,196 +1544,6 @@ EAPI const Evas_Device *evas_device_emulation_source_get(const Evas_Device *dev) */ /** - * @defgroup Evas_Object_Group_Interceptors Object Method Interceptors - * - * Evas provides a way to intercept method calls. The interceptor - * callback may opt to completely deny the call, or may check and - * change the parameters before continuing. The continuation of an - * intercepted call is done by calling the intercepted call again, - * from inside the interceptor callback. - * - * @ingroup Evas_Object_Group - */ - -/** - * @addtogroup Evas_Object_Group_Interceptors - * @{ - */ - -/** - * Function signature for the resize event of an evas object - * - * @param data is the pointer passed through the callback. - * @param obj the object being shown. - * - * @see evas_object_intercept_show_callback_add() - * @see evas_object_intercept_show_callback_del() - * - */ -typedef void (*Evas_Object_Intercept_Show_Cb)(void *data, Evas_Object *obj); - -/** - * Function signature for the hide event of an evas object - * - * @param data is the pointer passed through the callback. - * @param obj the object being hidden. - * - * @see evas_object_intercept_hide_callback_add() - * @see evas_object_intercept_hide_callback_del() - * - */ -typedef void (*Evas_Object_Intercept_Hide_Cb)(void *data, Evas_Object *obj); - -/** - * Function signature for the move event of an evas object - * - * @param data the pointer passed through the callback. - * @param obj the object being moved. - * @param x move x position - * @param y move y position - * - * @see evas_object_intercept_move_callback_add() - * @see evas_object_intercept_move_callback_del() - * - */ -typedef void (*Evas_Object_Intercept_Move_Cb)(void *data, Evas_Object *obj, Evas_Coord x, Evas_Coord y); - -/** - * Function signature for the resize event of an evas object - * - * @param data the pointer passed through the callback. - * @param obj the object being resized. - * @param width of the object - * @param height of the object - * - * @see evas_object_intercept_resize_callback_add() - * @see evas_object_intercept_resize_callback_del() - * - */ -typedef void (*Evas_Object_Intercept_Resize_Cb)(void *data, Evas_Object *obj, Evas_Coord w, Evas_Coord h); - -/** - * Function signature for the raise event of an evas object - * - * @param data the pointer passed through the callback. - * @param obj the object being raised. - * - * @see evas_object_intercept_raise_callback_add() - * @see evas_object_intercept_raise_callback_del() - * - */ -typedef void (*Evas_Object_Intercept_Raise_Cb)(void *data, Evas_Object *obj); - -/** - * Function signature for the lower event of an evas object - * - * @param data the pointer passed through the callback. - * @param obj the object being lowered. - * - * @see evas_object_intercept_lower_callback_add() - * @see evas_object_intercept_lower_callback_del() - * - */ -typedef void (*Evas_Object_Intercept_Lower_Cb)(void *data, Evas_Object *obj); - -/** - * Function signature for the stack above event of an evas object - * - * @param data the pointer passed through the callback. - * @param obj the object being stacked above. - * @param above the object above which the object is stacked - * - * @see evas_object_intercept_stack_above_callback_add() - * @see evas_object_intercept_stack_above_callback_del() - * - */ -typedef void (*Evas_Object_Intercept_Stack_Above_Cb)(void *data, Evas_Object *obj, Evas_Object *above); - -/** - * Function signature for the stack below event of an evas object - * - * @param data the pointer passed through the callback. - * @param obj the object being stacked below. - * @param above the object below which the object is stacked - * - * @see evas_object_intercept_stack_below_callback_add() - * @see evas_object_intercept_stack_below_callback_del() - * - */ -typedef void (*Evas_Object_Intercept_Stack_Below_Cb)(void *data, Evas_Object *obj, Evas_Object *above); - -/** - * Function signature for the layer event of an evas object - * - * @param data the pointer passed through the callback. - * @param obj the object being layered - * @param l the layer value - * - * @see evas_object_intercept_layer_callback_add() - * @see evas_object_intercept_layer_callback_del() - * - */ -typedef void (*Evas_Object_Intercept_Layer_Set_Cb)(void *data, Evas_Object *obj, int l); - -/** - * Function signature for the focus set event of an evas object - * - * @param data the pointer passed through the callback. - * @param obj the object being focused - * @param focus the focus value, EINA_TRUE if the object is focused, EINA_FALSE otherwise - * - * @see evas_object_intercept_focus_set_callback_add() - * @see evas_object_intercept_focus_set_callback_del() - * - */ -typedef void (*Evas_Object_Intercept_Focus_Set_Cb)(void *data, Evas_Object *obj, Eina_Bool focus); - -/** - * Function signature for the color set event of an evas object - * - * @param data the pointer passed through the callback. - * @param obj the object changing color - * @param r the red component of the color - * @param g the green component of the color - * @param b the blue component of the color - * @param a the alpha component of the color - * - * @see evas_object_intercept_color_set_callback_add() - * @see evas_object_intercept_color_set_callback_del() - * - */ -typedef void (*Evas_Object_Intercept_Color_Set_Cb)(void *data, Evas_Object *obj, int r, int g, int b, int a); - -/** - * Function signature for the clip set event of an evas object - * - * @param data the pointer passed through the callback. - * @param obj the object being clipped - * @param clip the evas object on which the object is clipped - * - * @see evas_object_intercept_clip_set_callback_add() - * @see evas_object_intercept_clip_set_callback_del() - * - */ -typedef void (*Evas_Object_Intercept_Clip_Set_Cb)(void *data, Evas_Object *obj, Evas_Object *clip); - -/** - * Function signature for the clip unset event of an evas object - * - * @param data the pointer passed through the callback. - * @param obj the object being unclipped - * - * @see evas_object_intercept_clip_unset_callback_add() - * @see evas_object_intercept_clip_unset_callback_del() - * - */ -typedef void (*Evas_Object_Intercept_Clip_Unset_Cb)(void *data, Evas_Object *obj); - -/** - * @} - */ - -/** * @defgroup Evas_Object_Specific Specific Object Functions * @ingroup Evas * diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h index ab2d3fb..e9f010d 100644 --- a/src/lib/evas/Evas_Legacy.h +++ b/src/lib/evas/Evas_Legacy.h @@ -1920,12 +1920,193 @@ EAPI Evas_Object *evas_object_top_at_pointer_get(const Evas *e) EINA_WARN_UNUSED */ /** + * @defgroup Evas_Object_Group_Interceptors Object Method Interceptors + * + * Evas provides a way to intercept method calls. The interceptor + * callback may opt to completely deny the call, or may check and + * change the parameters before continuing. The continuation of an + * intercepted call is done by calling the intercepted call again, + * from inside the interceptor callback. + * + * @ingroup Evas_Object_Group + */ + +/** * @ingroup Evas_Object_Group_Interceptors * * @{ */ /** + * Function signature for the resize event of an evas object + * + * @param data is the pointer passed through the callback. + * @param obj the object being shown. + * + * @see evas_object_intercept_show_callback_add() + * @see evas_object_intercept_show_callback_del() + * + */ +typedef void (*Evas_Object_Intercept_Show_Cb)(void *data, Evas_Object *obj); + +/** + * Function signature for the hide event of an evas object + * + * @param data is the pointer passed through the callback. + * @param obj the object being hidden. + * + * @see evas_object_intercept_hide_callback_add() + * @see evas_object_intercept_hide_callback_del() + * + */ +typedef void (*Evas_Object_Intercept_Hide_Cb)(void *data, Evas_Object *obj); + +/** + * Function signature for the move event of an evas object + * + * @param data the pointer passed through the callback. + * @param obj the object being moved. + * @param x move x position + * @param y move y position + * + * @see evas_object_intercept_move_callback_add() + * @see evas_object_intercept_move_callback_del() + * + */ +typedef void (*Evas_Object_Intercept_Move_Cb)(void *data, Evas_Object *obj, Evas_Coord x, Evas_Coord y); + +/** + * Function signature for the resize event of an evas object + * + * @param data the pointer passed through the callback. + * @param obj the object being resized. + * @param width of the object + * @param height of the object + * + * @see evas_object_intercept_resize_callback_add() + * @see evas_object_intercept_resize_callback_del() + * + */ +typedef void (*Evas_Object_Intercept_Resize_Cb)(void *data, Evas_Object *obj, Evas_Coord w, Evas_Coord h); + +/** + * Function signature for the raise event of an evas object + * + * @param data the pointer passed through the callback. + * @param obj the object being raised. + * + * @see evas_object_intercept_raise_callback_add() + * @see evas_object_intercept_raise_callback_del() + * + */ +typedef void (*Evas_Object_Intercept_Raise_Cb)(void *data, Evas_Object *obj); + +/** + * Function signature for the lower event of an evas object + * + * @param data the pointer passed through the callback. + * @param obj the object being lowered. + * + * @see evas_object_intercept_lower_callback_add() + * @see evas_object_intercept_lower_callback_del() + * + */ +typedef void (*Evas_Object_Intercept_Lower_Cb)(void *data, Evas_Object *obj); + +/** + * Function signature for the stack above event of an evas object + * + * @param data the pointer passed through the callback. + * @param obj the object being stacked above. + * @param above the object above which the object is stacked + * + * @see evas_object_intercept_stack_above_callback_add() + * @see evas_object_intercept_stack_above_callback_del() + * + */ +typedef void (*Evas_Object_Intercept_Stack_Above_Cb)(void *data, Evas_Object *obj, Evas_Object *above); + +/** + * Function signature for the stack below event of an evas object + * + * @param data the pointer passed through the callback. + * @param obj the object being stacked below. + * @param above the object below which the object is stacked + * + * @see evas_object_intercept_stack_below_callback_add() + * @see evas_object_intercept_stack_below_callback_del() + * + */ +typedef void (*Evas_Object_Intercept_Stack_Below_Cb)(void *data, Evas_Object *obj, Evas_Object *above); + +/** + * Function signature for the layer event of an evas object + * + * @param data the pointer passed through the callback. + * @param obj the object being layered + * @param l the layer value + * + * @see evas_object_intercept_layer_callback_add() + * @see evas_object_intercept_layer_callback_del() + * + */ +typedef void (*Evas_Object_Intercept_Layer_Set_Cb)(void *data, Evas_Object *obj, int l); + +/** + * Function signature for the focus set event of an evas object + * + * @param data the pointer passed through the callback. + * @param obj the object being focused + * @param focus the focus value, EINA_TRUE if the object is focused, EINA_FALSE otherwise + * + * @see evas_object_intercept_focus_set_callback_add() + * @see evas_object_intercept_focus_set_callback_del() + * + */ +typedef void (*Evas_Object_Intercept_Focus_Set_Cb)(void *data, Evas_Object *obj, Eina_Bool focus); + +/** + * Function signature for the color set event of an evas object + * + * @param data the pointer passed through the callback. + * @param obj the object changing color + * @param r the red component of the color + * @param g the green component of the color + * @param b the blue component of the color + * @param a the alpha component of the color + * + * @see evas_object_intercept_color_set_callback_add() + * @see evas_object_intercept_color_set_callback_del() + * + */ +typedef void (*Evas_Object_Intercept_Color_Set_Cb)(void *data, Evas_Object *obj, int r, int g, int b, int a); + +/** + * Function signature for the clip set event of an evas object + * + * @param data the pointer passed through the callback. + * @param obj the object being clipped + * @param clip the evas object on which the object is clipped + * + * @see evas_object_intercept_clip_set_callback_add() + * @see evas_object_intercept_clip_set_callback_del() + * + */ +typedef void (*Evas_Object_Intercept_Clip_Set_Cb)(void *data, Evas_Object *obj, Evas_Object *clip); + +/** + * Function signature for the clip unset event of an evas object + * + * @param data the pointer passed through the callback. + * @param obj the object being unclipped + * + * @see evas_object_intercept_clip_unset_callback_add() + * @see evas_object_intercept_clip_unset_callback_del() + * + */ +typedef void (*Evas_Object_Intercept_Clip_Unset_Cb)(void *data, Evas_Object *obj); + +/** * Set the callback function that intercepts a show event of an object. * * @param obj The given canvas object pointer. -- 2.7.4