EAPI extern Ecore_Version *ecore_version;
-#define ECORE_CALLBACK_CANCEL 0 /**< Return value to remove a callback */
-#define ECORE_CALLBACK_RENEW 1 /**< Return value to keep a callback */
+#define ECORE_CALLBACK_CANCEL EINA_FALSE /**< Return value to remove a callback */
+#define ECORE_CALLBACK_RENEW EINA_TRUE /**< Return value to keep a callback */
+
+#define ECORE_CALLBACK_PASS_ON EINA_TRUE /**< Return value to pass event to next handler */
+#define ECORE_CALLBACK_DONE EINA_FALSE /**< Return value to stop event handling */
#define ECORE_EVENT_NONE 0
#define ECORE_EVENT_SIGNAL_USER 1 /**< User signal event */
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, int (*func) (void *data, int type, void *event), const void *data);
+ EAPI Ecore_Event_Handler *ecore_event_handler_add(int type, Eina_Bool (*func) (void *data, int type, void *event), 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 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), int (*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(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 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);
EAPI void ecore_exe_signal(Ecore_Exe *exe, int num);
EAPI void ecore_exe_hup(Ecore_Exe *exe);
- EAPI Ecore_Idler *ecore_idler_add(int (*func) (void *data), const void *data);
+ EAPI Ecore_Idler *ecore_idler_add(Eina_Bool (*func) (void *data), const void *data);
EAPI void *ecore_idler_del(Ecore_Idler *idler);
- EAPI Ecore_Idle_Enterer *ecore_idle_enterer_add(int (*func) (void *data), const void *data);
- EAPI Ecore_Idle_Enterer *ecore_idle_enterer_before_add(int (*func) (void *data), const void *data);
+ 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 void *ecore_idle_enterer_del(Ecore_Idle_Enterer *idle_enterer);
- EAPI Ecore_Idle_Exiter *ecore_idle_exiter_add(int (*func) (void *data), const void *data);
+ EAPI Ecore_Idle_Exiter *ecore_idle_exiter_add(Eina_Bool (*func) (void *data), 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_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, int (*func) (void *data, Ecore_Fd_Handler *fd_handler), const void *data, int (*buf_func) (void *buf_data, Ecore_Fd_Handler *fd_handler), const void *buf_data);
+ 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 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, int (*func) (void *data, Ecore_Win32_Handler *wh), const void *data);
+ EAPI Ecore_Win32_Handler *ecore_main_win32_handler_add(void *h, Eina_Bool (*func) (void *data, Ecore_Win32_Handler *wh), 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 double ecore_time_get(void);
EAPI double ecore_loop_time_get(void);
- EAPI Ecore_Timer *ecore_timer_add(double in, int (*func) (void *data), const void *data);
- EAPI Ecore_Timer *ecore_timer_loop_add(double in, int (*func) (void *data), const void *data);
+ 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 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);
EAPI double ecore_timer_precision_get(void);
EAPI void ecore_timer_precision_set(double precision);
- EAPI Ecore_Animator *ecore_animator_add(int (*func) (void *data), const void *data);
+ EAPI Ecore_Animator *ecore_animator_add(Eina_Bool (*func) (void *data), 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);
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, int (*func) (void *data), const void *data);
+ EAPI Ecore_Poller *ecore_poller_add(Ecore_Poller_Type type, int interval, Eina_Bool (*func) (void *data), const void *data);
EAPI void *ecore_poller_del(Ecore_Poller *poller);
EAPI Ecore_Job *ecore_job_add(void (*func) (void *data), const void *data);
if (Global < (Local)) \
Global = Local;
-static int _ecore_memory_statistic(void *data);
+static Eina_Bool _ecore_memory_statistic(void *data);
static int _ecore_memory_max_total = 0;
static int _ecore_memory_max_free = 0;
static pid_t _ecore_memory_pid = 0;
}
#if HAVE_MALLINFO
-static int
+static Eina_Bool
_ecore_memory_statistic(__UNUSED__ void *data)
{
struct mallinfo mi;
KEEP_MAX(_ecore_memory_max_total, mi.uordblks);
KEEP_MAX(_ecore_memory_max_free, mi.fordblks);
- return 1;
+ return ECORE_CALLBACK_RENEW;
}
#endif
EINA_INLIST;
ECORE_MAGIC;
- int (*func) (void *data);
+ Eina_Bool (*func) (void *data);
void *data;
Eina_Bool delete_me : 1;
};
-static int _ecore_animator(void *data);
+static Eina_Bool _ecore_animator(void *data);
static Ecore_Timer *timer = NULL;
static int animators_delete_me = 0;
* automatically making any references/handles for it invalid.
*/
EAPI Ecore_Animator *
-ecore_animator_add(int (*func) (void *data), const void *data)
+ecore_animator_add(Eina_Bool (*func) (void *data), const void *data)
{
Ecore_Animator *animator;
}
}
-static int
+static Eina_Bool
_ecore_animator(void *data __UNUSED__)
{
Ecore_Animator *animator;
if (!animators)
{
timer = NULL;
- return 0;
+ return ECORE_CALLBACK_CANCEL;
}
- return 1;
+ return ECORE_CALLBACK_RENEW;
}
EINA_INLIST;
ECORE_MAGIC;
int type;
- int (*func) (void *data, int type, void *event);
- void *data;
+ Eina_Bool (*func) (void *data, int type, void *event);
+ void *data;
int references;
Eina_Bool delete_me : 1;
};
EINA_INLIST;
ECORE_MAGIC;
void *(*func_start) (void *data);
- int (*func_filter) (void *data, void *loop_data, int type, void *event);
+ Eina_Bool (*func_filter) (void *data, void *loop_data, int type, void *event);
void (*func_end) (void *data, void *loop_data);
void *loop_data;
void *data;
* been called, will not be.
*/
EAPI Ecore_Event_Handler *
-ecore_event_handler_add(int type, int (*func) (void *data, int type, void *event), const void *data)
+ecore_event_handler_add(int type, Eina_Bool (*func) (void *data, int type, void *event), const void *data)
{
Ecore_Event_Handler *eh;
* and @p data pointer to clean up.
*/
EAPI Ecore_Event_Filter *
-ecore_event_filter_add(void * (*func_start) (void *data), int (*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(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 *ef;
Ecore_Event_Handler *eh = event_handler_current;
if (!eh->delete_me)
{
- int ret;
+ Eina_Bool ret;
handle_count++;
};
static inline void _ecore_exe_exec_it(const char *exe_cmd, Ecore_Exe_Flags flags);
-static int _ecore_exe_data_generic_handler(void *data, Ecore_Fd_Handler *fd_handler, Ecore_Exe_Flags flags);
-static int _ecore_exe_data_error_handler(void *data, Ecore_Fd_Handler *fd_handler);
-static int _ecore_exe_data_read_handler(void *data, Ecore_Fd_Handler *fd_handler);
-static int _ecore_exe_data_write_handler(void *data, Ecore_Fd_Handler *fd_handler);
+static Eina_Bool _ecore_exe_data_generic_handler(void *data, Ecore_Fd_Handler *fd_handler, Ecore_Exe_Flags flags);
+static Eina_Bool _ecore_exe_data_error_handler(void *data, Ecore_Fd_Handler *fd_handler);
+static Eina_Bool _ecore_exe_data_read_handler(void *data, Ecore_Fd_Handler *fd_handler);
+static Eina_Bool _ecore_exe_data_write_handler(void *data, Ecore_Fd_Handler *fd_handler);
static void _ecore_exe_flush(Ecore_Exe * exe);
static void _ecore_exe_event_exe_data_free(void *data __UNUSED__, void *ev);
static Ecore_Exe *_ecore_exe_is_it_alive(pid_t pid);
-static int _ecore_exe_make_sure_its_dead(void *data);
-static int _ecore_exe_make_sure_its_really_dead(void *data);
+static Eina_Bool _ecore_exe_make_sure_its_dead(void *data);
+static Eina_Bool _ecore_exe_make_sure_its_really_dead(void *data);
static Ecore_Exe_Event_Add *_ecore_exe_event_add_new(void);
static void _ecore_exe_event_add_free(void *data, void *ev);
static void _ecore_exe_dead_attach(Ecore_Exe *exe);
if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE))
{
ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE, "ecore_exe_send");
- return 0;
+ return EINA_FALSE;
}
if (exe->close_stdin)
{
ERR("Ecore_Exe %p stdin is closed! Cannot send %d bytes from %p",
exe, size, data);
- return 0;
+ return EINA_FALSE;
}
if (exe->child_fd_write == -1)
{
ERR("Ecore_Exe %p created without ECORE_EXE_PIPE_WRITE! "
"Cannot send %d bytes from %p", exe, size, data);
- return 0;
+ return EINA_FALSE;
}
buf = realloc(exe->write_data_buf, exe->write_data_size + size);
- if (buf == NULL) return 0;
+ if (buf == NULL) return EINA_FALSE;
exe->write_data_buf = buf;
memcpy((char *)exe->write_data_buf + exe->write_data_size, data, size);
if (exe->write_fd_handler)
ecore_main_fd_handler_active_set(exe->write_fd_handler, ECORE_FD_WRITE);
- return 1;
+ return EINA_TRUE;
}
/**
return exe;
}
-static int
+static Eina_Bool
_ecore_exe_make_sure_its_dead(void *data)
{
struct _ecore_exe_dead_exe *dead;
free(dead);
}
}
- return 0;
+ return ECORE_CALLBACK_CANCEL;
}
-static int
+static Eina_Bool
_ecore_exe_make_sure_its_really_dead(void *data)
{
struct _ecore_exe_dead_exe *dead;
IF_FREE(dead->cmd);
free(dead);
}
- return 0;
+ return ECORE_CALLBACK_CANCEL;
}
void
return;
}
-static int
+static Eina_Bool
_ecore_exe_data_generic_handler(void *data, Ecore_Fd_Handler *fd_handler, Ecore_Exe_Flags flags)
{
Ecore_Exe *exe;
}
}
- return 1;
+ return ECORE_CALLBACK_RENEW;
}
-static int
+static Eina_Bool
_ecore_exe_data_error_handler(void *data, Ecore_Fd_Handler *fd_handler)
{
return _ecore_exe_data_generic_handler(data, fd_handler,
ECORE_EXE_PIPE_ERROR);
}
-static int
+static Eina_Bool
_ecore_exe_data_read_handler(void *data, Ecore_Fd_Handler *fd_handler)
{
return _ecore_exe_data_generic_handler(data, fd_handler,
ECORE_EXE_PIPE_READ);
}
-static int
+static Eina_Bool
_ecore_exe_data_write_handler(void *data, Ecore_Fd_Handler *fd_handler __UNUSED__)
{
Ecore_Exe *exe;
IF_FREE(exe->write_data_buf);
}
- return 1;
+ return ECORE_CALLBACK_RENEW;
}
static void
{
EINA_INLIST;
ECORE_MAGIC;
- int (*func) (void *data);
+ Eina_Bool (*func) (void *data);
void *data;
int references;
Eina_Bool delete_me : 1;
* @ingroup Idle_Group
*/
EAPI Ecore_Idle_Enterer *
-ecore_idle_enterer_add(int (*func) (void *data), const void *data)
+ecore_idle_enterer_add(Eina_Bool (*func) (void *data), const void *data)
{
Ecore_Idle_Enterer *ie;
* @ingroup Idle_Group
*/
EAPI Ecore_Idle_Enterer *
-ecore_idle_enterer_before_add(int (*func) (void *data), const void *data)
+ecore_idle_enterer_before_add(Eina_Bool (*func) (void *data), const void *data)
{
Ecore_Idle_Enterer *ie;
{
EINA_INLIST;
ECORE_MAGIC;
- int (*func) (void *data);
+ Eina_Bool (*func) (void *data);
void *data;
int references;
Eina_Bool delete_me : 1;
* @ingroup Idle_Group
*/
EAPI Ecore_Idle_Exiter *
-ecore_idle_exiter_add(int (*func) (void *data), const void *data)
+ecore_idle_exiter_add(Eina_Bool (*func) (void *data), const void *data)
{
Ecore_Idle_Exiter *ie;
{
EINA_INLIST;
ECORE_MAGIC;
- int (*func) (void *data);
+ Eina_Bool (*func) (void *data);
void *data;
int references;
Eina_Bool delete_me : 1;
* Idlers are useful for progressively prossessing data without blocking.
*/
EAPI Ecore_Idler *
-ecore_idler_add(int (*func) (void *data), const void *data)
+ecore_idler_add(Eina_Bool (*func) (void *data), const void *data)
{
Ecore_Idler *ie;
#include "Ecore.h"
#include "ecore_private.h"
-static int _ecore_job_event_handler(void *data, int type, void *ev);
+static Eina_Bool _ecore_job_event_handler(void *data, int type, void *ev);
static void _ecore_job_event_free(void *data, void *ev);
static int ecore_event_job_type = 0;
return data;
}
-static int
+static Eina_Bool
_ecore_job_event_handler(void *data __UNUSED__, int type __UNUSED__, void *ev)
{
Ecore_Job *job;
job = ev;
job->func(job->data);
- return 0;
+ return ECORE_CALLBACK_CANCEL;
}
static void
ECORE_MAGIC;
int fd;
Ecore_Fd_Handler_Flags flags;
- int (*func) (void *data, Ecore_Fd_Handler *fd_handler);
+ Eina_Bool (*func) (void *data, Ecore_Fd_Handler *fd_handler);
void *data;
- int (*buf_func) (void *data, Ecore_Fd_Handler *fd_handler);
+ Eina_Bool (*buf_func) (void *data, Ecore_Fd_Handler *fd_handler);
void *buf_data;
void (*prep_func) (void *data, Ecore_Fd_Handler *fd_handler);
void *prep_data;
EINA_INLIST;
ECORE_MAGIC;
HANDLE h;
- int (*func) (void *data, Ecore_Win32_Handler *win32_handler);
+ Eina_Bool (*func) (void *data, Ecore_Win32_Handler *win32_handler);
void *data;
int references;
Eina_Bool delete_me : 1;
* @ingroup Ecore_FD_Handler_Group
*/
EAPI Ecore_Fd_Handler *
-ecore_main_fd_handler_add(int fd, Ecore_Fd_Handler_Flags flags, int (*func) (void *data, Ecore_Fd_Handler *fd_handler), const void *data, int (*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,
+ 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_Fd_Handler *fdh;
#ifdef _WIN32
EAPI Ecore_Win32_Handler *
ecore_main_win32_handler_add(void *h,
- int (*func) (void *data, Ecore_Win32_Handler *wh),
+ Eina_Bool (*func) (void *data, Ecore_Win32_Handler *wh),
const void *data)
{
Ecore_Win32_Handler *wh;
#else
EAPI Ecore_Win32_Handler *
ecore_main_win32_handler_add(void *h __UNUSED__,
- int (*func) (void *data, Ecore_Win32_Handler *wh) __UNUSED__,
+ Eina_Bool (*func) (void *data, Ecore_Win32_Handler *wh) __UNUSED__,
const void *data __UNUSED__)
{
return NULL;
};
-static int _ecore_pipe_read(void *data, Ecore_Fd_Handler *fd_handler);
+static Eina_Bool _ecore_pipe_read(void *data, Ecore_Fd_Handler *fd_handler);
/**
* @defgroup Ecore_Pipe_Group Pipe wrapper
/* Private function */
-static int
+static Eina_Bool
_ecore_pipe_read(void *data, Ecore_Fd_Handler *fd_handler __UNUSED__)
{
Ecore_Pipe *p;
ECORE_MAGIC;
int ibit;
unsigned char delete_me : 1;
- int (*func) (void *data);
+ Eina_Bool (*func) (void *data);
void *data;
};
};
static void _ecore_poller_next_tick_eval(void);
-static int _ecore_poller_cb_timer(void *data);
+static Eina_Bool _ecore_poller_cb_timer(void *data);
static void
_ecore_poller_next_tick_eval(void)
poll_cur_interval = interval;
}
-static int
+static Eina_Bool
_ecore_poller_cb_timer(void *data __UNUSED__)
{
int i;
/* if the timer was deleted then there is no point returning 1 - ambiguous
* if we do as it im plies "keep running me" but we have been deleted
* anyway */
- if (!timer) return 0;
+ if (!timer) return ECORE_CALLBACK_CANCEL;
/* adjust interval */
ecore_timer_interval_set(timer, poll_cur_interval);
- return 1;
+ return ECORE_CALLBACK_RENEW;
}
/**
* invalid.
*/
EAPI Ecore_Poller *
-ecore_poller_add(Ecore_Poller_Type type __UNUSED__, int interval, int (*func) (void *data), const void *data)
+ecore_poller_add(Ecore_Poller_Type type __UNUSED__, int interval, Eina_Bool (*func) (void *data), const void *data)
{
Ecore_Poller *poller;
int ibit;
* a poll rate without deleting and re-creating a poller.
* @ingroup Ecore_Poller_Group
*/
-EAPI Eina_Bool
+EAPI Eina_Bool
ecore_poller_poller_interval_set(Ecore_Poller *poller, int interval)
{
int ibit;
{
ECORE_MAGIC_FAIL(poller, ECORE_MAGIC_POLLER,
"ecore_poller_poller_interval_set");
- return 0;
+ return EINA_FALSE;
}
/* interval MUST be a power of 2, so enforce it */
if (ibit > 15) ibit = 15;
/* if interval specified is the same as interval set, return true without wasting time */
if (poller->ibit == ibit)
- return 1;
+ return EINA_TRUE;
pollers[poller->ibit] = (Ecore_Poller *) eina_inlist_remove(EINA_INLIST_GET(pollers[poller->ibit]), EINA_INLIST_GET(poller));
poller->ibit = ibit;
pollers[poller->ibit] = (Ecore_Poller *) eina_inlist_prepend(EINA_INLIST_GET(pollers[poller->ibit]), EINA_INLIST_GET(poller));
just_added_poller++;
else
_ecore_poller_next_tick_eval();
- return 1;
+ return EINA_TRUE;
}
/**
static void _ecore_signal_callback_sigrt(int sig, siginfo_t *si, void *foo);
#endif
-static int _ecore_signal_exe_exit_delay(void *data);
+static Eina_Bool _ecore_signal_exe_exit_delay(void *data);
//#define MAXSIGQ 256 // 32k
#define MAXSIGQ 64 // 8k
}
#endif
-static int
+static Eina_Bool
_ecore_signal_exe_exit_delay(void *data)
{
Ecore_Exe_Event_Del *e;
_ecore_event_add(ECORE_EXE_EVENT_DEL, e,
_ecore_exe_event_del_free, NULL);
}
- return 0;
+ return ECORE_CALLBACK_CANCEL;
}
ecore_pipe_del(p);
}
-static int
+static Eina_Bool
_ecore_thread_pipe_del(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
{
/* This is a hack to delay pipe destruction until we are out of it's internal loop. */
- return 0;
+ return ECORE_CALLBACK_CANCEL;
}
static void
double in;
double at;
double pending;
- int (*func) (void *data);
+ Eina_Bool (*func) (void *data);
void *data;
int references;
};
-static void _ecore_timer_set(Ecore_Timer *timer, double at, double in, int (*func) (void *data), void *data);
+static void _ecore_timer_set(Ecore_Timer *timer, double at, double in, Eina_Bool (*func) (void *data), void *data);
static int timers_added = 0;
static int timers_delete_me = 0;
* invalid.
*/
EAPI Ecore_Timer *
-ecore_timer_add(double in, int (*func) (void *data), const void *data)
+ecore_timer_add(double in, Eina_Bool (*func) (void *data), const void *data)
{
double now;
Ecore_Timer *timer;
* ecore_timer_add() for more details.
*/
EAPI Ecore_Timer *
-ecore_timer_loop_add(double in, int (*func) (void *data), const void *data)
+ecore_timer_loop_add(double in, Eina_Bool (*func) (void *data), const void *data)
{
double now;
Ecore_Timer *timer;
}
static void
-_ecore_timer_set(Ecore_Timer *timer, double at, double in, int (*func) (void *data), void *data)
+_ecore_timer_set(Ecore_Timer *timer, double at, double in, Eina_Bool (*func) (void *data), void *data)
{
Ecore_Timer *t2;
static void _ecore_con_server_free(Ecore_Con_Server *svr);
static void _ecore_con_client_free(Ecore_Con_Client *cl);
-static int _ecore_con_svr_handler(void *data, Ecore_Fd_Handler *fd_handler);
-static int _ecore_con_cl_handler(void *data, Ecore_Fd_Handler *fd_handler);
-static int _ecore_con_cl_udp_handler(void *data, Ecore_Fd_Handler *fd_handler);
-static int _ecore_con_svr_udp_handler(void *data, Ecore_Fd_Handler *fd_handler);
-static int _ecore_con_svr_cl_handler(void *data, Ecore_Fd_Handler *fd_handler);
+static Eina_Bool _ecore_con_svr_handler(void *data, Ecore_Fd_Handler *fd_handler);
+static Eina_Bool _ecore_con_cl_handler(void *data, Ecore_Fd_Handler *fd_handler);
+static Eina_Bool _ecore_con_cl_udp_handler(void *data, Ecore_Fd_Handler *fd_handler);
+static Eina_Bool _ecore_con_svr_udp_handler(void *data, Ecore_Fd_Handler *fd_handler);
+static Eina_Bool _ecore_con_svr_cl_handler(void *data, Ecore_Fd_Handler *fd_handler);
static void _ecore_con_server_flush(Ecore_Con_Server *svr);
static void _ecore_con_client_flush(Ecore_Con_Client *cl);
return strdup(ipbuf);
}
-static int
+static Eina_Bool
_ecore_con_svr_handler(void *data, Ecore_Fd_Handler *fd_handler __UNUSED__)
{
Ecore_Con_Server *svr;
size_t size_in;
svr = data;
- if (svr->dead) return 1;
- if (svr->delete_me) return 1;
+ if (svr->dead) return ECORE_CALLBACK_RENEW;
+ if (svr->delete_me) return ECORE_CALLBACK_RENEW;
if ((svr->client_limit >= 0) && (!svr->reject_excess_clients))
{
if (eina_list_count(svr->clients) >= (unsigned int)svr->client_limit)
- return 1;
+ return ECORE_CALLBACK_RENEW;
}
/* a new client */
size_in = sizeof(incoming);
if (eina_list_count(svr->clients) >= (unsigned int)svr->client_limit)
{
close(new_fd);
- return 1;
+ return ECORE_CALLBACK_RENEW;
}
}
if (!cl)
{
close(new_fd);
- return 1;
+ return ECORE_CALLBACK_RENEW;
}
fcntl(new_fd, F_SETFL, O_NONBLOCK);
{
close(new_fd);
ecore_con_ssl_client_shutdown(cl);
- return 1;
+ return ECORE_CALLBACK_RENEW;
}
cl->fd_handler =
}
}
}
- return 1;
+ return ECORE_CALLBACK_RENEW;
}
-static int
+static Eina_Bool
_ecore_con_cl_handler(void *data, Ecore_Fd_Handler *fd_handler)
{
Ecore_Con_Server *svr;
svr = data;
- if (svr->dead) return 1;
- if (svr->delete_me) return 1;
+ if (svr->dead) return ECORE_CALLBACK_RENEW;
+ if (svr->delete_me) return ECORE_CALLBACK_RENEW;
if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_READ))
{
unsigned char *inbuf = NULL;
int tries;
if (svr->connecting && (svr_try_connect(svr) != ECORE_CON_CONNECTED))
- return 1;
+ return ECORE_CALLBACK_RENEW;
for (tries = 0; tries < 16; tries++)
{
else if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_WRITE))
{
if (svr->connecting && !svr_try_connect (svr))
- return 1;
+ return ECORE_CALLBACK_RENEW;
_ecore_con_server_flush(svr);
}
- return 1;
+ return ECORE_CALLBACK_RENEW;
}
-static int
+static Eina_Bool
_ecore_con_cl_udp_handler(void *data, Ecore_Fd_Handler *fd_handler)
{
Ecore_Con_Server *svr;
svr = data;
- if (svr->dead) return 1;
- if (svr->delete_me) return 1;
+ if (svr->dead) return ECORE_CALLBACK_RENEW;
+ if (svr->delete_me) return ECORE_CALLBACK_RENEW;
if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_READ))
{
unsigned char buf[65536];
else if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_WRITE))
_ecore_con_server_flush(svr);
- return 1;
+ return ECORE_CALLBACK_RENEW;
}
-static int
+static Eina_Bool
_ecore_con_svr_udp_handler(void *data, Ecore_Fd_Handler *fd_handler)
{
Ecore_Con_Server *svr;
Ecore_Con_Client *cl = NULL;
svr = data;
- if (svr->dead) return 1;
- if (svr->delete_me) return 1;
+ if (svr->dead) return ECORE_CALLBACK_RENEW;
+ if (svr->delete_me) return ECORE_CALLBACK_RENEW;
if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_READ))
{
unsigned char buf[READBUFSIZ];
/* Create a new client for use in the client data event */
cl = calloc(1, sizeof(Ecore_Con_Client));
if(cl == NULL)
- return 1;
+ return ECORE_CALLBACK_RENEW;
cl->buf = NULL;
cl->fd = 0;
cl->fd_handler = NULL;
if(cl->client_addr == NULL)
{
free(cl);
- return 1;
+ return ECORE_CALLBACK_RENEW;
}
memcpy(cl->client_addr, &client_addr, client_addr_len);
ECORE_MAGIC_SET(cl, ECORE_MAGIC_CON_CLIENT);
{
free(cl->client_addr);
free(cl);
- return 1;
+ return ECORE_CALLBACK_RENEW;
}
memcpy(inbuf, buf, num);
}
else if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_WRITE))
_ecore_con_client_flush(cl);
- return 1;
+ return ECORE_CALLBACK_RENEW;
}
-static int
+static Eina_Bool
_ecore_con_svr_cl_handler(void *data, Ecore_Fd_Handler *fd_handler)
{
Ecore_Con_Client *cl;
cl = data;
- if (cl->dead) return 1;
- if (cl->delete_me) return 1;
+ if (cl->dead) return ECORE_CALLBACK_RENEW;
+ if (cl->delete_me) return ECORE_CALLBACK_RENEW;
if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_READ))
{
unsigned char *inbuf = NULL;
}
else if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_WRITE))
_ecore_con_client_flush(cl);
- return 1;
+ return ECORE_CALLBACK_RENEW;
}
static void
static void _ecore_con_info_ares_nameinfo(Ecore_Con_CAres *arg, int status, int timeouts, char *node, char *service);
static void _ecore_con_info_ares_host_cb(Ecore_Con_CAres *arg, int status, int timeouts, struct hostent *hostent);
-static int _ecore_con_info_cares_fd_cb(void *data, Ecore_Fd_Handler *fd_handler);
-static int _ecore_con_info_cares_timeout_cb(void *data);
+static Eina_Bool _ecore_con_info_cares_fd_cb(void *data, Ecore_Fd_Handler *fd_handler);
+static Eina_Bool _ecore_con_info_cares_timeout_cb(void *data);
static void _ecore_con_info_cares_clean(void);
int
}
}
-static int
+static Eina_Bool
_ecore_con_info_cares_timeout_cb(void *data)
{
ares_process(info_channel, &info_readers, &info_writers);
_ecore_con_info_cares_clean();
- return 1;
+ return ECORE_CALLBACK_RENEW;
}
-static int
+static Eina_Bool
_ecore_con_info_cares_fd_cb(void *data, Ecore_Fd_Handler *fd_handler)
{
ares_process(info_channel, &info_readers, &info_writers);
_ecore_con_info_cares_clean();
- return 1;
+ return ECORE_CALLBACK_RENEW;
}
static void
static void _ecore_con_info_readdata(CB_Data *cbdata);
static void _ecore_con_info_slave_free(CB_Data *cbdata);
-static int _ecore_con_info_data_handler(void *data, Ecore_Fd_Handler *fd_handler);
-static int _ecore_con_info_exit_handler(void *data, int type __UNUSED__, void *event);
+static Eina_Bool _ecore_con_info_data_handler(void *data, Ecore_Fd_Handler *fd_handler);
+static Eina_Bool _ecore_con_info_exit_handler(void *data, int type __UNUSED__, void *event);
static int info_init = 0;
static CB_Data *info_slaves = NULL;
free(cbdata);
}
-static int
+static Eina_Bool
_ecore_con_info_data_handler(void *data, Ecore_Fd_Handler *fd_handler)
{
CB_Data *cbdata;
}
}
_ecore_con_info_slave_free(cbdata);
- return 0;
+ return ECORE_CALLBACK_CANCEL;
}
-static int
+static Eina_Bool
_ecore_con_info_exit_handler(void *data, int type __UNUSED__, void *event)
{
CB_Data *cbdata;
ev = event;
cbdata = data;
- if (cbdata->pid != ev->pid) return 1;
- return 0;
+ if (cbdata->pid != ev->pid) return ECORE_CALLBACK_RENEW;
+ return ECORE_CALLBACK_CANCEL; /* FIXME: Woot ??? */
_ecore_con_info_slave_free(cbdata);
- return 0;
+ return ECORE_CALLBACK_CANCEL;
}
int
ecore_con_local_connect(Ecore_Con_Server *svr,
- int (*cb_done)(void *data, Ecore_Fd_Handler *fd_handler),
+ Eina_Bool (*cb_done)(void *data, Ecore_Fd_Handler *fd_handler),
void *data __UNUSED__,
void (*cb_free)(void *data, void *ev))
{
int
ecore_con_local_listen(Ecore_Con_Server *svr,
- int (*cb_listen)(void *data, Ecore_Fd_Handler *fd_handler),
+ Eina_Bool (*cb_listen)(void *data, Ecore_Fd_Handler *fd_handler),
void *data __UNUSED__)
{
char buf[4096];
/* from ecore_local.c */
int ecore_con_local_init(void);
int ecore_con_local_shutdown(void);
-int ecore_con_local_connect(Ecore_Con_Server *svr, int (*cb_done)(void *data, Ecore_Fd_Handler *fd_handler), void *data, void (*cb_free)(void *data, void *ev));
-int ecore_con_local_listen(Ecore_Con_Server *svr, int (*cb_listen)(void *data, Ecore_Fd_Handler *fd_handler), void *data);
+int ecore_con_local_connect(Ecore_Con_Server *svr, Eina_Bool (*cb_done)(void *data, Ecore_Fd_Handler *fd_handler), void *data, void (*cb_free)(void *data, void *ev));
+int ecore_con_local_listen(Ecore_Con_Server *svr, Eina_Bool (*cb_listen)(void *data, Ecore_Fd_Handler *fd_handler), void *data);
/* from ecore_con_info.c */
int ecore_con_info_init(void);
int ecore_con_info_shutdown(void);
int ECORE_CON_EVENT_URL_PROGRESS = 0;
#ifdef HAVE_CURL
-static int _ecore_con_url_fd_handler(void *data, Ecore_Fd_Handler *fd_handler);
+static Eina_Bool _ecore_con_url_fd_handler(void *data, Ecore_Fd_Handler *fd_handler);
static int _ecore_con_url_perform(Ecore_Con_Url *url_con);
static size_t _ecore_con_url_header_cb(void *ptr, size_t size, size_t nitems, void *stream);
static size_t _ecore_con_url_data_cb(void *buffer, size_t size, size_t nitems, void *userp);
static size_t _ecore_con_url_read_cb(void *ptr, size_t size, size_t nitems, void *stream);
static void _ecore_con_event_url_free(void *data __UNUSED__, void *ev);
static int _ecore_con_url_process_completed_jobs(Ecore_Con_Url *url_con_to_match);
-static int _ecore_con_url_idler_handler(void *data __UNUSED__);
+static Eina_Bool _ecore_con_url_idler_handler(void *data __UNUSED__);
static Ecore_Idler *_fd_idler_handler = NULL;
static Eina_List *_url_con_list = NULL;
void *ev;
};
-static int
+static Eina_Bool
_url_complete_idler_cb(void *data)
{
Ecore_Con_Url_Event *lev;
ecore_event_add(lev->type, lev->ev, _ecore_con_event_url_free, NULL);
free(lev);
- return 0;
+ return ECORE_CALLBACK_CANCEL;
}
static void
return 1;
}
-static int
+static Eina_Bool
_ecore_con_url_idler_handler(void *data)
{
double start;
if (!_url_con_list)
ecore_timer_freeze(_curl_timeout);
- return data == (void*) 0xACE ? 1 : 0;
+ return data == (void*) 0xACE ? ECORE_CALLBACK_RENEW : ECORE_CALLBACK_CANCEL;
}
- return 1;
+ return ECORE_CALLBACK_RENEW;
}
-static int
+static Eina_Bool
_ecore_con_url_fd_handler(void *data __UNUSED__, Ecore_Fd_Handler *fd_handler __UNUSED__)
{
_ecore_con_url_suspend_fd_handler();
if (_fd_idler_handler == NULL)
_fd_idler_handler = ecore_idler_add(_ecore_con_url_idler_handler, NULL);
- return 1;
+ return ECORE_CALLBACK_RENEW;
}
static int
int _ecore_evas_log_dom = -1;
static int _ecore_evas_init_count = 0;
static Ecore_Fd_Handler *_ecore_evas_async_events_fd = NULL;
-static int _ecore_evas_async_events_fd_handler(void *data, Ecore_Fd_Handler *fd_handler);
+static Eina_Bool _ecore_evas_async_events_fd_handler(void *data, Ecore_Fd_Handler *fd_handler);
static Ecore_Idle_Enterer *ecore_evas_idle_enterer = NULL;
static Ecore_Evas *ecore_evases = NULL;
static int _ecore_evas_fps_debug = 0;
-static int
+static Eina_Bool
_ecore_evas_idle_enter(void *data __UNUSED__)
{
Ecore_Evas *ee;
double t2 = 0.0;
int rend = 0;
- if (!ecore_evases) return 1;
+ if (!ecore_evases) return ECORE_CALLBACK_RENEW;
if (_ecore_evas_fps_debug)
{
t1 = ecore_time_get();
if (rend)
_ecore_evas_fps_debug_rendertime_add(t2 - t1);
}
- return 1;
+ return ECORE_CALLBACK_RENEW;
}
/**
free(ee);
}
-static int
+static Eina_Bool
_ecore_evas_cb_idle_flush(void *data)
{
Ecore_Evas *ee;
ee = (Ecore_Evas *)data;
evas_render_idle_flush(ee->evas);
ee->engine.idle_flush_timer = NULL;
- return 0;
+ return ECORE_CALLBACK_CANCEL;
}
-static int
+static Eina_Bool
_ecore_evas_async_events_fd_handler(void *data __UNUSED__, Ecore_Fd_Handler *fd_handler __UNUSED__)
{
evas_async_events_process();
- return 1;
+ return ECORE_CALLBACK_RENEW;
}
void
return sdl_ee;
}
-static int
+static Eina_Bool
_ecore_evas_sdl_event_got_focus(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
{
Ecore_Evas *ee;
ee = _ecore_evas_sdl_match();
- if (!ee) return 1;
+ if (!ee) return ECORE_CALLBACK_PASS_ON;
/* pass on event */
ee->prop.focused = 1;
- return 0;
+ return ECORE_CALLBACK_DONE;
}
-static int
+static Eina_Bool
_ecore_evas_sdl_event_lost_focus(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
{
Ecore_Evas *ee;
ee = _ecore_evas_sdl_match();
- if (!ee) return 1;
+ if (!ee) return ECORE_CALLBACK_PASS_ON;
/* pass on event */
ee->prop.focused = 0;
- return 0;
+ return ECORE_CALLBACK_DONE;
}
-static int
+static Eina_Bool
_ecore_evas_sdl_event_video_resize(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Sdl_Event_Video_Resize *e;
e = event;
ee = _ecore_evas_sdl_match();
- if (!ee) return 1; /* pass on event */
+ if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */
evas_output_size_set(ee->evas, e->w, e->h);
- return 0;
+ return ECORE_CALLBACK_DONE;
}
-static int
+static Eina_Bool
_ecore_evas_sdl_event_video_expose(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
{
Ecore_Evas *ee;
ee = _ecore_evas_sdl_match();
- if (!ee) return 1;
+ if (!ee) return ECORE_CALLBACK_PASS_ON;
evas_output_size_get(ee->evas, &w, &h);
evas_damage_rectangle_add(ee->evas, 0, 0, w, h);
- return 0;
+ return ECORE_CALLBACK_DONE;
}
static int
return rend;
}
-static int
+static Eina_Bool
_ecore_evas_sdl_event(void *data __UNUSED__)
{
ecore_sdl_feed_events();
- return 1;
+ return ECORE_CALLBACK_RENEW;
}
static int
}
/* TODO: we need to make this work for all the states, not just sticky */
-static int
+static Eina_Bool
_ecore_evas_x_event_property_change(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Evas *ee;
e = event;
ee = ecore_event_window_match(e->win);
- if ((!ee) || (ee->ignore_events)) return 1; /* pass on event */
- if (e->win != ee->prop.window) return 1;
+ if ((!ee) || (ee->ignore_events)) return ECORE_CALLBACK_PASS_ON; /* pass on event */
+ if (e->win != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
if (e->atom == ECORE_X_ATOM_NET_WM_STATE)
{
unsigned int i, num;
}
}
- return 1;
+ return ECORE_CALLBACK_PASS_ON;
}
-static int
+static Eina_Bool
_ecore_evas_x_event_visibility_change(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Evas *ee;
e = event;
ee = ecore_event_window_match(e->win);
- if (!ee) return 1; /* pass on event */
- if (e->win != ee->prop.window) return 1;
+ if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */
+ if (e->win != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
// printf("VIS CHANGE OBSCURED: %p %i\n", ee, e->fully_obscured);
if (e->fully_obscured)
{
ee->draw_ok = 0;
}
else ee->draw_ok = 1;
- return 1;
+ return ECORE_CALLBACK_PASS_ON;
}
-static int
+static Eina_Bool
_ecore_evas_x_event_client_message(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Evas *ee;
Ecore_X_Event_Client_Message *e;
e = event;
- if (e->format != 32) return 1;
+ if (e->format != 32) return ECORE_CALLBACK_PASS_ON;
if (e->message_type == ECORE_X_ATOM_E_COMP_SYNC_BEGIN)
{
ee = ecore_event_window_match(e->data.l[0]);
- if (!ee) return 1; /* pass on event */
- if (e->data.l[0] != (long)ee->prop.window) return 1;
+ if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */
+ if (e->data.l[0] != (long)ee->prop.window) return ECORE_CALLBACK_PASS_ON;
ee->engine.x.sync_began = 1;
ee->engine.x.sync_cancel = 0;
}
else if (e->message_type == ECORE_X_ATOM_E_COMP_SYNC_END)
{
ee = ecore_event_window_match(e->data.l[0]);
- if (!ee) return 1; /* pass on event */
- if (e->data.l[0] != (long)ee->prop.window) return 1;
+ if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */
+ if (e->data.l[0] != (long)ee->prop.window) return ECORE_CALLBACK_PASS_ON;
ee->engine.x.sync_began = 0;
ee->engine.x.sync_cancel = 0;
}
else if (e->message_type == ECORE_X_ATOM_E_COMP_SYNC_CANCEL)
{
ee = ecore_event_window_match(e->data.l[0]);
- if (!ee) return 1; /* pass on event */
- if (e->data.l[0] != (long)ee->prop.window) return 1;
+ if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */
+ if (e->data.l[0] != (long)ee->prop.window) return ECORE_CALLBACK_PASS_ON;
ee->engine.x.sync_began = 0;
ee->engine.x.sync_cancel = 1;
}
- return 1;
+ return ECORE_CALLBACK_PASS_ON;
}
-static int
+static Eina_Bool
_ecore_evas_x_event_mouse_in(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Evas *ee;
e = event;
ee = ecore_event_window_match(e->win);
- if ((!ee) || (ee->ignore_events)) return 1; /* pass on event */
- if (e->win != ee->prop.window) return 1;
+ if ((!ee) || (ee->ignore_events)) return ECORE_CALLBACK_PASS_ON; /* pass on event */
+ if (e->win != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
/* { */
/* time_t t; */
/* char *ct; */
ecore_event_evas_modifier_lock_update(ee->evas, e->modifiers);
evas_event_feed_mouse_in(ee->evas, e->time, NULL);
_ecore_evas_mouse_move_process(ee, e->x, e->y, e->time);
- return 1;
+ return ECORE_CALLBACK_PASS_ON;
}
-static int
+static Eina_Bool
_ecore_evas_x_event_mouse_out(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Evas *ee;
e = event;
ee = ecore_event_window_match(e->win);
- if ((!ee) || (ee->ignore_events)) return 1;
+ if ((!ee) || (ee->ignore_events)) return ECORE_CALLBACK_PASS_ON;
/* pass on event */
- if (e->win != ee->prop.window) return 1;
+ if (e->win != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
/* { */
/* time_t t; */
/* char *ct; */
evas_event_feed_mouse_out(ee->evas, e->time, NULL);
if (ee->func.fn_mouse_out) ee->func.fn_mouse_out(ee);
if (ee->prop.cursor.object) evas_object_hide(ee->prop.cursor.object);
- return 1;
+ return ECORE_CALLBACK_PASS_ON;
}
-static int
+static Eina_Bool
_ecore_evas_x_event_window_focus_in(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Evas *ee;
e = event;
ee = ecore_event_window_match(e->win);
- if ((!ee) || (ee->ignore_events)) return 1; /* pass on event */
- if (e->win != ee->prop.window) return 1;
- if (e->mode == ECORE_X_EVENT_MODE_UNGRAB) return 1;
+ if ((!ee) || (ee->ignore_events)) return ECORE_CALLBACK_PASS_ON; /* pass on event */
+ if (e->win != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
+ if (e->mode == ECORE_X_EVENT_MODE_UNGRAB) return ECORE_CALLBACK_PASS_ON;
ee->prop.focused = 1;
evas_focus_in(ee->evas);
if (ee->func.fn_focus_in) ee->func.fn_focus_in(ee);
- return 1;
+ return ECORE_CALLBACK_PASS_ON;
}
-static int
+static Eina_Bool
_ecore_evas_x_event_window_focus_out(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Evas *ee;
e = event;
ee = ecore_event_window_match(e->win);
- if ((!ee) || (ee->ignore_events)) return 1; /* pass on event */
- if (e->win != ee->prop.window) return 1;
- if (e->mode == ECORE_X_EVENT_MODE_GRAB) return 1;
+ if ((!ee) || (ee->ignore_events)) return ECORE_CALLBACK_PASS_ON; /* pass on event */
+ if (e->win != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
+ if (e->mode == ECORE_X_EVENT_MODE_GRAB) return ECORE_CALLBACK_PASS_ON;
// if (ee->prop.fullscreen)
// ecore_x_window_focus(ee->prop.window);
evas_focus_out(ee->evas);
ee->prop.focused = 0;
if (ee->func.fn_focus_out) ee->func.fn_focus_out(ee);
- return 1;
+ return ECORE_CALLBACK_PASS_ON;
}
-static int
+static Eina_Bool
_ecore_evas_x_event_window_damage(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Evas *ee;
e = event;
ee = ecore_event_window_match(e->win);
- if (!ee) return 1; /* pass on event */
- if (e->win != ee->prop.window) return 1;
- if (ee->engine.x.using_bg_pixmap) return 1;
+ if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */
+ if (e->win != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
+ if (ee->engine.x.using_bg_pixmap) return ECORE_CALLBACK_PASS_ON;
// printf("EXPOSE %p [%i] %i %i %ix%i\n", ee, ee->prop.avoid_damage, e->x, e->y, e->w, e->h);
if (ee->prop.avoid_damage)
{
ee->w - e->x - e->w,
e->h, e->w);
}
- return 1;
+ return ECORE_CALLBACK_PASS_ON;
}
-static int
+static Eina_Bool
_ecore_evas_x_event_window_destroy(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Evas *ee;
e = event;
ee = ecore_event_window_match(e->win);
- if (!ee) return 1; /* pass on event */
- if (e->win != ee->prop.window) return 1;
+ if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */
+ if (e->win != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
if (ee->func.fn_destroy) ee->func.fn_destroy(ee);
_ecore_evas_x_sync_clear(ee);
ecore_evas_free(ee);
- return 1;
+ return ECORE_CALLBACK_PASS_ON;
}
-static int
+static Eina_Bool
_ecore_evas_x_event_window_configure(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Evas *ee;
e = event;
ee = ecore_event_window_match(e->win);
- if (!ee) return 1; /* pass on event */
- if (e->win != ee->prop.window) return 1;
- if (ee->engine.x.direct_resize) return 1;
+ if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */
+ if (e->win != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
+ if (ee->engine.x.direct_resize) return ECORE_CALLBACK_PASS_ON;
if ((e->from_wm) || (ee->prop.override))
{
}
if (ee->func.fn_resize) ee->func.fn_resize(ee);
}
- return 1;
+ return ECORE_CALLBACK_PASS_ON;
}
-static int
+static Eina_Bool
_ecore_evas_x_event_window_delete_request(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Evas *ee;
e = event;
ee = ecore_event_window_match(e->win);
- if (!ee) return 1; /* pass on event */
- if (e->win != ee->prop.window) return 1;
+ if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */
+ if (e->win != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
if (ee->func.fn_delete_request) ee->func.fn_delete_request(ee);
- return 1;
+ return ECORE_CALLBACK_PASS_ON;
}
-static int
+static Eina_Bool
_ecore_evas_x_event_window_show(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Evas *ee;
e = event;
ee = ecore_event_window_match(e->win);
- if (!ee) return 1; /* pass on event */
- if (e->win != ee->prop.window) return 1;
- if (ee->visible) return 0; /* dont pass it on */
+ if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */
+ if (e->win != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
+ if (ee->visible) return ECORE_CALLBACK_DONE; /* dont pass it on */
// printf("SHOW EVENT %p\n", ee);
ee->visible = 1;
if (ee->func.fn_show) ee->func.fn_show(ee);
- return 1;
+ return ECORE_CALLBACK_PASS_ON;
}
-static int
+static Eina_Bool
_ecore_evas_x_event_window_hide(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Evas *ee;
e = event;
ee = ecore_event_window_match(e->win);
- if (!ee) return 1; /* pass on event */
- if (e->win != ee->prop.window) return 1;
- if (!ee->visible) return 0; /* dont pass it on */
+ if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */
+ if (e->win != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
+ if (!ee->visible) return ECORE_CALLBACK_DONE; /* dont pass it on */
// printf("HIDE EVENT %p\n", ee);
ee->visible = 0;
if (ee->func.fn_hide) ee->func.fn_hide(ee);
- return 1;
+ return ECORE_CALLBACK_PASS_ON;
}
/* FIXME, should be in idler */
int (*progress_cb)(void *data, const char *file, long int dltotal, long int dlnow, long int ultotal, long int ulnow),
void *data);
-static int _ecore_file_download_url_complete_cb(void *data, int type, void *event);
-static int _ecore_file_download_url_progress_cb(void *data, int type, void *event);
+static Eina_Bool _ecore_file_download_url_complete_cb(void *data, int type, void *event);
+static Eina_Bool _ecore_file_download_url_progress_cb(void *data, int type, void *event);
#endif
static Ecore_Event_Handler *_url_complete_handler = NULL;
return -1;
}
-static int
+static Eina_Bool
_ecore_file_download_url_complete_cb(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Con_Event_Url_Complete *ev = event;
Ecore_File_Download_Job *job;
job = eina_list_search_unsorted(_job_list, _ecore_file_download_url_compare_job, ev->url_con);
- if (!ECORE_MAGIC_CHECK(job, ECORE_MAGIC_FILE_DOWNLOAD_JOB)) return 1;
-
+ if (!ECORE_MAGIC_CHECK(job, ECORE_MAGIC_FILE_DOWNLOAD_JOB)) return ECORE_CALLBACK_PASS_ON;
if (job->completion_cb)
job->completion_cb(ecore_con_url_data_get(job->url_con), job->dst, !ev->status);
free(job->dst);
free(job);
- return 0;
+ return ECORE_CALLBACK_DONE;
}
-static int
+static Eina_Bool
_ecore_file_download_url_progress_cb(void *data __UNUSED__, int type __UNUSED__, void *event)
{
/* this reports the downloads progress. if we return 0, then download
Ecore_File_Download_Job *job;
job = eina_list_search_unsorted(_job_list, _ecore_file_download_url_compare_job, ev->url_con);
- if (!ECORE_MAGIC_CHECK(job, ECORE_MAGIC_FILE_DOWNLOAD_JOB)) return 1;
+ if (!ECORE_MAGIC_CHECK(job, ECORE_MAGIC_FILE_DOWNLOAD_JOB)) return ECORE_CALLBACK_PASS_ON;
if (job->progress_cb)
if (job->progress_cb(ecore_con_url_data_get(job->url_con), job->dst,
free(job->dst);
free(job);
- return 1;
+ return ECORE_CALLBACK_PASS_ON;
}
- return 0;
+ return ECORE_CALLBACK_DONE;
}
Ecore_File_Download_Job *
static Ecore_Fd_Handler *_fdh = NULL;
static Ecore_File_Monitor *_monitors = NULL;
-static int _ecore_file_monitor_inotify_handler(void *data, Ecore_Fd_Handler *fdh);
+static Eina_Bool _ecore_file_monitor_inotify_handler(void *data, Ecore_Fd_Handler *fdh);
static Ecore_File_Monitor *_ecore_file_monitor_inotify_monitor_find(int wd);
static void _ecore_file_monitor_inotify_events(Ecore_File_Monitor *em, char *file, int mask);
static int _ecore_file_monitor_inotify_monitor(Ecore_File_Monitor *em, const char *path);
free(em);
}
-static int
+static Eina_Bool
_ecore_file_monitor_inotify_handler(void *data __UNUSED__, Ecore_Fd_Handler *fdh)
{
Ecore_File_Monitor *em;
_ecore_file_monitor_inotify_events(em, (event->len ? event->name : NULL), event->mask);
}
- return 1;
+ return ECORE_CALLBACK_RENEW;
}
static Ecore_File_Monitor *
static Ecore_File_Monitor *_monitors = NULL;
static int _lock = 0;
-static int _ecore_file_monitor_poll_handler(void *data);
+static Eina_Bool _ecore_file_monitor_poll_handler(void *data);
static void _ecore_file_monitor_poll_check(Ecore_File_Monitor *em);
static int _ecore_file_monitor_poll_checking(Ecore_File_Monitor *em, char *name);
}
}
-static int
+static Eina_Bool
_ecore_file_monitor_poll_handler(void *data __UNUSED__)
{
Ecore_File_Monitor *l;
if (ECORE_FILE_MONITOR_POLL(em)->deleted)
ecore_file_monitor_del(em);
}
- return 1;
+ return ECORE_CALLBACK_RENEW;
}
static void
EAPI int ecore_event_evas_init(void);
EAPI int ecore_event_evas_shutdown(void);
-EAPI int ecore_event_evas_key_down(void *data, int type, void *event);
-EAPI int ecore_event_evas_key_up(void *data, int type, void *event);
-EAPI int ecore_event_evas_mouse_button_up(void *data, int type, void *event);
-EAPI int ecore_event_evas_mouse_button_down(void *data, int type, void *event);
-EAPI int ecore_event_evas_mouse_wheel(void *data, int type, void *event);
-EAPI int ecore_event_evas_mouse_move(void *data, int type, void *event);
-EAPI int ecore_event_evas_mouse_in(void *data, int type, void *event);
-EAPI int ecore_event_evas_mouse_out(void *data, int type, void *event);
+EAPI Eina_Bool ecore_event_evas_key_down(void *data, int type, void *event);
+EAPI Eina_Bool ecore_event_evas_key_up(void *data, int type, void *event);
+EAPI Eina_Bool ecore_event_evas_mouse_button_up(void *data, int type, void *event);
+EAPI Eina_Bool ecore_event_evas_mouse_button_down(void *data, int type, void *event);
+EAPI Eina_Bool ecore_event_evas_mouse_wheel(void *data, int type, void *event);
+EAPI Eina_Bool ecore_event_evas_mouse_move(void *data, int type, void *event);
+EAPI Eina_Bool ecore_event_evas_mouse_in(void *data, int type, void *event);
+EAPI Eina_Bool ecore_event_evas_mouse_out(void *data, int type, void *event);
EAPI void ecore_event_window_register(Ecore_Window id, void *window, Evas *evas, Ecore_Event_Mouse_Move_Cb move_mouse);
EAPI void ecore_event_window_unregister(Ecore_Window id);
return lookup;
}
-static int
+static Eina_Bool
_ecore_event_evas_key(Ecore_Event_Key *e, Ecore_Event_Press press)
{
Ecore_Input_Window *lookup;
lookup = _ecore_event_window_match(e->window);
- if (!lookup) return 1;
+ if (!lookup) return ECORE_CALLBACK_RENEW;
ecore_event_evas_modifier_lock_update(lookup->evas, e->modifiers);
if (press == ECORE_DOWN)
evas_event_feed_key_down(lookup->evas, e->keyname, e->key, e->string, e->compose, e->timestamp, NULL);
else
evas_event_feed_key_up(lookup->evas, e->keyname, e->key, e->string, e->compose, e->timestamp, NULL);
- return 1;
+ return ECORE_CALLBACK_RENEW;
}
-static int
+static Eina_Bool
_ecore_event_evas_mouse_button(Ecore_Event_Mouse_Button *e, Ecore_Event_Press press)
{
Ecore_Input_Window *lookup;
Evas_Button_Flags flags = EVAS_BUTTON_NONE;
lookup = _ecore_event_window_match(e->window);
- if (!lookup) return 1;
+ if (!lookup) return ECORE_CALLBACK_RENEW;
if (e->double_click) flags |= EVAS_BUTTON_DOUBLE_CLICK;
if (e->triple_click) flags |= EVAS_BUTTON_TRIPLE_CLICK;
if (e->multi.device == 0)
else
evas_event_feed_multi_up(lookup->evas, e->multi.device, e->x, e->y, e->multi.radius, e->multi.radius_x, e->multi.radius_y, e->multi.pressure, e->multi.angle, e->multi.x, e->multi.y, flags, e->timestamp, NULL);
}
- return 1;
+ return ECORE_CALLBACK_RENEW;
}
-EAPI int
+EAPI Eina_Bool
ecore_event_evas_mouse_move(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Event_Mouse_Move *e;
e = event;
lookup = _ecore_event_window_match(e->window);
- if (!lookup) return 1;
+ if (!lookup) return ECORE_CALLBACK_RENEW;
if (e->multi.device == 0)
{
ecore_event_evas_modifier_lock_update(lookup->evas, e->modifiers);
{
evas_event_feed_multi_move(lookup->evas, e->multi.device, e->x, e->y, e->multi.radius, e->multi.radius_x, e->multi.radius_y, e->multi.pressure, e->multi.angle, e->multi.x, e->multi.y, e->timestamp, NULL);
}
- return 1;
+ return ECORE_CALLBACK_RENEW;
}
-EAPI int
+EAPI Eina_Bool
ecore_event_evas_mouse_button_down(void *data __UNUSED__, int type __UNUSED__, void *event)
{
return _ecore_event_evas_mouse_button((Ecore_Event_Mouse_Button *)event, ECORE_DOWN);
}
-EAPI int
+EAPI Eina_Bool
ecore_event_evas_mouse_button_up(void *data __UNUSED__, int type __UNUSED__, void *event)
{
return _ecore_event_evas_mouse_button((Ecore_Event_Mouse_Button *)event, ECORE_UP);
}
-static int
+static Eina_Bool
_ecore_event_evas_mouse_io(Ecore_Event_Mouse_IO *e, Ecore_Event_IO io)
{
Ecore_Input_Window *lookup;
lookup = _ecore_event_window_match(e->window);
- if (!lookup) return 1;
+ if (!lookup) return ECORE_CALLBACK_RENEW;
ecore_event_evas_modifier_lock_update(lookup->evas, e->modifiers);
switch (io)
{
}
lookup->move_mouse(lookup->window, e->x, e->y, e->timestamp);
- return 1;
+ return ECORE_CALLBACK_RENEW;
}
-EAPI int
+EAPI Eina_Bool
ecore_event_evas_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
{
return _ecore_event_evas_key((Ecore_Event_Key *)event, ECORE_DOWN);
}
-EAPI int
+EAPI Eina_Bool
ecore_event_evas_key_up(void *data __UNUSED__, int type __UNUSED__, void *event)
{
return _ecore_event_evas_key((Ecore_Event_Key *)event, ECORE_UP);
}
-EAPI int
+EAPI Eina_Bool
ecore_event_evas_mouse_wheel(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Event_Mouse_Wheel *e;
e = event;
lookup = _ecore_event_window_match(e->window);
- if (!lookup) return 1;
+ if (!lookup) return ECORE_CALLBACK_RENEW;
ecore_event_evas_modifier_lock_update(lookup->evas, e->modifiers);
evas_event_feed_mouse_wheel(lookup->evas, e->direction, e->z, e->timestamp, NULL);
- return 1;
+ return ECORE_CALLBACK_RENEW;
}
-EAPI int
+EAPI Eina_Bool
ecore_event_evas_mouse_in(void *data __UNUSED__, int type __UNUSED__, void *event)
{
return _ecore_event_evas_mouse_io((Ecore_Event_Mouse_IO *)event, ECORE_IN);
}
-EAPI int
+EAPI Eina_Bool
ecore_event_evas_mouse_out(void *data __UNUSED__, int type __UNUSED__, void *event)
{
return _ecore_event_evas_mouse_io((Ecore_Event_Mouse_IO *)event, ECORE_OUT);
return 0;
}
-static int _ecore_ipc_event_client_add(void *data, int ev_type, void *ev);
-static int _ecore_ipc_event_client_del(void *data, int ev_type, void *ev);
-static int _ecore_ipc_event_server_add(void *data, int ev_type, void *ev);
-static int _ecore_ipc_event_server_del(void *data, int ev_type, void *ev);
-static int _ecore_ipc_event_client_data(void *data, int ev_type, void *ev);
-static int _ecore_ipc_event_server_data(void *data, int ev_type, void *ev);
+static Eina_Bool _ecore_ipc_event_client_add(void *data, int ev_type, void *ev);
+static Eina_Bool _ecore_ipc_event_client_del(void *data, int ev_type, void *ev);
+static Eina_Bool _ecore_ipc_event_server_add(void *data, int ev_type, void *ev);
+static Eina_Bool _ecore_ipc_event_server_del(void *data, int ev_type, void *ev);
+static Eina_Bool _ecore_ipc_event_client_data(void *data, int ev_type, void *ev);
+static Eina_Bool _ecore_ipc_event_server_data(void *data, int ev_type, void *ev);
static void _ecore_ipc_event_client_add_free(void *data, void *ev);
static void _ecore_ipc_event_client_del_free(void *data, void *ev);
static void _ecore_ipc_event_client_data_free(void *data, void *ev);
}
-static int
+static Eina_Bool
_ecore_ipc_event_client_add(void *data __UNUSED__, int ev_type __UNUSED__, void *ev)
{
Ecore_Con_Event_Client_Add *e;
e = ev;
- if (!eina_list_data_find(servers, ecore_con_server_data_get(ecore_con_client_server_get(e->client)))) return 1;
+ if (!eina_list_data_find(servers, ecore_con_server_data_get(ecore_con_client_server_get(e->client)))) return ECORE_CALLBACK_RENEW;
/* handling code here */
{
Ecore_Ipc_Client *cl;
Ecore_Ipc_Server *svr;
cl = calloc(1, sizeof(Ecore_Ipc_Client));
- if (!cl) return 0;
+ if (!cl) return ECORE_CALLBACK_CANCEL;
svr = ecore_con_server_data_get(ecore_con_client_server_get(e->client));
ECORE_MAGIC_SET(cl, ECORE_MAGIC_IPC_CLIENT);
cl->client = e->client;
}
}
}
- return 0;
+ return ECORE_CALLBACK_CANCEL;
}
-static int
+static Eina_Bool
_ecore_ipc_event_client_del(void *data __UNUSED__, int ev_type __UNUSED__, void *ev)
{
Ecore_Con_Event_Client_Del *e;
e = ev;
- if (!eina_list_data_find(servers, ecore_con_server_data_get(ecore_con_client_server_get(e->client)))) return 1;
+ if (!eina_list_data_find(servers, ecore_con_server_data_get(ecore_con_client_server_get(e->client)))) return ECORE_CALLBACK_RENEW;
/* handling code here */
{
Ecore_Ipc_Client *cl;
}
}
}
- return 0;
+ return ECORE_CALLBACK_CANCEL;
}
-static int
+static Eina_Bool
_ecore_ipc_event_server_add(void *data __UNUSED__, int ev_type __UNUSED__, void *ev)
{
Ecore_Con_Event_Server_Add *e;
e = ev;
- if (!eina_list_data_find(servers, ecore_con_server_data_get(e->server))) return 1;
+ if (!eina_list_data_find(servers, ecore_con_server_data_get(e->server))) return ECORE_CALLBACK_RENEW;
/* handling code here */
{
Ecore_Ipc_Server *svr;
}
}
}
- return 0;
+ return ECORE_CALLBACK_CANCEL;
}
-static int
+static Eina_Bool
_ecore_ipc_event_server_del(void *data __UNUSED__, int ev_type __UNUSED__, void *ev)
{
Ecore_Con_Event_Server_Del *e;
e = ev;
- if (!eina_list_data_find(servers, ecore_con_server_data_get(e->server))) return 1;
+ if (!eina_list_data_find(servers, ecore_con_server_data_get(e->server))) return ECORE_CALLBACK_RENEW;
/* handling code here */
{
Ecore_Ipc_Server *svr;
}
}
}
- return 0;
+ return ECORE_CALLBACK_CANCEL;
}
#define CLSZ(_n) \
} \
msg._member = _ecore_ipc_ddlt_int(d, cl->prev.i._member, md);
-static int
+static Eina_Bool
_ecore_ipc_event_client_data(void *data __UNUSED__, int ev_type __UNUSED__, void *ev)
{
Ecore_Con_Event_Client_Data *e;
e = ev;
- if (!eina_list_data_find(servers, ecore_con_server_data_get(ecore_con_client_server_get(e->client)))) return 1;
+ if (!eina_list_data_find(servers, ecore_con_server_data_get(ecore_con_client_server_get(e->client)))) return ECORE_CALLBACK_RENEW;
/* handling code here */
{
Ecore_Ipc_Client *cl;
free(cl->buf);
cl->buf = 0;
cl->buf_size = 0;
- return 0;
+ return ECORE_CALLBACK_CANCEL;
}
cl->buf = buf;
memcpy(cl->buf + cl->buf_size, e->data, e->size);
if ((cl->buf_size - offset) < s)
{
if (offset > 0) goto scroll;
- return 0;
+ return ECORE_CALLBACK_CANCEL;
}
s = 4;
if (msg.size > 0)
{
buf = malloc(msg.size);
- if (!buf) return 0;
+ if (!buf) return ECORE_CALLBACK_CANCEL;
memcpy(buf, cl->buf + offset + s, msg.size);
}
if (!cl->delete_me)
free(cl->buf);
cl->buf = NULL;
cl->buf_size = 0;
- return 0;
+ return ECORE_CALLBACK_CANCEL;
}
goto redo;
}
free(cl->buf);
cl->buf = NULL;
cl->buf_size = 0;
- return 0;
+ return ECORE_CALLBACK_CANCEL;
}
memcpy(buf, cl->buf + offset, cl->buf_size - offset);
free(cl->buf);
cl->buf_size -= offset;
}
}
- return 0;
+ return ECORE_CALLBACK_CANCEL;
}
#define SVSZ(_n) \
} \
msg._member = _ecore_ipc_ddlt_int(d, svr->prev.i._member, md);
-static int
+static Eina_Bool
_ecore_ipc_event_server_data(void *data __UNUSED__, int ev_type __UNUSED__, void *ev)
{
Ecore_Con_Event_Server_Data *e;
e = ev;
- if (!eina_list_data_find(servers, ecore_con_server_data_get(e->server))) return 1;
+ if (!eina_list_data_find(servers, ecore_con_server_data_get(e->server))) return ECORE_CALLBACK_RENEW;
/* handling code here */
{
Ecore_Ipc_Server *svr;
free(svr->buf);
svr->buf = 0;
svr->buf_size = 0;
- return 0;
+ return ECORE_CALLBACK_CANCEL;
}
svr->buf = buf;
memcpy(svr->buf + svr->buf_size, e->data, e->size);
if ((svr->buf_size - offset) < s)
{
if (offset > 0) goto scroll;
- return 0;
+ return ECORE_CALLBACK_CANCEL;
}
s = 4;
if (msg.size > 0)
{
buf = malloc(msg.size);
- if (!buf) return 0;
+ if (!buf) return ECORE_CALLBACK_CANCEL;
memcpy(buf, svr->buf + offset + s, msg.size);
}
if (!svr->delete_me)
free(svr->buf);
svr->buf = NULL;
svr->buf_size = 0;
- return 0;
+ return ECORE_CALLBACK_CANCEL;
}
goto redo;
}
free(svr->buf);
svr->buf = NULL;
svr->buf_size = 0;
- return 0;
+ return ECORE_CALLBACK_CANCEL;
}
memcpy(buf, svr->buf + offset, svr->buf_size - offset);
free(svr->buf);
svr->buf_size -= offset;
}
}
- return 0;
+ return ECORE_CALLBACK_CANCEL;
}
static void
EAPI void ecore_x_keyboard_ungrab(void);
EAPI void ecore_x_grab(void);
EAPI void ecore_x_ungrab(void);
-EAPI void ecore_x_passive_grab_replay_func_set(int (*func) (void *data, int event_type, void *event), void *data);
+EAPI void ecore_x_passive_grab_replay_func_set(Eina_Bool (*func) (void *data, int event_type, void *event), void *data);
EAPI void ecore_x_window_button_grab(Ecore_X_Window win, int button,
Ecore_X_Event_Mask event_mask,
int mod, int any_mod);
#include "ecore_xcb_private.h"
#include "Ecore_X_Atoms.h"
-static int _ecore_xcb_fd_handler(void *data, Ecore_Fd_Handler *fd_handler);
-static int _ecore_xcb_fd_handler_buf(void *data, Ecore_Fd_Handler *fd_handler);
+static Eina_Bool _ecore_xcb_fd_handler(void *data, Ecore_Fd_Handler *fd_handler);
+static Eina_Bool _ecore_xcb_fd_handler_buf(void *data, Ecore_Fd_Handler *fd_handler);
static int _ecore_xcb_key_mask_get(xcb_keysym_t sym);
static int _ecore_xcb_event_modifier(unsigned int state);
}
}
-static int
+static Eina_Bool
_ecore_xcb_fd_handler(void *data, Ecore_Fd_Handler *fd_handler __UNUSED__)
{
xcb_connection_t *c;
while ((ev = xcb_poll_for_event(c)))
handle_event(ev);
- return 1;
+ return ECORE_CALLBACK_RENEW;
}
-static int
+static Eina_Bool
_ecore_xcb_fd_handler_buf(void *data, Ecore_Fd_Handler *fd_handler __UNUSED__)
{
xcb_connection_t *c;
_ecore_xcb_event_buffered = xcb_poll_for_event(c);
if (!_ecore_xcb_event_buffered)
- return 0;
+ return ECORE_CALLBACK_CANCEL;
- return 1;
+ return ECORE_CALLBACK_RENEW;
}
/* FIXME: possible roundtrip */
int _ecore_window_grabs_num = 0;
Ecore_X_Window *_ecore_window_grabs = NULL;
-int (*_ecore_window_grab_replay_func) (void *data, int event_type, void *event);
+Eina_Bool (*_ecore_window_grab_replay_func) (void *data, int event_type, void *event);
void *_ecore_window_grab_replay_data;
EAPI void
-ecore_x_passive_grab_replay_func_set(int (*func) (void *data,
- int event_type,
- void *event),
+ecore_x_passive_grab_replay_func_set(Eina_Bool (*func) (void *data,
+ int event_type,
+ void *event),
void *data)
{
_ecore_window_grab_replay_func = func;
if ((_ecore_window_grabs[i] == ev->event) ||
(_ecore_window_grabs[i] == ev->child))
{
- int replay = 0;
+ Eina_Bool replay = EINA_FALSE;
if (_ecore_window_grab_replay_func)
replay = _ecore_window_grab_replay_func(_ecore_window_grab_replay_data,
if ((_ecore_window_grabs[i] == ev->event) ||
(_ecore_window_grabs[i] == ev->child))
{
- int replay = 0;
+ Eina_Bool replay = EINA_FALSE;
if (_ecore_window_grab_replay_func)
replay = _ecore_window_grab_replay_func(_ecore_window_grab_replay_data,
#include "Ecore_X_Atoms.h"
#include "Ecore_Input.h"
-static int _ecore_x_fd_handler(void *data, Ecore_Fd_Handler *fd_handler);
-static int _ecore_x_fd_handler_buf(void *data, Ecore_Fd_Handler *fd_handler);
+static Eina_Bool _ecore_x_fd_handler(void *data, Ecore_Fd_Handler *fd_handler);
+static Eina_Bool _ecore_x_fd_handler_buf(void *data, Ecore_Fd_Handler *fd_handler);
static int _ecore_x_key_mask_get(KeySym sym);
static int _ecore_x_event_modifier(unsigned int state);
return (((s->width * 254) / s->mwidth) + 5) / 10;
}
-static int
+static Eina_Bool
_ecore_x_fd_handler(void *data, Ecore_Fd_Handler *fd_handler __UNUSED__)
{
Display *d;
_ecore_x_event_handlers[ev.type] (&ev);
}
}
- return 1;
+ return ECORE_CALLBACK_RENEW;
}
-static int
+static Eina_Bool
_ecore_x_fd_handler_buf(void *data, Ecore_Fd_Handler *fd_handler __UNUSED__)
{
Display *d;
d = data;
- if (XPending(d)) return 1;
- return 0;
+ if (XPending(d)) return ECORE_CALLBACK_RENEW;
+ return ECORE_CALLBACK_CANCEL;
}
static int
int _ecore_window_grabs_num = 0;
Window *_ecore_window_grabs = NULL;
-int (*_ecore_window_grab_replay_func) (void *data, int event_type, void *event);
+Eina_Bool (*_ecore_window_grab_replay_func) (void *data, int event_type, void *event);
void *_ecore_window_grab_replay_data;
EAPI void
-ecore_x_passive_grab_replay_func_set(int (*func) (void *data, int event_type, void *event), void *data)
+ecore_x_passive_grab_replay_func_set(Eina_Bool (*func) (void *data, int event_type, void *event), void *data)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
_ecore_window_grab_replay_func = func;
if ((_ecore_window_grabs[i] == xevent->xbutton.window) ||
(_ecore_window_grabs[i] == xevent->xbutton.subwindow))
{
- int replay = 0;
+ Eina_Bool replay = EINA_FALSE;
if (_ecore_window_grab_replay_func)
replay = _ecore_window_grab_replay_func(_ecore_window_grab_replay_data,
if ((_ecore_window_grabs[i] == xevent->xbutton.window) ||
(_ecore_window_grabs[i] == xevent->xbutton.subwindow))
{
- int replay = 0;
+ Eina_Bool replay = EINA_FALSE;
if (_ecore_window_grab_replay_func)
replay = _ecore_window_grab_replay_func(_ecore_window_grab_replay_data,
extern int _ecore_window_grabs_num;
extern Window *_ecore_window_grabs;
-extern int (*_ecore_window_grab_replay_func) (void *data, int event_type, void *event);
+extern Eina_Bool (*_ecore_window_grab_replay_func) (void *data, int event_type, void *event);
extern void *_ecore_window_grab_replay_data;
extern Ecore_X_Window _ecore_x_private_win;
projects / profile / ivi / ecore.git / commitdiff