Merge pull request #1203 from dcz-purism/input

Support input method and text input
This commit is contained in:
Drew DeVault 2018-10-12 13:44:46 +02:00 committed by GitHub
commit 66e8908e9a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 2944 additions and 1 deletions

View file

@ -34,6 +34,7 @@ lib_wlr_types = static_library(
'wlr_idle.c',
'wlr_input_device.c',
'wlr_input_inhibitor.c',
'wlr_input_method_v2.c',
'wlr_keyboard.c',
'wlr_layer_shell_v1.c',
'wlr_linux_dmabuf_v1.c',
@ -53,6 +54,7 @@ lib_wlr_types = static_library(
'wlr_surface.c',
'wlr_tablet_pad.c',
'wlr_tablet_tool.c',
'wlr_text_input_v3.c',
'wlr_touch.c',
'wlr_virtual_keyboard_v1.c',
'wlr_wl_shell.c',

297
types/wlr_input_method_v2.c Normal file
View file

@ -0,0 +1,297 @@
#ifndef _POSIX_C_SOURCE
#define _POSIX_C_SOURCE 200809L
#endif
#include <assert.h>
#include <string.h>
#include <wayland-util.h>
#include <wlr/types/wlr_input_method_v2.h>
#include <wlr/types/wlr_surface.h>
#include <wlr/util/log.h>
#include <xkbcommon/xkbcommon.h>
#include "input-method-unstable-v2-protocol.h"
#include "util/signal.h"
static const struct zwp_input_method_v2_interface input_method_impl;
static struct wlr_input_method_v2 *input_method_from_resource(
struct wl_resource *resource) {
assert(wl_resource_instance_of(resource,
&zwp_input_method_v2_interface, &input_method_impl));
return wl_resource_get_user_data(resource);
}
static void input_method_destroy(struct wlr_input_method_v2 *input_method) {
wlr_signal_emit_safe(&input_method->events.destroy, input_method);
wl_list_remove(&input_method->seat_destroy.link);
free(input_method->pending.commit_text);
free(input_method->pending.preedit.text);
free(input_method->current.commit_text);
free(input_method->current.preedit.text);
free(input_method);
}
static void input_method_resource_destroy(struct wl_resource *resource) {
struct wlr_input_method_v2 *input_method =
input_method_from_resource(resource);
if (!input_method) {
return;
}
input_method_destroy(input_method);
}
static void im_destroy(struct wl_client *client, struct wl_resource *resource) {
wl_resource_destroy(resource);
}
static void im_commit(struct wl_client *client, struct wl_resource *resource,
uint32_t serial) {
struct wlr_input_method_v2 *input_method =
input_method_from_resource(resource);
if (!input_method) {
return;
}
input_method->current = input_method->pending;
input_method->current_serial = serial;
struct wlr_input_method_v2_state default_state = {0};
input_method->pending = default_state;
wlr_signal_emit_safe(&input_method->events.commit, (void*)input_method);
}
static void im_commit_string(struct wl_client *client,
struct wl_resource *resource, const char *text) {
struct wlr_input_method_v2 *input_method =
input_method_from_resource(resource);
if (!input_method) {
return;
}
free(input_method->pending.commit_text);
input_method->pending.commit_text = strdup(text);
}
static void im_set_preedit_string(struct wl_client *client,
struct wl_resource *resource, const char *text, int32_t cursor_begin,
int32_t cursor_end) {
struct wlr_input_method_v2 *input_method =
input_method_from_resource(resource);
if (!input_method) {
return;
}
input_method->pending.preedit.cursor_begin = cursor_begin;
input_method->pending.preedit.cursor_end = cursor_end;
free(input_method->pending.preedit.text);
input_method->pending.preedit.text = strdup(text);
}
static void im_delete_surrounding_text(struct wl_client *client,
struct wl_resource *resource,
uint32_t before_length, uint32_t after_length) {
struct wlr_input_method_v2 *input_method =
input_method_from_resource(resource);
if (!input_method) {
return;
}
input_method->pending.delete.before_length = before_length;
input_method->pending.delete.after_length = after_length;
}
static void im_get_input_popup_surface(struct wl_client *client,
struct wl_resource *resource, uint32_t id,
struct wl_resource *surface) {
wlr_log(WLR_INFO, "Stub: zwp_input_method_v2::get_input_popup_surface");
}
static void im_grab_keyboard(struct wl_client *client,
struct wl_resource *resource, uint32_t keyboard) {
wlr_log(WLR_INFO, "Stub: zwp_input_method_v2::grab_keyboard");
}
static const struct zwp_input_method_v2_interface input_method_impl = {
.destroy = im_destroy,
.commit = im_commit,
.commit_string = im_commit_string,
.set_preedit_string = im_set_preedit_string,
.delete_surrounding_text = im_delete_surrounding_text,
.get_input_popup_surface = im_get_input_popup_surface,
.grab_keyboard = im_grab_keyboard,
};
void wlr_input_method_v2_send_activate(
struct wlr_input_method_v2 *input_method) {
zwp_input_method_v2_send_activate(input_method->resource);
input_method->active = true;
}
void wlr_input_method_v2_send_deactivate(
struct wlr_input_method_v2 *input_method) {
zwp_input_method_v2_send_deactivate(input_method->resource);
input_method->active = false;
}
void wlr_input_method_v2_send_surrounding_text(
struct wlr_input_method_v2 *input_method, const char *text,
uint32_t cursor, uint32_t anchor) {
const char *send_text = text;
if (!send_text) {
send_text = "";
}
zwp_input_method_v2_send_surrounding_text(input_method->resource, send_text,
cursor, anchor);
}
void wlr_input_method_v2_send_text_change_cause(
struct wlr_input_method_v2 *input_method, uint32_t cause) {
zwp_input_method_v2_send_text_change_cause(input_method->resource, cause);
}
void wlr_input_method_v2_send_content_type(
struct wlr_input_method_v2 *input_method,
uint32_t hint, uint32_t purpose) {
zwp_input_method_v2_send_content_type(input_method->resource, hint,
purpose);
}
void wlr_input_method_v2_send_done(struct wlr_input_method_v2 *input_method) {
zwp_input_method_v2_send_done(input_method->resource);
input_method->client_active = input_method->active;
input_method->current_serial++;
}
void wlr_input_method_v2_send_unavailable(
struct wlr_input_method_v2 *input_method) {
zwp_input_method_v2_send_unavailable(input_method->resource);
struct wl_resource *resource = input_method->resource;
input_method_destroy(input_method);
wl_resource_set_user_data(resource, NULL);
}
static const struct zwp_input_method_manager_v2_interface
input_method_manager_impl;
static struct wlr_input_method_manager_v2 *input_method_manager_from_resource(
struct wl_resource *resource) {
assert(wl_resource_instance_of(resource,
&zwp_input_method_manager_v2_interface, &input_method_manager_impl));
return wl_resource_get_user_data(resource);
}
static void input_method_handle_seat_destroy(struct wl_listener *listener,
void *data) {
struct wlr_input_method_v2 *input_method = wl_container_of(listener,
input_method, seat_destroy);
wlr_input_method_v2_send_unavailable(input_method);
}
static void manager_get_input_method(struct wl_client *client,
struct wl_resource *resource, struct wl_resource *seat,
uint32_t input_method_id) {
struct wlr_input_method_manager_v2 *im_manager =
input_method_manager_from_resource(resource);
struct wlr_input_method_v2 *input_method = calloc(1,
sizeof(struct wlr_input_method_v2));
if (!input_method) {
wl_client_post_no_memory(client);
return;
}
wl_signal_init(&input_method->events.commit);
wl_signal_init(&input_method->events.destroy);
int version = wl_resource_get_version(resource);
struct wl_resource *im_resource = wl_resource_create(client,
&zwp_input_method_v2_interface, version, input_method_id);
if (im_resource == NULL) {
free(input_method);
wl_client_post_no_memory(client);
return;
}
wl_resource_set_implementation(im_resource, &input_method_impl,
input_method, input_method_resource_destroy);
struct wlr_seat_client *seat_client = wlr_seat_client_from_resource(seat);
wl_signal_add(&seat_client->events.destroy,
&input_method->seat_destroy);
input_method->seat_destroy.notify =
input_method_handle_seat_destroy;
input_method->resource = im_resource;
input_method->seat = seat_client->seat;
wl_list_insert(&im_manager->input_methods,
wl_resource_get_link(input_method->resource));
wlr_signal_emit_safe(&im_manager->events.input_method, input_method);
}
static void manager_destroy(struct wl_client *client,
struct wl_resource *resource) {
wl_resource_destroy(resource);
}
static const struct zwp_input_method_manager_v2_interface
input_method_manager_impl = {
.get_input_method = manager_get_input_method,
.destroy = manager_destroy,
};
static void input_method_manager_unbind(struct wl_resource *resource) {
wl_list_remove(wl_resource_get_link(resource));
}
static void input_method_manager_bind(struct wl_client *wl_client, void *data,
uint32_t version, uint32_t id) {
assert(wl_client);
struct wlr_input_method_manager_v2 *im_manager = data;
struct wl_resource *bound_resource = wl_resource_create(wl_client,
&zwp_input_method_manager_v2_interface, version, id);
if (bound_resource == NULL) {
wl_client_post_no_memory(wl_client);
return;
}
wl_resource_set_implementation(bound_resource, &input_method_manager_impl,
im_manager, input_method_manager_unbind);
wl_list_insert(&im_manager->bound_resources,
wl_resource_get_link(bound_resource));
}
static void handle_display_destroy(struct wl_listener *listener, void *data) {
struct wlr_input_method_manager_v2 *manager =
wl_container_of(listener, manager, display_destroy);
wlr_input_method_manager_v2_destroy(manager);
}
struct wlr_input_method_manager_v2 *wlr_input_method_manager_v2_create(
struct wl_display *display) {
struct wlr_input_method_manager_v2 *im_manager = calloc(1,
sizeof(struct wlr_input_method_manager_v2));
if (!im_manager) {
return NULL;
}
wl_signal_init(&im_manager->events.input_method);
wl_list_init(&im_manager->bound_resources);
wl_list_init(&im_manager->input_methods);
im_manager->display_destroy.notify = handle_display_destroy;
wl_display_add_destroy_listener(display, &im_manager->display_destroy);
im_manager->global = wl_global_create(display,
&zwp_input_method_manager_v2_interface, 1, im_manager,
input_method_manager_bind);
return im_manager;
}
void wlr_input_method_manager_v2_destroy(
struct wlr_input_method_manager_v2 *manager) {
wlr_signal_emit_safe(&manager->events.destroy, manager);
wl_list_remove(&manager->display_destroy.link);
struct wl_resource *resource, *resource_tmp;
wl_resource_for_each_safe(resource, resource_tmp,
&manager->bound_resources) {
wl_resource_destroy(resource);
}
struct wlr_input_method_v2 *im, *im_tmp;
wl_list_for_each_safe(im, im_tmp, &manager->input_methods, link) {
wl_resource_destroy(im->resource);
}
wl_global_destroy(manager->global);
free(manager);
}

331
types/wlr_text_input_v3.c Normal file
View file

@ -0,0 +1,331 @@
#ifndef _POSIX_C_SOURCE
#define _POSIX_C_SOURCE 200809L
#endif
#include <assert.h>
#include <stdlib.h>
#include <stddef.h>
#include <wlr/types/wlr_text_input_v3.h>
#include <wlr/util/log.h>
#include "text-input-unstable-v3-protocol.h"
#include "util/signal.h"
static const struct zwp_text_input_v3_interface text_input_impl;
static struct wlr_text_input_v3 *text_input_from_resource(
struct wl_resource *resource) {
assert(wl_resource_instance_of(resource, &zwp_text_input_v3_interface,
&text_input_impl));
return wl_resource_get_user_data(resource);
}
void wlr_text_input_v3_send_enter(struct wlr_text_input_v3 *text_input,
struct wlr_surface *surface) {
assert(wl_resource_get_client(text_input->resource)
== wl_resource_get_client(surface->resource));
text_input->focused_surface = surface;
wl_signal_add(&text_input->focused_surface->events.destroy,
&text_input->surface_destroy);
zwp_text_input_v3_send_enter(text_input->resource,
text_input->focused_surface->resource);
}
void wlr_text_input_v3_send_leave(struct wlr_text_input_v3 *text_input) {
zwp_text_input_v3_send_leave(text_input->resource,
text_input->focused_surface->resource);
wl_list_remove(&text_input->surface_destroy.link);
text_input->focused_surface = NULL;
}
void wlr_text_input_v3_send_preedit_string(struct wlr_text_input_v3 *text_input,
const char *text, uint32_t cursor_begin, uint32_t cursor_end) {
zwp_text_input_v3_send_preedit_string(text_input->resource, text,
cursor_begin, cursor_end);
}
void wlr_text_input_v3_send_commit_string(struct wlr_text_input_v3 *text_input,
const char *text) {
zwp_text_input_v3_send_commit_string(text_input->resource, text);
}
void wlr_text_input_v3_send_delete_surrounding_text(
struct wlr_text_input_v3 *text_input, uint32_t before_length,
uint32_t after_length) {
zwp_text_input_v3_send_delete_surrounding_text(text_input->resource,
before_length, after_length);
}
void wlr_text_input_v3_send_done(struct wlr_text_input_v3 *text_input) {
zwp_text_input_v3_send_done(text_input->resource,
text_input->current_serial);
}
static void wlr_text_input_destroy(struct wlr_text_input_v3 *text_input) {
wlr_signal_emit_safe(&text_input->events.destroy, text_input);
wl_list_remove(&text_input->seat_destroy.link);
// remove from manager::text_inputs
wl_list_remove(&text_input->link);
free(text_input->current.surrounding.text);
free(text_input->pending.surrounding.text);
free(text_input);
}
static void text_input_resource_destroy(struct wl_resource *resource) {
struct wlr_text_input_v3 *text_input = text_input_from_resource(resource);
if (!text_input) {
return;
}
wlr_text_input_destroy(text_input);
}
static void text_input_destroy(struct wl_client *client,
struct wl_resource *resource) {
wl_resource_destroy(resource);
}
static void text_input_enable(struct wl_client *client,
struct wl_resource *resource) {
struct wlr_text_input_v3 *text_input = text_input_from_resource(resource);
if (!text_input) {
return;
}
struct wlr_text_input_v3_state defaults = {0};
free(text_input->pending.surrounding.text);
text_input->pending = defaults;
text_input->pending_enabled = true;
}
static void text_input_disable(struct wl_client *client,
struct wl_resource *resource) {
struct wlr_text_input_v3 *text_input = text_input_from_resource(resource);
if (!text_input) {
return;
}
text_input->pending_enabled = false;
}
static void text_input_set_surrounding_text(struct wl_client *client,
struct wl_resource *resource, const char *text, int32_t cursor,
int32_t anchor) {
struct wlr_text_input_v3 *text_input = text_input_from_resource(resource);
if (!text_input) {
return;
}
free(text_input->pending.surrounding.text);
text_input->pending.surrounding.text = strdup(text);
if (!text_input->pending.surrounding.text) {
wl_client_post_no_memory(client);
}
text_input->pending.surrounding.cursor = cursor;
text_input->pending.surrounding.anchor = anchor;
}
static void text_input_set_text_change_cause(struct wl_client *client,
struct wl_resource *resource, uint32_t cause) {
struct wlr_text_input_v3 *text_input = text_input_from_resource(resource);
if (!text_input) {
return;
}
text_input->pending.text_change_cause = cause;
}
static void text_input_set_content_type(struct wl_client *client,
struct wl_resource *resource, uint32_t hint, uint32_t purpose) {
struct wlr_text_input_v3 *text_input = text_input_from_resource(resource);
if (!text_input) {
return;
}
text_input->pending.content_type.hint = hint;
text_input->pending.content_type.purpose = purpose;
}
static void text_input_set_cursor_rectangle(struct wl_client *client,
struct wl_resource *resource, int32_t x, int32_t y, int32_t width,
int32_t height) {
struct wlr_text_input_v3 *text_input = text_input_from_resource(resource);
if (!text_input) {
return;
}
text_input->pending.cursor_rectangle.x = x;
text_input->pending.cursor_rectangle.y = y;
text_input->pending.cursor_rectangle.width = width;
text_input->pending.cursor_rectangle.height = height;
}
static void text_input_commit(struct wl_client *client,
struct wl_resource *resource) {
struct wlr_text_input_v3 *text_input = text_input_from_resource(resource);
if (!text_input) {
return;
}
free(text_input->current.surrounding.text);
text_input->current = text_input->pending;
if (text_input->pending.surrounding.text) {
text_input->current.surrounding.text =
strdup(text_input->pending.surrounding.text);
}
bool old_enabled = text_input->current_enabled;
text_input->current_enabled = text_input->pending_enabled;
text_input->current_serial++;
if (text_input->current_enabled && text_input->focused_surface == NULL) {
wl_resource_post_error(text_input->resource, 0, "Text input was not"
"entered, and cannot be enabled\n");
return;
}
if (!old_enabled && text_input->current_enabled) {
wlr_signal_emit_safe(&text_input->events.enable, text_input);
} else if (old_enabled && !text_input->current_enabled) {
wlr_signal_emit_safe(&text_input->events.disable, text_input);
} else { // including never enabled
wlr_signal_emit_safe(&text_input->events.commit, text_input);
}
}
static const struct zwp_text_input_v3_interface text_input_impl = {
.destroy = text_input_destroy,
.enable = text_input_enable,
.disable = text_input_disable,
.set_surrounding_text = text_input_set_surrounding_text,
.set_text_change_cause = text_input_set_text_change_cause,
.set_content_type = text_input_set_content_type,
.set_cursor_rectangle = text_input_set_cursor_rectangle,
.commit = text_input_commit,
};
static const struct zwp_text_input_manager_v3_interface text_input_manager_impl;
static struct wlr_text_input_manager_v3 *text_input_manager_from_resource(
struct wl_resource *resource) {
assert(wl_resource_instance_of(resource,
&zwp_text_input_manager_v3_interface, &text_input_manager_impl));
return wl_resource_get_user_data(resource);
}
static void text_input_manager_destroy(struct wl_client *client,
struct wl_resource *resource) {
wl_resource_destroy(resource);
}
static void text_input_handle_seat_destroy(struct wl_listener *listener,
void *data) {
struct wlr_text_input_v3 *text_input = wl_container_of(listener, text_input,
seat_destroy);
struct wl_resource *resource = text_input->resource;
wlr_text_input_destroy(text_input);
wl_resource_set_user_data(resource, NULL);
}
static void text_input_handle_focused_surface_destroy(
struct wl_listener *listener, void *data) {
struct wlr_text_input_v3 *text_input = wl_container_of(listener, text_input,
surface_destroy);
text_input->focused_surface = NULL;
}
static void text_input_manager_get_text_input(struct wl_client *client,
struct wl_resource *resource, uint32_t id, struct wl_resource *seat) {
struct wlr_text_input_v3 *text_input =
calloc(1, sizeof(struct wlr_text_input_v3));
if (text_input == NULL) {
wl_client_post_no_memory(client);
return;
}
wl_signal_init(&text_input->events.enable);
wl_signal_init(&text_input->events.commit);
wl_signal_init(&text_input->events.disable);
wl_signal_init(&text_input->events.destroy);
int version = wl_resource_get_version(resource);
struct wl_resource *text_input_resource = wl_resource_create(client,
&zwp_text_input_v3_interface, version, id);
if (text_input_resource == NULL) {
free(text_input);
wl_client_post_no_memory(client);
return;
}
text_input->resource = text_input_resource;
wl_resource_set_implementation(text_input->resource, &text_input_impl,
text_input, text_input_resource_destroy);
struct wlr_seat_client *seat_client = wlr_seat_client_from_resource(seat);
struct wlr_seat *wlr_seat = seat_client->seat;
text_input->seat = wlr_seat;
wl_signal_add(&seat_client->events.destroy,
&text_input->seat_destroy);
text_input->seat_destroy.notify =
text_input_handle_seat_destroy;
text_input->surface_destroy.notify =
text_input_handle_focused_surface_destroy;
struct wlr_text_input_manager_v3 *manager =
text_input_manager_from_resource(resource);
wl_list_insert(&manager->text_inputs, &text_input->link);
wlr_signal_emit_safe(&manager->events.text_input, text_input);
}
static const struct zwp_text_input_manager_v3_interface
text_input_manager_impl = {
.destroy = text_input_manager_destroy,
.get_text_input = text_input_manager_get_text_input,
};
static void text_input_manager_unbind(struct wl_resource *resource) {
wl_list_remove(wl_resource_get_link(resource));
}
static void text_input_manager_bind(struct wl_client *wl_client, void *data,
uint32_t version, uint32_t id) {
struct wlr_text_input_manager_v3 *manager = data;
assert(wl_client && manager);
struct wl_resource *resource = wl_resource_create(wl_client,
&zwp_text_input_manager_v3_interface, version, id);
if (resource == NULL) {
wl_client_post_no_memory(wl_client);
return;
}
wl_list_insert(&manager->bound_resources, wl_resource_get_link(resource));
wl_resource_set_implementation(resource, &text_input_manager_impl,
manager, text_input_manager_unbind);
}
struct wlr_text_input_manager_v3 *wlr_text_input_manager_v3_create(
struct wl_display *wl_display) {
struct wlr_text_input_manager_v3 *manager =
calloc(1, sizeof(struct wlr_text_input_manager_v3));
wl_list_init(&manager->bound_resources);
wl_list_init(&manager->text_inputs);
wl_signal_init(&manager->events.text_input);
manager->global = wl_global_create(wl_display,
&zwp_text_input_manager_v3_interface, 1, manager,
text_input_manager_bind);
if (!manager->global) {
free(manager);
return NULL;
}
return manager;
}
void wlr_text_input_manager_v3_destroy(
struct wlr_text_input_manager_v3 *manager) {
wlr_signal_emit_safe(&manager->events.destroy, manager);
wl_list_remove(&manager->display_destroy.link);
struct wl_resource *resource, *resource_tmp;
wl_resource_for_each_safe(resource, resource_tmp,
&manager->bound_resources) {
wl_resource_destroy(resource);
}
struct wlr_text_input_v3 *text_input, *text_input_tmp;
wl_list_for_each_safe(text_input, text_input_tmp, &manager->text_inputs,
link) {
wl_resource_destroy(text_input->resource);
}
wl_global_destroy(manager->global);
free(manager);
}