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

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.73 by sf-exg, Sat Jun 9 17:28:03 2012 UTC vs.
Revision 1.94 by root, Fri Jun 15 18:10:40 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 (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	}
6		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	{
50		200
51	return img;	201	return img;
52	}	202	}
53		203
54	# if HAVE_PIXBUF	204	# if HAVE_PIXBUF
		205
55	rxvt_img *	206	rxvt_img *
56	rxvt_img::new_from_pixbuf (rxvt_screen s, GdkPixbuf pb)	207	rxvt_img::new_from_pixbuf (rxvt_screen s, GdkPixbuf pb)
57	{	208	{
58	Display *dpy = s->display->dpy;	209	Display *dpy = s->display->dpy;
59		210
…		…
63	if (width > 32767 \|\| height > 32767) // well, we could upload in chunks	214	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");	215	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big (maximum size 32768x32768).\n");
65		216
66	// since we require rgb24/argb32 formats from xrender we assume	217	// 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	218	// 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		219
70	int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;	220	int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
71		221
72	XImage xi;	222	XImage xi;
73		223
…		…
77	xi.format = ZPixmap;	227	xi.format = ZPixmap;
78	xi.byte_order = ImageByteOrder (dpy);	228	xi.byte_order = ImageByteOrder (dpy);
79	xi.bitmap_unit = 0; //XY only, unused	229	xi.bitmap_unit = 0; //XY only, unused
80	xi.bitmap_bit_order = 0; //XY only, unused	230	xi.bitmap_bit_order = 0; //XY only, unused
81	xi.bitmap_pad = BitmapPad (dpy);	231	xi.bitmap_pad = BitmapPad (dpy);
82	xi.depth = depth;	232	xi.depth = 32;
83	xi.bytes_per_line = 0;	233	xi.bytes_per_line = 0;
84	xi.bits_per_pixel = 32; //Z only	234	xi.bits_per_pixel = 32; //Z only
85	xi.red_mask = 0x00000000; //Z only, unused	235	xi.red_mask = 0x00000000; //Z only, unused
86	xi.green_mask = 0x00000000; //Z only, unused	236	xi.green_mask = 0x00000000; //Z only, unused
87	xi.blue_mask = 0x00000000; //Z only, unused	237	xi.blue_mask = 0x00000000; //Z only, unused
…		…
96	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n");	246	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n");
97		247
98	xi.data = (char )rxvt_malloc (height xi.bytes_per_line);	248	xi.data = (char )rxvt_malloc (height xi.bytes_per_line);
99		249
100	int rowstride = gdk_pixbuf_get_rowstride (pb);	250	int rowstride = gdk_pixbuf_get_rowstride (pb);
101		251	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);	252	unsigned char *row = gdk_pixbuf_get_pixels (pb);
		253
104	char *line = xi.data;	254	char *line = xi.data;
105		255
106	for (int y = 0; y < height; y++)	256	for (int y = 0; y < height; y++)
107	{	257	{
108	unsigned char *src = row;	258	unsigned char *src = row;
109	uint32_t dst = (uint32_t )line;	259	uint32_t dst = (uint32_t )line;
110		260
111	if (depth == 24)	261	if (!pb_has_alpha)
112	for (int x = 0; x < width; x++)	262	for (int x = 0; x < width; x++)
113	{	263	{
114	uint8_t r = *src++;	264	uint8_t r = *src++;
115	uint8_t g = *src++;	265	uint8_t g = *src++;
116	uint8_t b = *src++;	266	uint8_t b = *src++;
117		267
118	uint32_t v = (r << 16) \| (g << 8) \| b;	268	uint32_t v = (255 << 24) \| (r << 16) \| (g << 8) \| b;
119		269
120	if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)	270	if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
121	v = ecb_bswap32 (v);	271	v = ecb_bswap32 (v);
122		272
123	*dst++ = v;	273	*dst++ = v;
…		…
140		290
141	row += rowstride;	291	row += rowstride;
142	line += xi.bytes_per_line;	292	line += xi.bytes_per_line;
143	}	293	}
144		294
145	rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, depth == 24 ? PictStandardRGB24 : PictStandardARGB32), 0, 0, width, height);	295	rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, PictStandardARGB32), 0, 0, width, height);
146	img->alloc ();	296	img->alloc ();
147		297
148	GC gc = XCreateGC (dpy, img->pm, 0, 0);	298	GC gc = XCreateGC (dpy, img->pm, 0, 0);
149	XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height);	299	XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height);
150	XFreeGC (dpy, gc);	300	XFreeGC (dpy, gc);
…		…
167		317
168	g_object_unref (pb);	318	g_object_unref (pb);
169		319
170	return img;	320	return img;
171	}	321	}
		322
