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

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.82 by root, Thu Jun 14 17:06:57 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	}
17	}	260	}
18		261
19	rxvt_img *	262	rxvt_img *
20	rxvt_img::new_from_root (rxvt_screen *s)	263	rxvt_img::new_from_root (rxvt_screen *s)
21	{	264	{
22	Display *dpy = s->display->dpy;	265	Display *dpy = s->dpy;
23	unsigned int root_pm_w, root_pm_h;	266	unsigned int root_pm_w, root_pm_h;
24	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]);
25	if (root_pixmap == None)	268	if (root_pixmap == None)
26	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]);
27		270
28	if (root_pixmap == None)	271	if (root_pixmap == None)
29	return 0;	272	return 0;
30		273
31	Window wdummy;	274	Window wdummy;
…		…
54	# if HAVE_PIXBUF	297	# if HAVE_PIXBUF
55		298
56	rxvt_img *	299	rxvt_img *
57	rxvt_img::new_from_pixbuf (rxvt_screen s, GdkPixbuf pb)	300	rxvt_img::new_from_pixbuf (rxvt_screen s, GdkPixbuf pb)
58	{	301	{
59	Display *dpy = s->display->dpy;	302	Display *dpy = s->dpy;
60		303
61	int width = gdk_pixbuf_get_width (pb);	304	int width = gdk_pixbuf_get_width (pb);
62	int height = gdk_pixbuf_get_height (pb);	305	int height = gdk_pixbuf_get_height (pb);
63		306
64	if (width > 32767 \|\| height > 32767) // well, we could upload in chunks	307	if (width > 32767 \|\| height > 32767) // well, we could upload in chunks
…		…
106	for (int y = 0; y < height; y++)	349	for (int y = 0; y < height; y++)
107	{	350	{
108	unsigned char *src = row;	351	unsigned char *src = row;
109	uint32_t dst = (uint32_t )line;	352	uint32_t dst = (uint32_t )line;
110		353
111	if (!pb_has_alpha)
112	for (int x = 0; x < width; x++)	354	for (int x = 0; x < width; x++)
113	{	355	{
114	uint8_t r = *src++;	356	uint8_t r = *src++;
115	uint8_t g = *src++;	357	uint8_t g = *src++;
116	uint8_t b = *src++;	358	uint8_t b = *src++;
		359	uint8_t a = *src;
117		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
118	uint32_t v = (255 << 24) \| (r << 16) \| (g << 8) \| b;	369	uint32_t v = (a << 24) \| (r << 16) \| (g << 8) \| b;
119		370
120	if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)	371	if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
121	v = ecb_bswap32 (v);	372	v = ecb_bswap32 (v);
122		373
123	*dst++ = v;	374	*dst++ = v;
124	}	375	}
125	else
126	for (int x = 0; x < width; x++)
127	{
128	uint32_t v = (uint32_t )src; src += 4;
129
130	if (ecb_big_endian ())
131	v = ecb_bswap32 (v);
132
133	v = ecb_rotl32 (v, 8); // abgr to bgra
134
135	if (!byte_order_mismatch)
136	v = ecb_bswap32 (v);
137
138	*dst++ = v;
139	}
140		376
141	row += rowstride;	377	row += rowstride;
142	line += xi.bytes_per_line;	378	line += xi.bytes_per_line;
143	}	379	}
144		380
…		…
177	{	413	{
178	if (--ref->cnt)	414	if (--ref->cnt)
179	return;	415	return;
180		416
181	if (pm && ref->ours)	417	if (pm && ref->ours)
182	XFreePixmap (s->display->dpy, pm);	418	XFreePixmap (s->dpy, pm);
183		419
184	delete ref;	420	delete ref;
185	}	421	}
186		422
187	rxvt_img::~rxvt_img ()	423	rxvt_img::~rxvt_img ()
…		…
190	}	426	}
191		427
192	void	428	void
193	rxvt_img::alloc ()	429	rxvt_img::alloc ()
194	{	430	{
195	pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);	431	pm = XCreatePixmap (s->dpy, s->display->root, w, h, format->depth);
196	ref = new pixref (w, h);	432	ref = new pixref (w, h);
197	}	433	}
198		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
199	Picture	444	Picture
200	rxvt_img::src_picture ()	445	rxvt_img::picture ()
201	{	446	{
202	Display *dpy = s->display->dpy;	447	Display *dpy = s->dpy;
203		448
204	XRenderPictureAttributes pa;	449	XRenderPictureAttributes pa;
205	pa.repeat = repeat;	450	pa.repeat = repeat;
206	Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);	451	Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
207		452
…		…
212	rxvt_img::unshare ()	457	rxvt_img::unshare ()
213	{	458	{
214	if (ref->cnt == 1 && ref->ours)	459	if (ref->cnt == 1 && ref->ours)
215	return;	460	return;
216		461
217	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);
218	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);	463	GC gc = XCreateGC (s->dpy, pm, 0, 0);
219	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);
220	XFreeGC (s->display->dpy, gc);	465	XFreeGC (s->dpy, gc);
221		466
222	destroy ();	467	destroy ();
223		468
224	pm = pm2;	469	pm = pm2;
225	ref = new pixref (ref->w, ref->h);	470	ref = new pixref (ref->w, ref->h);
226	}	471	}
227		472
228	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
229	rxvt_img::fill (const rgba &c)	485	rxvt_img::fill (const rgba &c)
230	{	486	{
231	XRenderColor rc = { c.r, c.g, c.b, c.a };	487	fill (c, 0, 0, w, h);
		488	}
232		489
233	Display *dpy = s->display->dpy;	490	void
234	Picture src = src_picture ();	491	rxvt_img::add_alpha ()
235	XRenderFillRectangle (dpy, PictOpSrc, src, &rc, 0, 0, w, h);	492	{
236	XRenderFreePicture (dpy, src);	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;
237	}	506	}
238		507
239	static void	508	static void
240	get_gaussian_kernel (int radius, int width, double kernel, XFixed params)	509	get_gaussian_kernel (int radius, int width, nv kernel, XFixed params)
241	{	510	{
242	double sigma = radius / 2.0;	511	nv sigma = radius / 2.0;
243	double scale = sqrt (2.0 * M_PI) * sigma;	512	nv scale = sqrt (2.0 * M_PI) * sigma;
244	double sum = 0.0;	513	nv sum = 0.0;
245		514
246	for (int i = 0; i < width; i++)	515	for (int i = 0; i < width; i++)
247	{	516	{
248	double x = i - width / 2;	517	nv x = i - width / 2;
249	kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;	518	kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
250	sum += kernel[i];	519	sum += kernel[i];
251	}	520	}
252		521
253	params[0] = XDoubleToFixed (width);	522	params[0] = XDoubleToFixed (width);
…		…
261	rxvt_img::blur (int rh, int rv)	530	rxvt_img::blur (int rh, int rv)
262	{	531	{
263	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))	532	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))
264	return clone ();	533	return clone ();
265		534
266	Display *dpy = s->display->dpy;	535	Display *dpy = s->dpy;
267	int size = max (rh, rv) * 2 + 1;	536	int size = max (rh, rv) * 2 + 1;
268	double kernel = (double )malloc (size * sizeof (double));	537	nv kernel = (nv )malloc (size * sizeof (nv));
269	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));	538	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
270	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);	539	rxvt_img *img = new_empty ();
271	img->alloc ();
272		540
273	XRenderPictureAttributes pa;	541	XRenderPictureAttributes pa;
274	pa.repeat = RepeatPad;	542	pa.repeat = RepeatPad;
275	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);	543	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
276	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);	544	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
…		…
319	XRenderFreePicture (dpy, tmp);	587	XRenderFreePicture (dpy, tmp);
320		588
321	return img;	589	return img;
322	}	590	}
323		591
324	static Picture	592	rxvt_img *
325	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha)	593	rxvt_img::muladd (nv mul, nv add)
326	{	594	{
327	Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);	595	// STEP 1: double the image width, fill all odd columns with white (==1)
328		596
329	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);	597	composer cc (this, new rxvt_img (s, format, 0, 0, w * 2, h, repeat));
330	XRenderPictureAttributes pa;
331	pa.repeat = RepeatNormal;
332	pa.component_alpha = component_alpha;
333	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat \| CPComponentAlpha, &pa);
334		598
335	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	};
336		606
337	return mask;	607	XRenderSetPictureFilter (cc.dpy, cc.src, "nearest", 0, 0);
338	}	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);
339		610
340	static void	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
341	extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)	651	extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)
342	{	652	{
343	int32_t x = clamp (c, cl0, cl1);	653	int32_t x = clamp (c, cl0, cl1);
344	c -= x;	654	c -= x;
345	xc = x;	655	xc = x;
346	}	656	}
347		657
348	static bool	658	ecb_noinline static bool
349	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)	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)
350	{	660	{
351	extract (cl0, cl1, r, xr);	661	extract (cl0, cl1, r, xr);
352	extract (cl0, cl1, g, xg);	662	extract (cl0, cl1, g, xg);
353	extract (cl0, cl1, b, xb);	663	extract (cl0, cl1, b, xb);
…		…
359	void	669	void
360	rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a)	670	rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a)
361	{	671	{
362	unshare ();	672	unshare ();
363		673
364	Display *dpy = s->display->dpy;	674	Display *dpy = s->dpy;
365	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	675	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
366		676
367	// loop should not be needed for brightness, as only -1..1 makes sense	677	// loop should not be needed for brightness, as only -1..1 makes sense
368	//while (r \| g \| b \| a)	678	//while (r \| g \| b \| a)
369	{	679	{
…		…
393	rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)	703	rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
394	{	704	{
395	if (r < 0 \|\| g < 0 \|\| b < 0 \|\| a < 0)	705	if (r < 0 \|\| g < 0 \|\| b < 0 \|\| a < 0)
396	rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");	706	rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");
397		707
398	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
399	img->alloc ();
400	img->fill (rgba (0, 0, 0, 0));
401
402	// premultiply (yeah, these are not exact, sue me or fix it)	708	// premultiply (yeah, these are not exact, sue me or fix it)
403	r = (r * (a >> 8)) >> 8;	709	r = (r * (a >> 8)) >> 8;
404	g = (g * (a >> 8)) >> 8;	710	g = (g * (a >> 8)) >> 8;
405	b = (b * (a >> 8)) >> 8;	711	b = (b * (a >> 8)) >> 8;
406		712
407	Display *dpy = s->display->dpy;	713	composer cc (this);
		714	rxvt_img *img = cc;
		715	img->fill (rgba (0, 0, 0, 0));
408		716
409	Picture src = src_picture ();	717	cc.mask (true);
410	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
411	Picture mul = create_xrender_mask (dpy, pm, True, True);
412		718
413	//TODO: this operator does not yet implement some useful contrast	719	//TODO: this operator does not yet implement some useful contrast
414	while (r \| g \| b \| a)	720	while (r \| g \| b \| a)
415	{	721	{
416	unsigned short xr, xg, xb, xa;	722	unsigned short xr, xg, xb, xa;
417	XRenderColor mask_c;	723	XRenderColor mask_c;
418		724
419	if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))	725	if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
420	{	726	{
421	XRenderFillRectangle (dpy, PictOpSrc, mul, &mask_c, 0, 0, 1, 1);	727	XRenderFillRectangle (cc.dpy, PictOpSrc, cc.msk, &mask_c, 0, 0, 1, 1);
422	XRenderComposite (dpy, PictOpAdd, src, mul, 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);
423	}	729	}
424	}	730	}
425
426	XRenderFreePicture (dpy, mul);
427	XRenderFreePicture (dpy, dst);
428	XRenderFreePicture (dpy, src);
429		731
430	::swap (img->ref, ref);	732	::swap (img->ref, ref);
431	::swap (img->pm , pm );	733	::swap (img->pm , pm );
432		734
433	delete img;	735	delete img;
434	}	736	}
435		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);
		749	}
		750
