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

keyboard: commit preedit before sending key events

Browse Source 
Commit the current preedit text before sending control key events.

Signed-off-by: Jan Arne Petersen <jpetersen@openismus.com>
This commit is contained in:
Jan Arne Petersen
2012-11-05 03:26:42 +01:00
committed by Kristian Høgsberg
parent 8083e019cd
commit 5ec05fb251
1 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/keyboard.c
+24 -8
View File
@@ -216,6 +216,23 @@ resize_handler(struct widget *widget,
/* struct keyboard *keyboard = data; */ /* struct keyboard *keyboard = data; */
} }
static void
virtual_keyboard_commit_preedit(struct virtual_keyboard *keyboard)
{
if (!keyboard->preedit_string ||
strlen(keyboard->preedit_string) == 0)
return;
input_method_context_preedit_string(keyboard->context,
"",
0);
input_method_context_commit_string(keyboard->context,
keyboard->preedit_string,
strlen(keyboard->preedit_string));
free(keyboard->preedit_string);
keyboard->preedit_string = strdup("");
}
static void static void
keyboard_handle_key(struct keyboard *keyboard, const struct key *key) keyboard_handle_key(struct keyboard *keyboard, const struct key *key)
{ {
@@ -241,20 +258,14 @@ keyboard_handle_key(struct keyboard *keyboard, const struct key *key)
} }
break; break;
case keytype_enter: case keytype_enter:
virtual_keyboard_commit_preedit(keyboard->keyboard);
input_method_context_key(keyboard->keyboard->context, input_method_context_key(keyboard->keyboard->context,
XKB_KEY_KP_Enter, WL_KEYBOARD_KEY_STATE_PRESSED); XKB_KEY_KP_Enter, WL_KEYBOARD_KEY_STATE_PRESSED);
break; break;
case keytype_space: case keytype_space:
keyboard->keyboard->preedit_string = strcat(keyboard->keyboard->preedit_string, keyboard->keyboard->preedit_string = strcat(keyboard->keyboard->preedit_string,
" "); " ");
input_method_context_preedit_string(keyboard->keyboard->context, virtual_keyboard_commit_preedit(keyboard->keyboard);
"",
0);
input_method_context_commit_string(keyboard->keyboard->context,
keyboard->keyboard->preedit_string,
strlen(keyboard->keyboard->preedit_string));
free(keyboard->keyboard->preedit_string);
keyboard->keyboard->preedit_string = strdup("");
break; break;
case keytype_switch: case keytype_switch:
if (keyboard->state == keyboardstate_default) if (keyboard->state == keyboardstate_default)
@@ -265,22 +276,27 @@ keyboard_handle_key(struct keyboard *keyboard, const struct key *key)
case keytype_symbols: case keytype_symbols:
break; break;
case keytype_tab: case keytype_tab:
virtual_keyboard_commit_preedit(keyboard->keyboard);
input_method_context_key(keyboard->keyboard->context, input_method_context_key(keyboard->keyboard->context,
XKB_KEY_Tab, WL_KEYBOARD_KEY_STATE_PRESSED); XKB_KEY_Tab, WL_KEYBOARD_KEY_STATE_PRESSED);
break; break;
case keytype_arrow_up: case keytype_arrow_up:
virtual_keyboard_commit_preedit(keyboard->keyboard);
input_method_context_key(keyboard->keyboard->context, input_method_context_key(keyboard->keyboard->context,
XKB_KEY_Up, WL_KEYBOARD_KEY_STATE_PRESSED); XKB_KEY_Up, WL_KEYBOARD_KEY_STATE_PRESSED);
break; break;
case keytype_arrow_left: case keytype_arrow_left:
virtual_keyboard_commit_preedit(keyboard->keyboard);
input_method_context_key(keyboard->keyboard->context, input_method_context_key(keyboard->keyboard->context,
XKB_KEY_Left, WL_KEYBOARD_KEY_STATE_PRESSED); XKB_KEY_Left, WL_KEYBOARD_KEY_STATE_PRESSED);
break; break;
case keytype_arrow_right: case keytype_arrow_right:
virtual_keyboard_commit_preedit(keyboard->keyboard);
input_method_context_key(keyboard->keyboard->context, input_method_context_key(keyboard->keyboard->context,
XKB_KEY_Right, WL_KEYBOARD_KEY_STATE_PRESSED); XKB_KEY_Right, WL_KEYBOARD_KEY_STATE_PRESSED);
break; break;
case keytype_arrow_down: case keytype_arrow_down:
virtual_keyboard_commit_preedit(keyboard->keyboard);
input_method_context_key(keyboard->keyboard->context, input_method_context_key(keyboard->keyboard->context,
XKB_KEY_Down, WL_KEYBOARD_KEY_STATE_PRESSED); XKB_KEY_Down, WL_KEYBOARD_KEY_STATE_PRESSED);
break; break;