Enlightenment CVS committal
Author : tsauerbeck
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_x
Modified Files:
ecore_x_events.c
Log Message:
don't use our own event_free callback when the default is good enough
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_x/ecore_x_events.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- ecore_x_events.c 30 Apr 2004 17:28:53 -0000 1.29
+++ ecore_x_events.c 9 May 2004 08:15:34 -0000 1.30
@@ -9,11 +9,8 @@
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)
@@ -101,24 +98,6 @@
}
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)
{
Ecore_X_Event_Key_Down *e;
@@ -152,21 +131,6 @@
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_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_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_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_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_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_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_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 @@
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_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_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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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);
}
}
-------------------------------------------------------
This SF.Net email is sponsored by Sleepycat Software
Learn developer strategies Cisco, Motorola, Ericsson & Lucent use to
deliver higher performing products faster, at low TCO.
http://www.sleepycat.com/telcomwpreg.php?From=osdnemail3
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
