Revert "e_comp_wl: Skip touch move events that be generated before touch down events"

This reverts commit e0bef963d704f1e2e131e46981cd33b7ef417a0d.

Change-Id: If4b00ce8bb73a9f41c5d51f9ec5d7cd3936f6ca2
Signed-off-by: Gwanglim Lee <gl77.lee@samsung.com>

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index bf1a2b7..6e954e4 100644 (file)
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -1172,21 +1172,17 @@ _e_comp_wl_evas_cb_mouse_move(void *data, Evas *evas EINA_UNUSED, Evas_Object *o
         dev = ev->dev;
         dev_name = evas_device_description_get(dev);
 
+        _e_comp_wl_device_send_event_device(ec, dev, ev->timestamp);
+
         if (dev && (evas_device_class_get(dev) == EVAS_DEVICE_CLASS_TOUCH))
           {
-             if (!(e_comp_wl->touch.pressed & (1 << 0))) return;
-
-             _e_comp_wl_device_send_event_device(ec, dev, ev->timestamp);
              if (dev_name)
                _e_comp_wl_device_handle_axes(dev_name, evas_device_class_get(dev),
                                              ec, ev->radius_x, ev->radius_y, ev->pressure, ev->angle);
              _e_comp_wl_send_touch_move(ec, 0, ev->cur.canvas.x, ev->cur.canvas.y, ev->timestamp, EINA_TRUE);
           }
         else
-          {
-             _e_comp_wl_device_send_event_device(ec, dev, ev->timestamp);
-             _e_comp_wl_send_mouse_move(ec, ev->cur.canvas.x, ev->cur.canvas.y, ev->timestamp, EINA_TRUE);
-          }
+          _e_comp_wl_send_mouse_move(ec, ev->cur.canvas.x, ev->cur.canvas.y, ev->timestamp, EINA_TRUE);
 
         if (e_config->use_cursor_timer)
           {
@@ -1270,7 +1266,6 @@ _e_comp_wl_evas_cb_mouse_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *o
           _e_comp_wl_device_handle_axes(dev_name, evas_device_class_get(dev),
                                         ec, ev->radius_x, ev->radius_y, ev->pressure, ev->angle);
         _e_comp_wl_evas_handle_mouse_button_to_touch(ec, ev->timestamp, ev->canvas.x, ev->canvas.y, EINA_TRUE);
-        e_comp_wl->touch.pressed |= (1 << 0);
      }
    else
      e_comp_wl_evas_handle_mouse_button(ec, ev->timestamp, ev->button,
@@ -1324,7 +1319,6 @@ _e_comp_wl_evas_cb_mouse_up(void *data, Evas *evas, Evas_Object *obj EINA_UNUSED
           _e_comp_wl_device_handle_axes(dev_name, evas_device_class_get(dev),
                                         ec, ev->radius_x, ev->radius_y, ev->pressure, ev->angle);
         _e_comp_wl_evas_handle_mouse_button_to_touch(ec, ev->timestamp, ev->canvas.x, ev->canvas.y, EINA_FALSE);
-        e_comp_wl->touch.pressed &= ~(1 << 0);
      }
    else
      e_comp_wl_evas_handle_mouse_button(ec, ev->timestamp, ev->button,
@@ -1401,7 +1395,6 @@ _e_comp_wl_evas_cb_multi_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *o
      }
 
    _e_comp_wl_send_touch(ec, ev->device, ev->canvas.x, ev->canvas.y, ev->timestamp, EINA_TRUE);
-   e_comp_wl->touch.pressed |= (1 << ev->device);
 }
 
 static void
@@ -1429,7 +1422,6 @@ _e_comp_wl_evas_cb_multi_up(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj
      }
 
    _e_comp_wl_send_touch(ec, ev->device, 0, 0, ev->timestamp, EINA_FALSE);
-   e_comp_wl->touch.pressed &= ~(1 << ev->device);
 }
 
 static void
@@ -1448,8 +1440,6 @@ _e_comp_wl_evas_cb_multi_move(void *data, Evas *evas EINA_UNUSED, Evas_Object *o
    /* Do not deliver emulated single touch events to client */
    if (ev->device == 0) return;
 
-   if (!(e_comp_wl->touch.pressed & (1 << ev->device))) return;
-
    dev = ev->dev;
    if (dev && (dev_name = evas_device_description_get(dev)))
      {

diff --git a/src/bin/e_comp_wl.h b/src/bin/e_comp_wl.h
index bff4725..7a5bdf8 100644 (file)
--- a/src/bin/e_comp_wl.h
+++ b/src/bin/e_comp_wl.h
@@ -252,7 +252,6 @@ struct _E_Comp_Wl_Data
         Eina_List *resources;
         Eina_Bool enabled : 1;
         unsigned int num_devices;
-        unsigned int pressed;
      } touch;
 
    struct