summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-05-26 10:11:20 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-05-29 10:49:16 +0900
commit3cc8bc21739ab5ab5c09fec3934176aa3b53bea8 (patch)
tree45a240edeaae2f8ababdc1d3bba830aff5a526c7
parent5540ab8c6fdb0f6a96d16af31d5a0c8ca8bd1c3e (diff)
edje: Move message structs to legacy header
-rw-r--r--src/lib/edje/Edje_Common.h72
-rw-r--r--src/lib/edje/Edje_Legacy.h82
2 files changed, 82 insertions, 72 deletions
diff --git a/src/lib/edje/Edje_Common.h b/src/lib/edje/Edje_Common.h
index 9479fac..414820c 100644
--- a/src/lib/edje/Edje_Common.h
+++ b/src/lib/edje/Edje_Common.h
@@ -2054,78 +2054,6 @@ EAPI double edje_transition_duration_factor_get (void);
2054 * @{ 2054 * @{
2055 */ 2055 */
2056 2056
2057typedef struct _Edje_Message_String Edje_Message_String;
2058typedef struct _Edje_Message_Int Edje_Message_Int;
2059typedef struct _Edje_Message_Float Edje_Message_Float;
2060typedef struct _Edje_Message_String_Set Edje_Message_String_Set;
2061typedef struct _Edje_Message_Int_Set Edje_Message_Int_Set;
2062typedef struct _Edje_Message_Float_Set Edje_Message_Float_Set;
2063typedef struct _Edje_Message_String_Int Edje_Message_String_Int;
2064typedef struct _Edje_Message_String_Float Edje_Message_String_Float;
2065typedef struct _Edje_Message_String_Int_Set Edje_Message_String_Int_Set;
2066typedef struct _Edje_Message_String_Float_Set Edje_Message_String_Float_Set;
2067
2068struct _Edje_Message_String
2069{
2070 char *str; /**< The message's string pointer */
2071}; /**< Structure passed as value on #EDJE_MESSAGE_STRING messages. The string in it is automatically freed Edje if passed to you by Edje */
2072
2073struct _Edje_Message_Int
2074{
2075 int val; /**< The message's value */
2076}; /**< Structure passed as value on #EDJE_MESSAGE_INT messages */
2077
2078struct _Edje_Message_Float
2079{
2080 double val; /**< The message's value */
2081}; /**< Structure passed as value on #EDJE_MESSAGE_FLOAT messages */
2082
2083struct _Edje_Message_String_Set
2084{
2085 int count; /**< The size of the message's array (may be greater than 1) */
2086 char *str[1]; /**< The message's @b array of string pointers */
2087}; /**< Structure passed as value on #EDJE_MESSAGE_STRING_SET messages. The array in it is automatically freed if passed to you by Edje */
2088
2089struct _Edje_Message_Int_Set
2090{
2091 int count; /**< The size of the message's array (may be greater than 1) */
2092 int val[1]; /**< The message's @b array of integers */
2093}; /**< Structure passed as value on #EDJE_MESSAGE_INT_SET messages. The array in it is automatically freed if passed to you by Edje */
2094
2095struct _Edje_Message_Float_Set
2096{
2097 int count; /**< The size of the message's array (may be greater than 1) */
2098 double val[1]; /**< The message's @b array of floats */
2099}; /**< Structure passed as value on #EDJE_MESSAGE_FLOAT_SET messages. The array in it is automatically freed if passed to you by Edje */
2100
2101struct _Edje_Message_String_Int
2102{
2103 char *str; /**< The message's string value */
2104 int val; /**< The message's integer value */
2105}; /**< Structure passed as value on #EDJE_MESSAGE_STRING_INT messages. The string in it is automatically freed if passed to you by Edje */
2106
2107struct _Edje_Message_String_Float
2108{
2109 char *str; /**< The message's string value */
2110 double val; /**< The message's float value */
2111}; /**< Structure passed as value on #EDJE_MESSAGE_STRING_FLOAT messages. The string in it is automatically freed if passed to you by Edje */
2112
2113struct _Edje_Message_String_Int_Set
2114{
2115 char *str; /**< The message's string value */
2116 int count; /**< The size of the message's array (may be greater than 1) */
2117 int val[1]; /**< The message's @b array of integers */
2118}; /**< Structure passed as value on #EDJE_MESSAGE_STRING_INT_SET messages. The array and string in it are automatically freed if passed to you by Edje */
2119
2120struct _Edje_Message_String_Float_Set
2121{
2122 char *str; /**< The message's string value */
2123 int count; /**< The size of the message's array (may be greater than 1) */
2124 double val[1]; /**< The message's @b array of floats */
2125}; /**< Structure passed as value on #EDJE_MESSAGE_STRING_FLOAT_SET messages. The array and string in it are automatically freed if passed to you by Edje */
2126
2127typedef void (*Edje_Message_Handler_Cb) (void *data, Evas_Object *obj, Edje_Message_Type type, int id, void *msg); /**< Edje message handler callback functions's prototype definition. @c data will have the auxiliary data pointer set at the time the callback registration. @c obj will be a pointer the Edje object where the message comes from. @c type will identify the type of the given message and @c msg will be a pointer the message's contents, de facto, which depend on @c type. */
2128
2129/** 2057/**
2130 * @brief Processes all queued up edje messages. 2058 * @brief Processes all queued up edje messages.
2131 * 2059 *
diff --git a/src/lib/edje/Edje_Legacy.h b/src/lib/edje/Edje_Legacy.h
index 0512f18..7bfeb9b 100644
--- a/src/lib/edje/Edje_Legacy.h
+++ b/src/lib/edje/Edje_Legacy.h
@@ -98,6 +98,82 @@ EAPI void *edje_object_signal_callback_del (Evas_Object *obj, const char
98EAPI void *edje_object_signal_callback_del_full(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func, void *data); 98EAPI void *edje_object_signal_callback_del_full(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func, void *data);
99 99
100 100
101/**
102 * @ingroup Edje_Object_Communication_Interface_Message
103 *
104 * @{
105 */
106
107typedef struct _Edje_Message_String Edje_Message_String;
108typedef struct _Edje_Message_Int Edje_Message_Int;
109typedef struct _Edje_Message_Float Edje_Message_Float;
110typedef struct _Edje_Message_String_Set Edje_Message_String_Set;
111typedef struct _Edje_Message_Int_Set Edje_Message_Int_Set;
112typedef struct _Edje_Message_Float_Set Edje_Message_Float_Set;
113typedef struct _Edje_Message_String_Int Edje_Message_String_Int;
114typedef struct _Edje_Message_String_Float Edje_Message_String_Float;
115typedef struct _Edje_Message_String_Int_Set Edje_Message_String_Int_Set;
116typedef struct _Edje_Message_String_Float_Set Edje_Message_String_Float_Set;
117
118struct _Edje_Message_String
119{
120 char *str; /**< The message's string pointer */
121}; /**< Structure passed as value on #EDJE_MESSAGE_STRING messages. The string in it is automatically freed Edje if passed to you by Edje */
122
123struct _Edje_Message_Int
124{
125 int val; /**< The message's value */
126}; /**< Structure passed as value on #EDJE_MESSAGE_INT messages */
127
128struct _Edje_Message_Float
129{
130 double val; /**< The message's value */
131}; /**< Structure passed as value on #EDJE_MESSAGE_FLOAT messages */
132
133struct _Edje_Message_String_Set
134{
135 int count; /**< The size of the message's array (may be greater than 1) */
136 char *str[1]; /**< The message's @b array of string pointers */
137}; /**< Structure passed as value on #EDJE_MESSAGE_STRING_SET messages. The array in it is automatically freed if passed to you by Edje */
138
139struct _Edje_Message_Int_Set
140{
141 int count; /**< The size of the message's array (may be greater than 1) */
142 int val[1]; /**< The message's @b array of integers */
143}; /**< Structure passed as value on #EDJE_MESSAGE_INT_SET messages. The array in it is automatically freed if passed to you by Edje */
144
145struct _Edje_Message_Float_Set
146{
147 int count; /**< The size of the message's array (may be greater than 1) */
148 double val[1]; /**< The message's @b array of floats */
149}; /**< Structure passed as value on #EDJE_MESSAGE_FLOAT_SET messages. The array in it is automatically freed if passed to you by Edje */
150
151struct _Edje_Message_String_Int
152{
153 char *str; /**< The message's string value */
154 int val; /**< The message's integer value */
155}; /**< Structure passed as value on #EDJE_MESSAGE_STRING_INT messages. The string in it is automatically freed if passed to you by Edje */
156
157struct _Edje_Message_String_Float
158{
159 char *str; /**< The message's string value */
160 double val; /**< The message's float value */
161}; /**< Structure passed as value on #EDJE_MESSAGE_STRING_FLOAT messages. The string in it is automatically freed if passed to you by Edje */
162
163struct _Edje_Message_String_Int_Set
164{
165 char *str; /**< The message's string value */
166 int count; /**< The size of the message's array (may be greater than 1) */
167 int val[1]; /**< The message's @b array of integers */
168}; /**< Structure passed as value on #EDJE_MESSAGE_STRING_INT_SET messages. The array and string in it are automatically freed if passed to you by Edje */
169
170struct _Edje_Message_String_Float_Set
171{
172 char *str; /**< The message's string value */
173 int count; /**< The size of the message's array (may be greater than 1) */
174 double val[1]; /**< The message's @b array of floats */
175}; /**< Structure passed as value on #EDJE_MESSAGE_STRING_FLOAT_SET messages. The array and string in it are automatically freed if passed to you by Edje */
176
101/** Identifiers of Edje message types, which can be sent back and forth code 177/** Identifiers of Edje message types, which can be sent back and forth code
102 * and a given Edje object's theme file/group. 178 * and a given Edje object's theme file/group.
103 * 179 *
@@ -146,6 +222,8 @@ typedef enum
146 * as message body, for this type. */ 222 * as message body, for this type. */
147} Edje_Message_Type; 223} Edje_Message_Type;
148 224
225typedef void (*Edje_Message_Handler_Cb) (void *data, Evas_Object *obj, Edje_Message_Type type, int id, void *msg); /**< Edje message handler callback functions's prototype definition. @c data will have the auxiliary data pointer set at the time the callback registration. @c obj will be a pointer the Edje object where the message comes from. @c type will identify the type of the given message and @c msg will be a pointer the message's contents, de facto, which depend on @c type. */
226
149/** 227/**
150 * @brief Sets an Edje message handler function for a given Edje object. 228 * @brief Sets an Edje message handler function for a given Edje object.
151 * 229 *
@@ -185,6 +263,10 @@ EAPI void edje_object_message_handler_set(Edje_Object *obj, Edje_Message_Handler
185 */ 263 */
186EAPI void edje_object_message_send(Edje_Object *obj, Edje_Message_Type type, int id, void *msg); 264EAPI void edje_object_message_send(Edje_Object *obj, Edje_Message_Type type, int id, void *msg);
187 265
266/**
267 * @}
268 */
269
188 /** 270 /**
189 * @deprecated use evas_object_size_hint_min_set() instead. 271 * @deprecated use evas_object_size_hint_min_set() instead.
190 * @brief Sets the object minimum size. 272 * @brief Sets the object minimum size.