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

ime: calculate wchar widths once

Browse source
This commit is contained in:
Daniel Eklöf 2020-12-03 18:37:40 +01:00
parent 4d90b200f1
commit 98bd798dae
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ime.c
View file

@ -181,8 +181,13 @@ done(void *data, struct zwp_text_input_v3 *zwp_text_input_v3,
/* Next, count number of cells needed */
size_t cell_count = 0;
for (size_t i = 0; i < wchars; i++)
cell_count += max(wcwidth(wcs[i]), 1);
size_t widths[wchars + 1];
for (size_t i = 0; i < wchars; i++) {
int width = max(wcwidth(wcs[i]), 1);
widths[i] = width;
cell_count += width;
}
/* Allocate cells */
term->ime.preedit.cells = xmalloc(
@ -193,7 +198,7 @@ done(void *data, struct zwp_text_input_v3 *zwp_text_input_v3,
for (size_t i = 0, cell_idx = 0; i < wchars; i++) {
struct cell *cell = &term->ime.preedit.cells[cell_idx];
int width = max(wcwidth(wcs[i]), 1);
int width = widths[i];
cell->wc = wcs[i];
cell->attrs = (struct attributes){.clean = 0, .underline = 1};