Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src
Modified Files:
Tag: SPLIT
Ecore.h ecore_app.c ecore_events.c ecore_exe.c
ecore_idle_enterer.c ecore_idler.c ecore_main.c
ecore_private.h ecore_signal.c ecore_timer.c
Log Message:
fixes.. completenes.. cleanliness... :)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/Ecore.h,v
retrieving revision 1.45.2.7
retrieving revision 1.45.2.8
diff -u -3 -r1.45.2.7 -r1.45.2.8
--- Ecore.h 13 Jan 2003 22:27:31 -0000 1.45.2.7
+++ Ecore.h 14 Jan 2003 01:21:04 -0000 1.45.2.8
@@ -76,14 +76,14 @@
int ecore_init(void);
void ecore_shutdown(void);
- void ecore_app_args_set(int argc, char **argv);
+ void ecore_app_args_set(int argc, const char **argv);
void ecore_app_args_get(int *argc, char ***argv);
void ecore_app_restart(void);
- Ecore_Event_Handler *ecore_event_handler_add(int type, void (*func) (int type,
void *event, void *data), void *data);
+ Ecore_Event_Handler *ecore_event_handler_add(int type, void (*func) (int type,
+void *event, void *data), const void *data);
void *ecore_event_handler_del(Ecore_Event_Handler *event_handler);
- Ecore_Exe *ecore_exe_run(char *exe_cmd, void *data);
+ Ecore_Exe *ecore_exe_run(const char *exe_cmd, const void *data);
pid_t ecore_exe_pid_get(Ecore_Exe *exe);
void *ecore_exe_data_get(Ecore_Exe *exe);
void ecore_exe_pause(Ecore_Exe *exe);
@@ -101,7 +101,7 @@
void ecore_main_loop_begin(void);
void ecore_main_loop_quit(void);
- Ecore_Fd_Handler *ecore_main_fd_handler_add(int fd, Ecore_Fd_Handler_Flags flags,
int (*func) (Ecore_Fd_Handler *fd_handler, void *data), void *data, int (*buf_func)
(Ecore_Fd_Handler *fd_handler, void *buf_data), void *buf_data);
+ Ecore_Fd_Handler *ecore_main_fd_handler_add(int fd, Ecore_Fd_Handler_Flags flags,
+int (*func) (Ecore_Fd_Handler *fd_handler, void *data), const void *data, int
+(*buf_func) (Ecore_Fd_Handler *fd_handler, void *buf_data), const void *buf_data);
void *ecore_main_fd_handler_del(Ecore_Fd_Handler *fd_handler);
int ecore_main_fd_handler_fd_get(Ecore_Fd_Handler *fd_handler);
int ecore_main_fd_handler_active_get(Ecore_Fd_Handler *fd_handler,
Ecore_Fd_Handler_Flags flags);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/Attic/ecore_app.c,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -3 -r1.1.2.3 -r1.1.2.4
--- ecore_app.c 13 Jan 2003 13:04:47 -0000 1.1.2.3
+++ ecore_app.c 14 Jan 2003 01:21:05 -0000 1.1.2.4
@@ -13,10 +13,12 @@
* for later use by ecore_app_restart() or ecore_app_args_get().
*/
void
-ecore_app_args_set(int argc, char **argv)
+ecore_app_args_set(int argc, const char **argv)
{
+ if ((argc < 1) ||
+ (!argv)) return;
app_argc = argc;
- app_argv = argv;
+ app_argv = (char **)argv;
}
/**
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/Attic/ecore_events.c,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -3 -r1.1.2.3 -r1.1.2.4
--- ecore_events.c 13 Jan 2003 13:04:47 -0000 1.1.2.3
+++ ecore_events.c 14 Jan 2003 01:21:05 -0000 1.1.2.4
@@ -16,15 +16,17 @@
* Add an event handler
*/
Ecore_Event_Handler *
-ecore_event_handler_add(int type, int (*func) (int type, void *event, void *data),
void *data)
+ecore_event_handler_add(int type, int (*func) (int type, void *event, void *data),
+const void *data)
{
Ecore_Event_Handler *eh;
-
+
+ if (!func) return NULL;
+ if ((type <= ECORE_EVENT_NONE) || (type >= ECORE_EVENT_COUNT)) return NULL;
eh = calloc(1, sizeof(Ecore_Event_Handler));
if (!eh) return NULL;
eh->type = type;
eh->func = func;
- eh->data = data;
+ eh->data = (void *)data;
event_handlers = _ecore_list_append(event_handlers, eh);
return eh;
}
@@ -39,6 +41,7 @@
void *
ecore_event_handler_del(Ecore_Event_Handler *event_handler)
{
+ if (!event_handler) return NULL;
event_handler->delete_me = 1;
return event_handler->data;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/Attic/ecore_exe.c,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -3 -r1.1.2.6 -r1.1.2.7
--- ecore_exe.c 13 Jan 2003 13:04:47 -0000 1.1.2.6
+++ ecore_exe.c 14 Jan 2003 01:21:05 -0000 1.1.2.7
@@ -23,11 +23,12 @@
* by Ecore, and so any references to it will become invalid.
*/
Ecore_Exe *
-ecore_exe_run(char *exe_cmd, void *data)
+ecore_exe_run(const char *exe_cmd, const void *data)
{
Ecore_Exe *exe;
pid_t pid;
-
+
+ if (!exe_cmd) return NULL;
pid = fork();
if (pid)
{
@@ -38,8 +39,7 @@
return NULL;
}
exe->pid = pid;
- exe->data = data;
- /* FIXME: add to exe list */
+ exe->data = (void *)data;
exes = _ecore_list_append(exes, exe);
return exe;
}
@@ -59,6 +59,7 @@
pid_t
ecore_exe_pid_get(Ecore_Exe *exe)
{
+ if (!exe) return -1;
return exe->pid;
}
@@ -73,6 +74,7 @@
void *
ecore_exe_data_get(Ecore_Exe *exe)
{
+ if (!exe) return NULL;
return exe->data;
}
@@ -85,6 +87,7 @@
void
ecore_exe_pause(Ecore_Exe *exe)
{
+ if (!exe) return;
kill(exe->pid, SIGSTOP);
}
@@ -97,6 +100,7 @@
void
ecore_exe_continue(Ecore_Exe *exe)
{
+ if (!exe) return;
kill(exe->pid, SIGCONT);
}
@@ -109,6 +113,7 @@
void
ecore_exe_terminate(Ecore_Exe *exe)
{
+ if (!exe) return;
kill(exe->pid, SIGTERM);
}
@@ -121,6 +126,7 @@
void
ecore_exe_kill(Ecore_Exe *exe)
{
+ if (!exe) return;
kill(exe->pid, SIGKILL);
}
@@ -133,6 +139,7 @@
void
ecore_exe_signal(Ecore_Exe *exe, int num)
{
+ if (!exe) return;
if (num == 1)
kill(exe->pid, SIGUSR1);
else if (num == 2)
@@ -148,6 +155,7 @@
void
ecore_exe_hup(Ecore_Exe *exe)
{
+ if (!exe) return;
kill(exe->pid, SIGHUP);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/Attic/ecore_idle_enterer.c,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -3 -r1.1.2.2 -r1.1.2.3
--- ecore_idle_enterer.c 13 Jan 2003 13:04:47 -0000 1.1.2.2
+++ ecore_idle_enterer.c 14 Jan 2003 01:21:05 -0000 1.1.2.3
@@ -15,11 +15,12 @@
ecore_idle_enterer_add(int (*func) (void *data), const void *data)
{
Ecore_Idle_Enterer *ie;
-
+
+ if (!func) return NULL;
ie = calloc(1, sizeof(Ecore_Idle_Enterer));
if (!ie) return NULL;
ie->func = func;
- ie->data = data;
+ ie->data = (void *)data;
idle_enterers = _ecore_list_append(idle_enterers, ie);
return ie;
}
@@ -34,6 +35,7 @@
void *
ecore_idle_enterer_del(Ecore_Idle_Enterer *idle_enterer)
{
+ if (!idle_enterer) return NULL;
idle_enterer->delete_me = 1;
return idle_enterer->data;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/Attic/ecore_idler.c,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -3 -r1.1.2.2 -r1.1.2.3
--- ecore_idler.c 13 Jan 2003 13:04:47 -0000 1.1.2.2
+++ ecore_idler.c 14 Jan 2003 01:21:05 -0000 1.1.2.3
@@ -15,11 +15,12 @@
ecore_idler_add(int (*func) (void *data), const void *data)
{
Ecore_Idler *ie;
-
+
+ if (!func) return NULL;
ie = calloc(1, sizeof(Ecore_Idler));
if (!ie) return NULL;
ie->func = func;
- ie->data = data;
+ ie->data = (void *)data;
idlers = _ecore_list_append(idlers, ie);
return ie;
}
@@ -34,6 +35,7 @@
void *
ecore_idler_del(Ecore_Idler *idler)
{
+ if (!idler) return NULL;
idler->delete_me = 1;
return idler->data;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/Attic/ecore_main.c,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -3 -r1.1.2.5 -r1.1.2.6
--- ecore_main.c 13 Jan 2003 22:27:39 -0000 1.1.2.5
+++ ecore_main.c 14 Jan 2003 01:21:05 -0000 1.1.2.6
@@ -154,10 +154,13 @@
* This adds a fd handler, calling @p func whenever the fd is active
*/
Ecore_Fd_Handler *
-ecore_main_fd_handler_add(int fd, Ecore_Fd_Handler_Flags flags, int (*func)
(Ecore_Fd_Handler *fd_handler, void *data), void *data, int (*buf_func)
(Ecore_Fd_Handler *fd_handler, void *buf_data), void *buf_data)
+ecore_main_fd_handler_add(int fd, Ecore_Fd_Handler_Flags flags, int (*func)
+(Ecore_Fd_Handler *fd_handler, void *data), const void *data, int (*buf_func)
+(Ecore_Fd_Handler *fd_handler, void *buf_data), const void *buf_data)
{
Ecore_Fd_Handler *fdh;
-
+
+ if ((fd < 0) ||
+ (flags == 0) ||
+ (!func)) return NULL;
fdh = calloc(1, sizeof(Ecore_Fd_Handler));
if (!fdh) return NULL;
fdh->fd = fd;
@@ -166,9 +169,9 @@
fdh->write_active = 0;
fdh->delete_me = 0;
fdh->func = func;
- fdh->data = data;
+ fdh->data = (void *)data;
fdh->buf_func = buf_func;
- fdh->buf_data = buf_data;
+ fdh->buf_data = (void *)buf_data;
fd_handlers = _ecore_list_append(fd_handlers, fdh);
return fdh;
}
@@ -184,6 +187,7 @@
void *
ecore_main_fd_handler_del(Ecore_Fd_Handler *fd_handler)
{
+ if (!fd_handler) return NULL;
fd_handler->delete_me = 1;
return fd_handler->data;
}
@@ -198,6 +202,7 @@
int
ecore_main_fd_handler_fd_get(Ecore_Fd_Handler *fd_handler)
{
+ if (!fd_handler) return -1;
return fd_handler->fd;
}
@@ -214,6 +219,7 @@
{
int ret;
+ if (!fd_handler) return 0;
ret = 0;
if ((flags & ECORE_FD_READ) && (fd_handler->read_active)) ret = 1;
if ((flags & ECORE_FD_WRITE) && (fd_handler->write_active)) ret = 1;
@@ -333,7 +339,9 @@
_ecore_main_fd_handlers_buf_call(void)
{
Ecore_List *l;
+ int ret;
+ ret = 0;
for (l = fd_handlers; l; l = l->next)
{
Ecore_Fd_Handler *fdh;
@@ -342,7 +350,11 @@
if (!fdh->delete_me)
{
if (fdh->buf_func(fdh, fdh->buf_data))
- fdh->func(fdh, fdh->data);
+ {
+ ret = 1;
+ fdh->func(fdh, fdh->data);
+ }
}
}
+ return ret;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/Attic/ecore_private.h,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -3 -r1.1.2.6 -r1.1.2.7
--- ecore_private.h 13 Jan 2003 22:27:42 -0000 1.1.2.6
+++ ecore_private.h 14 Jan 2003 01:21:05 -0000 1.1.2.7
@@ -43,7 +43,6 @@
Ecore_List __list_data;
double in;
double at;
- int delete_me : 1;
int (*func) (void *data);
void *data;
};
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/Attic/ecore_signal.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -3 -r1.1.2.1 -r1.1.2.2
--- ecore_signal.c 13 Jan 2003 11:19:39 -0000 1.1.2.1
+++ ecore_signal.c 14 Jan 2003 01:21:05 -0000 1.1.2.2
@@ -128,7 +128,7 @@
{
struct sigaction sa;
- sa.sa_handler = sig;
+ sa.sa_handler = func;
sa.sa_flags = SA_RESTART;
sigemptyset(&sa.sa_mask);
sigaction(sig, &sa, NULL);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/Attic/ecore_timer.c,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -3 -r1.1.2.2 -r1.1.2.3
--- ecore_timer.c 13 Jan 2003 13:04:47 -0000 1.1.2.2
+++ ecore_timer.c 14 Jan 2003 01:21:05 -0000 1.1.2.3
@@ -3,7 +3,9 @@
/* FIXME: write code for timers... */
-static Ecore_Idle_Enterer *timers = NULL;
+static void _ecore_timer_set(Ecore_Timer *timer, double at, double in, int (*func)
+(void *data), void *data);
+
+static Ecore_Timer *timers = NULL;
/**
* Add a timer to tick off in a specified time during main loop execution
@@ -17,7 +19,16 @@
Ecore_Timer *
ecore_timer_add(double in, int (*func) (void *data), const void *data)
{
- return NULL;
+ double now;
+ Ecore_Timer *timer;
+
+ if (!func) return NULL;
+ if (in < 0.0) in = 0.0;
+ timer = calloc(1, sizeof(Ecore_Timer));
+ if (!timer) return NULL;
+ now = ecore_time_get();
+ _ecore_timer_set(timer, now + in, in, func, (void *)data);
+ return timer;
}
/**
@@ -31,17 +42,64 @@
void *
ecore_timer_del(Ecore_Timer *timer)
{
- return NULL;
+ void *data;
+
+ if (!timer) return NULL;
+ timers = _ecore_list_remove(timers, timer);
+ data = timer->data;
+ free(timer);
+ return data;
}
double
_ecore_timer_next_get(void)
{
- return -1;
+ double now;
+ double in;
+
+ if (!timers) return -1;
+ now = ecore_time_get();
+ in = timers->at - now;
+ if (in < 0) in = 0;
+ return in;
}
int
_ecore_timer_call(double when)
{
- return 0;
+ Ecore_Timer *timer;
+
+ if (!timers) return 0;
+ if (timers->at > when) return 0;
+ timer = timers;
+ timers = _ecore_list_remove(timers, timer);
+ _ecore_timer_call(when);
+ if (timer->func(timer->data))
+ _ecore_timer_set(timer, timer->at + timer->in, timer->in, timer->func,
+timer->data);
+ else
+ free(timer);
+ return 1;
}
+
+static void
+_ecore_timer_set(Ecore_Timer *timer, double at, double in, int (*func) (void *data),
+void *data)
+{
+ Ecore_List *l;
+
+ timer->at = at;
+ timer->in = in;
+ timer->func = func;
+ timer->data = data;
+ for (l = ((Ecore_List *)(timers))->last; l; l = l->prev)
+ {
+ Ecore_Timer *t2;
+
+ t2 = l;
+ if (timer->at > t2->at)
+ {
+ timers = _ecore_list_append_relative(timers, timer, t2);
+ return;
+ }
+ }
+ timers = _ecore_list_prepend(timers, timer);
+}
-------------------------------------------------------
This SF.NET email is sponsored by: FREE SSL Guide from Thawte
are you planning your Web Server Security? Click here to get a FREE
Thawte SSL guide and find the answers to all your SSL security issues.
http://ads.sourceforge.net/cgi-bin/redirect.pl?thaw0026en
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
