e_comp_wl: maintain extra touch axis information each index of touches

Change-Id: I91064f8d052b5ea5ccfa9875c267494e56971c61

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 7bbae185c59e675d8313dbec58f1c640b2608b27..3b693dd457f57a3d0ca9f5d495fe83a6107befba 100644 (file)
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -803,27 +803,29 @@ _e_comp_wl_device_send_axis(const char *dev_name, Evas_Device_Class dev_class, E
 }
 
 static void
-_e_comp_wl_device_handle_axes(const char *dev_name, Evas_Device_Class dev_class, E_Client *ec, double radius_x, double radius_y, double pressure, double angle)
+_e_comp_wl_device_handle_axes(const char *dev_name, Evas_Device_Class dev_class, E_Client *ec, unsigned int idx, double radius_x, double radius_y, double pressure, double angle)
 {
-   if (e_comp_wl->input_device_manager.multi.radius_x != radius_x)
+   if (idx >= E_COMP_WL_TOUCH_MAX) return;
+
+   if (e_comp_wl->input_device_manager.multi[idx].radius_x != radius_x)
      {
         _e_comp_wl_device_send_axis(dev_name, dev_class, ec, TIZEN_INPUT_DEVICE_AXIS_TYPE_RADIUS_X, radius_x);
-        e_comp_wl->input_device_manager.multi.radius_x = radius_x;
+        e_comp_wl->input_device_manager.multi[idx].radius_x = radius_x;
      }
-   if (e_comp_wl->input_device_manager.multi.radius_y != radius_y)
+   if (e_comp_wl->input_device_manager.multi[idx].radius_y != radius_y)
      {
         _e_comp_wl_device_send_axis(dev_name, dev_class, ec, TIZEN_INPUT_DEVICE_AXIS_TYPE_RADIUS_Y, radius_y);
-        e_comp_wl->input_device_manager.multi.radius_y = radius_y;
+        e_comp_wl->input_device_manager.multi[idx].radius_y = radius_y;
      }
-   if (e_comp_wl->input_device_manager.multi.pressure != pressure)
+   if (e_comp_wl->input_device_manager.multi[idx].pressure != pressure)
      {
         _e_comp_wl_device_send_axis(dev_name, dev_class, ec, TIZEN_INPUT_DEVICE_AXIS_TYPE_PRESSURE, pressure);
-        e_comp_wl->input_device_manager.multi.pressure = pressure;
+        e_comp_wl->input_device_manager.multi[idx].pressure = pressure;
      }
-   if (e_comp_wl->input_device_manager.multi.angle != angle)
+   if (e_comp_wl->input_device_manager.multi[idx].angle != angle)
      {
         _e_comp_wl_device_send_axis(dev_name, dev_class, ec, TIZEN_INPUT_DEVICE_AXIS_TYPE_ANGLE, angle);
-        e_comp_wl->input_device_manager.multi.angle = angle;
+        e_comp_wl->input_device_manager.multi[idx].angle = angle;
      }
 }
 
@@ -1103,7 +1105,7 @@ _e_comp_wl_evas_cb_mouse_move(void *data, Evas *evas EINA_UNUSED, Evas_Object *o
                   _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);
+                                                  ec, 0, 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);
                }
              e_pointer_touch_move(e_comp->pointer, ev->cur.output.x, ev->cur.output.y);
@@ -1180,7 +1182,7 @@ _e_comp_wl_evas_cb_mouse_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *o
      {
         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);
+                                        ec, 0, 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_pointer_touch_move(e_comp->pointer, ev->output.x, ev->output.y);
         e_comp_wl->touch.pressed |= (1 << 0);
@@ -1239,7 +1241,7 @@ _e_comp_wl_evas_cb_mouse_up(void *data, Evas *evas, Evas_Object *obj EINA_UNUSED
      {
         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);
+                                        ec, 0, 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);
      }
@@ -1325,7 +1327,7 @@ _e_comp_wl_evas_cb_multi_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *o
      {
         dev_class = evas_device_class_get(dev);
         _e_comp_wl_device_send_event_device(ec, dev, ev->timestamp);
-        _e_comp_wl_device_handle_axes(dev_name, dev_class, ec, ev->radius_x, ev->radius_y, ev->pressure, ev->angle);
+        _e_comp_wl_device_handle_axes(dev_name, dev_class, ec, ev->device, ev->radius_x, ev->radius_y, ev->pressure, ev->angle);
      }
 
    _e_comp_wl_send_touch(ec, ev->device, ev->canvas.x, ev->canvas.y, ev->timestamp, EINA_TRUE);
