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

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.59 by root, Thu Jun 7 21:28:10 2012 UTC vs.
Revision 1.100 by root, Mon Jul 2 02:01:41 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 x = 1, int y = 1)
		176	{
		177	Pixmap pixmap = XCreatePixmap (dpy, srcimg->pm, x, y, 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;
…		…
49	img->ref->ours = false;	292	img->ref->ours = false;
50		293
51	return img;	294	return img;
52	}	295	}
53		296
		297	# if HAVE_PIXBUF
		298
54	rxvt_img *	299	rxvt_img *
55	rxvt_img::new_from_pixbuf (rxvt_screen s, GdkPixbuf pb)	300	rxvt_img::new_from_pixbuf (rxvt_screen s, GdkPixbuf pb)
56	{	301	{
57	Display *dpy = s->display->dpy;	302	Display *dpy = s->dpy;
58		303
59	int width = gdk_pixbuf_get_width (pb);	304	int width = gdk_pixbuf_get_width (pb);
60	int height = gdk_pixbuf_get_height (pb);	305	int height = gdk_pixbuf_get_height (pb);
61		306
62	if (width > 32767 \|\| height > 32767) // well, we could upload in chunks	307	if (width > 32767 \|\| height > 32767) // well, we could upload in chunks
63	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");
64		309
65	// since we require rgb24/argb32 formats from xrender we assume	310	// since we require rgb24/argb32 formats from xrender we assume
66	// 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
67	int depth = gdk_pixbuf_get_has_alpha (pb) ? 32 : 24;
68		312
69	int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;	313	int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
70		314
71	XImage xi;	315	XImage xi;
72		316
…		…
76	xi.format = ZPixmap;	320	xi.format = ZPixmap;
77	xi.byte_order = ImageByteOrder (dpy);	321	xi.byte_order = ImageByteOrder (dpy);
78	xi.bitmap_unit = 0; //XY only, unused	322	xi.bitmap_unit = 0; //XY only, unused
79	xi.bitmap_bit_order = 0; //XY only, unused	323	xi.bitmap_bit_order = 0; //XY only, unused
80	xi.bitmap_pad = BitmapPad (dpy);	324	xi.bitmap_pad = BitmapPad (dpy);
81	xi.depth = depth;	325	xi.depth = 32;
82	xi.bytes_per_line = 0;	326	xi.bytes_per_line = 0;
83	xi.bits_per_pixel = 32; //Z only	327	xi.bits_per_pixel = 32; //Z only
84	xi.red_mask = 0x00000000; //Z only, unused	328	xi.red_mask = 0x00000000; //Z only, unused
85	xi.green_mask = 0x00000000; //Z only, unused	329	xi.green_mask = 0x00000000; //Z only, unused
86	xi.blue_mask = 0x00000000; //Z only, unused	330	xi.blue_mask = 0x00000000; //Z only, unused
…		…
95	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");
96		340
97	xi.data = (char )rxvt_malloc (height xi.bytes_per_line);	341	xi.data = (char )rxvt_malloc (height xi.bytes_per_line);
98		342
99	int rowstride = gdk_pixbuf_get_rowstride (pb);	343	int rowstride = gdk_pixbuf_get_rowstride (pb);
100		344	bool pb_has_alpha = gdk_pixbuf_get_has_alpha (pb);
101	assert (3 + (depth == 32) == gdk_pixbuf_get_n_channels (pb));
102	unsigned char *row = gdk_pixbuf_get_pixels (pb);	345	unsigned char *row = gdk_pixbuf_get_pixels (pb);
		346
103	char *line = xi.data;	347	char *line = xi.data;
104		348
105	for (int y = 0; y < height; y++)	349	for (int y = 0; y < height; y++)
106	{	350	{
107	unsigned char *src = row;	351	unsigned char *src = row;
108	uint32_t dst = (uint32_t )line;	352	uint32_t dst = (uint32_t )line;
109		353
110	if (depth == 24)	354	if (!pb_has_alpha)
111	for (int x = 0; x < width; x++)	355	for (int x = 0; x < width; x++)
112	{	356	{
113	uint8_t r = *src++;	357	uint8_t r = *src++;
114	uint8_t g = *src++;	358	uint8_t g = *src++;
115	uint8_t b = *src++;	359	uint8_t b = *src++;
116		360
117	uint32_t v = (r << 16) \| (g << 8) \| b;	361	uint32_t v = (255 << 24) \| (r << 16) \| (g << 8) \| b;
118		362
119	if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)	363	if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
120	v = ecb_bswap32 (v);	364	v = ecb_bswap32 (v);
121		365
122	*dst++ = v;	366	*dst++ = v;
123	}	367	}
…		…
139		383
140	row += rowstride;	384	row += rowstride;
141	line += xi.bytes_per_line;	385	line += xi.bytes_per_line;
142	}	386	}
143		387
144	rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, depth == 24 ? PictStandardRGB24 : PictStandardARGB32), 0, 0, width, height);	388	rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, PictStandardARGB32), 0, 0, width, height);
145	img->alloc ();	389	img->alloc ();
146		390
147	GC gc = XCreateGC (dpy, img->pm, 0, 0);	391	GC gc = XCreateGC (dpy, img->pm, 0, 0);
148	XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height);	392	XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height);
149	XFreeGC (dpy, gc);	393	XFreeGC (dpy, gc);
…		…
167	g_object_unref (pb);	411	g_object_unref (pb);
168		412
169	return img;	413	return img;
170	}	414	}
171		415
		416	# endif
		417
