diff --git a/src/lib/efl/interfaces/efl_input_types.eot b/src/lib/efl/interfaces/efl_input_types.eot index bad3eb30fc..eb5f8edeb7 100644 --- a/src/lib/efl/interfaces/efl_input_types.eot +++ b/src/lib/efl/interfaces/efl_input_types.eot @@ -29,7 +29,7 @@ enum @beta Efl.Pointer.Flags triple_click = (1 << 1), [[This mouse button press was the 3rd press of a triple click]] } -enum Efl.Input.Flags +enum @beta Efl.Input.Flags { [[Special flags set during an input event propagation. @@ -48,7 +48,7 @@ enum Efl.Input.Flags actually perform anything.]] } -enum Efl.Input.Object_Pointer_Mode { +enum @beta Efl.Input.Object_Pointer_Mode { [[How the mouse pointer should be handled by EFL. In the mode $autograb, when a mouse button is pressed down over an diff --git a/src/lib/evas/canvas/efl_canvas_object_eo.legacy.c b/src/lib/evas/canvas/efl_canvas_object_eo.legacy.c index a02c1f887f..f6d9155d1d 100644 --- a/src/lib/evas/canvas/efl_canvas_object_eo.legacy.c +++ b/src/lib/evas/canvas/efl_canvas_object_eo.legacy.c @@ -1,14 +1,14 @@ EAPI Eina_Bool -evas_object_pointer_mode_set(Efl_Canvas_Object *obj, Efl_Input_Object_Pointer_Mode pointer_mode) +evas_object_pointer_mode_set(Efl_Canvas_Object *obj, Evas_Object_Pointer_Mode pointer_mode) { - return efl_canvas_object_pointer_mode_set(obj, pointer_mode); + return efl_canvas_object_pointer_mode_set(obj, (Efl_Input_Object_Pointer_Mode)pointer_mode); } -EAPI Efl_Input_Object_Pointer_Mode +EAPI Evas_Object_Pointer_Mode evas_object_pointer_mode_get(const Efl_Canvas_Object *obj) { - return efl_canvas_object_pointer_mode_get(obj); + return (Evas_Object_Pointer_Mode)efl_canvas_object_pointer_mode_get(obj); } EAPI void diff --git a/src/lib/evas/canvas/efl_canvas_object_eo.legacy.h b/src/lib/evas/canvas/efl_canvas_object_eo.legacy.h index ce51e7dd95..f21d91fca0 100644 --- a/src/lib/evas/canvas/efl_canvas_object_eo.legacy.h +++ b/src/lib/evas/canvas/efl_canvas_object_eo.legacy.h @@ -38,15 +38,15 @@ typedef struct _Efl_Event_Animator_Tick * This function has a direct effect on event callbacks related to pointers * (mouse, ...). * - * If the value is @ref EFL_INPUT_OBJECT_POINTER_MODE_AUTO_GRAB (default), then + * If the value is @ref EVAS_OBJECT_POINTER_MODE_AUTO_GRAB (default), then * when mouse is pressed down over this object, events will be restricted to it * as source, mouse moves, for example, will be emitted even when the pointer * goes outside this objects geometry. * - * If the value is @ref EFL_INPUT_OBJECT_POINTER_MODE_NO_GRAB, then events will + * If the value is @ref EVAS_OBJECT_POINTER_MODE_NO_GRAB, then events will * be emitted just when inside this object area. * - * The default value is @ref EFL_INPUT_OBJECT_POINTER_MODE_AUTO_GRAB. See also: + * The default value is @ref EVAS_OBJECT_POINTER_MODE_AUTO_GRAB. See also: * @ref Efl.Canvas.Object.pointer_mode_by_device.get and * @ref Efl.Canvas.Object.pointer_mode_by_device.set Note: This function will * only set/get the mode for the default pointer. @@ -58,7 +58,7 @@ typedef struct _Efl_Event_Animator_Tick * * @ingroup Evas_Object_Group */ -EAPI Eina_Bool evas_object_pointer_mode_set(Efl_Canvas_Object *obj, Efl_Input_Object_Pointer_Mode pointer_mode); +EAPI Eina_Bool evas_object_pointer_mode_set(Efl_Canvas_Object *obj, Evas_Object_Pointer_Mode pointer_mode); /** * @brief Low-level pointer behaviour. @@ -66,15 +66,15 @@ EAPI Eina_Bool evas_object_pointer_mode_set(Efl_Canvas_Object *obj, Efl_Input_Ob * This function has a direct effect on event callbacks related to pointers * (mouse, ...). * - * If the value is @ref EFL_INPUT_OBJECT_POINTER_MODE_AUTO_GRAB (default), then + * If the value is @ref EVAS_OBJECT_POINTER_MODE_AUTO_GRAB (default), then * when mouse is pressed down over this object, events will be restricted to it * as source, mouse moves, for example, will be emitted even when the pointer * goes outside this objects geometry. * - * If the value is @ref EFL_INPUT_OBJECT_POINTER_MODE_NO_GRAB, then events will + * If the value is @ref EVAS_OBJECT_POINTER_MODE_NO_GRAB, then events will * be emitted just when inside this object area. * - * The default value is @ref EFL_INPUT_OBJECT_POINTER_MODE_AUTO_GRAB. See also: + * The default value is @ref EVAS_OBJECT_POINTER_MODE_AUTO_GRAB. See also: * @ref Efl.Canvas.Object.pointer_mode_by_device.get and * @ref Efl.Canvas.Object.pointer_mode_by_device.set Note: This function will * only set/get the mode for the default pointer. @@ -85,7 +85,7 @@ EAPI Eina_Bool evas_object_pointer_mode_set(Efl_Canvas_Object *obj, Efl_Input_Ob * * @ingroup Evas_Object_Group */ -EAPI Efl_Input_Object_Pointer_Mode evas_object_pointer_mode_get(const Efl_Canvas_Object *obj); +EAPI Evas_Object_Pointer_Mode evas_object_pointer_mode_get(const Efl_Canvas_Object *obj); diff --git a/src/lib/evas/canvas/evas_canvas_eo.c b/src/lib/evas/canvas/evas_canvas_eo.c index 5ec573bdcd..2f618ce37c 100644 --- a/src/lib/evas/canvas/evas_canvas_eo.c +++ b/src/lib/evas/canvas/evas_canvas_eo.c @@ -31,13 +31,13 @@ __eolian_evas_canvas_image_cache_get_reflect(const Eo *obj) EOAPI EFL_FUNC_BODY_CONST(evas_canvas_image_cache_get, int, 0); -void _evas_canvas_event_default_flags_set(Eo *obj, Evas_Public_Data *pd, Efl_Input_Flags flags); +void _evas_canvas_event_default_flags_set(Eo *obj, Evas_Public_Data *pd, Evas_Event_Flags flags); -EOAPI EFL_VOID_FUNC_BODYV(evas_canvas_event_default_flags_set, EFL_FUNC_CALL(flags), Efl_Input_Flags flags); +EOAPI EFL_VOID_FUNC_BODYV(evas_canvas_event_default_flags_set, EFL_FUNC_CALL(flags), Evas_Event_Flags flags); -Efl_Input_Flags _evas_canvas_event_default_flags_get(const Eo *obj, Evas_Public_Data *pd); +Evas_Event_Flags _evas_canvas_event_default_flags_get(const Eo *obj, Evas_Public_Data *pd); -EOAPI EFL_FUNC_BODY_CONST(evas_canvas_event_default_flags_get, Efl_Input_Flags, 0); +EOAPI EFL_FUNC_BODY_CONST(evas_canvas_event_default_flags_get, Evas_Event_Flags, 0); void _evas_canvas_font_cache_set(Eo *obj, Evas_Public_Data *pd, int size); @@ -83,17 +83,17 @@ Efl_Canvas_Object *_evas_canvas_focus_get(const Eo *obj, Evas_Public_Data *pd); EOAPI EFL_FUNC_BODY_CONST(evas_canvas_focus_get, Efl_Canvas_Object *, NULL); -Efl_Canvas_Object *_evas_canvas_seat_focus_get(const Eo *obj, Evas_Public_Data *pd, Efl_Input_Device *seat); +Efl_Canvas_Object *_evas_canvas_seat_focus_get(const Eo *obj, Evas_Public_Data *pd, Evas_Device *seat); -EOAPI EFL_FUNC_BODYV_CONST(evas_canvas_seat_focus_get, Efl_Canvas_Object *, NULL, EFL_FUNC_CALL(seat), Efl_Input_Device *seat); +EOAPI EFL_FUNC_BODYV_CONST(evas_canvas_seat_focus_get, Efl_Canvas_Object *, NULL, EFL_FUNC_CALL(seat), Evas_Device *seat); Efl_Canvas_Object *_evas_canvas_object_top_get(const Eo *obj, Evas_Public_Data *pd); EOAPI EFL_FUNC_BODY_CONST(evas_canvas_object_top_get, Efl_Canvas_Object *, NULL); -void _evas_canvas_pointer_canvas_xy_by_device_get(const Eo *obj, Evas_Public_Data *pd, Efl_Input_Device *dev, int *x, int *y); +void _evas_canvas_pointer_canvas_xy_by_device_get(const Eo *obj, Evas_Public_Data *pd, Evas_Device *dev, int *x, int *y); -EOAPI EFL_VOID_FUNC_BODYV_CONST(evas_canvas_pointer_canvas_xy_by_device_get, EFL_FUNC_CALL(dev, x, y), Efl_Input_Device *dev, int *x, int *y); +EOAPI EFL_VOID_FUNC_BODYV_CONST(evas_canvas_pointer_canvas_xy_by_device_get, EFL_FUNC_CALL(dev, x, y), Evas_Device *dev, int *x, int *y); void _evas_canvas_pointer_canvas_xy_get(const Eo *obj, Evas_Public_Data *pd, int *x, int *y); @@ -111,17 +111,17 @@ Eina_Bool _evas_canvas_focus_state_get(const Eo *obj, Evas_Public_Data *pd); EOAPI EFL_FUNC_BODY_CONST(evas_canvas_focus_state_get, Eina_Bool, 0); -Eina_Bool _evas_canvas_seat_focus_state_get(const Eo *obj, Evas_Public_Data *pd, Efl_Input_Device *seat); +Eina_Bool _evas_canvas_seat_focus_state_get(const Eo *obj, Evas_Public_Data *pd, Evas_Device *seat); -EOAPI EFL_FUNC_BODYV_CONST(evas_canvas_seat_focus_state_get, Eina_Bool, 0, EFL_FUNC_CALL(seat), Efl_Input_Device *seat); +EOAPI EFL_FUNC_BODYV_CONST(evas_canvas_seat_focus_state_get, Eina_Bool, 0, EFL_FUNC_CALL(seat), Evas_Device *seat); Eina_Bool _evas_canvas_changed_get(const Eo *obj, Evas_Public_Data *pd); EOAPI EFL_FUNC_BODY_CONST(evas_canvas_changed_get, Eina_Bool, 0); -void _evas_canvas_pointer_output_xy_by_device_get(const Eo *obj, Evas_Public_Data *pd, Efl_Input_Device *dev, int *x, int *y); +void _evas_canvas_pointer_output_xy_by_device_get(const Eo *obj, Evas_Public_Data *pd, Evas_Device *dev, int *x, int *y); -EOAPI EFL_VOID_FUNC_BODYV_CONST(evas_canvas_pointer_output_xy_by_device_get, EFL_FUNC_CALL(dev, x, y), Efl_Input_Device *dev, int *x, int *y); +EOAPI EFL_VOID_FUNC_BODYV_CONST(evas_canvas_pointer_output_xy_by_device_get, EFL_FUNC_CALL(dev, x, y), Evas_Device *dev, int *x, int *y); void _evas_canvas_pointer_output_xy_get(const Eo *obj, Evas_Public_Data *pd, int *x, int *y); @@ -131,9 +131,9 @@ Efl_Canvas_Object *_evas_canvas_object_bottom_get(const Eo *obj, Evas_Public_Dat EOAPI EFL_FUNC_BODY_CONST(evas_canvas_object_bottom_get, Efl_Canvas_Object *, NULL); -unsigned int _evas_canvas_pointer_button_down_mask_by_device_get(const Eo *obj, Evas_Public_Data *pd, Efl_Input_Device *dev); +unsigned int _evas_canvas_pointer_button_down_mask_by_device_get(const Eo *obj, Evas_Public_Data *pd, Evas_Device *dev); -EOAPI EFL_FUNC_BODYV_CONST(evas_canvas_pointer_button_down_mask_by_device_get, unsigned int, 0, EFL_FUNC_CALL(dev), Efl_Input_Device *dev); +EOAPI EFL_FUNC_BODYV_CONST(evas_canvas_pointer_button_down_mask_by_device_get, unsigned int, 0, EFL_FUNC_CALL(dev), Evas_Device *dev); unsigned int _evas_canvas_pointer_button_down_mask_get(const Eo *obj, Evas_Public_Data *pd); @@ -147,13 +147,13 @@ void _evas_canvas_key_lock_on(Eo *obj, Evas_Public_Data *pd, const char *keyname EOAPI EFL_VOID_FUNC_BODYV(evas_canvas_key_lock_on, EFL_FUNC_CALL(keyname), const char *keyname); -void _evas_canvas_seat_key_lock_on(Eo *obj, Evas_Public_Data *pd, const char *keyname, Efl_Input_Device *seat); +void _evas_canvas_seat_key_lock_on(Eo *obj, Evas_Public_Data *pd, const char *keyname, Evas_Device *seat); -EOAPI EFL_VOID_FUNC_BODYV(evas_canvas_seat_key_lock_on, EFL_FUNC_CALL(keyname, seat), const char *keyname, Efl_Input_Device *seat); +EOAPI EFL_VOID_FUNC_BODYV(evas_canvas_seat_key_lock_on, EFL_FUNC_CALL(keyname, seat), const char *keyname, Evas_Device *seat); -void _evas_canvas_seat_key_lock_off(Eo *obj, Evas_Public_Data *pd, const char *keyname, Efl_Input_Device *seat); +void _evas_canvas_seat_key_lock_off(Eo *obj, Evas_Public_Data *pd, const char *keyname, Evas_Device *seat); -EOAPI EFL_VOID_FUNC_BODYV(evas_canvas_seat_key_lock_off, EFL_FUNC_CALL(keyname, seat), const char *keyname, Efl_Input_Device *seat); +EOAPI EFL_VOID_FUNC_BODYV(evas_canvas_seat_key_lock_off, EFL_FUNC_CALL(keyname, seat), const char *keyname, Evas_Device *seat); void _evas_canvas_key_modifier_add(Eo *obj, Evas_Public_Data *pd, const char *keyname); @@ -195,13 +195,13 @@ void _evas_canvas_key_modifier_on(Eo *obj, Evas_Public_Data *pd, const char *key EOAPI EFL_VOID_FUNC_BODYV(evas_canvas_key_modifier_on, EFL_FUNC_CALL(keyname), const char *keyname); -void _evas_canvas_seat_key_modifier_on(Eo *obj, Evas_Public_Data *pd, const char *keyname, Efl_Input_Device *seat); +void _evas_canvas_seat_key_modifier_on(Eo *obj, Evas_Public_Data *pd, const char *keyname, Evas_Device *seat); -EOAPI EFL_VOID_FUNC_BODYV(evas_canvas_seat_key_modifier_on, EFL_FUNC_CALL(keyname, seat), const char *keyname, Efl_Input_Device *seat); +EOAPI EFL_VOID_FUNC_BODYV(evas_canvas_seat_key_modifier_on, EFL_FUNC_CALL(keyname, seat), const char *keyname, Evas_Device *seat); -void _evas_canvas_seat_key_modifier_off(Eo *obj, Evas_Public_Data *pd, const char *keyname, Efl_Input_Device *seat); +void _evas_canvas_seat_key_modifier_off(Eo *obj, Evas_Public_Data *pd, const char *keyname, Evas_Device *seat); -EOAPI EFL_VOID_FUNC_BODYV(evas_canvas_seat_key_modifier_off, EFL_FUNC_CALL(keyname, seat), const char *keyname, Efl_Input_Device *seat); +EOAPI EFL_VOID_FUNC_BODYV(evas_canvas_seat_key_modifier_off, EFL_FUNC_CALL(keyname, seat), const char *keyname, Evas_Device *seat); Eina_List *_evas_canvas_font_available_list(const Eo *obj, Evas_Public_Data *pd); @@ -267,13 +267,13 @@ void _evas_canvas_focus_in(Eo *obj, Evas_Public_Data *pd); EOAPI EFL_VOID_FUNC_BODY(evas_canvas_focus_in); -void _evas_canvas_seat_focus_in(Eo *obj, Evas_Public_Data *pd, Efl_Input_Device *seat); +void _evas_canvas_seat_focus_in(Eo *obj, Evas_Public_Data *pd, Evas_Device *seat); -EOAPI EFL_VOID_FUNC_BODYV(evas_canvas_seat_focus_in, EFL_FUNC_CALL(seat), Efl_Input_Device *seat); +EOAPI EFL_VOID_FUNC_BODYV(evas_canvas_seat_focus_in, EFL_FUNC_CALL(seat), Evas_Device *seat); -void _evas_canvas_seat_focus_out(Eo *obj, Evas_Public_Data *pd, Efl_Input_Device *seat); +void _evas_canvas_seat_focus_out(Eo *obj, Evas_Public_Data *pd, Evas_Device *seat); -EOAPI EFL_VOID_FUNC_BODYV(evas_canvas_seat_focus_out, EFL_FUNC_CALL(seat), Efl_Input_Device *seat); +EOAPI EFL_VOID_FUNC_BODYV(evas_canvas_seat_focus_out, EFL_FUNC_CALL(seat), Evas_Device *seat); void _evas_canvas_obscured_rectangle_add(Eo *obj, Evas_Public_Data *pd, int x, int y, int w, int h); @@ -307,9 +307,9 @@ void _evas_canvas_render_idle_flush(Eo *obj, Evas_Public_Data *pd); EOAPI EFL_VOID_FUNC_BODY(evas_canvas_render_idle_flush); -Efl_Input_Device *_evas_canvas_default_device_get(const Eo *obj, Evas_Public_Data *pd, Efl_Input_Device_Type type); +Evas_Device *_evas_canvas_default_device_get(const Eo *obj, Evas_Public_Data *pd, Evas_Device_Class type); -EOAPI EFL_FUNC_BODYV_CONST(evas_canvas_default_device_get, Efl_Input_Device *, NULL, EFL_FUNC_CALL(type), Efl_Input_Device_Type type); +EOAPI EFL_FUNC_BODYV_CONST(evas_canvas_default_device_get, Evas_Device *, NULL, EFL_FUNC_CALL(type), Evas_Device_Class type); int _evas_canvas_coord_world_y_to_screen(const Eo *obj, Evas_Public_Data *pd, int y); @@ -336,19 +336,19 @@ Efl_Object *_evas_canvas_efl_object_provider_find(const Eo *obj, Evas_Public_Dat Efl_Loop *_evas_canvas_efl_loop_consumer_loop_get(const Eo *obj, Evas_Public_Data *pd); -Eina_Bool _evas_canvas_efl_canvas_pointer_pointer_inside_get(const Eo *obj, Evas_Public_Data *pd, Efl_Input_Device *seat); +Eina_Bool _evas_canvas_efl_canvas_pointer_pointer_inside_get(const Eo *obj, Evas_Public_Data *pd, Evas_Device *seat); -Efl_Input_Device *_evas_canvas_efl_canvas_scene_device_get(const Eo *obj, Evas_Public_Data *pd, const char *name); +Evas_Device *_evas_canvas_efl_canvas_scene_device_get(const Eo *obj, Evas_Public_Data *pd, const char *name); -Efl_Input_Device *_evas_canvas_efl_canvas_scene_seat_get(const Eo *obj, Evas_Public_Data *pd, int id); +Evas_Device *_evas_canvas_efl_canvas_scene_seat_get(const Eo *obj, Evas_Public_Data *pd, int id); -Efl_Input_Device *_evas_canvas_efl_canvas_scene_seat_default_get(const Eo *obj, Evas_Public_Data *pd); +Evas_Device *_evas_canvas_efl_canvas_scene_seat_default_get(const Eo *obj, Evas_Public_Data *pd); -Eina_Bool _evas_canvas_efl_canvas_scene_pointer_position_get(const Eo *obj, Evas_Public_Data *pd, Efl_Input_Device *seat, Eina_Position2D *pos); +Eina_Bool _evas_canvas_efl_canvas_scene_pointer_position_get(const Eo *obj, Evas_Public_Data *pd, Evas_Device *seat, Eina_Position2D *pos); Eina_Bool _evas_canvas_efl_canvas_scene_image_max_size_get(const Eo *obj, Evas_Public_Data *pd, Eina_Size2D *max); diff --git a/src/lib/evas/canvas/evas_canvas_eo.h b/src/lib/evas/canvas/evas_canvas_eo.h index da3fa2668d..938d59fcee 100644 --- a/src/lib/evas/canvas/evas_canvas_eo.h +++ b/src/lib/evas/canvas/evas_canvas_eo.h @@ -60,7 +60,7 @@ EOAPI int evas_canvas_image_cache_get(const Eo *obj); * * @ingroup Evas_Canvas */ -EOAPI void evas_canvas_event_default_flags_set(Eo *obj, Efl_Input_Flags flags); +EOAPI void evas_canvas_event_default_flags_set(Eo *obj, Evas_Event_Flags flags); /** * @brief Get the default set of flags an event begins with @@ -75,7 +75,7 @@ EOAPI void evas_canvas_event_default_flags_set(Eo *obj, Efl_Input_Flags flags); * * @ingroup Evas_Canvas */ -EOAPI Efl_Input_Flags evas_canvas_event_default_flags_get(const Eo *obj); +EOAPI Evas_Event_Flags evas_canvas_event_default_flags_get(const Eo *obj); /** * @brief Changes the size of font cache of the given evas. @@ -161,7 +161,7 @@ EOAPI Efl_Canvas_Object *evas_canvas_focus_get(const Eo *obj) EINA_WARN_UNUSED_R * * @ingroup Evas_Canvas */ -EOAPI Efl_Canvas_Object *evas_canvas_seat_focus_get(const Eo *obj, Efl_Input_Device *seat); +EOAPI Efl_Canvas_Object *evas_canvas_seat_focus_get(const Eo *obj, Evas_Device *seat); /** * @brief Get the highest (stacked) Evas object on the canvas @c e. @@ -195,7 +195,7 @@ EOAPI Efl_Canvas_Object *evas_canvas_object_top_get(const Eo *obj) EINA_WARN_UNU * * @ingroup Evas_Canvas */ -EOAPI void evas_canvas_pointer_canvas_xy_by_device_get(const Eo *obj, Efl_Input_Device *dev, int *x, int *y); +EOAPI void evas_canvas_pointer_canvas_xy_by_device_get(const Eo *obj, Evas_Device *dev, int *x, int *y); /** * @brief This function returns the current known default pointer coordinates @@ -270,7 +270,7 @@ EOAPI Eina_Bool evas_canvas_focus_state_get(const Eo *obj); * * @ingroup Evas_Canvas */ -EOAPI Eina_Bool evas_canvas_seat_focus_state_get(const Eo *obj, Efl_Input_Device *seat); +EOAPI Eina_Bool evas_canvas_seat_focus_state_get(const Eo *obj, Evas_Device *seat); /** * @brief Get the changed marker for the canvas. @@ -297,7 +297,7 @@ EOAPI Eina_Bool evas_canvas_changed_get(const Eo *obj); * * @ingroup Evas_Canvas */ -EOAPI void evas_canvas_pointer_output_xy_by_device_get(const Eo *obj, Efl_Input_Device *dev, int *x, int *y); +EOAPI void evas_canvas_pointer_output_xy_by_device_get(const Eo *obj, Evas_Device *dev, int *x, int *y); /** * @brief This function returns the current known default pointer coordinates. @@ -345,7 +345,7 @@ EOAPI Efl_Canvas_Object *evas_canvas_object_bottom_get(const Eo *obj) EINA_WARN_ * * @ingroup Evas_Canvas */ -EOAPI unsigned int evas_canvas_pointer_button_down_mask_by_device_get(const Eo *obj, Efl_Input_Device *dev); +EOAPI unsigned int evas_canvas_pointer_button_down_mask_by_device_get(const Eo *obj, Evas_Device *dev); /** * @brief Returns a bitmask with the default mouse buttons currently pressed, @@ -431,7 +431,7 @@ EOAPI void evas_canvas_key_lock_on(Eo *obj, const char *keyname) EINA_ARG_NONNUL * * @ingroup Evas_Canvas */ -EOAPI void evas_canvas_seat_key_lock_on(Eo *obj, const char *keyname, Efl_Input_Device *seat) EINA_ARG_NONNULL(2); +EOAPI void evas_canvas_seat_key_lock_on(Eo *obj, const char *keyname, Evas_Device *seat) EINA_ARG_NONNULL(2); /** * @brief Disables or turns off programmatically the lock key with name @@ -452,7 +452,7 @@ EOAPI void evas_canvas_seat_key_lock_on(Eo *obj, const char *keyname, Efl_Input_ * * @ingroup Evas_Canvas */ -EOAPI void evas_canvas_seat_key_lock_off(Eo *obj, const char *keyname, Efl_Input_Device *seat) EINA_ARG_NONNULL(2); +EOAPI void evas_canvas_seat_key_lock_off(Eo *obj, const char *keyname, Evas_Device *seat) EINA_ARG_NONNULL(2); /** * @brief Adds the @c keyname key to the current list of modifier keys. @@ -629,7 +629,7 @@ EOAPI void evas_canvas_key_modifier_on(Eo *obj, const char *keyname) EINA_ARG_NO * * @ingroup Evas_Canvas */ -EOAPI void evas_canvas_seat_key_modifier_on(Eo *obj, const char *keyname, Efl_Input_Device *seat) EINA_ARG_NONNULL(2); +EOAPI void evas_canvas_seat_key_modifier_on(Eo *obj, const char *keyname, Evas_Device *seat) EINA_ARG_NONNULL(2); /** * @brief Disables or turns off programmatically the modifier key with name @@ -649,7 +649,7 @@ EOAPI void evas_canvas_seat_key_modifier_on(Eo *obj, const char *keyname, Efl_In * * @ingroup Evas_Canvas */ -EOAPI void evas_canvas_seat_key_modifier_off(Eo *obj, const char *keyname, Efl_Input_Device *seat) EINA_ARG_NONNULL(2); +EOAPI void evas_canvas_seat_key_modifier_off(Eo *obj, const char *keyname, Evas_Device *seat) EINA_ARG_NONNULL(2); /** * @brief List of available font descriptions known or found by this evas. @@ -870,7 +870,7 @@ EOAPI void evas_canvas_focus_in(Eo *obj); * * @ingroup Evas_Canvas */ -EOAPI void evas_canvas_seat_focus_in(Eo *obj, Efl_Input_Device *seat); +EOAPI void evas_canvas_seat_focus_in(Eo *obj, Evas_Device *seat); /** * @brief Inform to the evas that it lost the focus from a given seat. @@ -882,7 +882,7 @@ EOAPI void evas_canvas_seat_focus_in(Eo *obj, Efl_Input_Device *seat); * * @ingroup Evas_Canvas */ -EOAPI void evas_canvas_seat_focus_out(Eo *obj, Efl_Input_Device *seat); +EOAPI void evas_canvas_seat_focus_out(Eo *obj, Evas_Device *seat); /** * @brief Add an "obscured region" to an Evas canvas. @@ -1046,7 +1046,7 @@ EOAPI void evas_canvas_render_idle_flush(Eo *obj); * * @ingroup Evas_Canvas */ -EOAPI Efl_Input_Device *evas_canvas_default_device_get(const Eo *obj, Efl_Input_Device_Type type); +EOAPI Evas_Device *evas_canvas_default_device_get(const Eo *obj, Evas_Device_Class type); /** * @brief Convert/scale a canvas coordinate into output screen coordinates. diff --git a/src/lib/evas/canvas/evas_canvas_eo.legacy.c b/src/lib/evas/canvas/evas_canvas_eo.legacy.c index 7c28a638ac..b864c2f6d4 100644 --- a/src/lib/evas/canvas/evas_canvas_eo.legacy.c +++ b/src/lib/evas/canvas/evas_canvas_eo.legacy.c @@ -12,15 +12,15 @@ evas_image_cache_get(const Evas_Canvas *obj) } EAPI void -evas_event_default_flags_set(Evas_Canvas *obj, Efl_Input_Flags flags) +evas_event_default_flags_set(Evas_Canvas *obj, Evas_Event_Flags flags) { - evas_canvas_event_default_flags_set(obj, flags); + evas_canvas_event_default_flags_set(obj, (Efl_Input_Flags)flags); } -EAPI Efl_Input_Flags +EAPI Evas_Event_Flags evas_event_default_flags_get(const Evas_Canvas *obj) { - return evas_canvas_event_default_flags_get(obj); + return (Evas_Event_Flags)evas_canvas_event_default_flags_get(obj); } EAPI void @@ -54,7 +54,7 @@ evas_focus_get(const Evas_Canvas *obj) } EAPI Efl_Canvas_Object * -evas_seat_focus_get(const Evas_Canvas *obj, Efl_Input_Device *seat) +evas_seat_focus_get(const Evas_Canvas *obj, Evas_Device *seat) { return evas_canvas_seat_focus_get(obj, seat); } @@ -66,7 +66,7 @@ evas_object_top_get(const Evas_Canvas *obj) } EAPI void -evas_pointer_canvas_xy_by_device_get(const Evas_Canvas *obj, Efl_Input_Device *dev, int *x, int *y) +evas_pointer_canvas_xy_by_device_get(const Evas_Canvas *obj, Evas_Device *dev, int *x, int *y) { evas_canvas_pointer_canvas_xy_by_device_get(obj, dev, x, y); } @@ -96,7 +96,7 @@ evas_focus_state_get(const Evas_Canvas *obj) } EAPI Eina_Bool -evas_seat_focus_state_get(const Evas_Canvas *obj, Efl_Input_Device *seat) +evas_seat_focus_state_get(const Evas_Canvas *obj, Evas_Device *seat) { return evas_canvas_seat_focus_state_get(obj, seat); } @@ -108,7 +108,7 @@ evas_changed_get(const Evas_Canvas *obj) } EAPI void -evas_pointer_output_xy_by_device_get(const Evas_Canvas *obj, Efl_Input_Device *dev, int *x, int *y) +evas_pointer_output_xy_by_device_get(const Evas_Canvas *obj, Evas_Device *dev, int *x, int *y) { evas_canvas_pointer_output_xy_by_device_get(obj, dev, x, y); } @@ -126,7 +126,7 @@ evas_object_bottom_get(const Evas_Canvas *obj) } EAPI unsigned int -evas_pointer_button_down_mask_by_device_get(const Evas_Canvas *obj, Efl_Input_Device *dev) +evas_pointer_button_down_mask_by_device_get(const Evas_Canvas *obj, Evas_Device *dev) { return evas_canvas_pointer_button_down_mask_by_device_get(obj, dev); } @@ -150,13 +150,13 @@ evas_key_lock_on(Evas_Canvas *obj, const char *keyname) } EAPI void -evas_seat_key_lock_on(Evas_Canvas *obj, const char *keyname, Efl_Input_Device *seat) +evas_seat_key_lock_on(Evas_Canvas *obj, const char *keyname, Evas_Device *seat) { evas_canvas_seat_key_lock_on(obj, keyname, seat); } EAPI void -evas_seat_key_lock_off(Evas_Canvas *obj, const char *keyname, Efl_Input_Device *seat) +evas_seat_key_lock_off(Evas_Canvas *obj, const char *keyname, Evas_Device *seat) { evas_canvas_seat_key_lock_off(obj, keyname, seat); } @@ -222,13 +222,13 @@ evas_key_modifier_on(Evas_Canvas *obj, const char *keyname) } EAPI void -evas_seat_key_modifier_on(Evas_Canvas *obj, const char *keyname, Efl_Input_Device *seat) +evas_seat_key_modifier_on(Evas_Canvas *obj, const char *keyname, Evas_Device *seat) { evas_canvas_seat_key_modifier_on(obj, keyname, seat); } EAPI void -evas_seat_key_modifier_off(Evas_Canvas *obj, const char *keyname, Efl_Input_Device *seat) +evas_seat_key_modifier_off(Evas_Canvas *obj, const char *keyname, Evas_Device *seat) { evas_canvas_seat_key_modifier_off(obj, keyname, seat); } @@ -371,8 +371,8 @@ evas_render_idle_flush(Evas_Canvas *obj) evas_canvas_render_idle_flush(obj); } -EAPI Efl_Input_Device * -evas_default_device_get(const Evas_Canvas *obj, Efl_Input_Device_Type type) +EAPI Evas_Device * +evas_default_device_get(const Evas_Canvas *obj, Evas_Device_Class type) { return evas_canvas_default_device_get(obj, type); } diff --git a/src/lib/evas/canvas/evas_canvas_eo.legacy.h b/src/lib/evas/canvas/evas_canvas_eo.legacy.h index 0a889f7249..88a6591168 100644 --- a/src/lib/evas/canvas/evas_canvas_eo.legacy.h +++ b/src/lib/evas/canvas/evas_canvas_eo.legacy.h @@ -53,7 +53,7 @@ EAPI int evas_image_cache_get(const Evas_Canvas *obj); * * @ingroup Evas_Group */ -EAPI void evas_event_default_flags_set(Evas_Canvas *obj, Efl_Input_Flags flags); +EAPI void evas_event_default_flags_set(Evas_Canvas *obj, Evas_Event_Flags flags); /** * @brief Get the default set of flags an event begins with @@ -68,7 +68,7 @@ EAPI void evas_event_default_flags_set(Evas_Canvas *obj, Efl_Input_Flags flags); * * @ingroup Evas_Group */ -EAPI Efl_Input_Flags evas_event_default_flags_get(const Evas_Canvas *obj); +EAPI Evas_Event_Flags evas_event_default_flags_get(const Evas_Canvas *obj); /** * @brief Changes the size of font cache of the given evas. @@ -154,7 +154,7 @@ EAPI Efl_Canvas_Object *evas_focus_get(const Evas_Canvas *obj) EINA_WARN_UNUSED_ * * @ingroup Evas_Group */ -EAPI Efl_Canvas_Object *evas_seat_focus_get(const Evas_Canvas *obj, Efl_Input_Device *seat); +EAPI Efl_Canvas_Object *evas_seat_focus_get(const Evas_Canvas *obj, Evas_Device *seat); /** * @brief Get the highest (stacked) Evas object on the canvas @c e. @@ -188,7 +188,7 @@ EAPI Efl_Canvas_Object *evas_object_top_get(const Evas_Canvas *obj) EINA_WARN_UN * * @ingroup Evas_Group */ -EAPI void evas_pointer_canvas_xy_by_device_get(const Evas_Canvas *obj, Efl_Input_Device *dev, int *x, int *y); +EAPI void evas_pointer_canvas_xy_by_device_get(const Evas_Canvas *obj, Evas_Device *dev, int *x, int *y); /** * @brief This function returns the current known default pointer coordinates @@ -263,7 +263,7 @@ EAPI Eina_Bool evas_focus_state_get(const Evas_Canvas *obj); * * @ingroup Evas_Group */ -EAPI Eina_Bool evas_seat_focus_state_get(const Evas_Canvas *obj, Efl_Input_Device *seat); +EAPI Eina_Bool evas_seat_focus_state_get(const Evas_Canvas *obj, Evas_Device *seat); /** * @brief Get the changed marker for the canvas. @@ -290,7 +290,7 @@ EAPI Eina_Bool evas_changed_get(const Evas_Canvas *obj); * * @ingroup Evas_Group */ -EAPI void evas_pointer_output_xy_by_device_get(const Evas_Canvas *obj, Efl_Input_Device *dev, int *x, int *y); +EAPI void evas_pointer_output_xy_by_device_get(const Evas_Canvas *obj, Evas_Device *dev, int *x, int *y); /** * @brief This function returns the current known default pointer coordinates. @@ -338,7 +338,7 @@ EAPI Efl_Canvas_Object *evas_object_bottom_get(const Evas_Canvas *obj) EINA_WARN * * @ingroup Evas_Group */ -EAPI unsigned int evas_pointer_button_down_mask_by_device_get(const Evas_Canvas *obj, Efl_Input_Device *dev); +EAPI unsigned int evas_pointer_button_down_mask_by_device_get(const Evas_Canvas *obj, Evas_Device *dev); /** * @brief Returns a bitmask with the default mouse buttons currently pressed, @@ -424,7 +424,7 @@ EAPI void evas_key_lock_on(Evas_Canvas *obj, const char *keyname) EINA_ARG_NONNU * * @ingroup Evas_Group */ -EAPI void evas_seat_key_lock_on(Evas_Canvas *obj, const char *keyname, Efl_Input_Device *seat) EINA_ARG_NONNULL(2); +EAPI void evas_seat_key_lock_on(Evas_Canvas *obj, const char *keyname, Evas_Device *seat) EINA_ARG_NONNULL(2); /** * @brief Disables or turns off programmatically the lock key with name @@ -445,7 +445,7 @@ EAPI void evas_seat_key_lock_on(Evas_Canvas *obj, const char *keyname, Efl_Input * * @ingroup Evas_Group */ -EAPI void evas_seat_key_lock_off(Evas_Canvas *obj, const char *keyname, Efl_Input_Device *seat) EINA_ARG_NONNULL(2); +EAPI void evas_seat_key_lock_off(Evas_Canvas *obj, const char *keyname, Evas_Device *seat) EINA_ARG_NONNULL(2); /** * @brief Adds the @c keyname key to the current list of modifier keys. @@ -620,7 +620,7 @@ EAPI void evas_key_modifier_on(Evas_Canvas *obj, const char *keyname) EINA_ARG_N * * @ingroup Evas_Group */ -EAPI void evas_seat_key_modifier_on(Evas_Canvas *obj, const char *keyname, Efl_Input_Device *seat) EINA_ARG_NONNULL(2); +EAPI void evas_seat_key_modifier_on(Evas_Canvas *obj, const char *keyname, Evas_Device *seat) EINA_ARG_NONNULL(2); /** * @brief Disables or turns off programmatically the modifier key with name @@ -640,7 +640,7 @@ EAPI void evas_seat_key_modifier_on(Evas_Canvas *obj, const char *keyname, Efl_I * * @ingroup Evas_Group */ -EAPI void evas_seat_key_modifier_off(Evas_Canvas *obj, const char *keyname, Efl_Input_Device *seat) EINA_ARG_NONNULL(2); +EAPI void evas_seat_key_modifier_off(Evas_Canvas *obj, const char *keyname, Evas_Device *seat) EINA_ARG_NONNULL(2); /** * @brief List of available font descriptions known or found by this evas. @@ -1001,7 +1001,7 @@ EAPI void evas_render_idle_flush(Evas_Canvas *obj); * * @ingroup Evas_Group */ -EAPI Efl_Input_Device *evas_default_device_get(const Evas_Canvas *obj, Efl_Input_Device_Type type); +EAPI Evas_Device *evas_default_device_get(const Evas_Canvas *obj, Evas_Device_Class type); /** * @brief Convert/scale a canvas coordinate into output screen coordinates. diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c index 092b57dcdb..029e8ee0d3 100644 --- a/src/lib/evas/canvas/evas_main.c +++ b/src/lib/evas/canvas/evas_main.c @@ -698,16 +698,16 @@ _evas_canvas_coord_world_y_to_screen(const Eo *eo_e EINA_UNUSED, Evas_Public_Dat else return (int)((((long long)y - (long long)e->viewport.y) * (long long)e->output.h) / (long long)e->viewport.h); } -EOLIAN static Efl_Input_Device * +EOLIAN static Evas_Device * _evas_canvas_default_device_get(const Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, - Efl_Input_Device_Type klass) + Evas_Device_Class klass) { - if (klass == EFL_INPUT_DEVICE_TYPE_SEAT) + if (klass == (Evas_Device_Class)EFL_INPUT_DEVICE_TYPE_SEAT) return e->default_seat; - if (klass == EFL_INPUT_DEVICE_TYPE_MOUSE) + if (klass == (Evas_Device_Class)EFL_INPUT_DEVICE_TYPE_MOUSE) return e->default_mouse; - if (klass == EFL_INPUT_DEVICE_TYPE_KEYBOARD) + if (klass == (Evas_Device_Class)EFL_INPUT_DEVICE_TYPE_KEYBOARD) return e->default_keyboard; return NULL; } @@ -761,7 +761,7 @@ evas_object_image_extension_can_load_fast_get(const char *file) EOLIAN static void _evas_canvas_pointer_output_xy_by_device_get(const Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, - Efl_Input_Device *dev, + Evas_Device *dev, int *x, int *y) { Evas_Pointer_Data *pdata = _evas_pointer_data_by_device_get(e, dev); @@ -782,7 +782,7 @@ _evas_canvas_pointer_output_xy_by_device_get(const Eo *eo_e EINA_UNUSED, EOLIAN static void _evas_canvas_pointer_canvas_xy_by_device_get(const Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, - Efl_Input_Device *dev, + Evas_Device *dev, int *x, int *y) { Evas_Pointer_Data *pdata = _evas_pointer_data_by_device_get(e, dev); @@ -802,7 +802,7 @@ _evas_canvas_pointer_canvas_xy_by_device_get(const Eo *eo_e EINA_UNUSED, EOLIAN static unsigned int _evas_canvas_pointer_button_down_mask_by_device_get(const Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, - Efl_Input_Device *dev) + Evas_Device *dev) { Evas_Pointer_Data *pdata = _evas_pointer_data_by_device_get(e, dev); if (!pdata) return 0; @@ -812,7 +812,7 @@ _evas_canvas_pointer_button_down_mask_by_device_get(const Eo *eo_e EINA_UNUSED, EOLIAN static Eina_Bool _evas_canvas_efl_canvas_pointer_pointer_inside_get(const Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, - Efl_Input_Device *dev) + Evas_Device *dev) { Evas_Pointer_Data *pdata = _evas_pointer_data_by_device_get(e, dev); if (!pdata) return EINA_FALSE; @@ -850,7 +850,7 @@ _evas_canvas_data_attach_get(const Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) } static void -_evas_canvas_focus_inout_dispatch(Eo *eo_e, Efl_Input_Device *seat, +_evas_canvas_focus_inout_dispatch(Eo *eo_e, Evas_Device *seat, Eina_Bool in) { Efl_Input_Focus_Data *ev_data; @@ -869,7 +869,7 @@ _evas_canvas_focus_inout_dispatch(Eo *eo_e, Efl_Input_Device *seat, EOLIAN static void _evas_canvas_seat_focus_in(Eo *eo_e, Evas_Public_Data *e, - Efl_Input_Device *seat) + Evas_Device *seat) { if (!seat) seat = e->default_seat; if (!seat || efl_input_device_type_get(seat) != EFL_INPUT_DEVICE_TYPE_SEAT) return; @@ -878,7 +878,7 @@ _evas_canvas_seat_focus_in(Eo *eo_e, Evas_Public_Data *e, EOLIAN static void _evas_canvas_seat_focus_out(Eo *eo_e, Evas_Public_Data *e, - Efl_Input_Device *seat) + Evas_Device *seat) { if (!seat) seat = e->default_seat; if (!seat || efl_input_device_type_get(seat) != EFL_INPUT_DEVICE_TYPE_SEAT) return; @@ -899,7 +899,7 @@ _evas_canvas_focus_out(Eo *eo_e, Evas_Public_Data *e) EOLIAN static Eina_Bool _evas_canvas_seat_focus_state_get(const Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, - Efl_Input_Device *seat) + Evas_Device *seat) { if (!seat) seat = e->default_seat; return eina_list_data_find(e->focused_by, seat) ? EINA_TRUE : EINA_FALSE; @@ -1443,7 +1443,7 @@ evas_output_viewport_get(const Evas *eo_e, Evas_Coord *x, Evas_Coord *y, Evas_Co } Evas_Pointer_Data * -_evas_pointer_data_by_device_get(Evas_Public_Data *edata, Efl_Input_Device *pointer) +_evas_pointer_data_by_device_get(Evas_Public_Data *edata, Evas_Device *pointer) { Evas_Pointer_Data *pdata; Evas_Pointer_Seat *pseat; @@ -1468,7 +1468,7 @@ _evas_pointer_data_by_device_get(Evas_Public_Data *edata, Efl_Input_Device *poin } Evas_Pointer_Data * -_evas_pointer_data_add(Evas_Public_Data *edata, Efl_Input_Device *pointer) +_evas_pointer_data_add(Evas_Public_Data *edata, Evas_Device *pointer) { Evas_Pointer_Data *pdata; Evas_Pointer_Seat *pseat = NULL; @@ -1504,7 +1504,7 @@ _evas_pointer_data_add(Evas_Public_Data *edata, Efl_Input_Device *pointer) } void -_evas_pointer_data_remove(Evas_Public_Data *edata, Efl_Input_Device *pointer) +_evas_pointer_data_remove(Evas_Public_Data *edata, Evas_Device *pointer) { Evas_Pointer_Data *pdata; Evas_Pointer_Seat *pseat;