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

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

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.66 by root, Fri Jun 8 21:48:07 2012 UTC vs. Revision 1.95 by root, Fri Jun 15 18:36:26 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.66 by root, Fri Jun 8 21:48:07 2012 UTC vs.
Revision 1.95 by root, Fri Jun 15 18:36:26 2012 UTC