172	void	418	void
173	rxvt_img::destroy ()	419	rxvt_img::destroy ()
174	{	420	{
175	if (--ref->cnt)	421	if (--ref->cnt)
176	return;	422	return;
177		423
178	if (pm && ref->ours)	424	if (pm && ref->ours)
179	XFreePixmap (s->display->dpy, pm);	425	XFreePixmap (s->dpy, pm);
180		426
181	delete ref;	427	delete ref;
182	}	428	}
183		429
184	rxvt_img::~rxvt_img ()	430	rxvt_img::~rxvt_img ()
…		…
187	}	433	}
188		434
189	void	435	void
190	rxvt_img::alloc ()	436	rxvt_img::alloc ()
191	{	437	{
192	pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);	438	pm = XCreatePixmap (s->dpy, s->display->root, w, h, format->depth);
193	ref = new pixref (w, h);	439	ref = new pixref (w, h);
194	}	440	}
195		441
		442	rxvt_img *
		443	rxvt_img::new_empty ()
		444	{
		445	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
		446	img->alloc ();
		447
		448	return img;
		449	}
		450
196	Picture	451	Picture
197	rxvt_img::src_picture ()	452	rxvt_img::picture ()
198	{	453	{
199	Display *dpy = s->display->dpy;	454	Display *dpy = s->dpy;
200		455
201	XRenderPictureAttributes pa;	456	XRenderPictureAttributes pa;
202	pa.repeat = repeat;	457	pa.repeat = repeat;
203	Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);	458	Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
204		459
…		…
209	rxvt_img::unshare ()	464	rxvt_img::unshare ()
210	{	465	{
211	if (ref->cnt == 1 && ref->ours)	466	if (ref->cnt == 1 && ref->ours)
212	return;	467	return;
213		468
214	//TODO: maybe should reify instead
215	Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth);	469	Pixmap pm2 = XCreatePixmap (s->dpy, s->display->root, ref->w, ref->h, format->depth);
216	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);	470	GC gc = XCreateGC (s->dpy, pm, 0, 0);
217	XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);	471	XCopyArea (s->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
218	XFreeGC (s->display->dpy, gc);	472	XFreeGC (s->dpy, gc);
219		473
220	destroy ();	474	destroy ();
221		475
222	pm = pm2;	476	pm = pm2;
223	ref = new pixref (ref->w, ref->h);	477	ref = new pixref (ref->w, ref->h);
224	}	478	}
225		479
226	void	480	void
		481	rxvt_img::fill (const rgba &c, int x, int y, int w, int h)
		482	{
		483	XRenderColor rc = { c.r, c.g, c.b, c.a };
		484
		485	Display *dpy = s->dpy;
		486	Picture src = picture ();
		487	XRenderFillRectangle (dpy, PictOpSrc, src, &rc, x, y, w, h);
		488	XRenderFreePicture (dpy, src);
		489	}
		490
		491	void
