#include "compositor.h"
#include "text-server-protocol.h"
+#include "input-method-server-protocol.h"
struct input_method;
+struct input_method_context;
struct text_model {
struct wl_resource resource;
struct wl_surface *surface;
};
+struct text_model_factory {
+ struct wl_global *text_model_factory_global;
+ struct wl_listener destroy_listener;
+
+ struct weston_compositor *ec;
+};
+
struct input_method {
struct wl_resource *input_method_binding;
struct wl_global *input_method_global;
- struct wl_global *text_model_factory_global;
struct wl_listener destroy_listener;
- struct weston_compositor *ec;
+ struct weston_seat *seat;
struct text_model *model;
struct wl_list link;
struct wl_listener keyboard_focus_listener;
int focus_listener_initialized;
+
+ struct input_method_context *context;
+};
+
+struct input_method_context {
+ struct wl_resource resource;
+
+ struct text_model *model;
+
+ struct wl_list link;
};
+static void input_method_context_create(struct text_model *model,
+ struct input_method *input_method);
+
static void input_method_init_seat(struct weston_seat *seat);
static void
struct weston_compositor *ec = text_model->ec;
if (input_method->model == text_model) {
+ if (input_method->input_method_binding)
+ input_method_send_deactivate(input_method->input_method_binding, &input_method->context->resource);
wl_list_remove(&input_method->link);
input_method->model = NULL;
+ input_method->context = NULL;
wl_signal_emit(&ec->hide_input_panel_signal, ec);
text_model_send_deactivated(&text_model->resource);
}
static void
text_model_set_surrounding_text(struct wl_client *client,
struct wl_resource *resource,
- const char *text)
+ const char *text,
+ uint32_t cursor,
+ uint32_t anchor)
{
-}
+ struct text_model *text_model = resource->data;
+ struct input_method *input_method, *next;
-static void
-text_model_set_cursor_index(struct wl_client *client,
- struct wl_resource *resource,
- uint32_t index)
-{
+ wl_list_for_each_safe(input_method, next, &text_model->input_methods, link) {
+ if (!input_method->context)
+ continue;
+ input_method_context_send_surrounding_text(&input_method->context->resource,
+ text,
+ cursor,
+ anchor);
+ }
}
static void
{
struct text_model *text_model = resource->data;
struct weston_seat *weston_seat = seat->data;
+ struct input_method *input_method = weston_seat->input_method;
struct text_model *old = weston_seat->input_method->model;
struct weston_compositor *ec = text_model->ec;
weston_seat->input_method);
}
- weston_seat->input_method->model = text_model;
- wl_list_insert(&text_model->input_methods, &weston_seat->input_method->link);
+ input_method->model = text_model;
+ wl_list_insert(&text_model->input_methods, &input_method->link);
input_method_init_seat(weston_seat);
text_model->surface = surface->data;
+ input_method_context_create(text_model, input_method);
+
wl_signal_emit(&ec->show_input_panel_signal, ec);
text_model_send_activated(&text_model->resource);
}
static void
-text_model_set_selected_text(struct wl_client *client,
- struct wl_resource *resource,
- const char *text,
- int32_t index)
-{
-}
-
-static void
text_model_set_micro_focus(struct wl_client *client,
struct wl_resource *resource,
int32_t x,
static const struct text_model_interface text_model_implementation = {
text_model_set_surrounding_text,
- text_model_set_cursor_index,
text_model_activate,
text_model_deactivate,
- text_model_set_selected_text,
text_model_set_micro_focus,
text_model_set_preedit,
text_model_set_content_type
struct wl_resource *resource,
uint32_t id)
{
- struct input_method *input_method = resource->data;
+ struct text_model_factory *text_model_factory = resource->data;
struct text_model *text_model;
text_model = calloc(1, sizeof *text_model);
- text_model->resource.destroy = destroy_text_model;
-
text_model->resource.object.id = id;
text_model->resource.object.interface = &text_model_interface;
text_model->resource.object.implementation =
(void (**)(void)) &text_model_implementation;
- text_model->resource.data = text_model;
- text_model->ec = input_method->ec;
+ text_model->resource.data = text_model;
+ text_model->resource.destroy = destroy_text_model;
- wl_client_add_resource(client, &text_model->resource);
+ text_model->ec = text_model_factory->ec;
wl_list_init(&text_model->input_methods);
+
+ wl_client_add_resource(client, &text_model->resource);
};
static const struct text_model_factory_interface text_model_factory_implementation = {
uint32_t version,
uint32_t id)
{
- struct input_method *input_method = data;
+ struct text_model_factory *text_model_factory = data;
/* No checking for duplicate binding necessary.
* No events have to be sent, so we don't need the return value. */
wl_client_add_object(client, &text_model_factory_interface,
&text_model_factory_implementation,
- id, input_method);
+ id, text_model_factory);
}
static void
-input_method_commit_string(struct wl_client *client,
- struct wl_resource *resource,
- const char *text,
- uint32_t index)
+text_model_factory_notifier_destroy(struct wl_listener *listener, void *data)
{
- struct input_method *input_method = resource->data;
+ struct text_model_factory *text_model_factory =
+ container_of(listener, struct text_model_factory, destroy_listener);
- if (input_method->model) {
- text_model_send_commit_string(&input_method->model->resource, text, index);
- }
+ wl_display_remove_global(text_model_factory->ec->wl_display,
+ text_model_factory->text_model_factory_global);
+
+ free(text_model_factory);
+}
+
+WL_EXPORT void
+text_model_factory_create(struct weston_compositor *ec)
+{
+ struct text_model_factory *text_model_factory;
+
+ text_model_factory = calloc(1, sizeof *text_model_factory);
+
+ text_model_factory->ec = ec;
+
+ text_model_factory->text_model_factory_global =
+ wl_display_add_global(ec->wl_display,
+ &text_model_factory_interface,
+ text_model_factory, bind_text_model_factory);
+
+ text_model_factory->destroy_listener.notify = text_model_factory_notifier_destroy;
+ wl_signal_add(&ec->destroy_signal, &text_model_factory->destroy_listener);
+}
+
+static void
+input_method_context_destroy(struct wl_client *client,
+ struct wl_resource *resource)
+{
+ wl_resource_destroy(resource);
+}
+
+static void
+input_method_context_commit_string(struct wl_client *client,
+ struct wl_resource *resource,
+ const char *text,
+ uint32_t index)
+{
+ struct input_method_context *context = resource->data;
+
+ text_model_send_commit_string(&context->model->resource, text, index);
+}
+
+static void
+input_method_context_preedit_string(struct wl_client *client,
+ struct wl_resource *resource,
+ const char *text,
+ uint32_t index)
+{
+ struct input_method_context *context = resource->data;
+
+ text_model_send_preedit_string(&context->model->resource, text, index);
+}
+
+static void
+input_method_context_delete_surrounding_text(struct wl_client *client,
+ struct wl_resource *resource,
+ int32_t index,
+ uint32_t length)
+{
+ struct input_method_context *context = resource->data;
+
+ text_model_send_delete_surrounding_text(&context->model->resource, index, length);
}
-static const struct input_method_interface input_method_implementation = {
- input_method_commit_string
+static const struct input_method_context_interface input_method_context_implementation = {
+ input_method_context_destroy,
+ input_method_context_commit_string,
+ input_method_context_preedit_string,
+ input_method_context_delete_surrounding_text
};
static void
+destroy_input_method_context(struct wl_resource *resource)
+{
+ struct input_method_context *context = resource->data;
+
+ free(context);
+}
+
+static void
+input_method_context_create(struct text_model *model,
+ struct input_method *input_method)
+{
+ struct input_method_context *context;
+
+ if (!input_method->input_method_binding)
+ return;
+
+ context = malloc(sizeof *context);
+ if (context == NULL)
+ return;
+
+ context->resource.destroy = destroy_input_method_context;
+ context->resource.object.id = 0;
+ context->resource.object.interface = &input_method_context_interface;
+ context->resource.object.implementation =
+ (void (**)(void)) &input_method_context_implementation;
+ context->resource.data = context;
+ wl_signal_init(&context->resource.destroy_signal);
+
+ context->model = model;
+ input_method->context = context;
+
+ wl_client_add_resource(input_method->input_method_binding->client, &context->resource);
+
+ input_method_send_activate(input_method->input_method_binding, &context->resource);
+}
+
+static void
unbind_input_method(struct wl_resource *resource)
{
struct input_method *input_method = resource->data;
input_method->input_method_binding = NULL;
+ input_method->context = NULL;
+
free(resource);
}
struct wl_resource *resource;
resource = wl_client_add_object(client, &input_method_interface,
- &input_method_implementation,
+ NULL,
id, input_method);
if (input_method->input_method_binding == NULL) {
struct input_method *input_method =
container_of(listener, struct input_method, destroy_listener);
- wl_display_remove_global(input_method->ec->wl_display,
+ if (input_method->model)
+ deactivate_text_model(input_method->model, input_method);
+
+ wl_display_remove_global(input_method->seat->compositor->wl_display,
input_method->input_method_global);
- wl_display_remove_global(input_method->ec->wl_display,
- input_method->text_model_factory_global);
+
free(input_method);
}
seat->input_method->focus_listener_initialized = 1;
}
-void
+WL_EXPORT void
input_method_create(struct weston_compositor *ec,
struct weston_seat *seat)
{
input_method = calloc(1, sizeof *input_method);
- input_method->ec = ec;
+ input_method->seat = seat;
input_method->model = NULL;
input_method->focus_listener_initialized = 0;
+ input_method->context = NULL;
input_method->input_method_global =
wl_display_add_global(ec->wl_display,
&input_method_interface,
input_method, bind_input_method);
- input_method->text_model_factory_global =
- wl_display_add_global(ec->wl_display,
- &text_model_factory_interface,
- input_method, bind_text_model_factory);
-
input_method->destroy_listener.notify = input_method_notifier_destroy;
- wl_signal_add(&ec->destroy_signal, &input_method->destroy_listener);
+ wl_signal_add(&seat->seat.destroy_signal, &input_method->destroy_listener);
seat->input_method = input_method;
}