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

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.44 by root, Thu Jun 7 13:12:08 2012 UTC vs.
Revision 1.93 by root, Fri Jun 15 18:07:24 2012 UTC

…		…
		1	#include <string.h>
1	#include <math.h>	2	#include <math.h>
2	#include "../config.h"	3	#include "../config.h"
3	#include "rxvt.h"	4	#include "rxvt.h"
4		5
5	#if HAVE_IMG	6	#if HAVE_IMG
6		7
		8	typedef rxvt_img::nv nv;
		9
		10	namespace
		11	{
		12
		13	struct mat3x3
		14	{
		15	nv v[3][3];
		16
		17	mat3x3 ()
		18	{
		19	}
		20
		21	mat3x3 (nv matrix[3][3])
		22	{
		23	memcpy (v, matrix, sizeof (v));
		24	}
		25
		26	mat3x3 (nv v11, nv v12, nv v13, nv v21, nv v22, nv v23, nv v31, nv v32, nv v33)
		27	{
		28	v[0][0] = v11; v[0][1] = v12; v[0][2] = v13;
		29	v[1][0] = v21; v[1][1] = v22; v[1][2] = v23;
		30	v[2][0] = v31; v[2][1] = v32; v[2][2] = v33;
		31	}
		32
		33	mat3x3 invert ();
		34
		35	nv *operator [](int i) { return &v[i][0]; }
		36	const nv *operator [](int i) const { return &v[i][0]; }
		37
		38	// quite inefficient, hopefully gcc pulls the w calc out of any loops
		39	nv apply1 (int i, nv x, nv y)
		40	{
		41	mat3x3 &m = *this;
		42
		43	nv v = m[i][0] * x + m[i][1] * y + m[i][2];
		44	nv w = m[2][0] * x + m[2][1] * y + m[2][2];
		45
		46	return v * (1. / w);
		47	}
		48
		49	static mat3x3 translate (nv x, nv y);
		50	};
		51
		52	mat3x3
		53	mat3x3::invert ()
		54	{
		55	mat3x3 &m = *this;
		56	mat3x3 inv;
		57
		58	nv s0 = m[2][2] * m[1][1] - m[2][1] * m[1][2];
		59	nv s1 = m[2][1] * m[0][2] - m[2][2] * m[0][1];
		60	nv s2 = m[1][2] * m[0][1] - m[1][1] * m[0][2];
		61
		62	nv invdet = 1. / (m[0][0] * s0 + m[1][0] * s1 + m[2][0] * s2);
		63
		64	inv[0][0] = invdet * s0;
		65	inv[0][1] = invdet * s1;
		66	inv[0][2] = invdet * s2;
		67
		68	inv[1][0] = invdet * (m[2][0] * m[1][2] - m[2][2] * m[1][0]);
		69	inv[1][1] = invdet * (m[2][2] * m[0][0] - m[2][0] * m[0][2]);
		70	inv[1][2] = invdet * (m[1][0] * m[0][2] - m[1][2] * m[0][0]);
		71
		72	inv[2][0] = invdet * (m[2][1] * m[1][0] - m[2][0] * m[1][1]);
		73	inv[2][1] = invdet * (m[2][0] * m[0][1] - m[2][1] * m[0][0]);
		74	inv[2][2] = invdet * (m[1][1] * m[0][0] - m[1][0] * m[0][1]);
		75
		76	return inv;
		77	}
		78
		79	static mat3x3
		80	operator *(const mat3x3 &a, const mat3x3 &b)
		81	{
		82	mat3x3 r;
		83
		84	for (int i = 0; i < 3; ++i)
		85	for (int j = 0; j < 3; ++j)
		86	r[i][j] = a[i][0] * b[0][j]
		87	+ a[i][1] * b[1][j]
		88	+ a[i][2] * b[2][j];
		89
		90	return r;
		91	}
		92
		93	mat3x3
		94	mat3x3::translate (nv x, nv y)
		95	{
		96	return mat3x3 (
		97	1, 0, x,
		98	0, 1, y,
		99	0, 0, 1
		100	);
		101	}
		102
		103	}
		104
		105	#if 0
		106	struct pict
		107	{
		108	Display *dpy;
		109	Picture pic;
		110
		111	operator Picture () const
		112	{
		113	return pic;
		114	}
		115
		116	pict ()
		117	: pic (0)
		118	{
		119	}
		120
		121	pict (rxvt_img img, XRenderPictFormat format = 0)
		122	: dpy (img->s->display->dpy)
		123	{
		124	XRenderPictureAttributes pa;
		125	pa.repeat = img->repeat;
		126	pic = XRenderCreatePicture (dpy, img->pm, format ? format : img->format, CPRepeat, &pa);
		127	}
		128
		129	~pict ()
		130	{
		131	if (pic)
		132	XRenderFreePicture (dpy, pic);
		133	}
		134	};
		135	#endif
		136
		137	static XRenderPictFormat *
		138	find_alpha_format_for (Display dpy, XRenderPictFormat format)
		139	{
		140	if (format->direct.alphaMask)
		141	return format; // already has alpha
		142
		143	// try to find a suitable alpha format, one bit alpha is enough for our purposes
		144	if (format->type == PictTypeDirect)
		145	for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
		146	if (f->direct.alphaMask
		147	&& f->type == PictTypeDirect
		148	&& ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
		149	&& ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
		150	&& ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
		151	return f;
		152
		153	// should be a very good fallback
		154	return XRenderFindStandardFormat (dpy, PictStandardARGB32);
		155	}
		156
7	rxvt_img::rxvt_img (rxvt_screen screen, XRenderPictFormat format, int x, int y, int width, int height, int repeat)	157	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),	158	: s(screen), x(x), y(y), w(width), h(height), format(format), repeat(repeat),
9	pm(0), ref(0)	159	pm(0), ref(0)
10	{	160	{
11	}	161	}
13	rxvt_img::rxvt_img (const rxvt_img &img)	163	rxvt_img::rxvt_img (const rxvt_img &img)
14	: s(img.s), x(img.x), y(img.y), w(img.w), h(img.h), format(img.format), repeat(img.repeat), pm(img.pm), ref(img.ref)	164	: s(img.s), x(img.x), y(img.y), w(img.w), h(img.h), format(img.format), repeat(img.repeat), pm(img.pm), ref(img.ref)
15	{	165	{
16	++ref->cnt;	166	++ref->cnt;
17	}	167	}
18
19	#if 0
20	rxvt_img::rxvt_img (rxvt_screen screen, XRenderPictFormat format, int width, int height, Pixmap pixmap)
21	: s(screen), x(0), y(0), w(width), h(height), format(format), repeat(RepeatNormal), shared(false), pm(pixmap)
22	{
23	}
24	#endif
25		168
26	rxvt_img *	169	rxvt_img *
27	rxvt_img::new_from_root (rxvt_screen *s)	170	rxvt_img::new_from_root (rxvt_screen *s)
28	{	171	{
29	Display *dpy = s->display->dpy;	172	Display *dpy = s->display->dpy;
…		…
56	img->ref->ours = false;	199	img->ref->ours = false;
57		200
58	return img;	201	return img;
59	}	202	}
60		203
		204	# if HAVE_PIXBUF
		205
		206	rxvt_img *
		207	rxvt_img::new_from_pixbuf (rxvt_screen s, GdkPixbuf pb)
		208	{
		209	Display *dpy = s->display->dpy;
		210
		211	int width = gdk_pixbuf_get_width (pb);
		212	int height = gdk_pixbuf_get_height (pb);
		213
		214	if (width > 32767 \|\| height > 32767) // well, we could upload in chunks
		215	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big (maximum size 32768x32768).\n");
		216
		217	// since we require rgb24/argb32 formats from xrender we assume
		218	// that both 24 and 32 bpp MUST be supported by any screen that supports xrender
		219
		220	int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
		221
		222	XImage xi;
		223
		224	xi.width = width;
		225	xi.height = height;
		226	xi.xoffset = 0;
		227	xi.format = ZPixmap;
		228	xi.byte_order = ImageByteOrder (dpy);
		229	xi.bitmap_unit = 0; //XY only, unused
		230	xi.bitmap_bit_order = 0; //XY only, unused
		231	xi.bitmap_pad = BitmapPad (dpy);
		232	xi.depth = 32;
		233	xi.bytes_per_line = 0;
		234	xi.bits_per_pixel = 32; //Z only
		235	xi.red_mask = 0x00000000; //Z only, unused
		236	xi.green_mask = 0x00000000; //Z only, unused
		237	xi.blue_mask = 0x00000000; //Z only, unused
		238	xi.obdata = 0; // probably unused
		239
		240	bool byte_order_mismatch = byte_order != xi.byte_order;
		241
		242	if (!XInitImage (&xi))
		243	rxvt_fatal ("unable to initialise ximage, please report.\n");
		244
		245	if (height > INT_MAX / xi.bytes_per_line)
		246	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n");
		247
		248	xi.data = (char )rxvt_malloc (height xi.bytes_per_line);
		249
		250	int rowstride = gdk_pixbuf_get_rowstride (pb);
		251	bool pb_has_alpha = gdk_pixbuf_get_has_alpha (pb);
		252	unsigned char *row = gdk_pixbuf_get_pixels (pb);
		253
		254	char *line = xi.data;
		255
		256	for (int y = 0; y < height; y++)
		257	{
		258	unsigned char *src = row;
		259	uint32_t dst = (uint32_t )line;
		260
		261	if (!pb_has_alpha)
		262	for (int x = 0; x < width; x++)
		263	{
		264	uint8_t r = *src++;
		265	uint8_t g = *src++;
		266	uint8_t b = *src++;
		267
		268	uint32_t v = (255 << 24) \| (r << 16) \| (g << 8) \| b;
		269
		270	if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
		271	v = ecb_bswap32 (v);
		272
		273	*dst++ = v;
		274	}
		275	else
		276	for (int x = 0; x < width; x++)
		277	{
		278	uint32_t v = (uint32_t )src; src += 4;
		279
		280	if (ecb_big_endian ())
		281	v = ecb_bswap32 (v);
		282
		283	v = ecb_rotl32 (v, 8); // abgr to bgra
		284
		285	if (!byte_order_mismatch)
		286	v = ecb_bswap32 (v);
		287
		288	*dst++ = v;
		289	}
		290
		291	row += rowstride;
		292	line += xi.bytes_per_line;
		293	}
		294
		295	rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, PictStandardARGB32), 0, 0, width, height);
		296	img->alloc ();
		297
		298	GC gc = XCreateGC (dpy, img->pm, 0, 0);
		299	XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height);
		300	XFreeGC (dpy, gc);
		301
		302	free (xi.data);
		303
		304	return img;
		305	}
		306