436	rxvt_img *	751	rxvt_img *
437	rxvt_img::clone ()	752	rxvt_img::clone ()
438	{	753	{
439	return new rxvt_img (*this);	754	return new rxvt_img (*this);
440	}
441
442	static XRenderPictFormat *
443	find_alpha_format_for (Display dpy, XRenderPictFormat format)
444	{
445	if (format->direct.alphaMask)
446	return format; // already has alpha
447
448	// try to find a suitable alpha format, one bit alpha is enough for our purposes
449	if (format->type == PictTypeDirect)
450	for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
451	if (f->direct.alphaMask
452	&& f->type == PictTypeDirect
453	&& ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
454	&& ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
455	&& ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
456	return f;
457
458	// should be a very good fallback
459	return XRenderFindStandardFormat (dpy, PictStandardARGB32);
460	}	755	}
461		756
462	rxvt_img *	757	rxvt_img *
463	rxvt_img::reify ()	758	rxvt_img::reify ()
464	{	759	{
465	if (x == 0 && y == 0 && w == ref->w && h == ref->h)	760	if (x == 0 && y == 0 && w == ref->w && h == ref->h)
466	return clone ();	761	return clone ();
467
468	Display *dpy = s->display->dpy;
469		762
470	// add an alpha channel if...	763	// add an alpha channel if...
471	bool alpha = !format->direct.alphaMask // pixmap has none yet	764	bool alpha = !format->direct.alphaMask // pixmap has none yet
472	&& (x \|\| y) // we need one because of non-zero offset	765	&& (x \|\| y) // we need one because of non-zero offset
473	&& repeat == RepeatNone; // and we have no good pixels to fill with	766	&& repeat == RepeatNone; // and we have no good pixels to fill with
474		767
475	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,
476	img->alloc ();	769	0, 0, w, h, repeat));
477		770
478	Picture src = src_picture ();	771	if (repeat == RepeatNone)
479	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
480
481	if (alpha)
482	{	772	{
483	XRenderColor rc = { 0, 0, 0, 0 };	773	XRenderColor rc = { 0, 0, 0, 0 };
484	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
485	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);
486	}	776	}
487	else	777	else
488	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);
489		779
490	XRenderFreePicture (dpy, src);
491	XRenderFreePicture (dpy, dst);
492
493	return img;	780	return cc;
494	}	781	}
495		782
496	rxvt_img *	783	rxvt_img *
497	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)
498	{	785	{
499	rxvt_img *img = clone ();	786	rxvt_img *img = clone ();
500		787
501	img->x += x;	788	img->x -= x;
502	img->y += y;	789	img->y -= y;
503		790
504	if (w != width \|\| h != height)	791	if (w != width \|\| h != height)
505	{	792	{
506	img->w = width;	793	img->w = width;
507	img->h = height;	794	img->h = height;
…		…
512	}	799	}
513		800
514	return img;	801	return img;
515	}	802	}
516		803
517	static void
518	mat_invert (double mat[3][3], double (&inv)[3][3])
519	{
520	double s0 = mat [2][2] * mat [1][1] - mat [2][1] * mat [1][2];
521	double s1 = mat [2][1] * mat [0][2] - mat [2][2] * mat [0][1];
522	double s2 = mat [1][2] * mat [0][1] - mat [1][1] * mat [0][2];
523
524	double invdet = 1. / (mat [0][0] * s0 + mat [1][0] * s1 + mat [2][0] * s2);
525
526	inv [0][0] = invdet * s0;
527	inv [0][1] = invdet * s1;
528	inv [0][2] = invdet * s2;
529
530	inv [1][0] = invdet * (mat [2][0] * mat [1][2] - mat [2][2] * mat [1][0]);
531	inv [1][1] = invdet * (mat [2][2] * mat [0][0] - mat [2][0] * mat [0][2]);
532	inv [1][2] = invdet * (mat [1][0] * mat [0][2] - mat [1][2] * mat [0][0]);
533
534	inv [2][0] = invdet * (mat [2][1] * mat [1][0] - mat [2][0] * mat [1][1]);
535	inv [2][1] = invdet * (mat [2][0] * mat [0][1] - mat [2][1] * mat [0][0]);
536	inv [2][2] = invdet * (mat [1][1] * mat [0][0] - mat [1][0] * mat [0][1]);
537	}
538
539	static double
540	mat_apply (double mat[3][3], int i, double x, double y)
541	{
542	double v = mat [i][0] * x + mat [i][1] * y + mat [i][2];
543	double w = mat [2][0] * x + mat [2][1] * y + mat [2][2];
544
545	return v * (1. / w);
546	}
547
548	rxvt_img *	804	rxvt_img *
549	rxvt_img::transform (double matrix[3][3])	805	rxvt_img::transform (const nv matrix[3][3])
550	{	806	{
551	// find new offset	807	return transform (mat3x3 (&matrix[0][0]));
552	int ox = mat_apply (matrix, 0, x, y);	808	}
553	int oy = mat_apply (matrix, 1, x, y);	809
		810	rxvt_img *
		811	rxvt_img::transform (const nv *matrix)
		812	{
		813	mat3x3 m (matrix);
554		814
555	// calculate new pixel bounding box coordinates	815	// calculate new pixel bounding box coordinates
556	double d [2], rmin[2], rmax[2];	816	nv rmin[2], rmax[2];
557		817
558	for (int i = 0; i < 2; ++i)	818	for (int i = 0; i < 2; ++i)
559	{	819	{
560	double v;	820	nv v;
		821
561	v = mat_apply (matrix, i, 0, 0); rmin [i] = rmax [i] = v; d [i] = v;	822	v = m.apply1 (i, 0+x, 0+y); rmin [i] = rmax [i] = v;
562	v = mat_apply (matrix, i, w, 0); min_it (rmin [i], v); max_it (rmax [i], v);	823	v = m.apply1 (i, w+x, 0+y); min_it (rmin [i], v); max_it (rmax [i], v);
563	v = mat_apply (matrix, i, 0, h); 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);
564	v = mat_apply (matrix, i, w, h); 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);
565	}	826	}
566		827
		828	float sx = rmin [0] - x;
		829	float sy = rmin [1] - y;
		830
		831	// TODO: adjust matrix for subpixel accuracy
