summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2015-06-10 17:23:30 +0100
committerTom Hacohen <tom@stosb.com>2015-06-10 17:23:30 +0100
commita023a04b53c52aa3fd65b5ac9054d5fd706c31d5 (patch)
tree921749aca5c65796e862fb6be70f19820034a7bc
parentf716d700084c8a0431710bdfd41930010f62b917 (diff)
Edje object: Fix remaining Eolian warnings.
-rw-r--r--src/lib/edje/Edje_Common.h117
-rwxr-xr-xsrc/lib/edje/edje_object.eo24
-rw-r--r--src/lib/edje/edje_types.eot92
3 files changed, 104 insertions, 129 deletions
diff --git a/src/lib/edje/Edje_Common.h b/src/lib/edje/Edje_Common.h
index 4aa3da2ef6..668eab0cd5 100644
--- a/src/lib/edje/Edje_Common.h
+++ b/src/lib/edje/Edje_Common.h
@@ -322,20 +322,6 @@ EAPI void edje_collection_cache_flush (void);
322 */ 322 */
323 323
324/** 324/**
325 * The possible types the parameters of an EXTERNAL part can be.
326 */
327typedef enum _Edje_External_Param_Type
328{
329 EDJE_EXTERNAL_PARAM_TYPE_INT, /**< Parameter value is an integer. */
330 EDJE_EXTERNAL_PARAM_TYPE_DOUBLE, /**< Parameter value is a double. */
331 EDJE_EXTERNAL_PARAM_TYPE_STRING, /**< Parameter value is a string. */
332 EDJE_EXTERNAL_PARAM_TYPE_BOOL, /**< Parameter value is boolean. */
333 EDJE_EXTERNAL_PARAM_TYPE_CHOICE, /**< Parameter value is one of a set of
334 predefined string choices. */
335 EDJE_EXTERNAL_PARAM_TYPE_MAX /**< Sentinel. Don't use. */
336} Edje_External_Param_Type;
337
338/**
339 * Flags that determine how a parameter may be accessed in different 325 * Flags that determine how a parameter may be accessed in different
340 * circumstances. 326 * circumstances.
341 */ 327 */
@@ -362,25 +348,6 @@ typedef enum _Edje_External_Param_Flags
362EAPI const char *edje_external_param_type_str(Edje_External_Param_Type type) EINA_PURE; 348EAPI const char *edje_external_param_type_str(Edje_External_Param_Type type) EINA_PURE;
363 349
364/** 350/**
365 * Struct that holds parameters for parts of type EXTERNAL.
366 */
367struct _Edje_External_Param
368{
369 const char *name; /**< The name of the parameter. */
370 Edje_External_Param_Type type; /**< The type of the parameter. This defines
371 which of the next three variables holds
372 the value for it. */
373 // XXX these could be in a union, but eet doesn't support them (or does it?)
374 int i; /**< Used by both integer and boolean */
375 double d; /**< Used by double */
376 const char *s; /**< Used by both string and choice */
377};
378/**
379 * Struct that holds parameters for parts of type EXTERNAL.
380 */
381typedef struct _Edje_External_Param Edje_External_Param;
382
383/**
384 * Helper macro to indicate an EXTERNAL's integer parameter is undefined. 351 * Helper macro to indicate an EXTERNAL's integer parameter is undefined.
385 */ 352 */
386#define EDJE_EXTERNAL_INT_UNSET INT_MAX 353#define EDJE_EXTERNAL_INT_UNSET INT_MAX
@@ -994,62 +961,6 @@ typedef enum _Edje_Text_Filter_Type
994 EDJE_TEXT_FILTER_MARKUP = 2 /**< Markup type filter */ 961 EDJE_TEXT_FILTER_MARKUP = 2 /**< Markup type filter */
995} Edje_Text_Filter_Type; 962} Edje_Text_Filter_Type;
996 963
997/**
998 * @typedef Edje_Input_Panel_Lang
999 *
1000 */
1001typedef enum _Edje_Input_Panel_Lang
1002{
1003 EDJE_INPUT_PANEL_LANG_AUTOMATIC, /**< Automatic @since 1.2 */
1004 EDJE_INPUT_PANEL_LANG_ALPHABET /**< Alphabet @since 1.2 */
1005} Edje_Input_Panel_Lang;
1006
1007typedef enum _Edje_Input_Panel_Return_Key_Type
1008{
1009 EDJE_INPUT_PANEL_RETURN_KEY_TYPE_DEFAULT, /**< Default @since 1.2 */
1010 EDJE_INPUT_PANEL_RETURN_KEY_TYPE_DONE, /**< Done @since 1.2 */
1011 EDJE_INPUT_PANEL_RETURN_KEY_TYPE_GO, /**< Go @since 1.2 */
1012 EDJE_INPUT_PANEL_RETURN_KEY_TYPE_JOIN, /**< Join @since 1.2 */
1013 EDJE_INPUT_PANEL_RETURN_KEY_TYPE_LOGIN, /**< Login @since 1.2 */
1014 EDJE_INPUT_PANEL_RETURN_KEY_TYPE_NEXT, /**< Next @since 1.2 */
1015 EDJE_INPUT_PANEL_RETURN_KEY_TYPE_SEARCH, /**< Search or magnifier icon @since 1.2 */
1016 EDJE_INPUT_PANEL_RETURN_KEY_TYPE_SEND, /**< Send @since 1.2 */
1017 EDJE_INPUT_PANEL_RETURN_KEY_TYPE_SIGNIN /**< Sign-in @since 1.8 */
1018} Edje_Input_Panel_Return_Key_Type;
1019
1020/**
1021 * @typedef Edje_Input_Panel_Layout
1022 * @brief Edje input panel layout
1023 */
1024typedef enum _Edje_Input_Panel_Layout
1025{
1026 EDJE_INPUT_PANEL_LAYOUT_NORMAL, /**< Default layout */
1027 EDJE_INPUT_PANEL_LAYOUT_NUMBER, /**< Number layout */
1028 EDJE_INPUT_PANEL_LAYOUT_EMAIL, /**< Email layout */
1029 EDJE_INPUT_PANEL_LAYOUT_URL, /**< URL layout */
1030 EDJE_INPUT_PANEL_LAYOUT_PHONENUMBER, /**< Phone Number layout */
1031 EDJE_INPUT_PANEL_LAYOUT_IP, /**< IP layout */
1032 EDJE_INPUT_PANEL_LAYOUT_MONTH, /**< Month layout */
1033 EDJE_INPUT_PANEL_LAYOUT_NUMBERONLY, /**< Number Only layout */
1034 EDJE_INPUT_PANEL_LAYOUT_INVALID, /**< Never use this */
1035 EDJE_INPUT_PANEL_LAYOUT_HEX, /**< Hexadecimal layout @since 1.2 */
1036 EDJE_INPUT_PANEL_LAYOUT_TERMINAL, /**< Command-line terminal layout including esc, alt, ctrl key, so on (no auto-correct, no auto-capitalization) @since 1.2 */
1037 EDJE_INPUT_PANEL_LAYOUT_PASSWORD, /**< Like normal, but no auto-correct, no auto-capitalization etc. @since 1.2 */
1038 EDJE_INPUT_PANEL_LAYOUT_DATETIME, /**< Date and time layout @since 1.8 */
1039 EDJE_INPUT_PANEL_LAYOUT_EMOTICON /**< Emoticon layout @since 1.10 */
1040} Edje_Input_Panel_Layout;
1041
1042/*
1043 * @typedef Edje_Input_Hints
1044 * @brief Edje input hints
1045 */
1046typedef enum
1047{
1048 EDJE_INPUT_HINT_NONE = 0, /**< No active hints @since 1.12 */
1049 EDJE_INPUT_HINT_AUTO_COMPLETE = 1 << 0, /**< Suggest word auto completion @since 1.12 */
1050 EDJE_INPUT_HINT_SENSITIVE_DATA = 1 << 1, /**< Typed text should not be stored. @since 1.12 */
1051} Edje_Input_Hints;
1052
1053enum 964enum
1054{ 965{
1055 EDJE_INPUT_PANEL_LAYOUT_NORMAL_VARIATION_NORMAL, /**< The plain normal layout @since 1.12 */ 966 EDJE_INPUT_PANEL_LAYOUT_NORMAL_VARIATION_NORMAL, /**< The plain normal layout @since 1.12 */
@@ -1947,34 +1858,6 @@ EAPI void edje_language_set (const char *locale);
1947 * @{ 1858 * @{
1948 */ 1859 */
1949 1860
1950/**
1951 * Identifiers of Edje message types, which can be sent back and forth
1952 * code and a given Edje object's theme file/group.
1953 *
1954 * @see edje_object_message_send()
1955 * @see edje_object_message_handler_set()
1956 */
1957typedef enum _Edje_Message_Type
1958{
1959 EDJE_MESSAGE_NONE = 0,
1960
1961 EDJE_MESSAGE_SIGNAL = 1, /* DONT USE THIS */
1962
1963 EDJE_MESSAGE_STRING = 2, /**< A message with a string as value. Use #Edje_Message_String structs as message body, for this type. */
1964 EDJE_MESSAGE_INT = 3, /**< A message with an integer number as value. Use #Edje_Message_Int structs as message body, for this type. */
1965 EDJE_MESSAGE_FLOAT = 4, /**< A message with a floating pointer number as value. Use #Edje_Message_Float structs as message body, for this type. */
1966
1967 EDJE_MESSAGE_STRING_SET = 5, /**< A message with a list of strings as value. Use #Edje_Message_String_Set structs as message body, for this type. */
1968 EDJE_MESSAGE_INT_SET = 6, /**< A message with a list of integer numbers as value. Use #Edje_Message_Int_Set structs as message body, for this type. */
1969 EDJE_MESSAGE_FLOAT_SET = 7, /**< A message with a list of floating point numbers as value. Use #Edje_Message_Float_Set structs as message body, for this type. */
1970
1971 EDJE_MESSAGE_STRING_INT = 8, /**< A message with a struct containing a string and an integer number as value. Use #Edje_Message_String_Int structs as message body, for this type. */
1972 EDJE_MESSAGE_STRING_FLOAT = 9, /**< A message with a struct containing a string and a floating point number as value. Use #Edje_Message_String_Float structs as message body, for this type. */
1973
1974 EDJE_MESSAGE_STRING_INT_SET = 10, /**< A message with a struct containing a string and list of integer numbers as value. Use #Edje_Message_String_Int_Set structs as message body, for this type. */
1975 EDJE_MESSAGE_STRING_FLOAT_SET = 11 /**< A message with a struct containing a string and list of floating point numbers as value. Use #Edje_Message_String_Float_Set structs as message body, for this type. */
1976} Edje_Message_Type;
1977
1978typedef struct _Edje_Message_String Edje_Message_String; 1861typedef struct _Edje_Message_String Edje_Message_String;
1979typedef struct _Edje_Message_Int Edje_Message_Int; 1862typedef struct _Edje_Message_Int Edje_Message_Int;
1980typedef struct _Edje_Message_Float Edje_Message_Float; 1863typedef struct _Edje_Message_Float Edje_Message_Float;
diff --git a/src/lib/edje/edje_object.eo b/src/lib/edje/edje_object.eo
index d6065826fe..76355e71b8 100755
--- a/src/lib/edje/edje_object.eo
+++ b/src/lib/edje/edje_object.eo
@@ -480,7 +480,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
480 480
481 @return @c EDJE_EXTERNAL_PARAM_TYPE_MAX on errors, or another value 481 @return @c EDJE_EXTERNAL_PARAM_TYPE_MAX on errors, or another value
482 from #Edje_External_Param_Type on success. */ 482 from #Edje_External_Param_Type on success. */
483 return: Edje_External_Param_Type; 483 return: Edje.External.Param_Type;
484 params { 484 params {
485 @in part: const(char)*; /*@ The part name */ 485 @in part: const(char)*; /*@ The part name */
486 @out param: const(char); /*@ the parameter name to use. */ 486 @out param: const(char); /*@ the parameter name to use. */
@@ -982,7 +982,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
982 982
983 params { 983 params {
984 @in part: const(char)*; /*@ The part name */ 984 @in part: const(char)*; /*@ The part name */
985 @in layout: Edje_Input_Panel_Layout; /*@ layout type */ 985 @in layout: Edje.Input_Panel.Layout; /*@ layout type */
986 } 986 }
987 } 987 }
988 part_text_input_panel_layout_get @const { 988 part_text_input_panel_layout_get @const {
@@ -993,7 +993,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
993 993
994 @see edje_object_part_text_input_panel_layout_set 994 @see edje_object_part_text_input_panel_layout_set
995 @since 1.1 */ 995 @since 1.1 */
996 return: Edje_Input_Panel_Layout; 996 return: Edje.Input_Panel.Layout;
997 params { 997 params {
998 @in part: const(char)*; /*@ The part name */ 998 @in part: const(char)*; /*@ The part name */
999 } 999 }
@@ -1026,7 +1026,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
1026 1026
1027 params { 1027 params {
1028 @in part: const(char)*; /*@ The part name */ 1028 @in part: const(char)*; /*@ The part name */
1029 @in lang: Edje_Input_Panel_Lang; /*@ the language to be set to the input panel. */ 1029 @in lang: Edje.Input_Panel.Lang; /*@ the language to be set to the input panel. */
1030 } 1030 }
1031 } 1031 }
1032 part_text_input_panel_language_get @const { 1032 part_text_input_panel_language_get @const {
@@ -1037,7 +1037,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
1037 1037
1038 @return input panel language type 1038 @return input panel language type
1039 @since 1.2.0 */ 1039 @since 1.2.0 */
1040 return: Edje_Input_Panel_Lang; 1040 return: Edje.Input_Panel.Lang;
1041 params { 1041 params {
1042 @in part: const(char)*; /*@ The part name */ 1042 @in part: const(char)*; /*@ The part name */
1043 } 1043 }
@@ -1317,7 +1317,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
1317 edje_object_message_handler_set(). */ 1317 edje_object_message_handler_set(). */
1318 1318
1319 params { 1319 params {
1320 @in type: Edje_Message_Type; /*@ The type of message to send to @p obj */ 1320 @in type: Edje.Message_Type; /*@ The type of message to send to @p obj */
1321 @in id: int; /*@ A identification number for the message to be sent */ 1321 @in id: int; /*@ A identification number for the message to be sent */
1322 @in msg: void *; /*@ The message's body, a struct depending on @p type */ 1322 @in msg: void *; /*@ The message's body, a struct depending on @p type */
1323 } 1323 }
@@ -1749,7 +1749,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
1749 1749
1750 params { 1750 params {
1751 @in part: const(char)*; /*@ The part name */ 1751 @in part: const(char)*; /*@ The part name */
1752 @in return_key_type: Edje_Input_Panel_Return_Key_Type; /*@ The type of "return" key on the input panel */ 1752 @in return_key_type: Edje.Input_Panel.Return_Key_Type; /*@ The type of "return" key on the input panel */
1753 } 1753 }
1754 } 1754 }
1755 part_text_input_panel_return_key_type_get @const { 1755 part_text_input_panel_return_key_type_get @const {
@@ -1760,7 +1760,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
1760 1760
1761 @return The type of "return" key on the input panel 1761 @return The type of "return" key on the input panel
1762 @since 1.2.0 */ 1762 @since 1.2.0 */
1763 return: Edje_Input_Panel_Return_Key_Type; 1763 return: Edje.Input_Panel.Return_Key_Type;
1764 params { 1764 params {
1765 @in part: const(char)*; /*@ The part name */ 1765 @in part: const(char)*; /*@ The part name */
1766 } 1766 }
@@ -1823,7 +1823,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
1823 return: bool; 1823 return: bool;
1824 params { 1824 params {
1825 @in part: const(char)*; /*@ The part name */ 1825 @in part: const(char)*; /*@ The part name */
1826 @in param: const(Edje_External_Param)*; /*@ the parameter details, including its name, type and 1826 @in param: const(Edje.External.Param)*; /*@ the parameter details, including its name, type and
1827 actual value. This pointer should be valid, and the 1827 actual value. This pointer should be valid, and the
1828 parameter must exist in 1828 parameter must exist in
1829 #Edje_External_Type.parameters_info, with the exact type, 1829 #Edje_External_Type.parameters_info, with the exact type,
@@ -1852,7 +1852,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
1852 return: bool; 1852 return: bool;
1853 params { 1853 params {
1854 @in part: const(char)*; /*@ The part name */ 1854 @in part: const(char)*; /*@ The part name */
1855 @out param: Edje_External_Param; /*@ the parameter details. It is used as both input and 1855 @out param: Edje.External.Param; /*@ the parameter details. It is used as both input and
1856 output variable. This pointer should be valid, and the 1856 output variable. This pointer should be valid, and the
1857 parameter must exist in 1857 parameter must exist in
1858 #Edje_External_Type.parameters_info, with the exact type, 1858 #Edje_External_Type.parameters_info, with the exact type,
@@ -2019,7 +2019,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
2019 2019
2020 params { 2020 params {
2021 @in part: const(char)*; /*@ The part name */ 2021 @in part: const(char)*; /*@ The part name */
2022 @in input_hints: Edje_Input_Hints; /*@ input hints */ 2022 @in input_hints: Edje.Input_Hints; /*@ input hints */
2023 } 2023 }
2024 } 2024 }
2025 part_text_input_hint_get @const { 2025 part_text_input_hint_get @const {
@@ -2028,7 +2028,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
2028 2028
2029 @return The value of input hint 2029 @return The value of input hint
2030 @since 1.12.0 */ 2030 @since 1.12.0 */
2031 return: Edje_Input_Hints; 2031 return: Edje.Input_Hints;
2032 params { 2032 params {
2033 @in part: const(char)*; /*@ The part name */ 2033 @in part: const(char)*; /*@ The part name */
2034 } 2034 }
diff --git a/src/lib/edje/edje_types.eot b/src/lib/edje/edje_types.eot
index eb2dabd683..d17a3d4ffc 100644
--- a/src/lib/edje/edje_types.eot
+++ b/src/lib/edje/edje_types.eot
@@ -40,6 +40,98 @@ enum Edje.Text.Autocapital_Type {
40 allcharacter [[All characters mode value]] 40 allcharacter [[All characters mode value]]
41} 41}
42 42
43enum Edje.Input_Hints {
44 legacy: Edje_Input_Hint;
45
46 none = 0, [[No active hints @since 1.12]]
47 auto_complete = 1 << 0, [[Suggest word auto completion @since 1.12]]
48 sensitive_data = 1 << 1 [[Typed text should not be stored. @since 1.12]]
49}
50
51enum Edje.Input_Panel.Lang {
52 automatic, [[Automatic @since 1.2]]
53 alphabet [[Alphabet @since 1.2]]
54}
55
56enum Edje.Input_Panel.Return_Key_Type {
57 default, [[Default @since 1.2]]
58 done, [[Done @since 1.2]]
59 go, [[Go @since 1.2]]
60 join, [[Join @since 1.2]]
61 login, [[Login @since 1.2]]
62 next, [[Next @since 1.2]]
63 search, [[Search or magnifier icon @since 1.2]]
64 send, [[Send @since 1.2]]
65 signin [[Sign-in @since 1.8]]
66}
67
68enum Edje.Input_Panel.Layout {
69 normal, [[Default layout]]
70 number, [[Number layout]]
71 email, [[Email layout]]
72 url, [[URL layout]]
73 phonenumber, [[Phone Number layout]]
74 ip, [[IP layout]]
75 month, [[Month layout]]
76 numberonly, [[Number Only layout]]
77 invalid, [[Never use this]]
78 hex, [[Hexadecimal layout @since 1.2]]
79 terminal, [[Command-line terminal layout including esc, alt, ctrl key, so on (no auto-correct, no auto-capitalization) @since 1.2]]
80 password, [[Like normal, but no auto-correct, no auto-capitalization etc. @since 1.2]]
81 datetime, [[Date and time layout @since 1.8]]
82 emoticon [[Emoticon layout @since 1.10]]
83}
84
85enum Edje.External.Param_Type {
86 [[The possible types the parameters of an EXTERNAL part can be.]]
87
88 int, /**< Parameter value is an integer. */
89 double, /**< Parameter value is a double. */
90 string, /**< Parameter value is a string. */
91 bool, /**< Parameter value is boolean. */
92 choice, /**< Parameter value is one of a set of
93 predefined string choices. */
94 max /**< Sentinel. Don't use. */
95}
96
97struct Edje.External.Param {
98 [[Struct that holds parameters for parts of type EXTERNAL.]]
99 name: const(char) *; [[The name of the parameter.]]
100 type: Edje.External.Param_Type; [[The type of the parameter. This defines
101 which of the next three variables holds
102 the value for it.]]
103 // XXX these could be in a union, but eet doesn't support them (or does it?)
104 i: int; [[Used by both integer and boolean]]
105 d: double; [[Used by double]]
106 s: const(char) *; [[Used by both string and choice]]
107}
108
109enum Edje.Message_Type {
110 [[Identifiers of Edje message types, which can be sent back and forth code and a given Edje object's theme file/group.
111 @Edje.Object.message_send() @Edje.Object.message_handler_set()
112 ]]
113 legacy: Edje_Message;
114
115 none = 0,
116
117 signal = 1, [[DONT USE THIS]]
118
119 string = 2, [[A message with a string as value. Use #Edje_Message_String structs as message body, for this type.]]
120 int = 3, [[A message with an integer number as value. Use #Edje_Message_Int structs as message body, for this type.]]
121 float = 4, [[A message with a floating pointer number as value. Use #Edje_Message_Float structs as message body, for this type.]]
122
123 string_set = 5, [[A message with a list of strings as value. Use #Edje_Message_String_Set structs as message body, for this type.]]
124 int_set = 6, [[A message with a list of integer numbers as value. Use #Edje_Message_Int_Set structs as message body, for this type.]]
125 float_set = 7, [[A message with a list of floating point numbers as value. Use #Edje_Message_Float_Set structs as message body, for this type.]]
126
127 string_int = 8, [[A message with a struct containing a string and an integer number as value. Use #Edje_Message_String_Int structs as message body, for this type.]]
128 string_float = 9, [[A message with a struct containing a string and a floating point number as value. Use #Edje_Message_String_Float structs as message body, for this type.]]
129
130 string_int_set = 10, [[A message with a struct containing a string and list of integer numbers as value. Use #Edje_Message_String_Int_Set structs as message body, for this type.]]
131 string_float_set = 11 [[A message with a struct containing a string and list of floating point numbers as value. Use #Edje_Message_String_Float_Set structs as message body, for this type.]]
132}
133
134
43struct Edje.Perspective; [[Perspective info for maps inside edje objects]] 135struct Edje.Perspective; [[Perspective info for maps inside edje objects]]
44 136
45/* FIXME-cb: Ignore cb types that should be fixed. */ 137/* FIXME-cb: Ignore cb types that should be fixed. */