61	rxvt_img *	307	rxvt_img *
62	rxvt_img::new_from_file (rxvt_screen s, const char filename)	308	rxvt_img::new_from_file (rxvt_screen s, const char filename)
63	{	309	{
64	GError *err = 0;	310	GError *err = 0;
65	GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);	311	GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);
66		312
67	if (!pb)	313	if (!pb)
68	rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);	314	rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);
69		315
70	rxvt_img *img = new rxvt_img (	316	rxvt_img *img = new_from_pixbuf (s, pb);
71	s,
72	XRenderFindStandardFormat (s->display->dpy, gdk_pixbuf_get_has_alpha (pb) ? PictStandardARGB32 : PictStandardRGB24),
73	0,
74	0,
75	gdk_pixbuf_get_width (pb),
76	gdk_pixbuf_get_height (pb)
77	);
78	img->alloc ();
79	img->render_pixbuf (pb, 0, 0, img->w, img->h, 0, 0);
80		317
81	g_object_unref (pb);	318	g_object_unref (pb);
82		319
83	return img;	320	return img;
84	}	321	}
		322
		323	# endif
85		324
86	void	325	void
87	rxvt_img::destroy ()	326	rxvt_img::destroy ()
88	{	327	{
89	if (--ref->cnt)	328	if (--ref->cnt)
…		…
106	pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);	345	pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);
107	ref = new pixref (w, h);	346	ref = new pixref (w, h);
108	}	347	}
109		348
110	Picture	349	Picture
111	rxvt_img::src_picture ()	350	rxvt_img::picture ()
112	{	351	{
113	Display *dpy = s->display->dpy;	352	Display *dpy = s->display->dpy;
114		353
115	XRenderPictureAttributes pa;	354	XRenderPictureAttributes pa;
116	pa.repeat = repeat;	355	pa.repeat = repeat;
…		…
123	rxvt_img::unshare ()	362	rxvt_img::unshare ()
124	{	363	{
125	if (ref->cnt == 1 && ref->ours)	364	if (ref->cnt == 1 && ref->ours)
126	return;	365	return;
127		366
128	//TODO: maybe should reify instead
129	Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth);	367	Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth);
130	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);	368	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
131	XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);	369	XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
132	XFreeGC (s->display->dpy, gc);	370	XFreeGC (s->display->dpy, gc);
133		371
…		…
136	pm = pm2;	374	pm = pm2;
137	ref = new pixref (ref->w, ref->h);	375	ref = new pixref (ref->w, ref->h);
138	}	376	}
139		377
140	void	378	void
141	rxvt_img::fill (const rxvt_color &c)	379	rxvt_img::fill (const rgba &c)
142	{	380	{
143	XGCValues gcv;	381	XRenderColor rc = { c.r, c.g, c.b, c.a };
144	gcv.foreground = c;	382
145	GC gc = XCreateGC (s->display->dpy, pm, GCForeground, &gcv);	383	Display *dpy = s->display->dpy;
146	XFillRectangle (s->display->dpy, pm, gc, 0, 0, w, h);	384	Picture src = picture ();
147	XFreeGC (s->display->dpy, gc);	385	XRenderFillRectangle (dpy, PictOpSrc, src, &rc, 0, 0, w, h);
		386	XRenderFreePicture (dpy, src);
		387	}
		388
		389	void
		390	rxvt_img::add_alpha ()
		391	{
		392	if (format->direct.alphaMask)
		393	return;
		394
		395	Display *dpy = s->display->dpy;
		396
		397	rxvt_img *img = new rxvt_img (s, find_alpha_format_for (dpy, format), x, y, w, h, repeat);
		398	img->alloc ();
		399
		400	Picture src = picture ();
		401	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
		402
		403	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
		404
		405	XRenderFreePicture (dpy, src);
		406	XRenderFreePicture (dpy, dst);
		407
		408	::swap (img->ref, ref);
		409	::swap (img->pm , pm );
		410
		411	delete img;
148	}	412	}
149		413
150	static void	414	static void
151	get_gaussian_kernel (int radius, int width, double kernel, XFixed params)	415	get_gaussian_kernel (int radius, int width, nv kernel, XFixed params)
152	{	416	{
153	double sigma = radius / 2.0;	417	nv sigma = radius / 2.0;
154	double scale = sqrt (2.0 * M_PI) * sigma;	418	nv scale = sqrt (2.0 * M_PI) * sigma;
155	double sum = 0.0;	419	nv sum = 0.0;
156		420
157	for (int i = 0; i < width; i++)	421	for (int i = 0; i < width; i++)
158	{	422	{
159	double x = i - width / 2;	423	nv x = i - width / 2;
160	kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;	424	kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
161	sum += kernel[i];	425	sum += kernel[i];
162	}	426	}
163		427
164	params[0] = XDoubleToFixed (width);	428	params[0] = XDoubleToFixed (width);
…		…
174	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))	438	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))
175	return clone ();	439	return clone ();
176		440
177	Display *dpy = s->display->dpy;	441	Display *dpy = s->display->dpy;
178	int size = max (rh, rv) * 2 + 1;	442	int size = max (rh, rv) * 2 + 1;
179	double kernel = (double )malloc (size * sizeof (double));	443	nv kernel = (nv )malloc (size * sizeof (nv));
180	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));	444	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
181	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);	445	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
182	img->alloc ();	446	img->alloc ();
183		447
184	Picture src = src_picture ();
185
186	XRenderPictureAttributes pa;	448	XRenderPictureAttributes pa;
187	pa.repeat = RepeatPad;	449	pa.repeat = RepeatPad;
188	Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa);	450	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
		451	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
