aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-12-03 17:38:26 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-12-07 19:44:10 +0000
commite9f99df2ab028d4385bef303bb5d77dab7b12e1f (patch)
tree57018b4ea5054bd84c86437a8d9c9adb897c2d54
parentime: calculate wchar widths once (diff)
render: ime: calculate on-screen cursor position ourselves
The position calculated by render_grid() may be -1,-1 if the cursor is currently hidden. This fixes a crash when trying to input IME while the cursor is hidden.
-rw-r--r--render.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/render.c b/render.c
index 4d1e1465..9546de46 100644
--- a/render.c
+++ b/render.c
@@ -1022,14 +1022,23 @@ render_sixel_images(struct terminal *term, pixman_image_t *pix)
}
static void
-render_ime_preedit(struct terminal *term, struct buffer *buf,
- struct coord cursor)
+render_ime_preedit(struct terminal *term, struct buffer *buf)
{
#if defined(FOOT_IME_ENABLED) && FOOT_IME_ENABLED
if (likely(term->ime.preedit.cells == NULL))
return;
+ /* Adjust cursor position to viewport */
+ struct coord cursor;
+ cursor = term->grid->cursor.point;
+ cursor.row += term->grid->offset;
+ cursor.row -= term->grid->view;
+ cursor.row &= term->grid->num_rows - 1;
+
+ if (cursor.row < 0 || cursor.row >= term->rows)
+ return;
+
int cells_needed = term->ime.preedit.count;
int row_idx = cursor.row;
@@ -2012,7 +2021,7 @@ grid_render(struct terminal *term)
}
/* Render IME pre-edit text */
- render_ime_preedit(term, buf, cursor);
+ render_ime_preedit(term, buf);
if (term->flash.active) {
/* Note: alpha is pre-computed in each color component */