Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/bin/tests/engine
Modified Files:
ewl_engine.c
Log Message:
- Consolidate the Ewl_Event_Key_* and Ewl_Event_Mouse_* structures down to
having common inherited base structs.
- This is an API break if you're using any of these structures.
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/engine/ewl_engine.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ewl_engine.c 12 Feb 2007 13:16:04 -0000 1.6
+++ ewl_engine.c 3 Mar 2007 01:58:19 -0000 1.7
@@ -115,13 +115,13 @@
pointer_win = ewl_widget_name_find(WIN_NAME);
- x = (int)((double)(event->x - CURRENT_X(w)) *
+ x = (int)((double)(event->base.x - CURRENT_X(w)) *
((double)CURRENT_W(pointer_win) /
(double)CURRENT_W(w)));
- y = (int)((double)(event->y - CURRENT_Y(w)) *
+ y = (int)((double)(event->base.y - CURRENT_Y(w)) *
((double)CURRENT_H(pointer_win) /
(double)CURRENT_H(w)));
ewl_embed_mouse_down_feed(EWL_EMBED(pointer_win), event->button,
- event->clicks, x, y, event->modifiers);
+ event->clicks, x, y, event->base.modifiers);
}
static void
@@ -133,13 +133,13 @@
pointer_win = ewl_widget_name_find(WIN_NAME);
- x = (int)((double)(event->x - CURRENT_X(w)) *
+ x = (int)((double)(event->base.x - CURRENT_X(w)) *
((double)CURRENT_W(pointer_win) /
(double)CURRENT_W(w)));
- y = (int)((double)(event->y - CURRENT_Y(w)) *
+ y = (int)((double)(event->base.y - CURRENT_Y(w)) *
((double)CURRENT_H(pointer_win) /
(double)CURRENT_H(w)));
ewl_embed_mouse_up_feed(EWL_EMBED(pointer_win), event->button, x, y,
- event->modifiers);
+ event->base.modifiers);
}
static void
@@ -147,7 +147,7 @@
{
int x, y;
Ewl_Widget *pointer_win;
- Ewl_Event_Mouse_Move *event = ev;
+ Ewl_Event_Mouse *event = ev;
pointer_win = ewl_widget_name_find(WIN_NAME);
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
