mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-03-06 01:40:22 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

render: ime: draw a ‘bar’ cursor when the pre-edit cursor’s begin == end

Browse source
This commit is contained in:
Daniel Eklöf 2020-12-04 18:43:06 +01:00
parent 85cdc66ff2
commit 2078e1675d
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
render.c
View file

@ -1092,25 +1092,33 @@ render_ime_preedit(struct terminal *term, struct buffer *buf)
render_cell(term, buf->pix[0], row, col_idx + i, row_idx, false); render_cell(term, buf->pix[0], row, col_idx + i, row_idx, false);
} }
/* Hollow cursor */
int start = term->ime.preedit.cursor.start; int start = term->ime.preedit.cursor.start;
int end = term->ime.preedit.cursor.end; int end = term->ime.preedit.cursor.end;
if (!term->ime.preedit.cursor.hidden && end > start) { if (!term->ime.preedit.cursor.hidden) {
const struct cell *start_cell = &term->ime.preedit.cells[start];
pixman_color_t fg = color_hex_to_pixman(term->colors.fg); pixman_color_t fg = color_hex_to_pixman(term->colors.fg);
pixman_color_t bg = color_hex_to_pixman(term->colors.bg); pixman_color_t bg = color_hex_to_pixman(term->colors.bg);
pixman_color_t cursor_color, text_color; pixman_color_t cursor_color, text_color;
cursor_colors_for_cell( cursor_colors_for_cell(
term, &term->ime.preedit.cells[start], term, start_cell, &fg, &bg, &cursor_color, &text_color);
&fg, &bg, &cursor_color, &text_color);
int x = term->margins.left + (col_idx + start) * term->cell_width; int x = term->margins.left + (col_idx + start) * term->cell_width;
int y = term->margins.top + row_idx * term->cell_height; int y = term->margins.top + row_idx * term->cell_height;
int cols = end - start; if (end == start) {
draw_unfocused_block(term, buf->pix[0], &cursor_color, x, y, cols); /* Bar */
struct fcft_font *font = attrs_to_font(term, &start_cell->attrs);
draw_bar(term, buf->pix[0], font, &cursor_color, x, y);
}
else if (end > start) {
/* Hollow cursor */
int cols = end - start;
draw_unfocused_block(term, buf->pix[0], &cursor_color, x, y, cols);
}
} }
/* Restore original content (but do not render) */ /* Restore original content (but do not render) */