summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoberto E. Vargas Caballero2013-10-28 19:18:24 +0100
committerRoberto E. Vargas Caballero2013-10-28 19:18:24 +0100
commit3d3c37bc70042cd2f4bbc8f6ea5fceb2311f0a32 (patch)
tree88478e9071eed37ac3233c0857097dcbdfd6a0c7
parent297c886b72f4e9093973aaa14b66d392f6196634 (diff)
parent489982d4b8442af25a380f8c22be542055cda81f (diff)
downloadst-3d3c37bc70042cd2f4bbc8f6ea5fceb2311f0a32.tar.gz
st-3d3c37bc70042cd2f4bbc8f6ea5fceb2311f0a32.tar.xz
st-3d3c37bc70042cd2f4bbc8f6ea5fceb2311f0a32.zip
Merge remote-tracking branch 'origin/master' into omaster
-rw-r--r--st.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/st.c b/st.c
index 12e1e1f..8cfa2f7 100644
--- 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;
}