227	rxvt_img::fill (const rxvt_color &c)	492	rxvt_img::fill (const rgba &c)
228	{	493	{
229	XGCValues gcv;	494	fill (c, 0, 0, w, h);
230	gcv.foreground = c;	495	}
231	GC gc = XCreateGC (s->display->dpy, pm, GCForeground, &gcv);	496
232	XFillRectangle (s->display->dpy, pm, gc, 0, 0, w, h);	497	void
233	XFreeGC (s->display->dpy, gc);	498	rxvt_img::add_alpha ()
		499	{
		500	if (format->direct.alphaMask)
		501	return;
		502
		503	composer cc (this, new rxvt_img (s, find_alpha_format_for (s->dpy, format), x, y, w, h, repeat));
		504
		505	XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
		506
		507	rxvt_img *img = cc;
		508
		509	::swap (img->ref, ref);
		510	::swap (img->pm , pm );
		511
		512	delete img;
234	}	513	}
235		514
236	static void	515	static void
237	get_gaussian_kernel (int radius, int width, double kernel, XFixed params)	516	get_gaussian_kernel (int radius, int width, nv kernel, XFixed params)
238	{	517	{
239	double sigma = radius / 2.0;	518	nv sigma = radius / 2.0;
240	double scale = sqrt (2.0 * M_PI) * sigma;	519	nv scale = sqrt (2.0 * M_PI) * sigma;
241	double sum = 0.0;	520	nv sum = 0.0;
242		521
243	for (int i = 0; i < width; i++)	522	for (int i = 0; i < width; i++)
244	{	523	{
245	double x = i - width / 2;	524	nv x = i - width / 2;
246	kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;	525	kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
247	sum += kernel[i];	526	sum += kernel[i];
248	}	527	}
249		528
250	params[0] = XDoubleToFixed (width);	529	params[0] = XDoubleToFixed (width);
…		…
258	rxvt_img::blur (int rh, int rv)	537	rxvt_img::blur (int rh, int rv)
259	{	538	{
260	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))	539	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))
261	return clone ();	540	return clone ();
262		541
263	Display *dpy = s->display->dpy;	542	Display *dpy = s->dpy;
264	int size = max (rh, rv) * 2 + 1;	543	int size = max (rh, rv) * 2 + 1;
265	double kernel = (double )malloc (size * sizeof (double));	544	nv kernel = (nv )malloc (size * sizeof (nv));
266	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));	545	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
267	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);	546	rxvt_img *img = new_empty ();
268	img->alloc ();
269
270	Picture src = src_picture ();
271		547
272	XRenderPictureAttributes pa;	548	XRenderPictureAttributes pa;
273	pa.repeat = RepeatPad;	549	pa.repeat = RepeatPad;
274	Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa);	550	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
		551	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
275		552
276	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);	553	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
277	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);	554	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
278	XFreePixmap (dpy, tmp_pm);	555	XFreePixmap (dpy, tmp_pm);
279		556
…		…
295		572
296	size = rv * 2 + 1;	573	size = rv * 2 + 1;
297	get_gaussian_kernel (rv, size, kernel, params);	574	get_gaussian_kernel (rv, size, kernel, params);
298	::swap (params[0], params[1]);	575	::swap (params[0], params[1]);
299		576
300	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);	577	XRenderSetPictureFilter (dpy, tmp, FilterConvolution, params, size+2);
301	XRenderComposite (dpy,	578	XRenderComposite (dpy,
302	PictOpSrc,	579	PictOpSrc,
303	tmp,	580	tmp,
304	None,	581	None,
305	dst,	582	dst,
…		…
309	w, h);	586	w, h);
310	}	587	}
311		588
312	free (kernel);	589	free (kernel);
313	free (params);	590	free (params);
		591
