forked from enlightenment/efl
unify more event handling, fix a little formatting
SVN revision: 61025
This commit is contained in:
parent
a90ffde10c
commit
58d3ee0924
|
@ -479,15 +479,11 @@ ecore_con_server_connect(Ecore_Con_Type compl_type,
|
|||
(type == ECORE_CON_LOCAL_ABSTRACT))
|
||||
/* Local */
|
||||
#ifdef _WIN32
|
||||
if (!ecore_con_local_connect(svr, _ecore_con_cl_handler,
|
||||
_ecore_con_event_server_add_free))
|
||||
goto
|
||||
error;
|
||||
if (!ecore_con_local_connect(svr, _ecore_con_cl_handler))
|
||||
goto error;
|
||||
#else
|
||||
if (!ecore_con_local_connect(svr, _ecore_con_cl_handler, svr,
|
||||
_ecore_con_event_server_add_free))
|
||||
goto
|
||||
error;
|
||||
if (!ecore_con_local_connect(svr, _ecore_con_cl_handler, svr))
|
||||
goto error;
|
||||
#endif
|
||||
|
||||
if ((type == ECORE_CON_REMOTE_TCP) ||
|
||||
|
|
|
@ -56,11 +56,8 @@ ecore_con_local_shutdown(void)
|
|||
|
||||
int
|
||||
ecore_con_local_connect(Ecore_Con_Server *svr,
|
||||
Eina_Bool (*cb_done)(void *data,
|
||||
Ecore_Fd_Handler *fd_handler),
|
||||
void *data __UNUSED__,
|
||||
void (*cb_free)(void *data,
|
||||
void *ev))
|
||||
Eina_Bool (*cb_done)(void *data, Ecore_Fd_Handler *fd_handler),
|
||||
void *data __UNUSED__)
|
||||
{
|
||||
char buf[4096];
|
||||
struct sockaddr_un socket_unix;
|
||||
|
@ -158,20 +155,7 @@ ecore_con_local_connect(Ecore_Con_Server
|
|||
if (!svr->fd_handler)
|
||||
return 0;
|
||||
|
||||
if (!svr->delete_me)
|
||||
{
|
||||
/* we got our server! */
|
||||
Ecore_Con_Event_Server_Add *e;
|
||||
|
||||
e = calloc(1, sizeof(Ecore_Con_Event_Server_Add));
|
||||
if (e)
|
||||
{
|
||||
svr->event_count++;
|
||||
e->server = svr;
|
||||
ecore_event_add(ECORE_CON_EVENT_SERVER_ADD, e,
|
||||
cb_free, NULL);
|
||||
}
|
||||
}
|
||||
if (!svr->delete_me) ecore_con_event_server_add(svr);
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
|
|
@ -551,8 +551,7 @@ ecore_con_local_win32_client_del(Ecore_Con_Client *cl)
|
|||
Eina_Bool
|
||||
ecore_con_local_connect(Ecore_Con_Server *svr,
|
||||
Eina_Bool (*cb_done)(void *data,
|
||||
Ecore_Fd_Handler *fd_handler),
|
||||
void (*cb_free)(void *data, void *ev))
|
||||
Ecore_Fd_Handler *fd_handler))
|
||||
{
|
||||
char buf[256];
|
||||
Ecore_Win32_Handler *handler_read;
|
||||
|
@ -647,19 +646,7 @@ ecore_con_local_connect(Ecore_Con_Server *svr,
|
|||
goto del_handler_peek;
|
||||
}
|
||||
|
||||
if (!svr->delete_me)
|
||||
{
|
||||
Ecore_Con_Event_Server_Add *e;
|
||||
|
||||
e = calloc(1, sizeof(Ecore_Con_Event_Server_Add));
|
||||
if (e)
|
||||
{
|
||||
svr->event_count++;
|
||||
e->server = svr;
|
||||
ecore_event_add(ECORE_CON_EVENT_SERVER_ADD, e,
|
||||
cb_free, NULL);
|
||||
}
|
||||
}
|
||||
if (!svr->delete_me) ecore_con_event_server_add(svr);
|
||||
|
||||
ResumeThread(svr->thread_read);
|
||||
|
||||
|
|
|
@ -229,8 +229,7 @@ void ecore_con_event_client_error(Ecore_Con_Client *cl, const char *error);
|
|||
Eina_Bool ecore_con_local_listen(Ecore_Con_Server *svr);
|
||||
Eina_Bool ecore_con_local_connect(Ecore_Con_Server *svr,
|
||||
Eina_Bool (*cb_done)(void *data,
|
||||
Ecore_Fd_Handler *fd_handler),
|
||||
void (*cb_free)(void *data, void *ev));
|
||||
Ecore_Fd_Handler *fd_handler));
|
||||
Eina_Bool ecore_con_local_win32_server_flush(Ecore_Con_Server *svr);
|
||||
Eina_Bool ecore_con_local_win32_client_flush(Ecore_Con_Client *cl);
|
||||
void ecore_con_local_win32_server_del(Ecore_Con_Server *svr);
|
||||
|
@ -243,9 +242,7 @@ 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));
|
||||
void *data);
|
||||
int ecore_con_local_listen(Ecore_Con_Server *svr,
|
||||
Eina_Bool (*cb_listen)(
|
||||
void *data,
|
||||
|
@ -273,6 +270,9 @@ int ecore_con_info_mcast_listen(Ecore_Con_Server *svr,
|
|||
void *data);
|
||||
void ecore_con_info_data_clear(void *info);
|
||||
|
||||
void ecore_con_event_server_add(Ecore_Con_Server *svr);
|
||||
|
||||
|
||||
/* from ecore_con_ssl.c */
|
||||
Ecore_Con_Ssl_Error ecore_con_ssl_init(void);
|
||||
Ecore_Con_Ssl_Error ecore_con_ssl_shutdown(void);
|
||||
|
|
Loading…
Reference in New Issue