Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_evas
Modified Files:
ecore_evas_fb.c ecore_evas_x.c
Log Message:
use evas's new extended info
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_evas/ecore_evas_fb.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ecore_evas_fb.c 18 Mar 2004 14:29:59 -0000 1.8
+++ ecore_evas_fb.c 14 Dec 2004 03:21:42 -0000 1.9
@@ -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);
+ evas_event_feed_mouse_move(ee->evas, x, y, NULL);
else if (ee->rotation == 90)
- evas_event_feed_mouse_move(ee->evas, (fbh - ee->h) + ee->h - y - 1, x);
+ evas_event_feed_mouse_move(ee->evas, (fbh - ee->h) + ee->h - y - 1, x,
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);
+ evas_event_feed_mouse_move(ee->evas, (fbw - ee->w) + ee->w - x - 1, (fbh
- ee->h) + ee->h - y - 1, NULL);
else if (ee->rotation == 270)
- evas_event_feed_mouse_move(ee->evas, y, (fbw - ee->w) + ee->w - x - 1);
+ evas_event_feed_mouse_move(ee->evas, y, (fbw - ee->w) + ee->w - x - 1,
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);
+ evas_event_feed_key_down(ee->evas, e->keyname, e->keysymbol,
e->key_compose, NULL, 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);
+ evas_event_feed_key_up(ee->evas, e->keyname, e->keysymbol, e->key_compose,
NULL, NULL);
return 0; /* dont pass it on */
}
@@ -129,12 +129,15 @@
{
Ecore_Evas *ee;
Ecore_Fb_Event_Mouse_Button_Down *e;
+ Evas_Button_Flags flags = EVAS_BUTTON_NONE;
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_down(ee->evas, e->button);
+ 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);
return 0; /* dont pass it on */
}
@@ -148,7 +151,7 @@
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_event_feed_mouse_up(ee->evas, e->button, EVAS_BUTTON_NONE, NULL);
return 0; /* dont pass it on */
}
@@ -514,7 +517,7 @@
evas_key_lock_add(ee->evas, "Num_Lock");
evas_key_lock_add(ee->evas, "Scroll_Lock");
- evas_event_feed_mouse_in(ee->evas);
+ evas_event_feed_mouse_in(ee->evas, 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.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- ecore_evas_x.c 23 Nov 2004 15:17:54 -0000 1.29
+++ ecore_evas_x.c 14 Dec 2004 03:21:42 -0000 1.30
@@ -42,13 +42,13 @@
ee->w - x - 1 - ee->prop.cursor.hot.y);
}
if (ee->rotation == 0)
- evas_event_feed_mouse_move(ee->evas, x, y);
+ evas_event_feed_mouse_move(ee->evas, x, y, NULL);
else if (ee->rotation == 90)
- evas_event_feed_mouse_move(ee->evas, ee->h - y - 1, x);
+ evas_event_feed_mouse_move(ee->evas, ee->h - y - 1, x, NULL);
else if (ee->rotation == 180)
- evas_event_feed_mouse_move(ee->evas, ee->w - x - 1, ee->h - y - 1);
+ evas_event_feed_mouse_move(ee->evas, ee->w - x - 1, ee->h - y - 1, NULL);
else if (ee->rotation == 270)
- evas_event_feed_mouse_move(ee->evas, y, ee->w - x - 1);
+ evas_event_feed_mouse_move(ee->evas, y, ee->w - x - 1, NULL);
}
static Ecore_Evas *
@@ -120,7 +120,7 @@
ee = _ecore_evas_x_match(e->win);
if (!ee) return 1; /* pass on event */
_ecore_evas_modifier_locks_update(ee, e->modifiers);
- evas_event_feed_key_down(ee->evas, e->keyname);
+ evas_event_feed_key_down(ee->evas, e->keyname, e->keysymbol,
e->key_compose, NULL, NULL);
return 0; /* dont pass it on */
}
@@ -134,7 +134,7 @@
ee = _ecore_evas_x_match(e->win);
if (!ee) return 1; /* pass on event */
_ecore_evas_modifier_locks_update(ee, e->modifiers);
- evas_event_feed_key_up(ee->evas, e->keyname);
+ evas_event_feed_key_up(ee->evas, e->keyname, e->keysymbol, e->key_compose,
NULL, NULL);
return 0; /* dont pass it on */
}
@@ -143,13 +143,16 @@
{
Ecore_Evas *ee;
Ecore_X_Event_Mouse_Button_Down *e;
+ Evas_Button_Flags flags = EVAS_BUTTON_NONE;
e = event;
ee = _ecore_evas_x_match(e->win);
if (!ee) return 1; /* pass on event */
_ecore_evas_modifier_locks_update(ee, e->modifiers);
_ecore_evas_mouse_move_process(ee, e->x, e->y);
- evas_event_feed_mouse_down(ee->evas, e->button);
+ 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);
return 0; /* dont pass it on */
}
@@ -164,7 +167,7 @@
if (!ee) return 1; /* pass on event */
_ecore_evas_modifier_locks_update(ee, e->modifiers);
_ecore_evas_mouse_move_process(ee, e->x, e->y);
- evas_event_feed_mouse_up(ee->evas, e->button);
+ evas_event_feed_mouse_up(ee->evas, e->button, EVAS_BUTTON_NONE, NULL);
return 0; /* dont pass it on */
}
@@ -182,7 +185,7 @@
_ecore_evas_modifier_locks_update(ee, e->modifiers);
_ecore_evas_mouse_move_process(ee, e->x, e->y);
- evas_event_feed_mouse_wheel(ee->evas, e->direction, e->z);
+ evas_event_feed_mouse_wheel(ee->evas, e->direction, e->z, NULL);
return 0; /* don't pass it on */
}
@@ -214,7 +217,7 @@
/* if (e->mode != ECORE_X_EVENT_MODE_NORMAL) return 0; */
if (ee->func.fn_mouse_in) ee->func.fn_mouse_in(ee);
_ecore_evas_modifier_locks_update(ee, e->modifiers);
- evas_event_feed_mouse_in(ee->evas);
+ evas_event_feed_mouse_in(ee->evas, NULL);
_ecore_evas_mouse_move_process(ee, e->x, e->y);
return 0; /* dont pass it on */
}
@@ -232,7 +235,7 @@
/* if (e->mode != ECORE_X_EVENT_MODE_NORMAL) return 0; */
_ecore_evas_modifier_locks_update(ee, e->modifiers);
_ecore_evas_mouse_move_process(ee, e->x, e->y);
- evas_event_feed_mouse_out(ee->evas);
+ evas_event_feed_mouse_out(ee->evas, 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 0; /* dont pass it on */
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://productguide.itmanagersjournal.com/
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
