[ViewVC] Diff of: cvs/rxvt-unicode/src/rxvtimg.C

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.55 by root, Thu Jun 7 20:26:21 2012 UTC vs.
Revision 1.108 by sf-exg, Fri Nov 7 13:45:55 2014 UTC

…		…
		1	/----------------------------------------------------------------------
		2	* File: rxvtimg.C
		3	----------------------------------------------------------------------
		4	*
		5	* All portions of code are copyright by their respective author/s.
		6	* Copyright (c) 2012 Marc Lehmann <schmorp@schmorp.de>
		7	* Copyright (c) 2012 Emanuele Giaquinta <e.giaquinta@glauco.it>
		8	*
		9	* This program is free software; you can redistribute it and/or modify
		10	* it under the terms of the GNU General Public License as published by
		11	* the Free Software Foundation; either version 3 of the License, or
		12	* (at your option) any later version.
		13	*
		14	* This program is distributed in the hope that it will be useful,
		15	* but WITHOUT ANY WARRANTY; without even the implied warranty of
		16	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		17	* GNU General Public License for more details.
		18	*
		19	* You should have received a copy of the GNU General Public License
		20	* along with this program; if not, write to the Free Software
		21	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
		22	---------------------------------------------------------------------/
		23
		24	#include <string.h>
