Use input-method-unstable-v1 interface

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

diff --git a/src/e_mod_input_method_manager.c b/src/e_mod_input_method_manager.c
index b3d3961..7a086ab 100644 (file)
--- a/src/e_mod_input_method_manager.c
+++ b/src/e_mod_input_method_manager.c
@@ -110,7 +110,7 @@ _e_input_method_manager_cb_set_transient_for(struct wl_client *client EINA_UNUSE
      }
 }
 
-static const struct wl_input_method_manager_interface _e_input_method_manager_interface =
+static const struct zwp_input_method_manager_v1_interface _e_input_method_manager_interface =
 {
    _e_input_method_manager_cb_set_transient_for,
 };
@@ -132,7 +132,7 @@ _e_input_method_manager_cb_bind(struct wl_client *client, void *data, uint32_t v
 
    input_method_mgr->resource =
       wl_resource_create(client,
-                         &wl_input_method_manager_interface, 1, id);
+                         &zwp_input_method_manager_v1_interface, 1, id);
 
    if (input_method_mgr->resource)
      wl_resource_set_implementation(input_method_mgr->resource,
@@ -153,7 +153,7 @@ e_input_method_manager_create(void)
 
    input_method_mgr->global =
       wl_global_create(e_comp_wl->wl.disp,
-                       &wl_input_method_manager_interface, 1,
+                       &zwp_input_method_manager_v1_interface, 1,
                        input_method_mgr, _e_input_method_manager_cb_bind);
 
    if (!input_method_mgr->global)

diff --git a/src/e_mod_input_panel.c b/src/e_mod_input_panel.c
index 668cc39..8508add 100644 (file)
--- a/src/e_mod_input_panel.c
+++ b/src/e_mod_input_panel.c
@@ -333,7 +333,7 @@ _e_input_panel_surface_cb_ready_set(struct wl_client *client EINA_UNUSED, struct
    _e_input_panel_surface_show(ips);
 }
 
-static const struct wl_input_panel_surface_interface _e_input_panel_surface_implementation = {
+static const struct zwp_input_panel_surface_v1_interface _e_input_panel_surface_implementation = {
      _e_input_panel_surface_cb_toplevel_set,
      _e_input_panel_surface_cb_overlay_panel_set,
      _e_input_panel_surface_cb_ready_set,
@@ -1043,7 +1043,7 @@ _e_input_panel_cb_surface_get(struct wl_client *client, struct wl_resource *reso
      }
 
    if (!(cdata->shell.surface =
-         wl_resource_create(client, &wl_input_panel_surface_interface, 1, id)))
+         wl_resource_create(client, &zwp_input_panel_surface_v1_interface, 1, id)))
      {
         wl_resource_post_no_memory(surface_resource);
         /* NOTE: Cleanup E_client. */
@@ -1118,7 +1118,7 @@ _e_input_panel_cb_surface_get(struct wl_client *client, struct wl_resource *reso
    e_client_base_output_resolution_update(ec);
 }
 
-static const struct wl_input_panel_interface _e_input_panel_implementation = {
+static const struct zwp_input_panel_v1_interface _e_input_panel_implementation = {
      _e_input_panel_cb_surface_get
 };
 
@@ -1173,7 +1173,7 @@ _e_input_panel_bind(struct wl_client *client, void *data, uint32_t version EINA_
    if (input_panel->resource)
      _e_input_panel_unbind(input_panel->resource);
 
-   resource = wl_resource_create(client, &wl_input_panel_interface, 1, id);
+   resource = wl_resource_create(client, &zwp_input_panel_v1_interface, 1, id);
    if (!resource) return;
 
    LOGI("client %p input_panel %p resource %p", client, input_panel, resource);
@@ -1335,7 +1335,7 @@ e_input_panel_init(void)
      }
 
    g_input_panel->global = wl_global_create(e_comp_wl->wl.disp,
-                                            &wl_input_panel_interface, 1,
+                                            &zwp_input_panel_v1_interface, 1,
                                             g_input_panel, _e_input_panel_bind);
 
    if (!g_input_panel->global)

diff --git a/src/e_mod_main.c b/src/e_mod_main.c
index 3724fd0..d12c24e 100644 (file)
--- a/src/e_mod_main.c
+++ b/src/e_mod_main.c
@@ -318,7 +318,7 @@ static void send_hide_input_panel(E_Input_Method *input_method)
    if (input_method && input_method->resource && input_method->context && input_method->context->resource)
      {
         LOGI("Request to hide IME");
-        wl_input_method_send_hide_input_panel(input_method->resource, input_method->context->resource);
+        zwp_input_method_v1_send_hide_input_panel(input_method->resource, input_method->context->resource);
      }
 }
 
@@ -1117,7 +1117,7 @@ _e_text_input_method_context_cb_set_floating_drag_enabled(struct wl_client *clie
     e_input_panel_floating_drag_enabled(enabled ? EINA_TRUE : EINA_FALSE);
 }
 
-static const struct wl_input_method_context_interface _e_text_input_method_context_implementation = {
+static const struct zwp_input_method_context_v1_interface _e_text_input_method_context_implementation = {
      _e_text_input_method_context_cb_destroy,
      _e_text_input_method_context_cb_string_commit,
      _e_text_input_method_context_cb_preedit_string,
@@ -1261,7 +1261,7 @@ _e_text_input_deactivate(E_Text_Input *text_input, E_Input_Method *input_method,
              else
                {
                   /* TODO: finish the grab of keyboard. */
-                  wl_input_method_send_deactivate(input_method->resource,
+                  zwp_input_method_v1_send_deactivate(input_method->resource,
                                                   input_method->context->resource,
                                                   need_focus_in);
                   LOGI("wm_map TEXTINPUT deactivate : %p %p", input_method->resource,
@@ -1350,7 +1350,7 @@ _e_text_input_cb_activate(struct wl_client *client, struct wl_resource *resource
 
         context->resource =
            wl_resource_create(wl_resource_get_client(input_method->resource),
-                              &wl_input_method_context_interface, 1, 0);
+                              &zwp_input_method_context_v1_interface, 1, 0);
 
         if (context->resource)
           wl_resource_set_implementation(context->resource,
@@ -1363,7 +1363,7 @@ _e_text_input_cb_activate(struct wl_client *client, struct wl_resource *resource
 
         if (context->resource)
           {
-             wl_input_method_send_activate(input_method->resource, context->resource, text_input->id, EINA_TRUE);
+             zwp_input_method_v1_send_activate(input_method->resource, context->resource, text_input->id, EINA_TRUE);
              LOGI("wm_map TEXTINPUT activate : %p %p", input_method->resource,
                   context->resource);
 
@@ -1454,7 +1454,7 @@ _e_text_input_method_create_context(struct wl_client *client, E_Input_Method *in
 
    context->resource =
       wl_resource_create(wl_resource_get_client(input_method->resource),
-                         &wl_input_method_context_interface, 1, 0);
+                         &zwp_input_method_context_v1_interface, 1, 0);
 
    if (context->resource)
      wl_resource_set_implementation(context->resource,
@@ -1465,7 +1465,7 @@ _e_text_input_method_create_context(struct wl_client *client, E_Input_Method *in
    context->input_method = input_method;
    input_method->context = context;
 
-   wl_input_method_send_activate(input_method->resource, context->resource, text_input->id, need_focus_out);
+   zwp_input_method_v1_send_activate(input_method->resource, context->resource, text_input->id, need_focus_out);
 
    LOGI("wm_map TEXTINPUT activate : input_method->resource(%p) context->resource(%p)",
         input_method->resource, context->resource);
@@ -1546,7 +1546,7 @@ _e_text_input_cb_input_panel_show(struct wl_client *client, struct wl_resource *
                   angle += client_surface_ec->e.state.rot.ang.curr;
                }
 
-             wl_input_method_send_show_input_panel(input_method->resource, input_method->context->resource, angle);
+             zwp_input_method_v1_send_show_input_panel(input_method->resource, input_method->context->resource, angle);
 
              /* we need to force update in order to release buffer
               * if we do not, client can't update
@@ -1611,7 +1611,7 @@ _e_text_input_cb_reset(struct wl_client *client EINA_UNUSED, struct wl_resource
      {
         if (!input_method || !input_method->context) continue;
         if (input_method->context->resource)
-          wl_input_method_context_send_reset(input_method->context->resource);
+          zwp_input_method_context_v1_send_reset(input_method->context->resource);
      }
 }
 
@@ -1635,7 +1635,7 @@ _e_text_input_cb_content_type_set(struct wl_client *client EINA_UNUSED, struct w
         if (!input_method || !input_method->context) continue;
 
         if (input_method->context->resource)
-          wl_input_method_context_send_content_type(input_method->context->resource,
+          zwp_input_method_context_v1_send_content_type(input_method->context->resource,
                                                     hint, purpose);
      }
 }
@@ -1676,7 +1676,7 @@ _e_text_input_cb_preferred_language_set(struct wl_client *client EINA_UNUSED, st
         if (!input_method || !input_method->context) continue;
 
         if (input_method->context->resource)
-          wl_input_method_context_send_preferred_language(input_method->context->resource,
+          zwp_input_method_context_v1_send_preferred_language(input_method->context->resource,
                                                           language);
      }
 }
@@ -1701,7 +1701,7 @@ _e_text_input_cb_state_commit(struct wl_client *client EINA_UNUSED, struct wl_re
         if (!input_method || !input_method->context) continue;
 
         if (input_method->context->resource)
-          wl_input_method_context_send_commit_state(input_method->context->resource, serial);
+          zwp_input_method_context_v1_send_commit_state(input_method->context->resource, serial);
      }
 }
 
@@ -1725,7 +1725,7 @@ _e_text_input_cb_action_invoke(struct wl_client *client EINA_UNUSED, struct wl_r
         if (!input_method || !input_method->context) continue;
 
         if (input_method->context->resource)
-          wl_input_method_context_send_invoke_action(input_method->context->resource,
+          zwp_input_method_context_v1_send_invoke_action(input_method->context->resource,
                                                      button, index);
      }
 }
@@ -1750,7 +1750,7 @@ _e_text_input_cb_return_key_type_set(struct wl_client *client EINA_UNUSED, struc
         if (!input_method || !input_method->context) continue;
 
         if (input_method->context->resource)
-          wl_input_method_context_send_return_key_type(input_method->context->resource,
+          zwp_input_method_context_v1_send_return_key_type(input_method->context->resource,
                                                        return_key_type);
      }
 }
@@ -1775,7 +1775,7 @@ _e_text_input_cb_return_key_disabled_set(struct wl_client *client EINA_UNUSED, s
         if (!input_method || !input_method->context) continue;
 
         if (input_method->context->resource)
-          wl_input_method_context_send_return_key_disabled(input_method->context->resource,
+          zwp_input_method_context_v1_send_return_key_disabled(input_method->context->resource,
                                                            disabled);
      }
 }
@@ -1800,7 +1800,7 @@ _e_text_input_cb_input_panel_data_set(struct wl_client *client EINA_UNUSED, stru
         if (!input_method || !input_method->context) continue;
 
         if (input_method->context->resource)
-          wl_input_method_context_send_input_panel_data(input_method->context->resource,
+          zwp_input_method_context_v1_send_input_panel_data(input_method->context->resource,
                                                         data, length);
      }
 
@@ -1843,7 +1843,7 @@ _e_text_input_cb_bidi_direction_set(struct wl_client *client EINA_UNUSED, struct
         if (!input_method || !input_method->context) continue;
 
         if (input_method->context->resource)
-          wl_input_method_context_send_bidi_direction(input_method->context->resource,
+          zwp_input_method_context_v1_send_bidi_direction(input_method->context->resource,
                                                        bidi_direction);
      }
 }
@@ -1868,7 +1868,7 @@ _e_text_input_cb_cursor_position_set(struct wl_client *client EINA_UNUSED, struc
         if (!input_method || !input_method->context) continue;
 
         if (input_method->context->resource)
-          wl_input_method_context_send_cursor_position(input_method->context->resource, cursor_position);
+          zwp_input_method_context_v1_send_cursor_position(input_method->context->resource, cursor_position);
      }
 }
 
@@ -1892,7 +1892,7 @@ _e_text_input_cb_process_input_device_event(struct wl_client *client EINA_UNUSED
         if (!input_method || !input_method->context) continue;
 
         if (input_method->context->resource)
-          wl_input_method_context_send_process_input_device_event(input_method->context->resource,
+          zwp_input_method_context_v1_send_process_input_device_event(input_method->context->resource,
                                                                   type, data, length);
      }
 }
@@ -1921,7 +1921,7 @@ _e_text_input_cb_filter_key_event(struct wl_client *client EINA_UNUSED, struct w
 
    if (input_method && input_method->context && input_method->context->resource)
      {
-        wl_input_method_context_send_filter_key_event(input_method->context->resource,
+        zwp_input_method_context_v1_send_filter_key_event(input_method->context->resource,
                                                       serial, time, keyname, state, modifiers,
                                                       dev_name, dev_class, dev_subclass, keycode);
      }
@@ -1993,7 +1993,7 @@ _e_text_input_cb_set_capital_mode(struct wl_client *client EINA_UNUSED, struct w
      {
         if (!input_method || !input_method->context) continue;
         if (input_method->context->resource)
-          wl_input_method_context_send_capital_mode(input_method->context->resource, mode);
+          zwp_input_method_context_v1_send_capital_mode(input_method->context->resource, mode);
      }
 }
 
@@ -2017,7 +2017,7 @@ _e_text_input_cb_prediction_hint_set(struct wl_client *client EINA_UNUSED, struc
         if (!input_method || !input_method->context) continue;
 
         if (input_method->context->resource)
-          wl_input_method_context_send_prediction_hint(input_method->context->resource, prediction_hint);
+          zwp_input_method_context_v1_send_prediction_hint(input_method->context->resource, prediction_hint);
      }
 }
 
@@ -2041,7 +2041,7 @@ _e_text_input_cb_prediction_hint_data_set(struct wl_client *client EINA_UNUSED,
         if (!input_method || !input_method->context) continue;
 
         if (input_method->context->resource)
-          wl_input_method_context_send_prediction_hint_data(input_method->context->resource, key, value);
+          zwp_input_method_context_v1_send_prediction_hint_data(input_method->context->resource, key, value);
      }
 }
 
@@ -2081,7 +2081,7 @@ _e_text_input_cb_mime_type_accept_set(struct wl_client *client EINA_UNUSED, stru
         if (!input_method || !input_method->context) continue;
 
         if (input_method->context->resource)
-          wl_input_method_context_send_mime_type(input_method->context->resource, mime_type);
+          zwp_input_method_context_v1_send_mime_type(input_method->context->resource, mime_type);
      }
 }
 
@@ -2120,7 +2120,7 @@ _e_text_input_cb_finalize_content(struct wl_client *client EINA_UNUSED, struct w
         if (!input_method || !input_method->context) continue;
 
         if (input_method->context->resource)
-          wl_input_method_context_send_finalized_content(input_method->context->resource, text, cursor_position);
+          zwp_input_method_context_v1_send_finalized_content(input_method->context->resource, text, cursor_position);
      }
 }
 
@@ -2201,7 +2201,7 @@ _e_text_input_cb_destroy(struct wl_client *client, struct wl_resource *resource)
    if (text_input == g_text_input &&
        input_method->resource && input_method->context && input_method->context->resource)
      {
-        wl_input_method_send_destroy(input_method->resource, input_method->context->resource);
+        zwp_input_method_v1_send_destroy(input_method->resource, input_method->context->resource);
         LOGI("wm_map TEXTINPUT destroy : input_method->resource(%p) input_method->context->resource(%p)",
              input_method->resource, input_method->context->resource);
 
@@ -2343,7 +2343,7 @@ _e_text_input_method_cb_bind(struct wl_client *client, void *data, uint32_t vers
         return;
      }
 
-   resource = wl_resource_create(client, &wl_input_method_interface, 1, id);
+   resource = wl_resource_create(client, &zwp_input_method_v1_interface, 1, id);
    if (EINA_UNLIKELY(!resource))
      return;
 
@@ -2383,7 +2383,7 @@ _e_text_input_method_create(void)
      }
 
    g_input_method->global =
-      wl_global_create(e_comp_wl->wl.disp, &wl_input_method_interface, 1,
+      wl_global_create(e_comp_wl->wl.disp, &zwp_input_method_v1_interface, 1,
                        g_input_method, _e_text_input_method_cb_bind);
 
    if (!g_input_method->global)