From d96339e9bb8884cba8b1eea6e113afcc859be7d6 Mon Sep 17 00:00:00 2001 From: Chris Michael Date: Mon, 18 Nov 2013 12:58:54 +0000 Subject: [PATCH] Don't send pointer_enter events on touch_down. Fix touch_down and touch_up to send proper button ID (ecore_x sends 0). Fixes Phab Ticket T468 Signed-off-by: Chris Michael --- src/lib/ecore_wayland/ecore_wl_input.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/lib/ecore_wayland/ecore_wl_input.c b/src/lib/ecore_wayland/ecore_wl_input.c index 1145554676..b4d3a33d33 100644 --- a/src/lib/ecore_wayland/ecore_wl_input.c +++ b/src/lib/ecore_wayland/ecore_wl_input.c @@ -980,10 +980,10 @@ _ecore_wl_input_cb_touch_down(void *data, struct wl_touch *touch EINA_UNUSED, un input->display->serial = serial; input->sx = wl_fixed_to_int(x); input->sy = wl_fixed_to_int(y); - _ecore_wl_input_mouse_move_send(input, input->pointer_focus, timestamp, id); - _ecore_wl_input_cb_pointer_enter(data, NULL, serial, surface, x, y); + /* _ecore_wl_input_mouse_move_send(input, input->pointer_focus, timestamp, id); */ + /* _ecore_wl_input_cb_pointer_enter(data, NULL, serial, surface, x, y); */ _ecore_wl_input_mouse_down_send(input, input->pointer_focus, - id, BTN_LEFT, timestamp); + id, 0, timestamp); } static void @@ -1000,7 +1000,7 @@ _ecore_wl_input_cb_touch_up(void *data, struct wl_touch *touch EINA_UNUSED, unsi /* input->timestamp = timestamp; */ input->display->serial = serial; _ecore_wl_input_mouse_up_send(input, input->pointer_focus, - id, BTN_LEFT, timestamp); + id, 0, timestamp); } static void @@ -1017,7 +1017,6 @@ _ecore_wl_input_cb_touch_motion(void *data, struct wl_touch *touch EINA_UNUSED, /* input->timestamp = timestamp; */ input->sx = wl_fixed_to_int(x); input->sy = wl_fixed_to_int(y); - _ecore_wl_input_mouse_move_send(input, input->pointer_focus, timestamp, id); }