Don't set dirty all lines because tswapcreen do it

[st.git] / st.c

diff --git a/st.c b/st.c
index 45bc89d..814f3f5 100644 (file)
--- a/st.c
+++ b/st.c
@@ -382,7 +382,7 @@ static void tnewline(int);
 static void tputtab(int);
 static void tputc(char *, int);
 static void treset(void);
 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);
 static void tscrollup(int, int);
 static void tscrolldown(int, int);
 static void tsetattr(int *, int);


@@ -1553,6 +1553,7 @@ tsetchar(char *c, Glyph *attr, int x, int y) {
 void
 tclearregion(int x1, int y1, int x2, int y2) {
        int x, y, temp;
 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;
 
        if(x1 > x2)
                temp = x1, x1 = x2, x2 = temp;


@@ -1567,10 +1568,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++) {
        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);
                        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);

                }
        }
 }
                }
        }
 }


@@ -2652,7 +2656,7 @@ tputc(char *c, int len) {
        }
 }
 
        }
 }
 

-int
+void

 tresize(int col, int row) {
        int i;
        int minrow = MIN(row, term.row);
 tresize(int col, int row) {
        int i;
        int minrow = MIN(row, term.row);


@@ -2662,8 +2666,11 @@ tresize(int col, int row) {
        Line *orig;
        TCursor c;
 
        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;
 
        /* free unneeded rows */
        i = 0;


@@ -2693,14 +2700,12 @@ tresize(int col, int row) {
 
        /* resize each row to new width, zero-pad if needed */
        for(i = 0; i < minrow; i++) {
 
        /* 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.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));
        }
                term.line[i] = xmalloc(col * sizeof(Glyph));
                term.alt[i] = xmalloc(col * sizeof(Glyph));
        }


@@ -2720,7 +2725,7 @@ tresize(int col, int row) {
        tsetscroll(0, row-1);
        /* make use of the LIMIT in tmoveto */
        tmoveto(term.c.x, term.c.y);
        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 {
        orig = term.line;
        c = term.c;
        do {


@@ -2734,8 +2739,6 @@ tresize(int col, int row) {
                tcursor(CURSOR_LOAD);
        } while(orig != term.line);
        term.c = c;
                tcursor(CURSOR_LOAD);
        } while(orig != term.line);
        term.c = c;

-
-       return (slide > 0);

 }
 
 void
 }
 
 void