Merge remote-tracking branch 'origin/master' into omaster - st - Personal fork of st
 (HTM) git clone git://git.drkhsh.at/st.git
 (DIR) Log
 (DIR) Files
 (DIR) Refs
 (DIR) README
 (DIR) LICENSE
       ---
 (DIR) commit 3d3c37bc70042cd2f4bbc8f6ea5fceb2311f0a32
 (DIR) parent 297c886b72f4e9093973aaa14b66d392f6196634
 (HTM) Author: Roberto E. Vargas Caballero <k0ga@shike2.com>
       Date:   Mon, 28 Oct 2013 19:18:24 +0100
       
       Merge remote-tracking branch 'origin/master' into omaster
       
       Diffstat:
         M st.c                                |       7 +++++--
       
       1 file changed, 5 insertions(+), 2 deletions(-)
       ---
 (DIR) diff --git a/st.c b/st.c
       @@ -3686,6 +3686,8 @@ run(void) {
                gettimeofday(&last, NULL);
        
                for(xev = actionfps;;) {
       +                long deltatime;
       +
                        FD_ZERO(&rfd);
                        FD_SET(cmdfd, &rfd);
                        FD_SET(xfd, &rfd);
       @@ -3719,8 +3721,9 @@ run(void) {
                                gettimeofday(&lastblink, NULL);
                                dodraw = 1;
                        }
       -                if(TIMEDIFF(now, last) \
       -                                > (xev? (1000/xfps) : (1000/actionfps))) {
       +                deltatime = TIMEDIFF(now, last);
       +                if(deltatime > (xev? (1000/xfps) : (1000/actionfps))
       +                                || deltatime < 0) {
                                dodraw = 1;
                                last = now;
                        }