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

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.33 by root, Thu Jun 7 08:12:55 2012 UTC vs.
Revision 1.104 by root, Sat Jul 14 08:27:55 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)	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(RepeatNormal),	251	: s(screen), x(x), y(y), w(width), h(height), format(format), repeat(repeat),
9	pm(0), refcnt(0)	252	pm(0), ref(0)
10	{	253	{
11	}	254	}
12		255
13	rxvt_img::rxvt_img (const rxvt_img &img)	256	rxvt_img::rxvt_img (const rxvt_img &img)
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), refcnt(img.refcnt)	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	if (refcnt)
17	++*refcnt;	259	++ref->cnt;
18	}	260	}
19
20	#if 0
21	rxvt_img::rxvt_img (rxvt_screen screen, XRenderPictFormat format, int width, int height, Pixmap pixmap)
22	: s(screen), x(0), y(0), w(width), h(height), format(format), repeat(RepeatNormal), shared(false), pm(pixmap)
23	{
24	}
25	#endif
26		261
27	rxvt_img *	262	rxvt_img *
28	rxvt_img::new_from_root (rxvt_screen *s)	263	rxvt_img::new_from_root (rxvt_screen *s)
29	{	264	{
30	Display *dpy = s->display->dpy;	265	Display *dpy = s->dpy;
31	unsigned int root_pm_w, root_pm_h;	266	unsigned int root_pm_w, root_pm_h;
32	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]);
33	if (root_pixmap == None)	268	if (root_pixmap == None)
34	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]);
35		270
36	if (root_pixmap == None)	271	if (root_pixmap == None)
37	return 0;	272	return 0;
38		273
39	Window wdummy;	274	Window wdummy;
51	root_pm_w,	286	root_pm_w,
52	root_pm_h	287	root_pm_h
53	);	288	);
54		289
55	img->pm = root_pixmap;	290	img->pm = root_pixmap;
		291	img->ref = new pixref (root_pm_w, root_pm_h);
		292	img->ref->ours = false;
		293
		294	return img;
		295	}
		296
		297	# if HAVE_PIXBUF
		298
		299	rxvt_img *
		300	rxvt_img::new_from_pixbuf (rxvt_screen s, GdkPixbuf pb)
		301	{
		302	Display *dpy = s->dpy;
		303
		304	int width = gdk_pixbuf_get_width (pb);
		305	int height = gdk_pixbuf_get_height (pb);
		306
		307	if (width > 32767 \|\| height > 32767) // well, we could upload in chunks
		308	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big (maximum size 32768x32768).\n");
		309
		310	// since we require rgb24/argb32 formats from xrender we assume
		311	// that both 24 and 32 bpp MUST be supported by any screen that supports xrender
		312
		313	int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
		314
		315	XImage xi;
		316
		317	xi.width = width;
		318	xi.height = height;
		319	xi.xoffset = 0;
		320	xi.format = ZPixmap;
		321	xi.byte_order = ImageByteOrder (dpy);
		322	xi.bitmap_unit = 0; //XY only, unused
		323	xi.bitmap_bit_order = 0; //XY only, unused
		324	xi.bitmap_pad = BitmapPad (dpy);
		325	xi.depth = 32;
		326	xi.bytes_per_line = 0;
		327	xi.bits_per_pixel = 32; //Z only
		328	xi.red_mask = 0x00000000; //Z only, unused
		329	xi.green_mask = 0x00000000; //Z only, unused
		330	xi.blue_mask = 0x00000000; //Z only, unused
		331	xi.obdata = 0; // probably unused
		332
		333	bool byte_order_mismatch = byte_order != xi.byte_order;
		334
		335	if (!XInitImage (&xi))
		336	rxvt_fatal ("unable to initialise ximage, please report.\n");
		337
		338	if (height > INT_MAX / xi.bytes_per_line)
		339	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n");
		340
		341	xi.data = (char )rxvt_malloc (height xi.bytes_per_line);
		342
		343	int rowstride = gdk_pixbuf_get_rowstride (pb);
		344	bool pb_has_alpha = gdk_pixbuf_get_has_alpha (pb);
		345	unsigned char *row = gdk_pixbuf_get_pixels (pb);
		346
		347	char *line = xi.data;
		348
		349	for (int y = 0; y < height; y++)
		350	{
		351	unsigned char *src = row;
		352	uint32_t dst = (uint32_t )line;
		353
		354	for (int x = 0; x < width; x++)
		355	{
		356	uint8_t r = *src++;
		357	uint8_t g = *src++;
		358	uint8_t b = *src++;
		359	uint8_t a = *src;
		360
		361	// this is done so it can be jump-free, but newer gcc's clone inner the loop
		362	a = pb_has_alpha ? a : 255;
		363	src += pb_has_alpha;
		364
		365	r = (r * a + 127) / 255;
		366	g = (g * a + 127) / 255;
		367	b = (b * a + 127) / 255;
		368
		369	uint32_t v = (a << 24) \| (r << 16) \| (g << 8) \| b;
		370
		371	if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
		372	v = ecb_bswap32 (v);
		373
		374	*dst++ = v;
		375	}
		376
		377	row += rowstride;
		378	line += xi.bytes_per_line;
		379	}
		380
		381	rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, PictStandardARGB32), 0, 0, width, height);
		382	img->alloc ();
		383
		384	GC gc = XCreateGC (dpy, img->pm, 0, 0);
		385	XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height);
		386	XFreeGC (dpy, gc);
		387
		388	free (xi.data);
