From: jeon Date: Tue, 4 Feb 2020 10:49:46 +0000 (+0900) Subject: e_comp_wl: add evas mouse callback's input logs X-Git-Tag: submit/tizen/20200206.060445~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dc51b7767ddd7d2a8831b19961726366963b5de7;p=platform%2Fupstream%2Fenlightenment.git e_comp_wl: add evas mouse callback's input logs Change-Id: Ifde52c2ac3e70dc5b7032c4fb41d14b02121d8bf --- diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c index 06da4baa10..bd39105a1b 100644 --- a/src/bin/e_comp_wl.c +++ b/src/bin/e_comp_wl.c @@ -1326,7 +1326,7 @@ _e_comp_wl_evas_handle_mouse_button_to_touch(E_Client *ec, uint32_t timestamp, i } static void -_e_comp_wl_evas_cb_mouse_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event) +_e_comp_wl_evas_cb_mouse_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj, void *event) { E_Client *ec = data; Evas_Event_Mouse_Down *ev = event; @@ -1334,6 +1334,7 @@ _e_comp_wl_evas_cb_mouse_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *o const char *dev_name; E_Client *focused; int pointer_x, pointer_y; + E_Comp_Config *comp_conf = NULL; if (!ec) return; if (e_object_is_del(E_OBJECT(ec))) return; @@ -1341,6 +1342,11 @@ _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); + 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)); + _e_comp_wl_device_send_event_device(ec, dev, ev->timestamp); if (dev && (evas_device_class_get(dev) == EVAS_DEVICE_CLASS_TOUCH)) @@ -1397,13 +1403,14 @@ _e_comp_wl_evas_cb_mouse_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *o } static void -_e_comp_wl_evas_cb_mouse_up(void *data, Evas *evas, Evas_Object *obj EINA_UNUSED, void *event) +_e_comp_wl_evas_cb_mouse_up(void *data, Evas *evas, Evas_Object *obj, void *event) { E_Client *ec = data; Evas_Event_Mouse_Up *ev = event; Evas_Device *dev = NULL; const char *dev_name; Evas_Event_Flags flags; + E_Comp_Config *comp_conf = NULL; if (!ec) return; if (ec->cur_mouse_action) return; @@ -1415,6 +1422,12 @@ _e_comp_wl_evas_cb_mouse_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, 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)); + if (flags & EVAS_EVENT_FLAG_ON_HOLD) goto finish; dev = ev->dev; @@ -1496,13 +1509,14 @@ _e_comp_wl_evas_cb_mouse_wheel(void *data, Evas *evas EINA_UNUSED, Evas_Object * } static void -_e_comp_wl_evas_cb_multi_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event) +_e_comp_wl_evas_cb_multi_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj, void *event) { E_Client *ec = data; Evas_Event_Multi_Down *ev = event; Evas_Device *dev = NULL; const char *dev_name; Evas_Device_Class dev_class; + E_Comp_Config *comp_conf = NULL; if (!ec) return; if (e_object_is_del(E_OBJECT(ec))) return; @@ -1511,6 +1525,11 @@ _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; if (dev && (dev_name = evas_device_description_get(dev))) { @@ -1532,6 +1551,7 @@ _e_comp_wl_evas_cb_multi_up(void *data, Evas *evas, Evas_Object *obj EINA_UNUSED const char *dev_name; Evas_Device_Class dev_class; Evas_Event_Flags flags; + E_Comp_Config *comp_conf = NULL; if (!ec) return; if (e_object_is_del(E_OBJECT(ec))) return; @@ -1541,6 +1561,12 @@ _e_comp_wl_evas_cb_multi_up(void *data, Evas *evas, Evas_Object *obj EINA_UNUSED if (ev->device == 0) return; 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)); + if (flags & EVAS_EVENT_FLAG_ON_HOLD) return; e_comp_wl->touch.pressed &= ~(1 << ev->device);