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

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.51 by root, Thu Jun 7 20:04:54 2012 UTC vs.
Revision 1.102 by root, Sat Jul 7 07:00:17 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;	312
		313	int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
75		314
76	XImage xi;	315	XImage xi;
77		316
78	xi.width = width;	317	xi.width = width;
79	xi.height = height;	318	xi.height = height;
80	xi.xoffset = 0;	319	xi.xoffset = 0;
81	xi.format = ZPixmap;	320	xi.format = ZPixmap;
82	xi.byte_order = LSBFirst; // maybe go for host byte order, because servers are usually local?	321	xi.byte_order = ImageByteOrder (dpy);
83	xi.bitmap_unit = 32; //XY only, unused	322	xi.bitmap_unit = 0; //XY only, unused
84	xi.bitmap_bit_order = LSBFirst; //XY only, unused	323	xi.bitmap_bit_order = 0; //XY only, unused
85	xi.bitmap_pad = BitmapPad (dpy);	324	xi.bitmap_pad = BitmapPad (dpy);
86	xi.depth = depth;	325	xi.depth = 32;
87	xi.bytes_per_line = 0;	326	xi.bytes_per_line = 0;
88	xi.bits_per_pixel = 32; //Z only	327	xi.bits_per_pixel = 32; //Z only
89	xi.red_mask = 0x000000ff; //Z only	328	xi.red_mask = 0x00000000; //Z only, unused
90	xi.green_mask = 0x0000ff00; //Z only	329	xi.green_mask = 0x00000000; //Z only, unused
91	xi.blue_mask = 0x00ff0000; //Z only	330	xi.blue_mask = 0x00000000; //Z only, unused
92	xi.obdata = 0; // probbaly unused	331	xi.obdata = 0; // probably unused
		332
		333	bool byte_order_mismatch = byte_order != xi.byte_order;
93		334
94	if (!XInitImage (&xi))	335	if (!XInitImage (&xi))
95	rxvt_fatal ("unable to initialise ximage, please report.\n");	336	rxvt_fatal ("unable to initialise ximage, please report.\n");
96		337
97	if (height > INT_MAX / xi.bytes_per_line)	338	if (height > INT_MAX / xi.bytes_per_line)
98	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");
99		340
100	xi.data = (char )rxvt_malloc (height xi.bytes_per_line);	341	xi.data = (char )rxvt_malloc (height xi.bytes_per_line);
101		342
102	int rowstride = gdk_pixbuf_get_rowstride (pb);	343	int rowstride = gdk_pixbuf_get_rowstride (pb);
103		344	bool pb_has_alpha = gdk_pixbuf_get_has_alpha (pb);
104	assert (3 + (depth == 32) == gdk_pixbuf_get_n_channels (pb));
105	unsigned char *row = gdk_pixbuf_get_pixels (pb);	345	unsigned char *row = gdk_pixbuf_get_pixels (pb);
		346
