tab moves the cursor instead of inserting spaces.

[st.git] / st.c

diff --git a/st.c b/st.c
index d5f004b..c24bb1d 100644 (file)
--- a/st.c
+++ b/st.c
@@ -217,7 +217,7 @@ escparse(void) {
                }
                break;
        case '(':
-               /* humf charset stuff */
+               /* XXX: graphic character set */
                break;
        }
 }
@@ -230,8 +230,7 @@ tmoveto(int x, int y) {
 
 void
 tcursor(int dir) {
-       int xi = term.c.x, yi = term.c.y;
-       int xf = xi, yf = yi;
+       int xf = term.c.x, yf = term.c.y;
 
        switch(dir) {
        case CSup:
@@ -365,21 +364,6 @@ void
 tsetattr(int *attr, int l) {
        int i;
 
-#ifdef TRUECOLOR /* ESC [ ? <fg/bg> ; <r> ; <g> ; <b> m */
-       Color col;
-       if(escseq.priv && escseq.len == 4) { /* True color extension :) */
-               col = (escseq.arg[1]<<16) + (escseq.arg[2]<<8) + escseq.arg[3];
-               switch(escseq.arg[0]) {
-               case 3: /* foreground */
-                       term.c.attr.fg = col;
-                       break;
-               case 4: /* background */
-                       term.c.attr.bg = col;
-                       break;
-               }
-       }
-       else
-#endif
                for(i = 0; i < l; i++) {
                        switch(attr[i]) {
                        case 0:
@@ -575,6 +559,17 @@ escreset(void) {
 }
 
 void
+tputtab(void) {
+    int space = TAB - term.c.x % TAB;
+    
+    if(term.c.x + space >= term.col)
+        space--;
+    
+    for(; space > 0; space--)
+        tcursor(CSright);
+}
+
+void
 tputc(char c) {
        static int inesc = 0;
 
@@ -590,6 +585,9 @@ tputc(char c) {
                        tsetchar(c);
                        tcursor(CSright);
                        break;
+        case '\t':
+            tputtab();
+            break;
                case '\b':
                        tcursor(CSleft);
                        break;
@@ -704,18 +702,25 @@ xinit(void) {
 
        xw.dis = XOpenDisplay(NULL);
        xw.scr = XDefaultScreen(xw.dis);
+    if(!xw.dis)
+        die("can not open display");
+    
        /* font */
-       dc.font = XLoadQueryFont(xw.dis, FONT);
+       if(!(dc.font = XLoadQueryFont(xw.dis, FONT)))
+        die("can not find font " FONT);
+
        xw.cw = dc.font->max_bounds.rbearing - dc.font->min_bounds.lbearing;
        xw.ch = dc.font->ascent + dc.font->descent + LINESPACE;
+
        /* colors */
        for(i = 0; i < LEN(colorname); i++)
                dc.col[i] = xgetcol(colorname[i]);
+
        term.c.attr.fg = DefaultFG;
        term.c.attr.bg = DefaultBG;
        term.c.attr.mode = ATnone;
        /* windows */
-       xw.h = term.row * xw.ch;
+    xw.h = term.row * xw.ch;
        xw.w = term.col * xw.cw;
        /* XXX: this BORDER is useless after the first resize, handle it in xdraws() */
        xw.win = XCreateSimpleWindow(xw.dis, XRootWindow(xw.dis, xw.scr), 0, 0,
@@ -737,6 +742,7 @@ xinit(void) {
        XSetWMProperties(xw.dis, xw.win, NULL, NULL, &args[0], 0, &shint, &wmhint, &chint);
        XStoreName(xw.dis, xw.win, TNAME);
        XSync(xw.dis, 0);
+    
 }
 
 void
@@ -909,13 +915,13 @@ run(void) {
 int
 main(int argc, char *argv[]) {
        if(argc == 2 && !strncmp("-v", argv[1], 3))
-               die("st-"VERSION", © 2009 st engineers\n");
+               die("st-" VERSION ", © 2009 st engineers\n");
        else if(argc != 1)
                die("usage: st [-v]\n");
        setlocale(LC_CTYPE, "");
-       tnew(80, 24);
-       ttynew();
-       xinit();
-       run();
+    tnew(80, 24);
+    ttynew();
+    xinit();
+    run();
        return 0;
 }