Redrawing is fixed.

[st.git] / st.c

diff --git a/st.c b/st.c
index c408ca9..89c59b4 100644 (file)
--- a/st.c
+++ b/st.c
@@ -198,6 +198,7 @@ typedef struct {
        int scr;
        Bool isfixed; /* is fixed geometry? */
        int fx, fy, fw, fh; /* fixed geometry */
+       int tw, th; /* tty width and height */
        int w;  /* window width */
        int h;  /* window height */
        int ch; /* char height */
@@ -596,14 +597,17 @@ selcopy(void) {
                /* append every set & selected glyph to the selection */
                for(y = 0; y < term.row; y++) {
                        for(x = 0; x < term.col; x++) {
-                               is_selected = selected(x, y);
-                               if((term.line[y][x].state & GLYPH_SET) && is_selected) {
-                                       int size = utf8size(term.line[y][x].c);
-                                       memcpy(ptr, term.line[y][x].c, size);
-                                       ptr += size;
-                               }
+                               int size;
+                               char *p;
+                               Glyph *gp = &term.line[y][x];
+
+                               if(!(is_selected = selected(x, y)))
+                                       continue;
+                               p = (gp->state & GLYPH_SET) ? gp->c : " ";
+                               size = utf8size(p);
+                               memcpy(ptr, p, size);
+                               ptr += size;
                        }
-
                        /* \n at the end of every selected line except for the last one */
                        if(is_selected && y < sel.e.y)
                                *ptr++ = '\n';
@@ -891,8 +895,8 @@ ttyresize(int x, int y) {
 
        w.ws_row = term.row;
        w.ws_col = term.col;
-       w.ws_xpixel = xw.w;
-       w.ws_ypixel = xw.h;
+       w.ws_xpixel = xw.tw;
+       w.ws_ypixel = xw.th;
        if(ioctl(cmdfd, TIOCSWINSZ, &w) < 0)
                fprintf(stderr, "Couldn't set window size: %s\n", SERRNO);
 }
@@ -1834,8 +1838,8 @@ tresize(int col, int row) {
 
 void
 xresize(int col, int row) {
-       xw.w = MAX(1, 2*BORDER + col * xw.cw);
-       xw.h = MAX(1, 2*BORDER + row * xw.ch);
+       xw.tw = MAX(1, 2*BORDER + col * xw.cw);
+       xw.th = MAX(1, 2*BORDER + row * xw.ch);
 }
 
 void
@@ -2139,6 +2143,8 @@ xresettitle(void) {
 void
 redraw(void) {
        struct timespec tv = {0, REDRAW_TIMEOUT * 1000};
+
+       xclear(0, 0, xw.w, xw.h);
        tfulldirt();
        draw();
        XSync(xw.dpy, False); /* necessary for a good tput flash */
@@ -2328,6 +2334,8 @@ resize(XEvent *e) {
        row = (xw.h - 2*BORDER) / xw.ch;
        if(col == term.col && row == term.row)
                return;
+
+       xclear(0, 0, xw.w, xw.h);
        tresize(col, row);
        xresize(col, row);
        ttyresize(col, row);