106	char *line = xi.data;	347	char *line = xi.data;
107		348
108	for (int y = 0; y < height; y++)	349	for (int y = 0; y < height; y++)
109	{	350	{
110	unsigned char *src = row;	351	unsigned char *src = row;
111	uint32_t dst = (uint32_t )line;	352	uint32_t dst = (uint32_t )line;
112		353
113	if (depth == 24)	354	if (!pb_has_alpha)
114	for (int x = 0; x < width; x++)	355	for (int x = 0; x < width; x++)
115	{	356	{
116	uint8_t r = *src++;	357	uint8_t r = *src++;
117	uint8_t g = *src++;	358	uint8_t g = *src++;
118	uint8_t b = *src++;	359	uint8_t b = *src++;
119		360
120	uint32_t v = r \| (g << 8) \| (b << 16);	361	uint32_t v = (255 << 24) \| (r << 16) \| (g << 8) \| b;
121		362
122	if (ecb_big_endian ())	363	if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
123	v = ecb_bswap32 (v);	364	v = ecb_bswap32 (v);
124		365
125	*dst++ = v;	366	*dst++ = v;
126	}	367	}
127	else	368	else
…		…
130	uint32_t v = (uint32_t )src; src += 4;	371	uint32_t v = (uint32_t )src; src += 4;
131		372
132	if (ecb_big_endian ())	373	if (ecb_big_endian ())
133	v = ecb_bswap32 (v);	374	v = ecb_bswap32 (v);
134		375
		376	v = ecb_rotl32 (v, 8); // abgr to bgra
		377
		378	if (!byte_order_mismatch)
		379	v = ecb_bswap32 (v);
		380
135	*dst++ = v;	381	*dst++ = v;
136	}	382	}
137		383
138	row += rowstride;	384	row += rowstride;
139	line += xi.bytes_per_line;	385	line += xi.bytes_per_line;
140	}	386	}
141		387
142	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);
143	img->alloc ();	389	img->alloc ();
144		390
145	GC gc = XCreateGC (dpy, img->pm, 0, 0);	391	GC gc = XCreateGC (dpy, img->pm, 0, 0);
146	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);
147	XFreeGC (dpy, gc);	393	XFreeGC (dpy, gc);
…		…
165	g_object_unref (pb);	411	g_object_unref (pb);
166		412
167	return img;	413	return img;
168	}	414	}
169		415
		416	# endif
		417
170	void	418	void
171	rxvt_img::destroy ()	419	rxvt_img::destroy ()
172	{	420	{
173	if (--ref->cnt)	421	if (--ref->cnt)
174	return;	422	return;
175		423
176	if (pm && ref->ours)	424	if (pm && ref->ours)
177	XFreePixmap (s->display->dpy, pm);	425	XFreePixmap (s->dpy, pm);
178		426
179	delete ref;	427	delete ref;
180	}	428	}
181		429
182	rxvt_img::~rxvt_img ()	430	rxvt_img::~rxvt_img ()
…		…
185	}	433	}
186		434
187	void	435	void
188	rxvt_img::alloc ()	436	rxvt_img::alloc ()
189	{	437	{
190	pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);	438	pm = XCreatePixmap (s->dpy, s->display->root, w, h, format->depth);
191	ref = new pixref (w, h);	439	ref = new pixref (w, h);
192	}	440	}
193		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
194	Picture	451	Picture
195	rxvt_img::src_picture ()	452	rxvt_img::picture ()
196	{	453	{
197	Display *dpy = s->display->dpy;	454	Display *dpy = s->dpy;
198		455
199	XRenderPictureAttributes pa;	456	XRenderPictureAttributes pa;
200	pa.repeat = repeat;	457	pa.repeat = repeat;
201	Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);	458	Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
202		459
…		…
207	rxvt_img::unshare ()	464	rxvt_img::unshare ()
208	{	465	{
209	if (ref->cnt == 1 && ref->ours)	466	if (ref->cnt == 1 && ref->ours)
210	return;	467	return;
211		468
212	//TODO: maybe should reify instead
213	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);
214	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);	470	GC gc = XCreateGC (s->dpy, pm, 0, 0);
215	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);
216	XFreeGC (s->display->dpy, gc);	472	XFreeGC (s->dpy, gc);
217		473
218	destroy ();	474	destroy ();
219		475
220	pm = pm2;	476	pm = pm2;
221	ref = new pixref (ref->w, ref->h);	477	ref = new pixref (ref->w, ref->h);
222	}	478	}
223		479
224	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
225	rxvt_img::fill (const rxvt_color &c)	492	rxvt_img::fill (const rgba &c)
226	{	493	{
227	XGCValues gcv;	494	fill (c, 0, 0, w, h);
228	gcv.foreground = c;	495	}
229	GC gc = XCreateGC (s->display->dpy, pm, GCForeground, &gcv);	496
230	XFillRectangle (s->display->dpy, pm, gc, 0, 0, w, h);	497	void
231	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;
232	}	513	}
233		514
234	static void	515	static void
235	get_gaussian_kernel (int radius, int width, double kernel, XFixed params)	516	get_gaussian_kernel (int radius, int width, nv kernel, XFixed params)
236	{	517	{
237	double sigma = radius / 2.0;	518	nv sigma = radius / 2.0;
238	double scale = sqrt (2.0 * M_PI) * sigma;	519	nv scale = sqrt (2.0 * M_PI) * sigma;
239	double sum = 0.0;	520	nv sum = 0.0;
240		521
241	for (int i = 0; i < width; i++)	522	for (int i = 0; i < width; i++)
242	{	523	{
243	double x = i - width / 2;	524	nv x = i - width / 2;
244	kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;	525	kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
245	sum += kernel[i];	526	sum += kernel[i];
246	}	527	}
247		528
248	params[0] = XDoubleToFixed (width);	529	params[0] = XDoubleToFixed (width);
…		…
256	rxvt_img::blur (int rh, int rv)	537	rxvt_img::blur (int rh, int rv)
257	{	538	{
258	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))	539	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))
259	return clone ();	540	return clone ();
260		541
261	Display *dpy = s->display->dpy;	542	Display *dpy = s->dpy;
262	int size = max (rh, rv) * 2 + 1;	543	int size = max (rh, rv) * 2 + 1;
263	double kernel = (double )malloc (size * sizeof (double));	544	nv kernel = (nv )malloc (size * sizeof (nv));
264	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));	545	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
265	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);	546	rxvt_img *img = new_empty ();
266	img->alloc ();
267
268	Picture src = src_picture ();
269		547
270	XRenderPictureAttributes pa;	548	XRenderPictureAttributes pa;
271	pa.repeat = RepeatPad;	549	pa.repeat = RepeatPad;
272	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);
273		552
274	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);	553	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
275	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);	554	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
276	XFreePixmap (dpy, tmp_pm);	555	XFreePixmap (dpy, tmp_pm);
277		556
…		…
293		572
294	size = rv * 2 + 1;	573	size = rv * 2 + 1;
295	get_gaussian_kernel (rv, size, kernel, params);	574	get_gaussian_kernel (rv, size, kernel, params);
296	::swap (params[0], params[1]);	575	::swap (params[0], params[1]);
297		576
298	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);	577	XRenderSetPictureFilter (dpy, tmp, FilterConvolution, params, size+2);
299	XRenderComposite (dpy,	578	XRenderComposite (dpy,
300	PictOpSrc,	579	PictOpSrc,
301	tmp,	580	tmp,
302	None,	581	None,
303	dst,	582	dst,
…		…
307	w, h);	586	w, h);
308	}	587	}
309		588
310	free (kernel);	589	free (kernel);
311	free (params);	590	free (params);
		591
