From 4f8945088344797a5fe505a58dc8d9ffdaec7481 Mon Sep 17 00:00:00 2001 From: SooChan Lim Date: Tue, 10 Nov 2020 15:29:53 +0900 Subject: [PATCH] e_service_volume: use e_client_cdata_get Change-Id: I6326776c777bf6ba7a8c5dcd53a4d98c2d849615 --- src/bin/services/e_service_volume.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/bin/services/e_service_volume.c b/src/bin/services/e_service_volume.c index 1dc8c11..faaa873 100644 --- a/src/bin/services/e_service_volume.c +++ b/src/bin/services/e_service_volume.c @@ -52,10 +52,11 @@ _volume_region_obj_cb_mouse_down(void *data EINA_UNUSED, Evas *evas EINA_UNUSED, { Evas_Event_Mouse_Down *e = event; uint32_t serial; + E_Comp_Wl_Client_Data *volume_cdata = e_client_cdata_get(_volume_ec); serial = wl_display_next_serial(e_comp_wl->wl.disp); wl_touch_send_down(_volume_wl_touch, serial, e->timestamp, - _volume_ec->comp_data->surface, 0, + volume_cdata->surface, 0, wl_fixed_from_int(e->canvas.x - _volume_ec->client.x), wl_fixed_from_int(e->canvas.y - _volume_ec->client.y)); } @@ -75,10 +76,11 @@ _volume_region_obj_cb_multi_down(void *data EINA_UNUSED, Evas *evas EINA_UNUSED, { Evas_Event_Multi_Down *e = event; uint32_t serial; + E_Comp_Wl_Client_Data *volume_cdata = e_client_cdata_get(_volume_ec); serial = wl_display_next_serial(e_comp_wl->wl.disp); wl_touch_send_down(_volume_wl_touch, serial, e->timestamp, - _volume_ec->comp_data->surface, e->device, + volume_cdata->surface, e->device, wl_fixed_from_int(e->canvas.x - _volume_ec->client.x), wl_fixed_from_int(e->canvas.y - _volume_ec->client.y)); } @@ -408,10 +410,11 @@ _volume_wl_touch_resource_get(void) Eina_List *l; struct wl_client *wc; struct wl_resource *res; + E_Comp_Wl_Client_Data *volume_cdata = e_client_cdata_get(_volume_ec); if (_volume_wl_touch) goto end; - wc = wl_resource_get_client(_volume_ec->comp_data->surface); + wc = wl_resource_get_client(volume_cdata->surface); EINA_LIST_FOREACH(e_comp_wl->touch.resources, l, res) { if (wl_resource_get_client(res) != wc) continue; -- 2.7.4