From: Jihoon Kim <jihoon48.kim@samsung.com>
Date: Tue, 16 Nov 2021 11:05:07 +0000 (+0900)
Subject: Update wayland inputmethod v1 protocol
X-Git-Tag: submit/tizen/20220106.083953~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e30ef6e2ef01ab5ceacce79da6a2252a52da433b;p=platform%2Fcore%2Fuifw%2Flibscl-core.git

Update wayland inputmethod v1 protocol

Change-Id: Iea454db8d84bdef79a6ec977965bbe2bb0c6fbaf
Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>
---

diff --git a/src/sclcoreui-efl.cpp b/src/sclcoreui-efl.cpp
index 99f38ec..5befad3 100644
--- a/src/sclcoreui-efl.cpp
+++ b/src/sclcoreui-efl.cpp
@@ -50,9 +50,9 @@ struct WaylandKeyboard
     Ecore_Wl2_Window *wl_win;
 
     struct wl_surface *surface;
-    struct wl_input_panel *ip;
+    struct zwp_input_panel_v1 *ip;
     struct wl_output *output;
-    struct wl_input_panel_surface *ips;
+    struct zwp_input_panel_surface_v1 *ips;
 };
 
 struct WaylandKeyboard wlkb = {0};
@@ -384,8 +384,8 @@ _wayland_setup(struct WaylandKeyboard *wlkb, Evas_Object *main_window)
 
     EINA_ITERATOR_FOREACH(globals, global)
     {
-        if (strcmp(global->interface, "wl_input_panel") == 0)
-            wlkb->ip = (wl_input_panel *)wl_registry_bind(registry, global->id, &wl_input_panel_interface, 1);
+        if (strcmp(global->interface, "zwp_input_panel_v1") == 0)
+            wlkb->ip = (zwp_input_panel_v1 *)wl_registry_bind(registry, global->id, &zwp_input_panel_v1_interface, 1);
         else if (strcmp(global->interface, "wl_output") == 0)
             wlkb->output = (wl_output *)wl_registry_bind(registry, global->id, &wl_output_interface, 1);
     }
@@ -422,13 +422,13 @@ _wayland_setup(struct WaylandKeyboard *wlkb, Evas_Object *main_window)
         return false;
     }
 
-    wlkb->ips = wl_input_panel_get_input_panel_surface(wlkb->ip, wlkb->surface);
+    wlkb->ips = zwp_input_panel_v1_get_input_panel_surface(wlkb->ip, wlkb->surface);
     if (!wlkb->ips) {
         LOGW("Couldn't get input panel surface\n");
         return false;
     }
 
-    wl_input_panel_surface_set_toplevel(wlkb->ips, wlkb->output, WL_INPUT_PANEL_SURFACE_POSITION_CENTER_BOTTOM);
+    zwp_input_panel_surface_v1_set_toplevel(wlkb->ips, wlkb->output, ZWP_INPUT_PANEL_SURFACE_V1_POSITION_CENTER_BOTTOM);
 
     return true;
 }
@@ -843,9 +843,9 @@ void CSCLCoreUIEFL::set_screen_rotation_degree(int degree)
 #ifdef WAYLAND
 static void _render_pre_cb(void *data, Evas *e, void *event_info)
 {
-    LOGD("_render_pre_cb() called, now invoking wl_input_panel_surface_set_ready()");
+    LOGD("_render_pre_cb() called, now invoking zwp_input_panel_surface_v1_set_ready()");
 
-    wl_input_panel_surface_set_ready(wlkb.ips, 1);
+    zwp_input_panel_surface_v1_set_ready(wlkb.ips, 1);
 
     Evas_Object *main_window = NATIVE_WINDOW_CAST(data);
     evas_event_callback_del_full(evas_object_evas_get(main_window),