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

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.84 by root, Thu Jun 14 18:19:11 2012 UTC vs.
Revision 1.105 by sf-exg, Sat Jan 19 10:04:34 2013 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
		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	}
6		229
7	static XRenderPictFormat *	230	static XRenderPictFormat *
8	find_alpha_format_for (Display dpy, XRenderPictFormat format)	231	find_alpha_format_for (Display dpy, XRenderPictFormat format)
9	{	232	{
10	if (format->direct.alphaMask)	233	if (format->direct.alphaMask)
37	}	260	}
38		261
39	rxvt_img *	262	rxvt_img *
40	rxvt_img::new_from_root (rxvt_screen *s)	263	rxvt_img::new_from_root (rxvt_screen *s)
41	{	264	{
42	Display *dpy = s->display->dpy;	265	Display *dpy = s->dpy;
43	unsigned int root_pm_w, root_pm_h;	266	unsigned int root_pm_w, root_pm_h;
44	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]);
45	if (root_pixmap == None)	268	if (root_pixmap == None)
46	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]);
47		270
48	if (root_pixmap == None)	271	if (root_pixmap == None)
49	return 0;	272	return 0;
50		273
51	Window wdummy;	274	Window wdummy;
…		…
74	# if HAVE_PIXBUF	297	# if HAVE_PIXBUF
75		298
76	rxvt_img *	299	rxvt_img *
77	rxvt_img::new_from_pixbuf (rxvt_screen s, GdkPixbuf pb)	300	rxvt_img::new_from_pixbuf (rxvt_screen s, GdkPixbuf pb)
78	{	301	{
79	Display *dpy = s->display->dpy;	302	Display *dpy = s->dpy;
80		303
81	int width = gdk_pixbuf_get_width (pb);	304	int width = gdk_pixbuf_get_width (pb);
82	int height = gdk_pixbuf_get_height (pb);	305	int height = gdk_pixbuf_get_height (pb);
83		306
84	if (width > 32767 \|\| height > 32767) // well, we could upload in chunks	307	if (width > 32767 \|\| height > 32767) // well, we could upload in chunks
…		…
126	for (int y = 0; y < height; y++)	349	for (int y = 0; y < height; y++)
127	{	350	{
128	unsigned char *src = row;	351	unsigned char *src = row;
129	uint32_t dst = (uint32_t )line;	352	uint32_t dst = (uint32_t )line;
130		353
131	if (!pb_has_alpha)
132	for (int x = 0; x < width; x++)	354	for (int x = 0; x < width; x++)
133	{	355	{
134	uint8_t r = *src++;	356	uint8_t r = *src++;
135	uint8_t g = *src++;	357	uint8_t g = *src++;
136	uint8_t b = *src++;	358	uint8_t b = *src++;
		359	uint8_t a = *src;
137		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
138	uint32_t v = (255 << 24) \| (r << 16) \| (g << 8) \| b;	369	uint32_t v = (a << 24) \| (r << 16) \| (g << 8) \| b;
139		370
140	if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)	371	if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
141	v = ecb_bswap32 (v);	372	v = ecb_bswap32 (v);
142		373
143	*dst++ = v;	374	*dst++ = v;
144	}	375	}
145	else
146	for (int x = 0; x < width; x++)
147	{
148	uint32_t v = (uint32_t )src; src += 4;
149
150	if (ecb_big_endian ())
151	v = ecb_bswap32 (v);
152
153	v = ecb_rotl32 (v, 8); // abgr to bgra
154
155	if (!byte_order_mismatch)
156	v = ecb_bswap32 (v);
157
158	*dst++ = v;
159	}
160		376
161	row += rowstride;	377	row += rowstride;
162	line += xi.bytes_per_line;	378	line += xi.bytes_per_line;
163	}	379	}
164		380
…		…
197	{	413	{
198	if (--ref->cnt)	414	if (--ref->cnt)
199	return;	415	return;
200		416
201	if (pm && ref->ours)	417	if (pm && ref->ours)
202	XFreePixmap (s->display->dpy, pm);	418	XFreePixmap (s->dpy, pm);
203		419
204	delete ref;	420	delete ref;
205	}	421	}
206		422
207	rxvt_img::~rxvt_img ()	423	rxvt_img::~rxvt_img ()
…		…
210	}	426	}
211		427
212	void	428	void
213	rxvt_img::alloc ()	429	rxvt_img::alloc ()
214	{	430	{
215	pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);	431	pm = XCreatePixmap (s->dpy, s->display->root, w, h, format->depth);
216	ref = new pixref (w, h);	432	ref = new pixref (w, h);
217	}	433	}
218		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
219	Picture	444	Picture
220	rxvt_img::src_picture ()	445	rxvt_img::picture ()
221	{	446	{
222	Display *dpy = s->display->dpy;	447	Display *dpy = s->dpy;
223		448
224	XRenderPictureAttributes pa;	449	XRenderPictureAttributes pa;
225	pa.repeat = repeat;	450	pa.repeat = repeat;
226	Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);	451	Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
227		452
…		…
232	rxvt_img::unshare ()	457	rxvt_img::unshare ()
233	{	458	{
234	if (ref->cnt == 1 && ref->ours)	459	if (ref->cnt == 1 && ref->ours)
235	return;	460	return;
236		461
237	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);
238	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);	463	GC gc = XCreateGC (s->dpy, pm, 0, 0);
239	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);
240	XFreeGC (s->display->dpy, gc);	465	XFreeGC (s->dpy, gc);
241		466
242	destroy ();	467	destroy ();
243		468
244	pm = pm2;	469	pm = pm2;
245	ref = new pixref (ref->w, ref->h);	470	ref = new pixref (ref->w, ref->h);
246	}	471	}
247		472
248	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
249	rxvt_img::fill (const rgba &c)	485	rxvt_img::fill (const rgba &c)
250	{	486	{
251	XRenderColor rc = { c.r, c.g, c.b, c.a };	487	fill (c, 0, 0, w, h);
252
253	Display *dpy = s->display->dpy;
254	Picture src = src_picture ();
255	XRenderFillRectangle (dpy, PictOpSrc, src, &rc, 0, 0, w, h);
256	XRenderFreePicture (dpy, src);
257	}	488	}
258		489
259	void	490	void
260	rxvt_img::add_alpha ()	491	rxvt_img::add_alpha ()
261	{	492	{
262	if (format->direct.alphaMask)	493	if (format->direct.alphaMask)
263	return;	494	return;
264		495
265	Display *dpy = s->display->dpy;
266
267	rxvt_img *img = new rxvt_img (s, find_alpha_format_for (dpy, format), x, y, w, h, repeat);	496	composer cc (this, new rxvt_img (s, find_alpha_format_for (s->dpy, format), x, y, w, h, repeat));
268	img->alloc ();
269
270	Picture src = src_picture ();
271	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
272		497
273	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	498	XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
274		499
275	XRenderFreePicture (dpy, src);	500	rxvt_img *img = cc;
276	XRenderFreePicture (dpy, dst);
277		501
278	::swap (img->ref, ref);	502	::swap (img->ref, ref);
279	::swap (img->pm , pm );	503	::swap (img->pm , pm );
280		504
281	delete img;	505	delete img;
282	}	506	}
283		507
284	static void	508	static void
285	get_gaussian_kernel (int radius, int width, rxvt_img::nv kernel, XFixed params)	509	get_gaussian_kernel (int radius, int width, nv kernel, XFixed params)
286	{	510	{
287	rxvt_img::nv sigma = radius / 2.0;	511	nv sigma = radius / 2.0;
288	rxvt_img::nv scale = sqrt (2.0 * M_PI) * sigma;	512	nv scale = sqrt (2.0 * M_PI) * sigma;
289	rxvt_img::nv sum = 0.0;	513	nv sum = 0.0;
290		514
291	for (int i = 0; i < width; i++)	515	for (int i = 0; i < width; i++)
292	{	516	{
293	rxvt_img::nv x = i - width / 2;	517	nv x = i - width / 2;
294	kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;	518	kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
295	sum += kernel[i];	519	sum += kernel[i];
296	}	520	}
297		521
298	params[0] = XDoubleToFixed (width);	522	params[0] = XDoubleToFixed (width);
…		…
306	rxvt_img::blur (int rh, int rv)	530	rxvt_img::blur (int rh, int rv)
307	{	531	{
308	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))	532	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))
309	return clone ();	533	return clone ();
310		534
311	Display *dpy = s->display->dpy;	535	Display *dpy = s->dpy;
312	int size = max (rh, rv) * 2 + 1;	536	int size = max (rh, rv) * 2 + 1;
313	nv kernel = (nv )malloc (size * sizeof (nv));	537	nv kernel = (nv )malloc (size * sizeof (nv));
314	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));	538	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
315	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);	539	rxvt_img *img = new_empty ();
316	img->alloc ();
317		540
318	XRenderPictureAttributes pa;	541	XRenderPictureAttributes pa;
319	pa.repeat = RepeatPad;	542	pa.repeat = RepeatPad;
320	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);	543	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
321	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);	544	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
…		…
364	XRenderFreePicture (dpy, tmp);	587	XRenderFreePicture (dpy, tmp);
365		588
366	return img;	589	return img;
367	}	590	}
368		591
369	static Picture	592	rxvt_img *
370	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha)	593	rxvt_img::muladd (nv mul, nv add)
371	{	594	{
372	Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);	595	// STEP 1: double the image width, fill all odd columns with white (==1)
373		596
374	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);	597	composer cc (this, new rxvt_img (s, format, 0, 0, w * 2, h, repeat));
375	XRenderPictureAttributes pa;
376	pa.repeat = RepeatNormal;
377	pa.component_alpha = component_alpha;
378	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat \| CPComponentAlpha, &pa);
379		598
380	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	};
381		606
382	return mask;	607	XRenderSetPictureFilter (cc.dpy, cc.src, "nearest", 0, 0);
383	}	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);
384		610
385	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
386	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)
387	{	652	{
388	int32_t x = clamp (c, cl0, cl1);	653	int32_t x = clamp (c, cl0, cl1);
389	c -= x;	654	c -= x;
390	xc = x;	655	xc = x;
391	}	656	}
392		657
393	static bool	658	ecb_noinline static bool
394	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)
395	{	660	{
396	extract (cl0, cl1, r, xr);	661	extract (cl0, cl1, r, xr);
397	extract (cl0, cl1, g, xg);	662	extract (cl0, cl1, g, xg);
398	extract (cl0, cl1, b, xb);	663	extract (cl0, cl1, b, xb);
…		…
404	void	669	void
405	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)
406	{	671	{
407	unshare ();	672	unshare ();
408		673
409	Display *dpy = s->display->dpy;	674	Display *dpy = s->dpy;
410	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	675	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
411		676
412	// 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
413	//while (r \| g \| b \| a)	678	//while (r \| g \| b \| a)
414	{	679	{
…		…
438	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)
439	{	704	{
440	if (r < 0 \|\| g < 0 \|\| b < 0 \|\| a < 0)	705	if (r < 0 \|\| g < 0 \|\| b < 0 \|\| a < 0)
441	rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");	706	rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");
442		707
443	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
444	img->alloc ();
445	img->fill (rgba (0, 0, 0, 0));
446
447	// premultiply (yeah, these are not exact, sue me or fix it)	708	// premultiply (yeah, these are not exact, sue me or fix it)
448	r = (r * (a >> 8)) >> 8;	709	r = (r * (a >> 8)) >> 8;
449	g = (g * (a >> 8)) >> 8;	710	g = (g * (a >> 8)) >> 8;
450	b = (b * (a >> 8)) >> 8;	711	b = (b * (a >> 8)) >> 8;
451		712
452	Display *dpy = s->display->dpy;	713	composer cc (this);
		714	rxvt_img *img = cc;
		715	img->fill (rgba (0, 0, 0, 0));
453		716
454	Picture src = src_picture ();	717	cc.mask (true);
455	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
456	Picture mul = create_xrender_mask (dpy, pm, True, True);
457		718
458	//TODO: this operator does not yet implement some useful contrast	719	//TODO: this operator does not yet implement some useful contrast
459	while (r \| g \| b \| a)	720	while (r \| g \| b \| a)
460	{	721	{
461	unsigned short xr, xg, xb, xa;	722	unsigned short xr, xg, xb, xa;
462	XRenderColor mask_c;	723	XRenderColor mask_c;
463		724
464	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))
465	{	726	{
466	XRenderFillRectangle (dpy, PictOpSrc, mul, &mask_c, 0, 0, 1, 1);	727	XRenderFillRectangle (cc.dpy, PictOpSrc, cc.msk, &mask_c, 0, 0, 1, 1);
467	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);
468	}	729	}
469	}	730	}
470
471	XRenderFreePicture (dpy, mul);
472	XRenderFreePicture (dpy, dst);
473	XRenderFreePicture (dpy, src);
474		731
475	::swap (img->ref, ref);	732	::swap (img->ref, ref);
476	::swap (img->pm , pm );	733	::swap (img->pm , pm );
477		734
478	delete img;	735	delete img;
479	}	736	}
480		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
481	rxvt_img *	751	rxvt_img *
482	rxvt_img::clone ()	752	rxvt_img::clone ()
483	{	753	{
484	return new rxvt_img (*this);	754	return new rxvt_img (*this);
485	}	755	}
…		…
487	rxvt_img *	757	rxvt_img *
488	rxvt_img::reify ()	758	rxvt_img::reify ()
489	{	759	{
490	if (x == 0 && y == 0 && w == ref->w && h == ref->h)	760	if (x == 0 && y == 0 && w == ref->w && h == ref->h)
491	return clone ();	761	return clone ();
492
493	Display *dpy = s->display->dpy;
494		762
495	// add an alpha channel if...	763	// add an alpha channel if...
496	bool alpha = !format->direct.alphaMask // pixmap has none yet	764	bool alpha = !format->direct.alphaMask // pixmap has none yet
497	&& (x \|\| y) // we need one because of non-zero offset	765	&& (x \|\| y) // we need one because of non-zero offset
498	&& repeat == RepeatNone; // and we have no good pixels to fill with	766	&& repeat == RepeatNone; // and we have no good pixels to fill with
499		767
500	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,
501	img->alloc ();	769	0, 0, w, h, repeat));
502		770
503	Picture src = src_picture ();	771	if (repeat == RepeatNone)
504	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
505
506	if (alpha)
507	{	772	{
508	XRenderColor rc = { 0, 0, 0, 0 };	773	XRenderColor rc = { 0, 0, 0, 0 };
509	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
510	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);
511	}	776	}
512	else	777	else
513	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);
514		779
515	XRenderFreePicture (dpy, src);
516	XRenderFreePicture (dpy, dst);
517
518	return img;	780	return cc;
519	}	781	}
520		782
521	rxvt_img *	783	rxvt_img *
522	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)
523	{	785	{
524	rxvt_img *img = clone ();	786	rxvt_img *img = clone ();
525		787
526	img->x += x;	788	img->x -= x;
527	img->y += y;	789	img->y -= y;
528		790
529	if (w != width \|\| h != height)	791	if (w != width \|\| h != height)
530	{	792	{
531	img->w = width;	793	img->w = width;
532	img->h = height;	794	img->h = height;
…		…
537	}	799	}
538		800
539	return img;	801	return img;
540	}	802	}
541		803
542	static void
543	mat_invert (rxvt_img::nv mat[3][3], rxvt_img::nv (&inv)[3][3])
544	{
545	rxvt_img::nv s0 = mat [2][2] * mat [1][1] - mat [2][1] * mat [1][2];
546	rxvt_img::nv s1 = mat [2][1] * mat [0][2] - mat [2][2] * mat [0][1];
547	rxvt_img::nv s2 = mat [1][2] * mat [0][1] - mat [1][1] * mat [0][2];
548
549	rxvt_img::nv invdet = 1. / (mat [0][0] * s0 + mat [1][0] * s1 + mat [2][0] * s2);
550
551	inv [0][0] = invdet * s0;
552	inv [0][1] = invdet * s1;
553	inv [0][2] = invdet * s2;
554
555	inv [1][0] = invdet * (mat [2][0] * mat [1][2] - mat [2][2] * mat [1][0]);
556	inv [1][1] = invdet * (mat [2][2] * mat [0][0] - mat [2][0] * mat [0][2]);
557	inv [1][2] = invdet * (mat [1][0] * mat [0][2] - mat [1][2] * mat [0][0]);
558
559	inv [2][0] = invdet * (mat [2][1] * mat [1][0] - mat [2][0] * mat [1][1]);
560	inv [2][1] = invdet * (mat [2][0] * mat [0][1] - mat [2][1] * mat [0][0]);
561	inv [2][2] = invdet * (mat [1][1] * mat [0][0] - mat [1][0] * mat [0][1]);
562	}
563
564	static rxvt_img::nv
565	mat_apply (rxvt_img::nv mat[3][3], int i, rxvt_img::nv x, rxvt_img::nv y)
566	{
567	rxvt_img::nv v = mat [i][0] * x + mat [i][1] * y + mat [i][2];
568	rxvt_img::nv w = mat [2][0] * x + mat [2][1] * y + mat [2][2];
569
570	return v * (1. / w);
571	}
572
573	rxvt_img *	804	rxvt_img *
574	rxvt_img::transform (nv matrix[3][3])	805	rxvt_img::transform (const nv matrix[3][3])
575	{	806	{
576	// find new offset	807	return transform (mat3x3 (&matrix[0][0]));
577	int ox = mat_apply (matrix, 0, x, y);	808	}
578	int oy = mat_apply (matrix, 1, x, y);	809
		810	rxvt_img *
		811	rxvt_img::transform (const nv *matrix)
		812	{
		813	mat3x3 m (matrix);
579		814
580	// calculate new pixel bounding box coordinates	815	// calculate new pixel bounding box coordinates
581	nv d [2], rmin[2], rmax[2];	816	nv rmin[2], rmax[2];
582		817
583	for (int i = 0; i < 2; ++i)	818	for (int i = 0; i < 2; ++i)
584	{	819	{
585	nv v;	820	nv v;
		821
586	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;
587	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);
588	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);
589	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);
590	}	826	}
591		827
		828	float sx = rmin [0] - x;
		829	float sy = rmin [1] - y;
		830
		831	// TODO: adjust matrix for subpixel accuracy
