faster resizing.

[st.git] / st.c

diff --git a/st.c b/st.c
index deddb0d..f44db79 100644 (file)
--- a/st.c
+++ b/st.c
@@ -20,8 +20,6 @@
 #include <X11/keysym.h>
 #include <X11/Xutil.h>
 
-#define TNAME "st-256color"
-
 /* Arbitrary sizes */
 #define ESC_TITLE_SIZ 256
 #define ESC_BUF_SIZ   256
@@ -107,8 +105,6 @@ typedef struct {
        char s[ESC_BUF_SIZ];
 } Key;
 
-#include "config.h"
-
 /* Drawing Context */
 typedef struct {
        unsigned long col[256];
@@ -117,6 +113,8 @@ typedef struct {
        GC gc;
 } DC;
 
+#include "config.h"
+
 static void die(const char *errstr, ...);
 static void draw(int);
 static void execsh(void);
@@ -138,6 +136,7 @@ static void tinsertblankline(int);
 static void tmoveto(int, int);
 static void tnew(int, int);
 static void tnewline(void);
+static void tputtab(void);
 static void tputc(char);
 static void tputs(char*, int);
 static void treset(void);
@@ -154,6 +153,9 @@ static void ttyread(void);
 static void ttyresize(int, int);
 static void ttywrite(const char *, size_t);
 
+static void xbell(void);
+static void xdraws(char *, Glyph, int, int, int);
+static void xhints(void);
 static void xclear(int, int, int, int);
 static void xcursor(int);
 static void xinit(void);
@@ -245,7 +247,7 @@ ttynew(void) {
        if((m = posix_openpt(O_RDWR | O_NOCTTY)) < 0)
                die("openpt failed: %s\n", SERRNO);
        if(grantpt(m) < 0)
-               die("grandpt failed: %s\n", SERRNO);
+               die("grantpt failed: %s\n", SERRNO);
        if(unlockpt(m) < 0)
                die("unlockpt failed: %s\n", SERRNO);
        if(!(pts = ptsname(m)))
@@ -263,7 +265,9 @@ ttynew(void) {
                dup2(s, STDOUT_FILENO);
                dup2(s, STDERR_FILENO);
                if(ioctl(s, TIOCSCTTY, NULL) < 0)
-                       die("ioctl TTIOCSTTY failed: %s\n", SERRNO);
+                       die("ioctl TIOCSCTTY failed: %s\n", SERRNO);
+               close(s);
+               close(m);
                execsh();
                break;
        default:
@@ -445,11 +449,6 @@ tmovecursor(int dir) {
                break;
        case CURSOR_LEFT:
                xf--;
-               if(term.mode & MODE_WRAP && xf < 0) {
-                       xf = term.col-1, yf--;
-                       if(yf < term.top)
-                               yf = term.top, xf = 0;
-               }
                break;
        case CURSOR_RIGHT:
                xf++;
@@ -499,21 +498,21 @@ tdeletechar(int n) {
                return;
        }
        memmove(&term.line[term.c.y][dst], &term.line[term.c.y][src], size * sizeof(Glyph));
-       tclearregion(term.col-size, term.c.y, term.col-1, term.c.y);
+       tclearregion(term.col-n, term.c.y, term.col-1, term.c.y);
 }
 
 void
 tinsertblank(int n) {
        int src = term.c.x;
        int dst = src + n;
-       int size = term.col - n - src;
+       int size = term.col - dst;
 
        if(dst >= term.col) {
                tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
                return;
        }
        memmove(&term.line[term.c.y][dst], &term.line[term.c.y][src], size * sizeof(Glyph));
-       tclearregion(src, term.c.y, dst, term.c.y);
+       tclearregion(src, term.c.y, dst - 1, term.c.y);
 }
 
 void
@@ -864,12 +863,7 @@ csireset(void) {
 void
 tputtab(void) {
        int space = TAB - term.c.x % TAB;
-       
-       if(term.c.x + space >= term.col)
-               space--;
-       
-       for(; space > 0; space--)
-               tmovecursor(CURSOR_RIGHT);
+       tmoveto(term.c.x + space, term.c.y);
 }
 
 void
@@ -1007,23 +1001,21 @@ tputs(char *s, int len) {
 void
 tresize(int col, int row) {
        int i;
-       Line *line;
        int minrow = MIN(row, term.row);
        int mincol = MIN(col, term.col);
 
        if(col < 1 || row < 1)
                return;
-       /* alloc */
-       line = calloc(row, sizeof(Line));
-       for(i = 0 ; i < row; i++)
-               line[i] = calloc(col, sizeof(Glyph));
-       /* copy */
-       for(i = 0 ; i < minrow; i++)
-               memcpy(line[i], term.line[i], mincol * sizeof(Glyph));
-       /* free */
-       for(i = 0; i < term.row; i++)
+
+       for(i = row; i < term.row; i++)
                free(term.line[i]);
-       free(term.line);
+       term.line = realloc(term.line, row * sizeof(Line));
+       for(i = 0; i < minrow; i++) {
+               term.line[i] = realloc(term.line[i], col * sizeof(Glyph));
+               memset(term.line[i] + mincol, 0, (col - mincol) * sizeof(Glyph));
+       }
+       for(/* i == minrow */; i < row; i++)
+               term.line[i] = calloc(col, sizeof(Glyph));
        
        LIMIT(term.c.x, 0, col-1);
        LIMIT(term.c.y, 0, row-1);
@@ -1031,7 +1023,6 @@ tresize(int col, int row) {
        LIMIT(term.bot, 0, row-1);
        
        term.bot = row-1;
-       term.line = line;
        term.col = col, term.row = row;
 }
 
@@ -1175,7 +1166,7 @@ xcursor(int mode) {
        
        if(term.line[term.c.y][term.c.x].state & GLYPH_SET)
                g.c = term.line[term.c.y][term.c.x].c;
-
+       
        /* remove the old cursor */
        if(term.line[oldy][oldx].state & GLYPH_SET)
                xdraws(&term.line[oldy][oldx].c, term.line[oldy][oldx], oldx, oldy, 1);