56		389
57	return img;	390	return img;
58	}	391	}
59		392
60	rxvt_img *	393	rxvt_img *
…		…
64	GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);	397	GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);
65		398
66	if (!pb)	399	if (!pb)
67	rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);	400	rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);
68		401
69	rxvt_img *img = new rxvt_img (	402	rxvt_img *img = new_from_pixbuf (s, pb);
70	s,
71	XRenderFindStandardFormat (s->display->dpy, gdk_pixbuf_get_has_alpha (pb) ? PictStandardARGB32 : PictStandardRGB24),
72	0,
73	0,
74	gdk_pixbuf_get_width (pb),
75	gdk_pixbuf_get_height (pb)
76	);
77	img->alloc ();
78	img->render_pixbuf (pb, 0, 0, img->w, img->h, 0, 0);
79		403
80	g_object_unref (pb);	404	g_object_unref (pb);
81		405
82	return img;	406	return img;
83	}	407	}
		408
		409	# endif
84		410
85	void	411	void
86	rxvt_img::destroy ()	412	rxvt_img::destroy ()
87	{	413	{
88	if (!refcnt \|\| --*refcnt)	414	if (--ref->cnt)
89	return;	415	return;
90		416
91	if (pm)	417	if (pm && ref->ours)
92	XFreePixmap (s->display->dpy, pm);	418	XFreePixmap (s->dpy, pm);
93		419
94	delete refcnt;	420	delete ref;
95	}	421	}
96		422
97	rxvt_img::~rxvt_img ()	423	rxvt_img::~rxvt_img ()
98	{	424	{
99	destroy ();	425	destroy ();
100	}	426	}
101		427
102	void	428	void
103	rxvt_img::alloc ()	429	rxvt_img::alloc ()
104	{	430	{
105	pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);	431	pm = XCreatePixmap (s->dpy, s->display->root, w, h, format->depth);
106	refcnt = new int (1);	432	ref = new pixref (w, h);
		433	}
		434
		435	rxvt_img *
		436	rxvt_img::new_empty ()
		437	{
		438	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
		439	img->alloc ();
		440
		441	return img;
		442	}
		443
		444	Picture
		445	rxvt_img::picture ()
		446	{
		447	Display *dpy = s->dpy;
		448
		449	XRenderPictureAttributes pa;
		450	pa.repeat = repeat;
		451	Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
		452
		453	return pic;
107	}	454	}
108		455
109	void	456	void
110	rxvt_img::unshare ()	457	rxvt_img::unshare ()
111	{	458	{
112	if (refcnt && *refcnt == 1)	459	if (ref->cnt == 1 && ref->ours)
113	return;	460	return;
114		461
115	Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);	462	Pixmap pm2 = XCreatePixmap (s->dpy, s->display->root, ref->w, ref->h, format->depth);
116	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);	463	GC gc = XCreateGC (s->dpy, pm, 0, 0);
117	XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, w, h, 0, 0);	464	XCopyArea (s->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
118	XFreeGC (s->display->dpy, gc);	465	XFreeGC (s->dpy, gc);
119		466
120	destroy ();	467	destroy ();
121		468
122	pm = pm2;	469	pm = pm2;
123	refcnt = new int (1);	470	ref = new pixref (ref->w, ref->h);
124	}	471	}
125		472
126	void	473	void
		474	rxvt_img::fill (const rgba &c, int x, int y, int w, int h)
		475	{
		476	XRenderColor rc = { c.r, c.g, c.b, c.a };
		477
		478	Display *dpy = s->dpy;
		479	Picture src = picture ();
		480	XRenderFillRectangle (dpy, PictOpSrc, src, &rc, x, y, w, h);
		481	XRenderFreePicture (dpy, src);
		482	}
		483
		484	void
