kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ecore/wayland: Store the multi position per device/finger. 

This will make every touch point have its position updated on
multi_move, and then it can be used to send a correct multi_up event.
This commit is contained in:
Rafael Antognolli 2013-05-07 18:09:02 -03:00
parent cf9d3c90f5
commit d4b7389f3a
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/lib/ecore_wayland/ecore_wl_input.c
View File

@ -43,6 +43,7 @@ typedef struct _Ecore_Wl_Mouse_Down_Info
int last_last_win;
int last_event_win;
int last_last_event_win;
int sx, sy;
unsigned int last_time;
unsigned int last_last_time;
Eina_Bool did_double : 1;
@ -1016,6 +1017,7 @@ static void
_ecore_wl_input_mouse_move_send(Ecore_Wl_Input *input, Ecore_Wl_Window *win, unsigned int timestamp, int device)
{
Ecore_Event_Mouse_Move *ev;
Ecore_Wl_Mouse_Down_Info *down_info;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
@ -1036,6 +1038,12 @@ _ecore_wl_input_mouse_move_send(Ecore_Wl_Input *input, Ecore_Wl_Window *win, uns
ev->multi.x = input->sx;
ev->multi.y = input->sy;
if ((down_info = _ecore_wl_mouse_down_info_get(device)))
{
down_info->sx = input->sx;
down_info->sy = input->sy;
}
if (win)
{
ev->window = win->id;
@ -1154,6 +1162,8 @@ _ecore_wl_input_mouse_down_send(Ecore_Wl_Input *input, Ecore_Wl_Window *win, int
* devices */
if ((down_info = _ecore_wl_mouse_down_info_get(device)))
{
down_info->sx = input->sx;
down_info->sy = input->sy;
if (down_info->did_triple)
{
down_info->last_win = 0;
@ -1260,6 +1270,13 @@ _ecore_wl_input_mouse_up_send(Ecore_Wl_Input *input, Ecore_Wl_Window *win, int d
ev->double_click = 1;
if (down_info->did_triple)
ev->triple_click = 1;
ev->multi.x = down_info->sx;
ev->multi.y = down_info->sy;
}
else
{
ev->multi.x = input->sx;
ev->multi.y = input->sy;
}
ev->multi.device = device;
@ -1268,8 +1285,6 @@ _ecore_wl_input_mouse_up_send(Ecore_Wl_Input *input, Ecore_Wl_Window *win, int d
ev->multi.radius_y = 1;
ev->multi.pressure = 1.0;
ev->multi.angle = 0.0;
ev->multi.x = input->sx;
ev->multi.y = input->sy;
if (win)
{