From: jeon Date: Thu, 5 Mar 2020 12:15:11 +0000 (+0900) Subject: e_comp_wl: do not inverse mouse coords for cursor X-Git-Tag: submit/tizen/20200701.060448^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9b8b06ad9a326863d548db72f879a816fb9800ed;p=platform%2Fupstream%2Fenlightenment.git e_comp_wl: do not inverse mouse coords for cursor - Until now, evas_mouse_event's output coords are same as canvas coords. - But this will be fix, so output coords are not implied evas_map. - So inverse coords are not necessary. Change-Id: I77f976256a8bae99c8200da69f6444aa7ba89634 --- diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c index 0496e32ef2..48653e50a5 100644 --- a/src/bin/e_comp_wl.c +++ b/src/bin/e_comp_wl.c @@ -1233,7 +1233,6 @@ _e_comp_wl_evas_cb_mouse_move(void *data, Evas *evas EINA_UNUSED, Evas_Object *o Evas_Event_Mouse_Move *ev; Evas_Device *dev = NULL; const char *dev_name; - int pointer_x, pointer_y; ev = event; @@ -1266,15 +1265,7 @@ _e_comp_wl_evas_cb_mouse_move(void *data, Evas *evas EINA_UNUSED, Evas_Object *o _e_comp_wl_send_touch_move(ec, 0, ev->cur.canvas.x, ev->cur.canvas.y, ev->timestamp); } - pointer_x = ev->cur.output.x; - pointer_y = ev->cur.output.y; - - if (evas_object_map_enable_get(ec->frame)) - { - e_comp_wl_map_inv_coord_get(ec, pointer_x, pointer_y, &pointer_x, &pointer_y); - } - - e_pointer_touch_move(e_comp->pointer, pointer_x, pointer_y); + e_pointer_touch_move(e_comp->pointer, ev->cur.output.x, ev->cur.output.y); } else { @@ -1287,15 +1278,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); _e_comp_wl_send_mouse_move(ec, ev->cur.canvas.x, ev->cur.canvas.y, ev->timestamp); - pointer_x = ev->cur.output.x; - pointer_y = ev->cur.output.y; - - if (evas_object_map_enable_get(ec->frame)) - { - e_comp_wl_map_inv_coord_get(ec, pointer_x, pointer_y, &pointer_x, &pointer_y); - } - - e_pointer_mouse_move(e_comp->pointer, pointer_x, pointer_y); + e_pointer_mouse_move(e_comp->pointer, ev->cur.output.x, ev->cur.output.y); if (e_config->use_cursor_timer) _e_comp_wl_cursor_move_timer_control(ec); } @@ -1323,7 +1306,6 @@ _e_comp_wl_evas_cb_mouse_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *o Evas_Device *dev = NULL; const char *dev_name; E_Client *focused; - int pointer_x, pointer_y; E_Comp_Config *comp_conf = NULL; if (!ec) return; @@ -1348,15 +1330,7 @@ _e_comp_wl_evas_cb_mouse_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *o 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); - pointer_x = ev->output.x; - pointer_y = ev->output.y; - - if (evas_object_map_enable_get(ec->frame)) - { - e_comp_wl_map_inv_coord_get(ec, pointer_x, pointer_y, &pointer_x, &pointer_y); - } - - e_pointer_touch_move(e_comp->pointer, pointer_x, pointer_y); + e_pointer_touch_move(e_comp->pointer, ev->output.x, ev->output.y); e_comp_wl->touch.pressed |= (1 << 0); } else @@ -1369,15 +1343,8 @@ _e_comp_wl_evas_cb_mouse_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *o e_comp_wl_evas_handle_mouse_button(ec, ev->timestamp, ev->button, WL_POINTER_BUTTON_STATE_PRESSED); - pointer_x = ev->output.x; - pointer_y = ev->output.y; - - if (evas_object_map_enable_get(ec->frame)) - { - e_comp_wl_map_inv_coord_get(ec, pointer_x, pointer_y, &pointer_x, &pointer_y); - } - e_pointer_mouse_move(e_comp->pointer, pointer_x, pointer_y); + e_pointer_mouse_move(e_comp->pointer, ev->output.x, ev->output.y); if (e_config->use_cursor_timer) _e_comp_wl_cursor_move_timer_control(ec); }