From: Jihoon Kim Date: Mon, 17 Mar 2025 10:43:38 +0000 (+0900) Subject: e_comp_wl: rename focus in and out function X-Git-Tag: accepted/tizen/unified/20250326.130904~20 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7af220d3a261bf36875c3f9ec845f523ed1981cc;p=platform%2Fupstream%2Fenlightenment.git e_comp_wl: rename focus in and out function Change-Id: Ic8053a3d13c4bee31da6ab2850fb004acd9f1083 Signed-off-by: Jihoon Kim --- diff --git a/src/bin/server/e_comp_wl.c b/src/bin/server/e_comp_wl.c index 8e10c9e9a9..efa2ad2962 100644 --- a/src/bin/server/e_comp_wl.c +++ b/src/bin/server/e_comp_wl.c @@ -2038,15 +2038,13 @@ _e_comp_wl_evas_cb_focus_in_timer(E_Client *ec) } static void -_e_comp_wl_input_thread_focus_in(void *data) +_e_comp_wl_surface_focus_in(struct wl_resource *surface) { - struct wl_resource *surface = NULL; struct wl_resource *res; struct wl_client *wc; Eina_List *l; - EINA_SAFETY_ON_NULL_RETURN(data); - surface = *(struct wl_resource **)data; + EINA_SAFETY_ON_NULL_RETURN(surface); wc = wl_resource_get_client(surface); @@ -2112,18 +2110,15 @@ _e_comp_wl_evas_cb_focus_in(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj } static void -_e_comp_wl_input_thread_focus_out(void *data) +_e_comp_wl_surface_focus_out(struct wl_resource *surface) { - struct wl_resource *surface = NULL; struct wl_resource *res; uint32_t serial; E_Comp_Wl_Key_Data *k; Eina_List *l, *ll; double t; - EINA_SAFETY_ON_NULL_RETURN(data); - - surface = *(struct wl_resource **)data; + EINA_SAFETY_ON_NULL_RETURN(surface); /* update keyboard modifier state */ wl_array_for_each(k, &e_comp_input_key->kbd.keys) @@ -2308,8 +2303,8 @@ _e_comp_wl_focus_client_cb_client_focus_set(struct wl_listener *listener, void * struct wl_resource *surface = e_comp_wl_client_surface_get(ec); if (!surface) return; - ELOGF("COMP_WL", "send focus in request to input thread. surface(%p)\n", ec, surface); - _e_comp_wl_input_thread_focus_in(&surface); + ELOGF("COMP_WL", "send focus in request. surface(%p)\n", ec, surface); + _e_comp_wl_surface_focus_in(surface); return; } @@ -2328,8 +2323,8 @@ _e_comp_wl_focus_client_cb_client_focus_unset(struct wl_listener *listener, void struct wl_resource *surface = e_comp_wl_client_surface_get(ec); if (!surface) return; - ELOGF("COMP_WL", "send focus out request to input thread. surface(%p)\n", ec, surface); - _e_comp_wl_input_thread_focus_out(&surface); + ELOGF("COMP_WL", "send focus out request. surface(%p)\n", ec, surface); + _e_comp_wl_surface_focus_out(surface); return; }