Commit 7b91e10

nsxiv7b91e10

Added thumbnail zooming...

- Key mappings +/- are now general commands
- Use JPG as thumbnail cache file format instead of PNG
- Fixes issue #161

Author: Bert Münnich
Date: 2014-09-28 00:26 +0200
Committer: Bert Münnich · 2014-09-28 00:28 +0200
Parent: b2dbd2f
Commit: 7b91e10f225797cef26ce7094bf2ac6b94901b33

+100 −63

7 files changed

Browse files Patch

−Context 3+

M README.md +2 −2
M commands.c +14 −12
M commands.lst +1 −1
M config.def.h +6 −6
M sxiv.1 +6 −6
M thumbs.c +68 −36
M thumbs.h +3 −0

M README.md View

M commands.c View

M commands.lst View

M config.def.h View

M sxiv.1 View

M thumbs.c View

M thumbs.h View

		@@ -101,6 +101,8 @@ of small previews is displayed, making it easy to choose an image to open.
101	101		r Reload image
102	102		D Remove image from file list and go to next image
103	103		Ctrl-h,j,k,l Scroll one window width/height left/down/up/right
	104	+	+ Zoom in
	105	+	- Zoom out
104	106		m Mark/unmark current image
105	107		M Reverse all image marks
106	108		Ctrl-m Remove all image marks
		@@ -123,8 +125,6 @@ of small previews is displayed, making it easy to choose an image to open.
123	125		h,j,k,l Scroll image 1/5 of window width/height or [count] pixels
124	126		left/down/up/right (also with arrow keys)
125	127		H,J,K,L Scroll to left/bottom/top/right image edge
126		−	+ Zoom in
127		−	- Zoom out
128	128		= Set zoom level to 100%, or [count]%
129	129		w Set zoom level to 100%, but fit large images into window
130	130		W Fit image to window

		@@ -193,6 +193,20 @@ bool cg_scroll_screen(arg_t a)
193	193		return tns_scroll(&tns, dir, true);
194	194		}
195	195
	196	+	bool cg_zoom(arg_t a)
	197	+	{
	198	+	long d = (long) a;
	199	+
	200	+	if (mode == MODE_THUMB)
	201	+	return tns_zoom(&tns, d);
	202	+	else if (d > 0)
	203	+	return img_zoom_in(&img);
	204	+	else if (d < 0)
	205	+	return img_zoom_out(&img);
	206	+	else
	207	+	return false;
	208	+	}
	209	+
