diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2021-06-30 16:00:33 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2021-07-01 05:58:06 +0000 |
| commit | 9817e44c325f5d44f64bfa768107998134ea7f59 (patch) | |
| tree | 60412220158008983064e696073355dbe0d37c52 /vt.c | |
| parent | vt: limit grapheme width to 2 cells (diff) | |
config: add tweak.grapheme-width-method=wcswidth|at-most-2
Diffstat (limited to 'vt.c')
| -rw-r--r-- | vt.c | 19 |
1 files changed, 14 insertions, 5 deletions
@@ -764,17 +764,26 @@ action_utf8_print(struct terminal *term, wchar_t wc) (wanted_count - 2) * sizeof(new_cc->chars[0])); } - int grapheme_width = composed != NULL ? composed->width : base_width; + const int grapheme_width = + composed != NULL ? composed->width : base_width; - if (wc == 0xfe0f) - width = 2; - new_cc->width = min(max(grapheme_width, width), 2); + switch (term->conf->tweak.grapheme_width_method) { + case GRAPHEME_WIDTH_MAX_2: + if (unlikely(wc == 0xfe0f)) + width = 2; + new_cc->width = min(grapheme_width + width, 2); + break; + + case GRAPHEME_WIDTH_WCSWIDTH: + new_cc->width = grapheme_width + width; + break; + } term->composed_count++; composed_insert(&term->composed, new_cc); wc = CELL_COMB_CHARS_LO + key; - width = grapheme_width; + width = new_cc->width; xassert(wc >= CELL_COMB_CHARS_LO); xassert(wc <= CELL_COMB_CHARS_HI); |
