Commit eaa269b

nsxiveaa269b

Revised thumbnail loading...

- Only load the thumbnails that are currently visible in the window
- Unload thumbnails that are leaving the visible area
- Much less memory needed, but scrolling is now slower
- This also unintentionally fixes issue #86

Author: Bert Münnich
Date: 2014-09-25 20:57 +0200
Committer: Bert Münnich · 2014-09-26 10:31 +0200
Parent: 52e56c8
Commit: eaa269b6cb486f83229cb0d3dc5f7e03d1c485bb

+71 −45

5 files changed

Browse files Patch

−Context 3+

M Makefile +1 −1
M commands.c +2 −1
M main.c +13 −20
M thumbs.c +52 −20
M thumbs.h +3 −3

M Makefile View

M commands.c View

M main.c View

M thumbs.c View

M thumbs.h View

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

		@@ -470,7 +470,8 @@ bool ct_reload_all(arg_t a)
470	470		{
471	471		tns_free(&tns);
472	472		tns_init(&tns, files, filecnt, &fileidx, &win);
473		−	return false;
	473	+	tns.dirty = true;
	474	+	return true;
474	475		}
475	476
476	477

		@@ -368,14 +368,13 @@ void update_info(void)
368	368		return;
369	369		mark = files[fileidx].marked ? "+ " : "";
370	370		if (mode == MODE_THUMB) {
371		−	if (tns.loadnext >= filecnt) {
372		−	n = snprintf(rt, rlen, "%s%0*d/%d", mark, fw, fileidx + 1, filecnt);
373		−	ow_info = true;
374		−	} else {
375		−	snprintf(lt, llen, "Loading... %0*d/%d", fw, tns.loadnext, filecnt);
376		−	rt[0] = '\0';
	371	+	if (tns.loadnext < tns.end) {
	372	+	snprintf(lt, llen, "Loading... %0*d", fw, tns.loadnext);
377	373		ow_info = false;
	374	+	} else {
	375	+	ow_info = true;
378	376		}
	377	+	n = snprintf(rt, rlen, "%s%0*d/%d", mark, fw, fileidx + 1, filecnt);
379	378		} else {
380	379		n = snprintf(rt, rlen, "%s", mark);
381	380		if (img.ss.on)
		@@ -439,7 +438,7 @@ void reset_cursor(void)
439	438		}
440	439		}
441	440		} else {
442		−	if (tns.loadnext < filecnt)
	441	+	if (tns.loadnext < tns.end)
443	442		cursor = CURSOR_WATCH;
444	443		else
445	444		cursor = CURSOR_ARROW;
		@@ -531,7 +530,7 @@ void run_key_handler(const char *key, unsigned int mask)
531	530		memcmp(&oldst->st_mtime, &newst.st_mtime, sizeof(newst.st_mtime)) != 0)
532	531		{
533	532		if (tns.thumbs != NULL) {
534		−	tns.thumbs[finfo[i].fn].loaded = false;
	533	+	tns_unload(&tns, finfo[i].fn);
535	534		tns.loadnext = MIN(tns.loadnext, finfo[i].fn);
536	535		}
537	536		changed = true;
		@@ -669,29 +668,24 @@ void run(void)
669	668		int xfd;
670	669		fd_set fds;
671	670		struct timeval timeout;
672		−	bool discard, reload, to_set;
	671	+	bool discard, to_set;
673	672		XEvent ev, nextev;
674	673
675	674		set_timeout(redraw, 25, false);
676	675
677	676		while (true) {
678		−	while (mode == MODE_THUMB && tns.loadnext < filecnt &&
	677	+	while (mode == MODE_THUMB && tns.loadnext < tns.end &&
679	678		XPending(win.env.dpy) == 0)
680	679		{
681	680		/* load thumbnails */
682		−	reload = tns.loadnext != tns.cnt;
683	681		set_timeout(redraw, TO_REDRAW_THUMBS, false);
684		−	if (tns_load(&tns, tns.loadnext, reload)) {
685		−	if (!reload)
686		−	tns.cnt++;
687		−	} else {
	682	+	if (!tns_load(&tns, tns.loadnext, false)) {
688	683		remove_file(tns.loadnext, false);
689		−	if (reload)
690		−	tns.dirty = true;
	684	+	tns.dirty = true;
691	685		}
692		−	while (tns.loadnext < filecnt && tns.thumbs[tns.loadnext].loaded)
	686	+	while (tns.loadnext < tns.end && tns.thumbs[tns.loadnext].im != NULL)
693	687		tns.loadnext++;
694		−	if (tns.loadnext >= filecnt)
	688	+	if (tns.loadnext >= tns.end)
695	689		redraw();
696	690		else
697	691		check_timeouts(NULL);
		@@ -882,7 +876,6 @@ int main(int argc, char **argv)
882	876		tns_init(&tns, files, filecnt, &fileidx, &win);
883	877		while (!tns_load(&tns, 0, false))
884	878		remove_file(0, false);
885		−	tns.cnt = 1;
886	879		} else {
887	880		mode = MODE_IMAGE;
888	881		tns.thumbs = NULL;

		@@ -56,7 +56,7 @@ char* tns_cache_filepath(const char *filepath)
56	56		return cfile;
57	57		}
58	58
59		−	Imlib_Image tns_cache_load(const char *filepath)
	59	+	Imlib_Image tns_cache_load(const char filepath, bool outdated)
60	60		{
61	61		char *cfile;
62	62		struct stat cstats, fstats;
		@@ -68,8 +68,12 @@ Imlib_Image tns_cache_load(const char *filepath)
68	68		return NULL;
69	69
70	70		if ((cfile = tns_cache_filepath(filepath)) != NULL) {
71		−	if (stat(cfile, &cstats) == 0 && cstats.st_mtime == fstats.st_mtime)
72		−	im = imlib_load_image(cfile);
	71	+	if (stat(cfile, &cstats) == 0) {
	72	+	if (cstats.st_mtime == fstats.st_mtime)
	73	+	im = imlib_load_image(cfile);
	74	+	else
	75	+	*outdated = true;
	76	+	}
73	77		free(cfile);
74	78		}
75	79		return im;
		@@ -165,8 +169,8 @@ void tns_init(tns_t tns, const fileinfo_t files, int cnt, int sel, win_t win
165	169		tns->thumbs = NULL;
166	170		}
167	171		tns->files = files;
168		−	tns->cap = cnt;
169		−	tns->cnt = tns->loadnext = tns->first = 0;
	172	+	tns->cnt = cnt;
	173	+	tns->loadnext = tns->first = tns->end = tns->r_first = tns->r_end = 0;
170	174		tns->sel = sel;
171	175		tns->win = win;
172	176		tns->dirty = false;
		@@ -218,7 +222,7 @@ bool tns_load(tns_t *tns, int n, bool force)
218	222
219	223		if (tns == NULL \|\| tns->thumbs == NULL)
220	224		return false;
221		−	if (n < 0 \|\| n >= tns->cap)
	225	+	if (n < 0 \|\| n >= tns->cnt)
222	226		return false;
223	227		file = &tns->files[n];
224	228		if (file->name == NULL \|\| file->path == NULL)
		@@ -231,7 +235,7 @@ bool tns_load(tns_t *tns, int n, bool force)
231	235		imlib_free_image();
232	236		}
233	237
234		−	if (!force && (im = tns_cache_load(file->path)) != NULL) {
	238	+	if (!force && (im = tns_cache_load(file->path, &force)) != NULL) {
235	239		cache_hit = true;
236	240		} else {
237	241		#if HAVE_LIBEXIF
		@@ -323,11 +327,28 @@ bool tns_load(tns_t *tns, int n, bool force)
323	327		if (!cache_hit)
324	328		tns_cache_write(t, file, true);
325	329
326		−	t->loaded = true;
327	330		tns->dirty = true;
328	331		return true;
329	332		}
330	333
	334	+	void tns_unload(tns_t *tns, int n)
	335	+	{
	336	+	thumb_t *t;
	337	+
	338	+	if (tns == NULL \|\| tns->thumbs == NULL)
	339	+	return;
	340	+	if (n < 0 \|\| n >= tns->cnt)
	341	+	return;
	342	+
	343	+	t = &tns->thumbs[n];
	344	+
	345	+	if (t->im != NULL) {
	346	+	imlib_context_set_image(t->im);
	347	+	imlib_free_image();
	348	+	t->im = NULL;
	349	+	}
	350	+	}
	351	+
331	352		void tns_check_view(tns_t *tns, bool scrolled)
332	353		{
333	354		int r;
		@@ -385,20 +406,31 @@ void tns_render(tns_t *tns)
385	406		if (r > 0)
386	407		cnt -= r % tns->cols;
387	408		}
388		−
389	409		r = cnt % tns->cols ? 1 : 0;
390	410		tns->x = x = (win->w - MIN(cnt, tns->cols) * thumb_dim) / 2 + 5;
391	411		tns->y = y = (win->h - (cnt / tns->cols + r) * thumb_dim) / 2 + 5;
	412	+	tns->loadnext = tns->cnt;
	413	+	tns->end = tns->first + cnt;
392	414
393		−	for (i = 0; i < cnt; i++) {
394		−	t = &tns->thumbs[tns->first + i];
395		−	t->x = x + (THUMB_SIZE - t->w) / 2;
396		−	t->y = y + (THUMB_SIZE - t->h) / 2;
397		−	imlib_context_set_image(t->im);
398		−	imlib_render_image_part_on_drawable_at_size(0, 0, t->w, t->h,
399		−	t->x, t->y, t->w, t->h);
400		−	if (tns->files[tns->first + i].marked)
401		−	tns_mark(tns, tns->first + i, true);
	415	+	for (i = tns->r_first; i < tns->r_end; i++) {
	416	+	if ((i < tns->first \|\| i >= tns->end) && tns->thumbs[i].im != NULL)
	417	+	tns_unload(tns, i);
	418	+	}
	419	+	tns->r_first = tns->first;
	420	+	tns->r_end = tns->end;
	421	+
	422	+	for (i = tns->first; i < tns->end; i++) {
	423	+	t = &tns->thumbs[i];
	424	+	if (t->im != NULL) {
	425	+	t->x = x + (THUMB_SIZE - t->w) / 2;
	426	+	t->y = y + (THUMB_SIZE - t->h) / 2;
	427	+	imlib_context_set_image(t->im);
	428	+	imlib_render_image_on_drawable_at_size(t->x, t->y, t->w, t->h);
	429	+	if (tns->files[i].marked)
	430	+	tns_mark(tns, i, true);
	431	+	} else {
	432	+	tns->loadnext = MIN(tns->loadnext, i);
	433	+	}
402	434		if ((i + 1) % tns->cols == 0) {
403	435		x = tns->x;
404	436		y += thumb_dim;
		@@ -415,7 +447,7 @@ void tns_mark(tns_t *tns, int n, bool mark)
415	447		if (tns == NULL \|\| tns->thumbs == NULL \|\| tns->win == NULL)
416	448		return;
417	449
418		−	if (n >= 0 && n < tns->cnt) {
	450	+	if (n >= 0 && n < tns->cnt && tns->thumbs[n].im != NULL) {
419	451		win_t *win = tns->win;
420	452		thumb_t *t = &tns->thumbs[n];
421	453		unsigned long col = win->fullscreen ? win->fscol : win->bgcol;
		@@ -440,7 +472,7 @@ void tns_highlight(tns_t *tns, int n, bool hl)
440	472		if (tns == NULL \|\| tns->thumbs == NULL \|\| tns->win == NULL)
441	473		return;
442	474
443		−	if (n >= 0 && n < tns->cnt) {
	475	+	if (n >= 0 && n < tns->cnt && tns->thumbs[n].im != NULL) {
444	476		win_t *win = tns->win;
445	477		thumb_t *t = &tns->thumbs[n];
446	478		unsigned long col;

		@@ -31,16 +31,15 @@ typedef struct {
31	31		int h;
32	32		int x;
33	33		int y;
34		−	bool loaded;
35	34		} thumb_t;
36	35
37	36		typedef struct {
38	37		const fileinfo_t *files;
39	38		thumb_t *thumbs;
40		−	int cap;
41	39		int cnt;
42	40		int loadnext;
43		−	int first;
	41	+	int first, end;
	42	+	int r_first, r_end;
44	43		int *sel;
45	44
46	45		win_t *win;
		@@ -58,6 +57,7 @@ void tns_init(tns_t, const fileinfo_t, int, int, win_t);
58	57		void tns_free(tns_t*);
59	58
60	59		bool tns_load(tns_t*, int, bool);
	60	+	void tns_unload(tns_t*, int);
61	61
62	62		void tns_render(tns_t*);
63	63		void tns_mark(tns_t*, int, bool);

nsxiv/eaa269b

Revised thumbnail loading...

nsxiveaa269b