189		452
190	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);	453	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
191	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);	454	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
192	XFreePixmap (dpy, tmp_pm);	455	XFreePixmap (dpy, tmp_pm);
193		456
…		…
209		472
210	size = rv * 2 + 1;	473	size = rv * 2 + 1;
211	get_gaussian_kernel (rv, size, kernel, params);	474	get_gaussian_kernel (rv, size, kernel, params);
212	::swap (params[0], params[1]);	475	::swap (params[0], params[1]);
213		476
214	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);	477	XRenderSetPictureFilter (dpy, tmp, FilterConvolution, params, size+2);
215	XRenderComposite (dpy,	478	XRenderComposite (dpy,
216	PictOpSrc,	479	PictOpSrc,
217	tmp,	480	tmp,
218	None,	481	None,
219	dst,	482	dst,
…		…
223	w, h);	486	w, h);
224	}	487	}
225		488
226	free (kernel);	489	free (kernel);
227	free (params);	490	free (params);
		491
228	XRenderFreePicture (dpy, src);	492	XRenderFreePicture (dpy, src);
229	XRenderFreePicture (dpy, dst);	493	XRenderFreePicture (dpy, dst);
230	XRenderFreePicture (dpy, tmp);	494	XRenderFreePicture (dpy, tmp);
231		495
232	return img;	496	return img;
233	}	497	}
234		498
235	static Picture	499	static Picture
236	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb)	500	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha)
237	{	501	{
238	Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);	502	Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
239		503
240	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);	504	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
241	XRenderPictureAttributes pa;	505	XRenderPictureAttributes pa;
242	pa.repeat = True;	506	pa.repeat = RepeatNormal;
		507	pa.component_alpha = component_alpha;
