From 617a546056619b471ddb51b9d228f6085fb6f186 Mon Sep 17 00:00:00 2001 From: tscholb Date: Wed, 19 Jan 2022 11:01:14 +0900 Subject: [PATCH] [Tizen] Change to latest wayland inputmethod protocol This reverts commit ccbc4f90dbdaa652dac15a6415259d2c7f7b009b. --- .../tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp | 12 ++++++------ .../tizen-wayland/ecore-wl2/window-base-ecore-wl2.h | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) 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 ccea97c..5443da8 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) 2021 Samsung Electronics Co., Ltd. + * Copyright (c) 2022 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, "wl_input_panel") == 0) + if(strcmp(global->interface, "zwp_input_panel_v1") == 0) { - mWlInputPanel = (wl_input_panel*)wl_registry_bind(registry, global->id, &wl_input_panel_interface, 1); + mWlInputPanel = (zwp_input_panel_v1*)wl_registry_bind(registry, global->id, &zwp_input_panel_v1_interface, 1); } else if(strcmp(global->interface, "wl_output") == 0) { @@ -2636,14 +2636,14 @@ void WindowBaseEcoreWl2::InitializeIme() return; } - mWlInputPanelSurface = wl_input_panel_get_input_panel_surface(mWlInputPanel, mWlSurface); + mWlInputPanelSurface = zwp_input_panel_v1_get_input_panel_surface(mWlInputPanel, mWlSurface); if(!mWlInputPanelSurface) { DALI_LOG_ERROR("WindowBaseEcoreWl2::InitializeIme(), fail to get wayland input panel surface\n"); return; } - wl_input_panel_surface_set_toplevel(mWlInputPanelSurface, mWlOutput, WL_INPUT_PANEL_SURFACE_POSITION_CENTER_BOTTOM); + zwp_input_panel_surface_v1_set_toplevel(mWlInputPanelSurface, mWlOutput, ZWP_INPUT_PANEL_SURFACE_V1_POSITION_CENTER_BOTTOM); } void WindowBaseEcoreWl2::ImeWindowReadyToRender() @@ -2654,7 +2654,7 @@ void WindowBaseEcoreWl2::ImeWindowReadyToRender() return; } - wl_input_panel_surface_set_ready(mWlInputPanelSurface, 1); + zwp_input_panel_surface_v1_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 3df827b..fce358e 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) 2021 Samsung Electronics Co., Ltd. + * Copyright (c) 2022 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 mEcoreEventHandler; Ecore_Wl2_Window* mEcoreWindow; - wl_surface* mWlSurface; - wl_input_panel* mWlInputPanel; - wl_output* mWlOutput; - wl_input_panel_surface* mWlInputPanelSurface; + wl_surface* mWlSurface; + zwp_input_panel_v1* mWlInputPanel; + wl_output* mWlOutput; + zwp_input_panel_surface_v1* mWlInputPanelSurface; wl_egl_window* mEglWindow; wl_display* mDisplay; -- 2.7.4