Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src
Modified Files:
Tag: SPLIT
Ecore.h Makefile.am ecore_events.c ecore_list.c ecore_main.c
ecore_timer.c
Added Files:
Tag: SPLIT
confdefs.h ecore_test.c
Log Message:
test proggy...
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/Ecore.h,v
retrieving revision 1.45.2.8
retrieving revision 1.45.2.9
diff -u -3 -r1.45.2.8 -r1.45.2.9
--- Ecore.h 14 Jan 2003 01:21:04 -0000 1.45.2.8
+++ Ecore.h 16 Jan 2003 01:44:30 -0000 1.45.2.9
@@ -80,7 +80,7 @@
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), const void *data);
+ Ecore_Event_Handler *ecore_event_handler_add(int type, int (*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(const char *exe_cmd, const void *data);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/Makefile.am,v
retrieving revision 1.7.2.4
retrieving revision 1.7.2.5
diff -u -3 -r1.7.2.4 -r1.7.2.5
--- Makefile.am 13 Jan 2003 13:04:46 -0000 1.7.2.4
+++ Makefile.am 16 Jan 2003 01:44:30 -0000 1.7.2.5
@@ -7,19 +7,41 @@
Ecore.h
libecore_la_SOURCES = \
- ecore.c \
- ecore_app.c \
- ecore_exe.c \
- ecore_idle_enterer.c \
- ecore_idler.c \
- ecore_main.c \
- ecore_signal.c \
- ecore_time.c \
- ecore_timer.c \
- ecore_private.h
+ecore.c \
+ecore_app.c \
+ecore_events.c \
+ecore_exe.c \
+ecore_idle_enterer.c \
+ecore_idler.c \
+ecore_list.c \
+ecore_main.c \
+ecore_signal.c \
+ecore_time.c \
+ecore_timer.c \
+ecore_private.h
libecore_la_LIBADD = @x_ldflags@ @x_libs@ -lm
libecore_la_LDFLAGS = -version-info 1:0:0
+
+bin_PROGRAMS = \
+ecore_test
+
+ecore_test_SOURCES = \
+ecore_test.c
+
+ecore_test_LDADD = \
+libecore.la \
+-all-static
+
+ecore_test_LDFLAGS = \
+$(LDFLAGS)
+
+ecore_test_CFLAGS = \
+$(CFLAGS) \
+$(INCLUDES)
+
+ecore_test_DEPENDENCIES = \
+libecore.la
EXTRA_DIST = \
e_ev_filter.c \
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/Attic/ecore_events.c,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -3 -r1.1.2.4 -r1.1.2.5
--- ecore_events.c 14 Jan 2003 01:21:05 -0000 1.1.2.4
+++ ecore_events.c 16 Jan 2003 01:44:30 -0000 1.1.2.5
@@ -53,7 +53,7 @@
e = calloc(1, sizeof(Ecore_Event));
if (!e) return NULL;
- e->type type;
+ e->type = type;
e->event = ev;
e->func_free = func_free;
e->data = data;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/Attic/ecore_list.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_list.c 13 Jan 2003 13:04:47 -0000 1.1.2.1
+++ ecore_list.c 16 Jan 2003 01:44:30 -0000 1.1.2.2
@@ -2,7 +2,7 @@
#include "Ecore.h"
void *
-ecore_list_append(void *in_list, void *in_item)
+_ecore_list_append(void *in_list, void *in_item)
{
Ecore_List *l, *new_l;
Ecore_List *list, *item;
@@ -26,7 +26,7 @@
}
void *
-ecore_list_prepend(void *in_list, void *in_item)
+_ecore_list_prepend(void *in_list, void *in_item)
{
Ecore_List *new_l;
Ecore_List *list, *item;
@@ -49,7 +49,7 @@
}
void *
-ecore_list_append_relative(void *in_list, void *in_item, void *in_relative)
+_ecore_list_append_relative(void *in_list, void *in_item, void *in_relative)
{
Ecore_List *l;
Ecore_List *list, *item, *relative;
@@ -78,11 +78,11 @@
return list;
}
}
- return ecore_list_append(list, item);
+ return _ecore_list_append(list, item);
}
void *
-ecore_list_prepend_relative(void *in_list, void *in_item, void *in_relative)
+_ecore_list_prepend_relative(void *in_list, void *in_item, void *in_relative)
{
Ecore_List *l;
Ecore_List *list, *item, *relative;
@@ -120,11 +120,11 @@
}
}
}
- return ecore_list_prepend(list, item);
+ return _ecore_list_prepend(list, item);
}
void *
-ecore_list_remove(void *in_list, void *in_item)
+_ecore_list_remove(void *in_list, void *in_item)
{
Ecore_List *return_l;
Ecore_List *list, *item;
@@ -157,7 +157,7 @@
}
void *
-ecore_list_find(void *in_list, void *in_item)
+_ecore_list_find(void *in_list, void *in_item)
{
Ecore_List *l;
Ecore_List *list, *item;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/Attic/ecore_main.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_main.c 14 Jan 2003 01:21:05 -0000 1.1.2.6
+++ ecore_main.c 16 Jan 2003 01:44:30 -0000 1.1.2.7
@@ -330,7 +330,10 @@
if (!fdh->delete_me)
{
if ((fdh->read_active) || (fdh->write_active))
- fdh->func(fdh, fdh->data);
+ {
+ if (!fdh->func(fdh, fdh->data))
+ fdh->delete_me = 1;
+ }
}
}
}
@@ -349,10 +352,12 @@
fdh = l;
if (!fdh->delete_me)
{
- if (fdh->buf_func(fdh, fdh->buf_data))
+ if (fdh->buf_func)
{
- ret = 1;
- fdh->func(fdh, fdh->data);
+ if (fdh->buf_func(fdh, fdh->buf_data))
+ {
+ ret |= fdh->func(fdh, fdh->data);
+ }
}
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/Attic/ecore_timer.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_timer.c 14 Jan 2003 01:21:05 -0000 1.1.2.3
+++ ecore_timer.c 16 Jan 2003 01:44:30 -0000 1.1.2.4
@@ -90,15 +90,18 @@
timer->in = in;
timer->func = func;
timer->data = data;
- for (l = ((Ecore_List *)(timers))->last; l; l = l->prev)
+ if (timers)
{
- Ecore_Timer *t2;
-
- t2 = l;
- if (timer->at > t2->at)
+ for (l = ((Ecore_List *)(timers))->last; l; l = l->prev)
{
- timers = _ecore_list_append_relative(timers, timer, t2);
- return;
+ 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: A Thawte Code Signing Certificate
is essential in establishing user confidence by providing assurance of
authenticity and code integrity. Download our Free Code Signing guide:
http://ads.sourceforge.net/cgi-bin/redirect.pl?thaw0028en
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