@@ -1357,7 +1359,7 @@ _e_comp_wl_evas_cb_multi_up(void *data, Evas *evas, Evas_Object *obj EINA_UNUSED
      {
         dev_class = evas_device_class_get(dev);
         _e_comp_wl_device_send_event_device(ec, dev, ev->timestamp);
-        _e_comp_wl_device_handle_axes(dev_name, dev_class, ec, ev->radius_x, ev->radius_y, ev->pressure, ev->angle);
+        _e_comp_wl_device_handle_axes(dev_name, dev_class, ec, ev->device, ev->radius_x, ev->radius_y, ev->pressure, ev->angle);
      }
 
    _e_comp_wl_send_touch(ec, ev->device, 0, 0, ev->timestamp, EINA_FALSE);
@@ -1387,7 +1389,7 @@ _e_comp_wl_evas_cb_multi_move(void *data, Evas *evas EINA_UNUSED, Evas_Object *o
           {
              dev_class = evas_device_class_get(dev);
              _e_comp_wl_device_send_event_device(ec, dev, ev->timestamp);
-             _e_comp_wl_device_handle_axes(dev_name, dev_class, ec, ev->radius_x, ev->radius_y, ev->pressure, ev->angle);
+             _e_comp_wl_device_handle_axes(dev_name, dev_class, ec, ev->device, ev->radius_x, ev->radius_y, ev->pressure, ev->angle);
           }
      
         _e_comp_wl_send_touch_move(ec, ev->device, ev->cur.canvas.x, ev->cur.canvas.y, ev->timestamp);
@@ -5715,12 +5717,12 @@ e_comp_wl_touch_send(E_Client *ec, int idx, int x, int y, Eina_Bool pressed, Eco
    if (dev)
      {
         _e_comp_wl_send_event_device(wc, time, dev, serial);
-        _e_comp_wl_device_handle_axes(ecore_device_identifier_get(dev), ECORE_DEVICE_CLASS_TOUCH, ec, radius_x, radius_y, pressure, angle);
+        _e_comp_wl_device_handle_axes(ecore_device_identifier_get(dev), ECORE_DEVICE_CLASS_TOUCH, ec, idx, radius_x, radius_y, pressure, angle);
      }
    else if (device)
      {
         _e_comp_wl_device_send_last_event_device(ec, ECORE_DEVICE_CLASS_TOUCH, time);
-        _e_comp_wl_device_handle_axes(device->identifier, device->clas, ec, radius_x, radius_y, pressure, angle);
+        _e_comp_wl_device_handle_axes(device->identifier, device->clas, ec, idx, radius_x, radius_y, pressure, angle);
      }
 
    x = x + ec->client.x;
@@ -5751,12 +5753,12 @@ e_comp_wl_touch_update_send(E_Client *ec, int idx, int x, int y, Ecore_Device *d
    if (dev)
      {
         _e_comp_wl_send_event_device(wc, time, dev, serial);
-        _e_comp_wl_device_handle_axes(ecore_device_identifier_get(dev), ECORE_DEVICE_CLASS_TOUCH, ec, radius_x, radius_y, pressure, angle);
+        _e_comp_wl_device_handle_axes(ecore_device_identifier_get(dev), ECORE_DEVICE_CLASS_TOUCH, ec, idx, radius_x, radius_y, pressure, angle);
      }
    else if (device)
      {
         _e_comp_wl_device_send_last_event_device(ec, ECORE_DEVICE_CLASS_TOUCH, time);
-        _e_comp_wl_device_handle_axes(device->identifier, device->clas, ec, radius_x, radius_y, pressure, angle);
+        _e_comp_wl_device_handle_axes(device->identifier, device->clas, ec, idx, radius_x, radius_y, pressure, angle);
      }
 
    x = x + ec->client.x;

diff --git a/src/bin/e_comp_wl.h b/src/bin/e_comp_wl.h
index 61af95bcc18fab582eccc1c67a692888c3dd1fcf..c48b3b6100e88584b2571c6f8fd366598e7eb094 100644 (file)
--- a/src/bin/e_comp_wl.h
+++ b/src/bin/e_comp_wl.h
@@ -34,6 +34,8 @@
 #include <Evas_GL.h>
 #include <tbm_surface.h>
 
+#define E_COMP_WL_TOUCH_MAX 10
+
 typedef struct _E_Comp_Wl_Aux_Hint  E_Comp_Wl_Aux_Hint;
 typedef struct _E_Comp_Wl_Buffer E_Comp_Wl_Buffer;
 typedef struct _E_Comp_Wl_Buffer_Ref E_Comp_Wl_Buffer_Ref;
@@ -45,6 +47,8 @@ typedef struct _E_Comp_Wl_Data E_Comp_Wl_Data;
 typedef struct _E_Comp_Wl_Output E_Comp_Wl_Output;
 typedef struct _E_Comp_Wl_Input_Device E_Comp_Wl_Input_Device;
 typedef struct _E_Comp_Wl_Hook E_Comp_Wl_Hook;
+typedef struct _E_Comp_Wl_Input_Device_Multi E_Comp_Wl_Input_Device_Multi;
+
 
 typedef enum _E_Comp_Wl_Buffer_Type
 {
@@ -163,6 +167,14 @@ struct _E_Comp_Wl_Input_Device
    Ecore_Device_Class clas;
 };
 
+struct _E_Comp_Wl_Input_Device_Multi
+{
+   double radius_x;
+   double radius_y;
+   double pressure;
+   double angle;
+};
+
 struct _E_Comp_Wl_Data
 {
    struct
@@ -208,13 +220,7 @@ struct _E_Comp_Wl_Data
         E_Comp_Wl_Input_Device *last_device_ptr;
         E_Comp_Wl_Input_Device *last_device_touch;
         E_Comp_Wl_Input_Device *last_device_kbd;
-        struct
-          {
-             double radius_x;
-             double radius_y;
-             double pressure;
-             double angle;
-          } multi;
+        E_Comp_Wl_Input_Device_Multi multi[E_COMP_WL_TOUCH_MAX];
      } input_device_manager;
 
    struct