Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c e_menu.c e_utils.c
Log Message:
update to new extended event stuff
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- e_border.c 11 Dec 2004 04:02:26 -0000 1.16
+++ e_border.c 14 Dec 2004 03:32:25 -0000 1.17
@@ -982,8 +982,8 @@
if (ev->win != bd->event_win) return 1;
bd->mouse.current.mx = ev->root.x;
bd->mouse.current.my = ev->root.y;
- evas_event_feed_mouse_move(bd->bg_evas, ev->x, ev->y);
- evas_event_feed_mouse_in(bd->bg_evas);
+ evas_event_feed_mouse_move(bd->bg_evas, ev->x, ev->y, NULL);
+ evas_event_feed_mouse_in(bd->bg_evas, NULL);
return 1;
}
@@ -1033,8 +1033,8 @@
if (ev->win != bd->event_win) return 1;
bd->mouse.current.mx = ev->root.x;
bd->mouse.current.my = ev->root.y;
- evas_event_feed_mouse_move(bd->bg_evas, ev->x, ev->y);
- evas_event_feed_mouse_out(bd->bg_evas);
+ evas_event_feed_mouse_move(bd->bg_evas, ev->x, ev->y, NULL);
+ evas_event_feed_mouse_out(bd->bg_evas, NULL);
return 1;
}
@@ -1088,8 +1088,12 @@
}
else
{
- evas_event_feed_mouse_move(bd->bg_evas, ev->x, ev->y);
- evas_event_feed_mouse_down(bd->bg_evas, ev->button);
+ Evas_Button_Flags flags = EVAS_BUTTON_NONE;
+
+ if (ev->double_click) flags |= EVAS_BUTTON_DOUBLE_CLICK;
+ if (ev->triple_click) flags |= EVAS_BUTTON_TRIPLE_CLICK;
+ evas_event_feed_mouse_move(bd->bg_evas, ev->x, ev->y, NULL);
+ evas_event_feed_mouse_down(bd->bg_evas, ev->button, flags, NULL);
}
return 1;
}
@@ -1133,8 +1137,8 @@
}
bd->mouse.current.mx = ev->root.x;
bd->mouse.current.my = ev->root.y;
- evas_event_feed_mouse_move(bd->bg_evas, ev->x, ev->y);
- evas_event_feed_mouse_up(bd->bg_evas, ev->button);
+ evas_event_feed_mouse_move(bd->bg_evas, ev->x, ev->y, NULL);
+ evas_event_feed_mouse_up(bd->bg_evas, ev->button, EVAS_BUTTON_NONE, NULL);
return 1;
}
@@ -1189,7 +1193,7 @@
}
else
{
- evas_event_feed_mouse_move(bd->bg_evas, ev->x, ev->y);
+ evas_event_feed_mouse_move(bd->bg_evas, ev->x, ev->y, NULL);
}
return 1;
}
@@ -1205,8 +1209,8 @@
if (ev->win != bd->event_win) return 1;
bd->mouse.current.mx = ev->root.x;
bd->mouse.current.my = ev->root.y;
- evas_event_feed_mouse_move(bd->bg_evas, ev->x, ev->y);
- evas_event_feed_mouse_wheel(bd->bg_evas, ev->direction, ev->z);
+ evas_event_feed_mouse_move(bd->bg_evas, ev->x, ev->y, NULL);
+ evas_event_feed_mouse_wheel(bd->bg_evas, ev->direction, ev->z, NULL);
return 1;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_menu.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_menu.c 5 Dec 2004 07:43:51 -0000 1.2
+++ e_menu.c 14 Dec 2004 03:32:25 -0000 1.3
@@ -936,8 +936,8 @@
ecore_evas_callback_resize_set(m->ecore_evas, _e_menu_cb_ecore_evas_resize);
m->evas = ecore_evas_get(m->ecore_evas);
/* move cursor out to avoid event cycles during setup */
- evas_event_feed_mouse_in(m->evas);
- evas_event_feed_mouse_move(m->evas, -1000000, -1000000);
+ evas_event_feed_mouse_in(m->evas, NULL);
+ evas_event_feed_mouse_move(m->evas, -1000000, -1000000, NULL);
m->evas_win = ecore_evas_software_x11_window_get(m->ecore_evas);
ecore_evas_name_class_set(m->ecore_evas, "E", "_e_menu_window");
ecore_evas_title_set(m->ecore_evas, "E Menu");
@@ -1974,7 +1974,8 @@
}
evas_event_feed_mouse_move(m->evas,
ev->x - m->cur.x,
- ev->y - m->cur.y);
+ ev->y - m->cur.y,
+ NULL);
}
}
while (tmp)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_utils.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_utils.c 25 Nov 2004 03:37:44 -0000 1.1
+++ e_utils.c 14 Dec 2004 03:32:25 -0000 1.2
@@ -55,7 +55,7 @@
info = data;
if (info)
{
- evas_event_feed_mouse_up(info->con->bg_evas, info->button);
+ evas_event_feed_mouse_up(info->con->bg_evas, info->button,
EVAS_BUTTON_NONE, NULL);
e_object_unref(E_OBJECT(info->con));
free(info);
}
-------------------------------------------------------
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
