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

editor: Insert commit-string at cursor 

Instead of appending at the end, insert the commit-string at the cursor
position.

Signed-off-by: Jan Arne Petersen <jpetersen@openismus.com>
This commit is contained in:
Jan Arne Petersen 2012-09-09 23:08:37 +02:00 committed by Kristian Høgsberg
parent 7e634a0ea7
commit 09e7c96574
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
clients/editor.c
View File

@ -205,15 +205,7 @@ static void text_entry_button_handler(struct widget *widget,
struct input *input, uint32_t time,
uint32_t button,
enum wl_pointer_button_state state, void *data);
static void
text_entry_append(struct text_entry *entry, const char *text)
{
entry->text = realloc(entry->text, strlen(entry->text) + strlen(text) + 1);
strcat(entry->text, text);
text_layout_set_text(entry->layout, entry->text);
}
static void text_entry_insert_at_cursor(struct text_entry *entry, const char *text);
static void
text_model_commit_string(void *data,
@ -223,7 +215,12 @@ text_model_commit_string(void *data,
{
struct text_entry *entry = data;
text_entry_append(entry, text);
if (index > strlen(text)) {
fprintf(stderr, "Invalid cursor index %d\n", index);
index = strlen(text);
}
text_entry_insert_at_cursor(entry, text);
widget_schedule_redraw(entry->widget);
}
@ -408,6 +405,23 @@ text_entry_deactivate(struct text_entry *entry,
seat);
}
static void
text_entry_insert_at_cursor(struct text_entry *entry, const char *text)
{
char *new_text = malloc(strlen(entry->text) + strlen(text) + 1);
strncpy(new_text, entry->text, entry->cursor);
strcpy(new_text + entry->cursor, text);
strcpy(new_text + entry->cursor + strlen(text),
entry->text + entry->cursor);
free(entry->text);
entry->text = new_text;
entry->cursor += strlen(text);
text_layout_set_text(entry->layout, entry->text);
}
static void
text_entry_set_cursor_position(struct text_entry *entry,
int32_t x, int32_t y)