Commit 47e6cd0

nsxiv47e6cd0

Apply gamma value on thumbnails too; fixes issue #193

Author: Bert Münnich
Date: 2015-01-05 20:53 +0100
Parent: 47af0dd
Commit: 47e6cd066902ec6e6295c6ae55245f8f4e53a56a

+27 −40

5 files changed

Browse files Patch

−Context 3+

M Makefile +1 −1
M commands.c +11 −5
M commands.lst +1 −1
M config.def.h +3 −3
M image.c +11 −30

M Makefile View

M commands.c View

M commands.lst View

M config.def.h View

M image.c View

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

		@@ -260,6 +260,17 @@ bool cg_navigate_marked(arg_t a)
260	260		}
261	261		}
262	262
	263	+	bool cg_change_gamma(arg_t a)
	264	+	{
	265	+	if (img_change_gamma(&img, (long) a * (prefix > 0 ? prefix : 1))) {
	266	+	if (mode == MODE_THUMB)
	267	+	tns.dirty = true;
	268	+	return true;
	269	+	} else {
	270	+	return false;
	271	+	}
	272	+	}
	273	+
263	274		bool ci_navigate(arg_t a)
264	275		{
265	276		long n = (long) a;
		@@ -419,11 +430,6 @@ bool ci_flip(arg_t a)
419	430		return true;
420	431		}
421	432
422		−	bool ci_change_gamma(arg_t a)
423		−	{
424		−	return img_change_gamma(&img, (long) a);
425		−	}
426		−
427	433		bool ci_toggle_antialias(arg_t a)
428	434		{
429	435		img_toggle_antialias(&img);

		@@ -13,6 +13,7 @@ G_CMD(toggle_image_mark)
13	13		G_CMD(reverse_marks)
14	14		G_CMD(unmark_all)
15	15		G_CMD(navigate_marked)
	16	+	G_CMD(change_gamma)
16	17
17	18		I_CMD(navigate)
18	19		I_CMD(alternate)
		@@ -25,7 +26,6 @@ I_CMD(set_zoom)
25	26		I_CMD(fit_to_win)
26	27		I_CMD(rotate)
27	28		I_CMD(flip)
28		−	I_CMD(change_gamma)
29	29		I_CMD(toggle_antialias)
30	30		I_CMD(toggle_alpha)
31	31		I_CMD(slideshow)

		@@ -88,6 +88,9 @@ static const keymap_t keys[] = {
88	88		{ ControlMask, XK_m, g_unmark_all, (arg_t) None },
89	89		{ 0, XK_N, g_navigate_marked, (arg_t) +1 },
90	90		{ 0, XK_P, g_navigate_marked, (arg_t) -1 },
	91	+	{ 0, XK_braceleft, g_change_gamma, (arg_t) -1 },
	92	+	{ 0, XK_braceright, g_change_gamma, (arg_t) +1 },
	93	+	{ ControlMask, XK_g, g_change_gamma, (arg_t) 0 },
91	94
92	95		{ 0, XK_h, t_move_sel, (arg_t) DIR_LEFT },
93	96		{ 0, XK_Left, t_move_sel, (arg_t) DIR_LEFT },
		@@ -133,9 +136,6 @@ static const keymap_t keys[] = {
133	136		{ 0, XK_question, i_rotate, (arg_t) DEGREE_180 },
134	137		{ 0, XK_bar, i_flip, (arg_t) FLIP_HORIZONTAL },
135	138		{ 0, XK_underscore, i_flip, (arg_t) FLIP_VERTICAL },
136		−	{ 0, XK_braceleft, i_change_gamma, (arg_t) -1 },
137		−	{ 0, XK_braceright, i_change_gamma, (arg_t) +1 },
138		−	{ ControlMask, XK_g, i_change_gamma, (arg_t) 0 },
139	139		{ 0, XK_a, i_toggle_antialias, (arg_t) None },
140	140		{ 0, XK_A, i_toggle_alpha, (arg_t) None },
141	141		{ 0, XK_s, i_slideshow, (arg_t) None },

		@@ -46,22 +46,6 @@ static int zoomdiff(float z1, float z2)
46	46		return (int) (z1 * 1000.0 - z2 * 1000.0);
47	47		}
48	48
49		−	static void img_apply_gamma(img_t *img)
50		−	{
51		−	if (img == NULL \|\| img->im == NULL \|\| img->cmod == NULL)
52		−	return;
53		−
54		−	if (img->gamma == 0) {
55		−	imlib_context_set_color_modifier(NULL);
56		−	} else {
57		−	double range = img->gamma <= 0 ? 1.0 : GAMMA_MAX - 1.0;
58		−
59		−	imlib_context_set_color_modifier(img->cmod);
60		−	imlib_reset_color_modifier();
61		−	imlib_modify_color_modifier_gamma(1.0 + img->gamma * (range / GAMMA_RANGE));
62		−	}
63		−	}
64		−
65	49		void img_init(img_t img, win_t win)
66	50		{
67	51		zoom_min = zoom_levels[0] / 100.0;
		@@ -89,8 +73,9 @@ void img_init(img_t img, win_t win)
89	73		img->multi.length = 0;
90	74
91	75		img->cmod = imlib_create_color_modifier();
	76	+	imlib_context_set_color_modifier(img->cmod);
92	77		img->gamma = MIN(MAX(options->gamma, -GAMMA_RANGE), GAMMA_RANGE);
93		−
	78	+
94	79		img->ss.on = options->slideshow > 0;
95	80		img->ss.delay = options->slideshow > 0 ? options->slideshow : SLIDESHOW_DELAY;
96	81		}
		@@ -339,8 +324,6 @@ bool img_load(img_t img, const fileinfo_t file)
339	324		img_load_gif(img, file);
340	325		#endif
341	326		}
342		−	img_apply_gamma(img);
343		−
344	327		img->w = imlib_image_get_width();
345	328		img->h = imlib_image_get_height();
346	329		img->checkpan = true;
		@@ -371,9 +354,6 @@ void img_close(img_t *img, bool decache)
371	354		imlib_free_image();
372	355		img->im = NULL;
373	356		}
374		−
375		−	if (img->cmod)
376		−	imlib_context_set_color_modifier(NULL);
377	357		}
378	358
379	359		void img_check_pan(img_t *img, bool moved)
		@@ -529,10 +509,8 @@ void img_render(img_t *img)
