aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2019-08-29 19:03:46 +0000
committerDaniel Eklöf <daniel@ekloef.se>2019-08-29 19:03:46 +0000
commit10649178f8f42d38e4e9d9760eeda4d11dfdadda (patch)
tree1789c60577b612dd2edde4d909ec7e725ebb75f1
parentsearch: search_cancel: reset cursor position (diff)
search: insert new characters at cursor, not at the end of the buffer
-rw-r--r--search.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/search.c b/search.c
index ffa50c0e..6326aded 100644
--- a/search.c
+++ b/search.c
@@ -312,11 +312,16 @@ search_input(struct terminal *term, uint32_t key, xkb_keysym_t sym, xkb_mod_mask
assert(term->search.len + wchars < term->search.sz);
+ memmove(&term->search.buf[term->search.cursor + wchars],
+ &term->search.buf[term->search.cursor],
+ (term->search.len - term->search.cursor) * sizeof(wchar_t));
+
memset(&ps, 0, sizeof(ps));
- mbsnrtowcs(&term->search.buf[term->search.len], &src, count,
- term->search.sz - term->search.len - 1, &ps);
+ mbsnrtowcs(&term->search.buf[term->search.cursor], &src, count,
+ wchars, &ps);
term->search.len += wchars;
+ term->search.cursor += wchars;
term->search.buf[term->search.len] = L'\0';
}