mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

text: delete text on commit_string 

Signed-off-by: Jan Arne Petersen <jpetersen@openismus.com>
This commit is contained in:
Jan Arne Petersen 2013-04-18 16:47:34 +02:00 committed by Kristian Høgsberg
parent 00191c7c4a
commit 919bc149e1
2 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
clients/editor.c
View File

@ -56,6 +56,8 @@ struct text_entry {
struct { struct {
int32_t cursor; int32_t cursor;
int32_t anchor; int32_t anchor;
uint32_t delete_index;
uint32_t delete_length;
} pending_commit; } pending_commit;
struct text_input *text_input; struct text_input *text_input;
PangoLayout *layout; PangoLayout *layout;
@ -113,6 +115,17 @@ utf8_next_char(const char *p)
return NULL; return NULL;
} }
static uint32_t
utf8_characters(const char *p)
{
uint32_t offset;
for (offset = 0; *p != 0; offset++)
p = utf8_next_char(p);
return offset;
}
static void text_entry_redraw_handler(struct widget *widget, void *data); static void text_entry_redraw_handler(struct widget *widget, void *data);
static void text_entry_button_handler(struct widget *widget, static void text_entry_button_handler(struct widget *widget,
struct input *input, uint32_t time, struct input *input, uint32_t time,
@ -148,6 +161,13 @@ text_input_commit_string(void *data,
text_entry_reset_preedit(entry); text_entry_reset_preedit(entry);
text_entry_delete_selected_text(entry); 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);
}
text_entry_insert_at_cursor(entry, text, text_entry_insert_at_cursor(entry, text,
entry->pending_commit.cursor, entry->pending_commit.cursor,
entry->pending_commit.anchor); entry->pending_commit.anchor);
@ -186,28 +206,24 @@ text_input_delete_surrounding_text(void *data,
uint32_t length) uint32_t length)
{ {
struct text_entry *entry = data; struct text_entry *entry = data;
uint32_t cursor_index = index + entry->cursor; uint32_t text_length;
const char *start, *end;
if (cursor_index > strlen(entry->text)) { entry->pending_commit.delete_index = entry->cursor + index;
entry->pending_commit.delete_length = length;
text_length = utf8_characters(entry->text);
if (entry->pending_commit.delete_index > text_length) {
fprintf(stderr, "Invalid cursor index %d\n", index); fprintf(stderr, "Invalid cursor index %d\n", index);
entry->pending_commit.delete_length = 0;
return; return;
} }
if (cursor_index + length > strlen(entry->text)) { if (entry->pending_commit.delete_index + length > text_length) {
fprintf(stderr, "Invalid length %d\n", length); fprintf(stderr, "Invalid length %d\n", length);
entry->pending_commit.delete_length = 0;
return; return;
} }
if (length == 0)
return;
start = utf8_start_char(entry->text, entry->text + cursor_index);
end = utf8_end_char(entry->text + cursor_index + length);
text_entry_delete_text(entry,
start - entry->text,
end - start);
} }
static void static void

3
clients/keyboard.c
View File

@ -447,6 +447,9 @@ keyboard_handle_key(struct keyboard *keyboard, uint32_t time, const struct key *
if (strlen(keyboard->keyboard->preedit_string) == 0) { if (strlen(keyboard->keyboard->preedit_string) == 0) {
input_method_context_delete_surrounding_text(keyboard->keyboard->context, input_method_context_delete_surrounding_text(keyboard->keyboard->context,
-1, 1); -1, 1);
input_method_context_commit_string(keyboard->keyboard->context,
keyboard->keyboard->serial,
"");
} else { } else {
keyboard->keyboard->preedit_string[strlen(keyboard->keyboard->preedit_string) - 1] = '\0'; keyboard->keyboard->preedit_string[strlen(keyboard->keyboard->preedit_string) - 1] = '\0';
virtual_keyboard_send_preedit(keyboard->keyboard, -1); virtual_keyboard_send_preedit(keyboard->keyboard, -1);