312	XRenderFreePicture (dpy, src);	592	XRenderFreePicture (dpy, src);
313	XRenderFreePicture (dpy, dst);	593	XRenderFreePicture (dpy, dst);
314	XRenderFreePicture (dpy, tmp);	594	XRenderFreePicture (dpy, tmp);
315		595
316	return img;	596	return img;
317	}	597	}
318		598
319	static Picture	599	rxvt_img *
320	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb)	600	rxvt_img::muladd (nv mul, nv add)
321	{	601	{
322	Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);	602	// STEP 1: double the image width, fill all odd columns with white (==1)
323		603
324	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);	604	composer cc (this, new rxvt_img (s, format, 0, 0, w * 2, h, repeat));
325	XRenderPictureAttributes pa;
326	pa.repeat = True;
327	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);
328		605
329	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	};
330		613
331	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;
332	}	674	}
333		675
334	void	676	void
335	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)
336	{	678	{
		679	unshare ();
		680
337	Display *dpy = s->display->dpy;	681	Display *dpy = s->dpy;
338	Picture src = create_xrender_mask (dpy, pm, True);
339	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	682	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
340		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;
341	XRenderColor mask_c;	688	XRenderColor mask_c;
342	mask_c.red = r;	689
343	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))
344	mask_c.blue = b;
345	mask_c.alpha = a;
346	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);	691	XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
347		692
348	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	}
349		705
350	XRenderFreePicture (dpy, src);
351	XRenderFreePicture (dpy, dst);	706	XRenderFreePicture (dpy, dst);
352	}	707	}
353		708
354	void	709	void
355	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)
356	{	711	{
357	if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))	712	if (r < 0 \|\| g < 0 \|\| b < 0 \|\| a < 0)
358	return;	713	rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");
359		714
360	Display *dpy = s->display->dpy;	715	// premultiply (yeah, these are not exact, sue me or fix it)
361	Picture src = create_xrender_mask (dpy, pm, True);	716	r = (r * (a >> 8)) >> 8;
362	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	717	g = (g * (a >> 8)) >> 8;
		718	b = (b * (a >> 8)) >> 8;
