Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_con
Modified Files:
Tag: SPLIT
Ecore_Con.h ecore_con.c
Log Message:
noew we have a server_add event (means connect to a server succeeded) and now
data will actually be able to be sent after this event is received. you can
send data before, but it may not be sent if connect fails. also have test
program callbacks return 1 properly... :)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_con/Attic/Ecore_Con.h,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_Con.h 13 Mar 2003 05:32:22 -0000 1.1.2.2
+++ Ecore_Con.h 17 Mar 2003 13:06:10 -0000 1.1.2.3
@@ -19,6 +19,7 @@
typedef struct _Ecore_Con_Event_Client_Add Ecore_Con_Event_Client_Add;
typedef struct _Ecore_Con_Event_Client_Del Ecore_Con_Event_Client_Del;
+ typedef struct _Ecore_Con_Event_Server_Add Ecore_Con_Event_Server_Add;
typedef struct _Ecore_Con_Event_Server_Del Ecore_Con_Event_Server_Del;
typedef struct _Ecore_Con_Event_Client_Data Ecore_Con_Event_Client_Data;
typedef struct _Ecore_Con_Event_Server_Data Ecore_Con_Event_Server_Data;
@@ -33,11 +34,16 @@
Ecore_Con_Client *client;
};
- struct _Ecore_Con_Event_Server_Del
+ struct _Ecore_Con_Event_Server_Add
{
Ecore_Con_Server *server;
};
+ struct _Ecore_Con_Event_Server_Del
+ {
+ Ecore_Con_Server *server;
+ };
+
struct _Ecore_Con_Event_Client_Data
{
Ecore_Con_Client *client;
@@ -54,6 +60,7 @@
extern int ECORE_CON_EVENT_CLIENT_ADD;
extern int ECORE_CON_EVENT_CLIENT_DEL;
+ extern int ECORE_CON_EVENT_SERVER_ADD;
extern int ECORE_CON_EVENT_SERVER_DEL;
extern int ECORE_CON_EVENT_CLIENT_DATA;
extern int ECORE_CON_EVENT_SERVER_DATA;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_con/Attic/ecore_con.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_con.c 17 Mar 2003 07:33:57 -0000 1.1.2.5
+++ ecore_con.c 17 Mar 2003 13:06:11 -0000 1.1.2.6
@@ -23,12 +23,14 @@
static void _ecore_con_client_flush(Ecore_Con_Client *cl);
static void _ecore_con_event_client_add_free(void *ev, void *data);
static void _ecore_con_event_client_del_free(void *ev, void *data);
+static void _ecore_con_event_server_add_free(void *ev, void *data);
static void _ecore_con_event_server_del_free(void *ev, void *data);
static void _ecore_con_event_client_data_free(void *ev, void *data);
static void _ecore_con_event_server_data_free(void *ev, void *data);
int ECORE_CON_EVENT_CLIENT_ADD = 0;
int ECORE_CON_EVENT_CLIENT_DEL = 0;
+int ECORE_CON_EVENT_SERVER_ADD = 0;
int ECORE_CON_EVENT_SERVER_DEL = 0;
int ECORE_CON_EVENT_CLIENT_DATA = 0;
int ECORE_CON_EVENT_SERVER_DATA = 0;
@@ -52,6 +54,7 @@
{
ECORE_CON_EVENT_CLIENT_ADD = ecore_event_type_new();
ECORE_CON_EVENT_CLIENT_DEL = ecore_event_type_new();
+ ECORE_CON_EVENT_SERVER_ADD = ecore_event_type_new();
ECORE_CON_EVENT_SERVER_DEL = ecore_event_type_new();
ECORE_CON_EVENT_CLIENT_DATA = ecore_event_type_new();
ECORE_CON_EVENT_SERVER_DATA = ecore_event_type_new();
@@ -237,6 +240,18 @@
_ecore_con_cl_handler, svr,
NULL, NULL);
if (!svr->fd_handler) goto error;
+ {
+ /* we got our server! */
+ Ecore_Con_Event_Server_Add *e;
+
+ e = calloc(1, sizeof(Ecore_Con_Event_Server_Add));
+ if (e)
+ {
+ e->server = svr;
+ ecore_event_add(ECORE_CON_EVENT_SERVER_ADD, e,
+ _ecore_con_event_server_add_free, NULL);
+ }
+ }
}
else if (type == ECORE_CON_REMOTE_SYSTEM)
{
@@ -572,6 +587,18 @@
}
else
{
+ {
+ /* we got our server! */
+ Ecore_Con_Event_Server_Add *e;
+
+ e = calloc(1, sizeof(Ecore_Con_Event_Server_Add));
+ if (e)
+ {
+ e->server = svr;
+ ecore_event_add(ECORE_CON_EVENT_SERVER_ADD, e,
+ _ecore_con_event_server_add_free, NULL);
+ }
+ }
if (!svr->buf)
ecore_main_fd_handler_active_set(svr->fd_handler, ECORE_FD_READ);
}
@@ -742,6 +769,15 @@
_ecore_con_event_client_del_free(void *ev, void *data)
{
Ecore_Con_Event_Client_Del *e;
+
+ e = ev;
+ free(e);
+}
+
+static void
+_ecore_con_event_server_add_free(void *ev, void *data)
+{
+ Ecore_Con_Event_Server_Add *e;
e = ev;
free(e);
-------------------------------------------------------
This SF.net email is sponsored by:Crypto Challenge is now open!
Get cracking and register here for some mind boggling fun and
the chance of winning an Apple iPod:
http://ads.sourceforge.net/cgi-bin/redirect.pl?thaw0031en
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
