cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=bf26946ba14ad564190e12fcc6a51cfab681926d
commit bf26946ba14ad564190e12fcc6a51cfab681926d Author: Cedric BAIL <ced...@osg.samsung.com> Date: Fri Jan 22 15:07:51 2016 -0800 evas: move canvas event to be declared inside proper eolian file. --- src/lib/evas/Evas_Eo.h | 25 ------------------------- src/lib/evas/canvas/evas_callbacks.c | 25 ------------------------- src/lib/evas/canvas/evas_canvas.eo | 14 +++++++++++++- 3 files changed, 13 insertions(+), 51 deletions(-) diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h index e581315..a56a5e7 100644 --- a/src/lib/evas/Evas_Eo.h +++ b/src/lib/evas/Evas_Eo.h @@ -2,31 +2,6 @@ # error You shall not include this header directly #endif -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; -EAPI extern const Eo_Event_Description _EVAS_CANVAS_EVENT_RENDER_FLUSH_POST; -EAPI extern const Eo_Event_Description _EVAS_CANVAS_EVENT_OBJECT_FOCUS_IN; -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; -EAPI extern const Eo_Event_Description _EVAS_CANVAS_EVENT_DEVICE_CHANGED; -EAPI extern const Eo_Event_Description _EVAS_CANVAS_EVENT_AXIS_UPDATE; -EAPI extern const Eo_Event_Description _EVAS_CANVAS_EVENT_VIEWPORT_RESIZE; - -// 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)) -#define EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE (&(_EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE)) -#define EVAS_CANVAS_EVENT_RENDER_FLUSH_POST (&(_EVAS_CANVAS_EVENT_RENDER_FLUSH_POST)) -#define EVAS_CANVAS_EVENT_OBJECT_FOCUS_IN (&(_EVAS_CANVAS_EVENT_OBJECT_FOCUS_IN)) -#define EVAS_CANVAS_EVENT_OBJECT_FOCUS_OUT (&(_EVAS_CANVAS_EVENT_OBJECT_FOCUS_OUT)) -#define EVAS_CANVAS_EVENT_RENDER_PRE (&(_EVAS_CANVAS_EVENT_RENDER_PRE)) -#define EVAS_CANVAS_EVENT_RENDER_POST (&(_EVAS_CANVAS_EVENT_RENDER_POST)) -#define EVAS_CANVAS_EVENT_DEVICE_CHANGED (&(_EVAS_CANVAS_EVENT_DEVICE_CHANGED)) -#define EVAS_CANVAS_EVENT_AXIS_UPDATE (&(_EVAS_CANVAS_EVENT_AXIS_UPDATE)) -#define EVAS_CANVAS_EVENT_VIEWPORT_RESIZE (&(_EVAS_CANVAS_EVENT_VIEWPORT_RESIZE)) - #include "canvas/evas_signal_interface.eo.h" #include "canvas/evas_draggable_interface.eo.h" #include "canvas/evas_clickable_interface.eo.h" diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c index c86eb61..2d36129 100644 --- a/src/lib/evas/canvas/evas_callbacks.c +++ b/src/lib/evas/canvas/evas_callbacks.c @@ -7,31 +7,6 @@ EVAS_MEMPOOL(_mp_pc); extern Eina_Hash* signals_hash_table; -EAPI const Eo_Event_Description _EVAS_CANVAS_EVENT_RENDER_PRE = - EO_EVENT_DESCRIPTION("Render Pre"); -EAPI const Eo_Event_Description _EVAS_CANVAS_EVENT_RENDER_POST = - EO_EVENT_DESCRIPTION("Render Post"); - -EAPI const Eo_Event_Description _EVAS_CANVAS_EVENT_AXIS_UPDATE = - EO_EVENT_DESCRIPTION("Axis Update"); - -EAPI const Eo_Event_Description _EVAS_CANVAS_EVENT_FOCUS_IN = - EO_EVENT_DESCRIPTION_HOT("Canvas Focus In"); -EAPI const Eo_Event_Description _EVAS_CANVAS_EVENT_FOCUS_OUT = - EO_EVENT_DESCRIPTION_HOT("Canvas Focus Out"); -EAPI const Eo_Event_Description _EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE = - EO_EVENT_DESCRIPTION_HOT("Render Flush Pre"); -EAPI const Eo_Event_Description _EVAS_CANVAS_EVENT_RENDER_FLUSH_POST = - EO_EVENT_DESCRIPTION_HOT("Render Flush Post"); -EAPI const Eo_Event_Description _EVAS_CANVAS_EVENT_OBJECT_FOCUS_IN = - EO_EVENT_DESCRIPTION_HOT("Canvas Object Focus In"); -EAPI const Eo_Event_Description _EVAS_CANVAS_EVENT_OBJECT_FOCUS_OUT = - EO_EVENT_DESCRIPTION_HOT("Canvas Object Focus Out"); - -EAPI const Eo_Event_Description _EVAS_CANVAS_EVENT_DEVICE_CHANGED = - EO_EVENT_DESCRIPTION_HOT("Device changed"); -EAPI const Eo_Event_Description _EVAS_CANVAS_EVENT_VIEWPORT_RESIZE = - EO_EVENT_DESCRIPTION_HOT("Canvas viewport resize"); /** * Evas events descriptions for Eo. */ diff --git a/src/lib/evas/canvas/evas_canvas.eo b/src/lib/evas/canvas/evas_canvas.eo index 1b72fed..63a6a86 100644 --- a/src/lib/evas/canvas/evas_canvas.eo +++ b/src/lib/evas/canvas/evas_canvas.eo @@ -1638,5 +1638,17 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface) Eo.Base.event_freeze; Evas.Common_Interface.evas.get; } - + events { + focus,in; + focus,out; + object,focus,in; + object,focus,out; + render,pre; + render,post; + render,flush,pre; + render,flush,post; + device,changed; + axis,update; + viewport,resize; + } } --