Allow control characters inside escape sequences

[st.git] / st.c

diff --git a/st.c b/st.c
index efe309f..2767d54 100644 (file)
--- a/st.c
+++ b/st.c
@@ -1094,6 +1094,27 @@ tmoveto(int x, int y) {
 
 void
 tsetchar(char *c) {
+       /*
+        * The table is proudly stolen from rxvt.
+        */
+       if(term.c.attr.mode & ATTR_GFX) {
+               char *vt100_0[62] = { /* 0x41 - 0x7e */
+                       "↑", "↓", "→", "←", "█", "▚", "☃", /* A - G */
+                       0, 0, 0, 0, 0, 0, 0, 0, /* H - O */
+                       0, 0, 0, 0, 0, 0, 0, 0, /* P - W */
+                       0, 0, 0, 0, 0, 0, 0, " ", /* X - _ */
+                       "◆", "▒", "␉", "␌", "␍", "␊", "°", "±", /* ` - g */
+                       "␤", "␋", "┘", "┐", "┌", "└", "┼", "⎺", /* h - o */
+                       "⎻", "─", "⎼", "⎽", "├", "┤", "┴", "┬", /* p - w */
+                       "│", "≤", "≥", "π", "≠", "£", "·", /* x - ~ */
+               };
+
+               if(c[0] >= 0x41 && c[0] <= 0x7e
+                               && vt100_0[c[0] - 0x41]) {
+                       c = vt100_0[c[0] - 0x41];
+               }
+       }
+
        term.dirty[term.c.y] = 1;
        term.line[term.c.y][term.c.x] = term.c.attr;
        memcpy(term.line[term.c.y][term.c.x].c, c, UTF_SIZ);
@@ -1642,11 +1663,37 @@ tputtab(bool forward) {
 
 void
 tputc(char *c, int len) {
-       char ascii = *c;
+       uchar ascii = *c;
 
        if(iofd != -1)
                write(iofd, c, len);
 
+       switch(ascii) {
+       case '\t':
+               tputtab(1);
+               return;
+       case '\b':
+               tmoveto(term.c.x-1, term.c.y);
+               return;
+       case '\r':
+               tmoveto(0, term.c.y);
+               return;
+       case '\f':
+       case '\v':
+       case '\n':
+               /* go to first col if the mode is set */
+               tnewline(IS_SET(MODE_CRLF));
+               return;
+       case '\a':
+               if(!(xw.state & WIN_FOCUSED))
+                       xseturgency(1);
+               return;
+       case '\033':
+               csireset();
+               term.esc = ESC_START;
+               return;
+       }
+
        if(term.esc & ESC_START) {
                if(term.esc & ESC_CSI) {
                        csiescseq.buf[csiescseq.len++] = ascii;
@@ -1676,12 +1723,18 @@ tputc(char *c, int len) {
                                strhandle();
                } else if(term.esc & ESC_ALTCHARSET) {
                        switch(ascii) {
-                       case '0': /* Line drawing crap */
+                       case '0': /* Line drawing set */
                                term.c.attr.mode |= ATTR_GFX;
                                break;
-                       case 'B': /* Back to regular text */
+                       case 'B': /* USASCII */
                                term.c.attr.mode &= ~ATTR_GFX;
                                break;
+                       case 'A': /* UK (IGNORED) */
+                       case '<': /* multinational charset (IGNORED) */
+                       case '5': /* Finnish (IGNORED) */
+                       case 'C': /* Finnish (IGNORED) */
+                       case 'K': /* German (IGNORED) */
+                               break;
                        default:
                                fprintf(stderr, "esc unhandled charset: ESC ( %c\n", ascii);
                        }
@@ -1700,10 +1753,14 @@ tputc(char *c, int len) {
                                strescseq.type = ascii;
                                term.esc |= ESC_STR;
                                break;
-                       case ')':
-                       case '(':
+                       case '(': /* set primary charset G0 */
                                term.esc |= ESC_ALTCHARSET;
                                break;
+                       case ')': /* set secondary charset G1 (IGNORED) */
+                       case '*': /* set tertiary charset G2 (IGNORED) */
+                       case '+': /* set quaternary charset G3 (IGNORED) */
+                               term.esc = 0;
+                               break;
                        case 'D': /* IND -- Linefeed */
                                if(term.c.y == term.bot)
                                        tscrollup(term.top, 1);
@@ -1760,33 +1817,7 @@ tputc(char *c, int len) {
        } else {
                if(sel.bx != -1 && BETWEEN(term.c.y, sel.by, sel.ey))
                        sel.bx = -1;
-               switch(ascii) {
-               case '\0': /* padding character, do nothing */
-                       break;
-               case '\t':
-                       tputtab(1);
-                       break;
-               case '\b':
-                       tmoveto(term.c.x-1, term.c.y);
-                       break;
-               case '\r':
-                       tmoveto(0, term.c.y);
-                       break;
-               case '\f':
-               case '\v':
-               case '\n':
-                       /* go to first col if the mode is set */
-                       tnewline(IS_SET(MODE_CRLF));
-                       break;
-               case '\a':
-                       if(!(xw.state & WIN_FOCUSED))
-                               xseturgency(1);
-                       break;
-               case '\033':
-                       csireset();
-                       term.esc = ESC_START;
-                       break;
-               default:
+               if(ascii >= '\020' || term.c.attr.mode & ATTR_GFX) {
                        if(IS_SET(MODE_WRAP) && term.c.state & CURSOR_WRAPNEXT)
                                tnewline(1); /* always go to first col */
                        tsetchar(c);
@@ -2067,7 +2098,6 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
        int winx = BORDER+x*xw.cw, winy = BORDER+y*xw.ch + dc.font.ascent, width = charlen*xw.cw;
        Font *font = &dc.font;
        XGlyphInfo extents;
-       int i;
 
        /* only switch default fg/bg if term is in RV mode */
        if(IS_SET(MODE_REVERSE)) {
@@ -2093,16 +2123,6 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
        XSetBackground(xw.dpy, dc.gc, dc.col[bg]);
        XSetForeground(xw.dpy, dc.gc, dc.col[fg]);
 
-       if(base.mode & ATTR_GFX) {
-               for(i = 0; i < bytelen; i++) {
-                       char c = gfx[(uint)s[i] % 256];
-                       if(c)
-                               s[i] = c;
-                       else if(s[i] > 0x5f)
-                               s[i] -= 0x5f;
-               }
-       }
-
        XftTextExtentsUtf8(xw.dpy, font->xft_set, (FcChar8 *)s, bytelen, &extents);
        width = extents.xOff;
        XftDrawRect(xw.xft_draw, &dc.xft_col[bg], winx, winy - font->ascent, width, xw.ch);