Merge remote-tracking branch 'origin/master' into omaster
This commit is contained in:
		
							
								
								
									
										7
									
								
								st.c
									
									
									
									
									
								
							
							
						
						
									
										7
									
								
								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;
 | 
			
		||||
		}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user