aboutsummaryrefslogtreecommitdiff
path: root/render.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-01-25 20:57:42 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-01-26 18:30:34 +0000
commita763531775a3423501710346a729c2a7d5a37db6 (patch)
tree884dc324bbeba1e07fb2061b290b7051fff3d9ca /render.c
parentMerge branch 'search-fix-rendering-of-combining-characters-with-positive-x-offsets' (diff)
ime: fix rendering of pre-edit cursor when positioned after the pre-edit string
We failed to convert the byte-indices to cell indices, resulting in a box cursor covering the entire pre-edit string. Note that in addition to fixing the translation from byte index to cell index, the rendered had to be updated to dirty one extra cell from the original grid. Without this, we left trailing cursors behind us when the user deleted text from the pre-edit string.
Diffstat (limited to 'render.c')
-rw-r--r--render.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/render.c b/render.c
index c298aaaa..e45140e5 100644
--- a/render.c
+++ b/render.c
@@ -1096,6 +1096,17 @@ render_ime_preedit(struct terminal *term, struct buffer *buf)
int cells_needed = term->ime.preedit.count;
+ if (term->ime.preedit.cursor.start == cells_needed &&
+ term->ime.preedit.cursor.end == cells_needed)
+ {
+ /* Cursor will be drawn *after* the pre-edit string, i.e. in
+ * the cell *after*. This means we need to copy, and dirty,
+ * one extra cell from the original grid, or we’ll leave
+ * trailing “cursors” after us if the user deletes text while
+ * pre-editing */
+ cells_needed++;
+ }
+
int row_idx = cursor.row;
int col_idx = cursor.col;
int ime_ofs = 0; /* Offset into pre-edit string to start rendering at */
@@ -1175,7 +1186,7 @@ render_ime_preedit(struct terminal *term, struct buffer *buf)
int end = term->ime.preedit.cursor.end - ime_ofs;
if (!term->ime.preedit.cursor.hidden) {
- const struct cell *start_cell = &term->ime.preedit.cells[start + ime_ofs];
+ const struct cell *start_cell = &term->ime.preedit.cells[0];
pixman_color_t fg = color_hex_to_pixman(term->colors.fg);
pixman_color_t bg = color_hex_to_pixman(term->colors.bg);