314	XRenderFreePicture (dpy, src);	592	XRenderFreePicture (dpy, src);
315	XRenderFreePicture (dpy, dst);	593	XRenderFreePicture (dpy, dst);
316	XRenderFreePicture (dpy, tmp);	594	XRenderFreePicture (dpy, tmp);
317		595
318	return img;	596	return img;
319	}	597	}
320		598
321	static Picture	599	ecb_noinline static void
322	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb)	600	extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)
323	{	601	{
324	Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);	602	int32_t x = clamp (c, cl0, cl1);
		603	c -= x;
		604	xc = x;
		605	}
325		606
326	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);	607	ecb_noinline static bool
327	XRenderPictureAttributes pa;	608	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)
328	pa.repeat = True;	609	{
329	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);	610	extract (cl0, cl1, r, xr);
		611	extract (cl0, cl1, g, xg);
		612	extract (cl0, cl1, b, xb);
		613	extract (cl0, cl1, a, xa);
330		614
331	XFreePixmap (dpy, pixmap);	615	return xr \| xg \| xb \| xa;
332
333	return mask;
334	}	616	}
335		617
336	void	618	void
337	rxvt_img::brightness (unsigned short r, unsigned short g, unsigned short b, unsigned short a)	619	rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a)
338	{	620	{
		621	unshare ();
		622
339	Display *dpy = s->display->dpy;	623	Display *dpy = s->dpy;
340	Picture src = create_xrender_mask (dpy, pm, True);
341	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	624	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
342		625
		626	// loop should not be needed for brightness, as only -1..1 makes sense
		627	//while (r \| g \| b \| a)
		628	{
		629	unsigned short xr, xg, xb, xa;
343	XRenderColor mask_c;	630	XRenderColor mask_c;
344	mask_c.red = r;	631
345	mask_c.green = g;	632	if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
346	mask_c.blue = b;
347	mask_c.alpha = a;
348	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);	633	XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
349		634
350	XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	635	if (extract (-65535, 0, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
		636	{
		637	XRenderColor mask_w = { 65535, 65535, 65535, 65535 };
		638	XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
		639	mask_c.red = -mask_c.red; //TODO: verify that doing clamp, assign, and negation does the right thing
		640	mask_c.green = -mask_c.green;
		641	mask_c.blue = -mask_c.blue;
		642	mask_c.alpha = -mask_c.alpha;
		643	XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
		644	XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
		645	}
		646	}
351		647
352	XRenderFreePicture (dpy, src);
353	XRenderFreePicture (dpy, dst);	648	XRenderFreePicture (dpy, dst);
354	}	649	}
355		650
356	void	651	void
357	rxvt_img::contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a)	652	rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
358	{	653	{
359	if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))	654	if (r < 0 \|\| g < 0 \|\| b < 0 \|\| a < 0)
360	return;	655	rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");
361		656
362	Display *dpy = s->display->dpy;	657	// premultiply (yeah, these are not exact, sue me or fix it)
363	Picture src = create_xrender_mask (dpy, pm, True);	658	r = (r * (a >> 8)) >> 8;
364	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	659	g = (g * (a >> 8)) >> 8;
		660	b = (b * (a >> 8)) >> 8;
365		661
		662	composer cc (this);
		663	rxvt_img *img = cc;
		664	img->fill (rgba (0, 0, 0, 0));
		665
		666	cc.mask (true);
		667
		668	//TODO: this operator does not yet implement some useful contrast
		669	while (r \| g \| b \| a)
		670	{
		671	unsigned short xr, xg, xb, xa;
366	XRenderColor mask_c;	672	XRenderColor mask_c;
367	mask_c.red = r;	673
368	mask_c.green = g;	674	if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
369	mask_c.blue = b;	675	{
370	mask_c.alpha = a;
371	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);	676	XRenderFillRectangle (cc.dpy, PictOpSrc, cc.msk, &mask_c, 0, 0, 1, 1);
372
373	XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	677	XRenderComposite (cc.dpy, PictOpAdd, cc.src, cc.msk, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
		678	}
		679	}
