enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 6 Projects Releases Wiki Activity

don't use our own event_free callback when the default is good enough 

SVN revision: 10141
This commit is contained in:
tsauerbeck 2004-05-09 08:15:34 +00:00 committed by tsauerbeck
parent b8edd19b2d
commit e21b5dd247
7 changed files with 55 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
legacy/ecore/src/lib/ecore/ecore_events.c
View File

@ -445,15 +445,6 @@ _ecore_event_signal_user_new(void)
return e;
}
void
_ecore_event_signal_user_free(void *data, void *ev)
{
Ecore_Event_Signal_User *e;
e = ev;
free(e);
}
void *
_ecore_event_signal_hup_new(void)
{
@ -463,15 +454,6 @@ _ecore_event_signal_hup_new(void)
return e;
}
void
_ecore_event_signal_hup_free(void *data, void *ev)
{
Ecore_Event_Signal_Hup *e;
e = ev;
free(e);
}
void *
_ecore_event_signal_exit_new(void)
{
@ -481,15 +463,6 @@ _ecore_event_signal_exit_new(void)
return e;
}
void
_ecore_event_signal_exit_free(void *data, void *ev)
{
Ecore_Event_Signal_Exit *e;
e = ev;
free(e);
}
void *
_ecore_event_signal_power_new(void)
{
@ -499,23 +472,8 @@ _ecore_event_signal_power_new(void)
return e;
}
void
_ecore_event_signal_power_free(void *data, void *ev)
{
Ecore_Event_Signal_Power *e;
e = ev;
free(e);
}
void *
_ecore_event_signal_realtime_new(void)
{
return calloc(1, sizeof(Ecore_Event_Signal_Realtime));
}
void
_ecore_event_signal_realtime_free(void *data, void *ev)
{
free(ev);
}

5
legacy/ecore/src/lib/ecore/ecore_private.h
View File

@ -185,15 +185,10 @@ void _ecore_event_call(void);
void *_ecore_event_exe_exit_new(void);
void _ecore_event_exe_exit_free(void *data, void *ev);
void *_ecore_event_signal_user_new(void);
void _ecore_event_signal_user_free(void *data, void *ev);
void *_ecore_event_signal_hup_new(void);
void _ecore_event_signal_hup_free(void *data, void *ev);
void *_ecore_event_signal_exit_new(void);
void _ecore_event_signal_exit_free(void *data, void *ev);
void *_ecore_event_signal_power_new(void);
void _ecore_event_signal_power_free(void *data, void *ev);
void * _ecore_event_signal_realtime_new(void);
void _ecore_event_signal_realtime_free(void *data, void *ev);
void _ecore_main_shutdown(void);

24
legacy/ecore/src/lib/ecore/ecore_signal.c
View File

