Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_evas
Modified Files:
ecore_evas_buffer.c ecore_evas_fb.c ecore_evas_x.c
Log Message:
one way or the other i'm forced to add timestamps to events - i cant avoid it
anymore. sorry guys. really no way around it. :(
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_evas/ecore_evas_buffer.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ecore_evas_buffer.c 3 May 2005 08:02:28 -0000 1.4
+++ ecore_evas_buffer.c 25 Jul 2005 09:55:46 -0000 1.5
@@ -12,11 +12,11 @@
static Ecore_Evas *ecore_evases = NULL;
static void
-_ecore_evas_mouse_move_process(Ecore_Evas *ee, int x, int y)
+_ecore_evas_mouse_move_process(Ecore_Evas *ee, int x, int y, unsigned int
timestamp)
{
ee->mouse.x = x;
ee->mouse.y = y;
- evas_event_feed_mouse_move(ee->evas, x, y, NULL);
+ evas_event_feed_mouse_move(ee->evas, x, y, timestamp, NULL);
}
static int
@@ -162,18 +162,22 @@
_ecore_evas_buffer_cb_mouse_in(void *data, Evas *e __UNUSED__, Evas_Object
*obj __UNUSED__, void *event_info __UNUSED__)
{
Ecore_Evas *ee;
+ Evas_Event_Mouse_In *ev;
ee = data;
- evas_event_feed_mouse_in(ee->evas, NULL);
+ ev = event_info;
+ evas_event_feed_mouse_in(ee->evas, ev->timestamp, NULL);
}
static void
_ecore_evas_buffer_cb_mouse_out(void *data, Evas *e __UNUSED__, Evas_Object
*obj __UNUSED__, void *event_info __UNUSED__)
{
Ecore_Evas *ee;
+ Evas_Event_Mouse_Out *ev;
ee = data;
- evas_event_feed_mouse_out(ee->evas, NULL);
+ ev = event_info;
+ evas_event_feed_mouse_out(ee->evas, ev->timestamp, NULL);
}
static void
@@ -184,7 +188,7 @@
ee = data;
ev = event_info;
- evas_event_feed_mouse_down(ee->evas, ev->button, ev->flags, NULL);
+ evas_event_feed_mouse_down(ee->evas, ev->button, ev->flags, ev->timestamp,
NULL);
}
static void
@@ -195,7 +199,7 @@
ee = data;
ev = event_info;
- evas_event_feed_mouse_up(ee->evas, ev->button, ev->flags, NULL);
+ evas_event_feed_mouse_up(ee->evas, ev->button, ev->flags, ev->timestamp,
NULL);
}
static void
@@ -210,7 +214,7 @@
x = ev->cur.canvas.x;
y = ev->cur.canvas.y;
_ecore_evas_buffer_coord_translate(ee, &x, &y);
- _ecore_evas_mouse_move_process(ee, x, y);
+ _ecore_evas_mouse_move_process(ee, x, y, ev->timestamp);
}
static void
@@ -221,7 +225,7 @@
ee = data;
ev = event_info;
- evas_event_feed_mouse_wheel(ee->evas, ev->direction, ev->z, NULL);
+ evas_event_feed_mouse_wheel(ee->evas, ev->direction, ev->z, ev->timestamp,
NULL);
}
static void
@@ -278,7 +282,7 @@
evas_key_lock_on(e, "Caps_Lock");
else
evas_key_lock_off(e, "Caps_Lock");
- evas_event_feed_key_down(ee->evas, ev->keyname, ev->key, ev->string,
ev->compose, NULL);
+ evas_event_feed_key_down(ee->evas, ev->keyname, ev->key, ev->string,
ev->compose, ev->timestamp, NULL);
}
static void
@@ -325,7 +329,7 @@
evas_key_lock_on(e, "Caps_Lock");
else
evas_key_lock_off(e, "Caps_Lock");
- evas_event_feed_key_up(ee->evas, ev->keyname, ev->key, ev->string,
ev->compose, NULL);
+ evas_event_feed_key_up(ee->evas, ev->keyname, ev->key, ev->string,
ev->compose, ev->timestamp, NULL);
}
static void
@@ -486,7 +490,7 @@
evas_key_lock_add(ee->evas, "Num_Lock");
evas_key_lock_add(ee->evas, "Scroll_Lock");
- evas_event_feed_mouse_in(ee->evas, NULL);
+ evas_event_feed_mouse_in(ee->evas, 0, NULL);
ecore_evases = _ecore_list_prepend(ecore_evases, ee);
return ee;
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_evas/ecore_evas_fb.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- ecore_evas_fb.c 2 Mar 2005 07:06:34 -0000 1.11
+++ ecore_evas_fb.c 25 Jul 2005 09:55:47 -0000 1.12
@@ -17,7 +17,7 @@
static Ecore_Idle_Enterer *ecore_evas_idle_enterer = NULL;
static void
-_ecore_evas_mouse_move_process(Ecore_Evas *ee, int x, int y)
+_ecore_evas_mouse_move_process(Ecore_Evas *ee, int x, int y, unsigned int
timestamp)
{
int fbw, fbh;
@@ -45,13 +45,13 @@
(fbw - ee->w) + ee->w - x - 1 -
ee->prop.cursor.hot.y);
}
if (ee->rotation == 0)
- evas_event_feed_mouse_move(ee->evas, x, y, NULL);
+ evas_event_feed_mouse_move(ee->evas, x, y, timestamp, NULL);
else if (ee->rotation == 90)
- evas_event_feed_mouse_move(ee->evas, (fbh - ee->h) + ee->h - y - 1, x,
NULL);
+ evas_event_feed_mouse_move(ee->evas, (fbh - ee->h) + ee->h - y - 1, x,
timestamp, NULL);
else if (ee->rotation == 180)
- evas_event_feed_mouse_move(ee->evas, (fbw - ee->w) + ee->w - x - 1, (fbh
- ee->h) + ee->h - y - 1, NULL);
+ evas_event_feed_mouse_move(ee->evas, (fbw - ee->w) + ee->w - x - 1, (fbh
- ee->h) + ee->h - y - 1, timestamp, NULL);
else if (ee->rotation == 270)
- evas_event_feed_mouse_move(ee->evas, y, (fbw - ee->w) + ee->w - x - 1,
NULL);
+ evas_event_feed_mouse_move(ee->evas, y, (fbw - ee->w) + ee->w - x - 1,
timestamp, NULL);
}
static Ecore_Evas *
@@ -107,7 +107,7 @@
e = event;
ee = _ecore_evas_fb_match();
if (!ee) return 1; /* pass on event */
- evas_event_feed_key_down(ee->evas, e->keyname, e->keysymbol,
e->key_compose, NULL, NULL);
+ evas_event_feed_key_down(ee->evas, e->keyname, e->keysymbol,
e->key_compose, NULL, (unsigned int)((unsigned long long)(ecore_time_get() *
1000.0) & 0xffffffff), NULL);
return 0; /* dont pass it on */
}
@@ -120,7 +120,7 @@
e = event;
ee = _ecore_evas_fb_match();
if (!ee) return 1; /* pass on event */
- evas_event_feed_key_up(ee->evas, e->keyname, e->keysymbol, e->key_compose,
NULL, NULL);
+ evas_event_feed_key_up(ee->evas, e->keyname, e->keysymbol, e->key_compose,
NULL, (unsigned int)((unsigned long long)(ecore_time_get() * 1000.0) &
0xffffffff), NULL);
return 0; /* dont pass it on */
}
@@ -134,10 +134,10 @@
e = event;
ee = _ecore_evas_fb_match();
if (!ee) return 1; /* pass on event */
- _ecore_evas_mouse_move_process(ee, e->x, e->y);
+ _ecore_evas_mouse_move_process(ee, e->x, e->y, (unsigned int)((unsigned
long long)(ecore_time_get() * 1000.0) & 0xffffffff));
if (e->double_click) flags |= EVAS_BUTTON_DOUBLE_CLICK;
if (e->triple_click) flags |= EVAS_BUTTON_TRIPLE_CLICK;
- evas_event_feed_mouse_down(ee->evas, e->button, flags, NULL);
+ evas_event_feed_mouse_down(ee->evas, e->button, flags, (unsigned
int)((unsigned long long)(ecore_time_get() * 1000.0) & 0xffffffff), NULL);
return 0; /* dont pass it on */
}
@@ -150,8 +150,8 @@
e = event;
ee = _ecore_evas_fb_match();
if (!ee) return 1; /* pass on event */
- _ecore_evas_mouse_move_process(ee, e->x, e->y);
- evas_event_feed_mouse_up(ee->evas, e->button, EVAS_BUTTON_NONE, NULL);
+ _ecore_evas_mouse_move_process(ee, e->x, e->y, (unsigned int)((unsigned
long long)(ecore_time_get() * 1000.0) & 0xffffffff));
+ evas_event_feed_mouse_up(ee->evas, e->button, EVAS_BUTTON_NONE, (unsigned
int)((unsigned long long)(ecore_time_get() * 1000.0) & 0xffffffff), NULL);
return 0; /* dont pass it on */
}
@@ -164,7 +164,7 @@
e = event;
ee = _ecore_evas_fb_match();
if (!ee) return 1; /* pass on event */
- _ecore_evas_mouse_move_process(ee, e->x, e->y);
+ _ecore_evas_mouse_move_process(ee, e->x, e->y, (unsigned int)((unsigned
long long)(ecore_time_get() * 1000.0) & 0xffffffff));
return 0; /* dont pass it on */
}
@@ -311,7 +311,7 @@
evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w);
else
evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
- _ecore_evas_mouse_move_process(ee, ee->mouse.x, ee->mouse.y);
+ _ecore_evas_mouse_move_process(ee, ee->mouse.x, ee->mouse.y, (unsigned
int)((unsigned long long)(ecore_time_get() * 1000.0) & 0xffffffff));
if (ee->func.fn_resize) ee->func.fn_resize(ee);
}
@@ -532,7 +532,7 @@
evas_key_lock_add(ee->evas, "Num_Lock");
evas_key_lock_add(ee->evas, "Scroll_Lock");
- evas_event_feed_mouse_in(ee->evas, NULL);
+ evas_event_feed_mouse_in(ee->evas, (unsigned int)((unsigned long
long)(ecore_time_get() * 1000.0) & 0xffffffff), NULL);
ecore_evases = _ecore_list_prepend(ecore_evases, ee);
return ee;
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_evas/ecore_evas_x.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -3 -r1.49 -r1.50
--- ecore_evas_x.c 12 Jul 2005 07:15:31 -0000 1.49
+++ ecore_evas_x.c 25 Jul 2005 09:55:47 -0000 1.50
@@ -193,7 +193,7 @@
}
static void
-_ecore_evas_x_mouse_move_process(Ecore_Evas *ee, int x, int y)
+_ecore_evas_x_mouse_move_process(Ecore_Evas *ee, int x, int y, unsigned int
timestamp)
{
ee->mouse.x = x;
ee->mouse.y = y;
@@ -218,13 +218,13 @@
ee->w - x - 1 - ee->prop.cursor.hot.y);
}
if (ee->rotation == 0)
- evas_event_feed_mouse_move(ee->evas, x, y, NULL);
+ evas_event_feed_mouse_move(ee->evas, x, y, timestamp, NULL);
else if (ee->rotation == 90)
- evas_event_feed_mouse_move(ee->evas, ee->h - y - 1, x, NULL);
+ evas_event_feed_mouse_move(ee->evas, ee->h - y - 1, x, timestamp, NULL);
else if (ee->rotation == 180)
- evas_event_feed_mouse_move(ee->evas, ee->w - x - 1, ee->h - y - 1, NULL);
+ evas_event_feed_mouse_move(ee->evas, ee->w - x - 1, ee->h - y - 1,
timestamp, NULL);
else if (ee->rotation == 270)
- evas_event_feed_mouse_move(ee->evas, y, ee->w - x - 1, NULL);
+ evas_event_feed_mouse_move(ee->evas, y, ee->w - x - 1, timestamp, NULL);
}
static char *
@@ -329,7 +329,7 @@
ee = _ecore_evas_x_match(e->win);
if (!ee) return 1; /* pass on event */
_ecore_evas_x_modifier_locks_update(ee, e->modifiers);
- evas_event_feed_key_down(ee->evas, e->keyname, e->keysymbol,
e->key_compose, NULL, NULL);
+ evas_event_feed_key_down(ee->evas, e->keyname, e->keysymbol,
e->key_compose, NULL, e->time, NULL);
return 1;
}
@@ -343,7 +343,7 @@
ee = _ecore_evas_x_match(e->win);
if (!ee) return 1; /* pass on event */
_ecore_evas_x_modifier_locks_update(ee, e->modifiers);
- evas_event_feed_key_up(ee->evas, e->keyname, e->keysymbol, e->key_compose,
NULL, NULL);
+ evas_event_feed_key_up(ee->evas, e->keyname, e->keysymbol, e->key_compose,
NULL, e->time, NULL);
return 1;
}
@@ -358,10 +358,10 @@
ee = _ecore_evas_x_match(e->win);
if (!ee) return 1; /* pass on event */
_ecore_evas_x_modifier_locks_update(ee, e->modifiers);
- _ecore_evas_x_mouse_move_process(ee, e->x, e->y);
+ _ecore_evas_x_mouse_move_process(ee, e->x, e->y, e->time);
if (e->double_click) flags |= EVAS_BUTTON_DOUBLE_CLICK;
if (e->triple_click) flags |= EVAS_BUTTON_TRIPLE_CLICK;
- evas_event_feed_mouse_down(ee->evas, e->button, flags, NULL);
+ evas_event_feed_mouse_down(ee->evas, e->button, flags, e->time, NULL);
return 1;
}
@@ -375,8 +375,8 @@
ee = _ecore_evas_x_match(e->win);
if (!ee) return 1; /* pass on event */
_ecore_evas_x_modifier_locks_update(ee, e->modifiers);
- _ecore_evas_x_mouse_move_process(ee, e->x, e->y);
- evas_event_feed_mouse_up(ee->evas, e->button, EVAS_BUTTON_NONE, NULL);
+ _ecore_evas_x_mouse_move_process(ee, e->x, e->y, e->time);
+ evas_event_feed_mouse_up(ee->evas, e->button, EVAS_BUTTON_NONE, e->time,
NULL);
return 1;
}
@@ -393,8 +393,8 @@
return 1; /* pass on event */
_ecore_evas_x_modifier_locks_update(ee, e->modifiers);
- _ecore_evas_x_mouse_move_process(ee, e->x, e->y);
- evas_event_feed_mouse_wheel(ee->evas, e->direction, e->z, NULL);
+ _ecore_evas_x_mouse_move_process(ee, e->x, e->y, e->time);
+ evas_event_feed_mouse_wheel(ee->evas, e->direction, e->z, e->time, NULL);
return 1;
}
@@ -409,7 +409,7 @@
ee = _ecore_evas_x_match(e->win);
if (!ee) return 1; /* pass on event */
_ecore_evas_x_modifier_locks_update(ee, e->modifiers);
- _ecore_evas_x_mouse_move_process(ee, e->x, e->y);
+ _ecore_evas_x_mouse_move_process(ee, e->x, e->y, e->time);
return 1;
}
@@ -426,8 +426,8 @@
/* if (e->mode != ECORE_X_EVENT_MODE_NORMAL) return 0; */
if (ee->func.fn_mouse_in) ee->func.fn_mouse_in(ee);
_ecore_evas_x_modifier_locks_update(ee, e->modifiers);
- evas_event_feed_mouse_in(ee->evas, NULL);
- _ecore_evas_x_mouse_move_process(ee, e->x, e->y);
+ evas_event_feed_mouse_in(ee->evas, e->time, NULL);
+ _ecore_evas_x_mouse_move_process(ee, e->x, e->y, e->time);
return 1;
}
@@ -443,8 +443,8 @@
if (e->event_win == ee->engine.x.win_container) return 0;
/* if (e->mode != ECORE_X_EVENT_MODE_NORMAL) return 0; */
_ecore_evas_x_modifier_locks_update(ee, e->modifiers);
- _ecore_evas_x_mouse_move_process(ee, e->x, e->y);
- evas_event_feed_mouse_out(ee->evas, NULL);
+ _ecore_evas_x_mouse_move_process(ee, e->x, e->y, e->time);
+ evas_event_feed_mouse_out(ee->evas, e->time, NULL);
if (ee->func.fn_mouse_out) ee->func.fn_mouse_out(ee);
if (ee->prop.cursor.object) evas_object_hide(ee->prop.cursor.object);
return 1;
@@ -596,7 +596,8 @@
{
if ((ee->expecting_resize.w == ee->w) &&
(ee->expecting_resize.h == ee->h))
- _ecore_evas_x_mouse_move_process(ee, ee->mouse.x, ee->mouse.y);
+ _ecore_evas_x_mouse_move_process(ee, ee->mouse.x, ee->mouse.y,
+ ecore_x_current_time_get());
ee->expecting_resize.w = 0;
ee->expecting_resize.h = 0;
}
@@ -1013,14 +1014,16 @@
ecore_evas_size_max_set(ee, maxh, maxw);
ecore_evas_size_base_set(ee, baseh, basew);
ecore_evas_size_step_set(ee, steph, stepw);
- _ecore_evas_x_mouse_move_process(ee, ee->mouse.x, ee->mouse.y);
+ _ecore_evas_x_mouse_move_process(ee, ee->mouse.x, ee->mouse.y,
+ ecore_x_current_time_get());
}
else
{
einfo->info.rotation = rotation;
evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
ee->rotation = rotation;
- _ecore_evas_x_mouse_move_process(ee, ee->mouse.x, ee->mouse.y);
+ _ecore_evas_x_mouse_move_process(ee, ee->mouse.x, ee->mouse.y,
+ ecore_x_current_time_get());
if (ee->func.fn_resize) ee->func.fn_resize(ee);
}
if ((ee->rotation == 90) || (ee->rotation == 270))
@@ -1432,7 +1435,8 @@
{
if ((ee->expecting_resize.w == ee->w) &&
(ee->expecting_resize.h == ee->h))
- _ecore_evas_x_mouse_move_process(ee, ee->mouse.x, ee->mouse.y);
+ _ecore_evas_x_mouse_move_process(ee, ee->mouse.x, ee->mouse.y,
+ ecore_x_current_time_get());
ee->expecting_resize.w = 0;
ee->expecting_resize.h = 0;
}
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
