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

editor: Support deleting text in preedit_string

Browse Source 
Delete text marked with wl_text_input::delete_surrounding_text on
preedit_string event. When text is explicitly marked with
delete_surrounding_text do not delete selected text.

Signed-off-by: Jan Arne Petersen <jpetersen@openismus.com>
This commit is contained in:
Jan Arne Petersen
2013-05-30 13:57:02 +02:00
committed by Kristian Høgsberg
parent 1c45b4a4a9
commit a96953dffa
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/editor.c
+11 -2
View File
@@ -146,12 +146,13 @@ text_input_commit_string(void *data,
text_entry_reset_preedit(entry); text_entry_reset_preedit(entry);
text_entry_delete_selected_text(entry);
if (entry->pending_commit.delete_length) { if (entry->pending_commit.delete_length) {
text_entry_delete_text(entry, text_entry_delete_text(entry,
entry->pending_commit.delete_index, entry->pending_commit.delete_index,
entry->pending_commit.delete_length); entry->pending_commit.delete_length);
} else {
text_entry_delete_selected_text(entry);
} }
text_entry_insert_at_cursor(entry, text, text_entry_insert_at_cursor(entry, text,
@@ -172,7 +173,15 @@ text_input_preedit_string(void *data,
{ {
struct text_entry *entry = data; struct text_entry *entry = data;
text_entry_delete_selected_text(entry); if (entry->pending_commit.delete_length) {
text_entry_delete_text(entry,
entry->pending_commit.delete_index,
entry->pending_commit.delete_length);
} else {
text_entry_delete_selected_text(entry);
}
memset(&entry->pending_commit, 0, sizeof entry->pending_commit);
text_entry_set_preedit(entry, text, entry->preedit_info.cursor); text_entry_set_preedit(entry, text, entry->preedit_info.cursor);
entry->preedit.commit = strdup(commit); entry->preedit.commit = strdup(commit);
entry->preedit.attr_list = entry->preedit_info.attr_list; entry->preedit.attr_list = entry->preedit_info.attr_list;