363		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;
364	XRenderColor mask_c;	730	XRenderColor mask_c;
365	mask_c.red = r;	731
366	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))
367	mask_c.blue = b;	733	{
368	mask_c.alpha = a;
369	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);	734	XRenderFillRectangle (cc.dpy, PictOpSrc, cc.msk, &mask_c, 0, 0, 1, 1);
370
371	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	}
372		738
373	XRenderFreePicture (dpy, src);	739	::swap (img->ref, ref);
374	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);
375	}	756	}
376		757
377	rxvt_img *	758	rxvt_img *
378	rxvt_img::clone ()	759	rxvt_img::clone ()
379	{	760	{
380	return new rxvt_img (*this);	761	return new rxvt_img (*this);
381	}
382
383	static XRenderPictFormat *
384	find_alpha_format_for (Display dpy, XRenderPictFormat format)
385	{
386	if (format->direct.alphaMask)
387	return format; // already has alpha
388
389	// try to find a suitable alpha format, one bit alpha is enough for our purposes
390	if (format->type == PictTypeDirect)
391	for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
392	if (f->direct.alphaMask
393	&& f->type == PictTypeDirect
394	&& ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
395	&& ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
396	&& ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
397	return f;
398
399	// should be a very good fallback
400	return XRenderFindStandardFormat (dpy, PictStandardARGB32);
401	}	762	}
402		763
403	rxvt_img *	764	rxvt_img *
404	rxvt_img::reify ()	765	rxvt_img::reify ()
405	{	766	{
406	if (x == 0 && y == 0 && w == ref->w && h == ref->h)	767	if (x == 0 && y == 0 && w == ref->w && h == ref->h)
407	return clone ();	768	return clone ();
408		769
409	Display *dpy = s->display->dpy;	770	// add an alpha channel if...
410
411	bool alpha = !format->direct.alphaMask	771	bool alpha = !format->direct.alphaMask // pixmap has none yet
412	&& (x \|\| y)	772	&& (x \|\| y) // we need one because of non-zero offset
413	&& repeat == RepeatNone;	773	&& repeat == RepeatNone; // and we have no good pixels to fill with
414		774
415	rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);	775	composer cc (this, new rxvt_img (s, alpha ? find_alpha_format_for (s->dpy, format) : format,
416	img->alloc ();	776	0, 0, w, h, repeat));
417		777
418	Picture src = src_picture ();	778	if (repeat == RepeatNone)
419	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
420
421	if (alpha)
422	{	779	{
423	XRenderColor rc = { 0, 0, 0, 0 };	780	XRenderColor rc = { 0, 0, 0, 0 };
424	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles	781	XRenderFillRectangle (cc.dpy, PictOpSrc, cc.dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
425	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h);	782	XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, 0, 0, 0, 0, x, y, ref->w, ref->h);
426	}	783	}
427	else	784	else
428	XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);	785	XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, -x, -y, 0, 0, 0, 0, w, h);
429		786
430	XRenderFreePicture (dpy, src);
431	XRenderFreePicture (dpy, dst);
432
433	return img;	787	return cc;
434	}	788	}
435		789
436	rxvt_img *	790	rxvt_img *
437	rxvt_img::sub_rect (int x, int y, int width, int height)	791	rxvt_img::sub_rect (int x, int y, int width, int height)
438	{	792	{
439	rxvt_img *img = clone ();	793	rxvt_img *img = clone ();
440		794
441	img->x += x;	795	img->x -= x;
442	img->y += y;	796	img->y -= y;
443		797
444	if (w != width \|\| h != height)	798	if (w != width \|\| h != height)
445	{	799	{
446	img->w = width;	800	img->w = width;
447	img->h = height;	801	img->h = height;
…		…
453		807
454	return img;	808	return img;
455	}	809	}
456		810
457	rxvt_img *	811	rxvt_img *
458	rxvt_img::transform (int new_width, int new_height, double matrix[9])	812	rxvt_img::transform (const nv matrix[3][3])
459	{	813	{
460	rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat);	814	return transform (mat3x3 (&matrix[0][0]));
461	img->alloc ();	815	}
462		816
463	Display *dpy = s->display->dpy;	817	rxvt_img *
464	Picture src = src_picture ();	818	rxvt_img::transform (const nv *matrix)
465	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	819	{
		820	mat3x3 m (matrix);
		821
		822	// calculate new pixel bounding box coordinates
		823	nv rmin[2], rmax[2];
		824
		825	for (int i = 0; i < 2; ++i)
		826	{
		827	nv v;
		828
		829	v = m.apply1 (i, 0+x, 0+y); rmin [i] = rmax [i] = v;
		830	v = m.apply1 (i, w+x, 0+y); min_it (rmin [i], v); max_it (rmax [i], v);
		831	v = m.apply1 (i, 0+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v);
		832	v = m.apply1 (i, w+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v);
		833	}
		834
		835	float sx = rmin [0] - x;
		836	float sy = rmin [1] - y;
		837
		838	// TODO: adjust matrix for subpixel accuracy
		839	int nx = floor (rmin [0]);
		840	int ny = floor (rmin [1]);
		841
		842	int new_width = ceil (rmax [0] - rmin [0]);
		843	int new_height = ceil (rmax [1] - rmin [1]);
		844
		845	mat3x3 inv = (mat3x3::translate (-x, -y) * m * mat3x3::translate (x, y)).inverse ();
		846
		847	composer cc (this, new rxvt_img (s, format, nx, ny, new_width, new_height, repeat));
466		848
467	XTransform xfrm;	849	XTransform xfrm;
468		850
469	for (int i = 0; i < 3; ++i)	851	for (int i = 0; i < 3; ++i)
470	for (int j = 0; j < 3; ++j)	852	for (int j = 0; j < 3; ++j)
471	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);	853	xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);
472		854
473	#if 0
474	xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
475	xfrm.matrix [1][2] -= XDoubleToFixed (y);
476	#endif
477
478	XRenderSetPictureFilter (dpy, src, "good", 0, 0);	855	XRenderSetPictureFilter (cc.dpy, cc.src, "good", 0, 0);
479	XRenderSetPictureTransform (dpy, src, &xfrm);	856	XRenderSetPictureTransform (cc.dpy, cc.src, &xfrm);
480	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);	857	XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, sx, sy, 0, 0, 0, 0, new_width, new_height);
481		858
482	XRenderFreePicture (dpy, src);
483	XRenderFreePicture (dpy, dst);
484
485	return img;	859	return cc;
486	}	860	}
487		861
488	rxvt_img *	862	rxvt_img *
489	rxvt_img::scale (int new_width, int new_height)	863	rxvt_img::scale (int new_width, int new_height)
490	{	864	{
491	if (w == new_width && h == new_height)	865	if (w == new_width && h == new_height)
492	return clone ();	866	return clone ();
493		867
494	double matrix[9] = {
495	w / (double)new_width, 0, 0,
496	0, h / (double)new_height, 0,
497	0, 0, 1
498	};
499
500	int old_repeat_mode = repeat;	868	int old_repeat_mode = repeat;
501	repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems	869	repeat = RepeatPad; // not right, but xrender can't properly scale it seems
502		870
503	rxvt_img *img = transform (new_width, new_height, matrix);	871	rxvt_img *img = transform (mat3x3::scale (new_width / (nv)w, new_height / (nv)h));
504		872
505	repeat = old_repeat_mode;	873	repeat = old_repeat_mode;
506	img->repeat = repeat;	874	img->repeat = repeat;
507		875
508	return img;	876	return img;
509	}	877	}
510		878
511	rxvt_img *	879	rxvt_img *
512	rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)	880	rxvt_img::rotate (int cx, int cy, nv phi)
513	{	881	{
514	double s = sin (phi);	882	move (-cx, -cy);
515	double c = cos (phi);	883	rxvt_img *img = transform (mat3x3::rotate (phi));
		884	move ( cx, cy);
		885	img->move (cx, cy);
516		886
517	double matrix[9] = {	887	return img;
518	c, -s, -c * x + s * y + x,
519	s, c, -s * x - c * y + y,
520	0, 0, 1
521	};
522
523	return transform (new_width, new_height, matrix);
524	}	888	}
525		889
526	rxvt_img *	890	rxvt_img *
527	rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg)	891	rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg)
528	{	892	{
529	if (new_format == format)	893	if (new_format == format)
530	return clone ();	894	return clone ();
531		895
532	rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);	896	composer cc (this, new rxvt_img (s, new_format, x, y, w, h, repeat));
533	img->alloc ();
534		897
535	Display *dpy = s->display->dpy;
536	Picture src = src_picture ();
537	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
538	int op = PictOpSrc;	898	int op = PictOpSrc;
539		899
540	if (format->direct.alphaMask && !new_format->direct.alphaMask)	900	if (format->direct.alphaMask && !new_format->direct.alphaMask)
541	{	901	{
542	// does it have to be that complicated	902	// does it have to be that complicated
543	rgba c;
544	bg.get (c);
545
546	XRenderColor rc = { c.r, c.g, c.b, 0xffff };	903	XRenderColor rc = { bg.r, bg.g, bg.b, bg.a };
547	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);	904	XRenderFillRectangle (cc.dpy, PictOpSrc, cc.dst, &rc, 0, 0, w, h);
548		905
549	op = PictOpOver;	906	op = PictOpOver;
550	}	907	}
551		908
552	XRenderComposite (dpy, op, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	909	XRenderComposite (cc.dpy, op, cc.src, None, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
553		910
554	XRenderFreePicture (dpy, src);
555	XRenderFreePicture (dpy, dst);
556
557	return img;	911	return cc;
558	}	912	}
559		913
560	rxvt_img *	914	rxvt_img *
561	rxvt_img::blend (rxvt_img *img, double factor)	915	rxvt_img::tint (const rgba &c)
562	{	916	{
563	rxvt_img *img2 = clone ();	917	composer cc (this);
564	Display *dpy = s->display->dpy;	918	cc.mask (true);
565	Picture src = img->src_picture ();	919	cc.fill (c);
566	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
567	Picture mask = create_xrender_mask (dpy, img->pm, False);
568		920
569	XRenderColor mask_c;
570
571	mask_c.alpha = float_to_component (factor);
572	mask_c.red =
573	mask_c.green =
574	mask_c.blue = 0;
575	XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
576
577	XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, w, h);	921	XRenderComposite (cc.dpy, PictOpSrc, cc.src, cc.msk, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
578		922
579	XRenderFreePicture (dpy, src);
580	XRenderFreePicture (dpy, dst);
581	XRenderFreePicture (dpy, mask);
582
583	return img2;	923	return cc;
		924	}
		925
		926	rxvt_img *
		927	rxvt_img::filter (const char name, int nparams, nv params)
		928	{
		929	composer cc (this);
		930
		931	XFixed *xparams = rxvt_temp_buf<XFixed> (nparams);
		932
		933	for (int i = 0; i < nparams; ++i)
		934	xparams [i] = XDoubleToFixed (params [i]);
		935
		936	XRenderSetPictureFilter (cc.dpy, cc.src, name, xparams, nparams);
		937
		938	XRenderComposite (cc.dpy, PictOpSrc, cc.src, 0, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
		939
		940	return cc;
584	}	941	}
585		942
586	#endif	943	#endif
587		944

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.51 by root, Thu Jun 7 20:04:54 2012 UTC vs. Revision 1.102 by root, Sat Jul 7 07:00:17 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.51 by root, Thu Jun 7 20:04:54 2012 UTC vs.
Revision 1.102 by root, Sat Jul 7 07:00:17 2012 UTC