Update wayland inputmethod interface as the latest opensource

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

diff --git a/ism/modules/panelagent/wayland/isf_wsc_context.h b/ism/modules/panelagent/wayland/isf_wsc_context.h
index 241125b..70b2baa 100644 (file)
--- a/ism/modules/panelagent/wayland/isf_wsc_context.h
+++ b/ism/modules/panelagent/wayland/isf_wsc_context.h
@@ -56,7 +56,7 @@ typedef struct _WSCContextISFImpl  WSCContextISFImpl;
 
 struct weescim
 {
-    struct wl_input_method *im;
+    struct zwp_input_method_v1 *im;
 
     WSCContextISF *wsc_ctx;
 };
@@ -64,8 +64,8 @@ struct weescim
 struct _wl_im
 {
     struct weescim *wsc;
-    struct wl_input_method *input_method;
-    struct wl_input_method_context *im_ctx;
+    struct zwp_input_method_v1 *input_method;
+    struct zwp_input_method_context_v1 *im_ctx;
     Eina_Bool need_focus_event;
 };
 
@@ -87,7 +87,7 @@ struct _WSCContextISF {
     KeycodeRepository _keysym2keycode;
 
 #endif
-    struct wl_input_method_context *im_ctx;
+    struct zwp_input_method_context_v1 *im_ctx;
 
     Ecore_Fd_Handler* surrounding_text_fd_read_handler;
     Ecore_Fd_Handler* selection_text_fd_read_handler;

diff --git a/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp b/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp
index 58ab235..92fdbf5 100644 (file)
--- a/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp
+++ b/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp
@@ -137,7 +137,7 @@ struct _WSCContextISFImpl {
     }
 };
 
-static struct wl_input_method_manager *_im_manager = NULL;
+static struct zwp_input_method_manager_v1 *_im_manager = NULL;
 
 /* private functions */
 
@@ -244,7 +244,13 @@ static scim::PanelAgentPointer instance;
 /////////////////////////////////////////////////////////////////////////////
 
 static void
-_wsc_im_ctx_reset (void *data, struct wl_input_method_context *im_ctx)
+_wsc_im_ctx_surrounding_text (void *data, struct zwp_input_method_context_v1 *im_ctx, const char *text, uint32_t cursor, uint32_t anchor)
+{
+    LOGD ("");
+}
+
+static void
+_wsc_im_ctx_reset (void *data, struct zwp_input_method_context_v1 *im_ctx)
 {
     WSCContextISF *context_scim = (WSCContextISF*)data;
     LOGD ("");
@@ -254,7 +260,7 @@ _wsc_im_ctx_reset (void *data, struct wl_input_method_context *im_ctx)
 }
 
 static void
