From: Seunghun Lee <shiin.lee@samsung.com>
Date: Mon, 24 Jul 2023 09:59:27 +0000 (+0900)
Subject: Use e_client_from_surface_resource()
X-Git-Tag: accepted/tizen/unified/20230726.020645~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F52%2F296252%2F1;p=platform%2Fcore%2Fuifw%2Fe-mod-tizen-keyrouter.git

Use e_client_from_surface_resource()

Use e_client_from_surface_resource() to get a E_Client instance from a
surface resource instead of using wl_resource_get_user_data(). The user
data of wl_resource for surface is no longer a E_Client instance.

Change-Id: I65887eeb0912e3e87f7a77fd0ef488a4b071afef
---

diff --git a/src/e_mod_keyrouter_events.c b/src/e_mod_keyrouter_events.c
index 808e42d..80c7804 100644
--- a/src/e_mod_keyrouter_events.c
+++ b/src/e_mod_keyrouter_events.c
@@ -597,7 +597,7 @@ _e_keyrouter_check_top_visible_window(E_Client *ec_focus, int arr_idx)
           {
              if (key_node_data)
                {
-                  if (ec_top == wl_resource_get_user_data(key_node_data->surface))
+                  if (ec_top == e_client_from_surface_resource(key_node_data->surface))
                     {
                        krt->HardKeys[arr_idx].top_ptr = eina_list_promote_list(krt->HardKeys[arr_idx].top_ptr, l);
                        KLDBG("Move a client(e_client: %p, wl_surface: %p) to first index of list(key: %d)",
diff --git a/src/e_mod_main_wl.c b/src/e_mod_main_wl.c
index a52faeb..59d6d73 100644
--- a/src/e_mod_main_wl.c
+++ b/src/e_mod_main_wl.c
@@ -384,7 +384,7 @@ _e_keyrouter_cb_get_keyregister_status(struct wl_client *client, struct wl_resou
              EINA_LIST_FOREACH_SAFE(krt->HardKeys[key].top_ptr, l, l_next, key_node_data)
                {
                   if (!key_node_data) continue;
-                  if ((ec_top->visible) && (ec_top == wl_resource_get_user_data(key_node_data->surface)))
+                  if ((ec_top->visible) && (ec_top == e_client_from_surface_resource(key_node_data->surface)))
                     {
                        delivery_mode = TIZEN_KEYROUTER_MODE_TOPMOST;
                        goto finish;