evas: Remove Evas_Callback_Type from EO

This moves the enum to legacy only, but in Evas_Common.h and not
Evas_Legacy.h because some other legacy things are in Evas_Common.h

Ref T5312
This commit is contained in:
Jean-Philippe Andre 2017-05-12 19:11:15 +09:00
parent cc82c48b73
commit 47b6db15c5
3 changed files with 49 additions and 73 deletions

View File

@ -5,6 +5,7 @@ import efl_input_types;
/* FIXME: This shouldn't be here. */
type list_data_get_func_type: __undefined_type; [[Elementary list data get function type]]
type region_hook_func_type: __undefined_type; [[Elementary region hook function type]]
type @extern Evas.Callback_Type: __undefined_type; [[Evas event type]]
enum Elm.Activate
{

View File

@ -393,6 +393,54 @@ typedef Efl_Input_Object_Pointer_Mode Evas_Object_Pointer_Mode;
#define EVAS_OBJECT_POINTER_MODE_NOGRAB EFL_INPUT_OBJECT_POINTER_MODE_NO_GRAB
#define EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN EFL_INPUT_OBJECT_POINTER_MODE_NO_GRAB_NO_REPEAT_UPDOWN
// FIXME: Move to Evas_Legacy.h
/** Identifier of callbacks to be set for Evas canvases or Evas objects. */
typedef enum
{
EVAS_CALLBACK_MOUSE_IN = 0, /**< Mouse In Event */
EVAS_CALLBACK_MOUSE_OUT, /**< Mouse Out Event */
EVAS_CALLBACK_MOUSE_DOWN, /**< Mouse Button Down Event */
EVAS_CALLBACK_MOUSE_UP, /**< Mouse Button Up Event */
EVAS_CALLBACK_MOUSE_MOVE, /**< Mouse Move Event */
EVAS_CALLBACK_MOUSE_WHEEL, /**< Mouse Wheel Event */
EVAS_CALLBACK_MULTI_DOWN, /**< Multi-touch Down Event */
EVAS_CALLBACK_MULTI_UP, /**< Multi-touch Up Event */
EVAS_CALLBACK_MULTI_MOVE, /**< Multi-touch Move Event */
EVAS_CALLBACK_FREE, /**< Object Being Freed (Called after Del) */
EVAS_CALLBACK_KEY_DOWN, /**< Key Press Event */
EVAS_CALLBACK_KEY_UP, /**< Key Release Event */
EVAS_CALLBACK_FOCUS_IN, /**< Focus In Event */
EVAS_CALLBACK_FOCUS_OUT, /**< Focus Out Event */
EVAS_CALLBACK_SHOW, /**< Show Event */
EVAS_CALLBACK_HIDE, /**< Hide Event */
EVAS_CALLBACK_MOVE, /**< Move Event */
EVAS_CALLBACK_RESIZE, /**< Resize Event */
EVAS_CALLBACK_RESTACK, /**< Restack Event */
EVAS_CALLBACK_DEL, /**< Object Being Deleted (called before Free) */
EVAS_CALLBACK_HOLD, /**< Events go on/off hold */
EVAS_CALLBACK_CHANGED_SIZE_HINTS, /**< Size hints changed event */
EVAS_CALLBACK_IMAGE_PRELOADED, /**< Image has been preloaded */
EVAS_CALLBACK_CANVAS_FOCUS_IN, /**< Canvas got focus as a whole */
EVAS_CALLBACK_CANVAS_FOCUS_OUT, /**< Canvas lost focus as a whole */
EVAS_CALLBACK_RENDER_FLUSH_PRE, /**< Called after render update regions have
* been calculated, but only if update regions exist */
EVAS_CALLBACK_RENDER_FLUSH_POST, /**< Called after render update regions have
* been sent to the display server, but only
* if update regions existed for the most recent frame */
EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_IN, /**< Canvas object got focus */
EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_OUT, /**< Canvas object lost focus */
EVAS_CALLBACK_IMAGE_UNLOADED, /**< Image data has been unloaded (by some mechanism in Evas that throw out original image data) */
EVAS_CALLBACK_RENDER_PRE, /**< Called just before rendering starts on the canvas target. @since 1.2 */
EVAS_CALLBACK_RENDER_POST, /**< Called just after rendering stops on the canvas target. @since 1.2 */
EVAS_CALLBACK_IMAGE_RESIZE, /**< Image size is changed. @since 1.8 */
EVAS_CALLBACK_DEVICE_CHANGED, /**< Devices added, removed or changed on canvas. @since 1.8 */
EVAS_CALLBACK_AXIS_UPDATE, /**< Input device changed value on some axis. @since 1.13 */
EVAS_CALLBACK_CANVAS_VIEWPORT_RESIZE, /**< Canvas viewport resized. @since 1.15 */
EVAS_CALLBACK_LAST /**< Sentinel value to indicate last enum field during
* iteration */
} Evas_Callback_Type;
struct _Evas_Engine_Info /** Generic engine information. Generic info is useless */
{
int magic; /**< Magic number */

View File

@ -24,79 +24,6 @@ enum Evas.Touch_Point_State {
cancel [[Touch point is cancelled]]
}
enum Evas.Callback_Type
{
[[Identifier of callbacks to be set for Evas canvases or Evas objects.]]
legacy: Evas_Callback;
/** FIXME-doc
* The following figure illustrates some Evas callbacks:
* @image html evas-callbacks.png
* @image rtf evas-callbacks.png
* @image latex evas-callbacks.eps
*
* @see evas_object_event_callback_add()
* @see evas_event_callback_add()
*/
mouse_in, [[Mouse In Event]]
mouse_out, [[Mouse Out Event]]
mouse_down, [[Mouse Button Down Event]]
mouse_up, [[Mouse Button Up Event]]
mouse_move, [[Mouse Move Event]]
mouse_wheel, [[Mouse Wheel Event]]
multi_down, [[Multi-touch Down Event]]
multi_up, [[Multi-touch Up Event]]
multi_move, [[Multi-touch Move Event]]
free, [[Object Being Freed (Called after Del)]]
key_down, [[Key Press Event]]
key_up, [[Key Release Event]]
focus_in, [[Focus In Event]]
focus_out, [[Focus Out Event]]
show, [[Show Event]]
hide, [[Hide Event]]
move, [[Move Event]]
resize, [[Resize Event]]
restack, [[Restack Event]]
del, [[Object Being Deleted (called before Free)]]
hold, [[Events go on/off hold]]
changed_size_hints, [[Size hints changed event]]
image_preloaded, [[Image has been preloaded]]
canvas_focus_in, [[Canvas got focus as a whole]]
canvas_focus_out, [[Canvas lost focus as a whole]]
render_flush_pre, [[Called after render update regions have been calculated, but only if update regions exist]]
render_flush_post, [[Called after render update regions have been sent to the display server, but only if update regions existed for the most recent frame]]
canvas_object_focus_in, [[Canvas object got focus]]
canvas_object_focus_ouT, [[Canvas object lost focus]]
image_unloaded, [[Image data has been unloaded (by some mechanism in Evas that throw out original image data)]]
render_pre, [[Called just before rendering starts on the canvas target
@since 1.2]]
render_post, [[Called just after rendering stops on the canvas target
@since 1.2]]
image_resize, [[Image size is changed
@since 1.8]]
device_changed, [[Devices added, removed or changed on canvas
@since 1.8]]
axis_update, [[Input device changed value on some axis
@since 1.13]]
canvas_viewport_resize, [[Canvas viewport resized
@since 1.15]]
last [[Sentinel value to indicate last enum field during iteration]]
}
enum Evas.Image.Orient
{
[[Possible orientation options for evas_object_image_orient_set().