243	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);	508	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat \| CPComponentAlpha, &pa);
244		509
245	XFreePixmap (dpy, pixmap);	510	XFreePixmap (dpy, pixmap);
246		511
247	return mask;	512	return mask;
248	}	513	}
249		514
		515	static void
		516	extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)
		517	{
		518	int32_t x = clamp (c, cl0, cl1);
		519	c -= x;
		520	xc = x;
		521	}
		522
		523	static bool
		524	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)
		525	{
		526	extract (cl0, cl1, r, xr);
		527	extract (cl0, cl1, g, xg);
		528	extract (cl0, cl1, b, xb);
		529	extract (cl0, cl1, a, xa);
		530
		531	return xr \| xg \| xb \| xa;
		532	}
		533
250	void	534	void
251	rxvt_img::brightness (unsigned short r, unsigned short g, unsigned short b, unsigned short a)	535	rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a)
252	{	536	{
		537	unshare ();
		538
253	Display *dpy = s->display->dpy;	539	Display *dpy = s->display->dpy;
254	Picture src = create_xrender_mask (dpy, pm, True);
255	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	540	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
256		541
		542	// loop should not be needed for brightness, as only -1..1 makes sense
		543	//while (r \| g \| b \| a)
		544	{
		545	unsigned short xr, xg, xb, xa;
257	XRenderColor mask_c;	546	XRenderColor mask_c;
258	mask_c.red = r;	547
259	mask_c.green = g;	548	if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
260	mask_c.blue = b;	549	XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
261	mask_c.alpha = a;	550
		551	if (extract (-65535, 0, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
		552	{
		553	XRenderColor mask_w = { 65535, 65535, 65535, 65535 };
		554	XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
		555	mask_c.red = -mask_c.red; //TODO: verify that doing clamp, assign, and negation does the right thing
		556	mask_c.green = -mask_c.green;
		557	mask_c.blue = -mask_c.blue;
		558	mask_c.alpha = -mask_c.alpha;
		559	XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
		560	XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
		561	}
		562	}
		563
		564	XRenderFreePicture (dpy, dst);
		565	}
		566
		567	void
		568	rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
		569	{
		570	if (r < 0 \|\| g < 0 \|\| b < 0 \|\| a < 0)
		571	rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");
		572
		573	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
		574	img->alloc ();
		575	img->fill (rgba (0, 0, 0, 0));
		576
		577	// premultiply (yeah, these are not exact, sue me or fix it)
		578	r = (r * (a >> 8)) >> 8;
		579	g = (g * (a >> 8)) >> 8;
		580	b = (b * (a >> 8)) >> 8;
		581
		582	Display *dpy = s->display->dpy;
		583
		584	Picture src = picture ();
		585	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
		586	Picture mul = create_xrender_mask (dpy, pm, True, True);
		587
		588	//TODO: this operator does not yet implement some useful contrast
		589	while (r \| g \| b \| a)
		590	{
		591	unsigned short xr, xg, xb, xa;
		592	XRenderColor mask_c;
		593
		594	if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
		595	{
		596	XRenderFillRectangle (dpy, PictOpSrc, mul, &mask_c, 0, 0, 1, 1);
		597	XRenderComposite (dpy, PictOpAdd, src, mul, dst, 0, 0, 0, 0, 0, 0, w, h);
		598	}
		599	}
		600
		601	XRenderFreePicture (dpy, mul);
		602	XRenderFreePicture (dpy, dst);
		603	XRenderFreePicture (dpy, src);
		604
		605	::swap (img->ref, ref);
		606	::swap (img->pm , pm );
		607
		608	delete img;
		609	}
		610
		611	void
		612	rxvt_img::draw (rxvt_img *img, int op, nv mask)
		613	{
		614	unshare ();
		615
		616	Display *dpy = s->display->dpy;
		617	Picture src = img->picture ();
		618	Picture dst = picture ();
		619	Picture mask_p = 0;
		620
		621	if (mask != 1.)
		622	{
		623	mask_p = create_xrender_mask (dpy, img->pm, False, False);
		624	XRenderColor mask_c = { 0, 0, 0, float_to_component (mask) };
262	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);	625	XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
		626	}
263		627
264	XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	628	XRenderComposite (dpy, op, src, mask_p, dst, x - img->x, y - img->y, 0, 0, 0, 0, w, h);
265		629
266	XRenderFreePicture (dpy, src);	630	XRenderFreePicture (dpy, src);
267	XRenderFreePicture (dpy, dst);	631	XRenderFreePicture (dpy, dst);
268	}
269		632
270	void	633	if (mask_p)
271	rxvt_img::contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a)
272	{
273	if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
274	return;
275
276	Display *dpy = s->display->dpy;
277	Picture src = create_xrender_mask (dpy, pm, True);
278	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
279
280	XRenderColor mask_c;
281	mask_c.red = r;
282	mask_c.green = g;
283	mask_c.blue = b;
284	mask_c.alpha = a;
285	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
286
287	XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
288
289	XRenderFreePicture (dpy, src);	634	XRenderFreePicture (dpy, mask_p);
290	XRenderFreePicture (dpy, dst);
291	}
292
293	bool
294	rxvt_img::render_pixbuf (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y)
295	{
296	Display *dpy = s->display->dpy;
297
298	if (s->visual->c_class != TrueColor)
299	return false;
300
301	uint32_t red_mask, green_mask, blue_mask, alpha_mask;
302
303	red_mask = (uint32_t)format->direct.redMask << format->direct.red;
304	green_mask = (uint32_t)format->direct.greenMask << format->direct.green;
305	blue_mask = (uint32_t)format->direct.blueMask << format->direct.blue;
306	alpha_mask = (uint32_t)format->direct.alphaMask << format->direct.alpha;
307
308	int width_r = ecb_popcount32 (red_mask);
309	int width_g = ecb_popcount32 (green_mask);
310	int width_b = ecb_popcount32 (blue_mask);
311	int width_a = ecb_popcount32 (alpha_mask);
312
313	if (width_r > 8 \|\| width_g > 8 \|\| width_b > 8 \|\| width_a > 8)
314	return false;
315
316	int sh_r = ecb_ctz32 (red_mask);
317	int sh_g = ecb_ctz32 (green_mask);
318	int sh_b = ecb_ctz32 (blue_mask);
319	int sh_a = ecb_ctz32 (alpha_mask);
320
321	if (width > 32767 \|\| height > 32767)
322	return false;
323
324	XImage *ximage = XCreateImage (dpy, s->visual, format->depth, ZPixmap, 0, 0,
325	width, height, 32, 0);
326	if (!ximage)
327	return false;
328
329	if (height > INT_MAX / ximage->bytes_per_line
330	\|\| !(ximage->data = (char )malloc (height ximage->bytes_per_line)))
331	{
332	XDestroyImage (ximage);
333	return false;
334	}
335
336	GC gc = XCreateGC (dpy, pm, 0, 0);
337
338	ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
339
340	int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
341	int channels = gdk_pixbuf_get_n_channels (pixbuf);
342	unsigned char row = gdk_pixbuf_get_pixels (pixbuf) + src_y rowstride + src_x * channels;
343	char *line = ximage->data;
344
345	for (int y = 0; y < height; y++)
346	{
347	for (int x = 0; x < width; x++)
348	{
349	unsigned char pixel = row + x channels;
350	uint32_t value;
351	unsigned char r, g, b, a;
352
353	if (channels == 4)
354	{
355	a = pixel[3];
356	r = pixel[0] * a / 0xff;
357	g = pixel[1] * a / 0xff;
358	b = pixel[2] * a / 0xff;
359	}
360	else
361	{
362	a = 0xff;
363	r = pixel[0];
364	g = pixel[1];
365	b = pixel[2];
366	}
367
368	value = ((r >> (8 - width_r)) << sh_r)
369	\| ((g >> (8 - width_g)) << sh_g)
370	\| ((b >> (8 - width_b)) << sh_b)
371	\| ((a >> (8 - width_a)) << sh_a);
372
373	if (ximage->bits_per_pixel == 32)
374	((uint32_t *)line)[x] = value;
375	else
376	XPutPixel (ximage, x, y, value);
377	}
378
379	row += rowstride;
380	line += ximage->bytes_per_line;
381	}
382
383	XPutImage (dpy, pm, gc, ximage, 0, 0, dst_x, dst_y, width, height);
384	XDestroyImage (ximage);
385	XFreeGC (dpy, gc);
386
387	return true;
388	}	635	}
389		636
390	rxvt_img *	637	rxvt_img *
391	rxvt_img::clone ()	638	rxvt_img::clone ()
392	{	639	{
…		…
399	if (x == 0 && y == 0 && w == ref->w && h == ref->h)	646	if (x == 0 && y == 0 && w == ref->w && h == ref->h)
400	return clone ();	647	return clone ();
401		648
402	Display *dpy = s->display->dpy;	649	Display *dpy = s->display->dpy;
403		650
		651	// add an alpha channel if...
404	bool alpha = !format->direct.alphaMask	652	bool alpha = !format->direct.alphaMask // pixmap has none yet
405	&& (x \|\| y)	653	&& (x \|\| y) // we need one because of non-zero offset
406	&& repeat == RepeatNone;	654	&& repeat == RepeatNone; // and we have no good pixels to fill with
407		655
408	rxvt_img *img = new rxvt_img (s, alpha ? XRenderFindStandardFormat (dpy, PictStandardARGB32) : format, 0, 0, w, h, repeat);	656	rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
409	img->alloc ();	657	img->alloc ();
410		658
411	Picture src = src_picture ();	659	Picture src = picture ();
412	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	660	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
413		661
414	if (alpha)	662	if (alpha)
415	{	663	{
416	XRenderColor rc = { 0, 0, 0, 0 };	664	XRenderColor rc = { 0, 0, 0, 0 };
417	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles	665	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
418	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h);	666	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, x, y, ref->w, ref->h);
419	}	667	}
420	else	668	else
421	XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);	669	XRenderComposite (dpy, PictOpSrc, src, None, dst, -x, -y, 0, 0, 0, 0, w, h);
422		670
423	XRenderFreePicture (dpy, src);	671	XRenderFreePicture (dpy, src);
424	XRenderFreePicture (dpy, dst);	672	XRenderFreePicture (dpy, dst);
425		673
426	return img;	674	return img;
…		…
429	rxvt_img *	677	rxvt_img *
430	rxvt_img::sub_rect (int x, int y, int width, int height)	678	rxvt_img::sub_rect (int x, int y, int width, int height)
431	{	679	{
432	rxvt_img *img = clone ();	680	rxvt_img *img = clone ();
433		681
434	img->x += x;	682	img->x -= x;
435	img->y += y;	683	img->y -= y;
436		684
437	if (w != width \|\| h != height)	685	if (w != width \|\| h != height)
438	{	686	{
439	img->w = width;	687	img->w = width;
440	img->h = height;	688	img->h = height;
…		…
446		694
447	return img;	695	return img;
448	}	696	}
449		697
450	rxvt_img *	698	rxvt_img *
451	rxvt_img::transform (int new_width, int new_height, double matrix[9])	699	rxvt_img::transform (nv matrix[3][3])
452	{	700	{
		701	// calculate new pixel bounding box coordinates
		702	nv r[2], rmin[2], rmax[2];
		703
		704	mat3x3 m (matrix);
		705
		706	for (int i = 0; i < 2; ++i)
		707	{
		708	nv v;
		709
		710	v = m.apply1 (i, 0+x, 0+y); rmin [i] = rmax [i] = v; r [i] = v;
		711	v = m.apply1 (i, w+x, 0+y); min_it (rmin [i], v); max_it (rmax [i], v);
		712	v = m.apply1 (i, 0+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v);
		713	v = m.apply1 (i, w+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v);
		714	}
		715
		716	float sx = rmin [0] - x;
		717	float sy = rmin [1] - y;
		718
		719	// TODO: adjust matrix for subpixel accuracy
		720	int nx = floor (rmin [0]);
		721	int ny = floor (rmin [1]);
		722
		723	int new_width = ceil (rmax [0] - rmin [0]);
		724	int new_height = ceil (rmax [1] - rmin [1]);
		725
		726	m = mat3x3::translate (-x, -y) * m * mat3x3::translate (x, y);
		727
		728	mat3x3 inv = m.invert ();
		729
453	rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat);	730	rxvt_img *img = new rxvt_img (s, format, nx, ny, new_width, new_height, repeat);
454	img->alloc ();	731	img->alloc ();
455		732
456	Display *dpy = s->display->dpy;	733	Display *dpy = s->display->dpy;
457	Picture src = src_picture ();	734	Picture src = picture ();
458	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	735	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
459		736
460	XTransform xfrm;	737	XTransform xfrm;
461		738
462	for (int i = 0; i < 3; ++i)	739	for (int i = 0; i < 3; ++i)
463	for (int j = 0; j < 3; ++j)	740	for (int j = 0; j < 3; ++j)
464	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);	741	xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);
465
466	#if 0
467	xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
468	xfrm.matrix [1][2] -= XDoubleToFixed (y);
469	#endif
470		742
471	XRenderSetPictureFilter (dpy, src, "good", 0, 0);	743	XRenderSetPictureFilter (dpy, src, "good", 0, 0);
472	XRenderSetPictureTransform (dpy, src, &xfrm);	744	XRenderSetPictureTransform (dpy, src, &xfrm);
473	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);	745	XRenderComposite (dpy, PictOpSrc, src, None, dst, sx, sy, 0, 0, 0, 0, new_width, new_height);
		746	#if 1
		747	{
		748	XRenderColor rc = { 65535,0,0,65535 };
		749	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, new_width, new_height);
		750	}{
		751	XRenderColor rc = { 0,0,0,65535 };
		752	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 1, 1, new_width - 2, new_height - 2);
		753	}
		754	XRenderComposite (dpy, PictOpOver, src, None, dst, sx, sy, 0, 0, 0, 0, new_width, new_height);
		755	#endif
