DustVoice
/
st
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into omaster

This commit is contained in:
Roberto E. Vargas Caballero 2013-10-28 19:18:24 +01:00
parent 297c886b72 489982d4b8
commit 3d3c37bc70
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
st.c
View File

@ -3686,6 +3686,8 @@ run(void) {
gettimeofday(&last, NULL); gettimeofday(&last, NULL);
for(xev = actionfps;;) { for(xev = actionfps;;) {
long deltatime;
FD_ZERO(&rfd); FD_ZERO(&rfd);
FD_SET(cmdfd, &rfd); FD_SET(cmdfd, &rfd);
FD_SET(xfd, &rfd); FD_SET(xfd, &rfd);
@ -3719,8 +3721,9 @@ run(void) {
gettimeofday(&lastblink, NULL); gettimeofday(&lastblink, NULL);
dodraw = 1; dodraw = 1;
} }
if(TIMEDIFF(now, last) \ deltatime = TIMEDIFF(now, last);
> (xev? (1000/xfps) : (1000/actionfps))) { if(deltatime > (xev? (1000/xfps) : (1000/actionfps))
|| deltatime < 0) {
dodraw = 1; dodraw = 1;
last = now; last = now;
} }