tasn pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=d10f9733ac7b9f5dc59607d2f61b4b70c3d9c787
commit d10f9733ac7b9f5dc59607d2f61b4b70c3d9c787
Author: Tom Hacohen <t...@stosb.com>
Date: Wed Jun 10 15:32:22 2015 +0100
Evas canvas: Fix Eolian warnings (migrate types).
---
src/lib/evas/Evas_Common.h | 117 -------------------------------------
src/lib/evas/canvas/evas_canvas.eo | 32 +++++-----
src/lib/evas/canvas/evas_types.eot | 110 ++++++++++++++++++++++++++++++++++
3 files changed, 126 insertions(+), 133 deletions(-)
diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h
index 312c74e..aa82737 100644
--- a/src/lib/evas/Evas_Common.h
+++ b/src/lib/evas/Evas_Common.h
@@ -58,76 +58,6 @@ EAPI extern Evas_Version * evas_version;
*/
/**
- * Identifier of callbacks to be set for Evas canvases or Evas
- * objects.
- *
- * 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()
- */
-typedef enum _Evas_Callback_Type
-{
- /*
- * The following events are only for use with Evas objects, with
- * evas_object_event_callback_add():
- */
- EVAS_CALLBACK_MOUSE_IN, /**< 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 */
-
- /*
- * The following events are only for use with Evas canvases, with
- * evas_event_callback_add():
- */
- 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 just before rendering is
updated on the canvas target */
- EVAS_CALLBACK_RENDER_FLUSH_POST, /**< Called just after rendering is
updated on the canvas target */
- EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_IN, /**< Canvas object got focus */
- EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_OUT, /**< Canvas object lost focus */
- EVAS_CALLBACK_CANVAS_VIEWPORT_RESIZE, /**< Canvas viewport resized @since
1.15 */
-
- /*
- * More Evas object event types - see evas_object_event_callback_add():
- */
- 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_LAST /**< kept as last element/sentinel -- not really an
event */
-} Evas_Callback_Type; /**< The types of events triggering a callback */
-
-/**
* @def EVAS_CALLBACK_PRIORITY_BEFORE
* Slightly more prioritized than default.
* @since 1.1
@@ -160,49 +90,6 @@ typedef enum _Evas_Callback_Type
*/
typedef Eo_Callback_Priority Evas_Callback_Priority;
-/**
- * Flags for Mouse Button events
- */
-typedef enum _Evas_Button_Flags
-{
- EVAS_BUTTON_NONE = 0, /**< No extra mouse button data */
- EVAS_BUTTON_DOUBLE_CLICK = (1 << 0), /**< This mouse button press was the
2nd press of a double click */
- EVAS_BUTTON_TRIPLE_CLICK = (1 << 1) /**< This mouse button press was the
3rd press of a triple click */
-} Evas_Button_Flags; /**< Flags for Mouse Button events */
-
-/**
- * Flags for Events
- */
-typedef enum _Evas_Event_Flags
-{
- EVAS_EVENT_FLAG_NONE = 0, /**< No fancy flags set */
- EVAS_EVENT_FLAG_ON_HOLD = (1 << 0), /**< This event is being delivered but
should be put "on hold" until the on hold flag is unset. The event should be
used for informational purposes and maybe some indications visually, but not
actually perform anything */
- EVAS_EVENT_FLAG_ON_SCROLL = (1 << 1) /**< This event flag indicates the
event occurs while scrolling; for example, DOWN event occurs during scrolling;
the event should be used for informational purposes and maybe some indications
visually, but not actually perform anything */
-} Evas_Event_Flags; /**< Flags for Events */
-
-/**
- * State of Evas_Coord_Touch_Point
- */
-typedef enum _Evas_Touch_Point_State
-{
- EVAS_TOUCH_POINT_DOWN, /**< Touch point is pressed down */
- EVAS_TOUCH_POINT_UP, /**< Touch point is released */
- EVAS_TOUCH_POINT_MOVE, /**< Touch point is moved */
- EVAS_TOUCH_POINT_STILL, /**< Touch point is not moved after pressed */
- EVAS_TOUCH_POINT_CANCEL /**< Touch point is cancelled */
-} Evas_Touch_Point_State;
-
-/**
- * Flags for Font Hinting
- * @ingroup Evas_Font_Group
- */
-typedef enum _Evas_Font_Hinting_Flags
-{
- EVAS_FONT_HINTING_NONE, /**< No font hinting */
- EVAS_FONT_HINTING_AUTO, /**< Automatic font hinting */
- EVAS_FONT_HINTING_BYTECODE /**< Bytecode font hinting */
-} Evas_Font_Hinting_Flags; /**< Flags for Font Hinting */
-
typedef struct _Evas_Coord_Rectangle Evas_Coord_Rectangle; /**< A
generic rectangle handle */
typedef struct _Evas_Point Evas_Point; /**< integer point */
@@ -284,8 +171,6 @@ typedef Eo Evas_Object;
typedef Eo Efl_VG;
typedef void Evas_Performance; /**< An Evas Performance
handle */
-typedef struct _Evas_Modifier Evas_Modifier; /**< An opaque type
containing information on which modifier keys are registered in an Evas canvas
*/
-typedef struct _Evas_Lock Evas_Lock; /**< An opaque type containing
information on which lock keys are registered in an Evas canvas */
typedef struct _Evas_Smart Evas_Smart; /**< An Evas Smart Object
handle */
typedef struct _Evas_Native_Surface Evas_Native_Surface; /**< A generic
datatype for engine specific native surface information */
@@ -357,7 +242,6 @@ struct _Evas_Precision_Position /** A position with
precision*/
};
typedef struct _Evas_Pixel_Import_Source Evas_Pixel_Import_Source; /**< A
source description of pixels for importing pixels */
-typedef struct _Evas_Engine_Info Evas_Engine_Info; /**< A generic Evas
Engine information structure */
typedef struct _Evas_Device Evas_Device; /**< A source device
handle - where the event came from */
typedef struct _Evas_Event_Mouse_Down Evas_Event_Mouse_Down; /**< Event
structure for #EVAS_CALLBACK_MOUSE_DOWN event callbacks */
typedef struct _Evas_Event_Mouse_Up Evas_Event_Mouse_Up; /**< Event
structure for #EVAS_CALLBACK_MOUSE_UP event callbacks */
@@ -372,7 +256,6 @@ typedef struct _Evas_Event_Key_Down
Evas_Event_Key_Down; /**< Event structu
typedef struct _Evas_Event_Key_Up Evas_Event_Key_Up; /**< Event
structure for #EVAS_CALLBACK_KEY_UP event callbacks */
typedef struct _Evas_Event_Hold Evas_Event_Hold; /**< Event structure
for #EVAS_CALLBACK_HOLD event callbacks */
typedef struct _Evas_Event_Render_Post Evas_Event_Render_Post; /**< Event
structure that may come with #EVAS_CALLBACK_RENDER_POST event callbacks @since
1.8 */
-typedef struct _Evas_Axis Evas_Axis; /**< Details for a single
device axis state @since 1.13 */
typedef struct _Evas_Event_Axis_Update Evas_Event_Axis_Update; /**< Event
structure for #EVAS_CALLBACK_AXIS_UPDATE event callbacks @since 1.13 */
typedef enum _Evas_Alloc_Error
diff --git a/src/lib/evas/canvas/evas_canvas.eo
b/src/lib/evas/canvas/evas_canvas.eo
index 79462c7..561aae1 100644
--- a/src/lib/evas/canvas/evas_canvas.eo
+++ b/src/lib/evas/canvas/evas_canvas.eo
@@ -111,7 +111,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
@since 1.2 */
}
values {
- flags: Evas_Event_Flags; /*@ The default flags to use */
+ flags: Evas.Event_Flags; /*@ The default flags to use */
}
}
@property output_method {
@@ -224,7 +224,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
@ingroup Evas_Font_Group */
}
values {
- hinting: Evas_Font_Hinting_Flags; /*@ The hinting to use, one of
#EVAS_FONT_HINTING_NONE, */
+ hinting: Evas.Font.Hinting_Flags; /*@ The hinting to use, one of
#EVAS_FONT_HINTING_NONE, */
}
}
@property engine_info {
@@ -262,7 +262,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
@ingroup Evas_Output_Method */
}
values {
- info: Evas_Engine_Info *; /*@ The pointer to the Engine Info to
use */
+ info: Evas.Engine_Info *; /*@ The pointer to the Engine Info to
use */
}
}
@property focus {
@@ -343,7 +343,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
@return An .Evas_Lock handle to query Evas' keys subsystem with
evas_key_lock_is_set(), or @c NULL on error. */
- return: const(Evas_Lock)* @warn_unused;
+ return: const(Evas.Lock)* @warn_unused;
}
}
@property pointer_canvas_xy {
@@ -535,7 +535,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
@return An .Evas_Modifier handle to query Evas' keys subsystem
with evas_key_modifier_is_set(), or @c NULL on error. */
- return: const(Evas_Modifier)* @warn_unused;
+ return: const(Evas.Modifier)* @warn_unused;
}
}
@property pointer_button_down_mask {
@@ -666,7 +666,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
@see evas_key_modifier_is_set
@see evas_object_key_grab
@see evas_object_key_ungrab */
- return: Evas_Modifier_Mask @warn_unused;
+ return: Evas.Modifier_Mask @warn_unused;
params {
@in keyname: const(char)* @nonull; /*@ The name of the modifier
key to create the mask for. */
}
@@ -829,7 +829,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
@in ang: double;
@in fx: double;
@in fy: double;
- @in flags: Evas_Button_Flags;
+ @in flags: Evas.Button_Flags;
@in timestamp: uint;
@in data: const(void)*;
}
@@ -847,7 +847,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
@in ang: double;
@in fx: double;
@in fy: double;
- @in flags: Evas_Button_Flags;
+ @in flags: Evas.Button_Flags;
@in timestamp: uint;
@in data: const(void)*;
}
@@ -987,7 +987,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
@in ang: double;
@in fx: double;
@in fy: double;
- @in flags: Evas_Button_Flags;
+ @in flags: Evas.Button_Flags;
@in timestamp: uint;
@in data: const(void)*;
}
@@ -1051,7 +1051,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
@ingroup Evas_Font_Group */
return: bool @warn_unused;
params {
- @in hinting: Evas_Font_Hinting_Flags; /*@ The hinting to use, one
of #EVAS_FONT_HINTING_NONE, */
+ @in hinting: Evas.Font.Hinting_Flags; /*@ The hinting to use, one
of #EVAS_FONT_HINTING_NONE, */
}
}
object_top_at_xy_get @const {
@@ -1107,7 +1107,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
params {
@in b: int; /*@ The button number. */
- @in flags: Evas_Button_Flags; /*@ evas button flags. */
+ @in flags: Evas.Button_Flags; /*@ evas button flags. */
@in timestamp: uint; /*@ The timestamp of the mouse up event. */
@in data: const(void)*; /*@ The data for canvas. */
}
@@ -1122,7 +1122,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
params {
@in b: int; /*@ The button number. */
- @in flags: Evas_Button_Flags; /*@ The evas button flags. */
+ @in flags: Evas.Button_Flags; /*@ The evas button flags. */
@in timestamp: uint; /*@ The timestamp of the mouse down event. */
@in data: const(void)*; /*@ The data for canvas. */
}
@@ -1138,7 +1138,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
params {
@in event_copy: void *; /*@ the event to refeed */
- @in event_type: Evas_Callback_Type; /*@ Event type */
+ @in event_type: Evas.Callback_Type; /*@ Event type */
}
}
font_available_list @const {
@@ -1468,7 +1468,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
@see evas_touch_point_list_nth_xy_get()
@see evas_touch_point_list_nth_id_get() */
- return: Evas_Touch_Point_State;
+ return: Evas.Touch_Point_State;
params {
@in n: uint; /*@ The number of the touched point (0 being the
first). */
}
@@ -1616,7 +1616,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
@in ang: double;
@in fx: double;
@in fy: double;
- @in flags: Evas_Button_Flags;
+ @in flags: Evas.Button_Flags;
@in timestamp: uint;
@in data: const(void)*;
}
@@ -1854,7 +1854,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
@in device: int; /*@ System-provided device identifier */
@in toolid: int; /*@ Type of tool currently being used */
@in naxes: int; /*@ Number of elements in the \p axis array */
- @in axis: const(Evas_Axis)*; /*@ Array containing the current
value of all updated axes */
+ @in axis: const(Evas.Axis)*; /*@ Array containing the current
value of all updated axes */
@in data: const(void)*; /*@ Data for canvas. */
}
}
diff --git a/src/lib/evas/canvas/evas_types.eot
b/src/lib/evas/canvas/evas_types.eot
index 3e83a0b..ffa4e35 100644
--- a/src/lib/evas/canvas/evas_types.eot
+++ b/src/lib/evas/canvas/evas_types.eot
@@ -99,6 +99,15 @@ enum Evas.Text_Style_Type {
type Evas.Font.Size: int; /**< A type for font size */
+enum Evas.Font.Hinting_Flags {
+ [[Flags for Font Hinting]]
+ legacy: Evas_Font_Hinting;
+
+ none, [[No font hinting]]
+ auto, [[Automatic font hinting]]
+ bytecode [[Bytecode font hinting]]
+}
+
struct Evas.Map; /*@ An opaque handle to map points
*
* @see evas_map_new()
@@ -107,3 +116,104 @@ struct Evas.Map; /*@ An opaque handle to map points
*
* @ingroup Evas_Object_Group_Map
*/
+
+enum Evas.Button_Flags {
+ [[Flags for Mouse Button events]]
+ legacy: Evas_Button;
+
+ none = 0, [[No extra mouse button data]]
+ double_click = (1 << 0), [[This mouse button press was the 2nd press of a
double click]]
+ triple_click = (1 << 1) [[This mouse button press was the 3rd press of a
triple click]]
+}
+
+enum Evas.Event_Flags {
+ [[Flags for Events]]
+ legacy: Evas_Event_Flag;
+
+ none = 0, [[No fancy flags set]]
+ on_hold = (1 << 0), [[This event is being delivered but should be put "on
hold" until the on hold flag is unset. The event should be used for
informational purposes and maybe some indications visually, but not actually
perform anything]]
+ on_scroll = (1 << 1) [[This event flag indicates the event occurs while
scrolling; for example, DOWN event occurs during scrolling; the event should be
used for informational purposes and maybe some indications visually, but not
actually perform anything]]
+}
+
+enum Evas.Touch_Point_State {
+ [[State of Evas_Coord_Touch_Point]]
+ legacy: Evas_Touch_Point;
+
+ down, [[Touch point is pressed down]]
+ up, [[Touch point is released]]
+ move, [[Touch point is moved]]
+ still, [[Touch point is not moved after pressed]]
+ 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]]
+
+ /*
+ * The following events are only for use with Evas canvases, with
+ * evas_event_callback_add():
+ */
+ canvas_focus_in, [[Canvas got focus as a whole]]
+ canvas_focus_out, [[Canvas lost focus as a whole]]
+ render_flush_pre, [[Called just before rendering is updated on the canvas
target]]
+ render_flush_post, [[Called just after rendering is updated on the canvas
target]]
+ canvas_object_focus_in, [[Canvas object got focus]]
+ canvas_object_focus_ouT, [[Canvas object lost focus]]
+ canvas_viewport_resize, [[Canvas viewport resized @since 1.15]]
+
+ /*
+ * More Evas object event types - see evas_object_event_callback_add():
+ */
+ 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]]
+ last [[kept as last element/sentinel -- not really an event]]
+}
+
+struct Evas.Modifier; [[An opaque type containing information on which
modifier keys are registered in an Evas canvas]]
+struct Evas.Lock; [[An opaque type containing information on which lock keys
are registered in an Evas canvas]]
+struct Evas.Engine_Info; [[A generic Evas Engine information structure]]
+struct Evas.Axis; [[Details for a single device axis state @since 1.13]]
--
