diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2020-05-01 10:06:09 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2020-05-01 10:06:09 +0000 |
| commit | 99172e7f8e0a7caa1356a9beebf7d22288e5f7a1 (patch) | |
| tree | 92af8f394e1124952cf69652bdb340376765f730 /terminal.c | |
| parent | term: don't enable ptmx FDM callback until Wayland window has been configured (diff) | |
| parent | unicode-combining: completely remove unicode combining characters when feature is disabled (diff) | |
Merge branch 'unicode-combining-for-real'
Diffstat (limited to 'terminal.c')
| -rw-r--r-- | terminal.c | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -27,12 +27,9 @@ #include "selection.h" #include "sixel.h" #include "slave.h" +#include "util.h" #include "vt.h" -#define ALEN(v) (sizeof(v) / sizeof(v[0])) -#define min(x, y) ((x) < (y) ? (x) : (y)) -#define max(x, y) ((x) > (y) ? (x) : (y)) - #define PTMX_TIMING 0 static const char *const XCURSOR_LEFT_PTR = "left_ptr"; @@ -1322,7 +1319,7 @@ term_reset(struct terminal *term, bool hard) tll_free(term->normal.scroll_damage); tll_free(term->alt.damage); tll_free(term->alt.scroll_damage); - term->render.last_cursor.cell = NULL; + term->render.last_cursor.row = NULL; term->render.was_flashing = false; term_damage_all(term); } @@ -2298,6 +2295,10 @@ 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_COMBINING + row->comb_chars[term->grid->cursor.point.col].count = 0; +#endif + row->dirty = true; cell->attrs.clean = 0; |