172	# endif	323	# endif
173		324
174	void	325	void
175	rxvt_img::destroy ()	326	rxvt_img::destroy ()
176	{	327	{
…		…
194	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);
195	ref = new pixref (w, h);	346	ref = new pixref (w, h);
196	}	347	}
197		348
198	Picture	349	Picture
199	rxvt_img::src_picture ()	350	rxvt_img::picture ()
200	{	351	{
201	Display *dpy = s->display->dpy;	352	Display *dpy = s->display->dpy;
202		353
203	XRenderPictureAttributes pa;	354	XRenderPictureAttributes pa;
204	pa.repeat = repeat;	355	pa.repeat = repeat;
…		…
223	pm = pm2;	374	pm = pm2;
224	ref = new pixref (ref->w, ref->h);	375	ref = new pixref (ref->w, ref->h);
225	}	376	}
226		377
227	void	378	void
228	rxvt_img::fill (const rxvt_color &c)	379	rxvt_img::fill (const rgba &c)
229	{	380	{
230	XGCValues gcv;	381	XRenderColor rc = { c.r, c.g, c.b, c.a };
231	gcv.foreground = c;	382
232	GC gc = XCreateGC (s->display->dpy, pm, GCForeground, &gcv);	383	Display *dpy = s->display->dpy;
233	XFillRectangle (s->display->dpy, pm, gc, 0, 0, w, h);	384	Picture src = picture ();
234	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;
235	}	412	}
236		413
237	static void	414	static void
238	get_gaussian_kernel (int radius, int width, double kernel, XFixed params)	415	get_gaussian_kernel (int radius, int width, nv kernel, XFixed params)
239	{	416	{
240	double sigma = radius / 2.0;	417	nv sigma = radius / 2.0;
241	double scale = sqrt (2.0 * M_PI) * sigma;	418	nv scale = sqrt (2.0 * M_PI) * sigma;
242	double sum = 0.0;	419	nv sum = 0.0;
243		420
244	for (int i = 0; i < width; i++)	421	for (int i = 0; i < width; i++)
245	{	422	{
246	double x = i - width / 2;	423	nv x = i - width / 2;
247	kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;	424	kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
248	sum += kernel[i];	425	sum += kernel[i];
249	}	426	}
250		427
251	params[0] = XDoubleToFixed (width);	428	params[0] = XDoubleToFixed (width);
…		…
261	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))	438	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))
262	return clone ();	439	return clone ();
263		440
264	Display *dpy = s->display->dpy;	441	Display *dpy = s->display->dpy;
265	int size = max (rh, rv) * 2 + 1;	442	int size = max (rh, rv) * 2 + 1;
266	double kernel = (double )malloc (size * sizeof (double));	443	nv kernel = (nv )malloc (size * sizeof (nv));
267	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));	444	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
268	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);
269	img->alloc ();	446	img->alloc ();
270		447
271	XRenderPictureAttributes pa;	448	XRenderPictureAttributes pa;
…		…
309	w, h);	486	w, h);
310	}	487	}
311		488
312	free (kernel);	489	free (kernel);
313	free (params);	490	free (params);
		491
314	XRenderFreePicture (dpy, src);	492	XRenderFreePicture (dpy, src);
315	XRenderFreePicture (dpy, dst);	493	XRenderFreePicture (dpy, dst);
316	XRenderFreePicture (dpy, tmp);	494	XRenderFreePicture (dpy, tmp);
317		495
318	return img;	496	return img;
		497	}
		498
		499	static Picture
		500	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha)
		501	{
		502	Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
		503
		504	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
		505	XRenderPictureAttributes pa;
		506	pa.repeat = RepeatNormal;
		507	pa.component_alpha = component_alpha;
		508	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat \| CPComponentAlpha, &pa);
		509
		510	XFreePixmap (dpy, pixmap);
		511
		512	return mask;
