Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/canvas
Modified Files:
evas_clip.c evas_events.c evas_layer.c evas_object_line.c
evas_object_main.c evas_object_polygon.c evas_object_text.c
evas_stack.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/evas/src/lib/canvas/evas_clip.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- evas_clip.c 22 Jul 2005 10:28:10 -0000 1.16
+++ evas_clip.c 25 Jul 2005 09:55:47 -0000 1.17
@@ -202,6 +202,7 @@
evas_event_feed_mouse_move(obj->layer->evas,
obj->layer->evas->pointer.x,
obj->layer->evas->pointer.y,
+ obj->layer->evas->last_timestamp,
NULL);
}
}
@@ -289,6 +290,7 @@
evas_event_feed_mouse_move(obj->layer->evas,
obj->layer->evas->pointer.x,
obj->layer->evas->pointer.y,
+ obj->layer->evas->last_timestamp,
NULL);
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_events.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- evas_events.c 22 Jul 2005 10:28:10 -0000 1.35
+++ evas_events.c 25 Jul 2005 09:55:47 -0000 1.36
@@ -183,7 +183,7 @@
*
*/
void
-evas_event_feed_mouse_down(Evas *e, int b, Evas_Button_Flags flags, const void
*data)
+evas_event_feed_mouse_down(Evas *e, int b, Evas_Button_Flags flags, unsigned
int timestamp, const void *data)
{
Evas_List *l, *copy;
@@ -196,6 +196,7 @@
e->pointer.button |= (1 << (b - 1));
if (e->events_frozen > 0) return;
+ e->last_timestamp = timestamp;
copy = evas_event_list_copy(e->pointer.object.in);
for (l = copy; l; l = l->next)
@@ -216,6 +217,7 @@
ev.modifiers = &(e->modifiers);
ev.locks = &(e->locks);
ev.flags = flags;
+ ev.timestamp = timestamp;
if (!e->events_frozen)
evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_DOWN, &ev);
}
@@ -229,7 +231,7 @@
*
*/
void
-evas_event_feed_mouse_up(Evas *e, int b, Evas_Button_Flags flags, const void
*data)
+evas_event_feed_mouse_up(Evas *e, int b, Evas_Button_Flags flags, unsigned int
timestamp, const void *data)
{
Evas_List *l, *copy;
@@ -242,6 +244,7 @@
e->pointer.button &= ~(1 << (b - 1));
if (e->events_frozen > 0) return;
+ e->last_timestamp = timestamp;
copy = evas_event_list_copy(e->pointer.object.in);
for (l = copy; l; l = l->next)
@@ -261,6 +264,7 @@
ev.modifiers = &(e->modifiers);
ev.locks = &(e->locks);
ev.flags = flags;
+ ev.timestamp = timestamp;
if (!e->events_frozen)
evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_UP, &ev);
}
@@ -293,6 +297,7 @@
ev.data = (void *)data;
ev.modifiers = &(e->modifiers);
ev.locks = &(e->locks);
+ ev.timestamp = timestamp;
if (!e->events_frozen)
evas_object_event_callback_call(obj,
EVAS_CALLBACK_MOUSE_OUT, &ev);
}
@@ -319,6 +324,7 @@
ev.data = (void *)data;
ev.modifiers = &(e->modifiers);
ev.locks = &(e->locks);
+ ev.timestamp = timestamp;
if (!e->events_frozen)
evas_object_event_callback_call(obj,
EVAS_CALLBACK_MOUSE_IN, &ev);
}
@@ -333,7 +339,7 @@
/* and set up the new one */
e->pointer.object.in = ins;
if (e->pointer.inside)
- evas_event_feed_mouse_move(e, e->pointer.x, e->pointer.y, data);
+ evas_event_feed_mouse_move(e, e->pointer.x, e->pointer.y, timestamp,
data);
}
}
@@ -344,7 +350,7 @@
*
*/
void
-evas_event_feed_mouse_wheel(Evas *e, int direction, int z, const void *data)
+evas_event_feed_mouse_wheel(Evas *e, int direction, int z, unsigned int
timestamp, const void *data)
{
Evas_List *l, *copy;
@@ -353,6 +359,7 @@
MAGIC_CHECK_END();
if (e->events_frozen > 0) return;
+ e->last_timestamp = timestamp;
copy = evas_event_list_copy(e->pointer.object.in);
@@ -370,6 +377,7 @@
ev.data = (void *) data;
ev.modifiers = &(e->modifiers);
ev.locks = &(e->locks);
+ ev.timestamp = timestamp;
if (!e->events_frozen)
evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_WHEEL, &ev);
}
@@ -385,7 +393,7 @@
*
*/
void
-evas_event_feed_mouse_move(Evas *e, int x, int y, const void *data)
+evas_event_feed_mouse_move(Evas *e, int x, int y, unsigned int timestamp,
const void *data)
{
int px, py;
Evas_Coord pcx, pcy;
@@ -400,6 +408,7 @@
pcy = e->pointer.canvas_y;
if (e->events_frozen > 0) return;
+ e->last_timestamp = timestamp;
e->pointer.x = x;
e->pointer.y = y;
@@ -441,6 +450,7 @@
ev.data = (void *)data;
ev.modifiers = &(e->modifiers);
ev.locks = &(e->locks);
+ ev.timestamp = timestamp;
if (!e->events_frozen)
evas_object_event_callback_call(obj,
EVAS_CALLBACK_MOUSE_MOVE, &ev);
}
@@ -470,6 +480,7 @@
ev.data = (void *)data;
ev.modifiers = &(e->modifiers);
ev.locks = &(e->locks);
+ ev.timestamp = timestamp;
if (!e->events_frozen)
evas_object_event_callback_call(obj,
EVAS_CALLBACK_MOUSE_OUT, &ev);
}
@@ -518,6 +529,7 @@
ev.data = (void *)data;
ev.modifiers = &(e->modifiers);
ev.locks = &(e->locks);
+ ev.timestamp = timestamp;
if (!e->events_frozen)
evas_object_event_callback_call(obj,
EVAS_CALLBACK_MOUSE_MOVE, &ev);
}
@@ -536,6 +548,7 @@
ev.data = (void *)data;
ev.modifiers = &(e->modifiers);
ev.locks = &(e->locks);
+ ev.timestamp = timestamp;
if (!e->events_frozen)
evas_object_event_callback_call(obj,
EVAS_CALLBACK_MOUSE_OUT, &ev);
}
@@ -561,6 +574,7 @@
ev.data = (void *)data;
ev.modifiers = &(e->modifiers);
ev.locks = &(e->locks);
+ ev.timestamp = timestamp;
if (!e->events_frozen)
evas_object_event_callback_call(obj,
EVAS_CALLBACK_MOUSE_IN, &ev);
}
@@ -579,7 +593,7 @@
*
*/
void
-evas_event_feed_mouse_in(Evas *e, const void *data)
+evas_event_feed_mouse_in(Evas *e, unsigned int timestamp, const void *data)
{
Evas_List *ins;
Evas_List *l;
@@ -590,6 +604,7 @@
e->pointer.inside = 1;
if (e->events_frozen > 0) return;
+ e->last_timestamp = timestamp;
if (e->pointer.mouse_grabbed != 0) return;
@@ -614,6 +629,7 @@
ev.data = (void *)data;
ev.modifiers = &(e->modifiers);
ev.locks = &(e->locks);
+ ev.timestamp = timestamp;
if (!e->events_frozen)
evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_IN,
&ev);
}
@@ -622,7 +638,7 @@
e->pointer.object.in = evas_list_free(e->pointer.object.in);
/* and set up the new one */
e->pointer.object.in = ins;
- evas_event_feed_mouse_move(e, e->pointer.x, e->pointer.y, data);
+ evas_event_feed_mouse_move(e, e->pointer.x, e->pointer.y, timestamp, data);
}
/**
@@ -632,7 +648,7 @@
*
*/
void
-evas_event_feed_mouse_out(Evas *e, const void *data)
+evas_event_feed_mouse_out(Evas *e, unsigned int timestamp, const void *data)
{
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return;
@@ -640,6 +656,7 @@
e->pointer.inside = 0;
if (e->events_frozen > 0) return;
+ e->last_timestamp = timestamp;
/* if our mouse button is grabbed to any objects */
if (e->pointer.mouse_grabbed == 0)
@@ -665,6 +682,7 @@
ev.data = (void *)data;
ev.modifiers = &(e->modifiers);
ev.locks = &(e->locks);
+ ev.timestamp = timestamp;
if (!e->events_frozen)
evas_object_event_callback_call(obj,
EVAS_CALLBACK_MOUSE_OUT, &ev);
}
@@ -682,13 +700,14 @@
*
*/
void
-evas_event_feed_key_down(Evas *e, const char *keyname, const char *key, const
char *string, const char *compose, const void *data)
+evas_event_feed_key_down(Evas *e, const char *keyname, const char *key, const
char *string, const char *compose, unsigned int timestamp, const void *data)
{
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return;
MAGIC_CHECK_END();
if (!keyname) return;
if (e->events_frozen > 0) return;
+ e->last_timestamp = timestamp;
{
Evas_Event_Key_Down ev;
int exclusive;
@@ -701,6 +720,7 @@
ev.key = key;
ev.string = string;
ev.compose = compose;
+ ev.timestamp = timestamp;
if (e->grabs)
{
Evas_List *l;
@@ -763,13 +783,14 @@
*
*/
void
-evas_event_feed_key_up(Evas *e, const char *keyname, const char *key, const
char *string, const char *compose, const void *data)
+evas_event_feed_key_up(Evas *e, const char *keyname, const char *key, const
char *string, const char *compose, unsigned int timestamp, const void *data)
{
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return;
MAGIC_CHECK_END();
if (!keyname) return;
if (e->events_frozen > 0) return;
+ e->last_timestamp = timestamp;
{
Evas_Event_Key_Up ev;
int exclusive;
@@ -782,6 +803,7 @@
ev.key = key;
ev.string = string;
ev.compose = compose;
+ ev.timestamp = timestamp;
if (e->grabs)
{
Evas_List *l;
@@ -857,6 +879,7 @@
evas_event_feed_mouse_move(obj->layer->evas,
obj->layer->evas->pointer.x,
obj->layer->evas->pointer.y,
+ obj->layer->evas->last_timestamp,
NULL);
}
@@ -894,6 +917,7 @@
evas_event_feed_mouse_move(obj->layer->evas,
obj->layer->evas->pointer.x,
obj->layer->evas->pointer.y,
+ obj->layer->evas->last_timestamp,
NULL);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_layer.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- evas_layer.c 18 Jun 2005 01:00:29 -0000 1.11
+++ evas_layer.c 25 Jul 2005 09:55:47 -0000 1.12
@@ -168,7 +168,11 @@
obj->layer->evas->pointer.y, 1, 1) &&
obj->cur.visible)
if (evas_list_find(obj->layer->evas->pointer.object.in, obj))
- evas_event_feed_mouse_move(obj->layer->evas,
obj->layer->evas->pointer.x, obj->layer->evas->pointer.y, NULL);
+ evas_event_feed_mouse_move(obj->layer->evas,
+ obj->layer->evas->pointer.x,
+ obj->layer->evas->pointer.y,
+ obj->layer->evas->last_timestamp,
+ NULL);
}
evas_object_inform_call_restack(obj);
}
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_line.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- evas_object_line.c 22 Jul 2005 10:28:10 -0000 1.14
+++ evas_object_line.c 25 Jul 2005 09:55:47 -0000 1.15
@@ -161,6 +161,7 @@
evas_event_feed_mouse_move(obj->layer->evas,
obj->layer->evas->pointer.x,
obj->layer->evas->pointer.y,
+ obj->layer->evas->last_timestamp,
NULL);
}
}
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_main.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- evas_object_main.c 22 Jul 2005 10:28:10 -0000 1.30
+++ evas_object_main.c 25 Jul 2005 09:55:47 -0000 1.31
@@ -494,6 +494,7 @@
evas_event_feed_mouse_move(obj->layer->evas,
obj->layer->evas->pointer.x,
obj->layer->evas->pointer.y,
+ obj->layer->evas->last_timestamp,
NULL);
}
}
@@ -558,6 +559,7 @@
evas_event_feed_mouse_move(obj->layer->evas,
obj->layer->evas->pointer.x,
obj->layer->evas->pointer.y,
+ obj->layer->evas->last_timestamp,
NULL);
}
}
@@ -645,6 +647,7 @@
evas_event_feed_mouse_move(obj->layer->evas,
obj->layer->evas->pointer.x,
obj->layer->evas->pointer.y,
+ obj->layer->evas->last_timestamp,
NULL);
}
}
@@ -691,6 +694,7 @@
evas_event_feed_mouse_move(obj->layer->evas,
obj->layer->evas->pointer.x,
obj->layer->evas->pointer.y,
+ obj->layer->evas->last_timestamp,
NULL);
if (obj->mouse_grabbed > 0)
{
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_polygon.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- evas_object_polygon.c 22 Jul 2005 10:28:10 -0000 1.14
+++ evas_object_polygon.c 25 Jul 2005 09:55:47 -0000 1.15
@@ -156,6 +156,7 @@
evas_event_feed_mouse_move(obj->layer->evas,
obj->layer->evas->pointer.x,
obj->layer->evas->pointer.y,
+ obj->layer->evas->last_timestamp,
NULL);
}
}
@@ -202,6 +203,7 @@
evas_event_feed_mouse_move(obj->layer->evas,
obj->layer->evas->pointer.x,
obj->layer->evas->pointer.y,
+ obj->layer->evas->last_timestamp,
NULL);
evas_object_inform_call_move(obj);
evas_object_inform_call_resize(obj);
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_text.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- evas_object_text.c 22 Jul 2005 10:28:10 -0000 1.40
+++ evas_object_text.c 25 Jul 2005 09:55:47 -0000 1.41
@@ -233,6 +233,7 @@
evas_event_feed_mouse_move(obj->layer->evas,
obj->layer->evas->pointer.x,
obj->layer->evas->pointer.y,
+ obj->layer->evas->last_timestamp,
NULL);
}
}
@@ -321,6 +322,7 @@
evas_event_feed_mouse_move(obj->layer->evas,
obj->layer->evas->pointer.x,
obj->layer->evas->pointer.y,
+ obj->layer->evas->last_timestamp,
NULL);
evas_object_inform_call_resize(obj);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_stack.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- evas_stack.c 22 Jul 2005 10:28:10 -0000 1.14
+++ evas_stack.c 25 Jul 2005 09:55:47 -0000 1.15
@@ -82,7 +82,11 @@
obj->layer->evas->pointer.x,
obj->layer->evas->pointer.y, 1, 1) &&
obj->cur.visible)
- evas_event_feed_mouse_move(obj->layer->evas,
obj->layer->evas->pointer.x, obj->layer->evas->pointer.y, NULL);
+ evas_event_feed_mouse_move(obj->layer->evas,
+ obj->layer->evas->pointer.x,
+ obj->layer->evas->pointer.y,
+ obj->layer->evas->last_timestamp,
+ NULL);
}
}
}
@@ -131,7 +135,11 @@
obj->layer->evas->pointer.x,
obj->layer->evas->pointer.y, 1, 1) &&
obj->cur.visible)
- evas_event_feed_mouse_move(obj->layer->evas,
obj->layer->evas->pointer.x, obj->layer->evas->pointer.y, NULL);
+ evas_event_feed_mouse_move(obj->layer->evas,
+ obj->layer->evas->pointer.x,
+ obj->layer->evas->pointer.y,
+ obj->layer->evas->last_timestamp,
+ NULL);
}
}
}
@@ -188,7 +196,11 @@
obj->layer->evas->pointer.x,
obj->layer->evas->pointer.y, 1, 1) &&
obj->cur.visible)
- evas_event_feed_mouse_move(obj->layer->evas,
obj->layer->evas->pointer.x, obj->layer->evas->pointer.y, NULL);
+ evas_event_feed_mouse_move(obj->layer->evas,
+ obj->layer->evas->pointer.x,
+ obj->layer->evas->pointer.y,
+ obj->layer->evas->last_timestamp,
+ NULL);
}
}
}
@@ -245,7 +257,11 @@
obj->layer->evas->pointer.x,
obj->layer->evas->pointer.y, 1, 1) &&
obj->cur.visible)
- evas_event_feed_mouse_move(obj->layer->evas,
obj->layer->evas->pointer.x, obj->layer->evas->pointer.y, NULL);
+ evas_event_feed_mouse_move(obj->layer->evas,
+ obj->layer->evas->pointer.x,
+ obj->layer->evas->pointer.y,
+ obj->layer->evas->last_timestamp,
+ NULL);
}
}
}
-------------------------------------------------------
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
