eeva/st
1
0
Fork 0
Code Releases 4 Activity

Do not mark as invalid UTF8 control codes

Browse source 
wcwidth() returns -1 for all the non visible characters, but it doesn't
necessarilly mean that they are incorrect. It only means that they are not
printable.
This commit is contained in:
Roberto E. Vargas Caballero 2015-08-17 11:25:38 +02:00
parent 9984ad4ba7
commit 7e61f5e4c5
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
st.c
View file

@ -2895,15 +2895,15 @@ tputc(Rune u)
int width, len; int width, len;
Glyph *gp; Glyph *gp;
control = ISCONTROL(u);
len = utf8encode(u, c); len = utf8encode(u, c);
if ((width = wcwidth(u)) == -1) { if (!control && (width = wcwidth(u)) == -1) {
memcpy(c, "\357\277\275", 4); /* UTF_INVALID */ memcpy(c, "\357\277\275", 4); /* UTF_INVALID */
width = 1; width = 1;
} }
if (IS_SET(MODE_PRINT)) if (IS_SET(MODE_PRINT))
tprinter(c, len); tprinter(c, len);
control = ISCONTROL(u);
/* /*
* STR sequence must be checked before anything else * STR sequence must be checked before anything else