1	#include <math.h>	25	#include <math.h>
2	#include "../config.h"	26	#include "../config.h"
3	#include "rxvt.h"	27	#include "rxvt.h"
4		28
5	#if HAVE_IMG	29	#if HAVE_IMG
6		30
		31	typedef rxvt_img::nv nv;
		32
		33	namespace
		34	{
		35	struct mat3x3
		36	{
		37	nv v[3][3];
		38
		39	mat3x3 ()
		40	{
		41	}
		42
		43	mat3x3 (const nv *matrix)
		44	{
		45	memcpy (v, matrix, sizeof (v));
		46	}
		47
		48	mat3x3 (nv v11, nv v12, nv v13, nv v21, nv v22, nv v23, nv v31, nv v32, nv v33)
		49	{
		50	v[0][0] = v11; v[0][1] = v12; v[0][2] = v13;
		51	v[1][0] = v21; v[1][1] = v22; v[1][2] = v23;
		52	v[2][0] = v31; v[2][1] = v32; v[2][2] = v33;
		53	}
		54
		55	mat3x3 inverse ();
		56
		57	nv *operator [](int i) { return &v[i][0]; }
		58	const nv *operator [](int i) const { return &v[i][0]; }
		59
		60	operator const nv * () const { return &v[0][0]; }
		61	operator nv * () { return &v[0][0]; }
		62
		63	// quite inefficient, hopefully gcc pulls the w calc out of any loops
		64	nv apply1 (int i, nv x, nv y)
		65	{
		66	mat3x3 &m = *this;
		67
		68	nv v = m[i][0] * x + m[i][1] * y + m[i][2];
		69	nv w = m[2][0] * x + m[2][1] * y + m[2][2];
		70
		71	return v * (1. / w);
		72	}
		73
		74	static mat3x3 translate (nv x, nv y);
		75	static mat3x3 scale (nv s, nv t);
		76	static mat3x3 rotate (nv phi);
		77	};
		78
		79	mat3x3
		80	mat3x3::inverse ()
		81	{
		82	mat3x3 &m = *this;
		83	mat3x3 inv;
		84
		85	nv s0 = m[2][2] * m[1][1] - m[2][1] * m[1][2];
		86	nv s1 = m[2][1] * m[0][2] - m[2][2] * m[0][1];
		87	nv s2 = m[1][2] * m[0][1] - m[1][1] * m[0][2];
		88
		89	nv invdet = 1. / (m[0][0] * s0 + m[1][0] * s1 + m[2][0] * s2);
		90
		91	inv[0][0] = invdet * s0;
		92	inv[0][1] = invdet * s1;
		93	inv[0][2] = invdet * s2;
		94
		95	inv[1][0] = invdet * (m[2][0] * m[1][2] - m[2][2] * m[1][0]);
		96	inv[1][1] = invdet * (m[2][2] * m[0][0] - m[2][0] * m[0][2]);
		97	inv[1][2] = invdet * (m[1][0] * m[0][2] - m[1][2] * m[0][0]);
		98
		99	inv[2][0] = invdet * (m[2][1] * m[1][0] - m[2][0] * m[1][1]);
		100	inv[2][1] = invdet * (m[2][0] * m[0][1] - m[2][1] * m[0][0]);
		101	inv[2][2] = invdet * (m[1][1] * m[0][0] - m[1][0] * m[0][1]);
		102
		103	return inv;
		104	}
		105
		106	static mat3x3
		107	operator *(const mat3x3 &a, const mat3x3 &b)
		108	{
		109	mat3x3 r;
		110
		111	for (int i = 0; i < 3; ++i)
		112	for (int j = 0; j < 3; ++j)
		113	r[i][j] = a[i][0] * b[0][j]
		114	+ a[i][1] * b[1][j]
		115	+ a[i][2] * b[2][j];
		116
		117	return r;
		118	}
		119
		120	mat3x3
		121	mat3x3::translate (nv x, nv y)
		122	{
		123	return mat3x3 (
		124	1, 0, x,
		125	0, 1, y,
		126	0, 0, 1
		127	);
		128	}
		129
		130	mat3x3
		131	mat3x3::scale (nv s, nv t)
		132	{
		133	return mat3x3 (
		134	s, 0, 0,
		135	0, t, 0,
		136	0, 0, 1
		137	);
		138	}
		139
		140	// clockwise
		141	mat3x3
		142	mat3x3::rotate (nv phi)
		143	{
		144	nv s = sin (phi);
		145	nv c = cos (phi);
		146
		147	return mat3x3 (
		148	c, -s, 0,
		149	s, c, 0,
		150	0, 0, 1
		151	);
		152	}
		153
		154	struct composer
		155	{
		156	rxvt_img srcimg, dstimg;
		157	Picture src, dst, msk;
		158	Display *dpy;
		159
		160	ecb_noinline
		161	composer (rxvt_img srcimg, rxvt_img dstimg = 0)
		162	: srcimg (srcimg), dstimg (dstimg), msk (0)
		163	{
		164	if (!this->dstimg)
		165	this->dstimg = srcimg->new_empty ();
		166	else if (!this->dstimg->pm) // somewhat unsatisfying
		167	this->dstimg->alloc ();
		168
		169	dpy = srcimg->s->dpy;
		170	src = srcimg->picture ();
		171	dst = this->dstimg->picture ();
		172	}
		173
		174	ecb_noinline
		175	void mask (bool rgb = true, int w = 1, int h = 1)
		176	{
		177	Pixmap pixmap = XCreatePixmap (dpy, srcimg->pm, w, h, rgb ? 32 : 8);
		178
		179	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, rgb ? PictStandardARGB32 : PictStandardA8);
		180	XRenderPictureAttributes pa;
		181	pa.repeat = RepeatNormal;
		182	pa.component_alpha = rgb;
		183	msk = XRenderCreatePicture (dpy, pixmap, format, CPRepeat \| CPComponentAlpha, &pa);
		184
		185	XFreePixmap (dpy, pixmap);
		186
		187	ecb_assume (msk);
		188	}
		189
		190	// CreateSolidFill creates a very very very weird picture
		191	void mask (const rgba &c)
		192	{
		193	// the casts are needed in C++11 (see 8.5.1)
		194	XRenderColor rc = {
		195	(unsigned short)(c.r * c.a / 65535),
		196	(unsigned short)(c.g * c.a / 65535),
		197	(unsigned short)(c.b * c.a / 65535),
		198	c.a
		199	};
		200	msk = XRenderCreateSolidFill (dpy, &rc);
		201	ecb_assume (msk);
		202	}
		203
		204	void fill (const rgba &c)
		205	{
		206	XRenderColor rc = {
		207	(unsigned short)(c.r * c.a / 65535),
		208	(unsigned short)(c.g * c.a / 65535),
		209	(unsigned short)(c.b * c.a / 65535),
		210	c.a
		211	};
		212
		213	XRenderFillRectangle (dpy, PictOpSrc, msk, &rc, 0, 0, 1, 1);
		214	}
		215
		216	operator rxvt_img *()
		217	{
		218	return dstimg;
		219	}
		220
		221	ecb_noinline
		222	~composer ()
		223	{
		224	XRenderFreePicture (dpy, src);
		225	XRenderFreePicture (dpy, dst);
		226	if (msk) XRenderFreePicture (dpy, msk);
		227	}
		228	};
		229	}
		230
		231	static XRenderPictFormat *
		232	find_alpha_format_for (Display dpy, XRenderPictFormat format)
		233	{
		234	if (format->direct.alphaMask)
		235	return format; // already has alpha
		236
		237	// try to find a suitable alpha format, one bit alpha is enough for our purposes
		238	if (format->type == PictTypeDirect)
		239	for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
		240	if (f->direct.alphaMask
		241	&& f->type == PictTypeDirect
		242	&& ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
		243	&& ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
		244	&& ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
		245	return f;
		246
		247	// should be a very good fallback
		248	return XRenderFindStandardFormat (dpy, PictStandardARGB32);
		249	}
		250
7	rxvt_img::rxvt_img (rxvt_screen screen, XRenderPictFormat format, int x, int y, int width, int height, int repeat)	251	rxvt_img::rxvt_img (rxvt_screen screen, XRenderPictFormat format, int x, int y, int width, int height, int repeat)
8	: s(screen), x(x), y(y), w(width), h(height), format(format), repeat(repeat),	252	: s(screen), x(x), y(y), w(width), h(height), format(format), repeat(repeat),
9	pm(0), ref(0)	253	pm(0), ref(0)
10	{	254	{
11	}	255	}
14	: s(img.s), x(img.x), y(img.y), w(img.w), h(img.h), format(img.format), repeat(img.repeat), pm(img.pm), ref(img.ref)	258	: s(img.s), x(img.x), y(img.y), w(img.w), h(img.h), format(img.format), repeat(img.repeat), pm(img.pm), ref(img.ref)
15	{	259	{
16	++ref->cnt;	260	++ref->cnt;
17	}	261	}
18		262
19	#if 0
20	rxvt_img::rxvt_img (rxvt_screen screen, XRenderPictFormat format, int width, int height, Pixmap pixmap)
21	: s(screen), x(0), y(0), w(width), h(height), format(format), repeat(RepeatNormal), shared(false), pm(pixmap)
22	{
23	}
24	#endif
25
26	rxvt_img *	263	rxvt_img *
27	rxvt_img::new_from_root (rxvt_screen *s)	264	rxvt_img::new_from_root (rxvt_screen *s)
28	{	265	{
29	Display *dpy = s->display->dpy;	266	Display *dpy = s->dpy;
30	unsigned int root_pm_w, root_pm_h;	267	unsigned int root_pm_w, root_pm_h;
31	Pixmap root_pixmap = s->display->get_pixmap_property (s->display->xa[XA_XROOTPMAP_ID]);	268	Pixmap root_pixmap = s->display->get_pixmap_property (s->display->xa [XA_XROOTPMAP_ID]);
32	if (root_pixmap == None)	269	if (root_pixmap == None)
33	root_pixmap = s->display->get_pixmap_property (s->display->xa[XA_ESETROOT_PMAP_ID]);	270	root_pixmap = s->display->get_pixmap_property (s->display->xa [XA_ESETROOT_PMAP_ID]);
34		271
35	if (root_pixmap == None)	272	if (root_pixmap == None)
36	return 0;	273	return 0;
37		274
38	Window wdummy;	275	Window wdummy;
…		…
56	img->ref->ours = false;	293	img->ref->ours = false;
57		294
58	return img;	295	return img;
59	}	296	}
60		297
		298	# if HAVE_PIXBUF
		299
61	rxvt_img *	300	rxvt_img *
62	rxvt_img::new_from_pixbuf (rxvt_screen s, GdkPixbuf pb)	301	rxvt_img::new_from_pixbuf (rxvt_screen s, GdkPixbuf pb)
63	{	302	{
64	Display *dpy = s->display->dpy;	303	Display *dpy = s->dpy;
65		304
66	int width = gdk_pixbuf_get_width (pb);	305	int width = gdk_pixbuf_get_width (pb);
67	int height = gdk_pixbuf_get_height (pb);	306	int height = gdk_pixbuf_get_height (pb);
68		307
69	if (width > 32767 \|\| height > 32767) // well, we could upload in chunks	308	if (width > 32767 \|\| height > 32767) // well, we could upload in chunks
70	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big (maximum size 32768x32768).\n");	309	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big (maximum size 32768x32768).\n");
71		310
72	// since we require rgb24/argb32 formats from xrender we assume	311	// since we require rgb24/argb32 formats from xrender we assume
73	// that both 24 and 32 bpp MUST be supported by any screen that supports xrender	312	// that both 24 and 32 bpp MUST be supported by any screen that supports xrender
74	int depth = gdk_pixbuf_get_has_alpha (pb) ? 32 : 24;
75		313
76	int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;	314	int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
77		315
78	XImage xi;	316	XImage xi;
79		317
…		…
83	xi.format = ZPixmap;	321	xi.format = ZPixmap;
84	xi.byte_order = ImageByteOrder (dpy);	322	xi.byte_order = ImageByteOrder (dpy);
85	xi.bitmap_unit = 0; //XY only, unused	323	xi.bitmap_unit = 0; //XY only, unused
86	xi.bitmap_bit_order = 0; //XY only, unused	324	xi.bitmap_bit_order = 0; //XY only, unused
87	xi.bitmap_pad = BitmapPad (dpy);	325	xi.bitmap_pad = BitmapPad (dpy);
88	xi.depth = depth;	326	xi.depth = 32;
89	xi.bytes_per_line = 0;	327	xi.bytes_per_line = 0;
90	xi.bits_per_pixel = 32; //Z only	328	xi.bits_per_pixel = 32; //Z only
91	xi.red_mask = 0x00000000; //Z only, unused	329	xi.red_mask = 0x00000000; //Z only, unused
92	xi.green_mask = 0x00000000; //Z only, unused	330	xi.green_mask = 0x00000000; //Z only, unused
93	xi.blue_mask = 0x00000000; //Z only, unused	331	xi.blue_mask = 0x00000000; //Z only, unused
…		…
102	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n");	340	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n");
103		341
104	xi.data = (char )rxvt_malloc (height xi.bytes_per_line);	342	xi.data = (char )rxvt_malloc (height xi.bytes_per_line);
105		343
106	int rowstride = gdk_pixbuf_get_rowstride (pb);	344	int rowstride = gdk_pixbuf_get_rowstride (pb);
107		345	bool pb_has_alpha = gdk_pixbuf_get_has_alpha (pb);
108	assert (3 + (depth == 32) == gdk_pixbuf_get_n_channels (pb));
109	unsigned char *row = gdk_pixbuf_get_pixels (pb);	346	unsigned char *row = gdk_pixbuf_get_pixels (pb);
		347
110	char *line = xi.data;	348	char *line = xi.data;
111		349
112	for (int y = 0; y < height; y++)	350	for (int y = 0; y < height; y++)
113	{	351	{
114	unsigned char *src = row;	352	unsigned char *src = row;
115	uint32_t dst = (uint32_t )line;	353	uint32_t dst = (uint32_t )line;
116		354
117	if (depth == 24)
118	for (int x = 0; x < width; x++)	355	for (int x = 0; x < width; x++)
119	{	356	{
120	uint8_t r = *src++;	357	uint8_t r = *src++;
121	uint8_t g = *src++;	358	uint8_t g = *src++;
122	uint8_t b = *src++;	359	uint8_t b = *src++;
		360	uint8_t a = *src;
123		361
		362	// this is done so it can be jump-free, but newer gcc's clone inner the loop
		363	a = pb_has_alpha ? a : 255;
		364	src += pb_has_alpha;
		365
		366	r = (r * a + 127) / 255;
		367	g = (g * a + 127) / 255;
		368	b = (b * a + 127) / 255;
		369
124	uint32_t v = (r << 16) \| (g << 8) \| b;	370	uint32_t v = (a << 24) \| (r << 16) \| (g << 8) \| b;
125		371
126	if (ecb_big_endian ())	372	if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
127	v = ecb_bswap32 (v);	373	v = ecb_bswap32 (v);
128		374
129	if (byte_order_mismatch)
130	v = ecb_bswap32 (v);
131
132	*dst++ = v;	375	*dst++ = v;
133	}	376	}
134	else
135	for (int x = 0; x < width; x++)
136	{
137	uint32_t v = (uint32_t )src; src += 4;
138
139	if (ecb_little_endian ())
140	v = ecb_bswap32 (v);
141
142	v = ecb_rotr32 (v, 8);
143
144	if (byte_order_mismatch)
145	v = ecb_bswap32 (v);
146
147	*dst++ = v;
148	}
149		377
150	row += rowstride;	378	row += rowstride;
151	line += xi.bytes_per_line;	379	line += xi.bytes_per_line;
152	}	380	}
153		381
154	rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, depth == 24 ? PictStandardRGB24 : PictStandardARGB32), 0, 0, width, height);	382	rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, PictStandardARGB32), 0, 0, width, height);
155	img->alloc ();	383	img->alloc ();
156		384
157	GC gc = XCreateGC (dpy, img->pm, 0, 0);	385	GC gc = XCreateGC (dpy, img->pm, 0, 0);
158	XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height);	386	XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height);
159	XFreeGC (dpy, gc);	387	XFreeGC (dpy, gc);
…		…
177	g_object_unref (pb);	405	g_object_unref (pb);
178		406
179	return img;	407	return img;
180	}	408	}
181		409
		410	# endif
		411
