Commit 61f61ca

nsxiv61f61ca

Generalized thumbnail loading, allows easier reloading of thumbnails later on

Author: Bert Münnich
Date: 2014-08-16 11:37 +0200
Committer: Bert Münnich · 2014-08-16 21:48 +0200
Parent: 3b8a79f
Commit: 61f61cae5fdf5aa51975bd587497b830684b7867

+16 −10

4 files changed

Browse files Patch

−Context 3+

M Makefile +1 −1
M main.c +11 −8
M thumbs.c +2 −1
M thumbs.h +2 −0

M Makefile View

M main.c View

M thumbs.c View

M thumbs.h View

		@@ -1,4 +1,4 @@
1		−	VERSION = git-20140801
	1	+	VERSION = git-20140816
2	2
3	3		PREFIX = /usr/local
4	4		MANPREFIX = $(PREFIX)/share/man

		@@ -363,11 +363,11 @@ void update_info(void)
363	363		return;
364	364		mark = files[sel].marked ? "* " : "";
365	365		if (mode == MODE_THUMB) {
366		−	if (tns.cnt == filecnt) {
	366	+	if (tns.loadnext >= filecnt) {
367	367		n = snprintf(rt, rlen, "%s%0*d/%d", mark, fw, sel + 1, filecnt);
368	368		ow_info = true;
369	369		} else {
370		−	snprintf(lt, llen, "Loading... %0*d/%d", fw, tns.cnt, filecnt);
	370	+	snprintf(lt, llen, "Loading... %0*d/%d", fw, tns.loadnext, filecnt);
371	371		rt[0] = '\0';
372	372		ow_info = false;
373	373		}
		@@ -434,7 +434,7 @@ void reset_cursor(void)
434	434		}
435	435		}
436	436		} else {
437		−	if (tns.cnt != filecnt)
	437	+	if (tns.loadnext < filecnt)
438	438		cursor = CURSOR_WATCH;
439	439		else
440	440		cursor = CURSOR_ARROW;
		@@ -655,19 +655,22 @@ void run(void)
655	655		set_timeout(redraw, 25, false);
656	656
657	657		while (true) {
658		−	while (mode == MODE_THUMB && tns.cnt < filecnt &&
	658	+	while (mode == MODE_THUMB && tns.loadnext < filecnt &&
659	659		XPending(win.env.dpy) == 0)
660	660		{
661	661		/* load thumbnails */
662	662		set_timeout(redraw, TO_REDRAW_THUMBS, false);
663		−	if (tns_load(&tns, tns.cnt, &files[tns.cnt], false, false)) {
664		−	tns.cnt++;
	663	+	if (tns_load(&tns, tns.loadnext, &files[tns.loadnext], false, false)) {
	664	+	if (tns.cnt == tns.loadnext)
	665	+	tns.cnt++;
665	666		} else {
666		−	remove_file(tns.cnt, false);
	667	+	remove_file(tns.loadnext, false);
667	668		if (tns.sel > 0 && tns.sel >= tns.cnt)
668	669		tns.sel--;
669	670		}
670		−	if (tns.cnt == filecnt)
	671	+	while (tns.loadnext < filecnt && tns.thumbs[tns.loadnext].loaded)
	672	+	tns.loadnext++;
	673	+	if (tns.loadnext >= filecnt)
671	674		redraw();
672	675		else
673	676		check_timeouts(NULL);

		@@ -165,7 +165,7 @@ void tns_init(tns_t tns, int cnt, win_t win)
165	165		tns->thumbs = NULL;
166	166		}
167	167		tns->cap = cnt;
168		−	tns->cnt = tns->first = tns->sel = 0;
	168	+	tns->cnt = tns->loadnext = tns->first = tns->sel = 0;
169	169		tns->win = win;
170	170		tns->dirty = false;
171	171
		@@ -325,6 +325,7 @@ bool tns_load(tns_t tns, int n, const fileinfo_t file,
325	325		if (!cache_hit)
326	326		tns_cache_write(t, true);
327	327
	328	+	t->loaded = true;
328	329		tns->dirty = true;
329	330		return true;
330	331		}

		@@ -32,12 +32,14 @@ typedef struct {
32	32		int h;
33	33		int x;
34	34		int y;
	35	+	bool loaded;
35	36		} thumb_t;
36	37
37	38		typedef struct {
38	39		thumb_t *thumbs;
39	40		int cap;
40	41		int cnt;
	42	+	int loadnext;
41	43		int first;
42	44		int sel;
43	45

nsxiv/61f61ca

Generalized thumbnail loading, allows easier reloading of thumbnails later on

nsxiv61f61ca