From b76c51080e1ff7a2ef3e69181fec6121cfdf4121 Mon Sep 17 00:00:00 2001 From: "duna.oh" Date: Fri, 25 Mar 2022 09:17:15 +0900 Subject: [PATCH] e_comp_wl: add log about which device/seat an evas event is from Change-Id: I38fdc92678956375f6d687ddbea334e827f0c1e9 --- src/bin/e_comp_wl.c | 68 +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 45 insertions(+), 23 deletions(-) diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c index 7d3790d..6e2a52f 100644 --- a/src/bin/e_comp_wl.c +++ b/src/bin/e_comp_wl.c @@ -1368,7 +1368,8 @@ _e_comp_wl_evas_cb_mouse_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *o E_Client *ec = data; Evas_Event_Mouse_Down *ev = event; Evas_Device *dev = NULL; - const char *dev_name; + const Evas_Device *seat_dev; + const char *dev_name, *seat_name; E_Client *focused; E_Comp_Config *comp_conf = NULL; @@ -1378,10 +1379,14 @@ _e_comp_wl_evas_cb_mouse_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *o dev = ev->dev; dev_name = evas_device_description_get(dev); + seat_dev = evas_device_parent_get(dev); + seat_name = evas_device_name_get(seat_dev); + comp_conf = e_comp_config_get(); if (comp_conf && comp_conf->input_log_enable) - ELOGF("Touch", "Down (obj: %p, button: %d, time: %d, x:%d, y:%d, name:%20s)", - ec, obj, ev->button, ev->timestamp, ev->output.x, ev->output.y, e_client_util_name_get(ec)); + ELOGF("Touch", "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); _e_comp_wl_device_send_event_device(ec, dev, ev->timestamp); @@ -1428,7 +1433,8 @@ _e_comp_wl_evas_cb_mouse_up(void *data, Evas *evas, Evas_Object *obj, void *even E_Client *ec = data; Evas_Event_Mouse_Up *ev = event; Evas_Device *dev = NULL; - const char *dev_name; + const Evas_Device *seat_dev; + const char *dev_name, *seat_name;; Evas_Event_Flags flags; E_Comp_Config *comp_conf = NULL; @@ -1441,15 +1447,18 @@ _e_comp_wl_evas_cb_mouse_up(void *data, Evas *evas, Evas_Object *obj, void *even need_send_motion = EINA_TRUE; } + dev = ev->dev; + dev_name = evas_device_description_get(dev); + + seat_dev = evas_device_parent_get(dev); + seat_name = evas_device_name_get(seat_dev); flags = evas_event_default_flags_get(evas); comp_conf = e_comp_config_get(); if (comp_conf && comp_conf->input_log_enable) - ELOGF("Touch", "Up (obj: %p, button: %d, flag: 0x%x, time: %d, x:%d, y:%d, name:%20s)", - ec, obj, ev->button, flags, ev->timestamp, ev->output.x, ev->output.y, e_client_util_name_get(ec)); - - dev = ev->dev; - dev_name = evas_device_description_get(dev); + ELOGF("Touch", "Up (obj: %p, button: %d, flag: 0x%x, time: %d, x:%d, y:%d, name:%20s) (dev:%s, seat:%s)", + ec, obj, ev->button, flags, ev->timestamp, ev->output.x, ev->output.y, e_client_util_name_get(ec), + dev_name, seat_name); if (dev && (evas_device_class_get(dev) == EVAS_DEVICE_CLASS_TOUCH)) { @@ -1537,7 +1546,8 @@ _e_comp_wl_evas_cb_multi_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *o E_Client *ec = data; Evas_Event_Multi_Down *ev = event; Evas_Device *dev = NULL; - const char *dev_name; + const Evas_Device *seat_dev; + const char *dev_name, *seat_name; Evas_Device_Class dev_class; E_Comp_Config *comp_conf = NULL; @@ -1548,15 +1558,20 @@ _e_comp_wl_evas_cb_multi_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *o /* Do not deliver emulated single touch events to client */ if (ev->device == 0) return; - comp_conf = e_comp_config_get(); - if (comp_conf && comp_conf->input_log_enable) - ELOGF("Touch", "Down (obj: %p, idx: %d, time: %d, x:%d, y:%d, name:%20s)", - ec, obj, ev->device, ev->timestamp, ev->output.x, ev->output.y, e_client_util_name_get(ec)); - dev = ev->dev; + dev_name = evas_device_description_get(dev); e_comp_wl->touch.faked_ec = ec; - if (dev && (dev_name = evas_device_description_get(dev))) + seat_dev = evas_device_parent_get(dev); + seat_name = evas_device_name_get(seat_dev); + + comp_conf = e_comp_config_get(); + if (comp_conf && comp_conf->input_log_enable) + ELOGF("Touch", "Down (obj: %p, idx: %d, time: %d, x:%d, y:%d, name:%20s) (dev:%s, seat:%s)", + ec, obj, ev->device, ev->timestamp, ev->output.x, ev->output.y, e_client_util_name_get(ec), + dev_name, seat_name); + + if (dev && dev_name) { dev_class = evas_device_class_get(dev); _e_comp_wl_device_send_event_device(ec, dev, ev->timestamp); @@ -1573,7 +1588,8 @@ _e_comp_wl_evas_cb_multi_up(void *data, Evas *evas, Evas_Object *obj EINA_UNUSED E_Client *ec = data; Evas_Event_Multi_Up *ev = event; Evas_Device *dev = NULL; - const char *dev_name; + const Evas_Device *seat_dev; + const char *dev_name, *seat_name; Evas_Device_Class dev_class; Evas_Event_Flags flags; E_Comp_Config *comp_conf = NULL; @@ -1587,11 +1603,6 @@ _e_comp_wl_evas_cb_multi_up(void *data, Evas *evas, Evas_Object *obj EINA_UNUSED flags = evas_event_default_flags_get(evas); - comp_conf = e_comp_config_get(); - if (comp_conf && comp_conf->input_log_enable) - ELOGF("Touch", "Up (obj: %p, idx: %d, flag: 0x%x, time: %d, x:%d, y:%d, name:%20s)", - ec, obj, ev->device, flags, ev->timestamp, ev->output.x, ev->output.y, e_client_util_name_get(ec)); - e_comp_wl->touch.pressed &= ~(1 << ev->device); if (!e_comp_wl->touch.pressed && e_comp_wl->touch.faked_ec) e_comp_wl->touch.faked_ec = NULL; @@ -1599,7 +1610,18 @@ _e_comp_wl_evas_cb_multi_up(void *data, Evas *evas, Evas_Object *obj EINA_UNUSED if (flags & EVAS_EVENT_FLAG_ON_HOLD) return; dev = ev->dev; - if (dev && (dev_name = evas_device_description_get(dev))) + dev_name = evas_device_description_get(dev); + + seat_dev = evas_device_parent_get(dev); + seat_name = evas_device_name_get(seat_dev); + + comp_conf = e_comp_config_get(); + if (comp_conf && comp_conf->input_log_enable) + ELOGF("Touch", "Up (obj: %p, idx: %d, flag: 0x%x, time: %d, x:%d, y:%d, name:%20s) (dev:%s, seat:%s)", + ec, obj, ev->device, flags, ev->timestamp, ev->output.x, ev->output.y, e_client_util_name_get(ec), + dev_name, seat_name); + + if (dev && dev_name) { dev_class = evas_device_class_get(dev); _e_comp_wl_device_send_event_device(ec, dev, ev->timestamp); -- 2.7.4