devilhorns pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=6d3e8a85585d3cbc4084dfbfb3bba0cd30df6144

commit 6d3e8a85585d3cbc4084dfbfb3bba0cd30df6144
Author: Chris Michael <cp.mich...@samsung.com>
Date:   Wed Sep 23 11:51:30 2015 -0400

    ecore-wl2: Finish send ecore events for any wayland touch related events
    
    Signed-off-by: Chris Michael <cp.mich...@samsung.com>
---
 src/lib/ecore_wl2/ecore_wl2_input.c | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/lib/ecore_wl2/ecore_wl2_input.c 
b/src/lib/ecore_wl2/ecore_wl2_input.c
index b8d0f0d..b4b1130 100644
--- a/src/lib/ecore_wl2/ecore_wl2_input.c
+++ b/src/lib/ecore_wl2/ecore_wl2_input.c
@@ -650,7 +650,16 @@ _touch_cb_down(void *data, struct wl_touch *touch 
EINA_UNUSED, unsigned int seri
 
    input->focus.touch = window;
 
-   /* TODO: Finish sending ecore events */
+   _pointer_cb_enter(data, NULL, serial, surface, x, y);
+
+   if ((!input->grab.window) && (input->focus.touch))
+     {
+        _ecore_wl2_input_grab(input, input->focus.touch, BTN_LEFT);
+        input->grab.timestamp = timestamp;
+     }
+
+   _ecore_wl2_input_mouse_down_send(input, input->focus.touch, id,
+                                    BTN_LEFT, timestamp);
 }
 
 static void
@@ -662,7 +671,11 @@ _touch_cb_up(void *data, struct wl_touch *touch 
EINA_UNUSED, unsigned int serial
    if (!input) return;
    if (!input->focus.touch) return;
 
-   /* TODO: Send ecore mouse up event and do input ungrab */
+   _ecore_wl2_input_mouse_up_send(input, input->focus.touch, id,
+                                  BTN_LEFT, timestamp);
+
+   if ((input->grab.window) && (input->grab.button == BTN_LEFT))
+     _ecore_wl2_input_ungrab(input);
 }
 
 static void
@@ -674,7 +687,7 @@ _touch_cb_motion(void *data, struct wl_touch *touch 
EINA_UNUSED, unsigned int ti
    if (!input) return;
    if (!input->focus.touch) return;
 
-   /* TODO: Send ecore mouse move event */
+   _ecore_wl2_input_mouse_move_send(input, input->focus.touch, timestamp, id);
 }
 
 static void

-- 


Reply via email to