Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_x
Modified Files:
Tag: SPLIT
Ecore_X.h ecore_x.c ecore_x_events.c
Log Message:
working on it.. had to do a namespace change... be consistent!
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_x/Attic/Ecore_X.h,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -u -3 -r1.1.2.15 -r1.1.2.16
--- Ecore_X.h 6 Feb 2003 06:19:40 -0000 1.1.2.15
+++ Ecore_X.h 7 Feb 2003 00:24:02 -0000 1.1.2.16
@@ -340,51 +340,51 @@
Time time;
};
-extern int ECORE_EVENT_X_KEY_DOWN;
-extern int ECORE_EVENT_X_KEY_UP;
-extern int ECORE_EVENT_X_MOUSE_BUTTON_DOWN;
-extern int ECORE_EVENT_X_MOUSE_BUTTON_UP;
-extern int ECORE_EVENT_X_MOUSE_MOVE;
-extern int ECORE_EVENT_X_MOUSE_IN;
-extern int ECORE_EVENT_X_MOUSE_OUT;
-extern int ECORE_EVENT_X_WINDOW_FOCUS_IN;
-extern int ECORE_EVENT_X_WINDOW_FOCUS_OUT;
-extern int ECORE_EVENT_X_WINDOW_KEYMAP;
-extern int ECORE_EVENT_X_WINDOW_DAMAGE;
-extern int ECORE_EVENT_X_WINDOW_VISIBILITY_CHANGE;
-extern int ECORE_EVENT_X_WINDOW_CREATE;
-extern int ECORE_EVENT_X_WINDOW_DESTROY;
-extern int ECORE_EVENT_X_WINDOW_HIDE;
-extern int ECORE_EVENT_X_WINDOW_SHOW;
-extern int ECORE_EVENT_X_WINDOW_SHOW_REQUEST;
-extern int ECORE_EVENT_X_WINDOW_REPARENT;
-extern int ECORE_EVENT_X_WINDOW_CONFIGURE;
-extern int ECORE_EVENT_X_WINDOW_CONFIGURE_REQUEST;
-extern int ECORE_EVENT_X_WINDOW_GRAVITY;
-extern int ECORE_EVENT_X_WINDOW_RESIZE_REQUEST;
-extern int ECORE_EVENT_X_WINDOW_STACK;
-extern int ECORE_EVENT_X_WINDOW_STACK_REQUEST;
-extern int ECORE_EVENT_X_WINDOW_PROPERTY;
-extern int ECORE_EVENT_X_WINDOW_COLORMAP;
-extern int ECORE_EVENT_X_WINDOW_MAPPING;
-extern int ECORE_EVENT_X_SELECTION_CLEAR;
-extern int ECORE_EVENT_X_SELECTION_REQUEST;
-extern int ECORE_EVENT_X_SELECTION_NOTIFY;
-extern int ECORE_EVENT_X_CLIENT_MESSAGE;
-extern int ECORE_EVENT_X_WINDOW_SHAPE;
+extern int ECORE_X_EVENT_KEY_DOWN;
+extern int ECORE_X_EVENT_KEY_UP;
+extern int ECORE_X_EVENT_MOUSE_BUTTON_DOWN;
+extern int ECORE_X_EVENT_MOUSE_BUTTON_UP;
+extern int ECORE_X_EVENT_MOUSE_MOVE;
+extern int ECORE_X_EVENT_MOUSE_IN;
+extern int ECORE_X_EVENT_MOUSE_OUT;
+extern int ECORE_X_EVENT_WINDOW_FOCUS_IN;
+extern int ECORE_X_EVENT_WINDOW_FOCUS_OUT;
+extern int ECORE_X_EVENT_WINDOW_KEYMAP;
+extern int ECORE_X_EVENT_WINDOW_DAMAGE;
+extern int ECORE_X_EVENT_WINDOW_VISIBILITY_CHANGE;
+extern int ECORE_X_EVENT_WINDOW_CREATE;
+extern int ECORE_X_EVENT_WINDOW_DESTROY;
+extern int ECORE_X_EVENT_WINDOW_HIDE;
+extern int ECORE_X_EVENT_WINDOW_SHOW;
+extern int ECORE_X_EVENT_WINDOW_SHOW_REQUEST;
+extern int ECORE_X_EVENT_WINDOW_REPARENT;
+extern int ECORE_X_EVENT_WINDOW_CONFIGURE;
+extern int ECORE_X_EVENT_WINDOW_CONFIGURE_REQUEST;
+extern int ECORE_X_EVENT_WINDOW_GRAVITY;
+extern int ECORE_X_EVENT_WINDOW_RESIZE_REQUEST;
+extern int ECORE_X_EVENT_WINDOW_STACK;
+extern int ECORE_X_EVENT_WINDOW_STACK_REQUEST;
+extern int ECORE_X_EVENT_WINDOW_PROPERTY;
+extern int ECORE_X_EVENT_WINDOW_COLORMAP;
+extern int ECORE_X_EVENT_WINDOW_MAPPING;
+extern int ECORE_X_EVENT_SELECTION_CLEAR;
+extern int ECORE_X_EVENT_SELECTION_REQUEST;
+extern int ECORE_X_EVENT_SELECTION_NOTIFY;
+extern int ECORE_X_EVENT_CLIENT_MESSAGE;
+extern int ECORE_X_EVENT_WINDOW_SHAPE;
-extern int ECORE_EVENT_X_WINDOW_DELETE_REQUEST;
-extern int ECORE_EVENT_X_WINDOW_PROP_TITLE_CHANGE;
-extern int ECORE_EVENT_X_WINDOW_PROP_NAME_CLASS_CHANGE;
+extern int ECORE_X_EVENT_WINDOW_DELETE_REQUEST;
+extern int ECORE_X_EVENT_WINDOW_PROP_TITLE_CHANGE;
+extern int ECORE_X_EVENT_WINDOW_PROP_NAME_CLASS_CHANGE;
-extern int ECORE_MODIFIER_SHIFT;
-extern int ECORE_MODIFIER_CTRL;
-extern int ECORE_MODIFIER_ALT;
-extern int ECORE_MODIFIER_WIN;
+extern int ECORE_X_MODIFIER_SHIFT;
+extern int ECORE_X_MODIFIER_CTRL;
+extern int ECORE_X_MODIFIER_ALT;
+extern int ECORE_X_MODIFIER_WIN;
-extern int ECORE_LOCK_SCROLL;
-extern int ECORE_LOCK_NUM;
-extern int ECORE_LOCK_CAPS;
+extern int ECORE_X_LOCK_SCROLL;
+extern int ECORE_X_LOCK_NUM;
+extern int ECORE_X_LOCK_CAPS;
int ecore_x_init(const char *name);
int ecore_x_shutdown(void);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_x/Attic/ecore_x.c,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -3 -r1.1.2.12 -r1.1.2.13
--- ecore_x.c 6 Feb 2003 06:19:40 -0000 1.1.2.12
+++ ecore_x.c 7 Feb 2003 00:24:02 -0000 1.1.2.13
@@ -29,51 +29,51 @@
Atom _ecore_x_atom_wm_class = 0;
Atom _ecore_x_atom_wm_name = 0;
-int ECORE_EVENT_X_KEY_DOWN = 0;
-int ECORE_EVENT_X_KEY_UP = 0;
-int ECORE_EVENT_X_MOUSE_BUTTON_DOWN = 0;
-int ECORE_EVENT_X_MOUSE_BUTTON_UP = 0;
-int ECORE_EVENT_X_MOUSE_MOVE = 0;
-int ECORE_EVENT_X_MOUSE_IN = 0;
-int ECORE_EVENT_X_MOUSE_OUT = 0;
-int ECORE_EVENT_X_WINDOW_FOCUS_IN = 0;
-int ECORE_EVENT_X_WINDOW_FOCUS_OUT = 0;
-int ECORE_EVENT_X_WINDOW_KEYMAP = 0;
-int ECORE_EVENT_X_WINDOW_DAMAGE = 0;
-int ECORE_EVENT_X_WINDOW_VISIBILITY_CHANGE = 0;
-int ECORE_EVENT_X_WINDOW_CREATE = 0;
-int ECORE_EVENT_X_WINDOW_DESTROY = 0;
-int ECORE_EVENT_X_WINDOW_HIDE = 0;
-int ECORE_EVENT_X_WINDOW_SHOW = 0;
-int ECORE_EVENT_X_WINDOW_SHOW_REQUEST = 0;
-int ECORE_EVENT_X_WINDOW_REPARENT = 0;
-int ECORE_EVENT_X_WINDOW_CONFIGURE = 0;
-int ECORE_EVENT_X_WINDOW_CONFIGURE_REQUEST = 0;
-int ECORE_EVENT_X_WINDOW_GRAVITY = 0;
-int ECORE_EVENT_X_WINDOW_RESIZE_REQUEST = 0;
-int ECORE_EVENT_X_WINDOW_STACK = 0;
-int ECORE_EVENT_X_WINDOW_STACK_REQUEST = 0;
-int ECORE_EVENT_X_WINDOW_PROPERTY = 0;
-int ECORE_EVENT_X_WINDOW_COLORMAP = 0;
-int ECORE_EVENT_X_WINDOW_MAPPING = 0;
-int ECORE_EVENT_X_SELECTION_CLEAR = 0;
-int ECORE_EVENT_X_SELECTION_REQUEST = 0;
-int ECORE_EVENT_X_SELECTION_NOTIFY = 0;
-int ECORE_EVENT_X_CLIENT_MESSAGE = 0;
-int ECORE_EVENT_X_WINDOW_SHAPE = 0;
-
-int ECORE_EVENT_X_WINDOW_DELETE_REQUEST = 0;
-int ECORE_EVENT_X_WINDOW_PROP_TITLE_CHANGE = 0;
-int ECORE_EVENT_X_WINDOW_PROP_NAME_CLASS_CHANGE = 0;
-
-int ECORE_MODIFIER_SHIFT = 0;
-int ECORE_MODIFIER_CTRL = 0;
-int ECORE_MODIFIER_ALT = 0;
-int ECORE_MODIFIER_WIN = 0;
-
-int ECORE_LOCK_SCROLL = 0;
-int ECORE_LOCK_NUM = 0;
-int ECORE_LOCK_CAPS = 0;
+int ECORE_X_EVENT_KEY_DOWN = 0;
+int ECORE_X_EVENT_KEY_UP = 0;
+int ECORE_X_EVENT_MOUSE_BUTTON_DOWN = 0;
+int ECORE_X_EVENT_MOUSE_BUTTON_UP = 0;
+int ECORE_X_EVENT_MOUSE_MOVE = 0;
+int ECORE_X_EVENT_MOUSE_IN = 0;
+int ECORE_X_EVENT_MOUSE_OUT = 0;
+int ECORE_X_EVENT_WINDOW_FOCUS_IN = 0;
+int ECORE_X_EVENT_WINDOW_FOCUS_OUT = 0;
+int ECORE_X_EVENT_WINDOW_KEYMAP = 0;
+int ECORE_X_EVENT_WINDOW_DAMAGE = 0;
+int ECORE_X_EVENT_WINDOW_VISIBILITY_CHANGE = 0;
+int ECORE_X_EVENT_WINDOW_CREATE = 0;
+int ECORE_X_EVENT_WINDOW_DESTROY = 0;
+int ECORE_X_EVENT_WINDOW_HIDE = 0;
+int ECORE_X_EVENT_WINDOW_SHOW = 0;
+int ECORE_X_EVENT_WINDOW_SHOW_REQUEST = 0;
+int ECORE_X_EVENT_WINDOW_REPARENT = 0;
+int ECORE_X_EVENT_WINDOW_CONFIGURE = 0;
+int ECORE_X_EVENT_WINDOW_CONFIGURE_REQUEST = 0;
+int ECORE_X_EVENT_WINDOW_GRAVITY = 0;
+int ECORE_X_EVENT_WINDOW_RESIZE_REQUEST = 0;
+int ECORE_X_EVENT_WINDOW_STACK = 0;
+int ECORE_X_EVENT_WINDOW_STACK_REQUEST = 0;
+int ECORE_X_EVENT_WINDOW_PROPERTY = 0;
+int ECORE_X_EVENT_WINDOW_COLORMAP = 0;
+int ECORE_X_EVENT_WINDOW_MAPPING = 0;
+int ECORE_X_EVENT_SELECTION_CLEAR = 0;
+int ECORE_X_EVENT_SELECTION_REQUEST = 0;
+int ECORE_X_EVENT_SELECTION_NOTIFY = 0;
+int ECORE_X_EVENT_CLIENT_MESSAGE = 0;
+int ECORE_X_EVENT_WINDOW_SHAPE = 0;
+
+int ECORE_X_EVENT_WINDOW_DELETE_REQUEST = 0;
+int ECORE_X_EVENT_WINDOW_PROP_TITLE_CHANGE = 0;
+int ECORE_X_EVENT_WINDOW_PROP_NAME_CLASS_CHANGE = 0;
+
+int ECORE_X_MODIFIER_SHIFT = 0;
+int ECORE_X_MODIFIER_CTRL = 0;
+int ECORE_X_MODIFIER_ALT = 0;
+int ECORE_X_MODIFIER_WIN = 0;
+
+int ECORE_X_LOCK_SCROLL = 0;
+int ECORE_X_LOCK_NUM = 0;
+int ECORE_X_LOCK_CAPS = 0;
/**
* Init the X display connection
@@ -143,56 +143,56 @@
_ecore_x_event_handlers[ClientMessage] = _ecore_x_event_handle_client_message;
if (_ecore_x_event_shape_id)
_ecore_x_event_handlers[_ecore_x_event_shape_id] =
_ecore_x_event_handle_shape_change;
- if (!ECORE_EVENT_X_KEY_DOWN)
+ if (!ECORE_X_EVENT_KEY_DOWN)
{
- ECORE_EVENT_X_KEY_DOWN = ecore_event_type_new();
- ECORE_EVENT_X_KEY_UP = ecore_event_type_new();
- ECORE_EVENT_X_MOUSE_BUTTON_DOWN = ecore_event_type_new();
- ECORE_EVENT_X_MOUSE_BUTTON_UP = ecore_event_type_new();
- ECORE_EVENT_X_MOUSE_MOVE = ecore_event_type_new();
- ECORE_EVENT_X_MOUSE_IN = ecore_event_type_new();
- ECORE_EVENT_X_MOUSE_OUT = ecore_event_type_new();
- ECORE_EVENT_X_WINDOW_FOCUS_IN = ecore_event_type_new();
- ECORE_EVENT_X_WINDOW_FOCUS_OUT = ecore_event_type_new();
- ECORE_EVENT_X_WINDOW_KEYMAP = ecore_event_type_new();
- ECORE_EVENT_X_WINDOW_DAMAGE = ecore_event_type_new();
- ECORE_EVENT_X_WINDOW_VISIBILITY_CHANGE = ecore_event_type_new();
- ECORE_EVENT_X_WINDOW_CREATE = ecore_event_type_new();
- ECORE_EVENT_X_WINDOW_DESTROY = ecore_event_type_new();
- ECORE_EVENT_X_WINDOW_HIDE = ecore_event_type_new();
- ECORE_EVENT_X_WINDOW_SHOW = ecore_event_type_new();
- ECORE_EVENT_X_WINDOW_SHOW_REQUEST = ecore_event_type_new();
- ECORE_EVENT_X_WINDOW_REPARENT = ecore_event_type_new();
- ECORE_EVENT_X_WINDOW_CONFIGURE = ecore_event_type_new();
- ECORE_EVENT_X_WINDOW_CONFIGURE_REQUEST = ecore_event_type_new();
- ECORE_EVENT_X_WINDOW_GRAVITY = ecore_event_type_new();
- ECORE_EVENT_X_WINDOW_RESIZE_REQUEST = ecore_event_type_new();
- ECORE_EVENT_X_WINDOW_STACK = ecore_event_type_new();
- ECORE_EVENT_X_WINDOW_STACK_REQUEST = ecore_event_type_new();
- ECORE_EVENT_X_WINDOW_PROPERTY = ecore_event_type_new();
- ECORE_EVENT_X_WINDOW_COLORMAP = ecore_event_type_new();
- ECORE_EVENT_X_WINDOW_MAPPING = ecore_event_type_new();
- ECORE_EVENT_X_SELECTION_CLEAR = ecore_event_type_new();
- ECORE_EVENT_X_SELECTION_REQUEST = ecore_event_type_new();
- ECORE_EVENT_X_SELECTION_NOTIFY = ecore_event_type_new();
- ECORE_EVENT_X_CLIENT_MESSAGE = ecore_event_type_new();
- ECORE_EVENT_X_WINDOW_SHAPE = ecore_event_type_new();
+ ECORE_X_EVENT_KEY_DOWN = ecore_event_type_new();
+ ECORE_X_EVENT_KEY_UP = ecore_event_type_new();
+ ECORE_X_EVENT_MOUSE_BUTTON_DOWN = ecore_event_type_new();
+ ECORE_X_EVENT_MOUSE_BUTTON_UP = ecore_event_type_new();
+ ECORE_X_EVENT_MOUSE_MOVE = ecore_event_type_new();
+ ECORE_X_EVENT_MOUSE_IN = ecore_event_type_new();
+ ECORE_X_EVENT_MOUSE_OUT = ecore_event_type_new();
+ ECORE_X_EVENT_WINDOW_FOCUS_IN = ecore_event_type_new();
+ ECORE_X_EVENT_WINDOW_FOCUS_OUT = ecore_event_type_new();
+ ECORE_X_EVENT_WINDOW_KEYMAP = ecore_event_type_new();
+ ECORE_X_EVENT_WINDOW_DAMAGE = ecore_event_type_new();
+ ECORE_X_EVENT_WINDOW_VISIBILITY_CHANGE = ecore_event_type_new();
+ ECORE_X_EVENT_WINDOW_CREATE = ecore_event_type_new();
+ ECORE_X_EVENT_WINDOW_DESTROY = ecore_event_type_new();
+ ECORE_X_EVENT_WINDOW_HIDE = ecore_event_type_new();
+ ECORE_X_EVENT_WINDOW_SHOW = ecore_event_type_new();
+ ECORE_X_EVENT_WINDOW_SHOW_REQUEST = ecore_event_type_new();
+ ECORE_X_EVENT_WINDOW_REPARENT = ecore_event_type_new();
+ ECORE_X_EVENT_WINDOW_CONFIGURE = ecore_event_type_new();
+ ECORE_X_EVENT_WINDOW_CONFIGURE_REQUEST = ecore_event_type_new();
+ ECORE_X_EVENT_WINDOW_GRAVITY = ecore_event_type_new();
+ ECORE_X_EVENT_WINDOW_RESIZE_REQUEST = ecore_event_type_new();
+ ECORE_X_EVENT_WINDOW_STACK = ecore_event_type_new();
+ ECORE_X_EVENT_WINDOW_STACK_REQUEST = ecore_event_type_new();
+ ECORE_X_EVENT_WINDOW_PROPERTY = ecore_event_type_new();
+ ECORE_X_EVENT_WINDOW_COLORMAP = ecore_event_type_new();
+ ECORE_X_EVENT_WINDOW_MAPPING = ecore_event_type_new();
+ ECORE_X_EVENT_SELECTION_CLEAR = ecore_event_type_new();
+ ECORE_X_EVENT_SELECTION_REQUEST = ecore_event_type_new();
+ ECORE_X_EVENT_SELECTION_NOTIFY = ecore_event_type_new();
+ ECORE_X_EVENT_CLIENT_MESSAGE = ecore_event_type_new();
+ ECORE_X_EVENT_WINDOW_SHAPE = ecore_event_type_new();
- ECORE_EVENT_X_WINDOW_DELETE_REQUEST = ecore_event_type_new();
- ECORE_EVENT_X_WINDOW_PROP_TITLE_CHANGE = ecore_event_type_new();
- ECORE_EVENT_X_WINDOW_PROP_NAME_CLASS_CHANGE = ecore_event_type_new();
+ ECORE_X_EVENT_WINDOW_DELETE_REQUEST = ecore_event_type_new();
+ ECORE_X_EVENT_WINDOW_PROP_TITLE_CHANGE = ecore_event_type_new();
+ ECORE_X_EVENT_WINDOW_PROP_NAME_CLASS_CHANGE = ecore_event_type_new();
}
- ECORE_MODIFIER_SHIFT = _ecore_x_key_mask_get(XK_Shift_L);
- ECORE_MODIFIER_CTRL = _ecore_x_key_mask_get(XK_Control_L);
- ECORE_MODIFIER_ALT = _ecore_x_key_mask_get(XK_Alt_L);
- ECORE_MODIFIER_WIN = _ecore_x_key_mask_get(XK_Super_L);
- if (!ECORE_MODIFIER_WIN)
- ECORE_MODIFIER_WIN = _ecore_x_key_mask_get(XK_Meta_L);
+ ECORE_X_MODIFIER_SHIFT = _ecore_x_key_mask_get(XK_Shift_L);
+ ECORE_X_MODIFIER_CTRL = _ecore_x_key_mask_get(XK_Control_L);
+ ECORE_X_MODIFIER_ALT = _ecore_x_key_mask_get(XK_Alt_L);
+ ECORE_X_MODIFIER_WIN = _ecore_x_key_mask_get(XK_Super_L);
+ if (!ECORE_X_MODIFIER_WIN)
+ ECORE_X_MODIFIER_WIN = _ecore_x_key_mask_get(XK_Meta_L);
- ECORE_LOCK_SCROLL = _ecore_x_key_mask_get(XK_Scroll_Lock);
- ECORE_LOCK_NUM = _ecore_x_key_mask_get(XK_Num_Lock);
- ECORE_LOCK_CAPS = _ecore_x_key_mask_get(XK_Caps_Lock);
+ ECORE_X_LOCK_SCROLL = _ecore_x_key_mask_get(XK_Scroll_Lock);
+ ECORE_X_LOCK_NUM = _ecore_x_key_mask_get(XK_Num_Lock);
+ ECORE_X_LOCK_CAPS = _ecore_x_key_mask_get(XK_Caps_Lock);
_ecore_x_fd_handler_handle =
ecore_main_fd_handler_add(ConnectionNumber(_ecore_x_disp),
@@ -391,9 +391,9 @@
filter_data = loop_data;
if (!filter_data) return 1;
- if (type == ECORE_EVENT_X_MOUSE_MOVE)
+ if (type == ECORE_X_EVENT_MOUSE_MOVE)
{
- if ((filter_data->last_event_type) == ECORE_EVENT_X_MOUSE_MOVE)
+ if ((filter_data->last_event_type) == ECORE_X_EVENT_MOUSE_MOVE)
{
filter_data->last_event_type = type;
return 0;
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_x/Attic/ecore_x_events.c,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -3 -r1.1.2.9 -r1.1.2.10
--- ecore_x_events.c 5 Feb 2003 06:51:57 -0000 1.1.2.9
+++ ecore_x_events.c 7 Feb 2003 00:24:02 -0000 1.1.2.10
@@ -92,7 +92,7 @@
e->time = xevent->xkey.time;
e->modifiers = xevent->xkey.state;
_ecore_x_event_last_time = e->time;
- ecore_event_add(ECORE_EVENT_X_KEY_DOWN, e, _ecore_x_event_free_key_down, NULL);
+ ecore_event_add(ECORE_X_EVENT_KEY_DOWN, e, _ecore_x_event_free_key_down, NULL);
}
void
@@ -129,7 +129,7 @@
e->time = xevent->xkey.time;
e->modifiers = xevent->xkey.state;
_ecore_x_event_last_time = e->time;
- ecore_event_add(ECORE_EVENT_X_KEY_UP, e, _ecore_x_event_free_key_up, NULL);
+ ecore_event_add(ECORE_X_EVENT_KEY_UP, e, _ecore_x_event_free_key_up, NULL);
}
void
@@ -167,7 +167,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_EVENT_X_MOUSE_MOVE, e, _ecore_x_event_free_generic,
NULL);
+ ecore_event_add(ECORE_X_EVENT_MOUSE_MOVE, e, _ecore_x_event_free_generic,
+NULL);
}
{
Ecore_X_Event_Mouse_Button_Down *e;
@@ -201,7 +201,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_EVENT_X_MOUSE_BUTTON_DOWN, e,
_ecore_x_event_free_generic, NULL);
+ ecore_event_add(ECORE_X_EVENT_MOUSE_BUTTON_DOWN, e,
+_ecore_x_event_free_generic, NULL);
}
if (did_triple)
{
@@ -251,7 +251,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_EVENT_X_MOUSE_MOVE, e, _ecore_x_event_free_generic,
NULL);
+ ecore_event_add(ECORE_X_EVENT_MOUSE_MOVE, e, _ecore_x_event_free_generic,
+NULL);
}
{
Ecore_X_Event_Mouse_Button_Up *e;
@@ -272,7 +272,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_EVENT_X_MOUSE_BUTTON_UP, e,
_ecore_x_event_free_generic, NULL);
+ ecore_event_add(ECORE_X_EVENT_MOUSE_BUTTON_UP, e,
+_ecore_x_event_free_generic, NULL);
}
}
}
@@ -297,7 +297,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_EVENT_X_MOUSE_MOVE, e, _ecore_x_event_free_generic, NULL);
+ ecore_event_add(ECORE_X_EVENT_MOUSE_MOVE, e, _ecore_x_event_free_generic, NULL);
}
void
@@ -321,7 +321,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_EVENT_X_MOUSE_MOVE, e, _ecore_x_event_free_generic,
NULL);
+ ecore_event_add(ECORE_X_EVENT_MOUSE_MOVE, e, _ecore_x_event_free_generic,
+NULL);
}
{
Ecore_X_Event_Mouse_In *e;
@@ -346,7 +346,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_EVENT_X_MOUSE_IN, e, _ecore_x_event_free_generic, NULL);
+ ecore_event_add(ECORE_X_EVENT_MOUSE_IN, e, _ecore_x_event_free_generic, NULL);
}
}
@@ -371,7 +371,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_EVENT_X_MOUSE_MOVE, e, _ecore_x_event_free_generic,
NULL);
+ ecore_event_add(ECORE_X_EVENT_MOUSE_MOVE, e, _ecore_x_event_free_generic,
+NULL);
}
{
Ecore_X_Event_Mouse_Out *e;
@@ -399,7 +399,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_EVENT_X_MOUSE_OUT, e, _ecore_x_event_free_generic, NULL);
+ ecore_event_add(ECORE_X_EVENT_MOUSE_OUT, e, _ecore_x_event_free_generic, NULL);
}
}
@@ -424,7 +424,7 @@
else if (xevent->xfocus.detail == NotifyPointerRoot) e->detail =
ECORE_X_EVENT_DETAIL_POINTER_ROOT;
else if (xevent->xfocus.detail == NotifyDetailNone) e->detail =
ECORE_X_EVENT_DETAIL_DETAIL_NONE;
e->time = _ecore_x_event_last_time;
- ecore_event_add(ECORE_EVENT_X_WINDOW_FOCUS_IN, e, _ecore_x_event_free_generic,
NULL);
+ ecore_event_add(ECORE_X_EVENT_WINDOW_FOCUS_IN, e, _ecore_x_event_free_generic,
+NULL);
}
void
@@ -448,7 +448,7 @@
else if (xevent->xfocus.detail == NotifyPointerRoot) e->detail =
ECORE_X_EVENT_DETAIL_POINTER_ROOT;
else if (xevent->xfocus.detail == NotifyDetailNone) e->detail =
ECORE_X_EVENT_DETAIL_DETAIL_NONE;
e->time = _ecore_x_event_last_time;
- ecore_event_add(ECORE_EVENT_X_WINDOW_FOCUS_OUT, e, _ecore_x_event_free_generic,
NULL);
+ ecore_event_add(ECORE_X_EVENT_WINDOW_FOCUS_OUT, e, _ecore_x_event_free_generic,
+NULL);
}
void
@@ -471,7 +471,7 @@
e->w = xevent->xexpose.width;
e->h = xevent->xexpose.height;
e->time = _ecore_x_event_last_time;
- ecore_event_add(ECORE_EVENT_X_WINDOW_DAMAGE, e, _ecore_x_event_free_generic,
NULL);
+ ecore_event_add(ECORE_X_EVENT_WINDOW_DAMAGE, e, _ecore_x_event_free_generic,
+NULL);
}
void
@@ -488,7 +488,7 @@
e->w = xevent->xgraphicsexpose.width;
e->h = xevent->xgraphicsexpose.height;
e->time = _ecore_x_event_last_time;
- ecore_event_add(ECORE_EVENT_X_WINDOW_DAMAGE, e, _ecore_x_event_free_generic,
NULL);
+ ecore_event_add(ECORE_X_EVENT_WINDOW_DAMAGE, e, _ecore_x_event_free_generic,
+NULL);
}
void
@@ -513,7 +513,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_EVENT_X_WINDOW_DESTROY, e, _ecore_x_event_free_generic,
NULL);
+ ecore_event_add(ECORE_X_EVENT_WINDOW_DESTROY, e, _ecore_x_event_free_generic,
+NULL);
}
void
@@ -557,7 +557,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_EVENT_X_WINDOW_CONFIGURE, e, _ecore_x_event_free_generic,
NULL);
+ ecore_event_add(ECORE_X_EVENT_WINDOW_CONFIGURE, e, _ecore_x_event_free_generic,
+NULL);
}
void
@@ -601,7 +601,7 @@
if (!e) return;
ecore_x_window_prop_name_class_get(xevent->xproperty.window,
&(e->name), &(e->clas));
- ecore_event_add(ECORE_EVENT_X_WINDOW_PROP_NAME_CLASS_CHANGE, e,
_ecore_x_event_free_window_prop_name_class_change, NULL);
+ ecore_event_add(ECORE_X_EVENT_WINDOW_PROP_NAME_CLASS_CHANGE, e,
+_ecore_x_event_free_window_prop_name_class_change, NULL);
}
else if (xevent->xproperty.atom == _ecore_x_atom_wm_name)
{
@@ -610,7 +610,7 @@
e = calloc(1, sizeof(Ecore_X_Event_Window_Prop_Title_Change));
if (!e) return;
e->title = ecore_x_window_prop_title_get(xevent->xproperty.window);
- ecore_event_add(ECORE_EVENT_X_WINDOW_PROP_TITLE_CHANGE, e,
_ecore_x_event_free_window_prop_title_change, NULL);
+ ecore_event_add(ECORE_X_EVENT_WINDOW_PROP_TITLE_CHANGE, e,
+_ecore_x_event_free_window_prop_title_change, NULL);
}
}
@@ -657,7 +657,7 @@
if (!e) return;
e->win = xevent->xclient.window;
e->time = _ecore_x_event_last_time;
- ecore_event_add(ECORE_EVENT_X_WINDOW_DELETE_REQUEST, e,
_ecore_x_event_free_generic, NULL);
+ ecore_event_add(ECORE_X_EVENT_WINDOW_DELETE_REQUEST, e,
+_ecore_x_event_free_generic, NULL);
}
else
{
-------------------------------------------------------
This SF.NET email is sponsored by:
SourceForge Enterprise Edition + IBM + LinuxWorld = Something 2 See!
http://www.vasoftware.com
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