319	}	513	}
320		514
321	static void	515	static void
322	extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)	516	extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)
323	{	517	{
…		…
365	XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);	559	XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
366	XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);	560	XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
367	}	561	}
368	}	562	}
369		563
370
371	XRenderFreePicture (dpy, dst);	564	XRenderFreePicture (dpy, dst);
372	}	565	}
373		566
374	void	567	void
375	rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)	568	rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
376	{	569	{
377	if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))	570	if (r < 0 \|\| g < 0 \|\| b < 0 \|\| a < 0)
378	{	571	rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");
379	rxvt_warn ("rxvt_img::contrast operation not supported on this display, RENDER extension too old.\n");	572
380	return;	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)
381	}	590	{
		591	unsigned short xr, xg, xb, xa;
		592	XRenderColor mask_c;
382		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	{
383	unshare ();	614	unshare ();
384		615
385	Display *dpy = s->display->dpy;	616	Display *dpy = s->display->dpy;
386	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	617	Picture src = img->picture ();
387		618	Picture dst = picture ();
388	XRenderColor mask_c;	619	Picture mask_p = 0;
389	mask_c.red = r;	620
390	mask_c.green = g;	621	if (mask != 1.)
391	mask_c.blue = b;	622	{
392	mask_c.alpha = a;	623	mask_p = create_xrender_mask (dpy, img->pm, False, False);
		624	XRenderColor mask_c = { 0, 0, 0, float_to_component (mask) };
393	XRenderFillRectangle (dpy, PictOpMultiply, dst, &mask_c, 0, 0, w, h);	625	XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
		626	}
394		627
		628	XRenderComposite (dpy, op, src, mask_p, dst, x - img->x, y - img->y, 0, 0, 0, 0, w, h);
		629
		630	XRenderFreePicture (dpy, src);
395	XRenderFreePicture (dpy, dst);	631	XRenderFreePicture (dpy, dst);
		632
		633	if (mask_p)
		634	XRenderFreePicture (dpy, mask_p);
396	}	635	}
397		636
398	rxvt_img *	637	rxvt_img *
399	rxvt_img::clone ()	638	rxvt_img::clone ()
400	{	639	{
401	return new rxvt_img (*this);	640	return new rxvt_img (*this);
402	}
403
404	static XRenderPictFormat *
405	find_alpha_format_for (Display dpy, XRenderPictFormat format)
406	{
407	if (format->direct.alphaMask)
408	return format; // already has alpha
409
410	// try to find a suitable alpha format, one bit alpha is enough for our purposes
411	if (format->type == PictTypeDirect)
412	for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
413	if (f->direct.alphaMask
414	&& f->type == PictTypeDirect
415	&& ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
416	&& ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
417	&& ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
418	return f;
419
420	// should be a very good fallback
421	return XRenderFindStandardFormat (dpy, PictStandardARGB32);
422	}	641	}
423		642
424	rxvt_img *	643	rxvt_img *
425	rxvt_img::reify ()	644	rxvt_img::reify ()
426	{	645	{
…		…
435	&& repeat == RepeatNone; // and we have no good pixels to fill with	654	&& repeat == RepeatNone; // and we have no good pixels to fill with
436		655
437	rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : 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);
438	img->alloc ();	657	img->alloc ();
439		658
440	Picture src = src_picture ();	659	Picture src = picture ();
441	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	660	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
442		661
443	if (alpha)	662	if (alpha)
444	{	663	{
445	XRenderColor rc = { 0, 0, 0, 0 };	664	XRenderColor rc = { 0, 0, 0, 0 };
446	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
447	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);
448	}	667	}
449	else	668	else
450	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);
451		670
452	XRenderFreePicture (dpy, src);	671	XRenderFreePicture (dpy, src);
453	XRenderFreePicture (dpy, dst);	672	XRenderFreePicture (dpy, dst);
454		673
455	return img;	674	return img;
…		…
458	rxvt_img *	677	rxvt_img *
459	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)
460	{	679	{
461	rxvt_img *img = clone ();	680	rxvt_img *img = clone ();
462		681
463	img->x += x;	682	img->x -= x;
464	img->y += y;	683	img->y -= y;
465		684
466	if (w != width \|\| h != height)	685	if (w != width \|\| h != height)
467	{	686	{
468	img->w = width;	687	img->w = width;
469	img->h = height;	688	img->h = height;
…		…
475		694
476	return img;	695	return img;
477	}	696	}
478		697
479	rxvt_img *	698	rxvt_img *
480	rxvt_img::transform (int new_width, int new_height, double matrix[9])	699	rxvt_img::transform (nv matrix[3][3])
481	{	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
482	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);
483	img->alloc ();	731	img->alloc ();
484		732
485	Display *dpy = s->display->dpy;	733	Display *dpy = s->display->dpy;
486	Picture src = src_picture ();	734	Picture src = picture ();
487	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	735	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
488		736
489	XTransform xfrm;	737	XTransform xfrm;
490		738
491	for (int i = 0; i < 3; ++i)	739	for (int i = 0; i < 3; ++i)
492	for (int j = 0; j < 3; ++j)	740	for (int j = 0; j < 3; ++j)
493	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);	741	xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);
494
495	xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
496	xfrm.matrix [1][2] -= XDoubleToFixed (y);
497		742
498	XRenderSetPictureFilter (dpy, src, "good", 0, 0);	743	XRenderSetPictureFilter (dpy, src, "good", 0, 0);
499	XRenderSetPictureTransform (dpy, src, &xfrm);	744	XRenderSetPictureTransform (dpy, src, &xfrm);
500	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);
501		746
502	XRenderFreePicture (dpy, src);	747	XRenderFreePicture (dpy, src);
503	XRenderFreePicture (dpy, dst);	748	XRenderFreePicture (dpy, dst);
504		749
505	return img;	750	return img;
…		…
509	rxvt_img::scale (int new_width, int new_height)	754	rxvt_img::scale (int new_width, int new_height)
510	{	755	{
511	if (w == new_width && h == new_height)	756	if (w == new_width && h == new_height)
512	return clone ();	757	return clone ();
513		758
514	double matrix[9] = {	759	nv matrix[3][3] = {
515	w / (double)new_width, 0, 0,	760	{ new_width / (nv)w, 0, 0 },
516	0, h / (double)new_height, 0,	761	{ 0, new_height / (nv)h, 0 },
517	0, 0, 1	762	{ 0, 0, 1 }
518	};	763	};
519		764
520	int old_repeat_mode = repeat;	765	int old_repeat_mode = repeat;
521	repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems	766	repeat = RepeatPad; // not right, but xrender can't properly scale it seems
522		767
523	rxvt_img *img = transform (new_width, new_height, matrix);	768	rxvt_img *img = transform (matrix);
524		769
525	repeat = old_repeat_mode;	770	repeat = old_repeat_mode;
526	img->repeat = repeat;	771	img->repeat = repeat;
527		772
528	return img;	773	return img;
529	}	774	}
530		775
531	rxvt_img *	776	rxvt_img *
532	rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)	777	rxvt_img::rotate (int cx, int cy, nv phi)
533	{	778	{
534	double s = sin (phi);	779	nv s = sin (phi);
535	double c = cos (phi);	780	nv c = cos (phi);
536		781
537	double matrix[9] = {	782	nv matrix[3][3] = {
		783	#if 0
538	c, -s, -c * x + s * y + x,	784	{ c, -s, cx - c * cx + s * cy },
539	s, c, -s * x - c * y + y,	785	{ s, c, cy - s * cx - c * cy },
540	0, 0, 1	786	{ 0, 0, 1 }
		787	#else
		788	{ c, -s, 0 },
		789	{ s, c, 0 },
		790	{ 0, 0, 1 }
		791	#endif
541	};	792	};
542		793
543	return transform (new_width, new_height, matrix);	794	move (-cx, -cy);
544	}	795	rxvt_img *img = transform (matrix);
		796	move ( cx, cy);
		797	img->move (cx, cy);
545		798
		799	return img;
		800	}
		801