567	int dx = floor (rmin [0]);	832	int nx = floor (rmin [0]);
568	int dy = floor (rmin [1]);	833	int ny = floor (rmin [1]);
569		834
570	int new_width = ceil (rmax [0] - dx);	835	int new_width = ceil (rmax [0] - rmin [0]);
571	int new_height = ceil (rmax [1] - dy);	836	int new_height = ceil (rmax [1] - rmin [1]);
572		837
573	double inv[3][3];	838	mat3x3 inv = (mat3x3::translate (-x, -y) * m * mat3x3::translate (x, y)).inverse ();
574	mat_invert (matrix, inv);
575		839
576	rxvt_img *img = new rxvt_img (s, format, ox - dx - d [0], oy - dy - d [1], new_width, new_height, repeat);	840	composer cc (this, new rxvt_img (s, format, nx, ny, new_width, new_height, repeat));
577	img->alloc ();
578
579	Display *dpy = s->display->dpy;
580	Picture src = src_picture ();
581	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
582		841
583	XTransform xfrm;	842	XTransform xfrm;
584		843
585	for (int i = 0; i < 3; ++i)	844	for (int i = 0; i < 3; ++i)
586	for (int j = 0; j < 3; ++j)	845	for (int j = 0; j < 3; ++j)
587	xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);	846	xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);
588		847
589	XRenderSetPictureFilter (dpy, src, "good", 0, 0);	848	XRenderSetPictureFilter (cc.dpy, cc.src, "good", 0, 0);
590	XRenderSetPictureTransform (dpy, src, &xfrm);	849	XRenderSetPictureTransform (cc.dpy, cc.src, &xfrm);
591	XRenderComposite (dpy, PictOpSrc, src, None, dst, dx, dy, 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);
592		851
593	XRenderFreePicture (dpy, src);
594	XRenderFreePicture (dpy, dst);
595
596	return img;	852	return cc;
597	}	853	}
598		854
599	rxvt_img *	855	rxvt_img *
600	rxvt_img::scale (int new_width, int new_height)	856	rxvt_img::scale (int new_width, int new_height)
601	{	857	{
602	if (w == new_width && h == new_height)	858	if (w == new_width && h == new_height)
603	return clone ();	859	return clone ();
604		860
605	double matrix[3][3] = {
606	{ new_width / (double)w, 0, 0 },
607	{ 0, new_height / (double)h, 0 },
608	{ 0, 0, 1 }
609	};
610
611	int old_repeat_mode = repeat;	861	int old_repeat_mode = repeat;
612	repeat = RepeatPad; // not right, but xrender can't properly scale it seems	862	repeat = RepeatPad; // not right, but xrender can't properly scale it seems
613		863
614	rxvt_img *img = transform (matrix);	864	rxvt_img *img = transform (mat3x3::scale (new_width / (nv)w, new_height / (nv)h));
615		865
616	repeat = old_repeat_mode;	866	repeat = old_repeat_mode;
617	img->repeat = repeat;	867	img->repeat = repeat;
618		868
619	return img;	869	return img;
620	}	870	}
621		871
622	rxvt_img *	872	rxvt_img *
623	rxvt_img::rotate (int cx, int cy, double phi)	873	rxvt_img::rotate (int cx, int cy, nv phi)
624	{	874	{
625	double s = sin (phi);
626	double c = cos (phi);
627
628	double matrix[3][3] = {
629	{ c, -s, cx - c * cx + s * cy },
630	{ s, c, cy - s * cx - c * cy },
631	{ 0, 0, 1 }
632	//{ c, -s, 0 },
633	//{ s, c, 0 },
634	//{ 0, 0, 1 }
635	};
636
637	//move (-cx, -cy);	875	move (-cx, -cy);
638	rxvt_img *img = transform (matrix);	876	rxvt_img *img = transform (mat3x3::rotate (phi));
639	//move ( cx, cy);	877	move ( cx, cy);
640	//img->move (cx, cy);	878	img->move (cx, cy);
641		879
642	return img;	880	return img;
643	}	881	}
644		882
645	rxvt_img *	883	rxvt_img *
646	rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg)	884	rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg)
647	{	885	{
648	if (new_format == format)	886	if (new_format == format)
649	return clone ();	887	return clone ();
650		888
651	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));
652	img->alloc ();
653		890
654	Display *dpy = s->display->dpy;
655	Picture src = src_picture ();
656	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
657	int op = PictOpSrc;	891	int op = PictOpSrc;
658		892
659	if (format->direct.alphaMask && !new_format->direct.alphaMask)	893	if (format->direct.alphaMask && !new_format->direct.alphaMask)
660	{	894	{
661	// does it have to be that complicated	895	// does it have to be that complicated
662	XRenderColor rc = { bg.r, bg.g, bg.b, bg.a };	896	XRenderColor rc = { bg.r, bg.g, bg.b, bg.a };
663	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);	897	XRenderFillRectangle (cc.dpy, PictOpSrc, cc.dst, &rc, 0, 0, w, h);
664		898
665	op = PictOpOver;	899	op = PictOpOver;
666	}	900	}
667		901
668	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);
669		903
670	XRenderFreePicture (dpy, src);
671	XRenderFreePicture (dpy, dst);
672
673	return img;	904	return cc;
674	}	905	}
675		906
676	rxvt_img *	907	rxvt_img *
677	rxvt_img::blend (rxvt_img *img, double factor)	908	rxvt_img::tint (const rgba &c)
678	{	909	{
679	rxvt_img *img2 = clone ();	910	composer cc (this);
680	Display *dpy = s->display->dpy;	911	cc.mask (true);
681	Picture src = img->src_picture ();	912	cc.fill (c);
682	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
683	Picture mask = create_xrender_mask (dpy, img->pm, False, False);
684		913
685	XRenderColor mask_c;
686
687	mask_c.alpha = float_to_component (factor);
688	mask_c.red =
689	mask_c.green =
690	mask_c.blue = 0;
691	XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
692
693	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);
694		915
695	XRenderFreePicture (dpy, src);
696	XRenderFreePicture (dpy, dst);
697	XRenderFreePicture (dpy, mask);
698
699	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;
700	}	934	}
701		935
702	#endif	936	#endif
703		937

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.82 by root, Thu Jun 14 17:06:57 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.82 by root, Thu Jun 14 17:06:57 2012 UTC vs.
Revision 1.104 by root, Sat Jul 14 08:27:55 2012 UTC