snark/st
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Adding a more efficient drawing code.

Browse source 
Thanks Mihail Zenkov <mihail.zenkov@gmail.com> for giving the hint!
This commit is contained in:
Christoph Lohmann 2013-02-15 19:10:22 +01:00
parent b7261c84aa
commit 95033753be
2 changed files with 42 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
config.def.h
View file

@ -9,10 +9,13 @@ static char font[] = "Liberation Mono:pixelsize=12:antialias=false:autohint=fals
static int borderpx = 2;
static char shell[] = "/bin/sh";
/* double-click timeout (in milliseconds) between clicks for selection */
/* timeouts (in milliseconds) */
static unsigned int doubleclicktimeout = 300;
static unsigned int tripleclicktimeout = 600;
/* frames per second st should at maximum draw to the screen */
static unsigned int framespersecond = 60;
/* TERM value */
static char termname[] = "st-256color";

65
st.c
View file

@ -3166,10 +3166,12 @@ void
run(void) {
XEvent ev;
fd_set rfd;
int xfd = XConnectionNumber(xw.dpy), i;
struct timeval drawtimeout, *tv = NULL;
int xfd = XConnectionNumber(xw.dpy);
struct timeval drawtimeout, *tv = NULL, now, last;
for(i = 0;; i++) {
gettimeofday(&last, NULL);
for(;;) {
FD_ZERO(&rfd);
FD_SET(cmdfd, &rfd);
FD_SET(xfd, &rfd);
@ -3179,35 +3181,44 @@ run(void) {
die("select failed: %s\n", SERRNO);
}
/*
* Stop after a certain number of reads so the user does not
* feel like the system is stuttering.
*/
if(i < 1000 && FD_ISSET(cmdfd, &rfd)) {
gettimeofday(&now, NULL);
/* usecs until (next) frame */
drawtimeout.tv_sec = 0;
drawtimeout.tv_usec = \
((1000/framespersecond) - TIMEDIFF(now, last)) * 1000;
/* Let us draw a frame. */
if(drawtimeout.tv_usec <= 0) {
draw();
XFlush(xw.dpy);
last = now;
tv = NULL;
}
if(FD_ISSET(cmdfd, &rfd))
ttyread();
/*
* Just wait a bit so it isn't disturbing the
* user and the system is able to write something.
*/
drawtimeout.tv_sec = 0;
drawtimeout.tv_usec = 5;
if(FD_ISSET(xfd, &rfd)) {
while(XPending(xw.dpy)) {
XNextEvent(xw.dpy, &ev);
if(XFilterEvent(&ev, None))
continue;
if(handler[ev.type])
(handler[ev.type])(&ev);
}
if(drawtimeout.tv_usec <= 0) {
draw();
XFlush(xw.dpy);
}
}
/* There is still some time to wait until next frame. */
if(drawtimeout.tv_usec > 0) {
tv = &drawtimeout;
continue;
}
i = 0;
tv = NULL;
while(XPending(xw.dpy)) {
XNextEvent(xw.dpy, &ev);
if(XFilterEvent(&ev, None))
continue;
if(handler[ev.type])
(handler[ev.type])(&ev);
}
draw();
XFlush(xw.dpy);
}
}