Evas/Eolian: Eolian'ized Evas_Object events.

Summary:
The event descriptions of Evas_Object were hardcoded instead
of declared in evas_object.eo and thus no binding could be aware of
their existence.

Note: Evas_Canvas events were left as is.

Reviewers: cedric, tasn, q66, JackDanielZ

Reviewed By: q66

CC: felipealmeida, raster, smohanty, cedric

Differential Revision: https://phab.enlightenment.org/D1065
This commit is contained in:
Savio Sena 2014-06-20 10:55:57 +01:00 committed by Daniel Kolesa
parent a83e28ca3d
commit 71c1482827
3 changed files with 27 additions and 104 deletions

View File

@ -4,32 +4,6 @@
#include <Eo.h>
EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_MOUSE_IN;
EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_MOUSE_OUT;
EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_MOUSE_DOWN;
EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_MOUSE_UP;
EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_MOUSE_MOVE;
EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_MOUSE_WHEEL;
EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_MULTI_DOWN;
EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_MULTI_UP;
EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_MULTI_MOVE;
EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_FREE;
EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_KEY_DOWN;
EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_KEY_UP;
EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_FOCUS_IN;
EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_FOCUS_OUT;
EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_SHOW;
EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_HIDE;
EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_MOVE;
EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_RESIZE;
EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_RESTACK;
EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_DEL;
EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_HOLD;
EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_CHANGED_SIZE_HINTS;
EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_IMAGE_PRELOADED;
EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_IMAGE_RESIZE;
EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_IMAGE_UNLOADED;
EAPI extern const Eo_Event_Description _EVAS_CANVAS_EVENT_FOCUS_IN;
EAPI extern const Eo_Event_Description _EVAS_CANVAS_EVENT_FOCUS_OUT;
EAPI extern const Eo_Event_Description _EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE;
@ -39,33 +13,6 @@ EAPI extern const Eo_Event_Description _EVAS_CANVAS_EVENT_OBJECT_FOCUS_OUT;
EAPI extern const Eo_Event_Description _EVAS_CANVAS_EVENT_RENDER_PRE;
EAPI extern const Eo_Event_Description _EVAS_CANVAS_EVENT_RENDER_POST;
// Callbacks events for use with Evas objects
#define EVAS_OBJECT_EVENT_MOUSE_IN (&(_EVAS_OBJECT_EVENT_MOUSE_IN))
#define EVAS_OBJECT_EVENT_MOUSE_OUT (&(_EVAS_OBJECT_EVENT_MOUSE_OUT))
#define EVAS_OBJECT_EVENT_MOUSE_DOWN (&(_EVAS_OBJECT_EVENT_MOUSE_DOWN))
#define EVAS_OBJECT_EVENT_MOUSE_UP (&(_EVAS_OBJECT_EVENT_MOUSE_UP))
#define EVAS_OBJECT_EVENT_MOUSE_MOVE (&(_EVAS_OBJECT_EVENT_MOUSE_MOVE))
#define EVAS_OBJECT_EVENT_MOUSE_WHEEL (&(_EVAS_OBJECT_EVENT_MOUSE_WHEEL))
#define EVAS_OBJECT_EVENT_MULTI_DOWN (&(_EVAS_OBJECT_EVENT_MULTI_DOWN))
#define EVAS_OBJECT_EVENT_MULTI_UP (&(_EVAS_OBJECT_EVENT_MULTI_UP))
#define EVAS_OBJECT_EVENT_MULTI_MOVE (&(_EVAS_OBJECT_EVENT_MULTI_MOVE))
#define EVAS_OBJECT_EVENT_FREE (&(_EVAS_OBJECT_EVENT_FREE))
#define EVAS_OBJECT_EVENT_KEY_DOWN (&(_EVAS_OBJECT_EVENT_KEY_DOWN))
#define EVAS_OBJECT_EVENT_KEY_UP (&(_EVAS_OBJECT_EVENT_KEY_UP))
#define EVAS_OBJECT_EVENT_FOCUS_IN (&(_EVAS_OBJECT_EVENT_FOCUS_IN))
#define EVAS_OBJECT_EVENT_FOCUS_OUT (&(_EVAS_OBJECT_EVENT_FOCUS_OUT))
#define EVAS_OBJECT_EVENT_SHOW (&(_EVAS_OBJECT_EVENT_SHOW))
#define EVAS_OBJECT_EVENT_HIDE (&(_EVAS_OBJECT_EVENT_HIDE))
#define EVAS_OBJECT_EVENT_MOVE (&(_EVAS_OBJECT_EVENT_MOVE))
#define EVAS_OBJECT_EVENT_RESIZE (&(_EVAS_OBJECT_EVENT_RESIZE))
#define EVAS_OBJECT_EVENT_RESTACK (&(_EVAS_OBJECT_EVENT_RESTACK))
#define EVAS_OBJECT_EVENT_DEL (&(_EVAS_OBJECT_EVENT_DEL))
#define EVAS_OBJECT_EVENT_HOLD (&(_EVAS_OBJECT_EVENT_HOLD))
#define EVAS_OBJECT_EVENT_CHANGED_SIZE_HINTS (&(_EVAS_OBJECT_EVENT_CHANGED_SIZE_HINTS))
#define EVAS_OBJECT_EVENT_IMAGE_PRELOADED (&(_EVAS_OBJECT_EVENT_IMAGE_PRELOADED))
#define EVAS_OBJECT_EVENT_IMAGE_RESIZE (&(_EVAS_OBJECT_EVENT_IMAGE_RESIZE))
#define EVAS_OBJECT_EVENT_IMAGE_UNLOADED (&(_EVAS_OBJECT_EVENT_IMAGE_UNLOADED))
// Callbacks events for use with Evas canvases
#define EVAS_CANVAS_EVENT_FOCUS_IN (&(_EVAS_CANVAS_EVENT_FOCUS_IN))
#define EVAS_CANVAS_EVENT_FOCUS_OUT (&(_EVAS_CANVAS_EVENT_FOCUS_OUT))

