diff options
| author | Jan Arne Petersen <jpetersen@openismus.com> | 2013-01-16 21:26:48 +0100 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2013-02-15 17:01:12 -0500 |
| commit | 2dc3b3fc9f0ca787d41391461d3249b5190e15db (patch) | |
| tree | 26849cc4f169001b796acc60209259d6517d73ac /clients/keyboard.c | |
| parent | 3489ba9c21d16a1545663b3d0d64b8f10a2a3c17 (diff) | |
| download | weston-2dc3b3fc9f0ca787d41391461d3249b5190e15db.tar.gz weston-2dc3b3fc9f0ca787d41391461d3249b5190e15db.tar.bz2 weston-2dc3b3fc9f0ca787d41391461d3249b5190e15db.zip | |
keyboard: add support for invoke_action
Set the pre-edit cursor on the clicked index on invoke_action.
Signed-off-by: Jan Arne Petersen <jpetersen@openismus.com>
Diffstat (limited to 'clients/keyboard.c')
| -rw-r--r-- | clients/keyboard.c | 32 |
1 files changed, 26 insertions, 6 deletions
diff --git a/clients/keyboard.c b/clients/keyboard.c index 20467df9..564afefd 100644 --- a/clients/keyboard.c +++ b/clients/keyboard.c @@ -331,17 +331,22 @@ virtual_keyboard_commit_preedit(struct virtual_keyboard *keyboard) } static void -virtual_keyboard_send_preedit(struct virtual_keyboard *keyboard) +virtual_keyboard_send_preedit(struct virtual_keyboard *keyboard, + int32_t cursor) { + uint32_t index = strlen(keyboard->preedit_string); + if (keyboard->preedit_style) input_method_context_preedit_styling(keyboard->context, keyboard->serial, 0, strlen(keyboard->preedit_string), keyboard->preedit_style); + if (cursor > 0) + index = cursor; input_method_context_preedit_cursor(keyboard->context, keyboard->serial, - strlen(keyboard->preedit_string)); + index); input_method_context_preedit_string(keyboard->context, keyboard->serial, keyboard->preedit_string, @@ -362,7 +367,7 @@ keyboard_handle_key(struct keyboard *keyboard, uint32_t time, const struct key * keyboard->keyboard->preedit_string = strcat(keyboard->keyboard->preedit_string, label); - virtual_keyboard_send_preedit(keyboard->keyboard); + virtual_keyboard_send_preedit(keyboard->keyboard, -1); break; case keytype_backspace: if (state != WL_POINTER_BUTTON_STATE_PRESSED) @@ -374,7 +379,7 @@ keyboard_handle_key(struct keyboard *keyboard, uint32_t time, const struct key * -1, 1); } else { keyboard->keyboard->preedit_string[strlen(keyboard->keyboard->preedit_string) - 1] = '\0'; - virtual_keyboard_send_preedit(keyboard->keyboard); + virtual_keyboard_send_preedit(keyboard->keyboard, -1); } break; case keytype_enter: @@ -442,7 +447,7 @@ keyboard_handle_key(struct keyboard *keyboard, uint32_t time, const struct key * if (state != WL_POINTER_BUTTON_STATE_PRESSED) break; keyboard->keyboard->preedit_style = (keyboard->keyboard->preedit_style + 1) % 8; /* TODO */ - virtual_keyboard_send_preedit(keyboard->keyboard); + virtual_keyboard_send_preedit(keyboard->keyboard, -1); break; } } @@ -542,10 +547,25 @@ input_method_context_content_type(void *data, keyboard->content_purpose = purpose; } +static void +input_method_context_invoke_action(void *data, + struct input_method_context *context, + uint32_t button, + uint32_t index) +{ + struct virtual_keyboard *keyboard = data; + + if (button != BTN_LEFT) + return; + + virtual_keyboard_send_preedit(keyboard, index); +} + 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_content_type, + input_method_context_invoke_action }; static void |