diff options
| author | Jan Arne Petersen <jpetersen@openismus.com> | 2013-01-31 15:52:20 +0100 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2013-02-15 17:07:03 -0500 |
| commit | 0eabcaafaeeb8648fbe6a2196f34afbbfd18d65a (patch) | |
| tree | 0657a670aa37bf321cec11bb145da4ba6259a96e /clients | |
| parent | f255165bd4cf7b571b7815331a13e3b178886d60 (diff) | |
text: Add commit request
Allows for atomic state changes. Updated surrounding text, content type
and micro focus is taken into account all at once at commit.
Signed-off-by: Jan Arne Petersen <jpetersen@openismus.com>
Diffstat (limited to 'clients')
| -rw-r--r-- | clients/editor.c | 2 | ||||
| -rw-r--r-- | clients/keyboard.c | 35 | ||||
| -rw-r--r-- | clients/weston-simple-im.c | 9 |
3 files changed, 34 insertions, 12 deletions
diff --git a/clients/editor.c b/clients/editor.c index 1eb8f118..5c072f21 100644 --- a/clients/editor.c +++ b/clients/editor.c @@ -558,6 +558,8 @@ text_entry_update(struct text_entry *entry) entry->text, entry->cursor, entry->anchor); + + text_model_commit(entry->model); } static void diff --git a/clients/keyboard.c b/clients/keyboard.c index 986dcff7..8d948704 100644 --- a/clients/keyboard.c +++ b/clients/keyboard.c @@ -45,6 +45,7 @@ struct virtual_keyboard { uint32_t serial; uint32_t content_hint; uint32_t content_purpose; + char *surrounding_text; struct window *window; struct widget *widget; }; @@ -496,17 +497,9 @@ input_method_context_surrounding_text(void *data, uint32_t anchor) { struct virtual_keyboard *keyboard = data; - const struct layout *layout; - - layout = get_current_layout(keyboard); - - fprintf(stderr, "Surrounding text updated: %s\n", text); - - window_schedule_resize(keyboard->window, - layout->columns * key_width, - layout->rows * key_height); - widget_schedule_redraw(keyboard->widget); + free(keyboard->surrounding_text); + keyboard->surrounding_text = strdup(text); } static void @@ -559,11 +552,31 @@ input_method_context_invoke_action(void *data, virtual_keyboard_send_preedit(keyboard, index); } +static void +input_method_context_commit(void *data, + struct input_method_context *context) +{ + struct virtual_keyboard *keyboard = data; + const struct layout *layout; + + layout = get_current_layout(keyboard); + + if (keyboard->surrounding_text) + fprintf(stderr, "Surrounding text updated: %s\n", keyboard->surrounding_text); + + window_schedule_resize(keyboard->window, + layout->columns * key_width, + layout->rows * key_height); + + widget_schedule_redraw(keyboard->widget); +} + static const struct input_method_context_listener input_method_context_listener = { input_method_context_surrounding_text, input_method_context_reset, input_method_context_content_type, - input_method_context_invoke_action + input_method_context_invoke_action, + input_method_context_commit }; static void diff --git a/clients/weston-simple-im.c b/clients/weston-simple-im.c index d0383828..fab7fc56 100644 --- a/clients/weston-simple-im.c +++ b/clients/weston-simple-im.c @@ -140,11 +140,18 @@ input_method_context_invoke_action(void *data, { } +static void +input_method_context_commit(void *data, + struct input_method_context *context) +{ +} + static const struct input_method_context_listener input_method_context_listener = { input_method_context_surrounding_text, input_method_context_reset, input_method_context_content_type, - input_method_context_invoke_action + input_method_context_invoke_action, + input_method_context_commit }; static void |