From: tscholb <scholb.kim@samsung.com>
Date: Wed, 19 Jan 2022 02:00:51 +0000 (+0900)
Subject: Revert "[Tizen] Change to latest wayland inputmethod protocol"
X-Git-Tag: submit/tizen/20220119.054331~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ccbc4f90dbdaa652dac15a6415259d2c7f7b009b;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

Revert "[Tizen] Change to latest wayland inputmethod protocol"

This reverts commit 928c3f79022c40bc8f19e1189d3139390194d3d2.
---

diff --git a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp
index 5443da8..ccea97c 100644
--- a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp
+++ b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -2614,9 +2614,9 @@ void WindowBaseEcoreWl2::InitializeIme()
 
   EINA_ITERATOR_FOREACH(globals, global)
   {
-    if(strcmp(global->interface, "zwp_input_panel_v1") == 0)
+    if(strcmp(global->interface, "wl_input_panel") == 0)
     {
-      mWlInputPanel = (zwp_input_panel_v1*)wl_registry_bind(registry, global->id, &zwp_input_panel_v1_interface, 1);
+      mWlInputPanel = (wl_input_panel*)wl_registry_bind(registry, global->id, &wl_input_panel_interface, 1);
     }
     else if(strcmp(global->interface, "wl_output") == 0)
     {
@@ -2636,14 +2636,14 @@ void WindowBaseEcoreWl2::InitializeIme()
     return;
   }
 
-  mWlInputPanelSurface = zwp_input_panel_v1_get_input_panel_surface(mWlInputPanel, mWlSurface);
+  mWlInputPanelSurface = wl_input_panel_get_input_panel_surface(mWlInputPanel, mWlSurface);
   if(!mWlInputPanelSurface)
   {
     DALI_LOG_ERROR("WindowBaseEcoreWl2::InitializeIme(), fail to get wayland input panel surface\n");
     return;
   }
 
-  zwp_input_panel_surface_v1_set_toplevel(mWlInputPanelSurface, mWlOutput, ZWP_INPUT_PANEL_SURFACE_V1_POSITION_CENTER_BOTTOM);
+  wl_input_panel_surface_set_toplevel(mWlInputPanelSurface, mWlOutput, WL_INPUT_PANEL_SURFACE_POSITION_CENTER_BOTTOM);
 }
 
 void WindowBaseEcoreWl2::ImeWindowReadyToRender()
@@ -2654,7 +2654,7 @@ void WindowBaseEcoreWl2::ImeWindowReadyToRender()
     return;
   }
 
-  zwp_input_panel_surface_v1_set_ready(mWlInputPanelSurface, 1);
+  wl_input_panel_surface_set_ready(mWlInputPanelSurface, 1);
 }
 
 void WindowBaseEcoreWl2::RequestMoveToServer()
diff --git a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.h b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.h
index fce358e..3df827b 100644
--- a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.h
+++ b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_WINDOWSYSTEM_TIZENWAYLAND_WINDOW_BASE_ECORE_WL2_H
 
 /*
- * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -548,10 +548,10 @@ private:
   Dali::Vector<Ecore_Event_Handler*>                        mEcoreEventHandler;
   Ecore_Wl2_Window*                                         mEcoreWindow;
 
-  wl_surface*                 mWlSurface;
-  zwp_input_panel_v1*         mWlInputPanel;
-  wl_output*                  mWlOutput;
-  zwp_input_panel_surface_v1* mWlInputPanelSurface;
+  wl_surface*             mWlSurface;
+  wl_input_panel*         mWlInputPanel;
+  wl_output*              mWlOutput;
+  wl_input_panel_surface* mWlInputPanelSurface;
 
   wl_egl_window*        mEglWindow;
   wl_display*           mDisplay;