Let curses do the dirty work for flash

[st.git] / st.c

diff --git a/st.c b/st.c
index 4499be6..e1139ec 100644 (file)
--- a/st.c
+++ b/st.c
@@ -63,8 +63,6 @@ char *argv0;
 #define XK_NO_MOD     0
 #define XK_SWITCH_MOD (1<<13)
 
-#define REDRAW_TIMEOUT (80*1000) /* 80 ms */
-
 /* macros */
 #define MIN(a, b)  ((a) < (b) ? (a) : (b))
 #define MAX(a, b)  ((a) < (b) ? (b) : (a))
@@ -349,7 +347,7 @@ typedef struct {
 
 static void die(const char *, ...);
 static void draw(void);
-static void redraw(int);
+static void redraw(void);
 static void drawregion(int, int, int, int);
 static void execsh(void);
 static void sigchld(int);
@@ -947,6 +945,8 @@ getsel(void) {
                        lastx = (sel.ne.y == y) ? sel.ne.x : term.col-1;
                }
                last = &term.line[y][MIN(lastx, linelen-1)];
+               while(last >= gp && last->c[0] == ' ')
+                       --last;
 
                for( ; gp <= last; ++gp) {
                        if(gp->mode & ATTR_WDUMMY)
@@ -1824,7 +1824,7 @@ tsetmode(bool priv, bool set, int *args, int narg) {
                                mode = term.mode;
                                MODBIT(term.mode, set, MODE_REVERSE);
                                if(mode != term.mode)
-                                       redraw(REDRAW_TIMEOUT);
+                                       redraw();
                                break;
                        case 6: /* DECOM -- Origin */
                                MODBIT(term.c.state, set, CURSOR_ORIGIN);
@@ -2198,7 +2198,7 @@ strhandle(void) {
                                 * TODO if defaultbg color is changed, borders
                                 * are dirty
                                 */
-                               redraw(0);
+                               redraw();
                        }
                        return;
                }
@@ -2671,13 +2671,16 @@ tputc(char *c, int len) {
        if(IS_SET(MODE_WRAP) && (term.c.state & CURSOR_WRAPNEXT)) {
                gp->mode |= ATTR_WRAP;
                tnewline(1);
+               gp = &term.line[term.c.y][term.c.x];
        }
 
-       if(IS_SET(MODE_INSERT) && term.c.x+1 < term.col)
-               memmove(gp+1, gp, (term.col - term.c.x - 1) * sizeof(Glyph));
+       if(IS_SET(MODE_INSERT) && term.c.x+width < term.col)
+               memmove(gp+width, gp, (term.col - term.c.x - width) * sizeof(Glyph));
 
-       if(term.c.x+width > term.col)
+       if(term.c.x+width > term.col) {
                tnewline(1);
+               gp = &term.line[term.c.y][term.c.x];
+       }
 
        tsetchar(c, &term.c.attr, term.c.x, term.c.y);
 
@@ -2987,7 +2990,7 @@ xloadfonts(char *fontstr, double fontsize) {
        if(!pattern)
                die("st: can't open font %s\n", fontstr);
 
-       if(fontsize > 0) {
+       if(fontsize > 1) {
                FcPatternDel(pattern, FC_PIXEL_SIZE);
                FcPatternDel(pattern, FC_SIZE);
                FcPatternAddDouble(pattern, FC_PIXEL_SIZE, (double)fontsize);
@@ -3088,7 +3091,7 @@ xzoomabs(const Arg *arg) {
        xunloadfonts();
        xloadfonts(usedfont, arg->i);
        cresize(0, 0);
-       redraw(0);
+       redraw();
        xhints();
 }
 
@@ -3553,16 +3556,9 @@ xresettitle(void) {
 }
 
 void
-redraw(int timeout) {
-       struct timespec tv = {0, timeout * 1000};
-
+redraw(void) {
        tfulldirt();
        draw();
-
-       if(timeout > 0) {
-               nanosleep(&tv, NULL);
-               XSync(xw.dpy, False); /* necessary for a good tput flash */
-       }
 }
 
 void
@@ -3629,7 +3625,7 @@ expose(XEvent *ev) {
                if(!e->count)
                        xw.state &= ~WIN_REDRAW;
        }
-       redraw(0);
+       redraw();
 }
 
 void
@@ -3920,6 +3916,9 @@ run(void) {
                                                        TIMEDIFF(now,
                                                                lastblink)));
                                        }
+                                       drawtimeout.tv_sec = \
+                                           drawtimeout.tv_nsec / 1E9;
+                                       drawtimeout.tv_nsec %= (long)1E9;
                                } else {
                                        tv = NULL;
                                }
@@ -3930,7 +3929,7 @@ run(void) {
 
 void
 usage(void) {
-       die("%s " VERSION " (c) 2010-2014 st engineers\n" \
+       die("%s " VERSION " (c) 2010-2015 st engineers\n" \
        "usage: st [-a] [-v] [-c class] [-f font] [-g geometry] [-o file]\n"
        "          [-i] [-t title] [-w windowid] [-e command ...]\n", argv0);
 }