summaryrefslogtreecommitdiff
path: root/legacy/ecore
diff options
context:
space:
mode:
authorChristopher Michael <cpmichael1@comcast.net>2012-08-22 15:53:29 +0000
committerChristopher Michael <cpmichael1@comcast.net>2012-08-22 15:53:29 +0000
commit0ef94e328ed10c3af6679630920cd00b481589e2 (patch)
tree2c56b662fb709205d8db22ce024516042b52f311 /legacy/ecore
parentbacdd1ae11a450b034da15d72d5e41cf12f554d1 (diff)
Ecore_Wayland: small patch from Alex wu <zhiwen.wu@linux.intel.com> to
implement touch events in ecore_wayland. SVN revision: 75556
Diffstat (limited to 'legacy/ecore')
-rw-r--r--legacy/ecore/src/lib/ecore_wayland/ecore_wl_input.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/legacy/ecore/src/lib/ecore_wayland/ecore_wl_input.c b/legacy/ecore/src/lib/ecore_wayland/ecore_wl_input.c
index 4f7760b72b..0b6a6933cb 100644
--- a/legacy/ecore/src/lib/ecore_wayland/ecore_wl_input.c
+++ b/legacy/ecore/src/lib/ecore_wayland/ecore_wl_input.c
@@ -836,9 +836,10 @@ _ecore_wl_input_cb_touch_down(void *data, struct wl_touch *touch __UNUSED__, uns
836 * This needs to be tested with an actual touch device */ 836 * This needs to be tested with an actual touch device */
837 /* input->timestamp = timestamp; */ 837 /* input->timestamp = timestamp; */
838 input->display->serial = serial; 838 input->display->serial = serial;
839 input->button = 0; 839 input->button = BTN_LEFT;
840 input->sx = wl_fixed_to_int(x); 840 input->sx = wl_fixed_to_int(x);
841 input->sy = wl_fixed_to_int(y); 841 input->sy = wl_fixed_to_int(y);
842 _ecore_wl_input_cb_pointer_enter(data, NULL, serial, surface, x, y);
842 _ecore_wl_input_mouse_down_send(input, input->pointer_focus, timestamp); 843 _ecore_wl_input_mouse_down_send(input, input->pointer_focus, timestamp);
843} 844}
844 845
@@ -854,9 +855,10 @@ _ecore_wl_input_cb_touch_up(void *data, struct wl_touch *touch __UNUSED__, unsig
854 /* FIXME: NB: Not sure yet if input->timestamp should be set here. 855 /* FIXME: NB: Not sure yet if input->timestamp should be set here.
855 * This needs to be tested with an actual touch device */ 856 * This needs to be tested with an actual touch device */
856 /* input->timestamp = timestamp; */ 857 /* input->timestamp = timestamp; */
857 input->button = 0; 858 input->button = BTN_LEFT;
858 input->display->serial = serial; 859 input->display->serial = serial;
859 _ecore_wl_input_mouse_up_send(input, input->pointer_focus, timestamp); 860 _ecore_wl_input_mouse_up_send(input, input->pointer_focus, timestamp);
861 input->button = 0;
860} 862}
861 863
862static void 864static void