kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

edje: Rename EAPI macro to EDJE_API in Edje library 

Patch from a series of patches to rename EAPI symbols to specific
library DSOs.

EAPI was designed to be able to pass
```__attribute__ ((visibility ("default")))``` for symbols with
GCC, which would mean that even if -fvisibility=hidden was used
when compiling the library, the needed symbols would get exported.

MSVC __almost__ works like GCC (or mingw) in which you can
declare everything as export and it will just work (slower, but
it will work). But there's a caveat: global variables will not
work the same way for MSVC, but works for mingw and GCC.

For global variables (as opposed to functions), MSVC requires
correct DSO visibility for MSVC: instead of declaring a symbol as
export for everything, you need to declare it as import when
importing from another DSO and export when defining it locally.

With current EAPI definitions, we get the following example
working in mingw and MSVC (observe it doesn't define any global
variables as exported symbols).

Example 1:
dll1:
```
EAPI void foo(void);

EAPI void bar()
{
  foo();
}
```
dll2:
```
EAPI void foo()
{
  printf ("foo\n");
}
```

This works fine with API defined as __declspec(dllexport) in both
cases and for gcc defining as
```__atttribute__((visibility("default")))```.

However, the following:
Example 2:

dll1:

```
EAPI extern int foo;
EAPI void foobar(void);

EAPI void bar()
{
  foo = 5;
  foobar();
}
```

dll2:

```
EAPI int foo = 0;
EAPI void foobar()
{
  printf ("foo %d\n", foo);
}
```

This will work on mingw but will not work for MSVC. And that's why
EAPI is the only solution that worked for MSVC.

Co-authored-by: João Paulo Taylor Ienczak Zanette <jpaulotiz@gmail.com>
Co-authored-by: Ricardo Campos <ricardo.campos@expertise.dev>
Co-authored-by: Lucas Cavalcante de Sousa <lucks.sousa@gmail.com>
This commit is contained in:
Felipe Magno de Almeida 2020-10-13 13:00:52 -03:00
parent a594413ccb
commit 62f87b69da
27 changed files with 1676 additions and 1756 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/lib/edje/Edje.h
View File

