Implementing line drawing right.

[st.git] / st.c

diff --git a/st.c b/st.c
index 4c8d67f..a64b84d 100644 (file)
--- a/st.c
+++ b/st.c
@@ -110,7 +110,8 @@ enum term_mode {
        MODE_MOUSEBTN    = 32,
        MODE_MOUSEMOTION = 64,
        MODE_MOUSE       = 32|64,
-       MODE_REVERSE     = 128
+       MODE_REVERSE     = 128,
+       MODE_KBDLOCK     = 256
 };
 
 enum escape_state {
@@ -277,7 +278,7 @@ static void tmoveto(int, int);
 static void tnew(int, int);
 static void tnewline(int);
 static void tputtab(bool);
-static void tputc(char*);
+static void tputc(char*, int);
 static void treset(void);
 static int tresize(int, int);
 static void tscrollup(int, int);
@@ -292,7 +293,7 @@ static void tfulldirt(void);
 
 static void ttynew(void);
 static void ttyread(void);
-static void ttyresize(int, int);
+static void ttyresize(void);
 static void ttywrite(const char *, size_t);
 
 static void xdraws(char *, Glyph, int, int, int, int);
@@ -883,7 +884,7 @@ ttyread(void) {
        while(buflen >= UTF_SIZ || isfullutf8(ptr,buflen)) {
                charsize = utf8decode(ptr, &utf8c);
                utf8encode(&utf8c, s);
-               tputc(s);
+               tputc(s, charsize);
                ptr    += charsize;
                buflen -= charsize;
        }
@@ -899,7 +900,7 @@ ttywrite(const char *s, size_t n) {
 }
 
 void
-ttyresize(int x, int y) {
+ttyresize(void) {
        struct winsize w;
 
        w.ws_row = term.row;
@@ -952,7 +953,7 @@ treset(void) {
                term.tabs[i] = 1;
        term.top = 0, term.bot = term.row - 1;
        term.mode = MODE_WRAP;
-       xclear(0, 0, xw.w, xw.h);
+
        tclearregion(0, 0, term.col-1, term.row-1);
 }
 
@@ -1093,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);
@@ -1279,7 +1301,8 @@ tsetmode(bool priv, bool set, int *args, int narg) {
        for(lim = args + narg; args < lim; ++args) {
                if(priv) {
                        switch(*args) {
-                       case 1:
+                               break;
+                       case 1: /* DECCKM -- Cursor key */
                                MODBIT(term.mode, set, MODE_APPKEYPAD);
                                break;
                        case 5: /* DECSCNM -- Reverve video */
@@ -1288,12 +1311,14 @@ tsetmode(bool priv, bool set, int *args, int narg) {
                                if(mode != term.mode)
                                        redraw();
                                break;
-                       case 7:
+                       case 6: /* XXX: DECOM -- Origin */
+                               break;
+                       case 7: /* DECAWM -- Auto wrap */
                                MODBIT(term.mode, set, MODE_WRAP);
                                break;
-                       case 20:
-                               MODBIT(term.mode, set, MODE_CRLF);
+                       case 8: /* XXX: DECARM -- Auto repeat */
                                break;
+                       case 0:  /* Error (IGNORED) */
                        case 12: /* att610 -- Start blinking cursor (IGNORED) */
                                break;
                        case 25:
@@ -1321,6 +1346,12 @@ tsetmode(bool priv, bool set, int *args, int narg) {
                                tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD);
                                break;
                        default:
+                       /* case 2:  DECANM -- ANSI/VT52 (NOT SUPPOURTED) */
+                       /* case 3:  DECCOLM -- Column  (NOT SUPPORTED) */
+                       /* case 4:  DECSCLM -- Scroll (NOT SUPPORTED) */
+                       /* case 18: DECPFF -- Printer feed (NOT SUPPORTED) */
+                       /* case 19: DECPEX -- Printer extent (NOT SUPPORTED) */
+                       /* case 42: DECNRCM -- National characters (NOT SUPPORTED) */
                                fprintf(stderr,
                                        "erresc: unknown private set/reset mode %d\n",
                                        *args);
@@ -1328,9 +1359,19 @@ tsetmode(bool priv, bool set, int *args, int narg) {
                        }
                } else {
                        switch(*args) {
-                       case 4:
+                       case 0:  /* Error (IGNORED) */
+                               break;
+                       case 2:  /* KAM -- keyboard action */
+                               MODBIT(term.mode, set, MODE_KBDLOCK);
+                               break;
+                       case 4:  /* IRM -- Insertion-replacement */
                                MODBIT(term.mode, set, MODE_INSERT);
                                break;
+                       case 12: /* XXX: SRM -- Send/Receive */
+                               break;
+                       case 20: /* LNM -- Linefeed/new line */
+                               MODBIT(term.mode, set, MODE_CRLF);
+                               break;
                        default:
                                fprintf(stderr,
                                        "erresc: unknown set/reset mode %d\n",
@@ -1621,11 +1662,11 @@ tputtab(bool forward) {
 }
 
 void
-tputc(char *c) {
+tputc(char *c, int len) {
        char ascii = *c;
 
        if(iofd != -1)
-               write(iofd, c, 1);
+               write(iofd, c, len);
 
        if(term.esc & ESC_START) {
                if(term.esc & ESC_CSI) {
@@ -1656,12 +1697,18 @@ tputc(char *c) {
                                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);
                        }
@@ -1680,9 +1727,14 @@ tputc(char *c) {
                                strescseq.type = ascii;
                                term.esc |= ESC_STR;
                                break;
-                       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);
@@ -1708,6 +1760,7 @@ tputc(char *c) {
                        case 'c': /* RIS -- Reset to inital state */
                                treset();
                                term.esc = 0;
+                               xclear(0, 0, xw.w, xw.h);
                                xresettitle();
                                break;
                        case '=': /* DECPAM -- Application keypad */
@@ -2045,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)) {
@@ -2071,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);
@@ -2257,6 +2299,8 @@ kpress(XEvent *ev) {
        int shift;
        Status status;
 
+       if (IS_SET(MODE_KBDLOCK))
+               return;
        meta = e->state & Mod1Mask;
        shift = e->state & ShiftMask;
        len = XmbLookupString(xw.xic, e, buf, sizeof(buf), &ksym, &status);
@@ -2327,7 +2371,7 @@ resize(XEvent *e) {
        xclear(0, 0, xw.w, xw.h);
        tresize(col, row);
        xresize(col, row);
-       ttyresize(col, row);
+       ttyresize();
 }
 
 void
@@ -2434,9 +2478,9 @@ main(int argc, char *argv[]) {
 
  run:
        setlocale(LC_CTYPE, "");
-       xinit();
        tnew(80, 24);
        ttynew();
+       xinit();
        selinit();
        run();
        return 0;