e_comp_wl: rename focus in and out function 68/324768/1
authorJihoon Kim <jihoon48.kim@samsung.com>
Mon, 17 Mar 2025 10:43:38 +0000 (19:43 +0900)
committerJihoon Kim <jihoon48.kim@samsung.com>
Mon, 26 May 2025 06:27:38 +0000 (15:27 +0900)
Change-Id: Ic8053a3d13c4bee31da6ab2850fb004acd9f1083
Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>
src/bin/server/e_comp_wl.c

index c6600f2b8b4ea4266cd14a1eee5b509e5001749d..eab638537f90cc3042303aa70fe21d8d0ebb34b2 100644 (file)
@@ -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