474		756
475	XRenderFreePicture (dpy, src);	757	XRenderFreePicture (dpy, src);
476	XRenderFreePicture (dpy, dst);	758	XRenderFreePicture (dpy, dst);
477		759
478	return img;	760	return img;
…		…
482	rxvt_img::scale (int new_width, int new_height)	764	rxvt_img::scale (int new_width, int new_height)
483	{	765	{
484	if (w == new_width && h == new_height)	766	if (w == new_width && h == new_height)
485	return clone ();	767	return clone ();
486		768
487	double matrix[9] = {	769	nv matrix[3][3] = {
488	w / (double)new_width, 0, 0,	770	{ new_width / (nv)w, 0, 0 },
489	0, h / (double)new_height, 0,	771	{ 0, new_height / (nv)h, 0 },
490	0, 0, 1	772	{ 0, 0, 1 }
491	};	773	};
492		774
493	int old_repeat_mode = repeat;	775	int old_repeat_mode = repeat;
494	repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems	776	repeat = RepeatPad; // not right, but xrender can't properly scale it seems
495		777
496	rxvt_img *img = transform (new_width, new_height, matrix);	778	rxvt_img *img = transform (matrix);
497		779
498	repeat = old_repeat_mode;	780	repeat = old_repeat_mode;
499	img->repeat = repeat;	781	img->repeat = repeat;
500		782
501	return img;	783	return img;
502	}	784	}
503		785
504	rxvt_img *	786	rxvt_img *
505	rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)	787	rxvt_img::rotate (int cx, int cy, nv phi)
506	{	788	{
507	double s = sin (phi);	789	nv s = sin (phi);
508	double c = cos (phi);	790	nv c = cos (phi);
509		791
510	double matrix[9] = {	792	nv matrix[3][3] = {
		793	#if 0
511	c, -s, -c * x + s * y + x,	794	{ c, -s, cx - c * cx + s * cy },
512	s, c, -s * x - c * y + y,	795	{ s, c, cy - s * cx - c * cy },
513	0, 0, 1	796	{ 0, 0, 1 }
		797	#else
		798	{ c, -s, 0 },
		799	{ s, c, 0 },
		800	{ 0, 0, 1 }
		801	#endif
514	};	802	};
515		803
516	return transform (new_width, new_height, matrix);	804	move (-cx, -cy);
517	}	805	rxvt_img *img = transform (matrix);
		806	move ( cx, cy);
		807	img->move (cx, cy);
518		808
		809	return img;
		810	}
		811
