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

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

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.48 by root, Thu Jun 7 19:24:02 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.48 by root, Thu Jun 7 19:24:02 2012 UTC vs.
Revision 1.104 by root, Sat Jul 14 08:27:55 2012 UTC