aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoberto E. Vargas Caballero <k0ga@shike2.com>2013-10-28 19:18:24 +0100
committerRoberto E. Vargas Caballero <k0ga@shike2.com>2013-10-28 19:18:24 +0100
commit3d3c37bc70042cd2f4bbc8f6ea5fceb2311f0a32 (patch)
tree88478e9071eed37ac3233c0857097dcbdfd6a0c7
parent297c886b72f4e9093973aaa14b66d392f6196634 (diff)
parent489982d4b8442af25a380f8c22be542055cda81f (diff)
downloadst-patched-3d3c37bc70042cd2f4bbc8f6ea5fceb2311f0a32.tar.bz2
st-patched-3d3c37bc70042cd2f4bbc8f6ea5fceb2311f0a32.tar.xz
st-patched-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) {
3686 gettimeofday(&last, NULL); 3686 gettimeofday(&last, NULL);
3687 3687
3688 for(xev = actionfps;;) { 3688 for(xev = actionfps;;) {
3689 long deltatime;
3690
3689 FD_ZERO(&rfd); 3691 FD_ZERO(&rfd);
3690 FD_SET(cmdfd, &rfd); 3692 FD_SET(cmdfd, &rfd);
3691 FD_SET(xfd, &rfd); 3693 FD_SET(xfd, &rfd);
@@ -3719,8 +3721,9 @@ run(void) {
3719 gettimeofday(&lastblink, NULL); 3721 gettimeofday(&lastblink, NULL);
3720 dodraw = 1; 3722 dodraw = 1;
3721 } 3723 }
3722 if(TIMEDIFF(now, last) \ 3724 deltatime = TIMEDIFF(now, last);
3723 > (xev? (1000/xfps) : (1000/actionfps))) { 3725 if(deltatime > (xev? (1000/xfps) : (1000/actionfps))
3726 || deltatime < 0) {
3724 dodraw = 1; 3727 dodraw = 1;
3725 last = now; 3728 last = now;
3726 } 3729 }