text: Rename input_method to wl_input_method
Also rename input_method_context to wl_input_method_context,
input_panel to wl_input_panel and input_panel_surface to
wl_input_panel_surface.
Signed-off-by: Jan Arne Petersen <jpetersen@openismus.com>
diff --git a/src/text-backend.c b/src/text-backend.c
index 2c450b3..02e4d6f 100644
--- a/src/text-backend.c
+++ b/src/text-backend.c
@@ -112,8 +112,8 @@
if (input_method->model == text_input) {
if (input_method->context && input_method->input_method_binding) {
input_method_context_end_keyboard_grab(input_method->context);
- input_method_send_deactivate(input_method->input_method_binding,
- &input_method->context->resource);
+ wl_input_method_send_deactivate(input_method->input_method_binding,
+ &input_method->context->resource);
}
wl_list_remove(&input_method->link);
@@ -150,16 +150,16 @@
wl_list_for_each_safe(input_method, next, &text_input->input_methods, link) {
if (!input_method->context)
continue;
- input_method_context_send_surrounding_text(&input_method->context->resource,
- text,
- cursor,
- anchor);
+ wl_input_method_context_send_surrounding_text(&input_method->context->resource,
+ text,
+ cursor,
+ anchor);
}
}
static void
text_input_activate(struct wl_client *client,
- struct wl_resource *resource,
+ struct wl_resource *resource,
struct wl_resource *seat,
struct wl_resource *surface)
{
@@ -215,7 +215,7 @@
wl_list_for_each_safe(input_method, next, &text_input->input_methods, link) {
if (!input_method->context)
continue;
- input_method_context_send_reset(&input_method->context->resource);
+ wl_input_method_context_send_reset(&input_method->context->resource);
}
}
@@ -250,7 +250,7 @@
wl_list_for_each_safe(input_method, next, &text_input->input_methods, link) {
if (!input_method->context)
continue;
- input_method_context_send_content_type(&input_method->context->resource, hint, purpose);
+ wl_input_method_context_send_content_type(&input_method->context->resource, hint, purpose);
}
}
@@ -266,7 +266,7 @@
wl_list_for_each_safe(input_method, next, &text_input->input_methods, link) {
if (!input_method->context)
continue;
- input_method_context_send_invoke_action(&input_method->context->resource, button, index);
+ wl_input_method_context_send_invoke_action(&input_method->context->resource, button, index);
}
}
@@ -281,7 +281,7 @@
wl_list_for_each_safe(input_method, next, &text_input->input_methods, link) {
if (!input_method->context)
continue;
- input_method_context_send_commit_state(&input_method->context->resource, serial);
+ wl_input_method_context_send_commit_state(&input_method->context->resource, serial);
}
}
@@ -324,8 +324,8 @@
wl_list_for_each_safe(input_method, next, &text_input->input_methods, link) {
if (!input_method->context)
continue;
- input_method_context_send_preferred_language(&input_method->context->resource,
- language);
+ wl_input_method_context_send_preferred_language(&input_method->context->resource,
+ language);
}
}
@@ -512,7 +512,7 @@
struct input_method_context *context = resource->data;
wl_text_input_send_keysym(&context->model->resource, serial, time,
- sym, state, modifiers);
+ sym, state, modifiers);
}
static void
@@ -650,7 +650,7 @@
}
-static const struct input_method_context_interface input_method_context_implementation = {
+static const struct wl_input_method_context_interface input_method_context_implementation = {
input_method_context_destroy,
input_method_context_commit_string,
input_method_context_preedit_string,
@@ -694,7 +694,7 @@
context->resource.destroy = destroy_input_method_context;
context->resource.object.id = 0;
- context->resource.object.interface = &input_method_context_interface;
+ context->resource.object.interface = &wl_input_method_context_interface;
context->resource.object.implementation =
(void (**)(void)) &input_method_context_implementation;
context->resource.data = context;
@@ -706,7 +706,7 @@
wl_client_add_resource(input_method->input_method_binding->client, &context->resource);
- input_method_send_activate(input_method->input_method_binding, &context->resource);
+ wl_input_method_send_activate(input_method->input_method_binding, &context->resource);
}
static void
@@ -748,7 +748,7 @@
struct text_backend *text_backend = input_method->text_backend;
struct wl_resource *resource;
- resource = wl_client_add_object(client, &input_method_interface,
+ resource = wl_client_add_object(client, &wl_input_method_interface,
NULL,
id, input_method);
@@ -841,9 +841,9 @@
return;
text_backend->input_method.client = weston_client_launch(text_backend->compositor,
- &text_backend->input_method.process,
- text_backend->input_method.path,
- handle_input_method_sigchld);
+ &text_backend->input_method.process,
+ text_backend->input_method.path,
+ handle_input_method_sigchld);
if (!text_backend->input_method.client)
weston_log("not able to start %s\n", text_backend->input_method.path);
@@ -870,7 +870,7 @@
input_method->input_method_global =
wl_display_add_global(ec->wl_display,
- &input_method_interface,
+ &wl_input_method_interface,
input_method, bind_input_method);
input_method->destroy_listener.notify = input_method_notifier_destroy;