127	rxvt_img::fill (const rxvt_color &c)	485	rxvt_img::fill (const rgba &c)
128	{	486	{
129	XGCValues gcv;	487	fill (c, 0, 0, w, h);
130	gcv.foreground = c;	488	}
131	GC gc = XCreateGC (s->display->dpy, pm, GCForeground, &gcv);	489
132	XFillRectangle (s->display->dpy, pm, gc, 0, 0, w, h);	490	void
133	XFreeGC (s->display->dpy, gc);	491	rxvt_img::add_alpha ()
		492	{
		493	if (format->direct.alphaMask)
		494	return;
		495
		496	composer cc (this, new rxvt_img (s, find_alpha_format_for (s->dpy, format), x, y, w, h, repeat));
		497
		498	XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
		499
		500	rxvt_img *img = cc;
		501
		502	::swap (img->ref, ref);
		503	::swap (img->pm , pm );
		504
		505	delete img;
134	}	506	}
135		507
136	static void	508	static void
137	get_gaussian_kernel (int radius, int width, double kernel, XFixed params)	509	get_gaussian_kernel (int radius, int width, nv kernel, XFixed params)
138	{	510	{
139	double sigma = radius / 2.0;	511	nv sigma = radius / 2.0;
140	double scale = sqrt (2.0 * M_PI) * sigma;	512	nv scale = sqrt (2.0 * M_PI) * sigma;
141	double sum = 0.0;	513	nv sum = 0.0;
142		514
143	for (int i = 0; i < width; i++)	515	for (int i = 0; i < width; i++)
144	{	516	{
145	double x = i - width / 2;	517	nv x = i - width / 2;
146	kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;	518	kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
147	sum += kernel[i];	519	sum += kernel[i];
148	}	520	}
149		521
150	params[0] = XDoubleToFixed (width);	522	params[0] = XDoubleToFixed (width);
…		…
158	rxvt_img::blur (int rh, int rv)	530	rxvt_img::blur (int rh, int rv)
159	{	531	{
160	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))	532	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))
161	return clone ();	533	return clone ();
162		534
163	Display *dpy = s->display->dpy;	535	Display *dpy = s->dpy;
164	int size = max (rh, rv) * 2 + 1;	536	int size = max (rh, rv) * 2 + 1;
165	double kernel = (double )malloc (size * sizeof (double));	537	nv kernel = (nv )malloc (size * sizeof (nv));
166	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));	538	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
167	rxvt_img *img = new rxvt_img (s, format, x, y, w, h);	539	rxvt_img *img = new_empty ();
168	img->alloc ();
169		540
170	XRenderPictureAttributes pa;	541	XRenderPictureAttributes pa;
171
172	pa.repeat = RepeatPad;	542	pa.repeat = RepeatPad;
173	Picture src = XRenderCreatePicture (dpy, pm , format, CPRepeat, &pa);	543	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
174	Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa);	544	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
175		545
176	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);	546	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
177	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);	547	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
178	XFreePixmap (dpy, tmp_pm);	548	XFreePixmap (dpy, tmp_pm);
179		549
…		…
195		565
196	size = rv * 2 + 1;	566	size = rv * 2 + 1;
197	get_gaussian_kernel (rv, size, kernel, params);	567	get_gaussian_kernel (rv, size, kernel, params);
198	::swap (params[0], params[1]);	568	::swap (params[0], params[1]);
199		569
200	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);	570	XRenderSetPictureFilter (dpy, tmp, FilterConvolution, params, size+2);
201	XRenderComposite (dpy,	571	XRenderComposite (dpy,
202	PictOpSrc,	572	PictOpSrc,
203	tmp,	573	tmp,
204	None,	574	None,
205	dst,	575	dst,
…		…
209	w, h);	579	w, h);
210	}	580	}
211		581
212	free (kernel);	582	free (kernel);
213	free (params);	583	free (params);
		584
