Fix man page and usage()

[st.git] / st.c

diff --git a/st.c b/st.c
index a2703f4..8f19018 100644 (file)
--- a/st.c
+++ b/st.c
@@ -86,8 +86,6 @@ char *argv0;
 #define TRUEBLUE(x)      (((x) & 0xff) << 8)
 
 
-#define VT102ID "\033[?6c"
-
 enum glyph_attribute {
        ATTR_NULL      = 0,
        ATTR_BOLD      = 1,
@@ -382,7 +380,7 @@ static void tnewline(int);
 static void tputtab(int);
 static void tputc(char *, int);
 static void treset(void);
-static int tresize(int, int);
+static void tresize(int, int);
 static void tscrollup(int, int);
 static void tscrolldown(int, int);
 static void tsetattr(int *, int);
@@ -1176,16 +1174,15 @@ execsh(void) {
 
 void
 sigchld(int a) {
-       int stat = 0;
+       int stat, ret;
 
        if(waitpid(pid, &stat, 0) < 0)
                die("Waiting for pid %hd failed: %s\n", pid, strerror(errno));
 
-       if(WIFEXITED(stat)) {
-               exit(WEXITSTATUS(stat));
-       } else {
-               exit(EXIT_FAILURE);
-       }
+       ret = WIFEXITED(stat) ? WEXITSTATUS(stat) : EXIT_FAILURE;
+       if (ret != EXIT_SUCCESS)
+               die("child finished with error '%d'\n", stat);
+       exit(EXIT_SUCCESS);
 }
 
 void
@@ -1554,6 +1551,7 @@ tsetchar(char *c, Glyph *attr, int x, int y) {
 void
 tclearregion(int x1, int y1, int x2, int y2) {
        int x, y, temp;
+       Glyph *gp;
 
        if(x1 > x2)
                temp = x1, x1 = x2, x2 = temp;
@@ -1568,10 +1566,13 @@ tclearregion(int x1, int y1, int x2, int y2) {
        for(y = y1; y <= y2; y++) {
                term.dirty[y] = 1;
                for(x = x1; x <= x2; x++) {
+                       gp = &term.line[y][x];
                        if(selected(x, y))
                                selclear(NULL);
-                       term.line[y][x] = term.c.attr;
-                       memcpy(term.line[y][x].c, " ", 2);
+                       gp->fg = term.c.attr.fg;
+                       gp->bg = term.c.attr.bg;
+                       gp->mode = 0;
+                       memcpy(gp->c, " ", 2);
                }
        }
 }
@@ -1962,7 +1963,7 @@ csihandle(void) {
                break;
        case 'c': /* DA -- Device Attributes */
                if(csiescseq.arg[0] == 0)
-                       ttywrite(VT102ID, sizeof(VT102ID) - 1);
+                       ttywrite(vtiden, sizeof(vtiden) - 1);
                break;
        case 'C': /* CUF -- Cursor <n> Forward */
        case 'a': /* HPR -- Cursor <n> Forward */
@@ -2308,13 +2309,13 @@ techo(char *buf, int len) {
        for(; len > 0; buf++, len--) {
                char c = *buf;
 
-               if(ISCONTROL(c)) { /* control code */
+               if(ISCONTROL((uchar) c)) { /* control code */
                        if(c & 0x80) {
                                c &= 0x7f;
                                tputc("^", 1);
                                tputc("[", 1);
                        } else if(c != '\n' && c != '\r' && c != '\t') {
-                               c ^= '\x40';
+                               c ^= 0x40;
                                tputc("^", 1);
                        }
                        tputc(&c, 1);
@@ -2430,7 +2431,7 @@ tcontrolcode(uchar ascii) {
        case 0x98:   /* TODO: SOS */
                break;
        case 0x9a:   /* DECID -- Identify Terminal */
-               ttywrite(VT102ID, sizeof(VT102ID) - 1);
+               ttywrite(vtiden, sizeof(vtiden) - 1);
                break;
        case 0x9b:   /* TODO: CSI */
        case 0x9c:   /* TODO: ST */
@@ -2586,7 +2587,7 @@ tputc(char *c, int len) {
                                }
                                break;
                        case 'Z': /* DECID -- Identify Terminal */
-                               ttywrite(VT102ID, sizeof(VT102ID) - 1);
+                               ttywrite(vtiden, sizeof(vtiden) - 1);
                                break;
                        case 'c': /* RIS -- Reset to inital state */
                                treset();
@@ -2653,7 +2654,7 @@ tputc(char *c, int len) {
        }
 }
 
-int
+void
 tresize(int col, int row) {
        int i;
        int minrow = MIN(row, term.row);
@@ -2663,8 +2664,11 @@ tresize(int col, int row) {
        Line *orig;
        TCursor c;
 
-       if(col < 1 || row < 1)
-               return 0;
+       if(col < 1 || row < 1) {
+               fprintf(stderr,
+                       "tresize: error resizing to %dx%d\n", col, row);
+               return;
+       }
 
        /* free unneeded rows */
        i = 0;
@@ -2694,14 +2698,12 @@ tresize(int col, int row) {
 
        /* resize each row to new width, zero-pad if needed */
        for(i = 0; i < minrow; i++) {
-               term.dirty[i] = 1;
                term.line[i] = xrealloc(term.line[i], col * sizeof(Glyph));
                term.alt[i]  = xrealloc(term.alt[i],  col * sizeof(Glyph));
        }
 
        /* allocate any new rows */
        for(/* i == minrow */; i < row; i++) {
-               term.dirty[i] = 1;
                term.line[i] = xmalloc(col * sizeof(Glyph));
                term.alt[i] = xmalloc(col * sizeof(Glyph));
        }
@@ -2721,7 +2723,7 @@ tresize(int col, int row) {
        tsetscroll(0, row-1);
        /* make use of the LIMIT in tmoveto */
        tmoveto(term.c.x, term.c.y);
-       /* Clearing both screens */
+       /* Clearing both screens (it makes dirty all lines) */
        orig = term.line;
        c = term.c;
        do {
@@ -2735,8 +2737,6 @@ tresize(int col, int row) {
                tcursor(CURSOR_LOAD);
        } while(orig != term.line);
        term.c = c;
-
-       return (slide > 0);
 }
 
 void
@@ -3870,8 +3870,8 @@ run(void) {
 void
 usage(void) {
        die("%s " VERSION " (c) 2010-2014 st engineers\n" \
-       "usage: st [-a] [-v] [-c class] [-f font] [-g geometry] [-o file]" \
-       " [-t title] [-w windowid] [-e command ...]\n", argv0);
+       "usage: st [-a] [-v] [-c class] [-f font] [-g geometry] [-o file]\n"
+       "          [-i] [-t title] [-w windowid] [-e command ...]\n", argv0);
 }
 
 int