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-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2a79353fe4bf44164bd904f3ca1ec2c369666659;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 c6600f2b8b..eab638537f 100644 --- a/src/bin/server/e_comp_wl.c +++ b/src/bin/server/e_comp_wl.c @@ -2219,15 +2219,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); @@ -2280,8 +2278,7 @@ e_comp_wl_feed_focus_in(E_Client *ec) struct wl_resource *surface = e_comp_wl_client_surface_get(ec); if (!surface) return; - INF("send focus in request to input thread. surface(%p)\n", surface); - _e_comp_wl_input_thread_focus_in(&surface); + _e_comp_wl_surface_focus_in(surface); ec->comp_data->on_focus_timer = ecore_timer_add(((e_config->xkb.delay_held_key_input_to_focus)/1000.0), @@ -2299,18 +2296,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) @@ -2361,8 +2355,7 @@ _e_comp_wl_evas_cb_focus_out(void *data, Evas *evas EINA_UNUSED, Evas_Object *ob _e_comp_wl_client_priority_normal(ec); struct wl_resource *surface = e_comp_wl_client_surface_get(ec); - INF("send focus out request to input thread. surface(%p)\n", surface); - _e_comp_wl_input_thread_focus_out(&surface); + _e_comp_wl_surface_focus_out(surface); } static void