@ -192,8 +192,7 @@ _ecore_signal_call(void)
if (sigusr1_info.si_signo)
e->data = sigusr1_info;
_ecore_event_add(ECORE_EVENT_SIGNAL_USER, e,
_ecore_event_signal_user_free, NULL);
ecore_event_add(ECORE_EVENT_SIGNAL_USER, e, NULL, NULL);
}
sigusr1_count--;
sig_count--;
@ -210,8 +209,7 @@ _ecore_signal_call(void)
if (sigusr2_info.si_signo)
e->data = sigusr2_info;
_ecore_event_add(ECORE_EVENT_SIGNAL_USER, e,
_ecore_event_signal_user_free, NULL);
ecore_event_add(ECORE_EVENT_SIGNAL_USER, e, NULL, NULL);
}
sigusr2_count--;
sig_count--;
@ -226,8 +224,7 @@ _ecore_signal_call(void)
if (sighup_info.si_signo)
e->data = sighup_info;
_ecore_event_add(ECORE_EVENT_SIGNAL_HUP, e,
_ecore_event_signal_hup_free, NULL);
ecore_event_add(ECORE_EVENT_SIGNAL_HUP, e, NULL, NULL);
}
sighup_count--;
sig_count--;
@ -244,8 +241,7 @@ _ecore_signal_call(void)
if (sigquit_info.si_signo)
e->data = sigquit_info;
_ecore_event_add(ECORE_EVENT_SIGNAL_EXIT, e,
_ecore_event_signal_exit_free, NULL);
ecore_event_add(ECORE_EVENT_SIGNAL_EXIT, e, NULL, NULL);
}
sigquit_count--;
sig_count--;
@ -262,8 +258,7 @@ _ecore_signal_call(void)
if (sigint_info.si_signo)
e->data = sigint_info;
_ecore_event_add(ECORE_EVENT_SIGNAL_EXIT, e,
_ecore_event_signal_exit_free, NULL);
ecore_event_add(ECORE_EVENT_SIGNAL_EXIT, e, NULL, NULL);
}
sigint_count--;
sig_count--;
@ -280,8 +275,7 @@ _ecore_signal_call(void)
if (sigterm_info.si_signo)
e->data = sigterm_info;
_ecore_event_add(ECORE_EVENT_SIGNAL_EXIT, e,
_ecore_event_signal_exit_free, NULL);
ecore_event_add(ECORE_EVENT_SIGNAL_EXIT, e, NULL, NULL);
}
sigterm_count--;
sig_count--;
@ -297,8 +291,7 @@ _ecore_signal_call(void)
if (sigpwr_info.si_signo)
e->data = sigpwr_info;
_ecore_event_add(ECORE_EVENT_SIGNAL_POWER, e,
_ecore_event_signal_power_free, NULL);
ecore_event_add(ECORE_EVENT_SIGNAL_POWER, e, NULL, NULL);
}
sigpwr_count--;
sig_count--;
@ -316,8 +309,7 @@ _ecore_signal_call(void)
if (sigrt_info[i].si_signo)
e->data = sigrt_info[i];
_ecore_event_add(ECORE_EVENT_SIGNAL_REALTIME, e,
_ecore_event_signal_realtime_free, NULL);
ecore_event_add(ECORE_EVENT_SIGNAL_REALTIME, e, NULL, NULL);
}
sigrt_count[i]--;

22
legacy/ecore/src/lib/ecore_fb/ecore_fb.c
View File