214	XRenderFreePicture (dpy, src);	585	XRenderFreePicture (dpy, src);
215	XRenderFreePicture (dpy, dst);	586	XRenderFreePicture (dpy, dst);
216	XRenderFreePicture (dpy, tmp);	587	XRenderFreePicture (dpy, tmp);
217		588
218	return img;	589	return img;
219	}	590	}
220		591
221	static Picture	592	rxvt_img *
222	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb)	593	rxvt_img::muladd (nv mul, nv add)
223	{	594	{
224	Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);	595	// STEP 1: double the image width, fill all odd columns with white (==1)
225		596
226	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);	597	composer cc (this, new rxvt_img (s, format, 0, 0, w * 2, h, repeat));
227	XRenderPictureAttributes pa;
228	pa.repeat = True;
229	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);
230		598
231	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	};
232		606
233	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;
234	}	667	}
235		668
236	void	669	void
237	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)
238	{	671	{
		672	unshare ();
		673
239	Display *dpy = s->display->dpy;	674	Display *dpy = s->dpy;
240	Picture src = create_xrender_mask (dpy, pm, True);
241	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	675	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
242		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;
243	XRenderColor mask_c;	681	XRenderColor mask_c;
244	mask_c.red = r;	682
245	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))
246	mask_c.blue = b;
247	mask_c.alpha = a;
248	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);	684	XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
249		685
250	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	}
251		698
252	XRenderFreePicture (dpy, src);
253	XRenderFreePicture (dpy, dst);	699	XRenderFreePicture (dpy, dst);
254	}	700	}
255		701
256	void	702	void
257	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)
258	{	704	{
259	if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))	705	if (r < 0 \|\| g < 0 \|\| b < 0 \|\| a < 0)
260	return;	706	rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");
261		707
262	Display *dpy = s->display->dpy;	708	// premultiply (yeah, these are not exact, sue me or fix it)
263	Picture src = create_xrender_mask (dpy, pm, True);	709	r = (r * (a >> 8)) >> 8;
264	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	710	g = (g * (a >> 8)) >> 8;
		711	b = (b * (a >> 8)) >> 8;