592	int dx = floor (rmin [0]);	832	int nx = floor (rmin [0]);
593	int dy = floor (rmin [1]);	833	int ny = floor (rmin [1]);
594		834
595	int new_width = ceil (rmax [0] - dx);	835	int new_width = ceil (rmax [0] - rmin [0]);
596	int new_height = ceil (rmax [1] - dy);	836	int new_height = ceil (rmax [1] - rmin [1]);
597		837
598	nv inv[3][3];	838	mat3x3 inv = (mat3x3::translate (-x, -y) * m * mat3x3::translate (x, y)).inverse ();
599	mat_invert (matrix, inv);
600		839
601	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));
602	img->alloc ();
603
604	Display *dpy = s->display->dpy;
605	Picture src = src_picture ();
606	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
607		841
608	XTransform xfrm;	842	XTransform xfrm;
609		843
610	for (int i = 0; i < 3; ++i)	844	for (int i = 0; i < 3; ++i)
611	for (int j = 0; j < 3; ++j)	845	for (int j = 0; j < 3; ++j)
612	xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);	846	xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);
613		847
614	XRenderSetPictureFilter (dpy, src, "good", 0, 0);	848	XRenderSetPictureFilter (cc.dpy, cc.src, "good", 0, 0);
615	XRenderSetPictureTransform (dpy, src, &xfrm);	849	XRenderSetPictureTransform (cc.dpy, cc.src, &xfrm);
616	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);
617		851
618	XRenderFreePicture (dpy, src);
619	XRenderFreePicture (dpy, dst);
620
621	return img;	852	return cc;
622	}	853	}
623		854
624	rxvt_img *	855	rxvt_img *
625	rxvt_img::scale (int new_width, int new_height)	856	rxvt_img::scale (int new_width, int new_height)
626	{	857	{
627	if (w == new_width && h == new_height)	858	if (w == new_width && h == new_height)
628	return clone ();	859	return clone ();
629		860
630	nv matrix[3][3] = {
631	{ new_width / (nv)w, 0, 0 },
632	{ 0, new_height / (nv)h, 0 },
633	{ 0, 0, 1 }
634	};
635
636	int old_repeat_mode = repeat;	861	int old_repeat_mode = repeat;
637	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
638		863
639	rxvt_img *img = transform (matrix);	864	rxvt_img *img = transform (mat3x3::scale (new_width / (nv)w, new_height / (nv)h));
640		865
641	repeat = old_repeat_mode;	866	repeat = old_repeat_mode;
642	img->repeat = repeat;	867	img->repeat = repeat;
643		868
644	return img;	869	return img;
645	}	870	}
646		871
647	rxvt_img *	872	rxvt_img *
648	rxvt_img::rotate (int cx, int cy, nv phi)	873	rxvt_img::rotate (int cx, int cy, nv phi)
649	{	874	{
650	nv s = sin (phi);
651	nv c = cos (phi);
652
653	nv matrix[3][3] = {
654	{ c, -s, cx - c * cx + s * cy },
655	{ s, c, cy - s * cx - c * cy },
656	{ 0, 0, 1 }
657	//{ c, -s, 0 },
658	//{ s, c, 0 },
659	//{ 0, 0, 1 }
660	};
661
662	//move (-cx, -cy);	875	move (-cx, -cy);
663	rxvt_img *img = transform (matrix);	876	rxvt_img *img = transform (mat3x3::rotate (phi));
664	//move ( cx, cy);	877	move ( cx, cy);
665	//img->move (cx, cy);	878	img->move (cx, cy);
666		879
667	return img;	880	return img;
668	}	881	}
669		882
670	rxvt_img *	883	rxvt_img *
671	rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg)	884	rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg)
672	{	885	{
673	if (new_format == format)	886	if (new_format == format)
674	return clone ();	887	return clone ();
675		888
676	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));
677	img->alloc ();
678		890
679	Display *dpy = s->display->dpy;
680	Picture src = src_picture ();
681	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
682	int op = PictOpSrc;	891	int op = PictOpSrc;
683		892
684	if (format->direct.alphaMask && !new_format->direct.alphaMask)	893	if (format->direct.alphaMask && !new_format->direct.alphaMask)
685	{	894	{
686	// does it have to be that complicated	895	// does it have to be that complicated
687	XRenderColor rc = { bg.r, bg.g, bg.b, bg.a };	896	XRenderColor rc = { bg.r, bg.g, bg.b, bg.a };
688	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);	897	XRenderFillRectangle (cc.dpy, PictOpSrc, cc.dst, &rc, 0, 0, w, h);
689		898
690	op = PictOpOver;	899	op = PictOpOver;
691	}	900	}
692		901
693	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);
694		903
695	XRenderFreePicture (dpy, src);	904	return cc;
696	XRenderFreePicture (dpy, dst);	905	}
		906
		907	rxvt_img *
		908	rxvt_img::tint (const rgba &c)
		909	{
		910	composer cc (this);
		911	cc.mask (true);
		912	cc.fill (c);
		913
		914	XRenderComposite (cc.dpy, PictOpSrc, cc.src, cc.msk, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
		915
		916	return cc;
		917	}
		918
		919	rxvt_img *
		920	rxvt_img::shade (nv factor, rgba c)
		921	{
		922	clamp_it (factor, -1., 1.);
		923	factor++;
		924
		925	if (factor > 1)
		926	{
		927	c.r = c.r * (2 - factor);
		928	c.g = c.g * (2 - factor);
		929	c.b = c.b * (2 - factor);
		930	}
		931	else
		932	{
		933	c.r = c.r * factor;
		934	c.g = c.g * factor;
		935	c.b = c.b * factor;
		936	}
		937
		938	rxvt_img *img = this->tint (c);
		939
		940	if (factor > 1)
		941	{
		942	c.a = 0xffff;
		943	c.r =
		944	c.g =
		945	c.b = 0xffff * (factor - 1);
		946
		947	img->brightness (c.r, c.g, c.b, c.a);
		948	}
697		949
698	return img;	950	return img;
699	}	951	}
700		952
701	rxvt_img *	953	rxvt_img *
702	rxvt_img::blend (rxvt_img *img, nv factor)	954	rxvt_img::filter (const char name, int nparams, nv params)
703	{	955	{
704	rxvt_img *img2 = clone ();	956	composer cc (this);
705	Display *dpy = s->display->dpy;
706	Picture src = img->src_picture ();
707	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
708	Picture mask = create_xrender_mask (dpy, img->pm, False, False);
709		957
710	XRenderColor mask_c;	958	XFixed *xparams = rxvt_temp_buf<XFixed> (nparams);
711		959
712	mask_c.alpha = float_to_component (factor);	960	for (int i = 0; i < nparams; ++i)
713	mask_c.red =	961	xparams [i] = XDoubleToFixed (params [i]);
714	mask_c.green =
715	mask_c.blue = 0;
716	XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
717		962
		963	XRenderSetPictureFilter (cc.dpy, cc.src, name, xparams, nparams);
		964
718	XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, w, h);	965	XRenderComposite (cc.dpy, PictOpSrc, cc.src, 0, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
719		966
720	XRenderFreePicture (dpy, src);
721	XRenderFreePicture (dpy, dst);
722	XRenderFreePicture (dpy, mask);
723
724	return img2;	967	return cc;
725	}	968	}
726		969
727	#endif	970	#endif
728		971

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.84 by root, Thu Jun 14 18:19:11 2012 UTC vs. Revision 1.105 by sf-exg, Sat Jan 19 10:04:34 2013 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.84 by root, Thu Jun 14 18:19:11 2012 UTC vs.
Revision 1.105 by sf-exg, Sat Jan 19 10:04:34 2013 UTC