factored code and fixed behaviour of tnewline().

[st.git] / st.c

diff --git a/st.c b/st.c
index a5cca17..5633e40 100644 (file)
--- a/st.c
+++ b/st.c
@@ -161,8 +161,8 @@ static void tputc(char);
 static void tputs(char*, int);
 static void treset(void);
 static void tresize(int, int);
-static void tscrollup(int);
-static void tscrolldown(int);
+static void tscrollup(int, int);
+static void tscrolldown(int, int);
 static void tsetattr(int*, int);
 static void tsetchar(char);
 static void tsetscroll(int, int);
@@ -387,10 +387,10 @@ dump(char c) {
 
 void
 ttyread(void) {
-       char buf[BUFSIZ] = {0};
+       char buf[BUFSIZ];
        int ret;
 
-       if((ret = read(cmdfd, buf, BUFSIZ)) < 0)
+       if((ret = read(cmdfd, buf, LEN(buf))) < 0)
                die("Couldn't read from shell: %s\n", SERRNO);
        else
                tputs(buf, ret);
@@ -459,16 +459,15 @@ tswapscreen(void) {
 }
 
 void
-tscrolldown (int n) {
+tscrolldown(int orig, int n) {
        int i;
        Line temp;
        
-       LIMIT(n, 0, term.bot-term.top+1);
+       LIMIT(n, 0, term.bot-orig+1);
 
-       for(i = 0; i < n; i++)
-               memset(term.line[term.bot-i], 0, term.col*sizeof(Glyph));
+       tclearregion(0, term.bot-n+1, term.col-1, term.bot);
        
-       for(i = term.bot; i >= term.top+n; i--) {
+       for(i = term.bot; i >= orig+n; i--) {
                temp = term.line[i];
                term.line[i] = term.line[i-n];
                term.line[i-n] = temp;
@@ -476,15 +475,14 @@ tscrolldown (int n) {
 }
 
 void
-tscrollup (int n) {
+tscrollup(int orig, int n) {
        int i;
        Line temp;
-       LIMIT(n, 0, term.bot-term.top+1);
+       LIMIT(n, 0, term.bot-orig+1);
        
-       for(i = 0; i < n; i++)
-               memset(term.line[term.top+i], 0, term.col*sizeof(Glyph));
+       tclearregion(0, orig, term.col-1, orig+n-1);
        
-       for(i = term.top; i <= term.bot-n; i++) { 
+       for(i = orig; i <= term.bot-n; i++) { 
                 temp = term.line[i];
                 term.line[i] = term.line[i+n]; 
                 term.line[i+n] = temp;
@@ -493,9 +491,11 @@ tscrollup (int n) {
 
 void
 tnewline(void) {
-       int y = term.c.y + 1;
-       if(y > term.bot)
-               tscrollup(1), y = term.bot;
+       int y = term.c.y;
+       if(term.c.y == term.bot)
+               tscrollup(term.top, 1);
+       else
+               y++;
        tmoveto(0, y);
 }
 
@@ -587,50 +587,18 @@ tinsertblank(int n) {
 
 void
 tinsertblankline(int n) {
-       int i;
-       Line blank;
-       int bot = term.bot;
-
-       if(term.c.y > term.bot)
-               bot = term.row - 1;
-       else if(term.c.y < term.top)
-               bot = term.top - 1;
-       if(term.c.y + n >= bot) {
-               tclearregion(0, term.c.y, term.col-1, bot);
+       if(term.c.y < term.top || term.c.y > term.bot)
                return;
-       }
-       for(i = bot; i >= term.c.y+n; i--) {
-               /* swap deleted line <-> blanked line */
-               blank = term.line[i];
-               term.line[i] = term.line[i-n];
-               term.line[i-n] = blank;
-               /* blank it */
-               memset(blank, 0, term.col * sizeof(Glyph));
-       }
+
+       tscrolldown(term.c.y, n);
 }
 
 void
 tdeleteline(int n) {
-       int i;
-       Line blank;
-       int bot = term.bot;
-
-       if(term.c.y > term.bot)
-               bot = term.row - 1;
-       else if(term.c.y < term.top)
-               bot = term.top - 1;
-       if(term.c.y + n >= bot) {
-               tclearregion(0, term.c.y, term.col-1, bot);
+       if(term.c.y < term.top || term.c.y > term.bot)
                return;
-       }
-       for(i = term.c.y; i <= bot-n; i++) {
-               /* swap deleted line <-> blanked line */
-               blank = term.line[i];
-               term.line[i] = term.line[i+n];
-               term.line[i+n] = blank;
-               /* blank it */
-               memset(blank, 0, term.col * sizeof(Glyph));
-       }
+
+       tscrollup(term.c.y, n);
 }
 
 void
@@ -802,11 +770,11 @@ csihandle(void) {
                break;
        case 'S': /* SU -- Scroll <n> line up */
                DEFAULT(escseq.arg[0], 1);
-               tscrollup(escseq.arg[0]);
+               tscrollup(term.top, escseq.arg[0]);
                break;
        case 'T': /* SD -- Scroll <n> line down */
                DEFAULT(escseq.arg[0], 1);
-               tscrolldown(escseq.arg[0]);
+               tscrolldown(term.top, escseq.arg[0]);
                break;
        case 'L': /* IL -- Insert <n> blank lines */
                DEFAULT(escseq.arg[0], 1);
@@ -957,7 +925,8 @@ tputc(char c) {
                                term.esc = 0;
                                csiparse(), csihandle();
                        }
-               } else if(term.esc & ESC_OSC) {
+                       /* TODO: handle other OSC */
+               } else if(term.esc & ESC_OSC) { 
                        if(c == ';') {
                                term.titlelen = 0;
                                term.esc = ESC_START | ESC_TITLE;
@@ -995,7 +964,7 @@ tputc(char c) {
                                break;
                        case 'D': /* IND -- Linefeed */
                                if(term.c.y == term.bot)
-                                       tscrollup(1);
+                                       tscrollup(term.top, 1);
                                else
                                        tmoveto(term.c.x, term.c.y+1);
                                term.esc = 0;
@@ -1006,7 +975,7 @@ tputc(char c) {
                                break;
                        case 'M': /* RI -- Reverse index */
                                if(term.c.y == term.top)
-                                       tscrolldown(1);
+                                       tscrolldown(term.top, 1);
                                else
                                        tmoveto(term.c.x, term.c.y-1);
                                term.esc = 0;
@@ -1201,18 +1170,18 @@ xinit(void) {
        xloadcols();
 
        /* windows */
-       xw.h = term.row * xw.ch + 2*BORDER;
-       xw.w = term.col * xw.cw + 2*BORDER;
+       xw.bufh = term.row * xw.ch;
+       xw.bufw = term.col * xw.cw;
+       xw.h = xw.bufh + 2*BORDER;
+       xw.w = xw.bufw + 2*BORDER;
        xw.win = XCreateSimpleWindow(xw.dis, XRootWindow(xw.dis, xw.scr), 0, 0,
                        xw.w, xw.h, 0,
                        dc.col[DefaultBG],
                        dc.col[DefaultBG]);
-       xw.bufw = xw.w - 2*BORDER;
-       xw.bufh = xw.h - 2*BORDER;
        xw.buf = XCreatePixmap(xw.dis, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dis, xw.scr));
        /* gc */
        dc.gc = XCreateGC(xw.dis, xw.win, 0, NULL);
-       
+
        /* event mask */
        XSelectInput(xw.dis, xw.win, ExposureMask | KeyPressMask
                | StructureNotifyMask | FocusChangeMask | PointerMotionMask