519	rxvt_img *	812	rxvt_img *
520	rxvt_img::convert_to (XRenderPictFormat *new_format, const rxvt_color &bg)	813	rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg)
521	{	814	{
522	if (new_format == format)	815	if (new_format == format)
523	return clone ();	816	return clone ();
524		817
525	rxvt_img *img = new rxvt_img (s, new_format, 0, 0, w, h, repeat);	818	rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);
526	img->alloc ();	819	img->alloc ();
527		820
528	Display *dpy = s->display->dpy;	821	Display *dpy = s->display->dpy;
529	Picture src = src_picture ();	822	Picture src = picture ();
530	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);	823	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
531	int op = PictOpSrc;	824	int op = PictOpSrc;
532		825
533	if (format->direct.alphaMask && !new_format->direct.alphaMask)	826	if (format->direct.alphaMask && !new_format->direct.alphaMask)
534	{	827	{
535	// does it have to be that complicated	828	// does it have to be that complicated
536	rgba c;
537	bg.get (c);
538
539	XRenderColor rc = { c.r, c.g, c.b, 0xffff };	829	XRenderColor rc = { bg.r, bg.g, bg.b, bg.a };
540	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);	830	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);
541		831
542	op = PictOpOver;	832	op = PictOpOver;
543	}	833	}
544		834
…		…
549		839
550	return img;	840	return img;
551	}	841	}
552		842
553	rxvt_img *	843	rxvt_img *
554	rxvt_img::blend (rxvt_img *img, double factor)	844	rxvt_img::blend (rxvt_img *img, nv factor)
555	{	845	{
556	rxvt_img *img2 = clone ();	846	rxvt_img *img2 = clone ();
557	Display *dpy = s->display->dpy;	847	Display *dpy = s->display->dpy;
558	Picture src = img->src_picture ();	848	Picture src = img->picture ();
559	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);	849	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
560	Picture mask = create_xrender_mask (dpy, img->pm, False);	850	Picture mask = create_xrender_mask (dpy, img->pm, False, False);
561		851
562	XRenderColor mask_c;	852	XRenderColor mask_c;
563		853
564	mask_c.alpha = float_to_component (factor);	854	mask_c.alpha = float_to_component (factor);
565	mask_c.red =	855	mask_c.red =

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.44 by root, Thu Jun 7 13:12:08 2012 UTC vs. Revision 1.93 by root, Fri Jun 15 18:07:24 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.44 by root, Thu Jun 7 13:12:08 2012 UTC vs.
Revision 1.93 by root, Fri Jun 15 18:07:24 2012 UTC