e_comp_wl: fix log related to touch event

Change-Id: Id7dbcafdb6e66b986d7487055485bacc7949feb1
Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>

diff --git a/src/bin/inputmgr/e_devicemgr_input.c b/src/bin/inputmgr/e_devicemgr_input.c
index 7e79c5168141023331b2550222a00ad1d3d36bc3..6a6ee0a7c54a5e9eb1ba2d75e93399cb4f0d2196 100644 (file)
--- a/src/bin/inputmgr/e_devicemgr_input.c
+++ b/src/bin/inputmgr/e_devicemgr_input.c
@@ -396,7 +396,8 @@ _e_devicemgr_input_cb_mouse_button_down(void *data, int type, void *event)
    comp_conf = e_comp_config_get();
    if (comp_conf && comp_conf->input_log_enable)
      {
-        ELOGF("DEVMGR", "Mouse Down (id: %d, button: %d, x: %d, y: %d), res: %d", NULL,
+        ELOGF("DEVMGR", "%s Down (id: %d, button: %d, x: %d, y: %d), res: %d", NULL,
+              ecore_device_class_get(ev->dev) == ECORE_DEVICE_CLASS_TOUCH ? "Touch" : "Mouse",
               ev->multi.device, ev->buttons, ev->x, ev->y, res);
      }
 
@@ -419,7 +420,8 @@ _e_devicemgr_input_cb_mouse_button_up(void *data, int type, void *event)
    comp_conf = e_comp_config_get();
    if (comp_conf && comp_conf->input_log_enable)
      {
-        ELOGF("DEVMGR", "Mouse Up (id: %d, button: %d, x: %d, y: %d), res: %d", NULL,
+        ELOGF("DEVMGR", "%s Up (id: %d, button: %d, x: %d, y: %d), res: %d", NULL,
+              ecore_device_class_get(ev->dev) == ECORE_DEVICE_CLASS_TOUCH ? "Touch" : "Mouse",
               ev->multi.device, ev->buttons, ev->x, ev->y, res);
      }
 

diff --git a/src/bin/server/e_comp_wl.c b/src/bin/server/e_comp_wl.c
index 6dd37264405a629a467649086265ddb6d6acf394..b3c067d0b75f280066fc2754fbc5a0637ea7ab27 100644 (file)
--- a/src/bin/server/e_comp_wl.c
+++ b/src/bin/server/e_comp_wl.c
@@ -1521,7 +1521,8 @@ _e_comp_wl_evas_cb_mouse_move(void *data, Evas *evas EINA_UNUSED, Evas_Object *o
 
    comp_conf = e_comp_config_get();
    if (comp_conf && comp_conf->input_log_enable)
-     ELOGF("Mouse", "Move (obj: %p, time: %d, canvas(%d, %d), output(%d, %d), name:%20s) (dev:%s, seat:%s)",
+     ELOGF(dev_class == EVAS_DEVICE_CLASS_TOUCH ? "Touch" : "Mouse",
+           "Move (obj: %p, time: %d, canvas(%d, %d), output(%d, %d), name:%20s) (dev:%s, seat:%s)",
            ec, obj, ev->timestamp, ev->cur.canvas.x, ev->cur.canvas.y, ev->cur.output.x, ev->cur.output.y,
            e_client_util_name_get(ec), dev_name, seat_name);
 
@@ -1624,7 +1625,8 @@ _e_comp_wl_evas_cb_mouse_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *o
    pointer = e_pointer_find(seat_name);
    e_comp_pointer_set(pointer);
 
-   ELOGF("Mouse", "Down (obj: %p, button: %d, time: %d, x:%d, y:%d, name:%20s) (dev:%s, seat:%s)",
+   ELOGF(dev_class == EVAS_DEVICE_CLASS_TOUCH ? "Touch" : "Mouse",
+         "Down (obj: %p, button: %d, time: %d, x:%d, y:%d, name:%20s) (dev:%s, seat:%s)",
          ec, obj, ev->button, ev->timestamp, ev->output.x, ev->output.y, e_client_util_name_get(ec),
          dev_name, seat_name);
 
@@ -1691,7 +1693,8 @@ _e_comp_wl_evas_cb_mouse_up(void *data, Evas *evas, Evas_Object *obj, void *even
    seat_name = evas_device_name_get(seat_dev);
    dev_class = evas_device_class_get(dev);
 
-   ELOGF("Mouse", "Up (obj: %p, button: %d, flag: 0x%x, time: %d, x:%d, y:%d, name:%20s) (dev:%s, seat:%s)",
+   ELOGF(dev_class == EVAS_DEVICE_CLASS_TOUCH ? "Touch" : "Mouse",
+         "Up (obj: %p, button: %d, flag: 0x%x, time: %d, x:%d, y:%d, name:%20s) (dev:%s, seat:%s)",
          ec, obj, ev->button, ev->event_flags, ev->timestamp, ev->output.x, ev->output.y, e_client_util_name_get(ec),
          dev_name, seat_name);