From b828b554191c761776e4757d1b92156c624c75f6 Mon Sep 17 00:00:00 2001 From: Bert Date: Thu, 17 Feb 2011 14:13:18 +0100 Subject: Immediately respond to events while loading thumbs --- main.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'main.c') diff --git a/main.c b/main.c index 80d69b6..5b3bd33 100644 --- a/main.c +++ b/main.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -469,7 +470,7 @@ void on_motionnotify(XMotionEvent *mev) { void run() { int xfd; fd_set fds; - struct timeval t; + struct timeval t, t0; XEvent ev; timeout = 0; @@ -477,12 +478,22 @@ void run() { while (1) { if (mode == MODE_THUMBS && tns_loaded < filecnt) { win_set_cursor(&win, CURSOR_WATCH); - tns_load(&tns, &win, filenames[tns_loaded++]); - tns_render(&tns, &win); + gettimeofday(&t0, 0); + + while (!XPending(win.env.dpy) && tns_loaded < filecnt) { + tns_load(&tns, &win, filenames[tns_loaded++]); + gettimeofday(&t, 0); + if (TV_TO_DOUBLE(t) - TV_TO_DOUBLE(t0) >= 0.25) + break; + } if (tns_loaded == filecnt) win_set_cursor(&win, CURSOR_ARROW); - else if (!XPending(win.env.dpy)) + if (!XPending(win.env.dpy)) { + tns_render(&tns, &win); continue; + } else { + timeout = 1; + } } else if (timeout) { t.tv_sec = 0; t.tv_usec = 75000; -- cgit v1.2.3-54-g00ecf