Commit 095217b

nsxiv095217b

Linked thumbnails to files

Author: Bert
Date: 2011-02-17 15:58 +0100
Parent: dc04bdc
Commit: 095217b26f43b711c8ebc281110553ec788f7ebe

+13 −16

3 files changed

Browse files Patch

−Context 3+

M main.c +6 −10
M thumbs.c +7 −5
M thumbs.h +0 −1

M main.c View

M thumbs.c View

M thumbs.h View

		@@ -55,8 +55,6 @@ const char **filenames;
55	55		int filecnt, fileidx;
56	56		size_t filesize;
57	57
58		−	int tns_loaded;
59		−
60	58		#define TITLE_LEN 256
61	59		char win_title[TITLE_LEN];
62	60
		@@ -131,10 +129,8 @@ int main(int argc, char **argv) {
131	129		win_open(&win);
132	130		img_init(&img, &win);
133	131
134		−	if (options->thumbnails) {
135		−	tns_loaded = 0;
	132	+	if (options->thumbnails)
136	133		tns_init(&tns, filecnt);
137		−	}
138	134
139	135		if (options->thumbnails == 2) {
140	136		mode = MODE_THUMBS;
		@@ -161,7 +157,7 @@ void update_title() {
161	157		if (mode == MODE_THUMBS) {
162	158		n = snprintf(win_title, TITLE_LEN, "sxiv: [%d/%d] %s",
163	159		tns.cnt ? tns.sel + 1 : 0, tns.cnt,
164		−	tns.cnt ? tns.thumbs[tns.sel].filename : "");
	160	+	tns.cnt ? filenames[tns.sel] : "");
165	161		} else {
166	162		if (img.valid) {
167	163		size = filesize;
		@@ -490,17 +486,17 @@ void run() {
490	486		timeout = 0;
491	487
492	488		while (1) {
493		−	if (mode == MODE_THUMBS && tns_loaded < filecnt) {
	489	+	if (mode == MODE_THUMBS && tns.cnt < filecnt) {
494	490		win_set_cursor(&win, CURSOR_WATCH);
495	491		gettimeofday(&t0, 0);
496	492
497		−	while (!XPending(win.env.dpy) && tns_loaded < filecnt) {
498		−	tns_load(&tns, &win, filenames[tns_loaded++]);
	493	+	while (!XPending(win.env.dpy) && tns.cnt < filecnt) {
	494	+	tns_load(&tns, &win, filenames[tns.cnt]);
499	495		gettimeofday(&t, 0);
500	496		if (TV_TO_DOUBLE(t) - TV_TO_DOUBLE(t0) >= 0.25)
501	497		break;
502	498		}
503		−	if (tns_loaded == filecnt)
	499	+	if (tns.cnt == filecnt)
504	500		win_set_cursor(&win, CURSOR_ARROW);
505	501		if (!XPending(win.env.dpy)) {
506	502		redraw();

		@@ -25,6 +25,7 @@
25	25		#include "thumbs.h"
26	26		#include "util.h"
27	27
	28	+	extern Imlib_Image *im_broken;
28	29		const int thumb_dim = THUMB_SIZE + 10;
29	30
30	31		void tns_init(tns_t *tns, int cnt) {
		@@ -57,19 +58,20 @@ void tns_load(tns_t tns, win_t win, const char *filename) {
57	58		if (!tns \|\| !win \|\| !filename)
58	59		return;
59	60
60		−	if (!(im = imlib_load_image(filename)))
61		−	return;
62		−
63		−	imlib_context_set_image(im);
	61	+	if ((im = imlib_load_image(filename)))
	62	+	imlib_context_set_image(im);
	63	+	else
	64	+	imlib_context_set_image(im_broken);
64	65
65	66		w = imlib_image_get_width();
66	67		h = imlib_image_get_height();
67	68		zw = (float) THUMB_SIZE / (float) w;
68	69		zh = (float) THUMB_SIZE / (float) h;
69	70		z = MIN(zw, zh);
	71	+	if (!im && z > 1.0)
	72	+	z = 1.0;
70	73
71	74		t = &tns->thumbs[tns->cnt++];
72		−	t->filename = filename;
73	75		t->w = z * w;
74	76		t->h = z * h;
75	77

		@@ -23,7 +23,6 @@
23	23
24	24		typedef struct thumb_s {
25	25		Pixmap pm;
26		−	const char *filename;
27	26		int x;
28	27		int y;
29	28		int w;

nsxiv/095217b

Linked thumbnails to files

nsxiv095217b