aboutsummaryrefslogtreecommitdiff
path: root/terminal.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-05-03 09:36:20 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-05-03 09:36:20 +0000
commit1d1eb899257a98db81d2cd3a634135b60ba0d0ba (patch)
tree14d141ed96f7e47a6adb6102a0ab1626cd125a29 /terminal.c
parentosc: fix scaling of RGB formatted color specifiers (diff)
parentunicode-combining: limit maximum number of allowed composed chains (diff)
Merge branch 'space-optimize-combining-chars'
Diffstat (limited to 'terminal.c')
-rw-r--r--terminal.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/terminal.c b/terminal.c
index 60dff8a6..b5cb6590 100644
--- a/terminal.c
+++ b/terminal.c
@@ -822,6 +822,8 @@ term_init(const struct config *conf, struct fdm *fdm, struct wayland *wayl,
.normal = {.damage = tll_init(), .scroll_damage = tll_init(), .sixel_images = tll_init()},
.alt = {.damage = tll_init(), .scroll_damage = tll_init(), .sixel_images = tll_init()},
.grid = &term->normal,
+ .composed_count = 0,
+ .composed = NULL,
.meta = {
.esc_prefix = true,
.eight_bit = true,
@@ -1086,6 +1088,8 @@ term_destroy(struct terminal *term)
tll_free(term->normal.scroll_damage);
tll_free(term->alt.scroll_damage);
+ free(term->composed);
+
free(term->window_title);
tll_free_and_free(term->window_title_stack, free);
@@ -2295,10 +2299,6 @@ term_print(struct terminal *term, wchar_t wc, int width)
cell->wc = term->vt.last_printed = wc;
cell->attrs = term->vt.attrs;
-#if FOOT_UNICODE_MAX_COMBINING_CHARS > 0
- row->comb_chars[term->grid->cursor.point.col].count = 0;
-#endif
-
row->dirty = true;
cell->attrs.clean = 0;