diff --git a/src/lib/edje/Edje_Common.h b/src/lib/edje/Edje_Common.h index 9479facfb1..414820ca7f 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); * @{ */ -typedef struct _Edje_Message_String Edje_Message_String; -typedef struct _Edje_Message_Int Edje_Message_Int; -typedef struct _Edje_Message_Float Edje_Message_Float; -typedef struct _Edje_Message_String_Set Edje_Message_String_Set; -typedef struct _Edje_Message_Int_Set Edje_Message_Int_Set; -typedef struct _Edje_Message_Float_Set Edje_Message_Float_Set; -typedef struct _Edje_Message_String_Int Edje_Message_String_Int; -typedef struct _Edje_Message_String_Float Edje_Message_String_Float; -typedef struct _Edje_Message_String_Int_Set Edje_Message_String_Int_Set; -typedef struct _Edje_Message_String_Float_Set Edje_Message_String_Float_Set; - -struct _Edje_Message_String -{ - char *str; /**< The message's string pointer */ -}; /**< Structure passed as value on #EDJE_MESSAGE_STRING messages. The string in it is automatically freed Edje if passed to you by Edje */ - -struct _Edje_Message_Int -{ - int val; /**< The message's value */ -}; /**< Structure passed as value on #EDJE_MESSAGE_INT messages */ - -struct _Edje_Message_Float -{ - double val; /**< The message's value */ -}; /**< Structure passed as value on #EDJE_MESSAGE_FLOAT messages */ - -struct _Edje_Message_String_Set -{ - int count; /**< The size of the message's array (may be greater than 1) */ - char *str[1]; /**< The message's @b array of string pointers */ -}; /**< Structure passed as value on #EDJE_MESSAGE_STRING_SET messages. The array in it is automatically freed if passed to you by Edje */ - -struct _Edje_Message_Int_Set -{ - int count; /**< The size of the message's array (may be greater than 1) */ - int val[1]; /**< The message's @b array of integers */ -}; /**< Structure passed as value on #EDJE_MESSAGE_INT_SET messages. The array in it is automatically freed if passed to you by Edje */ - -struct _Edje_Message_Float_Set -{ - int count; /**< The size of the message's array (may be greater than 1) */ - double val[1]; /**< The message's @b array of floats */ -}; /**< Structure passed as value on #EDJE_MESSAGE_FLOAT_SET messages. The array in it is automatically freed if passed to you by Edje */ - -struct _Edje_Message_String_Int -{ - char *str; /**< The message's string value */ - int val; /**< The message's integer value */ -}; /**< Structure passed as value on #EDJE_MESSAGE_STRING_INT messages. The string in it is automatically freed if passed to you by Edje */ - -struct _Edje_Message_String_Float -{ - char *str; /**< The message's string value */ - double val; /**< The message's float value */ -}; /**< Structure passed as value on #EDJE_MESSAGE_STRING_FLOAT messages. The string in it is automatically freed if passed to you by Edje */ - -struct _Edje_Message_String_Int_Set -{ - char *str; /**< The message's string value */ - int count; /**< The size of the message's array (may be greater than 1) */ - int val[1]; /**< The message's @b array of integers */ -}; /**< 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 */ - -struct _Edje_Message_String_Float_Set -{ - char *str; /**< The message's string value */ - int count; /**< The size of the message's array (may be greater than 1) */ - double val[1]; /**< The message's @b array of floats */ -}; /**< 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 */ - -typedef 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. */ - /** * @brief Processes all queued up edje messages. * diff --git a/src/lib/edje/Edje_Legacy.h b/src/lib/edje/Edje_Legacy.h index 0512f184b0..7bfeb9bfbc 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 EAPI void *edje_object_signal_callback_del_full(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func, void *data); +/** + * @ingroup Edje_Object_Communication_Interface_Message + * + * @{ + */ + +typedef struct _Edje_Message_String Edje_Message_String; +typedef struct _Edje_Message_Int Edje_Message_Int; +typedef struct _Edje_Message_Float Edje_Message_Float; +typedef struct _Edje_Message_String_Set Edje_Message_String_Set; +typedef struct _Edje_Message_Int_Set Edje_Message_Int_Set; +typedef struct _Edje_Message_Float_Set Edje_Message_Float_Set; +typedef struct _Edje_Message_String_Int Edje_Message_String_Int; +typedef struct _Edje_Message_String_Float Edje_Message_String_Float; +typedef struct _Edje_Message_String_Int_Set Edje_Message_String_Int_Set; +typedef struct _Edje_Message_String_Float_Set Edje_Message_String_Float_Set; + +struct _Edje_Message_String +{ + char *str; /**< The message's string pointer */ +}; /**< Structure passed as value on #EDJE_MESSAGE_STRING messages. The string in it is automatically freed Edje if passed to you by Edje */ + +struct _Edje_Message_Int +{ + int val; /**< The message's value */ +}; /**< Structure passed as value on #EDJE_MESSAGE_INT messages */ + +struct _Edje_Message_Float +{ + double val; /**< The message's value */ +}; /**< Structure passed as value on #EDJE_MESSAGE_FLOAT messages */ + +struct _Edje_Message_String_Set +{ + int count; /**< The size of the message's array (may be greater than 1) */ + char *str[1]; /**< The message's @b array of string pointers */ +}; /**< Structure passed as value on #EDJE_MESSAGE_STRING_SET messages. The array in it is automatically freed if passed to you by Edje */ + +struct _Edje_Message_Int_Set +{ + int count; /**< The size of the message's array (may be greater than 1) */ + int val[1]; /**< The message's @b array of integers */ +}; /**< Structure passed as value on #EDJE_MESSAGE_INT_SET messages. The array in it is automatically freed if passed to you by Edje */ + +struct _Edje_Message_Float_Set +{ + int count; /**< The size of the message's array (may be greater than 1) */ + double val[1]; /**< The message's @b array of floats */ +}; /**< Structure passed as value on #EDJE_MESSAGE_FLOAT_SET messages. The array in it is automatically freed if passed to you by Edje */ + +struct _Edje_Message_String_Int +{ + char *str; /**< The message's string value */ + int val; /**< The message's integer value */ +}; /**< Structure passed as value on #EDJE_MESSAGE_STRING_INT messages. The string in it is automatically freed if passed to you by Edje */ + +struct _Edje_Message_String_Float +{ + char *str; /**< The message's string value */ + double val; /**< The message's float value */ +}; /**< Structure passed as value on #EDJE_MESSAGE_STRING_FLOAT messages. The string in it is automatically freed if passed to you by Edje */ + +struct _Edje_Message_String_Int_Set +{ + char *str; /**< The message's string value */ + int count; /**< The size of the message's array (may be greater than 1) */ + int val[1]; /**< The message's @b array of integers */ +}; /**< 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 */ + +struct _Edje_Message_String_Float_Set +{ + char *str; /**< The message's string value */ + int count; /**< The size of the message's array (may be greater than 1) */ + double val[1]; /**< The message's @b array of floats */ +}; /**< 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 */ + /** Identifiers of Edje message types, which can be sent back and forth code * and a given Edje object's theme file/group. * @@ -146,6 +222,8 @@ typedef enum * as message body, for this type. */ } Edje_Message_Type; +typedef 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. */ + /** * @brief Sets an Edje message handler function for a given Edje object. * @@ -185,6 +263,10 @@ EAPI void edje_object_message_handler_set(Edje_Object *obj, Edje_Message_Handler */ EAPI void edje_object_message_send(Edje_Object *obj, Edje_Message_Type type, int id, void *msg); +/** + * @} + */ + /** * @deprecated use evas_object_size_hint_min_set() instead. * @brief Sets the object minimum size.