enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

update to new extended event stuff 

SVN revision: 12460
This commit is contained in:
Carsten Haitzler 2004-12-14 03:32:25 +00:00
parent 432ea44fd5
commit da12976d32
3 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/bin/e_border.c
View File

@ -982,8 +982,8 @@ _e_border_cb_mouse_in(void *data, int type, void *event)
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 @@ _e_border_cb_mouse_out(void *data, int type, void *event)
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 @@ _e_border_cb_mouse_down(void *data, int type, void *event)
}
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 @@ _e_border_cb_mouse_up(void *data, int type, void *event)
}
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 @@ _e_border_cb_mouse_move(void *data, int type, void *event)
}
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 @@ _e_border_cb_mouse_wheel(void *data, int type, void *event)
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;
}

7
src/bin/e_menu.c
View File

@ -936,8 +936,8 @@ _e_menu_realize(E_Menu *m)
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 @@ _e_menu_cb_mouse_move(void *data, int type, void *event)
}
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)

2
src/bin/e_utils.c
View File

@ -55,7 +55,7 @@ _e_util_container_fake_mouse_up_cb(void *data)
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);
}