182	void	412	void
183	rxvt_img::destroy ()	413	rxvt_img::destroy ()
184	{	414	{
185	if (--ref->cnt)	415	if (--ref->cnt)
186	return;	416	return;
187		417
188	if (pm && ref->ours)	418	if (pm && ref->ours)
189	XFreePixmap (s->display->dpy, pm);	419	XFreePixmap (s->dpy, pm);
190		420
191	delete ref;	421	delete ref;
192	}	422	}
193		423
194	rxvt_img::~rxvt_img ()	424	rxvt_img::~rxvt_img ()
…		…
197	}	427	}
198		428
199	void	429	void
200	rxvt_img::alloc ()	430	rxvt_img::alloc ()
201	{	431	{
202	pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);	432	pm = XCreatePixmap (s->dpy, s->display->root, w, h, format->depth);
203	ref = new pixref (w, h);	433	ref = new pixref (w, h);
204	}	434	}
205		435
		436	rxvt_img *
		437	rxvt_img::new_empty ()
		438	{
		439	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
		440	img->alloc ();
		441
		442	return img;
		443	}
		444
206	Picture	445	Picture
207	rxvt_img::src_picture ()	446	rxvt_img::picture ()
208	{	447	{
209	Display *dpy = s->display->dpy;	448	Display *dpy = s->dpy;
210		449
211	XRenderPictureAttributes pa;	450	XRenderPictureAttributes pa;
212	pa.repeat = repeat;	451	pa.repeat = repeat;
213	Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);	452	Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
214		453
…		…
219	rxvt_img::unshare ()	458	rxvt_img::unshare ()
220	{	459	{
221	if (ref->cnt == 1 && ref->ours)	460	if (ref->cnt == 1 && ref->ours)
222	return;	461	return;
223		462
224	//TODO: maybe should reify instead
225	Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth);	463	Pixmap pm2 = XCreatePixmap (s->dpy, s->display->root, ref->w, ref->h, format->depth);
226	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);	464	GC gc = XCreateGC (s->dpy, pm, 0, 0);
227	XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);	465	XCopyArea (s->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
228	XFreeGC (s->display->dpy, gc);	466	XFreeGC (s->dpy, gc);
229		467
230	destroy ();	468	destroy ();
231		469
232	pm = pm2;	470	pm = pm2;
233	ref = new pixref (ref->w, ref->h);	471	ref = new pixref (ref->w, ref->h);
234	}	472	}
235		473
236	void	474	void
		475	rxvt_img::fill (const rgba &c, int x, int y, int w, int h)
		476	{
		477	XRenderColor rc = { c.r, c.g, c.b, c.a };
		478
		479	Display *dpy = s->dpy;
		480	Picture src = picture ();
		481	XRenderFillRectangle (dpy, PictOpSrc, src, &rc, x, y, w, h);
		482	XRenderFreePicture (dpy, src);
		483	}
		484
		485	void
237	rxvt_img::fill (const rxvt_color &c)	486	rxvt_img::fill (const rgba &c)
238	{	487	{
239	XGCValues gcv;	488	fill (c, 0, 0, w, h);
240	gcv.foreground = c;	489	}
241	GC gc = XCreateGC (s->display->dpy, pm, GCForeground, &gcv);	490
242	XFillRectangle (s->display->dpy, pm, gc, 0, 0, w, h);	491	void
243	XFreeGC (s->display->dpy, gc);	492	rxvt_img::add_alpha ()
		493	{
		494	if (format->direct.alphaMask)
		495	return;
		496
		497	composer cc (this, new rxvt_img (s, find_alpha_format_for (s->dpy, format), x, y, w, h, repeat));
		498
		499	XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
		500
		501	rxvt_img *img = cc;
		502
		503	::swap (img->ref, ref);
		504	::swap (img->pm , pm );
		505
		506	delete img;
244	}	507	}
245		508
246	static void	509	static void
247	get_gaussian_kernel (int radius, int width, double kernel, XFixed params)	510	get_gaussian_kernel (int radius, int width, nv kernel, XFixed params)
248	{	511	{
249	double sigma = radius / 2.0;	512	nv sigma = radius / 2.0;
250	double scale = sqrt (2.0 * M_PI) * sigma;	513	nv scale = sqrt (2.0 * M_PI) * sigma;
251	double sum = 0.0;	514	nv sum = 0.0;
252		515
253	for (int i = 0; i < width; i++)	516	for (int i = 0; i < width; i++)
254	{	517	{
255	double x = i - width / 2;	518	nv x = i - width / 2;
256	kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;	519	kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
257	sum += kernel[i];	520	sum += kernel[i];
258	}	521	}
259		522
260	params[0] = XDoubleToFixed (width);	523	params[0] = XDoubleToFixed (width);
…		…
268	rxvt_img::blur (int rh, int rv)	531	rxvt_img::blur (int rh, int rv)
269	{	532	{
270	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))	533	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))
271	return clone ();	534	return clone ();
272		535
273	Display *dpy = s->display->dpy;	536	Display *dpy = s->dpy;
274	int size = max (rh, rv) * 2 + 1;	537	int size = max (rh, rv) * 2 + 1;
275	double kernel = (double )malloc (size * sizeof (double));	538	nv kernel = (nv )malloc (size * sizeof (nv));
276	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));	539	XFixed *params = rxvt_temp_buf<XFixed> (size + 2);
277	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);	540	rxvt_img *img = new_empty ();
278	img->alloc ();
279
280	Picture src = src_picture ();
281		541
282	XRenderPictureAttributes pa;	542	XRenderPictureAttributes pa;
283	pa.repeat = RepeatPad;	543	pa.repeat = RepeatPad;
284	Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa);	544	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
		545	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
285		546
286	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);	547	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
287	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);	548	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
288	XFreePixmap (dpy, tmp_pm);	549	XFreePixmap (dpy, tmp_pm);
289		550
…		…
305		566
306	size = rv * 2 + 1;	567	size = rv * 2 + 1;
307	get_gaussian_kernel (rv, size, kernel, params);	568	get_gaussian_kernel (rv, size, kernel, params);
308	::swap (params[0], params[1]);	569	::swap (params[0], params[1]);
309		570
310	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);	571	XRenderSetPictureFilter (dpy, tmp, FilterConvolution, params, size+2);
311	XRenderComposite (dpy,	572	XRenderComposite (dpy,
312	PictOpSrc,	573	PictOpSrc,
313	tmp,	574	tmp,
314	None,	575	None,
315	dst,	576	dst,
…		…
318	0, 0,	579	0, 0,
319	w, h);	580	w, h);
320	}	581	}
321		582
322	free (kernel);	583	free (kernel);
323	free (params);	584
324	XRenderFreePicture (dpy, src);	585	XRenderFreePicture (dpy, src);
325	XRenderFreePicture (dpy, dst);	586	XRenderFreePicture (dpy, dst);
326	XRenderFreePicture (dpy, tmp);	587	XRenderFreePicture (dpy, tmp);
327		588
328	return img;	589	return img;
329	}	590	}
330		591
331	static Picture	592	rxvt_img *
332	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb)	593	rxvt_img::muladd (nv mul, nv add)
333	{	594	{
334	Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);	595	// STEP 1: double the image width, fill all odd columns with white (==1)
335		596
336	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);	597	composer cc (this, new rxvt_img (s, format, 0, 0, w * 2, h, repeat));
337	XRenderPictureAttributes pa;
338	pa.repeat = True;
339	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);
340		598
341	XFreePixmap (dpy, pixmap);	599	// why the hell does XRenderSetPictureTransform want a writable matrix :(
		600	// that keeps us from just static const'ing this matrix.
		601	XTransform h_double = {
		602	0x08000, 0, 0,
		603	0, 0x10000, 0,
		604	0, 0, 0x10000
		605	};
342		606
343	return mask;	607	XRenderSetPictureFilter (cc.dpy, cc.src, "nearest", 0, 0);
		608	XRenderSetPictureTransform (cc.dpy, cc.src, &h_double);
		609	XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, 0, 0, 0, 0, 0, 0, w * 2, h);
		610
		611	cc.mask (false, 2, 1);
		612
		613	static const XRenderColor c0 = { 0, 0, 0, 0 };
		614	XRenderFillRectangle (cc.dpy, PictOpSrc, cc.msk, &c0, 0, 0, 1, 1);
		615	static const XRenderColor c1 = { 65535, 65535, 65535, 65535 };
		616	XRenderFillRectangle (cc.dpy, PictOpSrc, cc.msk, &c1, 1, 0, 1, 1);
		617
		618	Picture white = XRenderCreateSolidFill (cc.dpy, &c1);
		619
		620	XRenderComposite (cc.dpy, PictOpOver, white, cc.msk, cc.dst, 0, 0, 0, 0, 0, 0, w * 2, h);
		621
		622	XRenderFreePicture (cc.dpy, white);
		623
		624	// STEP 2: convolve the image with a 3x1 filter
		625	// a 2x1 filter would obviously suffice, but given the total lack of specification
		626	// for xrender, I expect different xrender implementations to randomly diverge.
		627	// we also halve the image, and hope for the best (again, for lack of specs).
		628	composer cc2 (cc.dstimg);
		629
		630	XFixed kernel [] = {
		631	XDoubleToFixed (3), XDoubleToFixed (1),
		632	XDoubleToFixed (0), XDoubleToFixed (mul), XDoubleToFixed (add)
		633	};
		634
		635	XTransform h_halve = {
		636	0x20000, 0, 0,
		637	0, 0x10000, 0,
		638	0, 0, 0x10000
		639	};
		640
		641	XRenderSetPictureFilter (cc.dpy, cc2.src, "nearest", 0, 0);
		642	XRenderSetPictureTransform (cc.dpy, cc2.src, &h_halve);
		643	XRenderSetPictureFilter (cc.dpy, cc2.src, FilterConvolution, kernel, ecb_array_length (kernel));
		644
		645	XRenderComposite (cc.dpy, PictOpSrc, cc2.src, None, cc2.dst, 0, 0, 0, 0, 0, 0, w * 2, h);
		646
		647	return cc2;
		648	}
		649
		650	ecb_noinline static void
		651	extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)
		652	{
		653	int32_t x = clamp (c, cl0, cl1);
		654	c -= x;
		655	xc = x;
		656	}
		657
		658	ecb_noinline static bool
		659	extract (int32_t cl0, int32_t cl1, int32_t &r, int32_t &g, int32_t &b, int32_t &a, unsigned short &xr, unsigned short &xg, unsigned short &xb, unsigned short &xa)
		660	{
		661	extract (cl0, cl1, r, xr);
		662	extract (cl0, cl1, g, xg);
		663	extract (cl0, cl1, b, xb);
		664	extract (cl0, cl1, a, xa);
		665
		666	return xr \| xg \| xb \| xa;
344	}	667	}
345		668
346	void	669	void
347	rxvt_img::brightness (unsigned short r, unsigned short g, unsigned short b, unsigned short a)	670	rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a)
348	{	671	{
		672	unshare ();
		673
349	Display *dpy = s->display->dpy;	674	Display *dpy = s->dpy;
350	Picture src = create_xrender_mask (dpy, pm, True);
351	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	675	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
352		676
		677	// loop should not be needed for brightness, as only -1..1 makes sense
		678	//while (r \| g \| b \| a)
		679	{
		680	unsigned short xr, xg, xb, xa;
353	XRenderColor mask_c;	681	XRenderColor mask_c;
354	mask_c.red = r;	682
355	mask_c.green = g;	683	if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
356	mask_c.blue = b;
357	mask_c.alpha = a;
358	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);	684	XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
359		685
360	XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	686	if (extract (-65535, 0, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
		687	{
		688	XRenderColor mask_w = { 65535, 65535, 65535, 65535 };
		689	XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
		690	mask_c.red = -mask_c.red; //TODO: verify that doing clamp, assign, and negation does the right thing
		691	mask_c.green = -mask_c.green;
		692	mask_c.blue = -mask_c.blue;
		693	mask_c.alpha = -mask_c.alpha;
		694	XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
		695	XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
		696	}
		697	}
361		698
362	XRenderFreePicture (dpy, src);
363	XRenderFreePicture (dpy, dst);	699	XRenderFreePicture (dpy, dst);
364	}	700	}
365		701
366	void	702	void
367	rxvt_img::contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a)	703	rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
368	{	704	{
369	if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))	705	if (r < 0 \|\| g < 0 \|\| b < 0 \|\| a < 0)
370	return;	706	rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");
371		707
372	Display *dpy = s->display->dpy;	708	// premultiply (yeah, these are not exact, sue me or fix it)
373	Picture src = create_xrender_mask (dpy, pm, True);	709	r = (r * (a >> 8)) >> 8;
374	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	710	g = (g * (a >> 8)) >> 8;
		711	b = (b * (a >> 8)) >> 8;
375		712
		713	composer cc (this);
		714	rxvt_img *img = cc;
		715	img->fill (rgba (0, 0, 0, 0));
		716
		717	cc.mask (true);
		718
		719	//TODO: this operator does not yet implement some useful contrast
		720	while (r \| g \| b \| a)
		721	{
		722	unsigned short xr, xg, xb, xa;
376	XRenderColor mask_c;	723	XRenderColor mask_c;
377	mask_c.red = r;	724
378	mask_c.green = g;	725	if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
379	mask_c.blue = b;	726	{
380	mask_c.alpha = a;
381	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);	727	XRenderFillRectangle (cc.dpy, PictOpSrc, cc.msk, &mask_c, 0, 0, 1, 1);
382
383	XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	728	XRenderComposite (cc.dpy, PictOpAdd, cc.src, cc.msk, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
		729	}
		730	}
