diff options
| author | Bert <ber.t@gmx.com> | 2011-06-28 13:45:57 +0200 |
|---|---|---|
| committer | Bert <ber.t@gmx.com> | 2011-06-28 13:45:57 +0200 |
| commit | bd87ae9346503cb13ab1d12ff6f135b77fa0b473 (patch) | |
| tree | 38365a088734cafef9bcd113129627c64fc0c537 /main.c | |
| parent | f52603b31a50a2e7159cc3229d36ec214c3064f0 (diff) | |
| download | nsxiv-bd87ae9346503cb13ab1d12ff6f135b77fa0b473.tar.zst | |
All timeouts in milliseconds
Diffstat (limited to 'main.c')
| -rw-r--r-- | main.c | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -241,7 +241,7 @@ int main(int argc, char **argv) { } filecnt = fileidx; - fileidx = options->startnum < filecnt ? options->startnum : filecnt - 1; + fileidx = options->startnum < filecnt ? options->startnum : 0; win_init(&win); img_init(&img, &win); @@ -327,10 +327,11 @@ int run_command(const char *cline, Bool reload) { /* event handling */ -#define TO_WIN_RESIZE 75000 -#define TO_IMAGE_DRAG 1000 -#define TO_CURSOR_HIDE 1500000 -#define TO_THUMBS_LOAD 75000 +/* timeouts in milliseconds: */ +#define TO_WIN_RESIZE 75 +#define TO_IMAGE_DRAG 1 +#define TO_CURSOR_HIDE 1500 +#define TO_THUMBS_LOAD 200 int timo_cursor; int timo_redraw; @@ -723,7 +724,7 @@ void run() { else remove_file(tns.cnt, 0); gettimeofday(&t1, 0); - if (TV_TO_DOUBLE(t1) - TV_TO_DOUBLE(t0) >= 0.25) + if (TIMEDIFF(&t1, &t0) >= TO_THUMBS_LOAD) break; } if (tns.cnt == filecnt) @@ -742,8 +743,7 @@ void run() { timeout = timo_cursor; else timeout = timo_redraw; - tt.tv_sec = timeout / 1000000; - tt.tv_usec = timeout % 1000000; + MSEC_TO_TIMEVAL(timeout, &tt); xfd = ConnectionNumber(win.env.dpy); FD_ZERO(&fds); FD_SET(xfd, &fds); @@ -751,7 +751,7 @@ void run() { if (!XPending(win.env.dpy)) select(xfd + 1, &fds, 0, 0, &tt); gettimeofday(&t1, 0); - timeout = MIN((TV_TO_DOUBLE(t1) - TV_TO_DOUBLE(t0)) * 1000000, timeout); + timeout = MIN(TIMEDIFF(&t1, &t0), timeout); /* timeouts fired? */ if (timo_cursor) { |