Enlightenment CVS committal Author : moom Project : e_modules Module : mixer
Dir : e_modules/mixer Modified Files: e_mod_main.c Log Message: * Correctly feed mouse move and mouse wheel events =================================================================== RCS file: /cvs/e/e_modules/mixer/e_mod_main.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -3 -r1.21 -r1.22 --- e_mod_main.c 11 Sep 2006 16:31:16 -0000 1.21 +++ e_mod_main.c 11 Sep 2006 16:42:46 -0000 1.22 @@ -459,6 +459,7 @@ ecore_x_window_geometry_get(root, &root_x, &root_y, &root_w, &root_h); win->input_window = ecore_x_window_input_new(root, root_x, root_y, root_w, root_h); ecore_x_window_show(win->input_window); + /* TODO: Fixme... */ //ecore_x_pointer_confine_grab(win->input_window); ecore_x_keyboard_grab(win->input_window); @@ -540,6 +541,7 @@ if (win->input_window != 0) { + /* TODO: Fixme... */ //ecore_x_pointer_ungrab(); ecore_x_keyboard_ungrab(); ecore_x_window_del(win->input_window); @@ -672,10 +674,7 @@ Mixer_Win_Simple *win; Ecore_X_Event_Mouse_Move *xev = event; - if (!(win = data) || !E_INSIDE(xev->x, xev->y, - win->window->x, win->window->y, - win->window->w, win->window->h)) - return 1; + if (!(win = data)) return 1; evas_event_feed_mouse_move(e_win_evas_get(win->window), xev->x - win->window->x, xev->y - win->window->y, @@ -732,5 +731,17 @@ static int _mixer_window_simple_mouse_wheel_cb(void *data, int type, void *event) { + Mixer_Win_Simple *win; + Ecore_X_Event_Mouse_Wheel *xev = event; + + if (!(win = data) || !E_INSIDE(xev->x, xev->y, + win->window->x, win->window->y, + win->window->w, win->window->h)) + return 1; + + evas_event_feed_mouse_wheel(e_win_evas_get(win->window), + xev->direction, xev->z, + xev->time, NULL); + return 1; } ------------------------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs