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

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

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.56 by root, Thu Jun 7 20:31:26 2012 UTC vs. Revision 1.101 by root, Mon Jul 2 03:57:53 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.56 by root, Thu Jun 7 20:31:26 2012 UTC vs.
Revision 1.101 by root, Mon Jul 2 03:57:53 2012 UTC