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

convert all function pointers to typedefs, add doxy stubs for typedefs. 

note: I've chosen to consolidate typedefs where possible to simplify things

my time is limited this week, so feel free to expand on the doxy stubs I've added if you know what they do


SVN revision: 50803
This commit is contained in:
Mike Blumenkrantz 2010-08-04 02:55:20 +00:00
parent 457525aa7d
commit a475971aaa
16 changed files with 151 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
legacy/ecore/src/lib/ecore/Ecore.h
View File

@ -166,14 +166,78 @@ extern "C" {
typedef struct _Ecore_Exe_Event_Del Ecore_Exe_Event_Del; /**< Spawned Exe exit event */
typedef struct _Ecore_Exe_Event_Data_Line Ecore_Exe_Event_Data_Line; /**< Lines from a child process */
typedef struct _Ecore_Exe_Event_Data Ecore_Exe_Event_Data; /**< Data from a child process */
typedef struct _Ecore_Thread Ecore_Thread;
typedef void (*Ecore_Thread_Blocking_Cb) (void *data);
typedef void (*Ecore_Thread_End_Cb) (void *data);
typedef void (*Ecore_Thread_Cancel_Cb) (void *data);
typedef void (*Ecore_Thread_Heavy_Cb) (Ecore_Thread *thread, void *data);
typedef void (*Ecore_Thread_Notify_Cb) (Ecore_Thread *thread, void *msg_data, void *data);
/**
* @typedef Ecore_Data_Cb Ecore_Data_Cb
* A callback which is used to return data to the main function
*/
typedef void *(*Ecore_Data_Cb) (void *data);
/**
* @typedef Ecore_Filter_Cb
* A callback used for filtering events from the main loop.
*/
typedef Eina_Bool (*Ecore_Filter_Cb) (void *data, void *loop_data, int type, void *event);
/**
* @typedef Ecore_Eselect_Function Ecore_Eselect_Function
* A function which can be used to replace select() in the main loop
*/
typedef int (*Ecore_Select_Function)(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval *timeout);
/**
* @typedef Ecore_End_Cb Ecore_End_Cb
* This is the callback which is called at the end of a function, usually for cleanup purposes.
*/
typedef void (*Ecore_End_Cb) (void *user_data, void *func_data);
/**
* @typedef Ecore_Pipe_Cb Ecore_Pipe_Cb
* The callback that data written to the pipe is sent to.
*/
typedef void (*Ecore_Pipe_Cb) (void *data, void *buffer, unsigned int nbyte);
/**
* @typedef Ecore_Exe_Cb Ecore_Exe_Cb
* A callback to run with the associated @ref Ecore_Exe, usually for cleanup purposes.
*/
typedef void (*Ecore_Exe_Cb)(void *data, const Ecore_Exe *exe);
/**
* @typedef Ecore_Event_Handler_Cb Ecore_Event_Handler_Cb
* A callback used by the main loop to handle events of a specified type.
*/
typedef Eina_Bool (*Ecore_Event_Handler_Cb) (void *data, int type, void *event);
/**
* @typedef Ecore_Thread_Heavy_Cb Ecore_Thread_Heavy_Cb
* A callback used to run cpu intensive or blocking I/O operations.
*/
typedef void (*Ecore_Thread_Heavy_Cb) (Ecore_Thread *thread, void *data);
/**
* @typedef Ecore_Thread_Notify_Cb Ecore_Thread_Notify_Cb
* A callback used by the main loop to receive data sent by an @ref Ecore_Thread.
*/
typedef void (*Ecore_Thread_Notify_Cb) (Ecore_Thread *thread, void *msg_data, void *data);
/**
* @typedef Ecore_Task_Cb Ecore_Task_Cb
* A callback run for a task (timer, idler, poller, animater, etc)
*/
typedef Eina_Bool (*Ecore_Task_Cb) (void *data);
/**
* @typedef Ecore_Cb Ecore_Cb
* A generic callback called as a hook when a certain point in execution is reached.
*/
typedef void (*Ecore_Cb) (void *data);
/**
* @typedef Ecore_Fd_Cb Ecore_Fd_Cb
* A callback used by an @ref Ecore_Fd_Handler.
*/
typedef Eina_Bool (*Ecore_Fd_Cb) (void *data, Ecore_Fd_Handler *fd_handler);
/**
* @typedef Ecore_Fd_Prep_Cb Ecore_Fd_Prep_Cb
* A callback used by an @ref Ecore_Fd_Handler.
*/
typedef void (*Ecore_Fd_Prep_Cb) (void *data, Ecore_Fd_Handler *fd_handler);
/**
* @typedef Ecore_Fd_Win32_Cb Ecore_Fd_Win32_Cb
* A callback used by an @ref Ecore_Win32_Handler.
*/
typedef Eina_Bool (*Ecore_Fd_Win32_Cb) (void *data, Ecore_Win32_Handler *wh);
typedef struct _Ecore_Job Ecore_Job; /**< A job handle */
@ -268,12 +332,12 @@ extern "C" {
EAPI void ecore_app_args_get(int *argc, char ***argv);
EAPI void ecore_app_restart(void);
EAPI Ecore_Event_Handler *ecore_event_handler_add(int type, Eina_Bool (*func) (void *data, int type, void *event), const void *data);
EAPI Ecore_Event_Handler *ecore_event_handler_add(int type, Ecore_Event_Handler_Cb func, const void *data);
EAPI void *ecore_event_handler_del(Ecore_Event_Handler *event_handler);
EAPI Ecore_Event *ecore_event_add(int type, void *ev, void (*func_free) (void *data, void *ev), void *data);
EAPI Ecore_Event *ecore_event_add(int type, void *ev, Ecore_End_Cb func_free, void *data);
EAPI void *ecore_event_del(Ecore_Event *event);
EAPI int ecore_event_type_new(void);
EAPI Ecore_Event_Filter *ecore_event_filter_add(void * (*func_start) (void *data), Eina_Bool (*func_filter) (void *data, void *loop_data, int type, void *event), void (*func_end) (void *data, void *loop_data), const void *data);
EAPI Ecore_Event_Filter *ecore_event_filter_add(Ecore_Data_Cb func_start, Ecore_Filter_Cb func_filter, Ecore_End_Cb func_end, const void *data);
EAPI void *ecore_event_filter_del(Ecore_Event_Filter *ef);
EAPI int ecore_event_current_type_get(void);
EAPI void *ecore_event_current_event_get(void);
@ -283,7 +347,7 @@ extern "C" {
EAPI int ecore_exe_run_priority_get(void);
EAPI Ecore_Exe *ecore_exe_run(const char *exe_cmd, const void *data);
EAPI Ecore_Exe *ecore_exe_pipe_run(const char *exe_cmd, Ecore_Exe_Flags flags, const void *data);
EAPI void ecore_exe_callback_pre_free_set(Ecore_Exe *exe, void (*func)(void *data, const Ecore_Exe *exe));
EAPI void ecore_exe_callback_pre_free_set(Ecore_Exe *exe, Ecore_Exe_Cb func);
EAPI Eina_Bool ecore_exe_send(Ecore_Exe *exe, const void *data, int size);
EAPI void ecore_exe_close_stdin(Ecore_Exe *exe);
EAPI void ecore_exe_auto_limits_set(Ecore_Exe *exe, int start_bytes, int end_bytes, int start_lines, int end_lines);
@ -305,19 +369,19 @@ extern "C" {
EAPI void ecore_exe_signal(Ecore_Exe *exe, int num);
EAPI void ecore_exe_hup(Ecore_Exe *exe);
EAPI Ecore_Idler *ecore_idler_add(Eina_Bool (*func) (void *data), const void *data);
EAPI Ecore_Idler *ecore_idler_add(Ecore_Task_Cb func, const void *data);
EAPI void *ecore_idler_del(Ecore_Idler *idler);
EAPI Ecore_Idle_Enterer *ecore_idle_enterer_add(Eina_Bool (*func) (void *data), const void *data);
EAPI Ecore_Idle_Enterer *ecore_idle_enterer_before_add(Eina_Bool (*func) (void *data), const void *data);
EAPI Ecore_Idle_Enterer *ecore_idle_enterer_add(Ecore_Task_Cb func, const void *data);
EAPI Ecore_Idle_Enterer *ecore_idle_enterer_before_add(Ecore_Task_Cb func, const void *data);
EAPI void *ecore_idle_enterer_del(Ecore_Idle_Enterer *idle_enterer);
EAPI Ecore_Idle_Exiter *ecore_idle_exiter_add(Eina_Bool (*func) (void *data), const void *data);
EAPI Ecore_Idle_Exiter *ecore_idle_exiter_add(Ecore_Task_Cb func, const void *data);
EAPI void *ecore_idle_exiter_del(Ecore_Idle_Exiter *idle_exiter);
EAPI void ecore_main_loop_iterate(void);
EAPI void ecore_main_loop_select_func_set(int (*func)(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval *timeout));
EAPI void ecore_main_loop_select_func_set(Ecore_Select_Function func);
EAPI void *ecore_main_loop_select_func_get(void);
EAPI Eina_Bool ecore_main_loop_glib_integrate(void);
@ -325,19 +389,18 @@ extern "C" {
EAPI void ecore_main_loop_begin(void);
EAPI void ecore_main_loop_quit(void);
EAPI Ecore_Fd_Handler *ecore_main_fd_handler_add(int fd, Ecore_Fd_Handler_Flags flags,
Eina_Bool (*func) (void *data, Ecore_Fd_Handler *fd_handler), const void *data,
Eina_Bool (*buf_func) (void *buf_data, Ecore_Fd_Handler *fd_handler), const void *buf_data);
EAPI void ecore_main_fd_handler_prepare_callback_set(Ecore_Fd_Handler *fd_handler, void (*func) (void *data, Ecore_Fd_Handler *fd_handler), const void *data);
EAPI Ecore_Fd_Handler *ecore_main_fd_handler_add(int fd, Ecore_Fd_Handler_Flags flags, Ecore_Fd_Cb func, const void *data,
Ecore_Fd_Cb buf_func, const void *buf_data);
EAPI void ecore_main_fd_handler_prepare_callback_set(Ecore_Fd_Handler *fd_handler, Ecore_Fd_Prep_Cb func, const void *data);
EAPI void *ecore_main_fd_handler_del(Ecore_Fd_Handler *fd_handler);
EAPI int ecore_main_fd_handler_fd_get(Ecore_Fd_Handler *fd_handler);
EAPI int ecore_main_fd_handler_active_get(Ecore_Fd_Handler *fd_handler, Ecore_Fd_Handler_Flags flags);
EAPI void ecore_main_fd_handler_active_set(Ecore_Fd_Handler *fd_handler, Ecore_Fd_Handler_Flags flags);
EAPI Ecore_Win32_Handler *ecore_main_win32_handler_add(void *h, Eina_Bool (*func) (void *data, Ecore_Win32_Handler *wh), const void *data);
EAPI Ecore_Win32_Handler *ecore_main_win32_handler_add(void *h, Ecore_Fd_Win32_Cb func, const void *data);
EAPI void *ecore_main_win32_handler_del(Ecore_Win32_Handler *win32_handler);
EAPI Ecore_Pipe *ecore_pipe_add(void (*handler) (void *data, void *buffer, unsigned int nbyte), const void *data);
EAPI Ecore_Pipe *ecore_pipe_add(Ecore_Pipe_Cb handler, const void *data);
EAPI void *ecore_pipe_del(Ecore_Pipe *p);
EAPI Eina_Bool ecore_pipe_write(Ecore_Pipe *p, const void *buffer, unsigned int nbytes);
EAPI void ecore_pipe_write_close(Ecore_Pipe *p);
@ -345,14 +408,14 @@ extern "C" {
EAPI Ecore_Thread *ecore_thread_run(Ecore_Thread_Blocking_Cb,
Ecore_Thread_End_Cb,
Ecore_Thread_Cancel_Cb,
EAPI Ecore_Thread *ecore_thread_run(Ecore_Cb,
Ecore_Cb,
Ecore_Cb,
const void *data);
EAPI Ecore_Thread *ecore_long_run(Ecore_Thread_Heavy_Cb,
Ecore_Thread_Notify_Cb,
Ecore_Thread_End_Cb,
Ecore_Thread_Cancel_Cb,
Ecore_Cb,
Ecore_Cb,
const void *data,
Eina_Bool try_no_queue);
EAPI Eina_Bool ecore_thread_cancel(Ecore_Thread *thread);
@ -384,8 +447,8 @@ extern "C" {
EAPI double ecore_time_get(void);
EAPI double ecore_loop_time_get(void);
EAPI Ecore_Timer *ecore_timer_add(double in, Eina_Bool (*func) (void *data), const void *data);
EAPI Ecore_Timer *ecore_timer_loop_add(double in, Eina_Bool (*func) (void *data), const void *data);
EAPI Ecore_Timer *ecore_timer_add(double in, Ecore_Task_Cb func, const void *data);
EAPI Ecore_Timer *ecore_timer_loop_add(double in, Ecore_Task_Cb func, const void *data);
EAPI void *ecore_timer_del(Ecore_Timer *timer);
EAPI void ecore_timer_interval_set(Ecore_Timer *timer, double in);
EAPI double ecore_timer_interval_get(Ecore_Timer *timer);
@ -397,7 +460,7 @@ extern "C" {
EAPI double ecore_timer_precision_get(void);
EAPI void ecore_timer_precision_set(double precision);
EAPI Ecore_Animator *ecore_animator_add(Eina_Bool (*func) (void *data), const void *data);
EAPI Ecore_Animator *ecore_animator_add(Ecore_Task_Cb func, const void *data);
EAPI void *ecore_animator_del(Ecore_Animator *animator);
EAPI void ecore_animator_freeze(Ecore_Animator *animator);
EAPI void ecore_animator_thaw(Ecore_Animator *animator);
@ -408,10 +471,10 @@ extern "C" {
EAPI double ecore_poller_poll_interval_get(Ecore_Poller_Type type);
EAPI Eina_Bool ecore_poller_poller_interval_set(Ecore_Poller *poller, int interval);
EAPI int ecore_poller_poller_interval_get(Ecore_Poller *poller);
EAPI Ecore_Poller *ecore_poller_add(Ecore_Poller_Type type, int interval, Eina_Bool (*func) (void *data), const void *data);
EAPI Ecore_Poller *ecore_poller_add(Ecore_Poller_Type type, int interval, Ecore_Task_Cb func, const void *data);
EAPI void *ecore_poller_del(Ecore_Poller *poller);
EAPI Ecore_Job *ecore_job_add(void (*func) (void *data), const void *data);
EAPI Ecore_Job *ecore_job_add(Ecore_Cb func, const void *data);
EAPI void *ecore_job_del(Ecore_Job *job);
#ifdef __cplusplus

4
legacy/ecore/src/lib/ecore/ecore_anim.c
View File

@ -18,7 +18,7 @@ struct _Ecore_Animator
EINA_INLIST;
ECORE_MAGIC;
Eina_Bool (*func) (void *data);
Ecore_Task_Cb func;
void *data;
Eina_Bool delete_me : 1;
@ -51,7 +51,7 @@ static double animators_frametime = 1.0 / 30.0;
* automatically making any references/handles for it invalid.
*/
EAPI Ecore_Animator *
ecore_animator_add(Eina_Bool (*func) (void *data), const void *data)
ecore_animator_add(Ecore_Task_Cb func, const void *data)
{
Ecore_Animator *animator;

18
legacy/ecore/src/lib/ecore/ecore_events.c
View File

@ -18,7 +18,7 @@ struct _Ecore_Event_Handler
EINA_INLIST;
ECORE_MAGIC;
int type;
Eina_Bool (*func) (void *data, int type, void *event);
Ecore_Event_Handler_Cb func;
void *data;
int references;
Eina_Bool delete_me : 1;
@ -28,9 +28,9 @@ struct _Ecore_Event_Filter
{
EINA_INLIST;
ECORE_MAGIC;
void *(*func_start) (void *data);
Eina_Bool (*func_filter) (void *data, void *loop_data, int type, void *event);
void (*func_end) (void *data, void *loop_data);
Ecore_Data_Cb func_start;
Ecore_Filter_Cb func_filter;
Ecore_End_Cb func_end;
void *loop_data;
void *data;
int references;
@ -43,7 +43,7 @@ struct _Ecore_Event
ECORE_MAGIC;
int type;
void *event;
void (*func_free) (void *data, void *ev);
Ecore_End_Cb func_free;
void *data;
int references;
Eina_Bool delete_me : 1;
@ -98,7 +98,7 @@ static void *_ecore_event_del(Ecore_Event *event);
* been called, will not be.
*/
EAPI Ecore_Event_Handler *
ecore_event_handler_add(int type, Eina_Bool (*func) (void *data, int type, void *event), const void *data)
ecore_event_handler_add(int type, Ecore_Event_Handler_Cb func, const void *data)
{
Ecore_Event_Handler *eh;
@ -187,7 +187,7 @@ _ecore_event_generic_free (void *data __UNUSED__, void *event)
* func_free is passed @p data as its data parameter.
*/
EAPI Ecore_Event *
ecore_event_add(int type, void *ev, void (*func_free) (void *data, void *ev), void *data)
ecore_event_add(int type, void *ev, Ecore_End_Cb func_free, void *data)
{
/* if (!ev) return NULL;*/
if (type <= ECORE_EVENT_NONE) return NULL;
@ -258,7 +258,7 @@ ecore_event_type_new(void)
* and @p data pointer to clean up.
*/
EAPI Ecore_Event_Filter *
ecore_event_filter_add(void * (*func_start) (void *data), Eina_Bool (*func_filter) (void *data, void *loop_data, int type, void *event), void (*func_end) (void *data, void *loop_data), const void *data)
ecore_event_filter_add(Ecore_Data_Cb func_start, Ecore_Filter_Cb func_filter, Ecore_End_Cb func_end, const void *data)
{
Ecore_Event_Filter *ef;
@ -382,7 +382,7 @@ _ecore_event_exist(void)
}
Ecore_Event *
_ecore_event_add(int type, void *ev, void (*func_free) (void *data, void *ev), void *data)
_ecore_event_add(int type, void *ev, Ecore_End_Cb func_free, void *data)
{
Ecore_Event *e;

4
legacy/ecore/src/lib/ecore/ecore_exe.c
View File

@ -121,7 +121,7 @@ struct _Ecore_Exe
Ecore_Timer *doomsday_clock; /* The Timer of Death. Muahahahaha. */
void *doomsday_clock_dead; /* data for the doomsday clock */
void (*pre_free_cb)(void *data, const Ecore_Exe *exe);
Ecore_Exe_Cb pre_free_cb;
};
@ -712,7 +712,7 @@ ecore_exe_pipe_run(const char *exe_cmd, Ecore_Exe_Flags flags, const void *data)
* @param func The function to call before @a exe is freed.
*/
EAPI void
ecore_exe_callback_pre_free_set(Ecore_Exe *exe, void (*func)(void *data, const Ecore_Exe *exe))
ecore_exe_callback_pre_free_set(Ecore_Exe *exe, Ecore_Exe_Cb func)
{
if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE))
{

4
legacy/ecore/src/lib/ecore/ecore_exe_win32.c
View File

@ -82,7 +82,7 @@ struct _Ecore_Exe
Eina_Bool close_stdin : 1;
Eina_Bool is_suspended : 1;
void (*pre_free_cb)(void *data, const Ecore_Exe *exe);
Ecore_Exe_Cb pre_free_cb;
};
static Ecore_Exe *exes = NULL;
@ -292,7 +292,7 @@ ecore_exe_pipe_run(const char *exe_cmd, Ecore_Exe_Flags flags, const void *data)
}
EAPI void
ecore_exe_callback_pre_free_set(Ecore_Exe *exe, void (*func)(void *data, const Ecore_Exe *exe))
ecore_exe_callback_pre_free_set(Ecore_Exe *exe, Ecore_Exe_Cb func)
{
if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE))
{

2
legacy/ecore/src/lib/ecore/ecore_glib.c
View File

@ -15,7 +15,7 @@
#include <glib.h>
static Eina_Bool _ecore_glib_active = EINA_FALSE;
static int (*_ecore_glib_select_original)(int, fd_set*, fd_set*, fd_set*, struct timeval *);
static Ecore_Select_Function _ecore_glib_select_original;
static GCond *_ecore_glib_cond = NULL;
static GPollFD *_ecore_glib_fds = NULL;
static size_t _ecore_glib_fds_size = 0;

6
legacy/ecore/src/lib/ecore/ecore_idle_enterer.c
View File

@ -16,7 +16,7 @@ struct _Ecore_Idle_Enterer
{
EINA_INLIST;
ECORE_MAGIC;
Eina_Bool (*func) (void *data);
Ecore_Task_Cb func;
void *data;
int references;
Eina_Bool delete_me : 1;
@ -36,7 +36,7 @@ static int idle_enterers_delete_me = 0;
* @ingroup Idle_Group
*/
EAPI Ecore_Idle_Enterer *
ecore_idle_enterer_add(Eina_Bool (*func) (void *data), const void *data)
ecore_idle_enterer_add(Ecore_Task_Cb func, const void *data)
{
Ecore_Idle_Enterer *ie;
@ -59,7 +59,7 @@ ecore_idle_enterer_add(Eina_Bool (*func) (void *data), const void *data)
* @ingroup Idle_Group
*/
EAPI Ecore_Idle_Enterer *
ecore_idle_enterer_before_add(Eina_Bool (*func) (void *data), const void *data)
ecore_idle_enterer_before_add(Ecore_Task_Cb func, const void *data)
{
Ecore_Idle_Enterer *ie;

4
legacy/ecore/src/lib/ecore/ecore_idle_exiter.c
View File

@ -16,7 +16,7 @@ struct _Ecore_Idle_Exiter
{
EINA_INLIST;
ECORE_MAGIC;
Eina_Bool (*func) (void *data);
Ecore_Task_Cb func;
void *data;
int references;
Eina_Bool delete_me : 1;
@ -35,7 +35,7 @@ static int idle_exiters_delete_me = 0;
* @ingroup Idle_Group
*/
EAPI Ecore_Idle_Exiter *
ecore_idle_exiter_add(Eina_Bool (*func) (void *data), const void *data)
ecore_idle_exiter_add(Ecore_Task_Cb func, const void *data)
{
Ecore_Idle_Exiter *ie;

4
legacy/ecore/src/lib/ecore/ecore_idler.c
View File

@ -16,7 +16,7 @@ struct _Ecore_Idler
{
EINA_INLIST;
ECORE_MAGIC;
Eina_Bool (*func) (void *data);
Ecore_Task_Cb func;
void *data;
int references;
Eina_Bool delete_me : 1;
@ -43,7 +43,7 @@ static int idlers_delete_me = 0;
* Idlers are useful for progressively prossessing data without blocking.
*/
EAPI Ecore_Idler *
ecore_idler_add(Eina_Bool (*func) (void *data), const void *data)
ecore_idler_add(Ecore_Task_Cb func, const void *data)
{
Ecore_Idler *ie;

4
legacy/ecore/src/lib/ecore/ecore_job.c
View File

@ -21,7 +21,7 @@ struct _Ecore_Job
{
ECORE_MAGIC;
Ecore_Event *event;
void (*func) (void *data);
Ecore_Cb func;
void *data;
};
@ -50,7 +50,7 @@ _ecore_job_shutdown(void)
* @note Once the job has been executed, the job handle is invalid.
*/
EAPI Ecore_Job *
ecore_job_add(void (*func) (void *data), const void *data)
ecore_job_add(Ecore_Cb func, const void *data)
{
Ecore_Job *job;

28
legacy/ecore/src/lib/ecore/ecore_main.c
View File

@ -63,11 +63,11 @@ struct _Ecore_Fd_Handler
ECORE_MAGIC;
int fd;
Ecore_Fd_Handler_Flags flags;
Eina_Bool (*func) (void *data, Ecore_Fd_Handler *fd_handler);
Ecore_Fd_Cb func;
void *data;
Eina_Bool (*buf_func) (void *data, Ecore_Fd_Handler *fd_handler);
Ecore_Fd_Cb buf_func;
void *buf_data;
void (*prep_func) (void *data, Ecore_Fd_Handler *fd_handler);
Ecore_Fd_Prep_Cb prep_func;
void *prep_data;
int references;
Eina_Bool read_active : 1;
@ -82,7 +82,7 @@ struct _Ecore_Win32_Handler
EINA_INLIST;
ECORE_MAGIC;
HANDLE h;
Eina_Bool (*func) (void *data, Ecore_Win32_Handler *win32_handler);
Ecore_Fd_Win32_Cb func;
void *data;
int references;
Eina_Bool delete_me : 1;
@ -117,9 +117,9 @@ static int win32_handlers_delete_me = 0;
#endif
#ifdef _WIN32
static int (*main_loop_select)(int , fd_set *, fd_set *, fd_set *, struct timeval *) = _ecore_main_win32_select;
static Ecore_Select_Function main_loop_select = _ecore_main_win32_select;
#else
static int (*main_loop_select)(int , fd_set *, fd_set *, fd_set *, struct timeval *) = select;
static Ecore_Select_Function main_loop_select = select;
#endif
static double t1 = 0.0;
@ -306,7 +306,7 @@ ecore_main_loop_quit(void)
* @ingroup Ecore_Main_Loop_Group
*/
EAPI void
ecore_main_loop_select_func_set(int (*func) (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval *timeout))
ecore_main_loop_select_func_set(Ecore_Select_Function func)
{
main_loop_select = func;
}
@ -362,9 +362,8 @@ ecore_main_loop_select_func_get(void)
* @ingroup Ecore_FD_Handler_Group
*/
EAPI Ecore_Fd_Handler *
ecore_main_fd_handler_add(int fd, Ecore_Fd_Handler_Flags flags,
Eina_Bool (*func) (void *data, Ecore_Fd_Handler *fd_handler), const void *data,
Eina_Bool (*buf_func) (void *buf_data, Ecore_Fd_Handler *fd_handler), const void *buf_data)
ecore_main_fd_handler_add(int fd, Ecore_Fd_Handler_Flags flags, Ecore_Fd_Cb func, const void *data,
Ecore_Fd_Cb buf_func, const void *buf_data)
{
Ecore_Fd_Handler *fdh;
@ -397,9 +396,7 @@ ecore_main_fd_handler_add(int fd, Ecore_Fd_Handler_Flags flags,
#ifdef _WIN32
EAPI Ecore_Win32_Handler *
ecore_main_win32_handler_add(void *h,
Eina_Bool (*func) (void *data, Ecore_Win32_Handler *wh),
const void *data)
ecore_main_win32_handler_add(void *h, Ecore_Fd_Win32_Cb func, const void *data)
{
Ecore_Win32_Handler *wh;
@ -419,8 +416,7 @@ ecore_main_win32_handler_add(void *h,
}
#else
EAPI Ecore_Win32_Handler *
ecore_main_win32_handler_add(void *h __UNUSED__,
Eina_Bool (*func) (void *data, Ecore_Win32_Handler *wh) __UNUSED__,
ecore_main_win32_handler_add(void *h __UNUSED__, Ecore_Fd_Win32_Cb func __UNUSED__,
const void *data __UNUSED__)
{
return NULL;
@ -477,7 +473,7 @@ ecore_main_win32_handler_del(Ecore_Win32_Handler *win32_handler __UNUSED__)
#endif
EAPI void
ecore_main_fd_handler_prepare_callback_set(Ecore_Fd_Handler *fd_handler, void (*func) (void *data, Ecore_Fd_Handler *fd_handler), const void *data)
ecore_main_fd_handler_prepare_callback_set(Ecore_Fd_Handler *fd_handler, Ecore_Fd_Prep_Cb func, const void *data)
{
if (!ECORE_MAGIC_CHECK(fd_handler, ECORE_MAGIC_FD_HANDLER))
{

5
legacy/ecore/src/lib/ecore/ecore_pipe.c
View File

@ -59,7 +59,7 @@ struct _Ecore_Pipe
int fd_write;
Ecore_Fd_Handler *fd_handler;
const void *data;
void (*handler) (void *data, void *buffer, unsigned int nbyte);
Ecore_Pipe_Cb handler;
unsigned int len;
size_t already_read;
void *passed_data;
@ -282,8 +282,7 @@ static Eina_Bool _ecore_pipe_read(void *data, Ecore_Fd_Handler *fd_handler);
* @ingroup Ecore_Pipe_Group
*/
EAPI Ecore_Pipe *
ecore_pipe_add(void (*handler) (void *data, void *buffer, unsigned int nbyte),
const void *data)
ecore_pipe_add(Ecore_Pipe_Cb handler, const void *data)
{
Ecore_Pipe *p;
int fds[2];

4
legacy/ecore/src/lib/ecore/ecore_poll.c
View File

@ -18,7 +18,7 @@ struct _Ecore_Poller
ECORE_MAGIC;
int ibit;
unsigned char delete_me : 1;
Eina_Bool (*func) (void *data);
Ecore_Task_Cb func;
void *data;
};
@ -282,7 +282,7 @@ ecore_poller_poll_interval_get(Ecore_Poller_Type type __UNUSED__)
* invalid.
*/
EAPI Ecore_Poller *
ecore_poller_add(Ecore_Poller_Type type __UNUSED__, int interval, Eina_Bool (*func) (void *data), const void *data)
ecore_poller_add(Ecore_Poller_Type type __UNUSED__, int interval, Ecore_Task_Cb func, const void *data)
{
Ecore_Poller *poller;
int ibit;

2
legacy/ecore/src/lib/ecore/ecore_private.h
View File

@ -138,7 +138,7 @@ int _ecore_idle_exiter_exist(void);
void _ecore_event_shutdown(void);
int _ecore_event_exist(void);
Ecore_Event *_ecore_event_add(int type, void *ev, void (*func_free) (void *data, void *ev), void *data);
Ecore_Event *_ecore_event_add(int type, void *ev, Ecore_End_Cb func_free, void *data);
void _ecore_event_call(void);
Ecore_Timer *_ecore_exe_doomsday_clock_get(Ecore_Exe *exe);

20
legacy/ecore/src/lib/ecore/ecore_thread.c
View File

@ -29,18 +29,18 @@ struct _Ecore_Pthread_Worker
{
struct
{
void (*func_blocking)(void *data);
Ecore_Cb func_blocking;
} short_run;
struct
{
void (*func_heavy)(Ecore_Thread *thread, void *data);
void (*func_notify)(Ecore_Thread *thread, void *msg_data, void *data);
Ecore_Thread_Heavy_Cb func_heavy;
Ecore_Thread_Notify_Cb func_notify;
Ecore_Pipe *notify;
} long_run;
} u;
void (*func_cancel)(void *data);
void (*func_end)(void *data);
Ecore_Cb func_cancel;
Ecore_Cb func_end;
#ifdef EFL_HAVE_PTHREAD
pthread_t self;
Eina_Hash *hash;
@ -391,9 +391,9 @@ _ecore_thread_shutdown(void)
* host CPU can handle.
*/
EAPI Ecore_Thread *
ecore_thread_run(Ecore_Thread_Blocking_Cb func_blocking,
Ecore_Thread_End_Cb func_end,
Ecore_Thread_Cancel_Cb func_cancel,
ecore_thread_run(Ecore_Cb func_blocking,
Ecore_Cb func_end,
Ecore_Cb func_cancel,
const void *data)
{
#ifdef EFL_HAVE_PTHREAD
@ -565,8 +565,8 @@ ecore_thread_check(Ecore_Thread *thread)
*/
EAPI Ecore_Thread *ecore_long_run(Ecore_Thread_Heavy_Cb func_heavy,
Ecore_Thread_Notify_Cb func_notify,
Ecore_Thread_End_Cb func_end,
Ecore_Thread_Cancel_Cb func_cancel,
Ecore_Cb func_end,
Ecore_Cb func_cancel,
const void *data,
Eina_Bool try_no_queue)
{

10
legacy/ecore/src/lib/ecore/ecore_timer.c
View File

@ -20,7 +20,7 @@ struct _Ecore_Timer
double in;
double at;
double pending;
Eina_Bool (*func) (void *data);
Ecore_Task_Cb func;
void *data;
int references;
@ -30,7 +30,7 @@ struct _Ecore_Timer
};
static void _ecore_timer_set(Ecore_Timer *timer, double at, double in, Eina_Bool (*func) (void *data), void *data);
static void _ecore_timer_set(Ecore_Timer *timer, double at, double in, Ecore_Task_Cb func, void *data);
static int timers_added = 0;
static int timers_delete_me = 0;
@ -113,7 +113,7 @@ ecore_timer_precision_set(double value)
* invalid.
*/
EAPI Ecore_Timer *
ecore_timer_add(double in, Eina_Bool (*func) (void *data), const void *data)
ecore_timer_add(double in, Ecore_Task_Cb func, const void *data)
{
double now;
Ecore_Timer *timer;
@ -142,7 +142,7 @@ ecore_timer_add(double in, Eina_Bool (*func) (void *data), const void *data)
* ecore_timer_add() for more details.
*/
EAPI Ecore_Timer *
ecore_timer_loop_add(double in, Eina_Bool (*func) (void *data), const void *data)
ecore_timer_loop_add(double in, Ecore_Task_Cb func, const void *data)
{
double now;
Ecore_Timer *timer;
@ -568,7 +568,7 @@ _ecore_timer_call(double when)
}
static void
_ecore_timer_set(Ecore_Timer *timer, double at, double in, Eina_Bool (*func) (void *data), void *data)
_ecore_timer_set(Ecore_Timer *timer, double at, double in, Ecore_Task_Cb func, void *data)
{
Ecore_Timer *t2;