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

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

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.74 by root, Sat Jun 9 19:20:04 2012 UTC vs. Revision 1.98 by root, Sun Jun 17 21:58:18 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.74 by root, Sat Jun 9 19:20:04 2012 UTC vs.
Revision 1.98 by root, Sun Jun 17 21:58:18 2012 UTC