374		680
375	XRenderFreePicture (dpy, src);	681	::swap (img->ref, ref);
376	XRenderFreePicture (dpy, dst);	682	::swap (img->pm , pm );
		683
		684	delete img;
		685	}
		686
		687	void
		688	rxvt_img::draw (rxvt_img *img, int op, nv mask)
		689	{
		690	unshare ();
		691
		692	composer cc (img, this);
		693
		694	if (mask != 1.)
		695	cc.mask (rgba (0, 0, 0, float_to_component (mask)));
		696
		697	XRenderComposite (cc.dpy, op, cc.src, cc.msk, cc.dst, x - img->x, y - img->y, 0, 0, 0, 0, w, h);
377	}	698	}
378		699
379	rxvt_img *	700	rxvt_img *
380	rxvt_img::clone ()	701	rxvt_img::clone ()
381	{	702	{
382	return new rxvt_img (*this);	703	return new rxvt_img (*this);
383	}
384
385	static XRenderPictFormat *
386	find_alpha_format_for (Display dpy, XRenderPictFormat format)
387	{
388	if (format->direct.alphaMask)
389	return format; // already has alpha
390
391	// try to find a suitable alpha format, one bit alpha is enough for our purposes
392	if (format->type == PictTypeDirect)
393	for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
394	if (f->direct.alphaMask
395	&& f->type == PictTypeDirect
396	&& ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
397	&& ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
398	&& ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
399	return f;
400
401	// should be a very good fallback
402	return XRenderFindStandardFormat (dpy, PictStandardARGB32);
403	}	704	}
404		705
405	rxvt_img *	706	rxvt_img *
406	rxvt_img::reify ()	707	rxvt_img::reify ()
407	{	708	{
408	if (x == 0 && y == 0 && w == ref->w && h == ref->h)	709	if (x == 0 && y == 0 && w == ref->w && h == ref->h)
409	return clone ();	710	return clone ();
410		711
411	Display *dpy = s->display->dpy;	712	Display *dpy = s->dpy;
412		713
		714	// add an alpha channel if...
413	bool alpha = !format->direct.alphaMask	715	bool alpha = !format->direct.alphaMask // pixmap has none yet
414	&& (x \|\| y)	716	&& (x \|\| y) // we need one because of non-zero offset
415	&& repeat == RepeatNone;	717	&& repeat == RepeatNone; // and we have no good pixels to fill with
416		718
417	rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);	719	composer cc (this, new rxvt_img (s, alpha ? find_alpha_format_for (s->dpy, format) : format,
418	img->alloc ();	720	0, 0, w, h, repeat));
419		721
420	Picture src = src_picture ();
421	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
422
423	if (alpha)	722	if (alpha)
424	{	723	{
425	XRenderColor rc = { 0, 0, 0, 0 };	724	XRenderColor rc = { 0, 0, 0, 0 };
426	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles	725	XRenderFillRectangle (cc.dpy, PictOpSrc, cc.dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
427	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h);	726	XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, 0, 0, 0, 0, x, y, ref->w, ref->h);
428	}	727	}
429	else	728	else
430	XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);	729	XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, -x, -y, 0, 0, 0, 0, w, h);
431		730
432	XRenderFreePicture (dpy, src);
433	XRenderFreePicture (dpy, dst);
434
435	return img;	731	return cc;
436	}	732	}
437		733
438	rxvt_img *	734	rxvt_img *
439	rxvt_img::sub_rect (int x, int y, int width, int height)	735	rxvt_img::sub_rect (int x, int y, int width, int height)
440	{	736	{
441	rxvt_img *img = clone ();	737	rxvt_img *img = clone ();
442		738
443	img->x += x;	739	img->x -= x;
444	img->y += y;	740	img->y -= y;
445		741
446	if (w != width \|\| h != height)	742	if (w != width \|\| h != height)
447	{	743	{
448	img->w = width;	744	img->w = width;
449	img->h = height;	745	img->h = height;
…		…
455		751
456	return img;	752	return img;
457	}	753	}
458		754
459	rxvt_img *	755	rxvt_img *
460	rxvt_img::transform (int new_width, int new_height, double matrix[9])	756	rxvt_img::transform (const nv matrix[3][3])
461	{	757	{
462	rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat);	758	return transform (mat3x3 (&matrix[0][0]));
463	img->alloc ();	759	}
464		760
465	Display *dpy = s->display->dpy;	761	rxvt_img *
466	Picture src = src_picture ();	762	rxvt_img::transform (const nv *matrix)
467	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	763	{
		764	mat3x3 m (matrix);
		765
		766	// calculate new pixel bounding box coordinates
		767	nv rmin[2], rmax[2];
		768
		769	for (int i = 0; i < 2; ++i)
		770	{
		771	nv v;
		772
		773	v = m.apply1 (i, 0+x, 0+y); rmin [i] = rmax [i] = v;
		774	v = m.apply1 (i, w+x, 0+y); min_it (rmin [i], v); max_it (rmax [i], v);
		775	v = m.apply1 (i, 0+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v);
		776	v = m.apply1 (i, w+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v);
		777	}
		778
		779	float sx = rmin [0] - x;
		780	float sy = rmin [1] - y;
		781
		782	// TODO: adjust matrix for subpixel accuracy
		783	int nx = floor (rmin [0]);
		784	int ny = floor (rmin [1]);
		785
		786	int new_width = ceil (rmax [0] - rmin [0]);
		787	int new_height = ceil (rmax [1] - rmin [1]);
		788
		789	mat3x3 inv = (mat3x3::translate (-x, -y) * m * mat3x3::translate (x, y)).inverse ();
		790
		791	composer cc (this, new rxvt_img (s, format, nx, ny, new_width, new_height, repeat));
468		792
469	XTransform xfrm;	793	XTransform xfrm;
470		794
471	for (int i = 0; i < 3; ++i)	795	for (int i = 0; i < 3; ++i)
472	for (int j = 0; j < 3; ++j)	796	for (int j = 0; j < 3; ++j)
473	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);	797	xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);
474		798
475	#if 0
476	xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
477	xfrm.matrix [1][2] -= XDoubleToFixed (y);
478	#endif
479
480	XRenderSetPictureFilter (dpy, src, "good", 0, 0);	799	XRenderSetPictureFilter (cc.dpy, cc.src, "good", 0, 0);
481	XRenderSetPictureTransform (dpy, src, &xfrm);	800	XRenderSetPictureTransform (cc.dpy, cc.src, &xfrm);
482	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);	801	XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, sx, sy, 0, 0, 0, 0, new_width, new_height);
483		802
484	XRenderFreePicture (dpy, src);
485	XRenderFreePicture (dpy, dst);
486
487	return img;	803	return cc;
488	}	804	}
489		805
490	rxvt_img *	806	rxvt_img *
491	rxvt_img::scale (int new_width, int new_height)	807	rxvt_img::scale (int new_width, int new_height)
492	{	808	{
493	if (w == new_width && h == new_height)	809	if (w == new_width && h == new_height)
494	return clone ();	810	return clone ();
495		811
496	double matrix[9] = {
497	w / (double)new_width, 0, 0,
498	0, h / (double)new_height, 0,
499	0, 0, 1
500	};
501
502	int old_repeat_mode = repeat;	812	int old_repeat_mode = repeat;
503	repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems	813	repeat = RepeatPad; // not right, but xrender can't properly scale it seems
504		814
505	rxvt_img *img = transform (new_width, new_height, matrix);	815	rxvt_img *img = transform (mat3x3::scale (new_width / (nv)w, new_height / (nv)h));
506		816
507	repeat = old_repeat_mode;	817	repeat = old_repeat_mode;
508	img->repeat = repeat;	818	img->repeat = repeat;
509		819
510	return img;	820	return img;
511	}	821	}
512		822
513	rxvt_img *	823	rxvt_img *
514	rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)	824	rxvt_img::rotate (int cx, int cy, nv phi)
515	{	825	{
516	double s = sin (phi);	826	move (-cx, -cy);
517	double c = cos (phi);	827	rxvt_img *img = transform (mat3x3::rotate (phi));
		828	move ( cx, cy);
		829	img->move (cx, cy);
518		830
519	double matrix[9] = {	831	return img;
520	c, -s, -c * x + s * y + x,
521	s, c, -s * x - c * y + y,
522	0, 0, 1
523	};
524
525	return transform (new_width, new_height, matrix);
526	}	832	}
527		833
528	rxvt_img *	834	rxvt_img *
529	rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg)	835	rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg)
530	{	836	{
531	if (new_format == format)	837	if (new_format == format)
532	return clone ();	838	return clone ();
533		839
534	rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);	840	composer cc (this, new rxvt_img (s, new_format, x, y, w, h, repeat));
535	img->alloc ();
536		841
537	Display *dpy = s->display->dpy;
538	Picture src = src_picture ();
539	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
540	int op = PictOpSrc;	842	int op = PictOpSrc;
541		843
542	if (format->direct.alphaMask && !new_format->direct.alphaMask)	844	if (format->direct.alphaMask && !new_format->direct.alphaMask)
543	{	845	{
544	// does it have to be that complicated	846	// does it have to be that complicated
545	rgba c;
546	bg.get (c);
547
548	XRenderColor rc = { c.r, c.g, c.b, 0xffff };	847	XRenderColor rc = { bg.r, bg.g, bg.b, bg.a };
549	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);	848	XRenderFillRectangle (cc.dpy, PictOpSrc, cc.dst, &rc, 0, 0, w, h);
550		849
551	op = PictOpOver;	850	op = PictOpOver;
552	}	851	}
553		852
554	XRenderComposite (dpy, op, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	853	XRenderComposite (cc.dpy, op, cc.src, None, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
555		854
556	XRenderFreePicture (dpy, src);
557	XRenderFreePicture (dpy, dst);
558
559	return img;	855	return cc;
560	}	856	}
561		857
562	rxvt_img *	858	rxvt_img *
563	rxvt_img::blend (rxvt_img *img, double factor)	859	rxvt_img::tint (const rgba &c)
564	{	860	{
565	rxvt_img *img2 = clone ();	861	composer cc (this);
566	Display *dpy = s->display->dpy;	862	cc.mask (true);
567	Picture src = img->src_picture ();	863	cc.fill (c);
568	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
569	Picture mask = create_xrender_mask (dpy, img->pm, False);
570		864
571	XRenderColor mask_c;
572
573	mask_c.alpha = float_to_component (factor);
574	mask_c.red =
575	mask_c.green =
576	mask_c.blue = 0;
577	XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
578
579	XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, w, h);	865	XRenderComposite (cc.dpy, PictOpSrc, cc.src, cc.msk, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
580		866
581	XRenderFreePicture (dpy, src);
582	XRenderFreePicture (dpy, dst);
583	XRenderFreePicture (dpy, mask);
584
585	return img2;	867	return cc;
		868	}
		869
		870	rxvt_img *
		871	rxvt_img::filter (const char name, int nparams, nv params)
		872	{
		873	composer cc (this);
		874
		875	XFixed *xparams = rxvt_temp_buf<XFixed> (nparams);
		876
		877	for (int i = 0; i < nparams; ++i)
		878	xparams [i] = XDoubleToFixed (params [i]);
		879
		880	XRenderSetPictureFilter (cc.dpy, cc.src, name, xparams, nparams);
		881
		882	XRenderComposite (cc.dpy, PictOpSrc, cc.src, 0, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
		883
		884	return cc;
586	}	885	}
587		886
588	#endif	887	#endif
589		888

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.59 by root, Thu Jun 7 21:28:10 2012 UTC vs. Revision 1.100 by root, Mon Jul 2 02:01:41 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.59 by root, Thu Jun 7 21:28:10 2012 UTC vs.
Revision 1.100 by root, Mon Jul 2 02:01:41 2012 UTC