aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-07-16 06:01:37 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-07-16 06:01:37 +0000
commit9508804b18270ab47c750dc61a16384297c06aa7 (patch)
treec33c64ae0393ae0976791902f487a2b8c4701fd1
parentvt: utf8: handle multi-column spacer values correctly when combining (diff)
vt: ignore 0x7f (DEL) in ground state
This ensures *all* bytes mapped to action_print() have wcwidth == 1. DEL has wcwidth == -1, and would thus have been ignored by term_print() anwyway.
-rw-r--r--vt.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/vt.c b/vt.c
index feac9040..148f2aae 100644
--- a/vt.c
+++ b/vt.c
@@ -223,6 +223,8 @@ action_print(struct terminal *term, uint8_t c)
L'│', L'≤', L'≥', L'π', L'≠', L'£', L'·', /* x - ~ */
};
+ assert(wcwidth(c) == 1);
+
if (unlikely(term->charsets.set[term->charsets.selected] == CHARSET_GRAPHIC) &&
c >= 0x60 && c <= 0x7e)
{
@@ -739,7 +741,8 @@ state_ground_switch(struct terminal *term, uint8_t data)
case 0x19:
case 0x1c ... 0x1f: action_execute(term, data); return STATE_GROUND;
- case 0x20 ... 0x7f: action_print(term, data); return STATE_GROUND;
+ /* modified from 0x20..0x7f to 0x20..0x7e, since 0x7f is DEL, which is a zero-width character */
+ case 0x20 ... 0x7e: action_print(term, data); return STATE_GROUND;
case 0xc2 ... 0xdf: action_utf8_21(term, data); return STATE_UTF8_21;
case 0xe0 ... 0xef: action_utf8_31(term, data); return STATE_UTF8_31;