From 24eaad059e88d0e9c65967cae59c32abd6338a7a Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Wed, 10 Jun 2015 16:56:43 +0100 Subject: [PATCH] Edje object: Fix Eolian warnings (and migrate types). Also add an eot file for general edje types. --- src/Makefile_Edje.am | 9 +++-- src/lib/edje/Edje_Common.h | 65 ++----------------------------------- src/lib/edje/edje_object.eo | 46 +++++++++++++------------- src/lib/edje/edje_types.eot | 43 ++++++++++++++++++++++++ 4 files changed, 76 insertions(+), 87 deletions(-) create mode 100644 src/lib/edje/edje_types.eot diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am index 15a8fed37e..e42f3c449b 100644 --- a/src/Makefile_Edje.am +++ b/src/Makefile_Edje.am @@ -5,9 +5,13 @@ edje_eolian_files = \ lib/edje/edje_object.eo \ lib/edje/edje_edit.eo +edje_eolian_type_files = \ + lib/edje/edje_types.eot + edje_eolian_c = $(edje_eolian_files:%.eo=%.eo.c) edje_eolian_h = $(edje_eolian_files:%.eo=%.eo.h) \ - $(edje_eolian_files:%.eo=%.eo.legacy.h) + $(edje_eolian_files:%.eo=%.eo.legacy.h) \ + $(edje_eolian_type_files:%.eot=%.eot.h) BUILT_SOURCES += \ $(edje_eolian_c) \ @@ -19,7 +23,8 @@ CLEANFILES += \ edjeeolianfilesdir = $(datadir)/eolian/include/edje-@VMAJ@ edjeeolianfiles_DATA = \ - $(edje_eolian_files) + $(edje_eolian_files) \ + $(edje_eolian_type_files) EXTRA_DIST += \ ${edjeeolianfiles_DATA} diff --git a/src/lib/edje/Edje_Common.h b/src/lib/edje/Edje_Common.h index d067486fd3..4aa3da2ef6 100644 --- a/src/lib/edje/Edje_Common.h +++ b/src/lib/edje/Edje_Common.h @@ -1,3 +1,5 @@ +#include "edje_types.eot.h" + /** * @internal * @@ -992,20 +994,6 @@ typedef enum _Edje_Text_Filter_Type EDJE_TEXT_FILTER_MARKUP = 2 /**< Markup type filter */ } Edje_Text_Filter_Type; -/** - * @typedef Edje_Text_Autocapital_Type - * - * All Text auto capital mode type values - * - */ -typedef enum _Edje_Text_Autocapital_Type -{ - EDJE_TEXT_AUTOCAPITAL_TYPE_NONE, /**< None mode value */ - EDJE_TEXT_AUTOCAPITAL_TYPE_WORD, /**< Word mode value */ - EDJE_TEXT_AUTOCAPITAL_TYPE_SENTENCE, /**< Sentence mode value */ - EDJE_TEXT_AUTOCAPITAL_TYPE_ALLCHARACTER /**< All characters mode value */ -} Edje_Text_Autocapital_Type; - /** * @typedef Edje_Input_Panel_Lang * @@ -1446,24 +1434,6 @@ typedef void (*Edje_Text_Change_Cb) (void *data, Evas_Object *obj, c * @{ */ -/** - * @typedef Edje_Cursor - * - * All available cursor states - * - */ -typedef enum _Edje_Cursor -{ - EDJE_CURSOR_MAIN, /*< Main cursor state */ - EDJE_CURSOR_SELECTION_BEGIN, /*< Selection begin cursor state */ - EDJE_CURSOR_SELECTION_END, /*< Selection end cursor state */ - EDJE_CURSOR_PREEDIT_START, /*< Pre-edit start cursor state */ - EDJE_CURSOR_PREEDIT_END, /*< Pre-edit end cursor starge */ - EDJE_CURSOR_USER, /*< User cursor state */ - EDJE_CURSOR_USER_EXTRA, /*< User extra cursor state */ - // more later -} Edje_Cursor; - /** * @} */ @@ -1546,19 +1516,6 @@ typedef enum _Edje_Aspect_Control * @{ */ -/** - * @typedef Edje_Drag_Dir - * - * Dragable properties values - */ -typedef enum _Edje_Drag_Dir -{ - EDJE_DRAG_DIR_NONE = 0, /*< Not dragable value */ - EDJE_DRAG_DIR_X = 1, /*< X dragable value */ - EDJE_DRAG_DIR_Y = 2, /*< Y dragable value */ - EDJE_DRAG_DIR_XY = 3 /*< X and Y dragable value */ -} Edje_Drag_Dir; - /** * @} */ @@ -1740,21 +1697,6 @@ EAPI Eina_List *edje_text_class_list (void); * @{ */ -typedef enum _Edje_Load_Error -{ - EDJE_LOAD_ERROR_NONE = 0, /**< No error happened, the loading was successful */ - EDJE_LOAD_ERROR_GENERIC = 1, /**< A generic error happened during the loading */ - EDJE_LOAD_ERROR_DOES_NOT_EXIST = 2, /**< The file pointed to did not exist */ - EDJE_LOAD_ERROR_PERMISSION_DENIED = 3, /**< Permission to read the given file was denied */ - EDJE_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED = 4, /**< Resource allocation failed during the loading */ - EDJE_LOAD_ERROR_CORRUPT_FILE = 5, /**< The file pointed to was corrupt */ - EDJE_LOAD_ERROR_UNKNOWN_FORMAT = 6, /**< The file pointed to had an unknown format */ - EDJE_LOAD_ERROR_INCOMPATIBLE_FILE = 7, /**< The file pointed to is incompatible, i.e., it doesn't match the library's current version's format */ - EDJE_LOAD_ERROR_UNKNOWN_COLLECTION = 8, /**< The group/collection set to load from was @b not found in the file */ - EDJE_LOAD_ERROR_RECURSIVE_REFERENCE = 9 /**< The group/collection set to load from had recursive references on its components */ -} Edje_Load_Error; /**< Edje file loading error codes one can get - see edje_load_error_str() too. */ - - /** * Get a list of groups in an edje mapped file * @param f The mapped file @@ -2137,9 +2079,6 @@ EAPI void edje_message_signal_process (void); * @{ */ -/* perspective info for maps inside edje objects */ -typedef struct _Edje_Perspective Edje_Perspective; - /** * Creates a new perspective in the given canvas. * diff --git a/src/lib/edje/edje_object.eo b/src/lib/edje/edje_object.eo index c05ef7731e..6f6506e8fc 100755 --- a/src/lib/edje/edje_object.eo +++ b/src/lib/edje/edje_object.eo @@ -1,3 +1,5 @@ +import edje_types; + class Edje.Object (Evas.Smart_Clipped, Efl.File) { legacy_prefix: edje_object; @@ -138,7 +140,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File) @see edje_object_perspective_get() @see edje_perspective_set() */ values { - ps: Edje_Perspective*; /*@ The perspective object that will be used. */ + ps: Edje.Perspective*; /*@ The perspective object that will be used. */ } } get { @@ -150,7 +152,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File) @see edje_object_perspective_set() */ values { - ps: const(Edje_Perspective)*; /*@ The perspective object that will be used. */ + ps: const(Edje.Perspective)*; /*@ The perspective object that will be used. */ } } } @@ -223,7 +225,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File) } values { part: const(char)*; /*@ The part name */ - cur: Edje_Cursor; /*@ the edje cursor to work on */ + cur: Edje.Cursor; /*@ the edje cursor to work on */ } } @property part_text_cursor_line_end { @@ -234,7 +236,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File) } values { part: const(char)*; /*@ The part name */ - cur: Edje_Cursor; /*@ the edje cursor to work on */ + cur: Edje.Cursor; /*@ the edje cursor to work on */ } } @property text_class { @@ -265,7 +267,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File) } values { part: const(char)*; /*@ The part containing the object. */ - cur: Edje_Cursor; /*@ The cursor to adjust. */ + cur: Edje.Cursor; /*@ The cursor to adjust. */ x: Evas.Coord; /*@ X Coordinate. */ y: Evas.Coord; /*@ Y Coordinate. */ } @@ -278,7 +280,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File) } values { part: const(char)*; /*@ The part name */ - cur: Edje_Cursor; /*@ the edje cursor to work on */ + cur: Edje.Cursor; /*@ the edje cursor to work on */ } } @property part_text_escaped { @@ -321,7 +323,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File) } values { part: const(char)*; /*@ The part name */ - cur: Edje_Cursor; /*@ the edje cursor to work on */ + cur: Edje.Cursor; /*@ the edje cursor to work on */ } } @property message_handler { @@ -415,7 +417,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File) check for the reason of failure with this one. @see edje_load_error_str() */ - return: Edje_Load_Error; + return: Edje.Load_Error; } } @property size_max { @@ -632,7 +634,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File) return: bool; params { @in part: const(char)*; /*@ The part name */ - @in cur: Edje_Cursor; /*@ The edje cursor to advance */ + @in cur: Edje.Cursor; /*@ The edje cursor to advance */ } } part_text_style_user_push { @@ -832,8 +834,8 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File) params { @in part: const(char)*; /*@ The part name */ - @in src: Edje_Cursor; /*@ the cursor to copy from */ - @in dst: Edje_Cursor; /*@ the cursor to copy to */ + @in src: Edje.Cursor; /*@ the cursor to copy from */ + @in dst: Edje.Cursor; /*@ the cursor to copy to */ } } parts_extends_calc { @@ -924,7 +926,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File) params { @in part: const(char)*; /*@ The part name */ - @in cur: Edje_Cursor; /*@ The cursor to move */ + @in cur: Edje.Cursor; /*@ The cursor to move */ @in pos: int; /*@ the position of the cursor */ } } @@ -937,7 +939,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File) return: int; params { @in part: const(char)*; /*@ The part name */ - @in cur: Edje_Cursor; /*@ The cursor to get the position */ + @in cur: Edje.Cursor; /*@ The cursor to get the position */ } } freeze { @@ -964,7 +966,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File) return: char *; params { @in part: const(char)*; /*@ The part name */ - @in cur: Edje_Cursor; /*@ The cursor to use */ + @in cur: Edje.Cursor; /*@ The cursor to use */ } } part_text_input_panel_layout_set { @@ -1182,7 +1184,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File) return: bool; params { @in part: const(char)*; /*@ The part name */ - @in cur: Edje_Cursor; /*@ the edje cursor to work on */ + @in cur: Edje.Cursor; /*@ the edje cursor to work on */ } } part_drag_page_set { @@ -1413,7 +1415,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File) #EDJE_DRAG_DIR_X: Dragable in X direction\n #EDJE_DRAG_DIR_Y: Dragable in Y direction\n #EDJE_DRAG_DIR_XY: Dragable in X & Y directions */ - return: Edje_Drag_Dir; + return: Edje.Drag_Dir; params { @in part: const(char)*; /*@ The part name */ } @@ -1552,7 +1554,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File) params { @in part: const(char)*; /*@ The part name */ - @in autocapital_type: Edje_Text_Autocapital_Type; /*@ The type of autocapitalization */ + @in autocapital_type: Edje.Text.Autocapital_Type; /*@ The type of autocapitalization */ } } part_text_autocapital_type_get @const { @@ -1561,7 +1563,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File) @return The autocapitalization type @since 1.1.0 */ - return: Edje_Text_Autocapital_Type; + return: Edje.Text.Autocapital_Type; params { @in part: const(char)*; /*@ The part name */ } @@ -2055,7 +2057,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File) return: bool; params { @in part: const(char)*; /*@ The part name */ - @in cur: Edje_Cursor; /*@ The cursor to adjust. */ + @in cur: Edje.Cursor; /*@ The cursor to adjust. */ } } text_class_get @const { @@ -2181,7 +2183,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File) return: bool; params { @in part: const(char)*; /*@ The part name */ - @in cur: Edje_Cursor; /*@ the edje cursor to work on */ + @in cur: Edje.Cursor; /*@ the edje cursor to work on */ } } part_text_cursor_geometry_get @const { @@ -2304,7 +2306,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File) return: bool; params { @in part: const(char)*; /*@ The part name */ - @in cur: Edje_Cursor; /*@ The cursor to adjust. */ + @in cur: Edje.Cursor; /*@ The cursor to adjust. */ } } part_text_user_insert @const { @@ -2328,7 +2330,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File) return: bool; params { @in part: const(char)*; /*@ The part name */ - @in cur: Edje_Cursor; /*@ the edje cursor to work on */ + @in cur: Edje.Cursor; /*@ the edje cursor to work on */ } } part_text_item_list_get @const { diff --git a/src/lib/edje/edje_types.eot b/src/lib/edje/edje_types.eot new file mode 100644 index 0000000000..e8b4dc0f9c --- /dev/null +++ b/src/lib/edje/edje_types.eot @@ -0,0 +1,43 @@ +enum Edje.Cursor { + [[All available cursor states]] + main, [[Main cursor state]] + selection_begin, [[Selection begin cursor state]] + selection_end, [[Selection end cursor state]] + preedit_start, [[Pre-edit start cursor state]] + preedit_end, [[Pre-edit end cursor starge]] + user, [[User cursor state]] + user_extra [[User extra cursor state]] +} + +enum Edje.Drag_Dir { + [[Dragable properties values]] + none = 0, [[Not dragable value]] + x = 1, [[X dragable value]] + y = 2, [[Y dragable value]] + xy = 3 [[X and Y dragable value]] +} + +enum Edje.Load_Error { + [[Edje file loading error codes one can get - see edje_load_error_str() too.]] + + none = 0, [[No error happened, the loading was successful]] + generic = 1, [[A generic error happened during the loading]] + does_not_exist = 2, [[The file pointed to did not exist]] + permission_denied = 3, [[Permission to read the given file was denied]] + resource_allocation_failed = 4, [[Resource allocation failed during the loading]] + corrupt_file = 5, [[The file pointed to was corrupt]] + unknown_format = 6, [[The file pointed to had an unknown format]] + incompatible_file = 7, [[The file pointed to is incompatible, i.e., it doesn't match the library's current version's format]] + unknown_collection = 8, [[The group/collection set to load from was @b not found in the file]] + recursive_reference = 9 [[The group/collection set to load from had recursive references on its components]] +} + +enum Edje.Text.Autocapital_Type { + [[All Text auto capital mode type values]] + none, [[None mode value]] + word, [[Word mode value]] + sentence, [[Sentence mode value]] + allcharacter [[All characters mode value]] +} + +struct Edje.Perspective; [[Perspective info for maps inside edje objects]]