@ -83,7 +83,6 @@ static int _ecore_fb_kbd_fd_handler(Ecore_Fd_Handler *fd_handler, void *data);
static int _ecore_fb_ps2_fd_handler(Ecore_Fd_Handler *fd_handler, void *data);
static void _ecore_fb_event_free_key_down(void *data, void *ev);
static void _ecore_fb_event_free_key_up(void *data, void *ev);
static void _ecore_fb_event_free_generic(void *data, void *ev);
static int _ecore_fb_signal_usr_handler(void *data, int type, void *ev);
static void _ecore_fb_vt_switch(int vt);
@ -447,8 +446,7 @@ ecore_fb_init(const char *name)
if (e)
{
e->number = 2;
_ecore_event_add(ECORE_EVENT_SIGNAL_USER, e,
_ecore_event_signal_user_free, NULL);
ecore_event_add(ECORE_EVENT_SIGNAL_USER, e, NULL, NULL);
}
}
}
@ -890,7 +888,7 @@ _ecore_fb_ts_fd_handler(Ecore_Fd_Handler *fd_handler, void *data)
if (!e) goto retry;
e->x = x;
e->y = y;
ecore_event_add(ECORE_FB_EVENT_MOUSE_MOVE, e, _ecore_fb_event_free_generic, NULL);
ecore_event_add(ECORE_FB_EVENT_MOUSE_MOVE, e, NULL, NULL);
}
if ((pressure) && (!prev_pressure))
{
@ -909,7 +907,7 @@ _ecore_fb_ts_fd_handler(Ecore_Fd_Handler *fd_handler, void *data)
did_triple = 1;
e->triple_click = 1;
}
ecore_event_add(ECORE_FB_EVENT_MOUSE_BUTTON_DOWN, e, _ecore_fb_event_free_generic, NULL);
ecore_event_add(ECORE_FB_EVENT_MOUSE_BUTTON_DOWN, e, NULL, NULL);
}
else if ((!pressure) && (prev_pressure))
{
@ -921,7 +919,7 @@ _ecore_fb_ts_fd_handler(Ecore_Fd_Handler *fd_handler, void *data)
e->x = prev_x;
e->y = prev_y;
e->button = 1;
ecore_event_add(ECORE_FB_EVENT_MOUSE_BUTTON_UP, e, _ecore_fb_event_free_generic, NULL);
ecore_event_add(ECORE_FB_EVENT_MOUSE_BUTTON_UP, e, NULL, NULL);
}
if (did_triple)
{
@ -1083,7 +1081,7 @@ _ecore_fb_ps2_fd_handler(Ecore_Fd_Handler *fd_handler, void *data)
if (!e) goto retry;
e->x = x;
e->y = y;
ecore_event_add(ECORE_FB_EVENT_MOUSE_MOVE, e, _ecore_fb_event_free_generic, NULL);
ecore_event_add(ECORE_FB_EVENT_MOUSE_MOVE, e, NULL, NULL);
}
for (i = 1; i <= 3; i++)
{
@ -1107,7 +1105,7 @@ _ecore_fb_ps2_fd_handler(Ecore_Fd_Handler *fd_handler, void *data)
did_triple = 1;
e->triple_click = 1;
}
ecore_event_add(ECORE_FB_EVENT_MOUSE_BUTTON_DOWN, e, _ecore_fb_event_free_generic, NULL);
ecore_event_add(ECORE_FB_EVENT_MOUSE_BUTTON_DOWN, e, NULL, NULL);
}
else if ((!(button & mask)) && ((prev_button & mask)))
{
@ -1119,7 +1117,7 @@ _ecore_fb_ps2_fd_handler(Ecore_Fd_Handler *fd_handler, void *data)
e->x = x;
e->y = y;
e->button = 1;
ecore_event_add(ECORE_FB_EVENT_MOUSE_BUTTON_UP, e, _ecore_fb_event_free_generic, NULL);
ecore_event_add(ECORE_FB_EVENT_MOUSE_BUTTON_UP, e, NULL, NULL);
}
}
if (did_triple)
@ -1161,12 +1159,6 @@ _ecore_fb_event_free_key_up(void *data, void *ev)
free(e);
}
static void
_ecore_fb_event_free_generic(void *data, void *ev)
{
free(ev);
}
static int
_ecore_fb_signal_usr_handler(void *data, int type, void *ev)
{

52
legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c
View File

@ -178,10 +178,6 @@ 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 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_server_add_free(void *data, void *ev);
static void _ecore_ipc_event_server_del_free(void *data, void *ev);
static void _ecore_ipc_event_client_data_free(void *data, void *ev);
static void _ecore_ipc_event_server_data_free(void *data, void *ev);
@ -655,8 +651,7 @@ _ecore_ipc_event_client_add(void *data, int ev_type, void *ev)
if (e2)
{
e2->client = cl;
ecore_event_add(ECORE_IPC_EVENT_CLIENT_ADD, e2,
_ecore_ipc_event_client_add_free, NULL);
ecore_event_add(ECORE_IPC_EVENT_CLIENT_ADD, e2, NULL, NULL);
}
}
}
@ -682,8 +677,7 @@ _ecore_ipc_event_client_del(void *data, int ev_type, void *ev)
if (e2)
{
e2->client = cl;
ecore_event_add(ECORE_IPC_EVENT_CLIENT_DEL, e2,
_ecore_ipc_event_client_del_free, NULL);
ecore_event_add(ECORE_IPC_EVENT_CLIENT_DEL, e2, NULL, NULL);
}
}
}
@ -709,8 +703,7 @@ _ecore_ipc_event_server_add(void *data, int ev_type, void *ev)
if (e2)
{
e2->server = svr;
ecore_event_add(ECORE_IPC_EVENT_SERVER_ADD, e2,
_ecore_ipc_event_server_add_free, NULL);
ecore_event_add(ECORE_IPC_EVENT_SERVER_ADD, e2, NULL, NULL);
}
}
}
@ -736,8 +729,7 @@ _ecore_ipc_event_server_del(void *data, int ev_type, void *ev)
if (e2)
{
e2->server = svr;
ecore_event_add(ECORE_IPC_EVENT_SERVER_DEL, e2,
_ecore_ipc_event_server_del_free, NULL);
ecore_event_add(ECORE_IPC_EVENT_SERVER_DEL, e2, NULL, NULL);
}
}
}
@ -1070,42 +1062,6 @@ _ecore_ipc_event_server_data(void *data, int ev_type, void *ev)
return 0;
}
static void
_ecore_ipc_event_client_add_free(void *data, void *ev)
{
Ecore_Ipc_Event_Client_Add *e;
e = ev;
free(e);
}
static void
_ecore_ipc_event_client_del_free(void *data, void *ev)
{
Ecore_Ipc_Event_Client_Del *e;
e = ev;
free(e);
}
static void
_ecore_ipc_event_server_add_free(void *data, void *ev)
{
Ecore_Ipc_Event_Server_Add *e;
e = ev;
free(e);
}
static void
_ecore_ipc_event_server_del_free(void *data, void *ev)
{
Ecore_Ipc_Event_Server_Del *e;
e = ev;
free(e);
}
static void
_ecore_ipc_event_client_data_free(void *data, void *ev)
{

12
legacy/ecore/src/lib/ecore_job/ecore_job.c
View File

@ -3,7 +3,6 @@
#include "ecore_job_private.h"
#include "Ecore_Job.h"
static void _ecore_job_free(void *data, void *ev);
static int _ecore_job_event_handler(void *data, int type, void *ev);
static int ecore_event_job_type = 0;
@ -33,7 +32,7 @@ ecore_job_add(void (*func) (void *data), const void *data)
job = calloc(1, sizeof(Ecore_Job));
if (!job) return NULL;
ECORE_MAGIC_SET(job, ECORE_MAGIC_JOB);
job->event = ecore_event_add(ecore_event_job_type, job, _ecore_job_free, NULL);
job->event = ecore_event_add(ecore_event_job_type, job, NULL, NULL);
if (!job->event)
{
free(job);
@ -69,15 +68,6 @@ ecore_job_del(Ecore_Job *job)
return data;
}
static void
_ecore_job_free(void *data, void *ev)
{
Ecore_Job *job;
job = ev;
free(job);
}
static int
_ecore_job_event_handler(void *data, int type, void *ev)
{

107
legacy/ecore/src/lib/ecore_x/ecore_x_events.c
View File

@ -9,11 +9,8 @@ static void _ecore_x_event_free_window_prop_visible_title_change(void *data, voi
static void _ecore_x_event_free_window_prop_icon_name_change(void *data, void *ev);
static void _ecore_x_event_free_window_prop_visible_icon_name_change(void *data, void *ev);
static void _ecore_x_event_free_window_prop_client_machine_change(void *data, void *ev);
static void _ecore_x_event_free_window_prop_pid_change(void *data, void *ev);
static void _ecore_x_event_free_window_prop_desktop_change(void *data, void *ev);
static void _ecore_x_event_free_key_down(void *data, void *ev);
static void _ecore_x_event_free_key_up(void *data, void *ev);
static void _ecore_x_event_free_generic(void *data, void *ev);
void
ecore_x_event_mask_set(Ecore_X_Window w, Ecore_X_Event_Mask mask)
@ -100,24 +97,6 @@ _ecore_x_event_free_window_prop_client_machine_change(void *data, void *ev)
free(e);
}
static void
_ecore_x_event_free_window_prop_pid_change(void *data, void *ev)
{
Ecore_X_Event_Window_Prop_Pid_Change *e;
e = ev;
free(e);
}
static void
_ecore_x_event_free_window_prop_desktop_change(void *data, void *ev)
{
Ecore_X_Event_Window_Prop_Desktop_Change *e;
e = ev;
free(e);
}
static void
_ecore_x_event_free_key_down(void *data, void *ev)
{
@ -152,21 +131,6 @@ _ecore_x_event_free_selection_notify(void *data, void *ev)
free(e);
}
static void
_ecore_x_event_free_client_message(void *data, void *ev)
{
Ecore_X_Event_Client_Message *e;
e = ev;
free(e);
}
static void
_ecore_x_event_free_generic(void *data, void *ev)
{
free(ev);
}
void
_ecore_x_event_handle_key_press(XEvent *xevent)
{
@ -310,7 +274,7 @@ _ecore_x_event_handle_button_press(XEvent *xevent)
_ecore_x_event_last_win = e->win;
_ecore_x_event_last_root_x = e->root.x;
_ecore_x_event_last_root_y = e->root.y;
ecore_event_add(ECORE_X_EVENT_MOUSE_WHEEL, e, _ecore_x_event_free_generic, NULL);
ecore_event_add(ECORE_X_EVENT_MOUSE_WHEEL, e, NULL, NULL);
}
else
{
@ -332,7 +296,7 @@ _ecore_x_event_handle_button_press(XEvent *xevent)
_ecore_x_event_last_win = e->win;
_ecore_x_event_last_root_x = e->root.x;
_ecore_x_event_last_root_y = e->root.y;
ecore_event_add(ECORE_X_EVENT_MOUSE_MOVE, e, _ecore_x_event_free_generic, NULL);
ecore_event_add(ECORE_X_EVENT_MOUSE_MOVE, e, NULL, NULL);
}
{
Ecore_X_Event_Mouse_Button_Down *e;
@ -366,7 +330,7 @@ _ecore_x_event_handle_button_press(XEvent *xevent)
_ecore_x_event_last_win = e->win;
_ecore_x_event_last_root_x = e->root.x;
_ecore_x_event_last_root_y = e->root.y;
ecore_event_add(ECORE_X_EVENT_MOUSE_BUTTON_DOWN, e, _ecore_x_event_free_generic, NULL);
ecore_event_add(ECORE_X_EVENT_MOUSE_BUTTON_DOWN, e, NULL, NULL);
}
if (did_triple)
{
@ -416,7 +380,7 @@ _ecore_x_event_handle_button_release(XEvent *xevent)
_ecore_x_event_last_win = e->win;
_ecore_x_event_last_root_x = e->root.x;
_ecore_x_event_last_root_y = e->root.y;
ecore_event_add(ECORE_X_EVENT_MOUSE_MOVE, e, _ecore_x_event_free_generic, NULL);
ecore_event_add(ECORE_X_EVENT_MOUSE_MOVE, e, NULL, NULL);
}
{
Ecore_X_Event_Mouse_Button_Up *e;
@ -437,7 +401,7 @@ _ecore_x_event_handle_button_release(XEvent *xevent)
_ecore_x_event_last_win = e->win;
_ecore_x_event_last_root_x = e->root.x;
_ecore_x_event_last_root_y = e->root.y;
ecore_event_add(ECORE_X_EVENT_MOUSE_BUTTON_UP, e, _ecore_x_event_free_generic, NULL);
ecore_event_add(ECORE_X_EVENT_MOUSE_BUTTON_UP, e, NULL, NULL);
}
}
}
@ -462,7 +426,7 @@ _ecore_x_event_handle_motion_notify(XEvent *xevent)
_ecore_x_event_last_win = e->win;
_ecore_x_event_last_root_x = e->root.x;
_ecore_x_event_last_root_y = e->root.y;
ecore_event_add(ECORE_X_EVENT_MOUSE_MOVE, e, _ecore_x_event_free_generic, NULL);
ecore_event_add(ECORE_X_EVENT_MOUSE_MOVE, e, NULL, NULL);
}
void
@ -486,7 +450,7 @@ _ecore_x_event_handle_enter_notify(XEvent *xevent)
_ecore_x_event_last_win = e->win;
_ecore_x_event_last_root_x = e->root.x;
_ecore_x_event_last_root_y = e->root.y;
ecore_event_add(ECORE_X_EVENT_MOUSE_MOVE, e, _ecore_x_event_free_generic, NULL);
ecore_event_add(ECORE_X_EVENT_MOUSE_MOVE, e, NULL, NULL);
}
{
Ecore_X_Event_Mouse_In *e;
@ -511,7 +475,7 @@ _ecore_x_event_handle_enter_notify(XEvent *xevent)
else if (xevent->xcrossing.detail == NotifyNonlinearVirtual) e->detail = ECORE_X_EVENT_DETAIL_NON_LINEAR_VIRTUAL;
e->time = xevent->xcrossing.time;
_ecore_x_event_last_time = e->time;
ecore_event_add(ECORE_X_EVENT_MOUSE_IN, e, _ecore_x_event_free_generic, NULL);
ecore_event_add(ECORE_X_EVENT_MOUSE_IN, e, NULL, NULL);
}
}
@ -536,7 +500,7 @@ _ecore_x_event_handle_leave_notify(XEvent *xevent)
_ecore_x_event_last_win = e->win;
_ecore_x_event_last_root_x = e->root.x;
_ecore_x_event_last_root_y = e->root.y;
ecore_event_add(ECORE_X_EVENT_MOUSE_MOVE, e, _ecore_x_event_free_generic, NULL);
ecore_event_add(ECORE_X_EVENT_MOUSE_MOVE, e, NULL, NULL);
}
{
Ecore_X_Event_Mouse_Out *e;
@ -564,7 +528,7 @@ _ecore_x_event_handle_leave_notify(XEvent *xevent)
_ecore_x_event_last_win = e->win;
_ecore_x_event_last_root_x = e->root.x;
_ecore_x_event_last_root_y = e->root.y;
ecore_event_add(ECORE_X_EVENT_MOUSE_OUT, e, _ecore_x_event_free_generic, NULL);
ecore_event_add(ECORE_X_EVENT_MOUSE_OUT, e, NULL, NULL);
}
}
@ -590,7 +554,7 @@ _ecore_x_event_handle_focus_in(XEvent *xevent)
else if (xevent->xfocus.detail == NotifyDetailNone) e->detail = ECORE_X_EVENT_DETAIL_DETAIL_NONE;
e->time = _ecore_x_event_last_time;
_ecore_x_event_last_time = e->time;
ecore_event_add(ECORE_X_EVENT_WINDOW_FOCUS_IN, e, _ecore_x_event_free_generic, NULL);
ecore_event_add(ECORE_X_EVENT_WINDOW_FOCUS_IN, e, NULL, NULL);
}
void
@ -615,7 +579,7 @@ _ecore_x_event_handle_focus_out(XEvent *xevent)
else if (xevent->xfocus.detail == NotifyDetailNone) e->detail = ECORE_X_EVENT_DETAIL_DETAIL_NONE;
e->time = _ecore_x_event_last_time;
_ecore_x_event_last_time = e->time;
ecore_event_add(ECORE_X_EVENT_WINDOW_FOCUS_OUT, e, _ecore_x_event_free_generic, NULL);
ecore_event_add(ECORE_X_EVENT_WINDOW_FOCUS_OUT, e, NULL, NULL);
}
void
@ -637,7 +601,7 @@ _ecore_x_event_handle_expose(XEvent *xevent)
e->y = xevent->xexpose.y;
e->w = xevent->xexpose.width;
e->h = xevent->xexpose.height;
ecore_event_add(ECORE_X_EVENT_WINDOW_DAMAGE, e, _ecore_x_event_free_generic, NULL);
ecore_event_add(ECORE_X_EVENT_WINDOW_DAMAGE, e, NULL, NULL);
}
void
@ -653,7 +617,7 @@ _ecore_x_event_handle_graphics_expose(XEvent *xevent)
e->y = xevent->xgraphicsexpose.y;
e->w = xevent->xgraphicsexpose.width;
e->h = xevent->xgraphicsexpose.height;
ecore_event_add(ECORE_X_EVENT_WINDOW_DAMAGE, e, _ecore_x_event_free_generic, NULL);
ecore_event_add(ECORE_X_EVENT_WINDOW_DAMAGE, e, NULL, NULL);
}
void
@ -671,7 +635,7 @@ _ecore_x_event_handle_visibility_notify(XEvent *xevent)
e->fully_obscured = 1;
else
e->fully_obscured = 0;
ecore_event_add(ECORE_X_EVENT_WINDOW_VISIBILITY_CHANGE, e, _ecore_x_event_free_generic, NULL);
ecore_event_add(ECORE_X_EVENT_WINDOW_VISIBILITY_CHANGE, e, NULL, NULL);
}
}
@ -687,7 +651,7 @@ _ecore_x_event_handle_create_notify(XEvent *xevent)
else
e->override = 0;
e->time = _ecore_x_event_last_time;
ecore_event_add(ECORE_X_EVENT_WINDOW_CREATE, e, _ecore_x_event_free_generic, NULL);
ecore_event_add(ECORE_X_EVENT_WINDOW_CREATE, e, NULL, NULL);
}
void
@ -700,7 +664,7 @@ _ecore_x_event_handle_destroy_notify(XEvent *xevent)
e->win = xevent->xdestroywindow.window;
e->time = _ecore_x_event_last_time;
if (e->win == _ecore_x_event_last_win) _ecore_x_event_last_win = 0;
ecore_event_add(ECORE_X_EVENT_WINDOW_DESTROY, e, _ecore_x_event_free_generic, NULL);
ecore_event_add(ECORE_X_EVENT_WINDOW_DESTROY, e, NULL, NULL);
}
void
@ -712,7 +676,7 @@ _ecore_x_event_handle_unmap_notify(XEvent *xevent)
if (!e) return;
e->win = xevent->xunmap.window;
e->time = _ecore_x_event_last_time;
ecore_event_add(ECORE_X_EVENT_WINDOW_HIDE, e, _ecore_x_event_free_generic, NULL);
ecore_event_add(ECORE_X_EVENT_WINDOW_HIDE, e, NULL, NULL);
}
void
@ -724,7 +688,7 @@ _ecore_x_event_handle_map_notify(XEvent *xevent)
if (!e) return;
e->win = xevent->xmap.window;
e->time = _ecore_x_event_last_time;
ecore_event_add(ECORE_X_EVENT_WINDOW_SHOW, e, _ecore_x_event_free_generic, NULL);
ecore_event_add(ECORE_X_EVENT_WINDOW_SHOW, e, NULL, NULL);
}
void
@ -737,7 +701,7 @@ _ecore_x_event_handle_map_request(XEvent *xevent)
e->win = xevent->xmaprequest.window;
e->time = _ecore_x_event_last_time;
e->parent = xevent->xmaprequest.parent;
ecore_event_add(ECORE_X_EVENT_WINDOW_SHOW_REQUEST, e, _ecore_x_event_free_generic, NULL);
ecore_event_add(ECORE_X_EVENT_WINDOW_SHOW_REQUEST, e, NULL, NULL);
}
void
@ -750,7 +714,7 @@ _ecore_x_event_handle_reparent_notify(XEvent *xevent)
e->win = xevent->xreparent.window;
e->parent = xevent->xreparent.parent;
e->time = _ecore_x_event_last_time;
ecore_event_add(ECORE_X_EVENT_WINDOW_REPARENT, e, _ecore_x_event_free_generic, NULL);
ecore_event_add(ECORE_X_EVENT_WINDOW_REPARENT, e, NULL, NULL);
}
void
@ -770,7 +734,7 @@ _ecore_x_event_handle_configure_notify(XEvent *xevent)
e->override = xevent->xconfigure.override_redirect;
e->from_wm = xevent->xconfigure.send_event;
e->time = _ecore_x_event_last_time;
ecore_event_add(ECORE_X_EVENT_WINDOW_CONFIGURE, e, _ecore_x_event_free_generic, NULL);
ecore_event_add(ECORE_X_EVENT_WINDOW_CONFIGURE, e, NULL, NULL);
}
void
@ -882,7 +846,7 @@ _ecore_x_event_handle_property_notify(XEvent *xevent)
e->pid = ecore_x_window_prop_pid_get(xevent->xproperty.window);
e->time = xevent->xproperty.time;
_ecore_x_event_last_time = e->time;
ecore_event_add(ECORE_X_EVENT_WINDOW_PROP_PID_CHANGE, e, _ecore_x_event_free_window_prop_pid_change, NULL);
ecore_event_add(ECORE_X_EVENT_WINDOW_PROP_PID_CHANGE, e, NULL, NULL);
}
else if (xevent->xproperty.atom == _ecore_x_atom_net_wm_desktop)
{
@ -891,7 +855,7 @@ _ecore_x_event_handle_property_notify(XEvent *xevent)
e = calloc(1, sizeof(Ecore_X_Event_Window_Prop_Desktop_Change));
if (!e) return;
e->desktop = ecore_x_window_prop_desktop_get(xevent->xproperty.window);
ecore_event_add(ECORE_X_EVENT_WINDOW_PROP_PID_CHANGE, e, _ecore_x_event_free_window_prop_desktop_change, NULL);
ecore_event_add(ECORE_X_EVENT_WINDOW_PROP_PID_CHANGE, e, NULL, NULL);
}
else
{
@ -903,7 +867,7 @@ _ecore_x_event_handle_property_notify(XEvent *xevent)
e->atom = xevent->xproperty.atom;
e->time = xevent->xproperty.time;
_ecore_x_event_last_time = e->time;
ecore_event_add(ECORE_X_EVENT_WINDOW_PROPERTY, e, _ecore_x_event_free_generic, NULL);
ecore_event_add(ECORE_X_EVENT_WINDOW_PROPERTY, e, NULL, NULL);
}
}
@ -933,7 +897,7 @@ _ecore_x_event_handle_selection_clear(XEvent *xevent)
e->selection = ECORE_X_SELECTION_SECONDARY;
else
e->selection = ECORE_X_SELECTION_CLIPBOARD;
ecore_event_add(ECORE_X_EVENT_SELECTION_CLEAR, e, _ecore_x_event_free_generic, NULL);
ecore_event_add(ECORE_X_EVENT_SELECTION_CLEAR, e, NULL, NULL);
}
@ -1042,7 +1006,7 @@ _ecore_x_event_handle_colormap_notify(XEvent *xevent)
e->installed = 1;
else
e->installed = 0;
ecore_event_add(ECORE_X_EVENT_WINDOW_COLORMAP, e, _ecore_x_event_free_generic, NULL);
ecore_event_add(ECORE_X_EVENT_WINDOW_COLORMAP, e, NULL, NULL);
}
void
@ -1062,7 +1026,7 @@ _ecore_x_event_handle_client_message(XEvent *xevent)
if (!e) return;
e->win = xevent->xclient.window;
e->time = _ecore_x_event_last_time;
ecore_event_add(ECORE_X_EVENT_WINDOW_DELETE_REQUEST, e, _ecore_x_event_free_generic, NULL);
ecore_event_add(ECORE_X_EVENT_WINDOW_DELETE_REQUEST, e, NULL, NULL);
}
/* Xdnd Client Message Handling Begin */
@ -1124,7 +1088,7 @@ _ecore_x_event_handle_client_message(XEvent *xevent)
e->source = _xdnd->source;
e->time = CurrentTime;
_ecore_x_event_last_time = e->time;
ecore_event_add(ECORE_X_EVENT_XDND_ENTER, e, _ecore_x_event_free_generic, NULL);
ecore_event_add(ECORE_X_EVENT_XDND_ENTER, e, NULL, NULL);
}
/* Message Type: XdndPosition */
@ -1152,7 +1116,7 @@ _ecore_x_event_handle_client_message(XEvent *xevent)
e->position.y = _xdnd->pos.y;
e->time = xevent->xclient.data.l[3]; /* Version 1 */
e->action = _xdnd->action;
ecore_event_add(ECORE_X_EVENT_XDND_POSITION, e, _ecore_x_event_free_generic, NULL);
ecore_event_add(ECORE_X_EVENT_XDND_POSITION, e, NULL, NULL);
}
/* Message Type: XdndStatus */
@ -1187,7 +1151,7 @@ _ecore_x_event_handle_client_message(XEvent *xevent)
e->rectangle.height = _xdnd->rectangle.height;
e->action = _xdnd->accepted_action;
ecore_event_add(ECORE_X_EVENT_XDND_STATUS, e, _ecore_x_event_free_generic, NULL);
ecore_event_add(ECORE_X_EVENT_XDND_STATUS, e, NULL, NULL);
}
/* Message Type: XdndLeave */
@ -1212,7 +1176,7 @@ _ecore_x_event_handle_client_message(XEvent *xevent)
if (!e) return;
e->win = _xdnd->dest;
e->source = _xdnd->source;
ecore_event_add(ECORE_X_EVENT_XDND_ENTER, e, _ecore_x_event_free_generic, NULL);
ecore_event_add(ECORE_X_EVENT_XDND_ENTER, e, NULL, NULL);
}
else if (xevent->xclient.message_type == _ecore_x_atom_xdnd_drop)
{
@ -1244,7 +1208,7 @@ _ecore_x_event_handle_client_message(XEvent *xevent)
e->action = _xdnd->action;
e->position.x = _xdnd->pos.x;
e->position.y = _xdnd->pos.y;
ecore_event_add(ECORE_X_EVENT_XDND_DROP, e, _ecore_x_event_free_generic, NULL);
ecore_event_add(ECORE_X_EVENT_XDND_DROP, e, NULL, NULL);
}
/* Message Type: XdndFinished */
@ -1288,7 +1252,7 @@ _ecore_x_event_handle_client_message(XEvent *xevent)
e->action = _xdnd->action;
}
ecore_event_add(ECORE_X_EVENT_XDND_FINISHED, e, _ecore_x_event_free_generic, NULL);
ecore_event_add(ECORE_X_EVENT_XDND_FINISHED, e, NULL, NULL);
}
else
@ -1303,8 +1267,7 @@ _ecore_x_event_handle_client_message(XEvent *xevent)
for(i = 0; i < 5; i++)
e->data.l[i] = xevent->xclient.data.l[i];
ecore_event_add(ECORE_X_EVENT_CLIENT_MESSAGE, e,
_ecore_x_event_free_client_message, NULL);
ecore_event_add(ECORE_X_EVENT_CLIENT_MESSAGE, e, NULL, NULL);
}
}