redraw optimization.

[st.git] / st.c

diff --git a/st.c b/st.c
index 37c4048..4f17752 100644 (file)
--- a/st.c
+++ b/st.c
@@ -58,6 +58,7 @@ enum { GLYPH_SET=1, GLYPH_DIRTY=2 };
 enum { MODE_WRAP=1, MODE_INSERT=2, MODE_APPKEYPAD=4, MODE_ALTSCREEN=8 };
 enum { ESC_START=1, ESC_CSI=2, ESC_OSC=4, ESC_TITLE=8, ESC_ALTCHARSET=16 };
 enum { SCREEN_UPDATE, SCREEN_REDRAW };
+enum { WIN_VISIBLE=1, WIN_REDRAW=2, WIN_FOCUSED=4 };
 
 typedef struct {
        char c;     /* character code  */
@@ -117,8 +118,7 @@ typedef struct {
        int bufh; /* pixmap height */
        int ch; /* char height */
        int cw; /* char width  */
-       int focus;
-       int vis; /* is visible */
+       char state; /* focus, redraw, visible */
 } XWindow; 
 
 typedef struct {
@@ -627,12 +627,13 @@ tscrollup(int orig, int n) {
 
 void
 tnewline(void) {
+       int x = term.c.x+1 < term.col ? term.c.x : 0;
        int y = term.c.y;
        if(term.c.y == term.bot)
                tscrollup(term.top, 1);
        else
                y++;
-       tmoveto(0, y);
+       tmoveto(x, y);
 }
 
 void
@@ -677,7 +678,7 @@ tsetchar(char c) {
 
 void
 tclearregion(int x1, int y1, int x2, int y2) {
-       int y, temp;
+       int x, y, temp;
 
        if(x1 > x2)
                temp = x1, x1 = x2, x2 = temp;
@@ -690,7 +691,8 @@ tclearregion(int x1, int y1, int x2, int y2) {
        LIMIT(y2, 0, term.row-1);
 
        for(y = y1; y <= y2; y++)
-               memset(&term.line[y][x1], 0, sizeof(Glyph)*(x2-x1+1));
+               for(x = x1; x <= x2; x++)
+                       term.line[y][x].state = 0;
 }
 
 void
@@ -1164,7 +1166,7 @@ tputc(char c) {
                        tnewline();
                        break;
                case '\a':
-                       if(!xw.focus)
+                       if(!(xw.state & WIN_FOCUSED))
                                xseturgency(1);
                        break;
                case '\033':
@@ -1192,7 +1194,7 @@ tputs(char *s, int len) {
 
 void
 tresize(int col, int row) {
-       int i;
+       int i, x;
        int minrow = MIN(row, term.row);
        int mincol = MIN(col, term.col);
        int slide = term.c.y - row + 1;
@@ -1226,8 +1228,10 @@ tresize(int col, int row) {
        for(i = 0; i < minrow; i++) {
                term.line[i] = realloc(term.line[i], col * sizeof(Glyph));
                term.alt[i]  = realloc(term.alt[i],  col * sizeof(Glyph));
-               memset(term.line[i] + mincol, 0, (col - mincol) * sizeof(Glyph));
-               memset(term.alt[i]  + mincol, 0, (col - mincol) * sizeof(Glyph));
+               for(x = mincol; x < col; x++) {
+                       term.line[i][x].state = 0;
+                       term.alt[i][x].state = 0;
+               }
        }
 
        /* allocate any new rows */
@@ -1414,7 +1418,7 @@ xdrawcursor(void) {
                xclear(oldx, oldy, oldx, oldy);
        
        /* draw the new one */
-       if(!(term.c.state & CURSOR_HIDE) && xw.focus) {
+       if(!(term.c.state & CURSOR_HIDE) && (xw.state & WIN_FOCUSED)) {
                xdraws(&g.c, g, term.c.x, term.c.y, 1);
                oldx = term.c.x, oldy = term.c.y;
        }
@@ -1454,7 +1458,7 @@ draw(int redraw_all) {
        Glyph base, new;
        char buf[DRAW_BUF_SIZ];
 
-       if(!xw.vis)
+       if(!(xw.state & WIN_VISIBLE))
                return;
 
        xclear(0, 0, term.col-1, term.row-1);
@@ -1483,27 +1487,36 @@ draw(int redraw_all) {
        }
        xdrawcursor();
        XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDER, BORDER);
-       XFlush(xw.dis);
 }
 
 #endif
 
 void
 expose(XEvent *ev) {
-       draw(SCREEN_REDRAW);
+       XExposeEvent *e = &ev->xexpose;
+       if(xw.state & WIN_REDRAW) {
+               if(!e->count) {
+                       xw.state &= ~WIN_REDRAW;
+                       draw(SCREEN_REDRAW);
+               }
+       } else
+               XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, e->x-BORDER, e->y-BORDER,
+                               e->width, e->height, e->x, e->y);
 }
 
 void
 visibility(XEvent *ev) {
        XVisibilityEvent *e = &ev->xvisibility;
-       /* XXX if this goes from 0 to 1, need a full redraw for next Expose,
-        * not just a buf copy */
-       xw.vis = e->state != VisibilityFullyObscured;
+       if(e->state == VisibilityFullyObscured)
+               xw.state &= ~WIN_VISIBLE;
+       else if(!(xw.state & WIN_VISIBLE))
+               /* need a full redraw for next Expose, not just a buf copy */
+               xw.state |= WIN_VISIBLE | WIN_REDRAW;
 }
 
 void
 unmap(XEvent *ev) {
-       xw.vis = 0;
+       xw.state &= ~WIN_VISIBLE;
 }
 
 void
@@ -1516,8 +1529,11 @@ xseturgency(int add) {
 
 void
 focus(XEvent *ev) {
-       if((xw.focus = ev->type == FocusIn))
+       if(ev->type == FocusIn) {
+               xw.state |= WIN_FOCUSED;
                xseturgency(0);
+       } else
+               xw.state &= ~WIN_FOCUSED;
        draw(SCREEN_UPDATE);
 }