enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

elementary: move Efl new general purpose API to efl_general.h

This commit is contained in:
Cedric BAIL 2017-11-06 10:28:15 -08:00
parent ede0587887
commit 25b6a280c0
2 changed files with 69 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/lib/elementary/efl_general.h Normal file
View File

@ -0,0 +1,68 @@
#ifdef EFL_BETA_API_SUPPORT
#ifdef EFL_VERSION_MICRO
# define _EFL_VERSION_MICRO EFL_VERSION_MICRO
#else
# define _EFL_VERSION_MICRO 0
#endif
#ifdef EFL_VERSION_REVISION
# define _EFL_VERSION_REVISION EFL_VERSION_REVISION
#else
# define _EFL_VERSION_REVISION 0
#endif
#ifdef EFL_VERSION_FLAVOR
# define _EFL_VERSION_FLAVOR EFL_VERSION_FLAVOR
#else
# define _EFL_VERSION_FLAVOR NULL
#endif
#ifdef EFL_BUILD_ID
# define _EFL_BUILD_ID EFL_BUILD_ID
#else
# define _EFL_BUILD_ID NULL
#endif
#define _EFL_APP_VERSION_SET() \
do { \
if (efl_build_version_set) \
efl_build_version_set(EFL_VERSION_MAJOR, EFL_VERSION_MINOR, _EFL_VERSION_MICRO, \
_EFL_VERSION_REVISION, _EFL_VERSION_FLAVOR, _EFL_BUILD_ID); \
} while (0)
#define EFL_MAIN() int main(int argc, char **argv) \
{ \
Eina_Value *ret__; \
int real__; \
_EFL_APP_VERSION_SET(); \
_elm_startup_time = ecore_time_unix_get(); \
elm_init(argc, argv); \
efl_event_callback_add(ecore_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS, efl_main, NULL); \
ret__ = efl_loop_begin(ecore_main_loop_get()); \
real__ = efl_loop_exit_code_process(ret__); \
elm_shutdown(); \
return real__; \
}
#define EFL_MAIN_EX() \
EFL_CALLBACKS_ARRAY_DEFINE(_efl_main_ex, \
{ EFL_LOOP_EVENT_ARGUMENTS, efl_main }, \
{ EFL_LOOP_EVENT_PAUSE, efl_pause }, \
{ EFL_LOOP_EVENT_RESUME, efl_resume }, \
{ EFL_LOOP_EVENT_TERMINATE, efl_terminate }); \
int main(int argc, char **argv) \
{ \
Eina_Value *ret__; \
int real__; \
_EFL_APP_VERSION_SET(); \
_elm_startup_time = ecore_time_unix_get(); \
elm_init(argc, argv); \
efl_event_callback_array_add(ecore_main_loop_get(), _efl_main_ex(), NULL); \
ret__ = efl_loop_begin(ecore_main_loop_get()); \
real__ = efl_loop_exit_code_process(ret__); \
elm_shutdown(); \
return real__; \
}
#endif /* EFL_BETA_API_SUPPORT */

71
src/lib/elementary/elm_general.h
View File

@ -96,76 +96,7 @@ extern EAPI double _elm_startup_time;
#define ELM_MAIN() int main(int argc, char **argv) { int ret__; _elm_startup_time = ecore_time_unix_get(); ret__ = elm_quicklaunch_fallback(argc, argv); elm_shutdown(); return ret__; }
#endif
#ifdef EFL_BETA_API_SUPPORT
#ifdef EFL_VERSION_MICRO
# define _EFL_VERSION_MICRO EFL_VERSION_MICRO
#else
# define _EFL_VERSION_MICRO 0
#endif
#ifdef EFL_VERSION_REVISION
# define _EFL_VERSION_REVISION EFL_VERSION_REVISION
#else
# define _EFL_VERSION_REVISION 0
#endif
#ifdef EFL_VERSION_FLAVOR
# define _EFL_VERSION_FLAVOR EFL_VERSION_FLAVOR
#else
# define _EFL_VERSION_FLAVOR NULL
#endif
#ifdef EFL_BUILD_ID
# define _EFL_BUILD_ID EFL_BUILD_ID
#else
# define _EFL_BUILD_ID NULL
#endif
#define _EFL_APP_VERSION_SET() \
do { \
if (efl_build_version_set) \
efl_build_version_set(EFL_VERSION_MAJOR, EFL_VERSION_MINOR, _EFL_VERSION_MICRO, \
_EFL_VERSION_REVISION, _EFL_VERSION_FLAVOR, _EFL_BUILD_ID); \
} while (0)
#define EFL_MAIN() int main(int argc, char **argv) \
{ \
Eina_Value *ret__; \
int real__; \
_EFL_APP_VERSION_SET(); \
_elm_startup_time = ecore_time_unix_get(); \
elm_init(argc, argv); \
efl_event_callback_add(ecore_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS, efl_main, NULL); \
ret__ = efl_loop_begin(ecore_main_loop_get()); \
real__ = efl_loop_exit_code_process(ret__); \
elm_shutdown(); \
return real__; \
}
#define EFL_MAIN_EX() \
EFL_CALLBACKS_ARRAY_DEFINE(_efl_main_ex, \
{ EFL_LOOP_EVENT_ARGUMENTS, efl_main }, \
{ EFL_LOOP_EVENT_PAUSE, efl_pause }, \
{ EFL_LOOP_EVENT_RESUME, efl_resume }, \
{ EFL_LOOP_EVENT_TERMINATE, efl_terminate }); \
int main(int argc, char **argv) \
{ \
Eina_Value *ret__; \
int real__; \
_EFL_APP_VERSION_SET(); \
_elm_startup_time = ecore_time_unix_get(); \
elm_init(argc, argv); \
efl_event_callback_array_add(ecore_main_loop_get(), _efl_main_ex(), NULL); \
ret__ = efl_loop_begin(ecore_main_loop_get()); \
real__ = efl_loop_exit_code_process(ret__); \
elm_shutdown(); \
return real__; \
}
#endif /* EFL_BETA_API_SUPPORT */
#include "efl_general.h"
/**************************************************************************/
/* General calls */