@ -216,35 +216,7 @@ param in edje programs
#include <Eo.h>
#include <Efl_Config.h>
#ifdef EAPI
# undef EAPI
#endif
#ifdef _WIN32
# ifdef EFL_BUILD
# ifdef DLL_EXPORT
# define EAPI __declspec(dllexport)
# else
# define EAPI
# endif
# else
# define EAPI __declspec(dllimport)
# endif
# define EAPI_WEAK
#else
# ifdef __GNUC__
# if __GNUC__ >= 4
# define EAPI __attribute__ ((visibility("default")))
# define EAPI_WEAK __attribute__ ((weak))
# else
# define EAPI
# define EAPI_WEAK
# endif
# else
# define EAPI
# define EAPI_WEAK
# endif
#endif
#include <edje_api.h>
#ifdef __cplusplus
extern "C" {
@ -263,7 +235,4 @@ extern "C" {
}
#endif
#undef EAPI
#define EAPI
#endif

148
src/lib/edje/Edje_Common.h
View File

@ -162,7 +162,7 @@ typedef struct _Edje_Version
* Current Edje Version info
*
*/
EAPI extern Edje_Version *edje_version;
EDJE_API extern Edje_Version *edje_version;
#ifndef _EDJE_OBJECT_EO_CLASS_TYPE
#define _EDJE_OBJECT_EO_CLASS_TYPE
@ -246,7 +246,7 @@ struct _Edje_Size_Class
* (alive) edje objects.
*
*/
EAPI void edje_message_signal_process (void);
EDJE_API void edje_message_signal_process (void);
/**
* @}
@ -282,7 +282,7 @@ typedef Efl_Signal_Cb Edje_Signal_Cb;
* @see edje_object_signal_callback_add() for more on Edje signals.
* @since 1.1.0
*/
EAPI void * edje_object_signal_callback_extra_data_get(void);
EDJE_API void * edje_object_signal_callback_extra_data_get(void);
#ifdef EFL_BETA_API_SUPPORT
@ -302,7 +302,7 @@ EAPI void * edje_object_signal_callback_extra_data_get(void);
* @see edje_object_signal_callback_add() for more on Edje signals.
* @since 1.21
*/
EAPI void *edje_object_signal_callback_seat_data_get(void);
EDJE_API void *edje_object_signal_callback_seat_data_get(void);
#endif
@ -353,7 +353,7 @@ typedef enum _Edje_Channel
*
* @since 1.9
*/
EAPI void edje_audio_channel_mute_set(Edje_Channel channel, Eina_Bool mute);
EDJE_API void edje_audio_channel_mute_set(Edje_Channel channel, Eina_Bool mute);
/**
* @brief Gets the mute state of the given channel.
@ -365,7 +365,7 @@ EAPI void edje_audio_channel_mute_set(Edje_Channel channel, Eina_Bool mute);
*
* @since 1.9
*/
EAPI Eina_Bool edje_audio_channel_mute_get(Edje_Channel channel);
EDJE_API Eina_Bool edje_audio_channel_mute_get(Edje_Channel channel);
/**
* @}
@ -403,7 +403,7 @@ EAPI Eina_Bool edje_audio_channel_mute_get(Edje_Channel channel);
* @see eet_init()
*
*/
EAPI int edje_init (void);
EDJE_API int edje_init (void);
/**
* @brief Shuts down the Edje library.
@ -424,7 +424,7 @@ EAPI int edje_init (void);
* @see eet_shutdown()
*
*/
EAPI int edje_shutdown (void);
EDJE_API int edje_shutdown (void);
/**
* @brief Sets the edje append fontset.
@ -434,7 +434,7 @@ EAPI int edje_shutdown (void);
* This function sets the edje append fontset.
*
*/
EAPI void edje_fontset_append_set (const char *fonts);
EDJE_API void edje_fontset_append_set (const char *fonts);
/**
* @brief Gets data from the file level data block of an edje mapped file.
@ -453,7 +453,7 @@ EAPI void edje_fontset_append_set (const char *fonts);
*
* Then, edje_file_data_get("test.edj", "key1") will return "value1"
*/
EAPI char *edje_mmap_data_get(const Eina_File *f, const char *key);
EDJE_API char *edje_mmap_data_get(const Eina_File *f, const char *key);
/**
* @brief Gets data from the file level data block of an edje file.
@ -474,7 +474,7 @@ EAPI char *edje_mmap_data_get(const Eina_File *f, const char *key);
*
* @see edje_mmap_data_get()
*/
EAPI char *edje_file_data_get (const char *file, const char *key);
EDJE_API char *edje_file_data_get (const char *file, const char *key);
/**
* @brief Loads a new module in Edje.
@ -485,7 +485,7 @@ EAPI char *edje_file_data_get (const char *file, const char
* So, when a module is loaded, its functionality should be available for use.
*
*/
EAPI Eina_Bool edje_module_load (const char *module);
EDJE_API Eina_Bool edje_module_load (const char *module);
/**
* @brief Retrieves all modules that can be loaded.
@ -496,7 +496,7 @@ EAPI Eina_Bool edje_module_load (const char *module
* @see edje_module_load().
*
*/
EAPI const Eina_List *edje_available_modules_get (void);
EDJE_API const Eina_List *edje_available_modules_get (void);
/**
* @brief Gets the edje append fontset.
@ -509,7 +509,7 @@ EAPI const Eina_List *edje_available_modules_get (void);
* @see edje_fontset_append_set().
*
*/
EAPI const char *edje_fontset_append_get (void);
EDJE_API const char *edje_fontset_append_get (void);
/**
* @brief Sets the file cache size.
@ -524,7 +524,7 @@ EAPI const char *edje_fontset_append_get (void);
* @see edje_file_cache_flush()
*
*/
EAPI void edje_file_cache_set (int count);
EDJE_API void edje_file_cache_set (int count);
/**
* @brief Returns the file cache size.
@ -538,7 +538,7 @@ EAPI void edje_file_cache_set (int count);
* @see edje_file_cache_flush()
*
*/
EAPI int edje_file_cache_get (void);
EDJE_API int edje_file_cache_get (void);
/**
* @brief Cleans the file cache.
@ -550,7 +550,7 @@ EAPI int edje_file_cache_get (void);
* @see edje_file_cache_get()
*
*/
EAPI void edje_file_cache_flush (void);
EDJE_API void edje_file_cache_flush (void);
/**
* @brief Sets the collection cache size.
@ -566,7 +566,7 @@ EAPI void edje_file_cache_flush (void);
* @see edje_collection_cache_flush()
*
*/
EAPI void edje_collection_cache_set (int count);
EDJE_API void edje_collection_cache_set (int count);
/**
* @brief Returns the collection cache size.
@ -580,7 +580,7 @@ EAPI void edje_collection_cache_set (int count);
* @see edje_collection_cache_flush()
*
*/
EAPI int edje_collection_cache_get (void);
EDJE_API int edje_collection_cache_get (void);
/**
* @brief Cleans the collection cache.
@ -592,7 +592,7 @@ EAPI int edje_collection_cache_get (void);
* @see edje_collection_cache_get()
*
*/
EAPI void edje_collection_cache_flush (void);
EDJE_API void edje_collection_cache_flush (void);
/**
* @}
@ -666,7 +666,7 @@ typedef struct _Edje_External_Param
* @param type the identifier to convert.
* @return the string with the string representation, or @c "(unknown)".
*/
EAPI const char *edje_external_param_type_str(Edje_External_Param_Type type) EINA_PURE;
EDJE_API const char *edje_external_param_type_str(Edje_External_Param_Type type) EINA_PURE;
/**
* Helper macro to indicate an EXTERNAL's integer parameter is undefined.
@ -912,7 +912,7 @@ typedef struct _Edje_External_Type_Info Edje_External_Type_Info;
*
* @see edje_external_type_array_register()
*/
EAPI Eina_Bool edje_external_type_register (const char *type_name, const Edje_External_Type *type_info);
EDJE_API Eina_Bool edje_external_type_register (const char *type_name, const Edje_External_Type *type_info);
/**
* @brief Unregisters a previously registered EXTERNAL type.
@ -925,7 +925,7 @@ EAPI Eina_Bool edje_external_type_register (const char *type_name
*
* @see edje_external_type_array_unregister()
*/
EAPI Eina_Bool edje_external_type_unregister (const char *type_name);
EDJE_API Eina_Bool edje_external_type_unregister (const char *type_name);
/**
* @brief Registers a batch of types and their information.
@ -950,7 +950,7 @@ EAPI Eina_Bool edje_external_type_unregister (const char *type_name
*
* @see edje_external_type_register()
*/
EAPI void edje_external_type_array_register (const Edje_External_Type_Info *array);
EDJE_API void edje_external_type_array_register (const Edje_External_Type_Info *array);
/**
* @brief Unregisters a batch of given external type previously registered.
@ -960,7 +960,7 @@ EAPI void edje_external_type_array_register (const Edje_External_T
*
* @see edje_external_type_unregister()
*/
EAPI void edje_external_type_array_unregister (const Edje_External_Type_Info *array);
EDJE_API void edje_external_type_array_unregister (const Edje_External_Type_Info *array);
/**
* @brief Returns the current ABI version for Edje_External_Type structure.
@ -981,7 +981,7 @@ EAPI void edje_external_type_array_unregister (const Edje_External_T
* @return The external ABI version the Edje library was compiled with. That
* is, the value #EDJE_EXTERNAL_TYPE_ABI_VERSION had at that moment.
*/
EAPI unsigned int edje_external_type_abi_version_get (void) EINA_CONST;
EDJE_API unsigned int edje_external_type_abi_version_get (void) EINA_CONST;
/**
*
@ -1026,7 +1026,7 @@ EAPI unsigned int edje_external_type_abi_version_get (void) EINA_CONST;
*
* @endcode
*/
EAPI Eina_Iterator *edje_external_iterator_get (void);
EDJE_API Eina_Iterator *edje_external_iterator_get (void);
/**
* @brief Convenience function to find a specific parameter in a list of them.
@ -1036,7 +1036,7 @@ EAPI Eina_Iterator *edje_external_iterator_get (void);
*
* @return The matching #Edje_External_Param or NULL if it's not found.
*/
EAPI Edje_External_Param *edje_external_param_find (const Eina_List *params, const char *key);
EDJE_API Edje_External_Param *edje_external_param_find (const Eina_List *params, const char *key);
/**
* @brief Gets the value of the given parameter of integer type.
@ -1054,7 +1054,7 @@ EAPI Edje_External_Param *edje_external_param_find (const Eina_
* @return @c EINA_TRUE if the parameter was found and is of integer type,
* @c EINA_FALSE otherwise.
*/
EAPI Eina_Bool edje_external_param_int_get (const Eina_List *params, const char *key, int *ret);
EDJE_API Eina_Bool edje_external_param_int_get (const Eina_List *params, const char *key, int *ret);
/**
* @brief Gets the value of the given parameter of double type.
@ -1072,7 +1072,7 @@ EAPI Eina_Bool edje_external_param_int_get (const Eina_
* @return @c EINA_TRUE if the parameter was found and is of double type,
* @c EINA_FALSE otherwise.
*/
EAPI Eina_Bool edje_external_param_double_get (const Eina_List *params, const char *key, double *ret);
EDJE_API Eina_Bool edje_external_param_double_get (const Eina_List *params, const char *key, double *ret);
/**
* @brief Gets the value of the given parameter of string type.
@ -1092,7 +1092,7 @@ EAPI Eina_Bool edje_external_param_double_get (const Eina_
* @return @c EINA_TRUE if the parameter was found and is of string type,
* @c EINA_FALSE otherwise.
*/
EAPI Eina_Bool edje_external_param_string_get (const Eina_List *params, const char *key, const char **ret);
EDJE_API Eina_Bool edje_external_param_string_get (const Eina_List *params, const char *key, const char **ret);
/**
* @brief Gets the value of the given parameter of boolean type.
@ -1110,7 +1110,7 @@ EAPI Eina_Bool edje_external_param_string_get (const Eina_
* @return @c EINA_TRUE if the parameter was found and is of boolean type,
* @c EINA_FALSE otherwise.
*/
EAPI Eina_Bool edje_external_param_bool_get (const Eina_List *params, const char *key, Eina_Bool *ret);
EDJE_API Eina_Bool edje_external_param_bool_get (const Eina_List *params, const char *key, Eina_Bool *ret);
/**
* @brief Gets the value of the given parameter of choice type.
@ -1130,7 +1130,7 @@ EAPI Eina_Bool edje_external_param_bool_get (const Eina_
* @return EINA_TRUE if the parameter was found and is of integer type,
* EINA_FALSE otherwise.
*/
EAPI Eina_Bool edje_external_param_choice_get (const Eina_List *params, const char *key, const char **ret);
EDJE_API Eina_Bool edje_external_param_choice_get (const Eina_List *params, const char *key, const char **ret);
/**
* @brief Gets the array of parameters information about a type given its name.
@ -1146,13 +1146,13 @@ EAPI Eina_Bool edje_external_param_choice_get (const Eina_
*
* @see edje_external_type_get()
*/
EAPI const Edje_External_Param_Info *edje_external_param_info_get (const char *type_name);
EDJE_API const Edje_External_Param_Info *edje_external_param_info_get (const char *type_name);
/**
* @brief Gets the #Edje_External_Type that defines an EXTERNAL type registered with
* the name @p type_name.
*/
EAPI const Edje_External_Type *edje_external_type_get (const char *type_name);
EDJE_API const Edje_External_Type *edje_external_type_get (const char *type_name);
/**
* @}
@ -1199,7 +1199,7 @@ typedef enum _Edje_Aspect_Control
* @see edje_object_part_object_get()
* @since 1.10
*/
EAPI const char *edje_object_part_object_name_get(const Evas_Object *obj);
EDJE_API const char *edje_object_part_object_name_get(const Evas_Object *obj);
/**
* @}
@ -1239,7 +1239,7 @@ EAPI const char *edje_object_part_object_name_get(const Evas_Object *obj);
*
* @see edje_scale_get().
*/
EAPI void edje_scale_set (double scale);
EDJE_API void edje_scale_set (double scale);
/**
* @brief Retrieves Edje's global scaling factor.
@ -1251,7 +1251,7 @@ EAPI void edje_scale_set (double scale);
* @see edje_scale_set() for more details
*
*/
EAPI double edje_scale_get (void);
EDJE_API double edje_scale_get (void);
/**
* @}
@ -1373,7 +1373,7 @@ typedef Evas_Object *(*Edje_Item_Provider_Cb) (void *data, Evas_Object *obj, c
*
* @see edje_password_show_last_timeout_set().
*/
EAPI void edje_password_show_last_set(Eina_Bool password_show_last);
EDJE_API void edje_password_show_last_set(Eina_Bool password_show_last);
/**
* @brief Sets the timeout value in last show password mode.
@ -1388,7 +1388,7 @@ EAPI void edje_password_show_last_set(Eina_Bool password_show_last);
* @see edje_password_show_last_set().
*
*/
EAPI void edje_password_show_last_timeout_set(double password_show_last_timeout);
EDJE_API void edje_password_show_last_timeout_set(double password_show_last_timeout);
/**
* @}
@ -1450,7 +1450,7 @@ EAPI void edje_password_show_last_timeout_set(double password_show_last_timeout)
*
* @return Eina_Bool, @c EINA_TRUE on success and @c EINA_FALSE on failure.
*/
EAPI Eina_Bool edje_color_class_set (const char *color_class, int r, int g, int b, int a, int r2, int g2, int b2, int a2, int r3, int g3, int b3, int a3);
EDJE_API Eina_Bool edje_color_class_set (const char *color_class, int r, int g, int b, int a, int r2, int g2, int b2, int a2, int r3, int g3, int b3, int a3);
/**
* @brief Gets Edje color class.
@ -1486,7 +1486,7 @@ EAPI Eina_Bool edje_color_class_set (const char *color_class, int
* @note Unlike Evas, Edje colors are @b not pre-multiplied. That is,
* half-transparent white is 255 255 255 128.
*/
EAPI Eina_Bool edje_color_class_get (const char *color_class, int *r, int *g, int *b, int *a, int *r2, int *g2, int *b2, int *a2, int *r3, int *g3, int *b3, int *a3);
EDJE_API Eina_Bool edje_color_class_get (const char *color_class, int *r, int *g, int *b, int *a, int *r2, int *g2, int *b2, int *a2, int *r3, int *g3, int *b3, int *a3);
/**
* @brief Deletes edje color class.
@ -1501,7 +1501,7 @@ EAPI Eina_Bool edje_color_class_get (const char *color_class, int
* Deleting the color class will emit the signal "color_class,del"
* to all the Edje objects in the running program.
*/
EAPI void edje_color_class_del (const char *color_class);
EDJE_API void edje_color_class_del (const char *color_class);
/**
* @brief Lists color classes.
@ -1513,7 +1513,7 @@ EAPI void edje_color_class_del (const char *color_class);
* process.
*
*/
EAPI Eina_List *edje_color_class_list (void);
EDJE_API Eina_List *edje_color_class_list (void);
/**
* @brief Iterates over all the active class of an application.
@ -1525,7 +1525,7 @@ EAPI Eina_List *edje_color_class_list (void);
*
* @since 1.14
*/
EAPI Eina_Iterator *edje_color_class_active_iterator_new(void);
EDJE_API Eina_Iterator *edje_color_class_active_iterator_new(void);
/**
* @brief Iterates over all the color class provided by an Edje file.
@ -1536,7 +1536,7 @@ EAPI Eina_Iterator *edje_color_class_active_iterator_new(void);
*
* @since 1.14
*/
EAPI Eina_Iterator *edje_mmap_color_class_iterator_new(Eina_File *f);
EDJE_API Eina_Iterator *edje_mmap_color_class_iterator_new(Eina_File *f);
/**
* @}
@ -1578,7 +1578,7 @@ EAPI Eina_Iterator *edje_mmap_color_class_iterator_new(Eina_File *f);
*
* @since 1.17
*/
EAPI Eina_Bool edje_size_class_set (const char *size_class, Evas_Coord minw, Evas_Coord minh, Evas_Coord maxw, Evas_Coord maxh);
EDJE_API Eina_Bool edje_size_class_set (const char *size_class, Evas_Coord minw, Evas_Coord minh, Evas_Coord maxw, Evas_Coord maxh);
/**
* @brief Gets the Edje size class.
@ -1596,7 +1596,7 @@ EAPI Eina_Bool edje_size_class_set (const char *size_class, Evas_
*
* @since 1.17
*/
EAPI Eina_Bool edje_size_class_get (const char *size_class, Evas_Coord *minw, Evas_Coord *minh, Evas_Coord *maxw, Evas_Coord *maxh);
EDJE_API Eina_Bool edje_size_class_get (const char *size_class, Evas_Coord *minw, Evas_Coord *minh, Evas_Coord *maxw, Evas_Coord *maxh);
/**
* @brief Deletes the size class.
@ -1608,7 +1608,7 @@ EAPI Eina_Bool edje_size_class_get (const char *size_class, Evas_
*
* @since 1.17
*/
EAPI void edje_size_class_del (const char *size_class);
EDJE_API void edje_size_class_del (const char *size_class);
/**
* @brief Lists size classes.
@ -1621,7 +1621,7 @@ EAPI void edje_size_class_del (const char *size_class);
*
* @since 1.17
*/
EAPI Eina_List *edje_size_class_list (void);
EDJE_API Eina_List *edje_size_class_list (void);
/**
* @brief Iterates over all active classes of an application.
@ -1633,7 +1633,7 @@ EAPI Eina_List *edje_size_class_list (void);
*
* @since 1.17
*/
EAPI Eina_Iterator *edje_size_class_active_iterator_new(void);
EDJE_API Eina_Iterator *edje_size_class_active_iterator_new(void);
/**
* @brief Iterates over all size classes provided by an Edje file.
@ -1644,7 +1644,7 @@ EAPI Eina_Iterator *edje_size_class_active_iterator_new(void);
*
* @since 1.17
*/
EAPI Eina_Iterator *edje_mmap_size_class_iterator_new(Eina_File *f);
EDJE_API Eina_Iterator *edje_mmap_size_class_iterator_new(Eina_File *f);
/**
* @}
@ -1687,7 +1687,7 @@ EAPI Eina_Iterator *edje_mmap_size_class_iterator_new(Eina_File *f);
* @see edje_text_class_get().
*
*/
EAPI Eina_Bool edje_text_class_set (const char *text_class, const char *font, Evas_Font_Size size);
EDJE_API Eina_Bool edje_text_class_set (const char *text_class, const char *font, Evas_Font_Size size);
/**
* @brief Gets the font and the font size from Edje text class.
@ -1705,7 +1705,7 @@ EAPI Eina_Bool edje_text_class_set (const char *text_class, const
*
* @since 1.14
*/
EAPI Eina_Bool edje_text_class_get (const char *text_class, const char **font, Evas_Font_Size *size);
EDJE_API Eina_Bool edje_text_class_get (const char *text_class, const char **font, Evas_Font_Size *size);
/**
* @brief Deletes the text class.
@ -1716,7 +1716,7 @@ EAPI Eina_Bool edje_text_class_get (const char *text_class, const
* specified text class.
*
*/
EAPI void edje_text_class_del (const char *text_class);
EDJE_API void edje_text_class_del (const char *text_class);
/**
* @brief Lists text classes.
@ -1728,7 +1728,7 @@ EAPI void edje_text_class_del (const char *text_class);
* process.
*
*/
EAPI Eina_List *edje_text_class_list (void);
EDJE_API Eina_List *edje_text_class_list (void);
/**
* @brief Iterate over all active classes of an application.
@ -1741,7 +1741,7 @@ EAPI Eina_List *edje_text_class_list (void);
* @since 1.17
*
*/
EAPI Eina_Iterator *edje_text_class_active_iterator_new(void);
EDJE_API Eina_Iterator *edje_text_class_active_iterator_new(void);
/**
* @brief Iterate over all text classes provided by an Edje file.
@ -1753,7 +1753,7 @@ EAPI Eina_Iterator *edje_text_class_active_iterator_new(void);
* @since 1.17
*
*/
EAPI Eina_Iterator *edje_mmap_text_class_iterator_new(Eina_File *f);
EDJE_API Eina_Iterator *edje_mmap_text_class_iterator_new(Eina_File *f);
/**
* @}
@ -1787,7 +1787,7 @@ EAPI Eina_Iterator *edje_mmap_text_class_iterator_new(Eina_File *f);
* Note: the list must be freed using edje_mmap_collection_list_free()
* when you are done with it.
*/
EAPI Eina_List *edje_mmap_collection_list(Eina_File *f);
EDJE_API Eina_List *edje_mmap_collection_list(Eina_File *f);
/**
* @brief Frees file collection list.
@ -1795,7 +1795,7 @@ EAPI Eina_List *edje_mmap_collection_list(Eina_File *f);
*
* Frees the list returned by edje_mmap_collection_list().
*/
EAPI void edje_mmap_collection_list_free(Eina_List *lst);
EDJE_API void edje_mmap_collection_list_free(Eina_List *lst);
/**
* @brief Determines whether a group matching glob exists in an edje mapped file.
@ -1804,7 +1804,7 @@ EAPI void edje_mmap_collection_list_free(Eina_List *lst);
*
* @return @c 1 if a match is found, @c 0 otherwise
*/
EAPI Eina_Bool edje_mmap_group_exists(Eina_File *f, const char *glob);
EDJE_API Eina_Bool edje_mmap_group_exists(Eina_File *f, const char *glob);
/**
* @brief Determines whether a group have 3D Scene.
@ -1816,7 +1816,7 @@ EAPI Eina_Bool edje_mmap_group_exists(Eina_File *f, const char *glob);
* @deprecated
* @since 1.18
*/
EINA_DEPRECATED EAPI Eina_Bool edje_mmap_3d_has(Eina_File *f, const char *group);
EINA_DEPRECATED EDJE_API Eina_Bool edje_mmap_3d_has(Eina_File *f, const char *group);
/**
* @brief Iterates over all the opened Edje files.
@ -1825,7 +1825,7 @@ EINA_DEPRECATED EAPI Eina_Bool edje_mmap_3d_has(Eina_File *f, const char
*
* @since 1.14
*/
EAPI Eina_Iterator *edje_file_iterator_new(void);
EDJE_API Eina_Iterator *edje_file_iterator_new(void);
/**
* @brief Gets a list of groups in an edje file.
@ -1839,7 +1839,7 @@ EAPI Eina_Iterator *edje_file_iterator_new(void);
*
* @see edje_mmap_group_exists()
*/
EAPI Eina_List *edje_file_collection_list (const char *file);
EDJE_API Eina_List *edje_file_collection_list (const char *file);
/**
* @brief Frees file collection list.
@ -1847,7 +1847,7 @@ EAPI Eina_List *edje_file_collection_list (const char *file);
*
* Frees the list returned by edje_file_collection_list().
*/
EAPI void edje_file_collection_list_free (Eina_List *lst);
EDJE_API void edje_file_collection_list_free (Eina_List *lst);
/**
* @brief Determines whether a group matching glob exists in an edje file.
@ -1856,7 +1856,7 @@ EAPI void edje_file_collection_list_free (Eina_List *lst);
*
* @return @c 1 if a match is found, @c 0 otherwise
*/
EAPI Eina_Bool edje_file_group_exists (const char *file, const char *glob);
EDJE_API Eina_Bool edje_file_group_exists (const char *file, const char *glob);
/**
* @}
@ -1953,7 +1953,7 @@ typedef enum _Edje_Action_Type
* @see edje_frametime_get()
*
*/
EAPI void edje_frametime_set (double t);
EDJE_API void edje_frametime_set (double t);
/**
* @brief Gets edje transitions' frame time.
@ -1966,7 +1966,7 @@ EAPI void edje_frametime_set (double t);
* @see edje_frametime_set()
*
*/
EAPI double edje_frametime_get (void);
EDJE_API double edje_frametime_get (void);
/**
* @brief Freezes Edje objects.
@ -1978,7 +1978,7 @@ EAPI double edje_frametime_get (void);
* @see edje_thaw()
*
*/
EAPI void edje_freeze (void);
EDJE_API void edje_freeze (void);
/**
* @brief Thaws Edje objects.
@ -1990,7 +1990,7 @@ EAPI void edje_freeze (void);
* @see edje_freeze()
*
*/
EAPI void edje_thaw (void);
EDJE_API void edje_thaw (void);
/**
* @brief Sets Edje language.
@ -2003,7 +2003,7 @@ EAPI void edje_thaw (void);
*
* @since 1.15
*/
EAPI void edje_language_set (const char *locale);
EDJE_API void edje_language_set (const char *locale);
/**
* @brief Sets edje transition duration factor.
@ -2026,7 +2026,7 @@ EAPI void edje_language_set (const char *locale);
*
* @since 1.15
*/
EAPI void edje_transition_duration_factor_set (double scale);
EDJE_API void edje_transition_duration_factor_set (double scale);
/**
* @brief Retrieves transitions duration factor.
@ -2040,7 +2040,7 @@ EAPI void edje_transition_duration_factor_set (double scale);
* @since 1.15
*
*/
EAPI double edje_transition_duration_factor_get (void);
EDJE_API double edje_transition_duration_factor_get (void);
/**
* @}
@ -2238,7 +2238,7 @@ typedef enum _Edje_Text_Effect
* as its parameter, and this one will be freed by free_data whenever
* the layout is unregistered from Edje.
*/
EAPI void edje_box_layout_register (const char *name, Evas_Object_Box_Layout func, void *(*layout_data_get)(void *), void (*layout_data_free)(void *), void (*free_data)(void *), void *data);
EDJE_API void edje_box_layout_register (const char *name, Evas_Object_Box_Layout func, void *(*layout_data_get)(void *), void (*layout_data_free)(void *), void (*free_data)(void *), void *data);
/**
* @}

1298
src/lib/edje/Edje_Edit.h
View File

File diff suppressed because it is too large Load Diff

348
src/lib/edje/Edje_Legacy.h
View File

File diff suppressed because it is too large Load Diff

32
src/lib/edje/Efl_Layout.h
View File

@ -11,35 +11,7 @@
#include <Efl_Canvas.h>
#ifdef EAPI
# undef EAPI
#endif
#ifdef _WIN32
# ifdef EFL_BUILD
# ifdef DLL_EXPORT
# define EAPI __declspec(dllexport)
# else
# define EAPI
# endif
# else
# define EAPI __declspec(dllimport)
# endif
# define EAPI_WEAK
#else
# ifdef __GNUC__
# if __GNUC__ >= 4
# define EAPI __attribute__ ((visibility("default")))
# define EAPI_WEAK __attribute__ ((weak))
# else
# define EAPI
# define EAPI_WEAK
# endif
# else
# define EAPI
# define EAPI_WEAK
# endif
#endif
#include <edje_api.h>
#ifdef __cplusplus
extern "C" {
@ -64,6 +36,4 @@ extern "C" {
}
#endif
#undef EAPI
#endif

34
src/lib/edje/edje_api.h Normal file
View File

@ -0,0 +1,34 @@
#ifndef _EFL_EDJE_API_H
#define _EFL_EDJE_API_H
#ifdef EDJE_API
#error EDJE_API should not be already defined
#endif
#ifdef _WIN32
# ifndef EDJE_STATIC
# ifdef EDJE_BUILD
# define EDJE_API __declspec(dllexport)
# else
# define EDJE_API __declspec(dllimport)
# endif
# else
# define EDJE_API
# endif
# define EDJE_API_WEAK
#else
# ifdef __GNUC__
# if __GNUC__ >= 4
# define EDJE_API __attribute__ ((visibility("default")))
# define EDJE_API_WEAK __attribute__ ((weak))
# else
# define EDJE_API
# define EDJE_API_WEAK
# endif
# else
# define EDJE_API
# define EDJE_API_WEAK
# endif
#endif
#endif

18
src/lib/edje/edje_cache.c
View File

@ -9,7 +9,7 @@ static Eina_List *_edje_file_cache = NULL;
static int _edje_collection_cache_size = 16;
EAPI void
EDJE_API void
edje_cache_emp_alloc(Edje_Part_Collection_Directory_Entry *ce)
{
/* Init Eina Mempools this is also used in edje_pick.c */
@ -44,7 +44,7 @@ edje_cache_emp_alloc(Edje_Part_Collection_Directory_Entry *ce)
INIT_EMP(part, Edje_Part, ce);
}
EAPI void
EDJE_API void
edje_cache_emp_free(Edje_Part_Collection_Directory_Entry *ce)
{ /* Free Eina Mempools this is also used in edje_pick.c */
/* Destroy all part and description. */
@ -850,7 +850,7 @@ _edje_cache_file_clean(void)
}
}
EAPI void
EDJE_API void
_edje_cache_file_unref(Edje_File *edf)
{
edf->references--;
@ -915,7 +915,7 @@ _edje_file_cache_shutdown(void)
* API *
*============================================================================*/
EAPI void
EDJE_API void
edje_file_cache_set(int count)
{
if (count < 0) count = 0;
@ -923,13 +923,13 @@ edje_file_cache_set(int count)
_edje_cache_file_clean();
}
EAPI int
EDJE_API int
edje_file_cache_get(void)
{
return _edje_file_cache_size;
}
EAPI void
EDJE_API void
edje_file_cache_flush(void)
{
int ps;
@ -940,7 +940,7 @@ edje_file_cache_flush(void)
_edje_file_cache_size = ps;
}
EAPI void
EDJE_API void
edje_collection_cache_set(int count)
{
Eina_List *l;
@ -953,13 +953,13 @@ edje_collection_cache_set(int count)
/* FIXME: freach in file hash too! */
}
EAPI int
EDJE_API int
edje_collection_cache_get(void)
{
return _edje_collection_cache_size;
}
EAPI void
EDJE_API void
edje_collection_cache_flush(void)
{
int ps;

18
src/lib/edje/edje_data.c
View File

@ -1,7 +1,7 @@
#include "edje_private.h"
EAPI Eet_Data_Descriptor * _edje_edd_edje_file = NULL;
EAPI Eet_Data_Descriptor * _edje_edd_edje_part_collection = NULL;
EDJE_API Eet_Data_Descriptor * _edje_edd_edje_file = NULL;
EDJE_API Eet_Data_Descriptor * _edje_edd_edje_part_collection = NULL;
Eet_Data_Descriptor *_edje_edd_edje_string = NULL;
Eet_Data_Descriptor *_edje_edd_edje_style = NULL;
@ -86,7 +86,7 @@ Eet_Data_Descriptor *_edje_edd_edje_part_description_vector_pointer = NULL;
* edje files.
*/
#define EMP(Type, Minus) \
EAPI Eina_Mempool *_emp_##Type = NULL; \
EDJE_API Eina_Mempool *_emp_##Type = NULL; \
\
static void * \
mem_alloc_##Minus(size_t size) \
@ -122,7 +122,7 @@ EMP(SNAPSHOT, snapshot)
EMP(VECTOR, vector)
#undef EMP
EAPI Eina_Mempool *_emp_part = NULL;
EDJE_API Eina_Mempool *_emp_part = NULL;
static void *
mem_alloc_part(size_t size)
@ -227,8 +227,8 @@ _edje_eina_hash_add_alloc(Eina_Hash *hash,
return hash;
}
// FIXME: remove EAPI when edje_convert goes
EAPI void
// FIXME: remove EDJE_API when edje_convert goes
EDJE_API void
_edje_edd_shutdown(void)
{
FREED(_edje_edd_edje_string);
@ -326,8 +326,8 @@ _edje_edd_shutdown(void)
EET_DATA_DESCRIPTOR_ADD_SUB(_edje_edd_edje_##Name##_pointer, Edje_##Type##_Pointer, "pointer", pointer, _edje_edd_edje_##Name); \
}
// FIXME: remove EAPI when edje_convert goes
EAPI void
// FIXME: remove EDJE_API when edje_convert goes
EDJE_API void
_edje_edd_init(void)
{
Eet_Data_Descriptor_Class eddc;
@ -1318,7 +1318,7 @@ _edje_edd_init(void)
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_collection, Edje_Part_Collection, "use_custom_seat_names", use_custom_seat_names, EET_T_UCHAR);
}
EAPI void
EDJE_API void
_edje_data_font_list_desc_make(Eet_Data_Descriptor **_font_list_edd,
Eet_Data_Descriptor **_font_edd)
{ /* User have to free: _font_list_edd, _font_edd */

900
src/lib/edje/edje_edit.c
View File

File diff suppressed because it is too large Load Diff

2
src/lib/edje/edje_edit_eo.h
View File

@ -23,6 +23,6 @@ typedef Eo Edje_Edit;
*/
#define EDJE_EDIT_CLASS edje_edit_class_get()
EWAPI const Efl_Class *edje_edit_class_get(void) EINA_CONST;
EDJE_API EDJE_API_WEAK const Efl_Class *edje_edit_class_get(void) EINA_CONST;
#endif

30
src/lib/edje/edje_external.c
View File

@ -3,7 +3,7 @@
static Eina_Hash *type_registry = NULL;
static int init_count = 0;
EAPI const char *
EDJE_API const char *
edje_external_param_type_str(Edje_External_Param_Type type)
{
switch (type)
@ -150,7 +150,7 @@ _edje_object_part_external_param_type_get(Edje *ed, const char *part, const char
return EDJE_EXTERNAL_PARAM_TYPE_MAX;
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_external_type_register(const char *type_name, const Edje_External_Type *type_info)
{
if (!type_name)
@ -175,7 +175,7 @@ edje_external_type_register(const char *type_name, const Edje_External_Type *typ
return eina_hash_add(type_registry, type_name, type_info);
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_external_type_unregister(const char *type_name)
{
if (!type_name)
@ -183,7 +183,7 @@ edje_external_type_unregister(const char *type_name)
return eina_hash_del_by_key(type_registry, type_name);
}
EAPI void
EDJE_API void
edje_external_type_array_register(const Edje_External_Type_Info *array)
{
const Edje_External_Type_Info *itr;
@ -206,7 +206,7 @@ edje_external_type_array_register(const Edje_External_Type_Info *array)
}
}
EAPI void
EDJE_API void
edje_external_type_array_unregister(const Edje_External_Type_Info *array)
{
const Edje_External_Type_Info *itr;
@ -218,19 +218,19 @@ edje_external_type_array_unregister(const Edje_External_Type_Info *array)
eina_hash_del(type_registry, itr->name, itr->info);
}
EAPI unsigned int
EDJE_API unsigned int
edje_external_type_abi_version_get(void)
{
return EDJE_EXTERNAL_TYPE_ABI_VERSION;
}
EAPI Eina_Iterator *
EDJE_API Eina_Iterator *
edje_external_iterator_get(void)
{
return eina_hash_iterator_tuple_new(type_registry);
}
EAPI Edje_External_Param *
EDJE_API Edje_External_Param *
edje_external_param_find(const Eina_List *params, const char *key)
{
const Eina_List *l;
@ -242,7 +242,7 @@ edje_external_param_find(const Eina_List *params, const char *key)
return NULL;
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_external_param_int_get(const Eina_List *params, const char *key, int *ret)
{
Edje_External_Param *param;
@ -259,7 +259,7 @@ edje_external_param_int_get(const Eina_List *params, const char *key, int *ret)
return EINA_FALSE;
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_external_param_double_get(const Eina_List *params, const char *key, double *ret)
{
Edje_External_Param *param;
@ -276,7 +276,7 @@ edje_external_param_double_get(const Eina_List *params, const char *key, double
return EINA_FALSE;
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_external_param_string_get(const Eina_List *params, const char *key, const char **ret)
{
Edje_External_Param *param;
@ -293,7 +293,7 @@ edje_external_param_string_get(const Eina_List *params, const char *key, const c
return EINA_FALSE;
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_external_param_bool_get(const Eina_List *params, const char *key, Eina_Bool *ret)
{
Edje_External_Param *param;
@ -310,7 +310,7 @@ edje_external_param_bool_get(const Eina_List *params, const char *key, Eina_Bool
return EINA_FALSE;
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_external_param_choice_get(const Eina_List *params, const char *key, const char **ret)
{
Edje_External_Param *param;
@ -327,7 +327,7 @@ edje_external_param_choice_get(const Eina_List *params, const char *key, const c
return EINA_FALSE;
}
EAPI const Edje_External_Param_Info *
EDJE_API const Edje_External_Param_Info *
edje_external_param_info_get(const char *type_name)
{
Edje_External_Type *type;
@ -338,7 +338,7 @@ edje_external_param_info_get(const char *type_name)
return type->parameters_info;
}
EAPI const Edje_External_Type *
EDJE_API const Edje_External_Type *
edje_external_type_get(const char *type_name)
{
return eina_hash_find(type_registry, type_name);

164
src/lib/edje/edje_legacy.c
View File

@ -11,7 +11,7 @@
rp = _edje_real_part_recursive_get(&ed, part);\
if (!rp) return x;\
EAPI Edje_Load_Error
EDJE_API Edje_Load_Error
edje_object_load_error_get(const Eo *obj)
{
Edje *ed;
@ -21,7 +21,7 @@ edje_object_load_error_get(const Eo *obj)
return ed->load_error;
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_part_geometry_get(const Edje_Object *obj, const char *part, int *x, int *y, int *w, int *h)
{
Edje_Real_Part *rp;
@ -60,7 +60,7 @@ edje_object_part_geometry_get(const Edje_Object *obj, const char *part, int *x,
return EINA_TRUE;
}
EAPI const char *
EDJE_API const char *
edje_object_part_state_get(const Edje_Object *obj, const char * part, double *val_ret)
{
const char *str = "";
@ -68,20 +68,20 @@ edje_object_part_state_get(const Edje_Object *obj, const char * part, double *va
return str;
}
EAPI void
EDJE_API void
edje_object_message_signal_process(Edje_Object *obj)
{
efl_layout_signal_process(obj, EINA_FALSE);
}
/* since 1.20 */
EAPI void
EDJE_API void
edje_object_message_signal_recursive_process(Edje_Object *obj)
{
efl_layout_signal_process(obj, EINA_TRUE);
}
EAPI void
EDJE_API void
edje_object_signal_callback_add(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func, void *data)
{
Edje *ed;
@ -91,7 +91,7 @@ edje_object_signal_callback_add(Evas_Object *obj, const char *emission, const ch
_edje_object_signal_callback_add(obj, ed, emission, source, func, NULL, NULL, data);
}
EAPI void *
EDJE_API void *
edje_object_signal_callback_del_full(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func, void *data)
{
Edje_Signal_Callback_Group *gp;
@ -135,7 +135,7 @@ edje_object_signal_callback_del_full(Evas_Object *obj, const char *emission, con
return NULL;
}
EAPI void *
EDJE_API void *
edje_object_signal_callback_del(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func)
{
// Legacy del_full seems to have been sloppy with NULL data, as that would
@ -143,41 +143,41 @@ edje_object_signal_callback_del(Evas_Object *obj, const char *emission, const ch
return edje_object_signal_callback_del_full(obj, emission, source, func, NULL);
}
EAPI void
EDJE_API void
edje_object_signal_emit(Evas_Object *obj, const char *emission, const char *source)
{
efl_layout_signal_emit(obj, emission, source);
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_part_external_param_set(Eo *obj, const char *part, const Edje_External_Param *param)
{
Edje *ed = _edje_fetch(obj);
return _edje_object_part_external_param_set(ed, part, param);
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_part_external_param_get(const Eo *obj, const char *part, Edje_External_Param *param)
{
Edje *ed = _edje_fetch(obj);
return _edje_object_part_external_param_get(ed, part, param);
}
EAPI Edje_External_Param_Type
EDJE_API Edje_External_Param_Type
edje_object_part_external_param_type_get(const Eo *obj, const char *part, const char *param)
{
Edje *ed = _edje_fetch(obj);
return _edje_object_part_external_param_type_get(ed, part, param);
}
EAPI Evas_Object *
EDJE_API Evas_Object *
edje_object_part_external_object_get(const Edje_Object *obj, const char *part)
{
return efl_content_get(efl_part(obj, part));
}
/* Legacy only. Shall we deprecate this API? */
EAPI Evas_Object *
EDJE_API Evas_Object *
edje_object_part_external_content_get(const Edje_Object *obj, const char *part, const char *content)
{
Edje *ed = _edje_fetch(obj);
@ -185,190 +185,190 @@ edje_object_part_external_content_get(const Edje_Object *obj, const char *part,
}
/* Efl.Ui.I18n APIs */
EAPI void
EDJE_API void
edje_object_mirrored_set(Edje_Object *obj, Eina_Bool rtl)
{
efl_ui_mirrored_set(obj, rtl);
}
EAPI Eina_Bool edje_object_mirrored_get(const Edje_Object *obj)
EDJE_API Eina_Bool edje_object_mirrored_get(const Edje_Object *obj)
{
return efl_ui_mirrored_get(obj);
}
EAPI void edje_object_language_set(Edje_Object *obj, const char *language)
EDJE_API void edje_object_language_set(Edje_Object *obj, const char *language)
{
efl_ui_language_set(obj, language);
}
EAPI const char *edje_object_language_get(const Edje_Object *obj)
EDJE_API const char *edje_object_language_get(const Edje_Object *obj)
{
return efl_ui_language_get(obj);
}
EAPI Eina_Bool edje_object_scale_set(Edje_Object *obj, double scale)
EDJE_API Eina_Bool edje_object_scale_set(Edje_Object *obj, double scale)
{
efl_gfx_entity_scale_set(obj, scale);
return EINA_TRUE;
}
EAPI double edje_object_scale_get(const Edje_Object *obj)
EDJE_API double edje_object_scale_get(const Edje_Object *obj)
{
return efl_gfx_entity_scale_get(obj);
}
/* Legacy part drag APIs */
EAPI Edje_Drag_Dir
EDJE_API Edje_Drag_Dir
edje_object_part_drag_dir_get(const Evas_Object *obj, const char *part)
{
return (Edje_Drag_Dir)efl_ui_drag_dir_get(efl_part(obj, part));
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_part_drag_value_set(Evas_Object *obj, const char *part, double dx, double dy)
{
return efl_ui_drag_value_set(efl_part(obj, part), dx, dy);
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_part_drag_value_get(const Evas_Object *obj, const char *part, double *dx, double *dy)
{
return efl_ui_drag_value_get(efl_part(obj, part), dx, dy);
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_part_drag_size_set(Evas_Object *obj, const char *part, double dw, double dh)
{
return efl_ui_drag_size_set(efl_part(obj, part), dw, dh);
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_part_drag_size_get(const Evas_Object *obj, const char *part, double *dw, double *dh)
{
return efl_ui_drag_size_get(efl_part(obj, part), dw, dh);
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_part_drag_step_set(Evas_Object *obj, const char *part, double dx, double dy)
{
return efl_ui_drag_step_set(efl_part(obj, part), dx, dy);
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_part_drag_step_get(const Evas_Object *obj, const char *part, double *dx, double *dy)
{
return efl_ui_drag_step_get(efl_part(obj, part), dx, dy);
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_part_drag_page_set(Evas_Object *obj, const char *part, double dx, double dy)
{
return efl_ui_drag_page_set(efl_part(obj, part), dx, dy);
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_part_drag_page_get(const Evas_Object *obj, const char *part, double *dx, double *dy)
{
return efl_ui_drag_page_get(efl_part(obj, part), dx, dy);
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_part_drag_step(Evas_Object *obj, const char *part, double dx, double dy)
{
return efl_ui_drag_step_move(efl_part(obj, part), dx, dy);
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_part_drag_page(Evas_Object *obj, const char *part, double dx, double dy)
{
return efl_ui_drag_page_move(efl_part(obj, part), dx, dy);
}
EAPI void
EDJE_API void
edje_object_part_text_cursor_begin_set(Edje_Object *obj, const char *part EINA_UNUSED, Edje_Cursor cur)
{
GET_REAL_PART_ON_FAIL_RETURN()
_edje_text_cursor_begin(rp, _edje_text_cursor_get(rp, cur));
}
EAPI void
EDJE_API void
edje_object_part_text_cursor_end_set(Edje_Object *obj, const char *part EINA_UNUSED, Edje_Cursor cur)
{
GET_REAL_PART_ON_FAIL_RETURN()
_edje_text_cursor_end(rp, _edje_text_cursor_get(rp, cur));
}
EAPI void
EDJE_API void
edje_object_part_text_cursor_pos_set(Edje_Object *obj, const char * part EINA_UNUSED, Edje_Cursor cur, int pos)
{
GET_REAL_PART_ON_FAIL_RETURN()
_edje_text_cursor_pos_set(rp, _edje_text_cursor_get(rp, cur), pos);
}
EAPI int
EDJE_API int
edje_object_part_text_cursor_pos_get(const Edje_Object *obj, const char * part EINA_UNUSED, Edje_Cursor cur)
{
GET_REAL_PART_ON_FAIL_RETURN(0)
return _edje_text_cursor_pos_get(rp, _edje_text_cursor_get(rp, cur));
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_part_text_cursor_coord_set(Edje_Object *obj, const char *part EINA_UNUSED, Edje_Cursor cur, int x, int y)
{
GET_REAL_PART_ON_FAIL_RETURN(EINA_FALSE)
return _edje_text_cursor_coord_set(rp, _edje_text_cursor_get(rp, cur), x, y);
}
EAPI void
EDJE_API void
edje_object_part_text_cursor_line_begin_set(Edje_Object *obj, const char *part EINA_UNUSED, Edje_Cursor cur)
{
GET_REAL_PART_ON_FAIL_RETURN()
_edje_text_cursor_line_begin(rp, _edje_text_cursor_get(rp, cur));
}
EAPI void
EDJE_API void
edje_object_part_text_cursor_line_end_set(Edje_Object *obj, const char *part EINA_UNUSED, Edje_Cursor cur)
{
GET_REAL_PART_ON_FAIL_RETURN()
_edje_text_cursor_line_end(rp, _edje_text_cursor_get(rp, cur));
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_part_text_cursor_prev(Edje_Object *obj, const char *part EINA_UNUSED, Edje_Cursor cur)
{
GET_REAL_PART_ON_FAIL_RETURN(EINA_FALSE)
return _edje_text_cursor_prev(rp, _edje_text_cursor_get(rp, cur));
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_part_text_cursor_next(Edje_Object *obj, const char *part EINA_UNUSED, Edje_Cursor cur)
{
GET_REAL_PART_ON_FAIL_RETURN(EINA_FALSE)
return _edje_text_cursor_next(rp, _edje_text_cursor_get(rp, cur));
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_part_text_cursor_down(Edje_Object *obj, const char *part EINA_UNUSED, Edje_Cursor cur)
{
GET_REAL_PART_ON_FAIL_RETURN(EINA_FALSE)
return _edje_text_cursor_down(rp, _edje_text_cursor_get(rp, cur));
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_part_text_cursor_up(Edje_Object *obj, const char *part EINA_UNUSED, Edje_Cursor cur)
{
GET_REAL_PART_ON_FAIL_RETURN(EINA_FALSE)
return _edje_text_cursor_up(rp, _edje_text_cursor_get(rp, cur));
}
EAPI void
EDJE_API void
edje_object_part_text_cursor_copy(Edje_Object *obj, const char *part EINA_UNUSED, Edje_Cursor cur, Edje_Cursor dst)
{
GET_REAL_PART_ON_FAIL_RETURN()
_edje_text_cursor_copy(rp, _edje_text_cursor_get(rp, cur), _edje_text_cursor_get(rp, dst));
}
EAPI char *
EDJE_API char *
edje_object_part_text_cursor_content_get(const Edje_Object *obj, const char *part EINA_UNUSED, Edje_Cursor cur)
{
GET_REAL_PART_ON_FAIL_RETURN(NULL)
@ -380,7 +380,7 @@ edje_object_part_text_cursor_content_get(const Edje_Object *obj, const char *par
return NULL;
}
EAPI void
EDJE_API void
edje_object_part_text_cursor_geometry_get(const Edje_Object *obj, const char * part EINA_UNUSED, int *x, int *y, int *w, int *h)
{
GET_REAL_PART_ON_FAIL_RETURN()
@ -392,7 +392,7 @@ edje_object_part_text_cursor_geometry_get(const Edje_Object *obj, const char * p
}
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_part_text_hide_visible_password(Eo *obj, const char *part)
{
GET_REAL_PART_ON_FAIL_RETURN(EINA_FALSE)
@ -410,7 +410,7 @@ edje_object_part_text_hide_visible_password(Eo *obj, const char *part)
return int_ret;
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_part_text_cursor_is_format_get(const Eo *obj, const char *part, Edje_Cursor cur)
{
GET_REAL_PART_ON_FAIL_RETURN(EINA_FALSE)
@ -421,7 +421,7 @@ edje_object_part_text_cursor_is_format_get(const Eo *obj, const char *part, Edje
return EINA_FALSE;
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_part_text_cursor_is_visible_format_get(const Eo *obj, const char *part, Edje_Cursor cur)
{
GET_REAL_PART_ON_FAIL_RETURN(EINA_FALSE)
@ -433,7 +433,7 @@ edje_object_part_text_cursor_is_visible_format_get(const Eo *obj, const char *pa
return EINA_FALSE;
}
EAPI const Eina_List *
EDJE_API const Eina_List *
edje_object_part_text_anchor_list_get(const Eo *obj, const char *part)
{
GET_REAL_PART_ON_FAIL_RETURN(NULL)
@ -443,7 +443,7 @@ edje_object_part_text_anchor_list_get(const Eo *obj, const char *part)
return NULL;
}
EAPI const Eina_List *
EDJE_API const Eina_List *
edje_object_part_text_anchor_geometry_get(const Eo *obj, const char *part, const char *anchor)
{
GET_REAL_PART_ON_FAIL_RETURN(NULL)
@ -453,7 +453,7 @@ edje_object_part_text_anchor_geometry_get(const Eo *obj, const char *part, const
return NULL;
}
EAPI void
EDJE_API void
edje_object_part_text_style_user_push(Eo *obj, const char *part, const char *style)
{
Evas_Textblock_Style *ts;
@ -472,7 +472,7 @@ edje_object_part_text_style_user_push(Eo *obj, const char *part, const char *sty
_edje_recalc(ed);
}
EAPI void
EDJE_API void
edje_object_part_text_style_user_pop(Eo *obj, const char *part)
{
GET_REAL_PART_ON_FAIL_RETURN()
@ -486,7 +486,7 @@ edje_object_part_text_style_user_pop(Eo *obj, const char *part)
_edje_recalc(ed);
}
EAPI const char *
EDJE_API const char *
edje_object_part_text_style_user_peek(const Eo *obj, const char *part)
{
Edje_Real_Part *rp;
@ -508,7 +508,7 @@ edje_object_part_text_style_user_peek(const Eo *obj, const char *part)
return NULL;
}
EAPI const Eina_List *
EDJE_API const Eina_List *
edje_object_part_text_item_list_get(const Eo *obj, const char *part)
{
GET_REAL_PART_ON_FAIL_RETURN(NULL)
@ -518,7 +518,7 @@ edje_object_part_text_item_list_get(const Eo *obj, const char *part)
return NULL;
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_part_text_item_geometry_get(const Eo *obj, const char *part, const char *item, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch)
{
GET_REAL_PART_ON_FAIL_RETURN(EINA_FALSE)
@ -530,7 +530,7 @@ edje_object_part_text_item_geometry_get(const Eo *obj, const char *part, const c
return EINA_FALSE;
}
EAPI void
EDJE_API void
edje_object_text_insert_filter_callback_add(Eo *obj, const char *part, Edje_Text_Filter_Cb func, void *data)
{
Edje_Text_Insert_Filter_Callback *cb;
@ -548,7 +548,7 @@ edje_object_text_insert_filter_callback_add(Eo *obj, const char *part, Edje_Text
eina_list_append(ed->text_insert_filter_callbacks, cb);
}
EAPI void *
EDJE_API void *
edje_object_text_insert_filter_callback_del(Eo *obj, const char *part, Edje_Text_Filter_Cb func)
{
Edje_Text_Insert_Filter_Callback *cb;
@ -575,7 +575,7 @@ edje_object_text_insert_filter_callback_del(Eo *obj, const char *part, Edje_Text
return NULL;
}
EAPI void *
EDJE_API void *
edje_object_text_insert_filter_callback_del_full(Eo *obj, const char *part, Edje_Text_Filter_Cb func, void *data)
{
Edje_Text_Insert_Filter_Callback *cb;
@ -603,7 +603,7 @@ edje_object_text_insert_filter_callback_del_full(Eo *obj, const char *part, Edje
return NULL;
}
EAPI void
EDJE_API void
edje_object_text_markup_filter_callback_add(Eo *obj, const char *part, Edje_Markup_Filter_Cb func, void *data)
{
Edje_Markup_Filter_Callback *cb;
@ -621,7 +621,7 @@ edje_object_text_markup_filter_callback_add(Eo *obj, const char *part, Edje_Mark
eina_list_append(ed->markup_filter_callbacks, cb);
}
EAPI void *
EDJE_API void *
edje_object_text_markup_filter_callback_del(Eo *obj, const char *part, Edje_Markup_Filter_Cb func)
{
Edje_Markup_Filter_Callback *cb;
@ -648,7 +648,7 @@ edje_object_text_markup_filter_callback_del(Eo *obj, const char *part, Edje_Mark
return NULL;
}
EAPI void *
EDJE_API void *
edje_object_text_markup_filter_callback_del_full(Eo *obj, const char *part, Edje_Markup_Filter_Cb func, void *data)
{
Edje_Markup_Filter_Callback *cb;
@ -676,7 +676,7 @@ edje_object_text_markup_filter_callback_del_full(Eo *obj, const char *part, Edje
return NULL;
}
EAPI void
EDJE_API void
edje_object_part_text_user_insert(const Eo *obj, const char *part, const char *text)
{
Edje_Real_Part *rp;
@ -729,7 +729,7 @@ _edje_object_part_text_raw_append(Edje *ed, Evas_Object *obj, Edje_Real_Part *rp
return EINA_TRUE;
}
EAPI void
EDJE_API void
edje_object_part_text_append(Eo *obj, const char *part, const char *text)
{
Edje_Real_Part *rp;
@ -754,7 +754,7 @@ edje_object_part_text_append(Eo *obj, const char *part, const char *text)
ed->text_change.func(ed->text_change.data, obj, part);
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_part_text_escaped_set(Eo *obj, const char *part, const char *text)
{
Edje_Real_Part *rp;
@ -941,7 +941,7 @@ _edje_text_unescape(const char *text)
return ret;
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_part_text_unescaped_set(Eo *obj, const char *part, const char *text_to_escape)
{
Edje_Real_Part *rp;
@ -970,7 +970,7 @@ edje_object_part_text_unescaped_set(Eo *obj, const char *part, const char *text_
return int_ret;
}
EAPI char *
EDJE_API char *
edje_object_part_text_unescaped_get(const Eo *obj, const char *part)
{
Edje_Real_Part *rp;
@ -1025,7 +1025,7 @@ _edje_object_part_text_insert(Edje *ed, Edje_Real_Part *rp, const char *text)
_edje_recalc(ed);
}
EAPI void
EDJE_API void
edje_object_part_text_insert(Eo *obj, const char *part, const char *text)
{
Edje_Real_Part *rp;
@ -1043,25 +1043,25 @@ edje_object_part_text_insert(Eo *obj, const char *part, const char *text)
/* Calc interface APIs */
EAPI void
EDJE_API void
edje_object_update_hints_set(Edje_Object *obj, Eina_Bool update)
{
efl_layout_calc_auto_update_hints_set(obj, update);
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_update_hints_get(const Edje_Object *obj)
{
return efl_layout_calc_auto_update_hints_get(obj);
}
EAPI void
EDJE_API void
edje_object_size_min_calc(Edje_Object *obj, int *minw, int *minh)
{
edje_object_size_min_restricted_calc(obj, minw, minh, 0, 0);
}
EAPI void
EDJE_API void
edje_object_size_min_restricted_calc(Edje_Object *obj, int *minw, int *minh, int restrictedw, int restrictedh)
{
Eina_Size2D sz = { restrictedw, restrictedh };
@ -1079,7 +1079,7 @@ edje_object_size_min_restricted_calc(Edje_Object *obj, int *minw, int *minh, int
if (minh) *minh = sz.h;
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_parts_extends_calc(Edje_Object *obj, int *x, int *y, int *w, int *h)
{
Eina_Rect r = EINA_RECT_ZERO();
@ -1094,45 +1094,45 @@ edje_object_parts_extends_calc(Edje_Object *obj, int *x, int *y, int *w, int *h)
return (ed != NULL);
}
EAPI int
EDJE_API int
edje_object_freeze(Edje_Object *obj)
{
return efl_layout_calc_freeze(obj);
}
EAPI int
EDJE_API int
edje_object_thaw(Edje_Object *obj)
{
return efl_layout_calc_thaw(obj);
}
EAPI void
EDJE_API void
edje_object_calc_force(Edje_Object *obj)
{
efl_layout_calc_force(obj);
}
EAPI void
EDJE_API void
edje_object_play_set(Evas_Object *obj, Eina_Bool play)
{
efl_player_paused_set(obj, !play);
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_play_get(const Evas_Object *obj)
{
if (!efl_isa(obj, EFL_CANVAS_LAYOUT_CLASS)) return EINA_FALSE;
return !efl_player_paused_get(obj);
}
EAPI void
EDJE_API void
edje_object_transition_duration_factor_set(Evas_Object *obj, double scale)
{
if (scale <= 0.0) return;
efl_player_playback_speed_set(obj, 1.0/scale);
}
EAPI double
EDJE_API double
edje_object_transition_duration_factor_get(const Evas_Object *obj)
{
double speed = efl_player_playback_speed_get(obj);
@ -1141,7 +1141,7 @@ edje_object_transition_duration_factor_get(const Evas_Object *obj)
return 1.0/speed;
}
EAPI void
EDJE_API void
edje_object_size_min_get(const Edje_Object *obj, int *minw, int *minh)
{
Eina_Size2D sz;
@ -1150,7 +1150,7 @@ edje_object_size_min_get(const Edje_Object *obj, int *minw, int *minh)
if (minh) *minh = sz.h;
}
EAPI void
EDJE_API void
edje_object_size_max_get(const Edje_Object *obj, int *maxw, int *maxh)
{
Eina_Size2D sz;
@ -1159,7 +1159,7 @@ edje_object_size_max_get(const Edje_Object *obj, int *maxw, int *maxh)
if (maxh) *maxh = sz.h;
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_part_exists(const Eo *obj, const char *part)
{
return efl_layout_group_part_exist_get(obj, part);

22
src/lib/edje/edje_load.c
View File

@ -104,7 +104,7 @@ _efl_canvas_layout_layout_load_error_get(const Eo *obj EINA_UNUSED, Edje *ed)
return EFL_GFX_IMAGE_LOAD_ERROR_GENERIC;
}
EAPI const char *
EDJE_API const char *
edje_load_error_str(Edje_Load_Error error)
{
switch (error)
@ -144,7 +144,7 @@ edje_load_error_str(Edje_Load_Error error)
}
}
EAPI Eina_List *
EDJE_API Eina_List *
edje_mmap_collection_list(Eina_File *f)
{
Eina_List *lst = NULL;
@ -171,7 +171,7 @@ edje_mmap_collection_list(Eina_File *f)
return lst;
}
EAPI Eina_List *
EDJE_API Eina_List *
edje_file_collection_list(const char *file)
{
Eina_File *f;
@ -191,7 +191,7 @@ err:
return lst;
}
EAPI void
EDJE_API void
edje_file_collection_list_free(Eina_List *lst)
{
while (lst)
@ -201,13 +201,13 @@ edje_file_collection_list_free(Eina_List *lst)
}
}
EAPI void
EDJE_API void
edje_mmap_collection_list_free(Eina_List *lst)
{
edje_file_collection_list_free(lst);
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_mmap_group_exists(Eina_File *f, const char *glob)
{
Edje_File *edf;
@ -268,7 +268,7 @@ edje_mmap_group_exists(Eina_File *f, const char *glob)
return succeed;
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_mmap_3d_has(Eina_File *f EINA_UNUSED, const char *group EINA_UNUSED)
{
return EINA_FALSE;
@ -311,7 +311,7 @@ _edje_file_iterator_free(Eina_Iterator *it)
free(et);
}
EAPI Eina_Iterator *
EDJE_API Eina_Iterator *
edje_file_iterator_new(void)
{
Edje_File_Iterator *it;
@ -330,7 +330,7 @@ edje_file_iterator_new(void)
return &it->iterator;
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_file_group_exists(const char *file, const char *glob)
{
Eina_File *f;
@ -353,7 +353,7 @@ err:
return result;
}
EAPI char *
EDJE_API char *
edje_mmap_data_get(const Eina_File *f, const char *key)
{
Edje_File *edf;
@ -374,7 +374,7 @@ edje_mmap_data_get(const Eina_File *f, const char *key)
return str;
}
EAPI char *
EDJE_API char *
edje_file_data_get(const char *file, const char *key)
{
Eina_File *f;

6
src/lib/edje/edje_main.c
View File

@ -1,7 +1,7 @@
#include "edje_private.h"
static Edje_Version _version = { VMAJ, VMIN, VMIC, VREV };
EAPI Edje_Version * edje_version = &_version;
EDJE_API Edje_Version * edje_version = &_version;
static int _edje_init_count = 0;
static Eina_Bool _need_imf = EINA_FALSE;
@ -31,7 +31,7 @@ static void _edje_ephysics_clear(void);
/*============================================================================*
* API *
*============================================================================*/
EAPI int
EDJE_API int
edje_init(void)
{
Eina_Strbuf *str;
@ -258,7 +258,7 @@ _edje_lib_unref(void)
if (_edje_init_count == 0) _edje_shutdown_core();
}
EAPI int
EDJE_API int
edje_shutdown(void)
{
if (_edje_init_count <= 0)

8
src/lib/edje/edje_message_queue.c
View File

@ -1010,21 +1010,21 @@ _edje_message_del(Edje *ed)
}
}
/* Legacy EAPI */
/* Legacy EDJE_API */
EAPI void
EDJE_API void
edje_object_message_send(Eo *obj, Edje_Message_Type type, int id, void *msg)
{
_edje_object_message_propagate_send(obj, type, id, msg, EINA_FALSE);
}
EAPI void
EDJE_API void
edje_message_signal_process(void)
{
_edje_message_queue_process();
}
EAPI void
EDJE_API void
edje_object_message_handler_set(Eo *obj, Edje_Message_Handler_Cb func, void *data)
{
Edje *ed;

4
src/lib/edje/edje_module.c
View File

@ -11,7 +11,7 @@ Eina_List *_modules_found = NULL;
# define EDJE_MODULE_NAME "module.so"
#endif
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_module_load(const char *module)
{
if (_edje_module_handle_load(module)) return EINA_TRUE;
@ -145,7 +145,7 @@ _edje_module_shutdown(void)
eina_stringshare_del(path);
}
EAPI const Eina_List *
EDJE_API const Eina_List *
edje_available_modules_get(void)
{
Eina_File_Direct_Info *info;

4
src/lib/edje/edje_multisense.c
View File

@ -112,7 +112,7 @@ _channel_mute(Edje *ed EINA_UNUSED, int channel)
#endif
EAPI void
EDJE_API void
edje_audio_channel_mute_set(Edje_Channel channel, Eina_Bool mute)
{
#ifdef ENABLE_MULTISENSE
@ -124,7 +124,7 @@ edje_audio_channel_mute_set(Edje_Channel channel, Eina_Bool mute)
#endif
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_audio_channel_mute_get(Edje_Channel channel)
{
#ifdef ENABLE_MULTISENSE

26
src/lib/edje/edje_part_table.c
View File

@ -228,49 +228,49 @@ _efl_canvas_layout_part_table_efl_pack_table_table_cell_row_set(Eo *obj, void *_
__box; })
#endif
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_part_box_append(Edje_Object *obj, const char *part, Evas_Object *child)
{
Eo *box = PART_BOX_GET(obj, part, EINA_FALSE);
return efl_pack_end(box, child);
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_part_box_prepend(Edje_Object *obj, const char *part, Evas_Object *child)
{
Eo *box = PART_BOX_GET(obj, part, EINA_FALSE);
return efl_pack_begin(box, child);
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_part_box_insert_before(Edje_Object *obj, const char *part, Evas_Object *child, const Evas_Object *reference)
{
Eo *box = PART_BOX_GET(obj, part, EINA_FALSE);
return efl_pack_before(box, child, reference);
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_part_box_insert_after(Edje_Object *obj, const char *part, Evas_Object *child, const Evas_Object *reference)
{
Eo *box = PART_BOX_GET(obj, part, EINA_FALSE);
return efl_pack_after(box, child, reference);
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_part_box_insert_at(Edje_Object *obj, const char *part, Evas_Object *child, unsigned int pos)
{
Eo *box = PART_BOX_GET(obj, part, EINA_FALSE);
return efl_pack_at(box, child, pos);
}
EAPI Evas_Object *
EDJE_API Evas_Object *
edje_object_part_box_remove_at(Edje_Object *obj, const char *part, unsigned int pos)
{
Eo *box = PART_BOX_GET(obj, part, NULL);
return efl_pack_unpack_at(box, pos);
}
EAPI Evas_Object *
EDJE_API Evas_Object *
edje_object_part_box_remove(Edje_Object *obj, const char *part, Evas_Object *child)
{
Eo *box = PART_BOX_GET(obj, part, NULL);
@ -279,7 +279,7 @@ edje_object_part_box_remove(Edje_Object *obj, const char *part, Evas_Object *chi
return NULL;
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_part_box_remove_all(Edje_Object *obj, const char *part, Eina_Bool clear)
{
Eo *box = PART_BOX_GET(obj, part, EINA_FALSE);
@ -289,14 +289,14 @@ edje_object_part_box_remove_all(Edje_Object *obj, const char *part, Eina_Bool cl
return efl_pack_unpack_all(box);
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_part_table_pack(Edje_Object *obj, const char *part, Evas_Object *child_obj, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan)
{
Eo *table = PART_TABLE_GET(obj, part, EINA_FALSE);
return efl_pack_table(table, child_obj, col, row, colspan, rowspan);
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_part_table_col_row_size_get(const Edje_Object *obj, const char *part, int *cols, int *rows)
{
Eo *table = PART_TABLE_GET(obj, part, EINA_FALSE);
@ -304,21 +304,21 @@ edje_object_part_table_col_row_size_get(const Edje_Object *obj, const char *part
return EINA_TRUE;
}
EAPI Evas_Object *
EDJE_API Evas_Object *
edje_object_part_table_child_get(const Edje_Object *obj, const char *part, unsigned int col, unsigned int row)
{
Eo *table = PART_TABLE_GET(obj, part, NULL);
return efl_pack_table_content_get(table, col, row);
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_part_table_unpack(Edje_Object *obj, const char *part, Evas_Object *child_obj)
{
Eo *table = PART_TABLE_GET(obj, part, EINA_FALSE);
return efl_pack_unpack(table, child_obj);
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_part_table_clear(Edje_Object *obj, const char *part, Eina_Bool clear)
{
Eo *table = PART_TABLE_GET(obj, part, EINA_FALSE);

84
src/lib/edje/edje_private.h
View File

@ -64,39 +64,14 @@
#endif
#include "Edje.h"
#include <edje_api.h>
#define EFL_INTERNAL_UNSTABLE
#include <Evas_Internal.h>
#ifdef EAPI
# undef EAPI
#endif
#ifdef _WIN32
# ifdef EFL_BUILD
# ifdef DLL_EXPORT
# define EAPI __declspec(dllexport)
# else
# define EAPI
# endif
# else
# define EAPI __declspec(dllimport)
# endif
#else
# ifdef __GNUC__
# if __GNUC__ >= 4
# define EAPI __attribute__ ((visibility("default")))
# else
# define EAPI
# endif
# else
# define EAPI
# endif
#endif
// This object is internal, only the interface needs to be exposed.
#include "edje_global.eo.h"
EAPI extern int _edje_default_log_dom ;
EDJE_API extern int _edje_default_log_dom ;
#ifdef EDJE_DEFAULT_LOG_COLOR
# undef EDJE_DEFAULT_LOG_COLOR
@ -2318,12 +2293,12 @@ Eina_Bool _edje_object_signal_callback_add(Evas_Object *obj, Edje *ed,
Efl_Signal_Cb func_eo, Eina_Free_Cb func_free_cb, void *data);
// FIXME remove below 3 eapi decls when edje_convert goes
EAPI void _edje_edd_init(void);
EAPI void _edje_data_font_list_desc_make(Eet_Data_Descriptor **_font_list_edd, Eet_Data_Descriptor **_font_edd);
EAPI void _edje_edd_shutdown(void);
EDJE_API void _edje_edd_init(void);
EDJE_API void _edje_data_font_list_desc_make(Eet_Data_Descriptor **_font_list_edd, Eet_Data_Descriptor **_font_edd);
EDJE_API void _edje_edd_shutdown(void);
EAPI extern Eet_Data_Descriptor *_edje_edd_edje_file;
EAPI extern Eet_Data_Descriptor *_edje_edd_edje_part_collection;
EDJE_API extern Eet_Data_Descriptor *_edje_edd_edje_file;
EDJE_API extern Eet_Data_Descriptor *_edje_edd_edje_part_collection;
extern Eina_Inlist *_edje_edjes;
@ -2349,20 +2324,20 @@ extern Eina_Hash *_edje_id_hash;
extern const char *_edje_language;
extern const char *_edje_cache_path;
EAPI extern Eina_Mempool *_emp_RECTANGLE;
EAPI extern Eina_Mempool *_emp_TEXT;
EAPI extern Eina_Mempool *_emp_IMAGE;
EAPI extern Eina_Mempool *_emp_PROXY;
EAPI extern Eina_Mempool *_emp_SWALLOW;
EAPI extern Eina_Mempool *_emp_TEXTBLOCK;
EAPI extern Eina_Mempool *_emp_GROUP;
EAPI extern Eina_Mempool *_emp_BOX;
EAPI extern Eina_Mempool *_emp_TABLE;
EAPI extern Eina_Mempool *_emp_EXTERNAL;
EAPI extern Eina_Mempool *_emp_SPACER;
EAPI extern Eina_Mempool *_emp_SNAPSHOT;
EAPI extern Eina_Mempool *_emp_part;
EAPI extern Eina_Mempool *_emp_VECTOR;
EDJE_API extern Eina_Mempool *_emp_RECTANGLE;
EDJE_API extern Eina_Mempool *_emp_TEXT;
EDJE_API extern Eina_Mempool *_emp_IMAGE;
EDJE_API extern Eina_Mempool *_emp_PROXY;
EDJE_API extern Eina_Mempool *_emp_SWALLOW;
EDJE_API extern Eina_Mempool *_emp_TEXTBLOCK;
EDJE_API extern Eina_Mempool *_emp_GROUP;
EDJE_API extern Eina_Mempool *_emp_BOX;
EDJE_API extern Eina_Mempool *_emp_TABLE;
EDJE_API extern Eina_Mempool *_emp_EXTERNAL;
EDJE_API extern Eina_Mempool *_emp_SPACER;
EDJE_API extern Eina_Mempool *_emp_SNAPSHOT;
EDJE_API extern Eina_Mempool *_emp_part;
EDJE_API extern Eina_Mempool *_emp_VECTOR;
static inline Edje_Global *
_edje_global(void)
@ -2443,8 +2418,8 @@ Eina_Bool _edje_signal_callback_disable(Edje_Signal_Callback_Group *cgp,
Edje_Signal_Cb func_legacy,
EflLayoutSignalCb func, Eina_Free_Cb func_free_cb, void *data);
EAPI void _edje_edd_init(void);
EAPI void _edje_edd_shutdown(void);
EDJE_API void _edje_edd_init(void);
EDJE_API void _edje_edd_shutdown(void);
Eina_Error _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const char *group, const char *parent, Eina_List *group_path, Eina_Array *nested);
@ -2666,9 +2641,9 @@ Edje_File *_edje_file_cache_find(const Eina_File *file);
void _edje_cache_coll_clean(Edje_File *edf);
void _edje_cache_coll_flush(Edje_File *edf);
void _edje_cache_coll_unref(Edje_File *edf, Edje_Part_Collection *edc);
EAPI void edje_cache_emp_alloc(Edje_Part_Collection_Directory_Entry *ce);
EAPI void edje_cache_emp_free(Edje_Part_Collection_Directory_Entry *ce);
EAPI void _edje_cache_file_unref(Edje_File *edf);
EDJE_API void edje_cache_emp_alloc(Edje_Part_Collection_Directory_Entry *ce);
EDJE_API void edje_cache_emp_free(Edje_Part_Collection_Directory_Entry *ce);
EDJE_API void _edje_cache_file_unref(Edje_File *edf);
void _edje_embryo_globals_init(Edje *ed);
@ -2888,8 +2863,8 @@ void edje_object_propagate_callback_add(Evas_Object *obj, void (*func) (void *da
/* used by edje_cc - private still */
EAPI void _edje_program_insert(Edje_Part_Collection *ed, Edje_Program *p);
EAPI void _edje_program_remove(Edje_Part_Collection *ed, Edje_Program *p);
EDJE_API void _edje_program_insert(Edje_Part_Collection *ed, Edje_Program *p);
EDJE_API void _edje_program_remove(Edje_Part_Collection *ed, Edje_Program *p);
void _edje_lua2_error_full(const char *file, const char *fnc, int line, lua_State *L, int err_code);
#define _edje_lua2_error(L, err_code) _edje_lua2_error_full(__FILE__, __func__, __LINE__, L, err_code)
@ -3279,7 +3254,4 @@ typedef RemixBase* (*MULTISENSE_SOUND_PLAYER_GET_FUNC) (Edje_Multisense_Env *);
#include "efl_canvas_layout_part_invalid.eo.h"
#undef EAPI
#define EAPI
#endif

12
src/lib/edje/edje_program.c
View File

@ -212,25 +212,25 @@ _efl_canvas_layout_seat_get(const Eo *obj EINA_UNUSED, Edje *ed, Eina_Stringshar
return _edje_seat_get(ed, name);
}
EAPI void
EDJE_API void
edje_frametime_set(double t)
{
ecore_animator_frametime_set(t);
}
EAPI double
EDJE_API double
edje_frametime_get(void)
{
return ecore_animator_frametime_get();
}
EAPI double
EDJE_API double
edje_transition_duration_factor_get(void)
{
return _edje_transition_duration_scale;
}
EAPI void
EDJE_API void
edje_transition_duration_factor_set(double scale)
{
_edje_transition_duration_scale = FROM_DOUBLE(scale);
@ -1698,14 +1698,14 @@ break_prog:
static void *callback_extra_data = NULL;
static void *callback_seat_data = NULL;
EAPI void *
EDJE_API void *
edje_object_signal_callback_extra_data_get(void)
{
return callback_extra_data;
}
#ifdef EFL_BETA_API_SUPPORT
EAPI void *
EDJE_API void *
edje_object_signal_callback_seat_data_get(void)
{
return callback_seat_data;

8
src/lib/edje/edje_smart.c
View File

@ -18,7 +18,7 @@ Eina_Inlist *_edje_edjes = NULL;
/************************** API Routines **************************/
EAPI Evas_Object *
EDJE_API Evas_Object *
edje_object_add(Evas *evas)
{
evas = evas_find(evas);
@ -457,20 +457,20 @@ _efl_canvas_layout_efl_file_load(Eo *obj, Edje *ed)
return err;
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_mmap_set(Edje_Object *obj, const Eina_File *file, const char *group)
{
return efl_file_simple_mmap_load(obj, file, group);
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_file_set(Edje_Object *obj, const char *file, const char *group)
{
/* mtime checking of file is handled in efl.file mixin */
return efl_file_simple_load(obj, file, group);
}
EAPI void
EDJE_API void
edje_object_file_get(const Edje_Object *obj, const char **file, const char **group)
{
if (file) *file = efl_file_get(obj);

200
src/lib/edje/edje_util.c
View File

@ -208,7 +208,7 @@ _edje_user_def_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *child EINA_U
#define FASTFREEZE 1
EAPI void
EDJE_API void
edje_freeze(void)
{
#ifdef FASTFREEZE
@ -317,7 +317,7 @@ _efl_canvas_layout_efl_ui_i18n_language_get(const Eo *obj EINA_UNUSED, Edje *ed)
return ed->language;
}
EAPI void
EDJE_API void
edje_language_set(const char *locale)
{
Edje *ed;
@ -345,7 +345,7 @@ edje_language_set(const char *locale)
}
}
EAPI void
EDJE_API void
edje_thaw(void)
{
#ifdef FASTFREEZE
@ -369,7 +369,7 @@ edje_thaw(void)
#endif
}
EAPI void
EDJE_API void
edje_fontset_append_set(const char *fonts)
{
if (_edje_fontset_append)
@ -381,13 +381,13 @@ edje_fontset_append_set(const char *fonts)
_edje_fontset_append_escaped = fonts ? eina_str_escape(fonts) : NULL;
}
EAPI const char *
EDJE_API const char *
edje_fontset_append_get(void)
{
return _edje_fontset_append;
}
EAPI void
EDJE_API void
edje_scale_set(double scale)
{
Edje *ed;
@ -397,20 +397,20 @@ edje_scale_set(double scale)
EINA_INLIST_FOREACH(_edje_edjes, ed) edje_object_calc_force(ed->obj);
}
EAPI double
EDJE_API double
edje_scale_get(void)
{
return TO_DOUBLE(_edje_scale);
}
EAPI void
EDJE_API void
edje_password_show_last_set(Eina_Bool password_show_last)
{
if (_edje_password_show_last == password_show_last) return;
_edje_password_show_last = password_show_last;
}
EAPI void
EDJE_API void
edje_password_show_last_timeout_set(double password_show_last_timeout)
{
if (EINA_DBL_EQ(_edje_password_show_last_timeout, password_show_last_timeout)) return;
@ -449,7 +449,7 @@ _efl_canvas_layout_efl_gfx_entity_scale_get(const Eo *obj EINA_UNUSED, Edje *ed)
return TO_DOUBLE(ed->scale);
}
EAPI double
EDJE_API double
edje_object_base_scale_get(const Evas_Object *obj)
{
Edje *ed;
@ -692,7 +692,7 @@ _edje_color_class_get_internal(Edje_Color_Class *cc, Efl_Gfx_Color_Class_Layer l
}
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_color_class_set(const char *color_class, int r, int g, int b, int a, int r2, int g2, int b2, int a2, int r3, int g3, int b3, int a3)
{
Eina_Bool result = EINA_TRUE;
@ -730,7 +730,7 @@ _edje_global_efl_gfx_color_class_color_class_set(Eo *obj EINA_UNUSED, void *pd E
return int_ret;
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_color_class_get(const char *color_class, int *r, int *g, int *b, int *a, int *r2, int *g2, int *b2, int *a2, int *r3, int *g3, int *b3, int *a3)
{
Eina_Bool int_ret = EINA_TRUE;
@ -756,7 +756,7 @@ _edje_global_efl_gfx_color_class_color_class_get(const Eo *obj EINA_UNUSED, void
return _edje_color_class_get_internal(cc, layer, r, g, b, a);
}
EAPI void
EDJE_API void
edje_color_class_del(const char *color_class)
{
efl_gfx_color_class_del(_edje_global(), color_class);
@ -858,7 +858,7 @@ _edje_color_class_active_iterator_free(Eina_Iterator *it)
free(et);
}
EAPI Eina_Iterator *
EDJE_API Eina_Iterator *
edje_color_class_active_iterator_new(void)
{
Edje_Active_Color_Class_Iterator *it;
@ -888,7 +888,7 @@ _edje_color_class_list_foreach(const Eina_Hash *hash EINA_UNUSED, const void *ke
return EINA_TRUE;
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_color_class_set(Evas_Object *obj, const char *color_class, int r, int g, int b, int a, int r2, int g2, int b2, int a2, int r3, int g3, int b3, int a3)
{
Eina_Bool int_ret = EINA_TRUE;
@ -936,7 +936,7 @@ _efl_canvas_layout_efl_gfx_color_class_color_class_set(Eo *obj EINA_UNUSED, Edje
return int_ret;
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_color_class_get(const Evas_Object *obj, const char *color_class, int *r, int *g, int *b, int *a, int *r2, int *g2, int *b2, int *a2, int *r3, int *g3, int *b3, int *a3)
{
Eina_Bool int_ret = EINA_TRUE;
@ -961,7 +961,7 @@ _efl_canvas_layout_efl_gfx_color_class_color_class_get(const Eo *obj EINA_UNUSED
return _edje_color_class_get_internal(cc, layer, r, g, b, a);
}
EAPI const char *
EDJE_API const char *
edje_object_color_class_description_get(const Evas_Object *obj, const char *color_class)
{
return efl_gfx_color_class_description_get(obj, color_class);
@ -974,7 +974,7 @@ _efl_canvas_layout_efl_gfx_color_class_color_class_description_get(const Eo *obj
return cc ? cc->desc : NULL;
}
EAPI void
EDJE_API void
edje_object_color_class_del(Evas_Object *obj, const char *color_class)
{
efl_gfx_color_class_del(obj, color_class);
@ -1011,7 +1011,7 @@ _efl_canvas_layout_efl_gfx_color_class_color_class_del(Eo *obj EINA_UNUSED, Edje
_edje_emit(ed, "color_class,del", color_class);
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_color_class_clear(const Evas_Object *obj)
{
efl_gfx_color_class_clear((Eo *)obj);
@ -1105,7 +1105,7 @@ _edje_mmap_color_class_iterator_free(Eina_Iterator *it)
free(et);
}
EAPI Eina_Iterator *
EDJE_API Eina_Iterator *
edje_mmap_color_class_iterator_new(Eina_File *f)
{
Edje_File_Color_Class_Iterator *it;
@ -1134,7 +1134,7 @@ on_error:
return NULL;
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_text_class_set(const char *text_class, const char *font, Evas_Font_Size size)
{
return efl_gfx_text_class_set(_edje_global(), text_class, font, (Efl_Font_Size)size);
@ -1185,7 +1185,7 @@ _edje_global_efl_gfx_text_class_text_class_set(Eo *obj EINA_UNUSED, void *pd EIN
return EINA_TRUE;
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_text_class_get(const char *text_class, const char **font, Evas_Font_Size *size)
{
return efl_gfx_text_class_get(_edje_global(), text_class, font, (Efl_Font_Size *)size);
@ -1216,7 +1216,7 @@ _edje_global_efl_gfx_text_class_text_class_get(const Eo *obj EINA_UNUSED, void *
return EINA_TRUE;
}
EAPI void
EDJE_API void
edje_text_class_del(const char *text_class)
{
efl_gfx_text_class_del(_edje_global(), text_class);
@ -1307,7 +1307,7 @@ _edje_text_class_active_iterator_free(Eina_Iterator *it)
free(et);
}
EAPI Eina_Iterator *
EDJE_API Eina_Iterator *
edje_text_class_active_iterator_new(void)
{
Edje_Active_Text_Class_Iterator *it;
@ -1360,7 +1360,7 @@ _edje_file_find(const char *file)
return edf;
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_file_text_class_get(const char *file, const char * text_class, const char **font, Evas_Font_Size *size)
{
Edje_Text_Class *tc = NULL;
@ -1388,7 +1388,7 @@ end:
return ret;
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_file_text_class_del(const char *file, const char *text_class)
{
Edje_Text_Class *tc = NULL;
@ -1416,7 +1416,7 @@ end:
return ret;
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_file_text_class_set(const char *file, const char *text_class, const char *font, Evas_Font_Size size)
{
Edje_File *edf = NULL;
@ -1471,7 +1471,7 @@ error_end:
return ret;
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_text_class_set(Evas_Object *obj, const char *text_class, const char *font, Evas_Font_Size size)
{
return efl_gfx_text_class_set(obj, text_class, font, (Efl_Font_Size)size);
@ -1541,7 +1541,7 @@ _efl_canvas_layout_efl_gfx_text_class_text_class_set(Eo *obj EINA_UNUSED, Edje *
return EINA_TRUE;
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_text_class_get(const Evas_Object *obj, const char *text_class, const char **font, Evas_Font_Size *size)
{
return efl_gfx_text_class_get(obj, text_class, font, (Efl_Font_Size *)size);
@ -1567,7 +1567,7 @@ _efl_canvas_layout_efl_gfx_text_class_text_class_get(const Eo *obj EINA_UNUSED,
return EINA_TRUE;
}
EAPI void
EDJE_API void
edje_object_text_class_del(Evas_Object *obj, const char *text_class)
{
efl_gfx_text_class_del(obj, text_class);
@ -1643,7 +1643,7 @@ _edje_mmap_text_class_iterator_free(Eina_Iterator *it)
free(et);
}
EAPI Eina_Iterator *
EDJE_API Eina_Iterator *
edje_mmap_text_class_iterator_new(Eina_File *f)
{
Edje_File_Text_Class_Iterator *it;
@ -1672,7 +1672,7 @@ on_error:
return NULL;
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_size_class_set(const char *size_class, Evas_Coord minw, Evas_Coord minh, Evas_Coord maxw, Evas_Coord maxh)
{
return efl_gfx_size_class_set(_edje_global(), size_class, minw, minh, maxw, maxh);
@ -1726,7 +1726,7 @@ _edje_global_efl_gfx_size_class_size_class_set(Eo *obj EINA_UNUSED, void *pd EIN
return EINA_TRUE;
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_size_class_get(const char *size_class, Evas_Coord *minw, Evas_Coord *minh, Evas_Coord *maxw, Evas_Coord *maxh)
{
return efl_gfx_size_class_get(_edje_global(), size_class, minw, minh, maxw, maxh);
@ -1761,7 +1761,7 @@ _edje_global_efl_gfx_size_class_size_class_get(const Eo *obj EINA_UNUSED, void *
return EINA_TRUE;
}
EAPI void
EDJE_API void
edje_size_class_del(const char *size_class)
{
efl_gfx_size_class_del(_edje_global(), size_class);
@ -1851,7 +1851,7 @@ _edje_size_class_active_iterator_free(Eina_Iterator *it)
free(et);
}
EAPI Eina_Iterator *
EDJE_API Eina_Iterator *
edje_size_class_active_iterator_new(void)
{
Edje_Active_Size_Class_Iterator *it;
@ -1881,7 +1881,7 @@ _edje_size_class_list_foreach(const Eina_Hash *hash EINA_UNUSED, const void *key
return EINA_TRUE;
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_size_class_set(Evas_Object *obj, const char *size_class, Evas_Coord minw, Evas_Coord minh, Evas_Coord maxw, Evas_Coord maxh)
{
return efl_gfx_size_class_set(obj, size_class, minw, minh, maxw, maxh);
@ -1949,7 +1949,7 @@ _efl_canvas_layout_efl_gfx_size_class_size_class_set(Eo *obj EINA_UNUSED, Edje *
return EINA_TRUE;
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_size_class_get(const Evas_Object *obj, const char *size_class, Evas_Coord *minw, Evas_Coord *minh, Evas_Coord *maxw, Evas_Coord *maxh)
{
return efl_gfx_size_class_get(obj, size_class, minw, minh, maxw, maxh);
@ -1979,7 +1979,7 @@ _efl_canvas_layout_efl_gfx_size_class_size_class_get(const Eo *obj EINA_UNUSED,
return EINA_TRUE;
}
EAPI void
EDJE_API void
edje_object_size_class_del(Evas_Object *obj, const char *size_class)
{
efl_gfx_size_class_del(obj, size_class);
@ -2054,7 +2054,7 @@ _edje_mmap_size_class_iterator_free(Eina_Iterator *it)
free(et);
}
EAPI Eina_Iterator *
EDJE_API Eina_Iterator *
edje_mmap_size_class_iterator_new(Eina_File *f)
{
Edje_File_Size_Class_Iterator *it;
@ -2084,7 +2084,7 @@ on_error:
}
/* Legacy API: exposes internal object. Easy to abuse. */
EAPI const Evas_Object *
EDJE_API const Evas_Object *
edje_object_part_object_get(const Eo *obj, const char *part)
{
Edje_Real_Part *rp;
@ -2102,7 +2102,7 @@ edje_object_part_object_get(const Eo *obj, const char *part)
return rp->object;
}
EAPI void
EDJE_API void
edje_object_item_provider_set(Edje_Object *obj, Edje_Item_Provider_Cb func, void *data)
{
Edje *ed = _edje_fetch(obj);
@ -2111,7 +2111,7 @@ edje_object_item_provider_set(Edje_Object *obj, Edje_Item_Provider_Cb func, void
ed->item_provider.data = data;
}
EAPI void
EDJE_API void
edje_object_text_change_cb_set(Eo *obj, Edje_Text_Change_Cb func, void *data)
{
unsigned short i;
@ -2367,7 +2367,7 @@ _edje_efl_text_text_get(const Eo *obj EINA_UNUSED, Edje *ed, const char *part,
return NULL;
}
EAPI const char *
EDJE_API const char *
edje_object_part_text_selection_get(const Eo *obj, const char *part)
{
Edje_Real_Part *rp;
@ -2384,7 +2384,7 @@ edje_object_part_text_selection_get(const Eo *obj, const char *part)
return NULL;
}
EAPI void
EDJE_API void
edje_object_part_text_select_none(const Eo *obj, const char *part)
{
Edje_Real_Part *rp;
@ -2399,7 +2399,7 @@ edje_object_part_text_select_none(const Eo *obj, const char *part)
_edje_entry_select_none(rp);
}
EAPI void
EDJE_API void
edje_object_part_text_select_all(const Eo *obj, const char *part)
{
Edje_Real_Part *rp;
@ -2434,7 +2434,7 @@ _efl_canvas_layout_part_text_cursor_geometry_get(Eo *obj EINA_UNUSED, Edje *ed,
}
}
EAPI void
EDJE_API void
edje_object_part_text_select_allow_set(const Eo *obj, const char *part, Eina_Bool allow)
{
Edje_Real_Part *rp;
@ -2449,7 +2449,7 @@ edje_object_part_text_select_allow_set(const Eo *obj, const char *part, Eina_Boo
_edje_entry_select_allow_set(rp, allow);
}
EAPI void
EDJE_API void
edje_object_part_text_select_abort(const Eo *obj, const char *part)
{
Edje_Real_Part *rp;
@ -2464,7 +2464,7 @@ edje_object_part_text_select_abort(const Eo *obj, const char *part)
_edje_entry_select_abort(rp);
}
EAPI void
EDJE_API void
edje_object_part_text_select_begin(const Eo *obj, const char *part)
{
Edje_Real_Part *rp;
@ -2479,7 +2479,7 @@ edje_object_part_text_select_begin(const Eo *obj, const char *part)
_edje_entry_select_begin(rp);
}
EAPI void
EDJE_API void
edje_object_part_text_select_extend(const Eo *obj, const char *part)
{
Edje_Real_Part *rp;
@ -2676,7 +2676,7 @@ _efl_canvas_layout_part_text_cursor_pos_get(Eo *obj EINA_UNUSED, Edje *ed, const
return ret;
}
EAPI void *
EDJE_API void *
edje_object_part_text_imf_context_get(const Eo *obj, const char *part)
{
Edje_Real_Part *rp;
@ -2695,7 +2695,7 @@ edje_object_part_text_imf_context_get(const Eo *obj, const char *part)
return NULL;
}
EAPI void
EDJE_API void
edje_object_part_text_imf_context_reset(const Eo *obj, const char *part)
{
Edje_Real_Part *rp;
@ -2712,7 +2712,7 @@ edje_object_part_text_imf_context_reset(const Eo *obj, const char *part)
}
}
EAPI void
EDJE_API void
edje_object_part_text_input_panel_layout_set(Eo *obj, const char *part, Edje_Input_Panel_Layout layout)
{
Edje_Real_Part *rp;
@ -2729,7 +2729,7 @@ edje_object_part_text_input_panel_layout_set(Eo *obj, const char *part, Edje_Inp
}
}
EAPI Edje_Input_Panel_Layout
EDJE_API Edje_Input_Panel_Layout
edje_object_part_text_input_panel_layout_get(const Eo *obj, const char *part)
{
Edje_Input_Panel_Layout ret;
@ -2750,7 +2750,7 @@ edje_object_part_text_input_panel_layout_get(const Eo *obj, const char *part)
return ret;
}
EAPI void
EDJE_API void
edje_object_part_text_input_panel_layout_variation_set(Eo *obj, const char *part, int variation)
{
Edje_Real_Part *rp;
@ -2767,7 +2767,7 @@ edje_object_part_text_input_panel_layout_variation_set(Eo *obj, const char *part
}
}
EAPI int
EDJE_API int
edje_object_part_text_input_panel_layout_variation_get(const Eo *obj, const char *part)
{
int r;
@ -2788,7 +2788,7 @@ edje_object_part_text_input_panel_layout_variation_get(const Eo *obj, const char
return r;
}
EAPI void
EDJE_API void
edje_object_part_text_autocapital_type_set(Eo *obj, const char *part, Edje_Text_Autocapital_Type autocapital_type)
{
Edje_Real_Part *rp;
@ -2804,7 +2804,7 @@ edje_object_part_text_autocapital_type_set(Eo *obj, const char *part, Edje_Text_
}
}
EAPI Edje_Text_Autocapital_Type
EDJE_API Edje_Text_Autocapital_Type
edje_object_part_text_autocapital_type_get(const Eo *obj, const char *part)
{
Edje_Text_Autocapital_Type ret;
@ -2825,7 +2825,7 @@ edje_object_part_text_autocapital_type_get(const Eo *obj, const char *part)
return ret;
}
EAPI void
EDJE_API void
edje_object_part_text_prediction_allow_set(Eo *obj, const char *part, Eina_Bool prediction)
{
Edje_Real_Part *rp;
@ -2842,7 +2842,7 @@ edje_object_part_text_prediction_allow_set(Eo *obj, const char *part, Eina_Bool
}
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_part_text_prediction_allow_get(const Eo *obj, const char *part)
{
Eina_Bool ret;
@ -2863,7 +2863,7 @@ edje_object_part_text_prediction_allow_get(const Eo *obj, const char *part)
return ret;
}
EAPI void
EDJE_API void
edje_object_part_text_input_hint_set(Eo *obj, const char *part, Edje_Input_Hints input_hints)
{
Edje_Real_Part *rp;
@ -2880,7 +2880,7 @@ edje_object_part_text_input_hint_set(Eo *obj, const char *part, Edje_Input_Hints
}
}
EAPI Edje_Input_Hints
EDJE_API Edje_Input_Hints
edje_object_part_text_input_hint_get(const Eo *obj, const char *part)
{
Edje_Real_Part *rp;
@ -2898,7 +2898,7 @@ edje_object_part_text_input_hint_get(const Eo *obj, const char *part)
return EINA_FALSE;
}
EAPI void
EDJE_API void
edje_object_part_text_input_panel_enabled_set(Eo *obj, const char *part, Eina_Bool enabled)
{
Edje_Real_Part *rp;
@ -2915,7 +2915,7 @@ edje_object_part_text_input_panel_enabled_set(Eo *obj, const char *part, Eina_Bo
}
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_part_text_input_panel_enabled_get(const Eo *obj, const char *part)
{
Eina_Bool ret;
@ -2936,7 +2936,7 @@ edje_object_part_text_input_panel_enabled_get(const Eo *obj, const char *part)
return ret;
}
EAPI void
EDJE_API void
edje_object_part_text_input_panel_show(const Eo *obj, const char *part)
{
Edje_Real_Part *rp;
@ -2951,7 +2951,7 @@ edje_object_part_text_input_panel_show(const Eo *obj, const char *part)
_edje_entry_input_panel_show(rp);
}
EAPI void
EDJE_API void
edje_object_part_text_input_panel_hide(const Eo *obj, const char *part)
{
Edje_Real_Part *rp;
@ -2966,7 +2966,7 @@ edje_object_part_text_input_panel_hide(const Eo *obj, const char *part)
_edje_entry_input_panel_hide(rp);
}
EAPI void
EDJE_API void
edje_object_part_text_input_panel_language_set(Eo *obj, const char *part, Edje_Input_Panel_Lang lang)
{
Edje_Real_Part *rp;
@ -2983,7 +2983,7 @@ edje_object_part_text_input_panel_language_set(Eo *obj, const char *part, Edje_I
}
}
EAPI Edje_Input_Panel_Lang
EDJE_API Edje_Input_Panel_Lang
edje_object_part_text_input_panel_language_get(const Eo *obj, const char *part)
{
Edje_Input_Panel_Lang ret;
@ -3004,7 +3004,7 @@ edje_object_part_text_input_panel_language_get(const Eo *obj, const char *part)
return ret;
}
EAPI void
EDJE_API void
edje_object_part_text_input_panel_imdata_set(Eo *obj, const char *part, const void *data, int len)
{
Edje_Real_Part *rp;
@ -3021,7 +3021,7 @@ edje_object_part_text_input_panel_imdata_set(Eo *obj, const char *part, const vo
}
}
EAPI void
EDJE_API void
edje_object_part_text_input_panel_imdata_get(const Eo *obj, const char *part, void *data, int *len)
{
Edje_Real_Part *rp;
@ -3038,7 +3038,7 @@ edje_object_part_text_input_panel_imdata_get(const Eo *obj, const char *part, vo
}
}
EAPI void
EDJE_API void
edje_object_part_text_input_panel_return_key_type_set(Eo *obj, const char *part, Edje_Input_Panel_Return_Key_Type return_key_type)
{
Edje_Real_Part *rp;
@ -3055,7 +3055,7 @@ edje_object_part_text_input_panel_return_key_type_set(Eo *obj, const char *part,
}
}
EAPI Edje_Input_Panel_Return_Key_Type
EDJE_API Edje_Input_Panel_Return_Key_Type
edje_object_part_text_input_panel_return_key_type_get(const Eo *obj, const char *part)
{
Edje_Input_Panel_Return_Key_Type ret;
@ -3076,7 +3076,7 @@ edje_object_part_text_input_panel_return_key_type_get(const Eo *obj, const char
return ret;
}
EAPI void
EDJE_API void
edje_object_part_text_input_panel_return_key_disabled_set(Eo *obj, const char *part, Eina_Bool disabled)
{
Edje_Real_Part *rp;
@ -3093,7 +3093,7 @@ edje_object_part_text_input_panel_return_key_disabled_set(Eo *obj, const char *p
}
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_part_text_input_panel_return_key_disabled_get(const Eo *obj, const char *part)
{
Eina_Bool ret;
@ -3114,7 +3114,7 @@ edje_object_part_text_input_panel_return_key_disabled_get(const Eo *obj, const c
return ret;
}
EAPI void
EDJE_API void
edje_object_part_text_input_panel_show_on_demand_set(Eo *obj, const char *part, Eina_Bool ondemand)
{
Edje_Real_Part *rp;
@ -3131,7 +3131,7 @@ edje_object_part_text_input_panel_show_on_demand_set(Eo *obj, const char *part,
}
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_part_text_input_panel_show_on_demand_get(const Eo *obj, const char *part)
{
Eina_Bool ret;
@ -3152,7 +3152,7 @@ edje_object_part_text_input_panel_show_on_demand_get(const Eo *obj, const char *
return ret;
}
EAPI void
EDJE_API void
edje_object_part_text_prediction_hint_set(Eo *obj, const char *part, const char *prediction_hint)
{
Edje_Real_Part *rp;
@ -3244,7 +3244,7 @@ _edje_efl_content_content_set(Edje *ed, const char *part, Efl_Gfx_Entity *obj_sw
return EINA_TRUE;
}
EAPI void
EDJE_API void
edje_extern_object_min_size_set(Evas_Object *obj, Evas_Coord minw, Evas_Coord minh)
{
if (!obj) return;
@ -3252,7 +3252,7 @@ edje_extern_object_min_size_set(Evas_Object *obj, Evas_Coord minw, Evas_Coord mi
evas_object_size_hint_min_set(obj, minw, minh);
}
EAPI void
EDJE_API void
edje_extern_object_max_size_set(Evas_Object *obj, Evas_Coord maxw, Evas_Coord maxh)
{
if (!obj) return;
@ -3260,7 +3260,7 @@ edje_extern_object_max_size_set(Evas_Object *obj, Evas_Coord maxw, Evas_Coord ma
evas_object_size_hint_max_set(obj, maxw, maxh);
}
EAPI void
EDJE_API void
edje_extern_object_aspect_set(Evas_Object *obj, Edje_Aspect_Control aspect, Evas_Coord aw, Evas_Coord ah)
{
if (!obj) return;
@ -3361,7 +3361,7 @@ _edje_box_layout_part_external_find(const char *name)
NULL);
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_part_text_prediction_hint_hash_set(Eo *obj, const char *part, const char *key, const char *value)
{
Edje_Real_Part *rp;
@ -3380,7 +3380,7 @@ edje_object_part_text_prediction_hint_hash_set(Eo *obj, const char *part, const
return EINA_FALSE;
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_part_text_prediction_hint_hash_del(Eo *obj, const char *part, const char *key)
{
Edje_Real_Part *rp;
@ -3458,7 +3458,7 @@ _edje_box_layout_part_external_new(const char *name, Evas_Object_Box_Layout func
return l;
}
EAPI void
EDJE_API void
edje_box_layout_register(const char *name, Evas_Object_Box_Layout func, void *(*layout_data_get)(void *), void (*layout_data_free)(void *), void (*free_data)(void *), void *data)
{
Edje_Box_Layout *l;
@ -4856,7 +4856,7 @@ _efl_canvas_layout_access_part_iterate(Eo *obj EINA_UNUSED, Edje *ed)
return &it->iterator;
}
EAPI Eina_List *
EDJE_API Eina_List *
edje_object_access_part_list_get(const Edje_Object *obj)
{
Eina_List *access_parts = NULL;
@ -5255,7 +5255,7 @@ _edje_perspective_obj_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA
free(ps);
}
EAPI Edje_Perspective *
EDJE_API Edje_Perspective *
edje_perspective_new(Evas *e)
{
Edje_Perspective *ps;
@ -5275,14 +5275,14 @@ edje_perspective_new(Evas *e)
return ps;
}
EAPI void
EDJE_API void
edje_perspective_free(Edje_Perspective *ps)
{
if (!ps) return;
evas_object_del(ps->obj);
}
EAPI void
EDJE_API void
edje_perspective_set(Edje_Perspective *ps, Evas_Coord px, Evas_Coord py, Evas_Coord z0, Evas_Coord foc)
{
Eina_List *l;
@ -5323,7 +5323,7 @@ edje_perspective_set(Edje_Perspective *ps, Evas_Coord px, Evas_Coord py, Evas_Co
}
}
EAPI void
EDJE_API void
edje_perspective_global_set(Edje_Perspective *ps, Eina_Bool global)
{
Edje *ed;
@ -5352,14 +5352,14 @@ edje_perspective_global_set(Edje_Perspective *ps, Eina_Bool global)
}
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_perspective_global_get(const Edje_Perspective *ps)
{
if (!ps) return EINA_FALSE;
return ps->global;
}
EAPI const Edje_Perspective *
EDJE_API const Edje_Perspective *
edje_evas_global_perspective_get(const Evas *e)
{
Evas_Object *obj;
@ -5370,7 +5370,7 @@ edje_evas_global_perspective_get(const Evas *e)
return evas_object_data_get(obj, "_edje_perspective");
}
EAPI void
EDJE_API void
edje_object_perspective_set(Eo *obj, Edje_Perspective *ps)
{
Edje *ed = _edje_fetch(obj);
@ -5388,7 +5388,7 @@ edje_object_perspective_set(Eo *obj, Edje_Perspective *ps)
_edje_recalc_do(ed);
}
EAPI const Edje_Perspective *
EDJE_API const Edje_Perspective *
edje_object_perspective_get(const Eo *obj)
{
Edje *ed =_edje_fetch(obj);
@ -5399,7 +5399,7 @@ edje_object_perspective_get(const Eo *obj)
#define EDJE_PRELOAD_EMISSION "preload,done"
#define EDJE_PRELOAD_SOURCE NULL
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_preload(Eo *obj, Eina_Bool cancel)
{
unsigned short count;
@ -6420,7 +6420,7 @@ _edje_object_signal_preload_cb(void *data, Evas_Object *obj, const char *emissio
*
* for edje_cc
*/
EAPI void
EDJE_API void
_edje_program_remove(Edje_Part_Collection *edc, Edje_Program *p)
{
Edje_Program ***array;
@ -6470,7 +6470,7 @@ _edje_program_remove(Edje_Part_Collection *edc, Edje_Program *p)
*
* for edje_cc
*/
EAPI void
EDJE_API void
_edje_program_insert(Edje_Part_Collection *edc, Edje_Program *p)
{
Edje_Program ***array, **temp;
@ -6556,7 +6556,7 @@ _edje_subobj_unregister(Edje *ed, Evas_Object *obj)
_cb_subobj_del, ed);
}
EAPI const char *
EDJE_API const char *
edje_object_part_object_name_get(const Evas_Object *obj)
{
Edje_Real_Part *rp;
@ -6671,7 +6671,7 @@ _edje_part_fetch(const Edje_Object *obj, const char *part, Edje **ped, Edje_Real
return EINA_TRUE;
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_part_swallow(Edje_Object *obj, const char *part, Evas_Object *obj_swallow)
{
Edje_Real_Part *rp;
@ -6688,13 +6688,13 @@ edje_object_part_swallow(Edje_Object *obj, const char *part, Evas_Object *obj_sw
return efl_content_set(efl_part(obj, part), obj_swallow);
}
EAPI void
EDJE_API void
edje_object_part_unswallow(Edje_Object *obj, Evas_Object *obj_swallow)
{
efl_canvas_layout_content_remove(obj, obj_swallow);
}
EAPI Evas_Object *
EDJE_API Evas_Object *
edje_object_part_swallow_get(const Edje_Object *obj, const char *part)
{
Edje_Real_Part *rp;
@ -6718,7 +6718,7 @@ edje_object_part_swallow_get(const Edje_Object *obj, const char *part)
return efl_content_get(efl_part(obj, part));
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_part_text_set(const Edje_Object *obj, const char *part, const char *text)
{
Edje *ed;
@ -6728,7 +6728,7 @@ edje_object_part_text_set(const Edje_Object *obj, const char *part, const char *
return _edje_efl_text_text_set((Eo *) obj, ed, part, text, EINA_TRUE, EINA_TRUE);
}
EAPI const char *
EDJE_API const char *
edje_object_part_text_get(const Edje_Object *obj, const char *part)
{
Edje_Real_Part *rp;

12
src/lib/edje/efl_canvas_layout_eo.legacy.c
View File

@ -1,35 +1,35 @@
EAPI void
EDJE_API void
edje_object_animation_set(Efl_Canvas_Layout *obj, Eina_Bool on)
{
efl_canvas_layout_animated_set(obj, on);
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_animation_get(const Efl_Canvas_Layout *obj)
{
return efl_canvas_layout_animated_get(obj);
}
EAPI Efl_Input_Device *
EDJE_API Efl_Input_Device *
edje_object_seat_get(const Efl_Canvas_Layout *obj, Eina_Stringshare *name)
{
return efl_canvas_layout_seat_get(obj, name);
}
EAPI Eina_Stringshare *
EDJE_API Eina_Stringshare *
edje_object_seat_name_get(const Efl_Canvas_Layout *obj, Efl_Input_Device *device)
{
return efl_canvas_layout_seat_name_get(obj, device);
}
EAPI Eina_Error
EDJE_API Eina_Error
edje_object_layout_load_error_get(const Efl_Canvas_Layout *obj)
{
return efl_canvas_layout_load_error_get(obj);
}
EAPI Eina_Bool
EDJE_API Eina_Bool
edje_object_content_remove(Efl_Canvas_Layout *obj, Efl_Gfx_Entity *content)
{
return efl_canvas_layout_content_remove(obj, content);

12
src/lib/edje/efl_canvas_layout_eo.legacy.h
View File

@ -31,7 +31,7 @@ typedef Eo Efl_Canvas_Layout;
*
* @ingroup Edje_Object_Group
*/
EAPI void edje_object_animation_set(Efl_Canvas_Layout *obj, Eina_Bool on);
EDJE_API void edje_object_animation_set(Efl_Canvas_Layout *obj, Eina_Bool on);
/**
* @brief Whether this object is animating or not.
@ -51,7 +51,7 @@ EAPI void edje_object_animation_set(Efl_Canvas_Layout *obj, Eina_Bool on);
*
* @ingroup Edje_Object_Group
*/
EAPI Eina_Bool edje_object_animation_get(const Efl_Canvas_Layout *obj);
EDJE_API Eina_Bool edje_object_animation_get(const Efl_Canvas_Layout *obj);
/**
* @brief Returns the seat device given its Edje's name.
@ -69,7 +69,7 @@ EAPI Eina_Bool edje_object_animation_get(const Efl_Canvas_Layout *obj);
*
* @ingroup Edje_Object_Group
*/
EAPI Efl_Input_Device *edje_object_seat_get(const Efl_Canvas_Layout *obj, Eina_Stringshare *name);
EDJE_API Efl_Input_Device *edje_object_seat_get(const Efl_Canvas_Layout *obj, Eina_Stringshare *name);
/**
* @brief Gets the name given to a set by Edje.
@ -87,7 +87,7 @@ EAPI Efl_Input_Device *edje_object_seat_get(const Efl_Canvas_Layout *obj, Eina_S
*
* @ingroup Edje_Object_Group
*/
EAPI Eina_Stringshare *edje_object_seat_name_get(const Efl_Canvas_Layout *obj, Efl_Input_Device *device);
EDJE_API Eina_Stringshare *edje_object_seat_name_get(const Efl_Canvas_Layout *obj, Efl_Input_Device *device);
/**
* @brief Gets the (last) file loading error for a given object.
@ -98,7 +98,7 @@ EAPI Eina_Stringshare *edje_object_seat_name_get(const Efl_Canvas_Layout *obj, E
*
* @ingroup Edje_Object_Group
*/
EAPI Eina_Error edje_object_layout_load_error_get(const Efl_Canvas_Layout *obj);
EDJE_API Eina_Error edje_object_layout_load_error_get(const Efl_Canvas_Layout *obj);
/**
* @brief Unswallow an object from this Edje.
@ -110,6 +110,6 @@ EAPI Eina_Error edje_object_layout_load_error_get(const Efl_Canvas_Layout *obj);
*
* @ingroup Edje_Object_Group
*/
EAPI Eina_Bool edje_object_content_remove(Efl_Canvas_Layout *obj, Efl_Gfx_Entity *content);
EDJE_API Eina_Bool edje_object_content_remove(Efl_Canvas_Layout *obj, Efl_Gfx_Entity *content);
#endif

2
src/lib/edje/efl_layout_group_eo.legacy.c
View File

@ -1,5 +1,5 @@
EAPI const char *
EDJE_API const char *
edje_object_data_get(const Efl_Layout_Group *obj, const char *key)
{
return efl_layout_group_data_get(obj, key);

2
src/lib/edje/efl_layout_group_eo.legacy.h
View File

@ -42,7 +42,7 @@ typedef Eo Efl_Layout_Group;
*
* @ingroup (null)_Group
*/
EAPI const char *edje_object_data_get(const Efl_Layout_Group *obj, const char *key);
EDJE_API const char *edje_object_data_get(const Efl_Layout_Group *obj, const char *key);
#endif

5
src/lib/edje/meson.build
View File

@ -51,6 +51,7 @@ foreach eo_file : pub_legacy_eo_files
'-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
'-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
'-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
'-e', 'EDJE_API',
'-gchd', '@INPUT@'])
endforeach
@ -68,6 +69,7 @@ foreach eo_file : pub_eo_types_files
command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
'-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
'-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
'-e', 'EDJE_API',
'-ghd', '@INPUT@'])
endforeach
@ -85,6 +87,7 @@ foreach eo_file : priv_eo_files
'-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
'-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
'-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
'-e', 'EDJE_API',
'-gchd', '@INPUT@'])
endforeach
@ -150,7 +153,7 @@ edje_lib = library('edje',
dependencies: edje_pub_deps + edje_deps + edje_ext_deps,
include_directories : config_dir + [include_directories('.')],
install: true,
c_args : [package_c_args],
c_args : [package_c_args, '-DEDJE_BUILD'],
version : meson.project_version()
)