-_wsc_im_ctx_content_type (void *data, struct wl_input_method_context *im_ctx, uint32_t hint, uint32_t purpose)
+_wsc_im_ctx_content_type (void *data, struct zwp_input_method_context_v1 *im_ctx, uint32_t hint, uint32_t purpose)
 {
     WSCContextISF *wsc_ctx = (WSCContextISF*)data;
     if (!wsc_ctx) return;
@@ -312,7 +318,7 @@ _wsc_im_ctx_content_type (void *data, struct wl_input_method_context *im_ctx, ui
 }
 
 static void
-_wsc_im_ctx_invoke_action (void *data, struct wl_input_method_context *im_ctx, uint32_t button, uint32_t index)
+_wsc_im_ctx_invoke_action (void *data, struct zwp_input_method_context_v1 *im_ctx, uint32_t button, uint32_t index)
 {
     WSCContextISF *wsc_ctx = (WSCContextISF*)data;
     if (!wsc_ctx) return;
@@ -326,7 +332,7 @@ _wsc_im_ctx_invoke_action (void *data, struct wl_input_method_context *im_ctx, u
 }
 
 static void
-_wsc_im_ctx_commit_state (void *data, struct wl_input_method_context *im_ctx, uint32_t serial)
+_wsc_im_ctx_commit_state (void *data, struct zwp_input_method_context_v1 *im_ctx, uint32_t serial)
 {
     WSCContextISF *wsc_ctx = (WSCContextISF*)data;
     if (!wsc_ctx) return;
@@ -334,11 +340,11 @@ _wsc_im_ctx_commit_state (void *data, struct wl_input_method_context *im_ctx, ui
     wsc_ctx->serial = serial;
 
     if (wsc_ctx->language)
-        wl_input_method_context_language (im_ctx, wsc_ctx->serial, wsc_ctx->language);
+        zwp_input_method_context_v1_language (im_ctx, wsc_ctx->serial, wsc_ctx->language);
 }
 
 static void
-_wsc_im_ctx_preferred_language (void *data, struct wl_input_method_context *im_ctx, const char *language)
+_wsc_im_ctx_preferred_language (void *data, struct zwp_input_method_context_v1 *im_ctx, const char *language)
 {
     WSCContextISF *wsc_ctx = (WSCContextISF*)data;
     if (!wsc_ctx) return;
@@ -358,7 +364,7 @@ _wsc_im_ctx_preferred_language (void *data, struct wl_input_method_context *im_c
 }
 
 static void
-_wsc_im_ctx_return_key_type (void *data, struct wl_input_method_context *im_ctx, uint32_t return_key_type)
+_wsc_im_ctx_return_key_type (void *data, struct zwp_input_method_context_v1 *im_ctx, uint32_t return_key_type)
 {
     WSCContextISF *wsc_ctx = (WSCContextISF*)data;
 
@@ -376,7 +382,7 @@ _wsc_im_ctx_return_key_type (void *data, struct wl_input_method_context *im_ctx,
 }
 
 static void
-_wsc_im_ctx_return_key_disabled (void *data, struct wl_input_method_context *im_ctx, uint32_t disabled)
+_wsc_im_ctx_return_key_disabled (void *data, struct zwp_input_method_context_v1 *im_ctx, uint32_t disabled)
 {
     WSCContextISF *wsc_ctx = (WSCContextISF*)data;
     Eina_Bool return_key_disabled = !!disabled;
@@ -395,7 +401,7 @@ _wsc_im_ctx_return_key_disabled (void *data, struct wl_input_method_context *im_
 }
 
 static void
-_wsc_im_ctx_input_panel_data (void *data, struct wl_input_method_context *im_ctx, const char *input_panel_data, uint32_t input_panel_data_length)
+_wsc_im_ctx_input_panel_data (void *data, struct zwp_input_method_context_v1 *im_ctx, const char *input_panel_data, uint32_t input_panel_data_length)
 {
     WSCContextISF *wsc_ctx = (WSCContextISF*)data;
     LOGD ("im_context = %p input panel data = %s len = %d", im_ctx, input_panel_data, input_panel_data_length);
@@ -417,7 +423,7 @@ _wsc_im_ctx_input_panel_data (void *data, struct wl_input_method_context *im_ctx
 }
 
 static void
-_wsc_im_ctx_bidi_direction (void *data, struct wl_input_method_context *im_ctx, uint32_t bidi_direction)
+_wsc_im_ctx_bidi_direction (void *data, struct zwp_input_method_context_v1 *im_ctx, uint32_t bidi_direction)
 {
     WSCContextISF *wsc_ctx = (WSCContextISF*)data;
 
@@ -432,7 +438,7 @@ _wsc_im_ctx_bidi_direction (void *data, struct wl_input_method_context *im_ctx,
 }
 
 static void
-_wsc_im_ctx_cursor_position (void *data, struct wl_input_method_context *im_ctx, uint32_t cursor_pos)
+_wsc_im_ctx_cursor_position (void *data, struct zwp_input_method_context_v1 *im_ctx, uint32_t cursor_pos)
 {
     WSCContextISF *wsc_ctx = (WSCContextISF*)data;
 
@@ -445,7 +451,7 @@ _wsc_im_ctx_cursor_position (void *data, struct wl_input_method_context *im_ctx,
 }
 
 static void
-_wsc_im_ctx_process_input_device_event (void *data, struct wl_input_method_context *im_ctx, uint32_t type, const char *input_data, uint32_t input_data_len)
+_wsc_im_ctx_process_input_device_event (void *data, struct zwp_input_method_context_v1 *im_ctx, uint32_t type, const char *input_data, uint32_t input_data_len)
 {
     WSCContextISF *wsc_ctx = (WSCContextISF*)data;
 
@@ -456,7 +462,7 @@ _wsc_im_ctx_process_input_device_event (void *data, struct wl_input_method_conte
 }
 
 static void
-_wsc_im_ctx_filter_key_event (void *data, struct wl_input_method_context *im_ctx, uint32_t serial, uint32_t time, const char *keyname, uint32_t state, uint32_t modifiers, const char *dev_name, uint32_t dev_class, uint32_t dev_subclass, uint32_t keycode)
+_wsc_im_ctx_filter_key_event (void *data, struct zwp_input_method_context_v1 *im_ctx, uint32_t serial, uint32_t time, const char *keyname, uint32_t state, uint32_t modifiers, const char *dev_name, uint32_t dev_class, uint32_t dev_subclass, uint32_t keycode)
 {
     WSCContextISF *wsc_ctx = (WSCContextISF*)data;
     if (!wsc_ctx) return;
@@ -468,7 +474,7 @@ _wsc_im_ctx_filter_key_event (void *data, struct wl_input_method_context *im_ctx
 }
 
 static void
-_wsc_im_ctx_capital_mode (void *data, struct wl_input_method_context *im_ctx, uint32_t mode)
+_wsc_im_ctx_capital_mode (void *data, struct zwp_input_method_context_v1 *im_ctx, uint32_t mode)
 {
     LOGD ("capital mode %d", mode);
     WSCContextISF *wsc_ctx = (WSCContextISF*)data;
@@ -478,7 +484,7 @@ _wsc_im_ctx_capital_mode (void *data, struct wl_input_method_context *im_ctx, ui
 }
 
 static void
-_wsc_im_ctx_prediction_hint (void *data, struct wl_input_method_context *im_ctx, const char *prediction_hint)
+_wsc_im_ctx_prediction_hint (void *data, struct zwp_input_method_context_v1 *im_ctx, const char *prediction_hint)
 {
     WSCContextISF *wsc_ctx = (WSCContextISF*)data;
 
@@ -489,7 +495,7 @@ _wsc_im_ctx_prediction_hint (void *data, struct wl_input_method_context *im_ctx,
 }
 
 static void
-_wsc_im_ctx_mime_type (void *data, struct wl_input_method_context *im_ctx, const char *mime_type)
+_wsc_im_ctx_mime_type (void *data, struct zwp_input_method_context_v1 *im_ctx, const char *mime_type)
 {
     WSCContextISF *wsc_ctx = (WSCContextISF*)data;
 
@@ -504,7 +510,7 @@ _wsc_im_ctx_mime_type (void *data, struct wl_input_method_context *im_ctx, const
 }
 
 static void
-_wsc_im_ctx_finalized_content (void *data, struct wl_input_method_context *im_ctx, const char *text, uint32_t cursor_pos)
+_wsc_im_ctx_finalized_content (void *data, struct zwp_input_method_context_v1 *im_ctx, const char *text, uint32_t cursor_pos)
 {
     WSCContextISF *wsc_ctx = (WSCContextISF*)data;
 
@@ -515,7 +521,7 @@ _wsc_im_ctx_finalized_content (void *data, struct wl_input_method_context *im_ct
 }
 
 static void
-_wsc_im_ctx_prediction_hint_data (void *data, struct wl_input_method_context *im_ctx, const char *key, const char * value)
+_wsc_im_ctx_prediction_hint_data (void *data, struct zwp_input_method_context_v1 *im_ctx, const char *key, const char * value)
 {
     WSCContextISF *wsc_ctx = (WSCContextISF*)data;
     if (!wsc_ctx) return;
@@ -523,7 +529,8 @@ _wsc_im_ctx_prediction_hint_data (void *data, struct wl_input_method_context *im
     isf_wsc_context_input_panel_prediction_hint_data_set (wsc_ctx, key, value);
 }
 
-static const struct wl_input_method_context_listener wsc_im_context_listener = {
+static const struct zwp_input_method_context_v1_listener wsc_im_context_listener = {
+     _wsc_im_ctx_surrounding_text,
      _wsc_im_ctx_reset,
      _wsc_im_ctx_content_type,
      _wsc_im_ctx_invoke_action,
@@ -687,7 +694,7 @@ _wsc_im_keyboard_modifiers (void *data,
     if (!wsc_ctx || !wsc_ctx->state)
         return;
 
-    struct wl_input_method_context *context = wsc_ctx->im_ctx;
+    struct zwp_input_method_context_v1 *context = wsc_ctx->im_ctx;
     xkb_mod_mask_t mask;
 
     xkb_state_update_mask (wsc_ctx->state, mods_depressed,
@@ -705,7 +712,7 @@ _wsc_im_keyboard_modifiers (void *data,
     if (mask & wsc_ctx->super_mask)
         wsc_ctx->modifiers |=  SCIM_KEY_SuperMask;
 
-    wl_input_method_context_modifiers (context, serial,
+    zwp_input_method_context_v1_modifiers (context, serial,
             mods_depressed, mods_depressed,
             mods_latched, group);
 }
@@ -755,8 +762,8 @@ wl_im_destroy ()
 #endif
 
     if (wsc_ctx->im_ctx) {
-        LOGD("destroy wl_input_method_context : %p", wsc_ctx->im_ctx);
-        wl_input_method_context_destroy (wsc_ctx->im_ctx);
+        LOGD("destroy zwp_input_method_context_v1 : %p", wsc_ctx->im_ctx);
+        zwp_input_method_context_v1_destroy (wsc_ctx->im_ctx);
         wsc_ctx->im_ctx = NULL;
     }
 
@@ -799,7 +806,7 @@ wl_im_destroy ()
 }
 
 static void
-_wsc_im_activate (void *data, struct wl_input_method *input_method, struct wl_input_method_context *im_ctx, uint32_t text_input_id, uint32_t focus_in_event)
+_wsc_im_activate (void *data, struct zwp_input_method_v1 *input_method, struct zwp_input_method_context_v1 *im_ctx, uint32_t text_input_id, uint32_t focus_in_event)
 {
     struct weescim *wsc = (weescim*)data;
     if (!wsc) return;
@@ -810,7 +817,7 @@ _wsc_im_activate (void *data, struct wl_input_method *input_method, struct wl_in
     }
 
     if (_need_wl_im_init) {
-        LOGD("destroy wl_input_method_context");
+        LOGD("destroy zwp_input_method_context_v1");
         wl_im_destroy ();
     }
 
@@ -839,16 +846,16 @@ _wsc_im_activate (void *data, struct wl_input_method *input_method, struct wl_in
     wsc_ctx->content_purpose = WL_TEXT_INPUT_CONTENT_PURPOSE_NORMAL;
 
     wsc_ctx->im_ctx = im_ctx;
-    wl_input_method_context_add_listener (im_ctx, &wsc_im_context_listener, wsc_ctx);
+    zwp_input_method_context_v1_add_listener (im_ctx, &wsc_im_context_listener, wsc_ctx);
 
 #if ENABLE_GRAB_KEYBOARD
-    wsc_ctx->keyboard = wl_input_method_context_grab_keyboard (im_ctx);
+    wsc_ctx->keyboard = zwp_input_method_context_v1_grab_keyboard (im_ctx);
     if (wsc_ctx->keyboard)
         wl_keyboard_add_listener (wsc_ctx->keyboard, &wsc_im_keyboard_listener, wsc_ctx);
 #endif
 
     if (wsc_ctx->language)
-        wl_input_method_context_language (im_ctx, wsc_ctx->serial, wsc_ctx->language);
+        zwp_input_method_context_v1_language (im_ctx, wsc_ctx->serial, wsc_ctx->language);
 
     isf_wsc_context_add (wsc_ctx);
 
@@ -859,7 +866,7 @@ _wsc_im_activate (void *data, struct wl_input_method *input_method, struct wl_in
 }
 
 static void
-_wsc_im_deactivate (void *data, struct wl_input_method *input_method, struct wl_input_method_context *im_ctx, uint32_t focus_out_event)
+_wsc_im_deactivate (void *data, struct zwp_input_method_v1 *input_method, struct zwp_input_method_context_v1 *im_ctx, uint32_t focus_out_event)
 {
     struct weescim *wsc = (weescim*)data;
     if (!wsc || !wsc->wsc_ctx) return;
@@ -867,7 +874,7 @@ _wsc_im_deactivate (void *data, struct wl_input_method *input_method, struct wl_
     LOGD("inputmethod : %p, im ctx : %p, focus out : %d", input_method, im_ctx, focus_out_event);
 
     /* When the focus_in/input_panel_shutdown event is called,
-     * it is not possible to know the information of wl_input_method to destroy */
+     * it is not possible to know the information of zwp_input_method_v1 to destroy */
     _wl_im_ctx->wsc = wsc;
     _wl_im_ctx->input_method = input_method;
     _wl_im_ctx->im_ctx = im_ctx;
@@ -881,7 +888,7 @@ _wsc_im_deactivate (void *data, struct wl_input_method *input_method, struct wl_
 }
 
 static void
-_wsc_im_destroy (void *data, struct wl_input_method *input_method, struct wl_input_method_context *im_ctx)
+_wsc_im_destroy (void *data, struct zwp_input_method_v1 *input_method, struct zwp_input_method_context_v1 *im_ctx)
 {
     struct weescim *wsc = (weescim*)data;
     if (!wsc || !wsc->wsc_ctx) return;
@@ -897,7 +904,7 @@ _wsc_im_destroy (void *data, struct wl_input_method *input_method, struct wl_inp
 }
 
 static void
-_wsc_im_show_input_panel (void *data, struct wl_input_method *input_method, struct wl_input_method_context *im_ctx, uint32_t angle)
+_wsc_im_show_input_panel (void *data, struct zwp_input_method_v1 *input_method, struct zwp_input_method_context_v1 *im_ctx, uint32_t angle)
 {
     struct weescim *wsc = (weescim*)data;
     if (!wsc || !wsc->wsc_ctx) return;
@@ -911,7 +918,7 @@ _wsc_im_show_input_panel (void *data, struct wl_input_method *input_method, stru
 }
 
 static void
-_wsc_im_hide_input_panel (void *data, struct wl_input_method *input_method, struct wl_input_method_context *im_ctx)
+_wsc_im_hide_input_panel (void *data, struct zwp_input_method_v1 *input_method, struct zwp_input_method_context_v1 *im_ctx)
 {
     struct weescim *wsc = (weescim*)data;
     if (!wsc || !wsc->wsc_ctx) return;
@@ -921,7 +928,7 @@ _wsc_im_hide_input_panel (void *data, struct wl_input_method *input_method, stru
     isf_wsc_context_input_panel_hide (wsc->wsc_ctx);
 }
 
-static const struct wl_input_method_listener wsc_im_listener = {
+static const struct zwp_input_method_v1_listener wsc_im_listener = {
     _wsc_im_activate,
     _wsc_im_deactivate,
     _wsc_im_destroy,
@@ -955,23 +962,23 @@ _wsc_setup (struct weescim *wsc)
     }
 
     EINA_ITERATOR_FOREACH(globals, global) {
-        if (strcmp (global->interface, "wl_input_method") == 0)
-            wsc->im = (wl_input_method*)wl_registry_bind (registry, global->id, &wl_input_method_interface, 1);
-        else if (strcmp (global->interface, "wl_input_method_manager") == 0)
-            _im_manager = (wl_input_method_manager*)wl_registry_bind (registry, global->id, &wl_input_method_manager_interface, 1);
+        if (strcmp (global->interface, "zwp_input_method_v1") == 0)
+            wsc->im = (zwp_input_method_v1*)wl_registry_bind (registry, global->id, &zwp_input_method_v1_interface, 1);
+        else if (strcmp (global->interface, "zwp_input_method_manager_v1") == 0)
+            _im_manager = (zwp_input_method_manager_v1*)wl_registry_bind (registry, global->id, &zwp_input_method_manager_v1_interface, 1);
     }
     eina_iterator_free (globals);
 
     if (wsc->im == NULL) {
-        LOGW ("Failed because wl_input_method is null");
+        LOGW ("Failed because zwp_input_method_v1 is null");
         return false;
     }
 
     /* Input method listener */
-    LOGD ("Adding wl_input_method listener");
+    LOGD ("Adding zwp_input_method_v1 listener");
 
     if (wsc->im)
-        wl_input_method_add_listener (wsc->im, &wsc_im_listener, wsc);
+        zwp_input_method_v1_add_listener (wsc->im, &wsc_im_listener, wsc);
     else {
         LOGW ("Couldn't get wayland input method interface");
         return false;
@@ -1840,7 +1847,7 @@ wsc_commit_preedit (WSCContextISF* wsc_ctx)
         strlen (wsc_ctx->preedit_str) == 0)
         return;
 
-    wl_input_method_context_cursor_position (wsc_ctx->im_ctx,
+    zwp_input_method_context_v1_cursor_position (wsc_ctx->im_ctx,
                                              0, 0);
 
     if (strlen (wsc_ctx->preedit_str) > MAX_PREEDIT_BUFSIZE) {
@@ -1860,7 +1867,7 @@ wsc_commit_preedit (WSCContextISF* wsc_ctx)
         }
     }
 
-    wl_input_method_context_commit_string (wsc_ctx->im_ctx,
+    zwp_input_method_context_v1_commit_string (wsc_ctx->im_ctx,
                                            wsc_ctx->serial,
                                            wsc_ctx->preedit_str);
 
@@ -1940,7 +1947,7 @@ wsc_send_preedit_style (WSCContextISF* wsc_ctx)
                                         break;
                                 }
 
-                                wl_input_method_context_preedit_styling (wsc_ctx->im_ctx,
+                                zwp_input_method_context_v1_preedit_styling (wsc_ctx->im_ctx,
                                                                          start_index,
                                                                          end_index - start_index,
                                                                          preedit_style);
@@ -1980,7 +1987,7 @@ wsc_send_preedit_style (WSCContextISF* wsc_ctx)
                             start_index = begin_pos;
                             end_index = pos;
 
-                            wl_input_method_context_preedit_styling (wsc_ctx->im_ctx,
+                            zwp_input_method_context_v1_preedit_styling (wsc_ctx->im_ctx,
                                                                      start_index,
                                                                      end_index - start_index,
                                                                      preedit_style);
@@ -2013,8 +2020,8 @@ wsc_send_preedit (WSCContextISF* wsc_ctx, int32_t cursor)
      * we must update preedit_string also whenever preedit_cursor or preedit_style is updated.
      * So the below 3 lines cannot be called separately. */
     wsc_send_preedit_style (wsc_ctx);
-    wl_input_method_context_preedit_cursor (wsc_ctx->im_ctx, index);
-    wl_input_method_context_preedit_string (wsc_ctx->im_ctx,
+    zwp_input_method_context_v1_preedit_cursor (wsc_ctx->im_ctx, index);
+    zwp_input_method_context_v1_preedit_string (wsc_ctx->im_ctx,
                                             wsc_ctx->serial,
                                             wsc_ctx->preedit_str,
                                             utf8_wcstombs (wsc_ctx->impl->commit_string).c_str ());
@@ -2116,7 +2123,7 @@ remote_surrounding_get (WSCContextISF *wsc_ctx)
     } else {
         LOGD("%d,%d", filedes[0], filedes[1]);
         if (wsc_ctx && wsc_ctx->im_ctx) {
-            wl_input_method_context_get_surrounding_text (wsc_ctx->im_ctx, UINT_MAX, UINT_MAX, filedes[1]);
+            zwp_input_method_context_v1_get_surrounding_text (wsc_ctx->im_ctx, UINT_MAX, UINT_MAX, filedes[1]);
             Ecore_Wl2_Display *wl2_display = ecore_wl2_connected_display_get (NULL);
             if (wl2_display)
                 ecore_wl2_display_flush (wl2_display);
@@ -2382,7 +2389,7 @@ void wsc_context_delete_surrounding (WSCContextISF *wsc_ctx, int offset, int len
     if (!wsc_ctx)
         return;
 
-    wl_input_method_context_delete_surrounding_text (wsc_ctx->im_ctx, offset, len);
+    zwp_input_method_context_v1_delete_surrounding_text (wsc_ctx->im_ctx, offset, len);
 }
 
 void wsc_context_set_selection (WSCContextISF *wsc_ctx, int start, int end)
@@ -2390,7 +2397,7 @@ void wsc_context_set_selection (WSCContextISF *wsc_ctx, int start, int end)
     if (!wsc_ctx)
         return;
 
-    wl_input_method_context_selection_region (wsc_ctx->im_ctx, wsc_ctx->serial, start, end);
+    zwp_input_method_context_v1_selection_region (wsc_ctx->im_ctx, wsc_ctx->serial, start, end);
 }
 
 void wsc_context_commit_string (WSCContextISF *wsc_ctx, const char *str)
@@ -2450,7 +2457,7 @@ void wsc_context_send_key (WSCContextISF *wsc_ctx, uint32_t keysym, uint32_t mod
     if (!wsc_ctx || !wsc_ctx->im_ctx)
         return;
 
-    wl_input_method_context_keysym (wsc_ctx->im_ctx, wsc_ctx->serial, time,
+    zwp_input_method_context_v1_keysym (wsc_ctx->im_ctx, wsc_ctx->serial, time,
             keysym, press ? WL_KEYBOARD_KEY_STATE_PRESSED : WL_KEYBOARD_KEY_STATE_RELEASED, modifiers);
 }
 
@@ -3001,7 +3008,7 @@ public:
 
     void stop (void) {
         if (_need_wl_im_init) {
-            LOGD("destroy wl_input_method_context");
+            LOGD("destroy zwp_input_method_context_v1");
             wl_im_destroy ();
         }
 
@@ -3088,14 +3095,14 @@ public:
         if (type == ECORE_IMF_INPUT_PANEL_LANGUAGE_EVENT) {
             WSCContextISF* ic = find_ic (context);
             if (ic && ic->language) {
-                wl_input_method_context_language (_focused_ic->im_ctx, _focused_ic->serial, ic->language);
+                zwp_input_method_context_v1_language (_focused_ic->im_ctx, _focused_ic->serial, ic->language);
             }
             else {
                 LOGE("language locale query failed : %p %s", ic, (ic ? ic->language : "NULL"));
-                wl_input_method_context_language (_focused_ic->im_ctx, _focused_ic->serial, "");
+                zwp_input_method_context_v1_language (_focused_ic->im_ctx, _focused_ic->serial, "");
             }
         }
-        wl_input_method_context_input_panel_event (_focused_ic->im_ctx, _focused_ic->serial, type, value);
+        zwp_input_method_context_v1_input_panel_event (_focused_ic->im_ctx, _focused_ic->serial, type, value);
     }
 
     void
@@ -3224,10 +3231,10 @@ public:
                 }
                 ic->impl->preedit_caret    = preedit.length ();
 
-                wl_input_method_context_preedit_cursor (ic->im_ctx, strlen(preedit_str.c_str()));
+                zwp_input_method_context_v1_preedit_cursor (ic->im_ctx, strlen(preedit_str.c_str()));
                 wsc_send_preedit_style (ic);
 
-                wl_input_method_context_recapture_string (ic->im_ctx, ic->serial,
+                zwp_input_method_context_v1_recapture_string (ic->im_ctx, ic->serial,
                                                           offset, len, preedit_str.c_str(), preedit_str.c_str(), commit_str.c_str());
             } else {
                 g_info_manager->socket_recapture_string (offset, len, preedit_str, commit_str, attrs);
@@ -3310,7 +3317,7 @@ public:
         if (!ic) return;
 
         if (ic->im_ctx)
-            wl_input_method_context_get_surrounding_text (ic->im_ctx, maxlen_before, maxlen_after, filedes[1]);
+            zwp_input_method_context_v1_get_surrounding_text (ic->im_ctx, maxlen_before, maxlen_after, filedes[1]);
 
         Ecore_Wl2_Display *wl2_display = ecore_wl2_connected_display_get (NULL);
         if (wl2_display)
@@ -3355,14 +3362,14 @@ public:
         LOGD ("client id:%d", id);
         //panel_slot_send_private_command (context_id, command);
         if (_focused_ic && _focused_ic->im_ctx)
-            wl_input_method_context_private_command (_focused_ic->im_ctx, _focused_ic->serial, command.c_str ());
+            zwp_input_method_context_v1_private_command (_focused_ic->im_ctx, _focused_ic->serial, command.c_str ());
     }
 
     void
     commit_content (int id, uint32 context_id, const String& content, const String& description, const String& mime_types) {
         LOGD ("client id:%d", id);
         if (_focused_ic && _focused_ic->im_ctx)
-            wl_input_method_context_commit_content (_focused_ic->im_ctx, _focused_ic->serial, content.c_str (), description.c_str (), mime_types.c_str ());
+            zwp_input_method_context_v1_commit_content (_focused_ic->im_ctx, _focused_ic->serial, content.c_str (), description.c_str (), mime_types.c_str ());
     }
 
     void
@@ -3372,7 +3379,7 @@ public:
         WSCContextISF* ic = find_ic (context_id);
 
         if (ic) {
-            wl_input_method_context_hide_input_panel (ic->im_ctx, ic->serial);
+            zwp_input_method_context_v1_hide_input_panel (ic->im_ctx, ic->serial);
         }
     }
 
@@ -3446,7 +3453,7 @@ public:
         WSCContextISF* ic = find_ic (context_id);
         if (!ic) return;
 
-        wl_input_method_context_get_selection_text (ic->im_ctx, filedes[1]);
+        zwp_input_method_context_v1_get_selection_text (ic->im_ctx, filedes[1]);
         Ecore_Wl2_Display *wl2_display = ecore_wl2_connected_display_get (NULL);
         if (wl2_display)
             ecore_wl2_display_flush (wl2_display);
@@ -3479,7 +3486,7 @@ public:
             send_wl_key_event (ic, key, false);
         }
 #else
-        wl_input_method_context_filter_key_event_done (ic->im_ctx, serial, ret);
+        zwp_input_method_context_v1_filter_key_event_done (ic->im_ctx, serial, ret);
 #endif
     }
 
@@ -3488,7 +3495,7 @@ public:
         WSCContextISF* ic = find_ic (context_id);
         if (!ic) return;
 
-        wl_input_method_context_hide_input_panel (ic->im_ctx, ic->serial);
+        zwp_input_method_context_v1_hide_input_panel (ic->im_ctx, ic->serial);
     }
 
     void
@@ -3496,7 +3503,7 @@ public:
         LOGD ("client id:%d", id);
 
         if (_focused_ic && _focused_ic->im_ctx) {
-            wl_input_method_context_update_ise_geometry (_focused_ic->im_ctx, _focused_ic->serial, x, y, width, height);
+            zwp_input_method_context_v1_update_ise_geometry (_focused_ic->im_ctx, _focused_ic->serial, x, y, width, height);
         }
     }
 
@@ -3506,7 +3513,7 @@ public:
         if (!ic) return;
 
         if (ic->im_ctx) {
-            wl_input_method_context_update_candidate_state(ic->im_ctx, 1);
+            zwp_input_method_context_v1_update_candidate_state(ic->im_ctx, 1);
         }
     }
 
@@ -3516,7 +3523,7 @@ public:
         if (!ic) return;
 
         if (ic->im_ctx) {
-            wl_input_method_context_update_candidate_state(ic->im_ctx, 0);
+            zwp_input_method_context_v1_update_candidate_state(ic->im_ctx, 0);
         }
     }
 
@@ -3571,7 +3578,7 @@ public:
         WSCContextISF* ic = find_ic (context_id);
         if (!ic) return;
 
-        wl_input_method_context_reshow_input_panel (ic->im_ctx);
+        zwp_input_method_context_v1_reshow_input_panel (ic->im_ctx);
     }
 
     void set_transient_for (uint32 caller_pid, uint32 ime_pid)
@@ -3579,7 +3586,7 @@ public:
         LOGI ("caller pid : %u, ime pid : %u", caller_pid, ime_pid);
 
         if (_im_manager)
-            wl_input_method_manager_set_transient_for (_im_manager, caller_pid, ime_pid);
+            zwp_input_method_manager_v1_set_transient_for (_im_manager, caller_pid, ime_pid);
         else
             LOGW ("Failed to get input method manager interface");
     }
@@ -3591,7 +3598,7 @@ public:
         if (!ic) return;
 
         if (ic->im_ctx)
-            wl_input_method_context_set_floating_panel (ic->im_ctx, floating_mode);
+            zwp_input_method_context_v1_set_floating_panel (ic->im_ctx, floating_mode);
     }
 
     void set_floating_drag_enabled (int id, uint32 context_id, uint32 enabled)
@@ -3600,7 +3607,7 @@ public:
         if (!ic) return;
 
         if (ic->im_ctx)
-            wl_input_method_context_set_floating_drag_enabled (ic->im_ctx, enabled);
+            zwp_input_method_context_v1_set_floating_drag_enabled (ic->im_ctx, enabled);
     }
 };