529	509		imlib_blend_image_onto_image(img->im, 0, sx, sy, sw, sh, 0, 0, dw, dh);
530	510		imlib_context_set_color_modifier(NULL);
531	511		imlib_render_image_on_drawable(dx, dy);
532		−
533	512		imlib_free_image();
534		−	if (img->gamma != 0)
535		−	imlib_context_set_color_modifier(img->cmod);
	513	+	imlib_context_set_color_modifier(img->cmod);
536	514		} else {
537	515		imlib_render_image_part_on_drawable_at_size(sx, sy, sw, sh, dx, dy, dw, dh);
538	516		}
		@@ -771,20 +749,23 @@ bool img_change_gamma(img_t *img, int d)
771	749		* d > 0: increase gamma
772	750		*/
773	751		int gamma;
	752	+	double range;
774	753
775		−	if (img == NULL \|\| img->im == NULL)
	754	+	if (img == NULL)
776	755		return false;
777	756
778	757		if (d == 0)
779	758		gamma = 0;
780		−	else if (d < 0)
781		−	gamma = MAX(-GAMMA_RANGE, img->gamma - 1);
782	759		else
783		−	gamma = MIN(+GAMMA_RANGE, img->gamma + 1);
	760	+	gamma = MIN(MAX(img->gamma + d, -GAMMA_RANGE), GAMMA_RANGE);
784	761
785	762		if (img->gamma != gamma) {
	763	+	imlib_reset_color_modifier();
	764	+	if (gamma != 0) {
	765	+	range = gamma <= 0 ? 1.0 : GAMMA_MAX - 1.0;
	766	+	imlib_modify_color_modifier_gamma(1.0 + gamma * (range / GAMMA_RANGE));
	767	+	}
786	768		img->gamma = gamma;
787		−	img_apply_gamma(img);
788	769		img->dirty = true;
789	770		return true;
790	771		} else {

nsxiv/47e6cd0

Apply gamma value on thumbnails too; fixes issue #193

nsxiv47e6cd0