summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2015-06-10 16:56:43 +0100
committerTom Hacohen <tom@stosb.com>2015-06-10 16:56:48 +0100
commit24eaad059e88d0e9c65967cae59c32abd6338a7a (patch)
tree0f3219d8b2feb94a62d2ec4826b89833f79d005c /src
parent660e23fd75b40f09dfaba099b25121bf9d7e834e (diff)
Edje object: Fix Eolian warnings (and migrate types).
Also add an eot file for general edje types.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile_Edje.am9
-rw-r--r--src/lib/edje/Edje_Common.h65
-rwxr-xr-xsrc/lib/edje/edje_object.eo46
-rw-r--r--src/lib/edje/edje_types.eot43
4 files changed, 76 insertions, 87 deletions
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 = \
5 lib/edje/edje_object.eo \ 5 lib/edje/edje_object.eo \
6 lib/edje/edje_edit.eo 6 lib/edje/edje_edit.eo
7 7
8edje_eolian_type_files = \
9 lib/edje/edje_types.eot
10
8edje_eolian_c = $(edje_eolian_files:%.eo=%.eo.c) 11edje_eolian_c = $(edje_eolian_files:%.eo=%.eo.c)
9edje_eolian_h = $(edje_eolian_files:%.eo=%.eo.h) \ 12edje_eolian_h = $(edje_eolian_files:%.eo=%.eo.h) \
10 $(edje_eolian_files:%.eo=%.eo.legacy.h) 13 $(edje_eolian_files:%.eo=%.eo.legacy.h) \
14 $(edje_eolian_type_files:%.eot=%.eot.h)
11 15
12BUILT_SOURCES += \ 16BUILT_SOURCES += \
13 $(edje_eolian_c) \ 17 $(edje_eolian_c) \
@@ -19,7 +23,8 @@ CLEANFILES += \
19 23
20edjeeolianfilesdir = $(datadir)/eolian/include/edje-@VMAJ@ 24edjeeolianfilesdir = $(datadir)/eolian/include/edje-@VMAJ@
21edjeeolianfiles_DATA = \ 25edjeeolianfiles_DATA = \
22 $(edje_eolian_files) 26 $(edje_eolian_files) \
27 $(edje_eolian_type_files)
23 28
24EXTRA_DIST += \ 29EXTRA_DIST += \
25 ${edjeeolianfiles_DATA} 30 ${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 @@
1#include "edje_types.eot.h"
2
1/** 3/**
2 * @internal 4 * @internal
3 * 5 *
@@ -993,20 +995,6 @@ typedef enum _Edje_Text_Filter_Type
993} Edje_Text_Filter_Type; 995} Edje_Text_Filter_Type;
994 996
995/** 997/**
996 * @typedef Edje_Text_Autocapital_Type
997 *
998 * All Text auto capital mode type values
999 *
1000 */
1001typedef enum _Edje_Text_Autocapital_Type
1002{
1003 EDJE_TEXT_AUTOCAPITAL_TYPE_NONE, /**< None mode value */
1004 EDJE_TEXT_AUTOCAPITAL_TYPE_WORD, /**< Word mode value */
1005 EDJE_TEXT_AUTOCAPITAL_TYPE_SENTENCE, /**< Sentence mode value */
1006 EDJE_TEXT_AUTOCAPITAL_TYPE_ALLCHARACTER /**< All characters mode value */
1007} Edje_Text_Autocapital_Type;
1008
1009/**
1010 * @typedef Edje_Input_Panel_Lang 998 * @typedef Edje_Input_Panel_Lang
1011 * 999 *
1012 */ 1000 */
@@ -1447,24 +1435,6 @@ typedef void (*Edje_Text_Change_Cb) (void *data, Evas_Object *obj, c
1447 */ 1435 */
1448 1436
1449/** 1437/**
1450 * @typedef Edje_Cursor
1451 *
1452 * All available cursor states
1453 *
1454 */
1455typedef enum _Edje_Cursor
1456{
1457 EDJE_CURSOR_MAIN, /*< Main cursor state */
1458 EDJE_CURSOR_SELECTION_BEGIN, /*< Selection begin cursor state */
1459 EDJE_CURSOR_SELECTION_END, /*< Selection end cursor state */
1460 EDJE_CURSOR_PREEDIT_START, /*< Pre-edit start cursor state */
1461 EDJE_CURSOR_PREEDIT_END, /*< Pre-edit end cursor starge */
1462 EDJE_CURSOR_USER, /*< User cursor state */
1463 EDJE_CURSOR_USER_EXTRA, /*< User extra cursor state */
1464 // more later
1465} Edje_Cursor;
1466
1467/**
1468 * @} 1438 * @}
1469 */ 1439 */
1470 1440
@@ -1547,19 +1517,6 @@ typedef enum _Edje_Aspect_Control
1547 */ 1517 */
1548 1518
1549/** 1519/**
1550 * @typedef Edje_Drag_Dir
1551 *
1552 * Dragable properties values
1553 */
1554typedef enum _Edje_Drag_Dir
1555{
1556 EDJE_DRAG_DIR_NONE = 0, /*< Not dragable value */
1557 EDJE_DRAG_DIR_X = 1, /*< X dragable value */
1558 EDJE_DRAG_DIR_Y = 2, /*< Y dragable value */
1559 EDJE_DRAG_DIR_XY = 3 /*< X and Y dragable value */
1560} Edje_Drag_Dir;
1561
1562/**
1563 * @} 1520 * @}
1564 */ 1521 */
1565 1522
@@ -1740,21 +1697,6 @@ EAPI Eina_List *edje_text_class_list (void);
1740 * @{ 1697 * @{
1741 */ 1698 */
1742 1699
1743typedef enum _Edje_Load_Error
1744{
1745 EDJE_LOAD_ERROR_NONE = 0, /**< No error happened, the loading was successful */
1746 EDJE_LOAD_ERROR_GENERIC = 1, /**< A generic error happened during the loading */
1747 EDJE_LOAD_ERROR_DOES_NOT_EXIST = 2, /**< The file pointed to did not exist */
1748 EDJE_LOAD_ERROR_PERMISSION_DENIED = 3, /**< Permission to read the given file was denied */
1749 EDJE_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED = 4, /**< Resource allocation failed during the loading */
1750 EDJE_LOAD_ERROR_CORRUPT_FILE = 5, /**< The file pointed to was corrupt */
1751 EDJE_LOAD_ERROR_UNKNOWN_FORMAT = 6, /**< The file pointed to had an unknown format */
1752 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 */
1753 EDJE_LOAD_ERROR_UNKNOWN_COLLECTION = 8, /**< The group/collection set to load from was @b not found in the file */
1754 EDJE_LOAD_ERROR_RECURSIVE_REFERENCE = 9 /**< The group/collection set to load from had <b>recursive references</b> on its components */
1755} Edje_Load_Error; /**< Edje file loading error codes one can get - see edje_load_error_str() too. */
1756
1757
1758/** 1700/**
1759 * Get a list of groups in an edje mapped file 1701 * Get a list of groups in an edje mapped file
1760 * @param f The mapped file 1702 * @param f The mapped file
@@ -2137,9 +2079,6 @@ EAPI void edje_message_signal_process (void);
2137 * @{ 2079 * @{
2138 */ 2080 */
2139 2081
2140/* perspective info for maps inside edje objects */
2141typedef struct _Edje_Perspective Edje_Perspective;
2142
2143/** 2082/**
2144 * Creates a new perspective in the given canvas. 2083 * Creates a new perspective in the given canvas.
2145 * 2084 *
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 @@
1import edje_types;
2
1class Edje.Object (Evas.Smart_Clipped, Efl.File) 3class Edje.Object (Evas.Smart_Clipped, Efl.File)
2{ 4{
3 legacy_prefix: edje_object; 5 legacy_prefix: edje_object;
@@ -138,7 +140,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
138 @see edje_object_perspective_get() 140 @see edje_object_perspective_get()
139 @see edje_perspective_set() */ 141 @see edje_perspective_set() */
140 values { 142 values {
141 ps: Edje_Perspective*; /*@ The perspective object that will be used. */ 143 ps: Edje.Perspective*; /*@ The perspective object that will be used. */
142 } 144 }
143 } 145 }
144 get { 146 get {
@@ -150,7 +152,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
150 152
151 @see edje_object_perspective_set() */ 153 @see edje_object_perspective_set() */
152 values { 154 values {
153 ps: const(Edje_Perspective)*; /*@ The perspective object that will be used. */ 155 ps: const(Edje.Perspective)*; /*@ The perspective object that will be used. */
154 } 156 }
155 } 157 }
156 } 158 }
@@ -223,7 +225,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
223 } 225 }
224 values { 226 values {
225 part: const(char)*; /*@ The part name */ 227 part: const(char)*; /*@ The part name */
226 cur: Edje_Cursor; /*@ the edje cursor to work on */ 228 cur: Edje.Cursor; /*@ the edje cursor to work on */
227 } 229 }
228 } 230 }
229 @property part_text_cursor_line_end { 231 @property part_text_cursor_line_end {
@@ -234,7 +236,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
234 } 236 }
235 values { 237 values {
236 part: const(char)*; /*@ The part name */ 238 part: const(char)*; /*@ The part name */
237 cur: Edje_Cursor; /*@ the edje cursor to work on */ 239 cur: Edje.Cursor; /*@ the edje cursor to work on */
238 } 240 }
239 } 241 }
240 @property text_class { 242 @property text_class {
@@ -265,7 +267,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
265 } 267 }
266 values { 268 values {
267 part: const(char)*; /*@ The part containing the object. */ 269 part: const(char)*; /*@ The part containing the object. */
268 cur: Edje_Cursor; /*@ The cursor to adjust. */ 270 cur: Edje.Cursor; /*@ The cursor to adjust. */
269 x: Evas.Coord; /*@ X Coordinate. */ 271 x: Evas.Coord; /*@ X Coordinate. */
270 y: Evas.Coord; /*@ Y Coordinate. */ 272 y: Evas.Coord; /*@ Y Coordinate. */
271 } 273 }
@@ -278,7 +280,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
278 } 280 }
279 values { 281 values {
280 part: const(char)*; /*@ The part name */ 282 part: const(char)*; /*@ The part name */
281 cur: Edje_Cursor; /*@ the edje cursor to work on */ 283 cur: Edje.Cursor; /*@ the edje cursor to work on */
282 } 284 }
283 } 285 }
284 @property part_text_escaped { 286 @property part_text_escaped {
@@ -321,7 +323,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
321 } 323 }
322 values { 324 values {
323 part: const(char)*; /*@ The part name */ 325 part: const(char)*; /*@ The part name */
324 cur: Edje_Cursor; /*@ the edje cursor to work on */ 326 cur: Edje.Cursor; /*@ the edje cursor to work on */
325 } 327 }
326 } 328 }
327 @property message_handler { 329 @property message_handler {
@@ -415,7 +417,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
415 check for the reason of failure with this one. 417 check for the reason of failure with this one.
416 418
417 @see edje_load_error_str() */ 419 @see edje_load_error_str() */
418 return: Edje_Load_Error; 420 return: Edje.Load_Error;
419 } 421 }
420 } 422 }
421 @property size_max { 423 @property size_max {
@@ -632,7 +634,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
632 return: bool; 634 return: bool;
633 params { 635 params {
634 @in part: const(char)*; /*@ The part name */ 636 @in part: const(char)*; /*@ The part name */
635 @in cur: Edje_Cursor; /*@ The edje cursor to advance */ 637 @in cur: Edje.Cursor; /*@ The edje cursor to advance */
636 } 638 }
637 } 639 }
638 part_text_style_user_push { 640 part_text_style_user_push {
@@ -832,8 +834,8 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
832 834
833 params { 835 params {
834 @in part: const(char)*; /*@ The part name */ 836 @in part: const(char)*; /*@ The part name */
835 @in src: Edje_Cursor; /*@ the cursor to copy from */ 837 @in src: Edje.Cursor; /*@ the cursor to copy from */
836 @in dst: Edje_Cursor; /*@ the cursor to copy to */ 838 @in dst: Edje.Cursor; /*@ the cursor to copy to */
837 } 839 }
838 } 840 }
839 parts_extends_calc { 841 parts_extends_calc {
@@ -924,7 +926,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
924 926
925 params { 927 params {
926 @in part: const(char)*; /*@ The part name */ 928 @in part: const(char)*; /*@ The part name */
927 @in cur: Edje_Cursor; /*@ The cursor to move */ 929 @in cur: Edje.Cursor; /*@ The cursor to move */
928 @in pos: int; /*@ the position of the cursor */ 930 @in pos: int; /*@ the position of the cursor */
929 } 931 }
930 } 932 }
@@ -937,7 +939,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
937 return: int; 939 return: int;
938 params { 940 params {
939 @in part: const(char)*; /*@ The part name */ 941 @in part: const(char)*; /*@ The part name */
940 @in cur: Edje_Cursor; /*@ The cursor to get the position */ 942 @in cur: Edje.Cursor; /*@ The cursor to get the position */
941 } 943 }
942 } 944 }
943 freeze { 945 freeze {
@@ -964,7 +966,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
964 return: char *; 966 return: char *;
965 params { 967 params {
966 @in part: const(char)*; /*@ The part name */ 968 @in part: const(char)*; /*@ The part name */
967 @in cur: Edje_Cursor; /*@ The cursor to use */ 969 @in cur: Edje.Cursor; /*@ The cursor to use */
968 } 970 }
969 } 971 }
970 part_text_input_panel_layout_set { 972 part_text_input_panel_layout_set {
@@ -1182,7 +1184,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
1182 return: bool; 1184 return: bool;
1183 params { 1185 params {
1184 @in part: const(char)*; /*@ The part name */ 1186 @in part: const(char)*; /*@ The part name */
1185 @in cur: Edje_Cursor; /*@ the edje cursor to work on */ 1187 @in cur: Edje.Cursor; /*@ the edje cursor to work on */
1186 } 1188 }
1187 } 1189 }
1188 part_drag_page_set { 1190 part_drag_page_set {
@@ -1413,7 +1415,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
1413 #EDJE_DRAG_DIR_X: Dragable in X direction\n 1415 #EDJE_DRAG_DIR_X: Dragable in X direction\n
1414 #EDJE_DRAG_DIR_Y: Dragable in Y direction\n 1416 #EDJE_DRAG_DIR_Y: Dragable in Y direction\n
1415 #EDJE_DRAG_DIR_XY: Dragable in X & Y directions */ 1417 #EDJE_DRAG_DIR_XY: Dragable in X & Y directions */
1416 return: Edje_Drag_Dir; 1418 return: Edje.Drag_Dir;
1417 params { 1419 params {
1418 @in part: const(char)*; /*@ The part name */ 1420 @in part: const(char)*; /*@ The part name */
1419 } 1421 }
@@ -1552,7 +1554,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
1552 1554
1553 params { 1555 params {
1554 @in part: const(char)*; /*@ The part name */ 1556 @in part: const(char)*; /*@ The part name */
1555 @in autocapital_type: Edje_Text_Autocapital_Type; /*@ The type of autocapitalization */ 1557 @in autocapital_type: Edje.Text.Autocapital_Type; /*@ The type of autocapitalization */
1556 } 1558 }
1557 } 1559 }
1558 part_text_autocapital_type_get @const { 1560 part_text_autocapital_type_get @const {
@@ -1561,7 +1563,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
1561 1563
1562 @return The autocapitalization type 1564 @return The autocapitalization type
1563 @since 1.1.0 */ 1565 @since 1.1.0 */
1564 return: Edje_Text_Autocapital_Type; 1566 return: Edje.Text.Autocapital_Type;
1565 params { 1567 params {
1566 @in part: const(char)*; /*@ The part name */ 1568 @in part: const(char)*; /*@ The part name */
1567 } 1569 }
@@ -2055,7 +2057,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
2055 return: bool; 2057 return: bool;
2056 params { 2058 params {
2057 @in part: const(char)*; /*@ The part name */ 2059 @in part: const(char)*; /*@ The part name */
2058 @in cur: Edje_Cursor; /*@ The cursor to adjust. */ 2060 @in cur: Edje.Cursor; /*@ The cursor to adjust. */
2059 } 2061 }
2060 } 2062 }
2061 text_class_get @const { 2063 text_class_get @const {
@@ -2181,7 +2183,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
2181 return: bool; 2183 return: bool;
2182 params { 2184 params {
2183 @in part: const(char)*; /*@ The part name */ 2185 @in part: const(char)*; /*@ The part name */
2184 @in cur: Edje_Cursor; /*@ the edje cursor to work on */ 2186 @in cur: Edje.Cursor; /*@ the edje cursor to work on */
2185 } 2187 }
2186 } 2188 }
2187 part_text_cursor_geometry_get @const { 2189 part_text_cursor_geometry_get @const {
@@ -2304,7 +2306,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
2304 return: bool; 2306 return: bool;
2305 params { 2307 params {
2306 @in part: const(char)*; /*@ The part name */ 2308 @in part: const(char)*; /*@ The part name */
2307 @in cur: Edje_Cursor; /*@ The cursor to adjust. */ 2309 @in cur: Edje.Cursor; /*@ The cursor to adjust. */
2308 } 2310 }
2309 } 2311 }
2310 part_text_user_insert @const { 2312 part_text_user_insert @const {
@@ -2328,7 +2330,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
2328 return: bool; 2330 return: bool;
2329 params { 2331 params {
2330 @in part: const(char)*; /*@ The part name */ 2332 @in part: const(char)*; /*@ The part name */
2331 @in cur: Edje_Cursor; /*@ the edje cursor to work on */ 2333 @in cur: Edje.Cursor; /*@ the edje cursor to work on */
2332 } 2334 }
2333 } 2335 }
2334 part_text_item_list_get @const { 2336 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 @@
1enum Edje.Cursor {
2 [[All available cursor states]]
3 main, [[Main cursor state]]
4 selection_begin, [[Selection begin cursor state]]
5 selection_end, [[Selection end cursor state]]
6 preedit_start, [[Pre-edit start cursor state]]
7 preedit_end, [[Pre-edit end cursor starge]]
8 user, [[User cursor state]]
9 user_extra [[User extra cursor state]]
10}
11
12enum Edje.Drag_Dir {
13 [[Dragable properties values]]
14 none = 0, [[Not dragable value]]
15 x = 1, [[X dragable value]]
16 y = 2, [[Y dragable value]]
17 xy = 3 [[X and Y dragable value]]
18}
19
20enum Edje.Load_Error {
21 [[Edje file loading error codes one can get - see edje_load_error_str() too.]]
22
23 none = 0, [[No error happened, the loading was successful]]
24 generic = 1, [[A generic error happened during the loading]]
25 does_not_exist = 2, [[The file pointed to did not exist]]
26 permission_denied = 3, [[Permission to read the given file was denied]]
27 resource_allocation_failed = 4, [[Resource allocation failed during the loading]]
28 corrupt_file = 5, [[The file pointed to was corrupt]]
29 unknown_format = 6, [[The file pointed to had an unknown format]]
30 incompatible_file = 7, [[The file pointed to is incompatible, i.e., it doesn't match the library's current version's format]]
31 unknown_collection = 8, [[The group/collection set to load from was @b not found in the file]]
32 recursive_reference = 9 [[The group/collection set to load from had <b>recursive references</b> on its components]]
33}
34
35enum Edje.Text.Autocapital_Type {
36 [[All Text auto capital mode type values]]
37 none, [[None mode value]]
38 word, [[Word mode value]]
39 sentence, [[Sentence mode value]]
40 allcharacter [[All characters mode value]]
41}
42
43struct Edje.Perspective; [[Perspective info for maps inside edje objects]]