View File

@ -7,56 +7,6 @@ EVAS_MEMPOOL(_mp_pc);
extern Eina_Hash* signals_hash_table;
EAPI const Eo_Event_Description _EVAS_OBJECT_EVENT_MOUSE_IN =
EO_EVENT_DESCRIPTION("Mouse In", "Mouse In Event");
EAPI const Eo_Event_Description _EVAS_OBJECT_EVENT_MOUSE_OUT =
EO_EVENT_DESCRIPTION("Mouse Out", "Mouse Out Event");
EAPI const Eo_Event_Description _EVAS_OBJECT_EVENT_MOUSE_DOWN =
EO_EVENT_DESCRIPTION("Mouse Down", "Mouse Button Down Event");
EAPI const Eo_Event_Description _EVAS_OBJECT_EVENT_MOUSE_UP =
EO_EVENT_DESCRIPTION("Mouse Up", "Mouse Button Up Event");
EAPI const Eo_Event_Description _EVAS_OBJECT_EVENT_MOUSE_MOVE =
EO_EVENT_DESCRIPTION("Mouse Move", "Mouse Move Event");
EAPI const Eo_Event_Description _EVAS_OBJECT_EVENT_MOUSE_WHEEL =
EO_EVENT_DESCRIPTION("Mouse Wheel", "Mouse Wheel Event");
EAPI const Eo_Event_Description _EVAS_OBJECT_EVENT_MULTI_DOWN =
EO_EVENT_DESCRIPTION("Multi Down", "Mouse-touch Down Event");
EAPI const Eo_Event_Description _EVAS_OBJECT_EVENT_MULTI_UP =
EO_EVENT_DESCRIPTION("Multi Up", "Mouse-touch Up Event");
EAPI const Eo_Event_Description _EVAS_OBJECT_EVENT_MULTI_MOVE =
EO_EVENT_DESCRIPTION("Multi Move", "Multi-touch Move Event");
EAPI const Eo_Event_Description _EVAS_OBJECT_EVENT_FREE =
EO_EVENT_DESCRIPTION("Free", "Object Being Freed (Called after Del)");
EAPI const Eo_Event_Description _EVAS_OBJECT_EVENT_KEY_DOWN =
EO_EVENT_DESCRIPTION("Key Down", "Key Press Event");
EAPI const Eo_Event_Description _EVAS_OBJECT_EVENT_KEY_UP =
EO_EVENT_DESCRIPTION("Key Up", "Key Release Event");
EAPI const Eo_Event_Description _EVAS_OBJECT_EVENT_FOCUS_IN =
EO_EVENT_DESCRIPTION("Focus In", "Focus In Event");
EAPI const Eo_Event_Description _EVAS_OBJECT_EVENT_FOCUS_OUT =
EO_EVENT_DESCRIPTION("Focus Out", "Focus Out Event");
EAPI const Eo_Event_Description _EVAS_OBJECT_EVENT_SHOW =
EO_EVENT_DESCRIPTION("Show", "Show Event");
EAPI const Eo_Event_Description _EVAS_OBJECT_EVENT_HIDE =
EO_EVENT_DESCRIPTION("Hide", "Hide Event");
EAPI const Eo_Event_Description _EVAS_OBJECT_EVENT_MOVE =
EO_EVENT_DESCRIPTION("Move", "Move Event");
EAPI const Eo_Event_Description _EVAS_OBJECT_EVENT_RESIZE =
EO_EVENT_DESCRIPTION("Resize", "Resize Event");
EAPI const Eo_Event_Description _EVAS_OBJECT_EVENT_RESTACK =
EO_EVENT_DESCRIPTION("Restack", "Restack Event");
EAPI const Eo_Event_Description _EVAS_OBJECT_EVENT_DEL =
EO_EVENT_DESCRIPTION("Del", "Object Being Deleted (called before Free)");
EAPI const Eo_Event_Description _EVAS_OBJECT_EVENT_HOLD =
EO_EVENT_DESCRIPTION("Hold", "Events go on/off hold");
EAPI const Eo_Event_Description _EVAS_OBJECT_EVENT_CHANGED_SIZE_HINTS =
EO_EVENT_DESCRIPTION("Changed Size Hints", "Size hints changed event");
EAPI const Eo_Event_Description _EVAS_OBJECT_EVENT_IMAGE_PRELOADED =
EO_EVENT_DESCRIPTION("Image Preloaded", "Image has been preloaded");
EAPI const Eo_Event_Description _EVAS_OBJECT_EVENT_IMAGE_RESIZE=
EO_EVENT_DESCRIPTION("Image Resize", "Image resize");
EAPI const Eo_Event_Description _EVAS_OBJECT_EVENT_IMAGE_UNLOADED =
EO_EVENT_DESCRIPTION("Image Unloaded", "Image data has been unloaded (by some mechanism in Evas that throw out original image data)");
EAPI const Eo_Event_Description _EVAS_CANVAS_EVENT_RENDER_PRE =
EO_EVENT_DESCRIPTION("Render Pre", "Called just before rendering starts on the canvas target @since 1.2");
EAPI const Eo_Event_Description _EVAS_CANVAS_EVENT_RENDER_POST =

View File

@ -1516,5 +1516,31 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
Eo_Base.dbg_info_get;
Evas_Common_Interface.evas.get;
}
events {
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; /*@ Mouse-touch Down Event */
multi,up; /*@ Mouse-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 */
image,resize; /*@ Image resize */
image,unloaded; /*@ Image data has been unloaded (by some mechanism in Evas that throw out original image data) */
}
}