546	rxvt_img *	802	rxvt_img *
547	rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg)	803	rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg)
548	{	804	{
549	if (new_format == format)	805	if (new_format == format)
550	return clone ();	806	return clone ();
551		807
552	rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);	808	rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);
553	img->alloc ();	809	img->alloc ();
554		810
555	Display *dpy = s->display->dpy;	811	Display *dpy = s->display->dpy;
556	Picture src = src_picture ();	812	Picture src = picture ();
557	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);	813	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
558	int op = PictOpSrc;	814	int op = PictOpSrc;
559		815
560	if (format->direct.alphaMask && !new_format->direct.alphaMask)	816	if (format->direct.alphaMask && !new_format->direct.alphaMask)
561	{	817	{
562	// does it have to be that complicated	818	// does it have to be that complicated
563	rgba c;
564	bg.get (c);
565
566	XRenderColor rc = { c.r, c.g, c.b, 0xffff };	819	XRenderColor rc = { bg.r, bg.g, bg.b, bg.a };
567	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);	820	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);
568		821
569	op = PictOpOver;	822	op = PictOpOver;
570	}	823	}
571		824
…		…
576		829
577	return img;	830	return img;
578	}	831	}
579		832
580	rxvt_img *	833	rxvt_img *
581	rxvt_img::blend (rxvt_img *img, double factor)	834	rxvt_img::blend (rxvt_img *img, nv factor)
582	{	835	{
583	rxvt_img *img2 = clone ();	836	rxvt_img *img2 = clone ();
584	Display *dpy = s->display->dpy;	837	Display *dpy = s->display->dpy;
585	Picture src = img->src_picture ();	838	Picture src = img->picture ();
586	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);	839	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
587		840	Picture mask = create_xrender_mask (dpy, img->pm, False, False);
588	Pixmap pixmap = XCreatePixmap (dpy, img->pm, 1, 1, 8);
589	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, PictStandardA8);
590	XRenderPictureAttributes pa;
591	pa.repeat = True;
592	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);
593	XFreePixmap (dpy, pixmap);
594		841
595	XRenderColor mask_c;	842	XRenderColor mask_c;
596		843
597	mask_c.alpha = float_to_component (factor);	844	mask_c.alpha = float_to_component (factor);
598	mask_c.red =	845	mask_c.red =

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.73 by sf-exg, Sat Jun 9 17:28:03 2012 UTC vs. Revision 1.94 by root, Fri Jun 15 18:10:40 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.73 by sf-exg, Sat Jun 9 17:28:03 2012 UTC vs.
Revision 1.94 by root, Fri Jun 15 18:10:40 2012 UTC