196	210		bool cg_toggle_image_mark(arg_t a)
197	211		{
198	212		files[fileidx].marked = !files[fileidx].marked;
		@@ -386,18 +400,6 @@ bool ci_drag(arg_t a)
386	400		return true;
387	401		}
388	402
389		−	bool ci_zoom(arg_t a)
390		−	{
391		−	long scale = (long) a;
392		−
393		−	if (scale > 0)
394		−	return img_zoom_in(&img);
395		−	else if (scale < 0)
396		−	return img_zoom_out(&img);
397		−	else
398		−	return false;
399		−	}
400		−
401	403		bool ci_set_zoom(arg_t a)
402	404		{
403	405		return img_zoom(&img, (prefix ? prefix : (long) a) / 100.0);

		@@ -8,6 +8,7 @@ G_CMD(remove_image)
8	8		G_CMD(first)
9	9		G_CMD(n_or_last)
10	10		G_CMD(scroll_screen)
	11	+	G_CMD(zoom)
11	12		G_CMD(toggle_image_mark)
12	13		G_CMD(reverse_marks)
13	14		G_CMD(unmark_all)
		@@ -20,7 +21,6 @@ I_CMD(toggle_animation)
20	21		I_CMD(scroll)
21	22		I_CMD(scroll_to_edge)
22	23		I_CMD(drag)
23		−	I_CMD(zoom)
24	24		I_CMD(set_zoom)
25	25		I_CMD(fit_to_win)
26	26		I_CMD(rotate)

		@@ -79,6 +79,10 @@ static const keymap_t keys[] = {
79	79		{ ControlMask, XK_Up, g_scroll_screen, (arg_t) DIR_UP },
80	80		{ ControlMask, XK_l, g_scroll_screen, (arg_t) DIR_RIGHT },
81	81		{ ControlMask, XK_Right, g_scroll_screen, (arg_t) DIR_RIGHT },
	82	+	{ 0, XK_plus, g_zoom, (arg_t) +1 },
	83	+	{ 0, XK_KP_Add, g_zoom, (arg_t) +1 },
	84	+	{ 0, XK_minus, g_zoom, (arg_t) -1 },
	85	+	{ 0, XK_KP_Subtract, g_zoom, (arg_t) -1 },
82	86		{ 0, XK_m, g_toggle_image_mark, (arg_t) None },
83	87		{ 0, XK_M, g_reverse_marks, (arg_t) None },
84	88		{ ControlMask, XK_m, g_unmark_all, (arg_t) None },
		@@ -119,10 +123,6 @@ static const keymap_t keys[] = {
119	123		{ 0, XK_J, i_scroll_to_edge, (arg_t) DIR_DOWN },
120	124		{ 0, XK_K, i_scroll_to_edge, (arg_t) DIR_UP },
121	125		{ 0, XK_L, i_scroll_to_edge, (arg_t) DIR_RIGHT },
122		−	{ 0, XK_plus, i_zoom, (arg_t) +1 },
123		−	{ 0, XK_KP_Add, i_zoom, (arg_t) +1 },
124		−	{ 0, XK_minus, i_zoom, (arg_t) -1 },
125		−	{ 0, XK_KP_Subtract, i_zoom, (arg_t) -1 },
126	126		{ 0, XK_equal, i_set_zoom, (arg_t) 100 },
127	127		{ 0, XK_w, i_fit_to_win, (arg_t) SCALE_DOWN },
128	128		{ 0, XK_W, i_fit_to_win, (arg_t) SCALE_FIT },
		@@ -153,8 +153,8 @@ static const button_t buttons[] = {
153	153		{ ShiftMask, 5, i_scroll, (arg_t) DIR_RIGHT },
154	154		{ 0, 6, i_scroll, (arg_t) DIR_LEFT },
155	155		{ 0, 7, i_scroll, (arg_t) DIR_RIGHT },
156		−	{ ControlMask, 4, i_zoom, (arg_t) +1 },
157		−	{ ControlMask, 5, i_zoom, (arg_t) -1 },
	156	+	{ ControlMask, 4, g_zoom, (arg_t) +1 },
	157	+	{ ControlMask, 5, g_zoom, (arg_t) -1 },
158	158		};
159	159
160	160		#endif

		@@ -140,6 +140,12 @@ Scroll up one screen height.
140	140		.BR Ctrl-l ", " Ctrl-Right
141	141		Scroll right one screen width.
142	142		.TP
	143	+	.BR +
	144	+	Zoom in.
	145	+	.TP
	146	+	.B \-
	147	+	Zoom out.
	148	+	.TP
143	149		.B m
144	150		Mark/unmark the current image.
145	151		.TP
		@@ -251,12 +257,6 @@ Scroll to top image edge.
251	257		Scroll to right image edge.
252	258		.SS Zooming
253	259		.TP
254		−	.BR +
255		−	Zoom in.
256		−	.TP
257		−	.B \-
258		−	Zoom out.
259		−	.TP
260	260		.B =
261	261		Set zoom level to 100%, or
262	262		.IR count %.

		@@ -17,7 +17,6 @@
17	17		*/
18	18
19	19		#define _POSIX_C_SOURCE 200112L
20		−	#define _THUMBS_CONFIG
21	20
22	21		#include <stdio.h>
23	22		#include <stdlib.h>
		@@ -37,7 +36,7 @@ void exif_auto_orientate(const fileinfo_t*);
37	36		#endif
38	37
39	38		static char *cache_dir;
40		−	static const int thumb_dim = THUMB_SIZE + 10;
	39	+	static const int thumb_size[] = { 32, 64, 96, 128, 160 };
41	40
42	41		char* tns_cache_filepath(const char *filepath)
43	42		{
		@@ -51,7 +50,7 @@ char* tns_cache_filepath(const char *filepath)
51	50		/* don't cache images inside the cache directory! */
52	51		len = strlen(cache_dir) + strlen(filepath) + 6;
53	52		cfile = (char*) s_malloc(len);
54		−	snprintf(cfile, len, "%s/%s.png", cache_dir, filepath + 1);
	53	+	snprintf(cfile, len, "%s/%s.jpg", cache_dir, filepath + 1);
55	54		}
56	55		return cfile;
57	56		}
		@@ -79,21 +78,19 @@ Imlib_Image tns_cache_load(const char filepath, bool outdated)
79	78		return im;
80	79		}
81	80
82		−	void tns_cache_write(thumb_t t, const fileinfo_t file, bool force)
	81	+	void tns_cache_write(Imlib_Image im, const char *filepath, bool force)
83	82		{
84	83		char cfile, dirend;
85	84		struct stat cstats, fstats;
86	85		struct utimbuf times;
87	86		Imlib_Load_Error err = 0;
88	87
89		−	if (t == NULL \|\| t->im == NULL)
	88	+	if (im == NULL \|\| filepath == NULL)
90	89		return;
91		−	if (file == NULL \|\| file->name == NULL \|\| file->path == NULL)
92		−	return;
93		−	if (stat(file->path, &fstats) < 0)
	90	+	if (stat(filepath, &fstats) < 0)
94	91		return;
95	92
96		−	if ((cfile = tns_cache_filepath(file->path)) != NULL) {
	93	+	if ((cfile = tns_cache_filepath(filepath)) != NULL) {
97	94		if (force \|\| stat(cfile, &cstats) < 0 \|\|
98	95		cstats.st_mtime != fstats.st_mtime)
99	96		{
		@@ -103,8 +100,8 @@ void tns_cache_write(thumb_t t, const fileinfo_t file, bool force)
103	100		*dirend = '/';
104	101		}
105	102		if (err == 0) {
106		−	imlib_context_set_image(t->im);
107		−	imlib_image_set_format("png");
	103	+	imlib_context_set_image(im);
	104	+	imlib_image_set_format("jpg");
108	105		imlib_save_image_with_error_return(cfile, &err);
109	106		}
110	107		if (err == 0) {
		@@ -173,6 +170,7 @@ void tns_init(tns_t tns, const fileinfo_t files, int cnt, int sel, win_t win
173	170		tns->loadnext = tns->first = tns->end = tns->r_first = tns->r_end = 0;
174	171		tns->sel = sel;
175	172		tns->win = win;
	173	+	tns->zl = 1;
176	174		tns->dirty = false;
177	175
178	176		if ((homedir = getenv("XDG_CACHE_HOME")) == NULL \|\| homedir[0] == '\0') {
		@@ -211,11 +209,34 @@ void tns_free(tns_t *tns)
211	209		cache_dir = NULL;
212	210		}
213	211
	212	+	Imlib_Image tns_scale_down(Imlib_Image im, int dim)
	213	+	{
	214	+	int w, h;
	215	+	float z, zw, zh;
	216	+
	217	+	imlib_context_set_image(im);
	218	+	w = imlib_image_get_width();
	219	+	h = imlib_image_get_height();
	220	+	zw = (float) dim / (float) w;
	221	+	zh = (float) dim / (float) h;
	222	+	z = MIN(zw, zh);
	223	+	z = MIN(z, 1.0);
	224	+
	225	+	if (z < 1.0) {
	226	+	imlib_context_set_anti_alias(1);
	227	+	im = imlib_create_cropped_scaled_image(0, 0, w, h, z * w, z * h);
	228	+	if (im == NULL)
	229	+	die("could not allocate memory");
	230	+	imlib_free_image_and_decache();
	231	+	}
	232	+	return im;
	233	+	}
	234	+
214	235		bool tns_load(tns_t *tns, int n, bool force)
215	236		{
216	237		int w, h;
217	238		bool cache_hit = false;
218		−	float z, zw, zh;
	239	+	float zw, zh;
219	240		thumb_t *t;
220	241		Imlib_Image im = NULL;
221	242		const fileinfo_t *file;
		@@ -301,31 +322,20 @@ bool tns_load(tns_t *tns, int n, bool force)
301	322		return false;
302	323		}
303	324		}
304		−	imlib_context_set_image(im);
305		−	imlib_context_set_anti_alias(1);
306	325
	326	+	if (!cache_hit) {
307	327		#if HAVE_LIBEXIF
308		−	if (!cache_hit)
	328	+	imlib_context_set_image(im);
309	329		exif_auto_orientate(file);
310	330		#endif
	331	+	im = tns_scale_down(im, thumb_size[ARRLEN(thumb_size)-1]);
	332	+	tns_cache_write(im, file->path, true);
	333	+	}
311	334
312		−	w = imlib_image_get_width();
313		−	h = imlib_image_get_height();
314		−	zw = (float) THUMB_SIZE / (float) w;
315		−	zh = (float) THUMB_SIZE / (float) h;
316		−	z = MIN(zw, zh);
317		−	z = MIN(z, 1.0);
318		−	t->w = z * w;
319		−	t->h = z * h;
320		−
321		−	t->im = imlib_create_cropped_scaled_image(0, 0, w, h, t->w, t->h);
322		−	if (t->im == NULL)
323		−	die("could not allocate memory");
324		−
325		−	imlib_free_image_and_decache();
326		−
327		−	if (!cache_hit)
328		−	tns_cache_write(t, file, true);
	335	+	t->im = tns_scale_down(im, thumb_size[tns->zl]);
	336	+	imlib_context_set_image(t->im);
	337	+	t->w = imlib_image_get_width();
	338	+	t->h = imlib_image_get_height();
329	339
330	340		tns->dirty = true;
331	341		return true;
		@@ -382,6 +392,7 @@ void tns_render(tns_t *tns)
382	392		thumb_t *t;
383	393		win_t *win;
384	394		int i, cnt, r, x, y;
	395	+	int thumb_dim;
385	396
386	397		if (tns == NULL \|\| tns->thumbs == NULL \|\| tns->win == NULL)
387	398		return;
		@@ -392,6 +403,7 @@ void tns_render(tns_t *tns)
392	403		win_clear(win);
393	404		imlib_context_set_drawable(win->buf.pm);
394	405
	406	+	thumb_dim = thumb_size[tns->zl] + 10;
395	407		tns->cols = MAX(1, win->w / thumb_dim);
396	408		tns->rows = MAX(1, win->h / thumb_dim);
397	409
		@@ -422,8 +434,8 @@ void tns_render(tns_t *tns)
422	434		for (i = tns->first; i < tns->end; i++) {
423	435		t = &tns->thumbs[i];
424	436		if (t->im != NULL) {
425		−	t->x = x + (THUMB_SIZE - t->w) / 2;
426		−	t->y = y + (THUMB_SIZE - t->h) / 2;
	437	+	t->x = x + (thumb_size[tns->zl] - t->w) / 2;
	438	+	t->y = y + (thumb_size[tns->zl] - t->h) / 2;
427	439		imlib_context_set_image(t->im);
428	440		imlib_render_image_on_drawable_at_size(t->x, t->y, t->w, t->h);
429	441		if (tns->files[i].marked)
		@@ -550,6 +562,26 @@ bool tns_scroll(tns_t *tns, direction_t dir, bool screen)
550	562		return tns->first != old;
551	563		}
552	564
	565	+	bool tns_zoom(tns_t *tns, int d)
	566	+	{
	567	+	int i, oldzl;
	568	+
	569	+	if (tns == NULL \|\| tns->thumbs == NULL)
	570	+	return false;
	571	+
	572	+	oldzl = tns->zl;
	573	+	tns->zl += -(d < 0) + (d > 0);
	574	+	tns->zl = MAX(tns->zl, 0);
	575	+	tns->zl = MIN(tns->zl, ARRLEN(thumb_size)-1);
	576	+
	577	+	if (tns->zl != oldzl) {
	578	+	for (i = 0; i < tns->cnt; i++)
	579	+	tns_unload(tns, i);
	580	+	tns->dirty = true;
	581	+	}
	582	+	return tns->zl != oldzl;
	583	+	}
	584	+
553	585		int tns_translate(tns_t *tns, int x, int y)
554	586		{
555	587		int n;
		@@ -559,8 +591,8 @@ int tns_translate(tns_t *tns, int x, int y)
559	591		if (x < tns->x \|\| y < tns->y)
560	592		return -1;
561	593
562		−	n = tns->first + (y - tns->y) / thumb_dim * tns->cols +
563		−	(x - tns->x) / thumb_dim;
	594	+	n = tns->first + (y - tns->y) / (thumb_size[tns->zl] + 10) * tns->cols +
	595	+	(x - tns->x) / (thumb_size[tns->zl] + 10);
564	596		if (n >= tns->cnt)
565	597		n = -1;
566	598

		@@ -47,6 +47,7 @@ typedef struct {
47	47		int y;
48	48		int cols;
49	49		int rows;
	50	+	int zl;
50	51
51	52		bool dirty;
52	53		} tns_t;
		@@ -66,6 +67,8 @@ void tns_highlight(tns_t*, int, bool);
66	67		bool tns_move_selection(tns_t*, direction_t, int);
67	68		bool tns_scroll(tns_t*, direction_t, bool);
68	69
	70	+	bool tns_zoom(tns_t*, int);
	71	+
69	72		int tns_translate(tns_t*, int, int);
70	73
71	74		#endif /* THUMBS_H */

nsxiv/7b91e10

Added thumbnail zooming...

nsxiv7b91e10