diff options
author | Chris Michael <cp.michael@samsung.com> | 2013-11-18 12:58:54 +0000 |
---|---|---|
committer | Chris Michael <cp.michael@samsung.com> | 2013-11-18 12:58:54 +0000 |
commit | d96339e9bb8884cba8b1eea6e113afcc859be7d6 (patch) | |
tree | 06ebc268ded7fb752b63fff29f0057f38c84684e | |
parent | 1f8789644b89b284931e1b029f8d2e3266277e78 (diff) |
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 <cp.michael@samsung.com>
-rw-r--r-- | src/lib/ecore_wayland/ecore_wl_input.c | 9 |
1 files 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 | |||
980 | input->display->serial = serial; | 980 | input->display->serial = serial; |
981 | input->sx = wl_fixed_to_int(x); | 981 | input->sx = wl_fixed_to_int(x); |
982 | input->sy = wl_fixed_to_int(y); | 982 | input->sy = wl_fixed_to_int(y); |
983 | _ecore_wl_input_mouse_move_send(input, input->pointer_focus, timestamp, id); | 983 | /* _ecore_wl_input_mouse_move_send(input, input->pointer_focus, timestamp, id); */ |
984 | _ecore_wl_input_cb_pointer_enter(data, NULL, serial, surface, x, y); | 984 | /* _ecore_wl_input_cb_pointer_enter(data, NULL, serial, surface, x, y); */ |
985 | _ecore_wl_input_mouse_down_send(input, input->pointer_focus, | 985 | _ecore_wl_input_mouse_down_send(input, input->pointer_focus, |
986 | id, BTN_LEFT, timestamp); | 986 | id, 0, timestamp); |
987 | } | 987 | } |
988 | 988 | ||
989 | static void | 989 | static void |
@@ -1000,7 +1000,7 @@ _ecore_wl_input_cb_touch_up(void *data, struct wl_touch *touch EINA_UNUSED, unsi | |||
1000 | /* input->timestamp = timestamp; */ | 1000 | /* input->timestamp = timestamp; */ |
1001 | input->display->serial = serial; | 1001 | input->display->serial = serial; |
1002 | _ecore_wl_input_mouse_up_send(input, input->pointer_focus, | 1002 | _ecore_wl_input_mouse_up_send(input, input->pointer_focus, |
1003 | id, BTN_LEFT, timestamp); | 1003 | id, 0, timestamp); |
1004 | } | 1004 | } |
1005 | 1005 | ||
1006 | static void | 1006 | static void |
@@ -1017,7 +1017,6 @@ _ecore_wl_input_cb_touch_motion(void *data, struct wl_touch *touch EINA_UNUSED, | |||
1017 | /* input->timestamp = timestamp; */ | 1017 | /* input->timestamp = timestamp; */ |
1018 | input->sx = wl_fixed_to_int(x); | 1018 | input->sx = wl_fixed_to_int(x); |
1019 | input->sy = wl_fixed_to_int(y); | 1019 | input->sy = wl_fixed_to_int(y); |
1020 | |||
1021 | _ecore_wl_input_mouse_move_send(input, input->pointer_focus, timestamp, id); | 1020 | _ecore_wl_input_mouse_move_send(input, input->pointer_focus, timestamp, id); |
1022 | } | 1021 | } |
1023 | 1022 | ||