265		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;
266	XRenderColor mask_c;	723	XRenderColor mask_c;
267	mask_c.red = r;
268	mask_c.green = g;
269	mask_c.blue = b;
270	mask_c.alpha = a;
271	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
272		724
273	XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	725	if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
274
275	XRenderFreePicture (dpy, src);
276	XRenderFreePicture (dpy, dst);
277	}
278
279	bool
280	rxvt_img::render_pixbuf (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y)
281	{
282	Display *dpy = s->display->dpy;
283
284	if (s->visual->c_class != TrueColor)
285	return false;
286
287	uint32_t red_mask, green_mask, blue_mask, alpha_mask;
288
289	red_mask = (uint32_t)format->direct.redMask << format->direct.red;
290	green_mask = (uint32_t)format->direct.greenMask << format->direct.green;
291	blue_mask = (uint32_t)format->direct.blueMask << format->direct.blue;
292	alpha_mask = (uint32_t)format->direct.alphaMask << format->direct.alpha;
293
294	int width_r = ecb_popcount32 (red_mask);
295	int width_g = ecb_popcount32 (green_mask);
296	int width_b = ecb_popcount32 (blue_mask);
297	int width_a = ecb_popcount32 (alpha_mask);
298
299	if (width_r > 8 \|\| width_g > 8 \|\| width_b > 8 \|\| width_a > 8)
300	return false;
301
302	int sh_r = ecb_ctz32 (red_mask);
303	int sh_g = ecb_ctz32 (green_mask);
304	int sh_b = ecb_ctz32 (blue_mask);
305	int sh_a = ecb_ctz32 (alpha_mask);
306
307	if (width > 32767 \|\| height > 32767)
308	return false;
309
310	XImage *ximage = XCreateImage (dpy, s->visual, format->depth, ZPixmap, 0, 0,
311	width, height, 32, 0);
312	if (!ximage)
313	return false;
314
315	if (height > INT_MAX / ximage->bytes_per_line
316	\|\| !(ximage->data = (char )malloc (height ximage->bytes_per_line)))
317	{
318	XDestroyImage (ximage);
319	return false;
320	}
321
322	GC gc = XCreateGC (dpy, pm, 0, 0);
323
324	ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
325
326	int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
327	int channels = gdk_pixbuf_get_n_channels (pixbuf);
328	unsigned char row = gdk_pixbuf_get_pixels (pixbuf) + src_y rowstride + src_x * channels;
329	char *line = ximage->data;
330
331	for (int y = 0; y < height; y++)
332	{
333	for (int x = 0; x < width; x++)
334	{	726	{
335	unsigned char pixel = row + x channels;	727	XRenderFillRectangle (cc.dpy, PictOpSrc, cc.msk, &mask_c, 0, 0, 1, 1);
336	uint32_t value;	728	XRenderComposite (cc.dpy, PictOpAdd, cc.src, cc.msk, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
337	unsigned char r, g, b, a;
338
339	if (channels == 4)
340	{
341	a = pixel[3];
342	r = pixel[0] * a / 0xff;
343	g = pixel[1] * a / 0xff;
344	b = pixel[2] * a / 0xff;
345	}
346	else
347	{
348	a = 0xff;
349	r = pixel[0];
350	g = pixel[1];
351	b = pixel[2];
352	}
353
354	value = ((r >> (8 - width_r)) << sh_r)
355	\| ((g >> (8 - width_g)) << sh_g)
356	\| ((b >> (8 - width_b)) << sh_b)
357	\| ((a >> (8 - width_a)) << sh_a);
358
359	if (ximage->bits_per_pixel == 32)
360	((uint32_t *)line)[x] = value;
361	else
362	XPutPixel (ximage, x, y, value);
363	}	729	}
364
365	row += rowstride;
366	line += ximage->bytes_per_line;
367	}	730	}
368		731
369	XPutImage (dpy, pm, gc, ximage, 0, 0, dst_x, dst_y, width, height);	732	::swap (img->ref, ref);
370	XDestroyImage (ximage);	733	::swap (img->pm , pm );
371	XFreeGC (dpy, gc);
372		734
373	return true;	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);
374	}	749	}
375		750
376	rxvt_img *	751	rxvt_img *
377	rxvt_img::clone ()	752	rxvt_img::clone ()
378	{	753	{
…		…
380	}	755	}
381		756
382	rxvt_img *	757	rxvt_img *
383	rxvt_img::reify ()	758	rxvt_img::reify ()
384	{	759	{
385	rxvt_img *img = new rxvt_img (s, format, 0, 0, w, h);	760	if (x == 0 && y == 0 && w == ref->w && h == ref->h)
386	img->alloc ();	761	return clone ();
387		762
388	// todo, if x==0 and y==0 and w==real width we could clone	763	// add an alpha channel if...
389	// but that involves an rtt to find pixmap width.	764	bool alpha = !format->direct.alphaMask // pixmap has none yet
		765	&& (x \|\| y) // we need one because of non-zero offset
		766	&& repeat == RepeatNone; // and we have no good pixels to fill with
390		767
391	Display *dpy = s->display->dpy;	768	composer cc (this, new rxvt_img (s, alpha ? find_alpha_format_for (s->dpy, format) : format,
392	XRenderPictureAttributes pa;	769	0, 0, w, h, repeat));
393	pa.repeat = repeat;	770
394	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);	771	if (repeat == RepeatNone)
395	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	772	{
396		773	XRenderColor rc = { 0, 0, 0, 0 };
		774	XRenderFillRectangle (cc.dpy, PictOpSrc, cc.dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
		775	XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, 0, 0, 0, 0, x, y, ref->w, ref->h);
		776	}
		777	else
397	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);
398		779
399	XRenderFreePicture (dpy, src);	780	return cc;
400	XRenderFreePicture (dpy, dst);	781	}
		782
		783	rxvt_img *
		784	rxvt_img::sub_rect (int x, int y, int width, int height)
		785	{
		786	rxvt_img *img = clone ();
		787
		788	img->x -= x;
		789	img->y -= y;
		790
		791	if (w != width \|\| h != height)
		792	{
		793	img->w = width;
		794	img->h = height;
		795
		796	rxvt_img *img2 = img->reify ();
		797	delete img;
		798	img = img2;
		799	}
401		800
402	return img;	801	return img;
403	}	802	}
404		803
405	rxvt_img *	804	rxvt_img *
406	rxvt_img::sub_rect (int x, int y, int width, int height)	805	rxvt_img::transform (const nv matrix[3][3])
407	{	806	{
408	rxvt_img *img = clone ();	807	return transform (mat3x3 (&matrix[0][0]));
409
410	img->x += x;
411	img->y += y;
412	img->w = width;
413	img->h = height;
414
415	return img;
416	}	808	}
417		809
418	rxvt_img *	810	rxvt_img *
419	rxvt_img::transform (int new_width, int new_height, double matrix[9])	811	rxvt_img::transform (const nv *matrix)
420	{	812	{
421	rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height);	813	mat3x3 m (matrix);
422	img->alloc ();
423		814
424	Display *dpy = s->display->dpy;	815	// calculate new pixel bounding box coordinates
425	XRenderPictureAttributes pa;	816	nv rmin[2], rmax[2];
426	pa.repeat = repeat;	817
427	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);	818	for (int i = 0; i < 2; ++i)
428	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	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));
429		841
430	XTransform xfrm;	842	XTransform xfrm;
431		843
432	for (int i = 0; i < 3; ++i)	844	for (int i = 0; i < 3; ++i)
433	for (int j = 0; j < 3; ++j)	845	for (int j = 0; j < 3; ++j)
434	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);	846	xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);
435		847
436	xfrm.matrix [0][2] += XDoubleToFixed (x);//TODO
437	xfrm.matrix [0][3] += XDoubleToFixed (y);
438
439	XRenderSetPictureFilter (dpy, src, "good", 0, 0);	848	XRenderSetPictureFilter (cc.dpy, cc.src, "good", 0, 0);
440	XRenderSetPictureTransform (dpy, src, &xfrm);	849	XRenderSetPictureTransform (cc.dpy, cc.src, &xfrm);
441	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);
442		851
443	XRenderFreePicture (dpy, src);	852	return cc;
444	XRenderFreePicture (dpy, dst);	853	}
		854
		855	rxvt_img *
		856	rxvt_img::scale (int new_width, int new_height)
		857	{
		858	if (w == new_width && h == new_height)
		859	return clone ();
		860
		861	int old_repeat_mode = repeat;
		862	repeat = RepeatPad; // not right, but xrender can't properly scale it seems
		863
		864	rxvt_img *img = transform (mat3x3::scale (new_width / (nv)w, new_height / (nv)h));
		865
		866	repeat = old_repeat_mode;
		867	img->repeat = repeat;
445		868
446	return img;	869	return img;
447	}	870	}
448		871
449	rxvt_img *	872	rxvt_img *
450	rxvt_img::scale (int new_width, int new_height)	873	rxvt_img::rotate (int cx, int cy, nv phi)
451	{	874	{
452	double matrix[9] = {	875	move (-cx, -cy);
453	w / (double)new_width, 0, 0,	876	rxvt_img *img = transform (mat3x3::rotate (phi));
454	0, h / (double)new_height, 0,	877	move ( cx, cy);
455	0, 0, 1	878	img->move (cx, cy);
456	};
457		879
458	return transform (new_width, new_height, matrix);	880	return img;
459	}	881	}
460		882
461	rxvt_img *	883	rxvt_img *
462	rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)
463	{
464	double s = sin (phi);
465	double c = cos (phi);
466
467	double matrix[9] = {
468	c, -s, -c * x + s * y + x,
469	s, c, -s * x - c * y + y,
470	0, 0, 1
471	};
472
473	return transform (new_width, new_height, matrix);
474	}
475
476	rxvt_img *
477	rxvt_img::convert_to (XRenderPictFormat *new_format, const rxvt_color &bg)	884	rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg)
478	{	885	{
479	if (new_format == format)	886	if (new_format == format)
480	return clone ();	887	return clone ();
481		888
482	rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h);	889	composer cc (this, new rxvt_img (s, new_format, x, y, w, h, repeat));
483	img->alloc ();
484		890
485	Display *dpy = s->display->dpy;
486	Picture src = XRenderCreatePicture (dpy, pm, format, 0, 0);
487	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
488	int op = PictOpSrc;	891	int op = PictOpSrc;
489		892
490	if (format->direct.alphaMask && !new_format->direct.alphaMask)	893	if (format->direct.alphaMask && !new_format->direct.alphaMask)
491	{	894	{
492	// does it have to be that complicated	895	// does it have to be that complicated
493	rgba c;
494	bg.get (c);
495
496	XRenderColor rc = { c.r, c.g, c.b, 0xffff };	896	XRenderColor rc = { bg.r, bg.g, bg.b, bg.a };
497	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);	897	XRenderFillRectangle (cc.dpy, PictOpSrc, cc.dst, &rc, 0, 0, w, h);
498		898
499	op = PictOpOver;	899	op = PictOpOver;
500	}	900	}
501		901
502	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);
503		903
504	XRenderFreePicture (dpy, src);
505	XRenderFreePicture (dpy, dst);
506
507	return img;	904	return cc;
508	}	905	}
509		906
510	rxvt_img *	907	rxvt_img *
511	rxvt_img::blend (rxvt_img *img, double factor)	908	rxvt_img::tint (const rgba &c)
512	{	909	{
513	rxvt_img *img2 = clone ();	910	composer cc (this);
514	Display *dpy = s->display->dpy;	911	cc.mask (true);
515	Picture src = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	912	cc.fill (c);
516	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
517	Picture mask = create_xrender_mask (dpy, img->pm, False);
518		913
519	XRenderColor mask_c;
520
521	mask_c.alpha = float_to_component (factor);
522	mask_c.red =
523	mask_c.green =
524	mask_c.blue = 0;
525	XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
526
527	XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, w, h);	914	XRenderComposite (cc.dpy, PictOpSrc, cc.src, cc.msk, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
528		915
529	XRenderFreePicture (dpy, src);
530	XRenderFreePicture (dpy, dst);
531	XRenderFreePicture (dpy, mask);
532
533	return img2;	916	return cc;
		917	}
		918
		919	rxvt_img *
		920	rxvt_img::filter (const char name, int nparams, nv params)
		921	{
		922	composer cc (this);
		923
		924	XFixed *xparams = rxvt_temp_buf<XFixed> (nparams);
		925
		926	for (int i = 0; i < nparams; ++i)
		927	xparams [i] = XDoubleToFixed (params [i]);
		928
		929	XRenderSetPictureFilter (cc.dpy, cc.src, name, xparams, nparams);
		930
		931	XRenderComposite (cc.dpy, PictOpSrc, cc.src, 0, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
		932
		933	return cc;
534	}	934	}
535		935
536	#endif	936	#endif
537		937

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.33 by root, Thu Jun 7 08:12:55 2012 UTC vs. Revision 1.104 by root, Sat Jul 14 08:27:55 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.33 by root, Thu Jun 7 08:12:55 2012 UTC vs.
Revision 1.104 by root, Sat Jul 14 08:27:55 2012 UTC