384		731
385	XRenderFreePicture (dpy, src);	732	::swap (img->ref, ref);
386	XRenderFreePicture (dpy, dst);	733	::swap (img->pm , pm );
		734
		735	delete img;
		736	}
		737
		738	void
		739	rxvt_img::draw (rxvt_img *img, int op, nv mask)
		740	{
		741	unshare ();
		742
		743	composer cc (img, this);
		744
		745	if (mask != 1.)
		746	cc.mask (rgba (0, 0, 0, float_to_component (mask)));
		747
		748	XRenderComposite (cc.dpy, op, cc.src, cc.msk, cc.dst, x - img->x, y - img->y, 0, 0, 0, 0, w, h);
387	}	749	}
388		750
389	rxvt_img *	751	rxvt_img *
390	rxvt_img::clone ()	752	rxvt_img::clone ()
391	{	753	{
392	return new rxvt_img (*this);	754	return new rxvt_img (*this);
393	}
394
395	static XRenderPictFormat *
396	find_alpha_format_for (Display dpy, XRenderPictFormat format)
397	{
398	if (format->direct.alphaMask)
399	return format; // already has alpha
400
401	// try to find a suitable alpha format, one bit alpha is enough for our purposes
402	if (format->type == PictTypeDirect)
403	for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
404	if (f->direct.alphaMask
405	&& f->type == PictTypeDirect
406	&& ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
407	&& ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
408	&& ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
409	return f;
410
411	// should be a very good fallback
412	return XRenderFindStandardFormat (dpy, PictStandardARGB32);
413	}	755	}
414		756
415	rxvt_img *	757	rxvt_img *
416	rxvt_img::reify ()	758	rxvt_img::reify ()
417	{	759	{
418	if (x == 0 && y == 0 && w == ref->w && h == ref->h)	760	if (x == 0 && y == 0 && w == ref->w && h == ref->h)
419	return clone ();	761	return clone ();
420		762
421	Display *dpy = s->display->dpy;	763	// add an alpha channel if...
422
423	bool alpha = !format->direct.alphaMask	764	bool alpha = !format->direct.alphaMask // pixmap has none yet
424	&& (x \|\| y)	765	&& (x \|\| y) // we need one because of non-zero offset
425	&& repeat == RepeatNone;	766	&& repeat == RepeatNone; // and we have no good pixels to fill with
426		767
427	rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);	768	composer cc (this, new rxvt_img (s, alpha ? find_alpha_format_for (s->dpy, format) : format,
428	img->alloc ();	769	0, 0, w, h, repeat));
429		770
430	Picture src = src_picture ();	771	if (repeat == RepeatNone)
431	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
432
433	if (alpha)
434	{	772	{
435	XRenderColor rc = { 0, 0, 0, 0 };	773	XRenderColor rc = { 0, 0, 0, 0 };
436	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles	774	XRenderFillRectangle (cc.dpy, PictOpSrc, cc.dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
437	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h);	775	XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, 0, 0, 0, 0, x, y, ref->w, ref->h);
438	}	776	}
439	else	777	else
440	XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);	778	XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, -x, -y, 0, 0, 0, 0, w, h);
441		779
442	XRenderFreePicture (dpy, src);
443	XRenderFreePicture (dpy, dst);
444
445	return img;	780	return cc;
446	}	781	}
447		782
448	rxvt_img *	783	rxvt_img *
449	rxvt_img::sub_rect (int x, int y, int width, int height)	784	rxvt_img::sub_rect (int x, int y, int width, int height)
450	{	785	{
451	rxvt_img *img = clone ();	786	rxvt_img *img = clone ();
452		787
453	img->x += x;	788	img->x -= x;
454	img->y += y;	789	img->y -= y;
455		790
456	if (w != width \|\| h != height)	791	if (w != width \|\| h != height)
457	{	792	{
458	img->w = width;	793	img->w = width;
459	img->h = height;	794	img->h = height;
…		…
465		800
466	return img;	801	return img;
467	}	802	}
468		803
469	rxvt_img *	804	rxvt_img *
470	rxvt_img::transform (int new_width, int new_height, double matrix[9])	805	rxvt_img::transform (const nv matrix[3][3])
471	{	806	{
472	rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat);	807	return transform (mat3x3 (&matrix[0][0]));
473	img->alloc ();	808	}
474		809
475	Display *dpy = s->display->dpy;	810	rxvt_img *
476	Picture src = src_picture ();	811	rxvt_img::transform (const nv *matrix)
477	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	812	{
		813	mat3x3 m (matrix);
		814
		815	// calculate new pixel bounding box coordinates
		816	nv rmin[2], rmax[2];
		817
		818	for (int i = 0; i < 2; ++i)
		819	{
		820	nv v;
		821
		822	v = m.apply1 (i, 0+x, 0+y); rmin [i] = rmax [i] = v;
		823	v = m.apply1 (i, w+x, 0+y); min_it (rmin [i], v); max_it (rmax [i], v);
		824	v = m.apply1 (i, 0+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v);
		825	v = m.apply1 (i, w+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v);
		826	}
		827
		828	float sx = rmin [0] - x;
		829	float sy = rmin [1] - y;
		830
		831	// TODO: adjust matrix for subpixel accuracy
		832	int nx = floor (rmin [0]);
		833	int ny = floor (rmin [1]);
		834
		835	int new_width = ceil (rmax [0] - rmin [0]);
		836	int new_height = ceil (rmax [1] - rmin [1]);
		837
		838	mat3x3 inv = (mat3x3::translate (-x, -y) * m * mat3x3::translate (x, y)).inverse ();
		839
		840	composer cc (this, new rxvt_img (s, format, nx, ny, new_width, new_height, repeat));
478		841
479	XTransform xfrm;	842	XTransform xfrm;
480		843
481	for (int i = 0; i < 3; ++i)	844	for (int i = 0; i < 3; ++i)
482	for (int j = 0; j < 3; ++j)	845	for (int j = 0; j < 3; ++j)
483	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);	846	xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);
484		847
485	#if 0
486	xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
487	xfrm.matrix [1][2] -= XDoubleToFixed (y);
488	#endif
489
490	XRenderSetPictureFilter (dpy, src, "good", 0, 0);	848	XRenderSetPictureFilter (cc.dpy, cc.src, "good", 0, 0);
491	XRenderSetPictureTransform (dpy, src, &xfrm);	849	XRenderSetPictureTransform (cc.dpy, cc.src, &xfrm);
492	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);	850	XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, sx, sy, 0, 0, 0, 0, new_width, new_height);
493		851
494	XRenderFreePicture (dpy, src);
495	XRenderFreePicture (dpy, dst);
496
497	return img;	852	return cc;
498	}	853	}
499		854
500	rxvt_img *	855	rxvt_img *
501	rxvt_img::scale (int new_width, int new_height)	856	rxvt_img::scale (int new_width, int new_height)
502	{	857	{
503	if (w == new_width && h == new_height)	858	if (w == new_width && h == new_height)
504	return clone ();	859	return clone ();
505		860
506	double matrix[9] = {
507	w / (double)new_width, 0, 0,
508	0, h / (double)new_height, 0,
509	0, 0, 1
510	};
511
512	int old_repeat_mode = repeat;	861	int old_repeat_mode = repeat;
513	repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems	862	repeat = RepeatPad; // not right, but xrender can't properly scale it seems
514		863
515	rxvt_img *img = transform (new_width, new_height, matrix);	864	rxvt_img *img = transform (mat3x3::scale (new_width / (nv)w, new_height / (nv)h));
516		865
517	repeat = old_repeat_mode;	866	repeat = old_repeat_mode;
518	img->repeat = repeat;	867	img->repeat = repeat;
519		868
520	return img;	869	return img;
521	}	870	}
522		871
523	rxvt_img *	872	rxvt_img *
524	rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)	873	rxvt_img::rotate (int cx, int cy, nv phi)
525	{	874	{
526	double s = sin (phi);	875	move (-cx, -cy);
527	double c = cos (phi);	876	rxvt_img *img = transform (mat3x3::rotate (phi));
		877	move ( cx, cy);
		878	img->move (cx, cy);
528		879
529	double matrix[9] = {	880	return img;
530	c, -s, -c * x + s * y + x,
531	s, c, -s * x - c * y + y,
532	0, 0, 1
533	};
534
535	return transform (new_width, new_height, matrix);
536	}	881	}
537		882
538	rxvt_img *	883	rxvt_img *
539	rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg)	884	rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg)
540	{	885	{
541	if (new_format == format)	886	if (new_format == format)
542	return clone ();	887	return clone ();
543		888
544	rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);	889	composer cc (this, new rxvt_img (s, new_format, x, y, w, h, repeat));
545	img->alloc ();
546		890
547	Display *dpy = s->display->dpy;
548	Picture src = src_picture ();
549	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
550	int op = PictOpSrc;	891	int op = PictOpSrc;
551		892
552	if (format->direct.alphaMask && !new_format->direct.alphaMask)	893	if (format->direct.alphaMask && !new_format->direct.alphaMask)
553	{	894	{
554	// does it have to be that complicated	895	// does it have to be that complicated
555	rgba c;
556	bg.get (c);
557
558	XRenderColor rc = { c.r, c.g, c.b, 0xffff };	896	XRenderColor rc = { bg.r, bg.g, bg.b, bg.a };
559	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);	897	XRenderFillRectangle (cc.dpy, PictOpSrc, cc.dst, &rc, 0, 0, w, h);
560		898
561	op = PictOpOver;	899	op = PictOpOver;
562	}	900	}
563		901
564	XRenderComposite (dpy, op, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	902	XRenderComposite (cc.dpy, op, cc.src, None, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
565		903
566	XRenderFreePicture (dpy, src);	904	return cc;
567	XRenderFreePicture (dpy, dst);	905	}
		906
		907	rxvt_img *
		908	rxvt_img::tint (const rgba &c)
		909	{
		910	composer cc (this);
		911	cc.mask (true);
		912	cc.fill (c);
		913
		914	XRenderComposite (cc.dpy, PictOpSrc, cc.src, cc.msk, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
		915
		916	return cc;
		917	}
		918
		919	rxvt_img *
		920	rxvt_img::shade (nv factor, rgba c)
		921	{
		922	clamp_it (factor, -1., 1.);
		923	factor++;
		924
		925	if (factor > 1)
		926	{
		927	c.r = c.r * (2 - factor);
		928	c.g = c.g * (2 - factor);
		929	c.b = c.b * (2 - factor);
		930	}
		931	else
		932	{
		933	c.r = c.r * factor;
		934	c.g = c.g * factor;
		935	c.b = c.b * factor;
		936	}
		937
		938	rxvt_img *img = this->tint (c);
		939
		940	if (factor > 1)
		941	{
		942	c.a = 0xffff;
		943	c.r =
		944	c.g =
		945	c.b = 0xffff * (factor - 1);
		946
		947	img->brightness (c.r, c.g, c.b, c.a);
		948	}
568		949
569	return img;	950	return img;
570	}	951	}
571		952
572	rxvt_img *	953	rxvt_img *
573	rxvt_img::blend (rxvt_img *img, double factor)	954	rxvt_img::filter (const char name, int nparams, nv params)
574	{	955	{
575	rxvt_img *img2 = clone ();	956	composer cc (this);
576	Display *dpy = s->display->dpy;
577	Picture src = img->src_picture ();
578	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
579	Picture mask = create_xrender_mask (dpy, img->pm, False);
580		957
581	XRenderColor mask_c;	958	XFixed *xparams = rxvt_temp_buf<XFixed> (nparams);
582		959
583	mask_c.alpha = float_to_component (factor);	960	for (int i = 0; i < nparams; ++i)
584	mask_c.red =	961	xparams [i] = XDoubleToFixed (params [i]);
585	mask_c.green =
586	mask_c.blue = 0;
587	XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
588		962
		963	XRenderSetPictureFilter (cc.dpy, cc.src, name, xparams, nparams);
		964
589	XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, w, h);	965	XRenderComposite (cc.dpy, PictOpSrc, cc.src, 0, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
590		966
591	XRenderFreePicture (dpy, src);
592	XRenderFreePicture (dpy, dst);
593	XRenderFreePicture (dpy, mask);
594
595	return img2;	967	return cc;
596	}	968	}
597		969
598	#endif	970	#endif
599		971

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.55 by root, Thu Jun 7 20:26:21 2012 UTC vs. Revision 1.108 by sf-exg, Fri Nov 7 13:45:55 2014 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.55 by root, Thu Jun 7 20:26:21 2012 UTC vs.
Revision 1.108 by sf-exg, Fri Nov 7 13:45:55 2014 UTC