Make tputc, tsetchar and techo accept unicode
This commit is contained in:
noname@inventati.org
Roberto E. Vargas Caballero
parent
21f765426c
commit
0622ad9bad
1 changed files with 45 additions and 62 deletions
107
st.c
107
st.c
|
|
@ -383,20 +383,20 @@ static void tmoveato(int, int);
|
|||
static void tnew(int, int);
|
||||
static void tnewline(int);
|
||||
static void tputtab(int);
|
||||
static void tputc(char *, int);
|
||||
static void tputc(long);
|
||||
static void treset(void);
|
||||
static void tresize(int, int);
|
||||
static void tscrollup(int, int);
|
||||
static void tscrolldown(int, int);
|
||||
static void tsetattr(int *, int);
|
||||
static void tsetchar(char *, Glyph *, int, int);
|
||||
static void tsetchar(long, Glyph *, int, int);
|
||||
static void tsetscroll(int, int);
|
||||
static void tswapscreen(void);
|
||||
static void tsetdirt(int, int);
|
||||
static void tsetdirtattr(int);
|
||||
static void tsetmode(bool, bool, int *, int);
|
||||
static void tfulldirt(void);
|
||||
static void techo(char *, int);
|
||||
static void techo(long);
|
||||
static void tcontrolcode(uchar );
|
||||
static void tdectest(char );
|
||||
static int32_t tdefcolor(int *, int *, int);
|
||||
|
|
@ -1332,7 +1332,6 @@ ttyread(void) {
|
|||
static char buf[BUFSIZ];
|
||||
static int buflen = 0;
|
||||
char *ptr;
|
||||
char s[UTF_SIZ];
|
||||
int charsize; /* size of utf8 char in bytes */
|
||||
long unicodep;
|
||||
int ret;
|
||||
|
|
@ -1345,8 +1344,7 @@ ttyread(void) {
|
|||
buflen += ret;
|
||||
ptr = buf;
|
||||
while((charsize = utf8decode(ptr, &unicodep, buflen))) {
|
||||
utf8encode(unicodep, s);
|
||||
tputc(s, charsize);
|
||||
tputc(unicodep);
|
||||
ptr += charsize;
|
||||
buflen -= charsize;
|
||||
}
|
||||
|
|
@ -1363,9 +1361,16 @@ ttywrite(const char *s, size_t n) {
|
|||
|
||||
void
|
||||
ttysend(char *s, size_t n) {
|
||||
int len;
|
||||
long u;
|
||||
|
||||
ttywrite(s, n);
|
||||
if(IS_SET(MODE_ECHO))
|
||||
techo(s, n);
|
||||
while((len = utf8decode(s, &u, n)) > 0) {
|
||||
techo(u);
|
||||
n -= len;
|
||||
s += len;
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
|
|
@ -1614,7 +1619,7 @@ tmoveto(int x, int y) {
|
|||
}
|
||||
|
||||
void
|
||||
tsetchar(char *c, Glyph *attr, int x, int y) {
|
||||
tsetchar(long u, Glyph *attr, int x, int y) {
|
||||
static char *vt100_0[62] = { /* 0x41 - 0x7e */
|
||||
"↑", "↓", "→", "←", "█", "▚", "☃", /* A - G */
|
||||
0, 0, 0, 0, 0, 0, 0, 0, /* H - O */
|
||||
|
|
@ -1629,11 +1634,9 @@ tsetchar(char *c, Glyph *attr, int x, int y) {
|
|||
/*
|
||||
* The table is proudly stolen from rxvt.
|
||||
*/
|
||||
if(term.trantbl[term.charset] == CS_GRAPHIC0) {
|
||||
if(BETWEEN(c[0], 0x41, 0x7e) && vt100_0[c[0] - 0x41]) {
|
||||
c = vt100_0[c[0] - 0x41];
|
||||
}
|
||||
}
|
||||
if(term.trantbl[term.charset] == CS_GRAPHIC0 &&
|
||||
BETWEEN(u, 0x41, 0x7e) && vt100_0[u - 0x41])
|
||||
utf8decode(vt100_0[u - 0x41], &u, UTF_SIZ);
|
||||
|
||||
if(term.line[y][x].mode & ATTR_WIDE) {
|
||||
if(x+1 < term.col) {
|
||||
|
|
@ -1647,7 +1650,7 @@ tsetchar(char *c, Glyph *attr, int x, int y) {
|
|||
|
||||
term.dirty[y] = 1;
|
||||
term.line[y][x] = *attr;
|
||||
utf8decode(c, &term.line[y][x].u, UTF_SIZ);
|
||||
term.line[y][x].u = u;
|
||||
}
|
||||
|
||||
void
|
||||
|
|
@ -2431,26 +2434,18 @@ tputtab(int n) {
|
|||
}
|
||||
|
||||
void
|
||||
techo(char *buf, int len) {
|
||||
for(; len > 0; buf++, len--) {
|
||||
char c = *buf;
|
||||
|
||||
if(ISCONTROL((uchar) c)) { /* control code */
|
||||
if(c & 0x80) {
|
||||
c &= 0x7f;
|
||||
tputc("^", 1);
|
||||
tputc("[", 1);
|
||||
} else if(c != '\n' && c != '\r' && c != '\t') {
|
||||
c ^= 0x40;
|
||||
tputc("^", 1);
|
||||
}
|
||||
tputc(&c, 1);
|
||||
} else {
|
||||
break;
|
||||
techo(long u) {
|
||||
if(ISCONTROL(u)) { /* control code */
|
||||
if(u & 0x80) {
|
||||
u &= 0x7f;
|
||||
tputc('^');
|
||||
tputc('[');
|
||||
} else if(u != '\n' && u != '\r' && u != '\t') {
|
||||
u ^= 0x40;
|
||||
tputc('^');
|
||||
}
|
||||
}
|
||||
if(len)
|
||||
tputc(buf, len);
|
||||
tputc(u);
|
||||
}
|
||||
|
||||
void
|
||||
|
|
@ -2468,13 +2463,12 @@ tdeftran(char ascii) {
|
|||
|
||||
void
|
||||
tdectest(char c) {
|
||||
static char E[UTF_SIZ] = "E";
|
||||
int x, y;
|
||||
|
||||
if(c == '8') { /* DEC screen alignment test. */
|
||||
for(x = 0; x < term.col; ++x) {
|
||||
for(y = 0; y < term.row; ++y)
|
||||
tsetchar(E, &term.c.attr, x, y);
|
||||
tsetchar('E', &term.c.attr, x, y);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -2502,8 +2496,6 @@ tstrsequence(uchar c) {
|
|||
|
||||
void
|
||||
tcontrolcode(uchar ascii) {
|
||||
static char question[UTF_SIZ] = "?";
|
||||
|
||||
switch(ascii) {
|
||||
case '\t': /* HT */
|
||||
tputtab(1);
|
||||
|
|
@ -2541,7 +2533,7 @@ tcontrolcode(uchar ascii) {
|
|||
term.charset = 1 - (ascii - '\016');
|
||||
return;
|
||||
case '\032': /* SUB */
|
||||
tsetchar(question, &term.c.attr, term.c.x, term.c.y);
|
||||
tsetchar('?', &term.c.attr, term.c.x, term.c.y);
|
||||
case '\030': /* CAN */
|
||||
csireset();
|
||||
break;
|
||||
|
|
@ -2665,28 +2657,21 @@ eschandle(uchar ascii) {
|
|||
}
|
||||
|
||||
void
|
||||
tputc(char *c, int len) {
|
||||
uchar ascii;
|
||||
tputc(long u) {
|
||||
char c[UTF_SIZ];
|
||||
bool control;
|
||||
long unicodep;
|
||||
int width;
|
||||
int width, len;
|
||||
Glyph *gp;
|
||||
|
||||
if(len == 1) {
|
||||
len = utf8encode(u, c);
|
||||
if((width = wcwidth(u)) == -1) {
|
||||
memcpy(c, "\357\277\275", 4); /* UTF_INVALID */
|
||||
width = 1;
|
||||
unicodep = ascii = *c;
|
||||
} else {
|
||||
utf8decode(c, &unicodep, UTF_SIZ);
|
||||
if ((width = wcwidth(unicodep)) == -1) {
|
||||
c = "\357\277\275"; /* UTF_INVALID */
|
||||
width = 1;
|
||||
}
|
||||
ascii = unicodep;
|
||||
}
|
||||
|
||||
if(IS_SET(MODE_PRINT))
|
||||
tprinter(c, len);
|
||||
control = ISCONTROL(unicodep);
|
||||
control = ISCONTROL(u);
|
||||
|
||||
/*
|
||||
* STR sequence must be checked before anything else
|
||||
|
|
@ -2695,10 +2680,8 @@ tputc(char *c, int len) {
|
|||
* character.
|
||||
*/
|
||||
if(term.esc & ESC_STR) {
|
||||
if(len == 1 &&
|
||||
(ascii == '\a' || ascii == 030 ||
|
||||
ascii == 032 || ascii == 033 ||
|
||||
ISCONTROLC1(unicodep))) {
|
||||
if(u == '\a' || u == 030 || u == 032 || u == 033 ||
|
||||
ISCONTROLC1(u)) {
|
||||
term.esc &= ~(ESC_START|ESC_STR);
|
||||
term.esc |= ESC_STR_END;
|
||||
} else if(strescseq.len + len < sizeof(strescseq.buf) - 1) {
|
||||
|
|
@ -2729,15 +2712,15 @@ tputc(char *c, int len) {
|
|||
* they must not cause conflicts with sequences.
|
||||
*/
|
||||
if(control) {
|
||||
tcontrolcode(ascii);
|
||||
tcontrolcode(u);
|
||||
/*
|
||||
* control codes are not shown ever
|
||||
*/
|
||||
return;
|
||||
} else if(term.esc & ESC_START) {
|
||||
if(term.esc & ESC_CSI) {
|
||||
csiescseq.buf[csiescseq.len++] = ascii;
|
||||
if(BETWEEN(ascii, 0x40, 0x7E)
|
||||
csiescseq.buf[csiescseq.len++] = u;
|
||||
if(BETWEEN(u, 0x40, 0x7E)
|
||||
|| csiescseq.len >= \
|
||||
sizeof(csiescseq.buf)-1) {
|
||||
term.esc = 0;
|
||||
|
|
@ -2746,11 +2729,11 @@ tputc(char *c, int len) {
|
|||
}
|
||||
return;
|
||||
} else if(term.esc & ESC_ALTCHARSET) {
|
||||
tdeftran(ascii);
|
||||
tdeftran(u);
|
||||
} else if(term.esc & ESC_TEST) {
|
||||
tdectest(ascii);
|
||||
tdectest(u);
|
||||
} else {
|
||||
if (!eschandle(ascii))
|
||||
if (!eschandle(u))
|
||||
return;
|
||||
/* sequence already finished */
|
||||
}
|
||||
|
|
@ -2779,7 +2762,7 @@ tputc(char *c, int len) {
|
|||
gp = &term.line[term.c.y][term.c.x];
|
||||
}
|
||||
|
||||
tsetchar(c, &term.c.attr, term.c.x, term.c.y);
|
||||
tsetchar(u, &term.c.attr, term.c.x, term.c.y);
|
||||
|
||||
if(width == 2) {
|
||||
gp->mode |= ATTR_WIDE;
|
||||
|
|
|
|||
Loading…
Reference in a new issue