aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjamin <acdimalev@gmail.com>2021-12-29 09:07:17 -0800
committerHiltjo Posthuma <hiltjo@codemadness.org>2021-12-30 18:37:17 +0100
commit65f1dc428315ae9d7f362e10c668557c1379e7af (patch)
tree18d8884f65aa970c823901bbb39f3def0784c327
parenta0467c802d4f86ed162486e3453dd61181423902 (diff)
downloadst-patched-65f1dc428315ae9d7f362e10c668557c1379e7af.tar.bz2
st-patched-65f1dc428315ae9d7f362e10c668557c1379e7af.tar.xz
st-patched-65f1dc428315ae9d7f362e10c668557c1379e7af.zip
Fix overtyping wide characters.
Overtyping the first half of a wide character with the second half of a wide character results in display garbage. This is because the trailing dummy is not cleaned up. i.e. ATTR_WIDE, ATTR_WDUMMY, ATTR_WDUMMY Here is a short script for demonstrating the behavior: #!/bin/sh alias printf=/usr/bin/printf printf こんにちは!; sleep 2 printf '\x1b[5D'; sleep 2 printf へ; sleep 2 printf ' '; sleep 2 echo
-rw-r--r--st.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/st.c b/st.c
index de2dd0e..51049ba 100644
--- a/st.c
+++ b/st.c
@@ -2507,6 +2507,10 @@ check_control_code:
2507 if (width == 2) { 2507 if (width == 2) {
2508 gp->mode |= ATTR_WIDE; 2508 gp->mode |= ATTR_WIDE;
2509 if (term.c.x+1 < term.col) { 2509 if (term.c.x+1 < term.col) {
2510 if (gp[1].mode == ATTR_WIDE && term.c.x+2 < term.col) {
2511 gp[2].u = ' ';
2512 gp[2].mode &= ~ATTR_WDUMMY;
2513 }
2510 gp[1].u = '\0'; 2514 gp[1].u = '\0';
2511 gp[1].mode = ATTR_WDUMMY; 2515 gp[1].mode = ATTR_WDUMMY;
2512 } 2516 }