cleaning st.info. added comment in st.c for DECSCNM.

[st.git] / st.c

diff --git a/st.c b/st.c
index 5633e40..261612f 100644 (file)
--- a/st.c
+++ b/st.c
@@ -28,6 +28,10 @@
  #include <libutil.h>
 #endif
 
+#define USAGE \
+       "st-" VERSION ", (c) 2010 st engineers\n" \
+       "usage: st [-t title] [-e cmd] [-v]\n"
+
 /* Arbitrary sizes */
 #define ESC_TITLE_SIZ 256
 #define ESC_BUF_SIZ   256
@@ -210,6 +214,8 @@ static CSIEscape escseq;
 static int cmdfd;
 static pid_t pid;
 static Selection sel;
+static char *opt_cmd   = NULL;
+static char *opt_title = NULL;
 
 void
 selinit(void) {
@@ -329,9 +335,12 @@ die(const char *errstr, ...) {
 
 void
 execsh(void) {
-       char *args[3] = {getenv("SHELL"), "-i", NULL};
-       DEFAULT(args[0], SHELL); /* if getenv() failed */
-       putenv("TERM=" TNAME);
+       char *args[] = {getenv("SHELL"), "-i", NULL};
+       if(opt_cmd)
+               args[0] = opt_cmd, args[1] = NULL;
+       else
+               DEFAULT(args[0], SHELL);
+       putenv("TERM="TNAME);
        execvp(args[0], args);
 }
 
@@ -668,7 +677,8 @@ tsetattr(int *attr, int l) {
                        else if(BETWEEN(attr[i], 100, 107))
                                term.c.attr.fg = attr[i] - 100 + 8;
                        else 
-                               fprintf(stderr, "erresc: gfx attr %d unknown\n", attr[i]); 
+                               fprintf(stderr, "erresc: gfx attr %d unknown\n", attr[i]), csidump();
+                       
                        break;
                }
        }
@@ -786,6 +796,8 @@ csihandle(void) {
                        case 1:
                                term.mode &= ~MODE_APPKEYPAD;
                                break;
+                       case 5: /* TODO: DECSCNM -- Remove reverse video */
+                               break;
                        case 7:
                                term.mode &= ~MODE_WRAP;
                                break;
@@ -841,11 +853,16 @@ csihandle(void) {
                        case 1:
                                term.mode |= MODE_APPKEYPAD;
                                break;
+                       case 5: /* DECSCNM -- Reverve video */
+                               /* TODO: set REVERSE on the whole screen (f) */
+                               break;
                        case 7:
                                term.mode |= MODE_WRAP;
                                break;
                        case 12: /* att610 -- Start blinking cursor (IGNORED) */
-                               break;
+                                /* fallthrough for xterm cvvis = CSI [ ? 12 ; 25 h */
+                               if(escseq.narg > 1 && escseq.arg[1] != 25)
+                                       break;
                        case 25:
                                term.c.state &= ~CURSOR_HIDE;
                                break;
@@ -1051,12 +1068,25 @@ tresize(int col, int row) {
        int i;
        int minrow = MIN(row, term.row);
        int mincol = MIN(col, term.col);
+       int slide = term.c.y - row + 1;
 
        if(col < 1 || row < 1)
                return;
 
-       /* free uneeded rows */
-       for(i = row; i < term.row; i++) {
+       /* free unneeded rows */
+       i = 0;
+       if(slide > 0) {
+               /* slide screen to keep cursor where we expect it -
+                * tscrollup would work here, but we can optimize to
+                * memmove because we're freeing the earlier lines */
+               for(/* i = 0 */; i < slide; i++) {
+                       free(term.line[i]);
+                       free(term.alt[i]);
+               }
+               memmove(term.line, term.line + slide, row * sizeof(Line));
+               memmove(term.alt, term.alt + slide, row * sizeof(Line));
+       }
+       for(i += row; i < term.row; i++) {
                free(term.line[i]);
                free(term.alt[i]);
        }
@@ -1189,7 +1219,7 @@ xinit(void) {
        
        XMapWindow(xw.dis, xw.win);
        xhints();
-       XStoreName(xw.dis, xw.win, "st");
+       XStoreName(xw.dis, xw.win, opt_title ? opt_title : "st");
        XSync(xw.dis, 0);
 }
 
@@ -1208,8 +1238,13 @@ xdraws(char *s, Glyph base, int x, int y, int len) {
        XSetForeground(xw.dis, dc.gc, xfg);
        
        if(base.mode & ATTR_GFX)
-               for(i = 0; i < len; i++)
-                       s[i] = gfx[(int)s[i]];
+               for(i = 0; i < len; i++) {
+                       char c = gfx[(unsigned int)s[i] % 256];
+                       if(c)
+                               s[i] = c;
+                       else if(s[i] > 0x5f)
+                               s[i] -= 0x5f;
+               }
 
        XSetFont(xw.dis, dc.gc, base.mode & ATTR_BOLD ? dc.bfont->fid : dc.font->fid);
        XDrawImageString(xw.dis, xw.buf, dc.gc, winx, winy, s, len);
@@ -1429,10 +1464,21 @@ run(void) {
 
 int
 main(int argc, char *argv[]) {
-       if(argc == 2 && !strncmp("-v", argv[1], 3))
-               die("st-" VERSION ", (c) 2010 st engineers\n");
-       else if(argc != 1)
-               die("usage: st [-v]\n");
+       int i;
+       
+       for(i = 1; i < argc; i++) {
+               switch(argv[i][0] != '-' || argv[i][2] ? -1 : argv[i][1]) {
+               case 't':
+                       if(++i < argc) opt_title = argv[i];
+                       break;
+               case 'e':
+                       if(++i < argc) opt_cmd = argv[i];
+                       break;
+               case 'v':
+               default:
+                       die(USAGE);
+               }
+       }
        setlocale(LC_CTYPE, "");
        tnew(80, 24);
        ttynew();