mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

text: Split out cursor_position

Browse Source 
Add an extra cursor_position, which also allows to change the anchor
(for slections). Change the index type to int to allow setting it before
the beginning of a commited string.

The cursor should not be moved as a direct repsonse to this event but
atomically on the next commit_string event.

Signed-off-by: Jan Arne Petersen <jpetersen@openismus.com>
This commit is contained in:
Jan Arne Petersen
2013-01-31 15:52:23 +01:00
committed by Kristian Høgsberg
parent 964b517c9b
commit 1cc9e08d2f
6 changed files with 83 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/text-backend.c
+15 -3
View File
@@ -397,12 +397,11 @@ static void
input_method_context_commit_string(struct wl_client *client,
struct wl_resource *resource,
uint32_t serial,
const char *text,
uint32_t index)
const char *text)
{
struct input_method_context *context = resource->data;
text_model_send_commit_string(&context->model->resource, serial, text, index);
text_model_send_commit_string(&context->model->resource, serial, text);
}
static void
@@ -453,6 +452,18 @@ input_method_context_delete_surrounding_text(struct wl_client *client,
text_model_send_delete_surrounding_text(&context->model->resource, serial, index, length);
}
static void
input_method_context_cursor_position(struct wl_client *client,
struct wl_resource *resource,
uint32_t serial,
int32_t index,
int32_t anchor)
{
struct input_method_context *context = resource->data;
text_model_send_cursor_position(&context->model->resource, serial, index, anchor);
}
static void
input_method_context_modifiers_map(struct wl_client *client,
struct wl_resource *resource,
@@ -597,6 +608,7 @@ static const struct input_method_context_interface input_method_context_implemen
input_method_context_preedit_styling,
input_method_context_preedit_cursor,
input_method_context_delete_surrounding_text,
input_method_context_cursor_position,
input_method_context_modifiers_map,
input_method_context_keysym,
input_method_context_grab_keyboard,