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

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.76 by root, Sun Jun 10 10:29:26 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
		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
…		…
166		317
167	g_object_unref (pb);	318	g_object_unref (pb);
168		319
169	return img;	320	return img;
170	}	321	}
		322
171	# endif	323	# endif
172		324
173	void	325	void
174	rxvt_img::destroy ()	326	rxvt_img::destroy ()
175	{	327	{
…		…
193	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);
194	ref = new pixref (w, h);	346	ref = new pixref (w, h);
195	}	347	}
196		348
197	Picture	349	Picture
198	rxvt_img::src_picture ()	350	rxvt_img::picture ()
199	{	351	{
200	Display *dpy = s->display->dpy;	352	Display *dpy = s->display->dpy;
201		353
202	XRenderPictureAttributes pa;	354	XRenderPictureAttributes pa;
203	pa.repeat = repeat;	355	pa.repeat = repeat;
…		…
222	pm = pm2;	374	pm = pm2;
223	ref = new pixref (ref->w, ref->h);	375	ref = new pixref (ref->w, ref->h);
224	}	376	}
225		377
226	void	378	void
227	rxvt_img::fill (const rxvt_color &c)	379	rxvt_img::fill (const rgba &c)
228	{	380	{
229	XGCValues gcv;	381	XRenderColor rc = { c.r, c.g, c.b, c.a };
230	gcv.foreground = c;	382
231	GC gc = XCreateGC (s->display->dpy, pm, GCForeground, &gcv);	383	Display *dpy = s->display->dpy;
232	XFillRectangle (s->display->dpy, pm, gc, 0, 0, w, h);	384	Picture src = picture ();
233	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;
234	}	412	}
235		413
236	static void	414	static void
237	get_gaussian_kernel (int radius, int width, double kernel, XFixed params)	415	get_gaussian_kernel (int radius, int width, nv kernel, XFixed params)
238	{	416	{
239	double sigma = radius / 2.0;	417	nv sigma = radius / 2.0;
240	double scale = sqrt (2.0 * M_PI) * sigma;	418	nv scale = sqrt (2.0 * M_PI) * sigma;
241	double sum = 0.0;	419	nv sum = 0.0;
242		420
243	for (int i = 0; i < width; i++)	421	for (int i = 0; i < width; i++)
244	{	422	{
245	double x = i - width / 2;	423	nv x = i - width / 2;
246	kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;	424	kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
247	sum += kernel[i];	425	sum += kernel[i];
248	}	426	}
249		427
250	params[0] = XDoubleToFixed (width);	428	params[0] = XDoubleToFixed (width);
…		…
260	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))	438	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))
261	return clone ();	439	return clone ();
262		440
263	Display *dpy = s->display->dpy;	441	Display *dpy = s->display->dpy;
264	int size = max (rh, rv) * 2 + 1;	442	int size = max (rh, rv) * 2 + 1;
265	double kernel = (double )malloc (size * sizeof (double));	443	nv kernel = (nv )malloc (size * sizeof (nv));
266	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));	444	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
267	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);
268	img->alloc ();	446	img->alloc ();
269		447
270	XRenderPictureAttributes pa;	448	XRenderPictureAttributes pa;
…		…
308	w, h);	486	w, h);
309	}	487	}
310		488
311	free (kernel);	489	free (kernel);
312	free (params);	490	free (params);
		491
313	XRenderFreePicture (dpy, src);	492	XRenderFreePicture (dpy, src);
314	XRenderFreePicture (dpy, dst);	493	XRenderFreePicture (dpy, dst);
315	XRenderFreePicture (dpy, tmp);	494	XRenderFreePicture (dpy, tmp);
316		495
317	return img;	496	return img;
…		…
391	if (r < 0 \|\| g < 0 \|\| b < 0 \|\| a < 0)	570	if (r < 0 \|\| g < 0 \|\| b < 0 \|\| a < 0)
392	rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");	571	rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");
393		572
394	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);	573	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
395	img->alloc ();	574	img->alloc ();
396		575	img->fill (rgba (0, 0, 0, 0));
397	{
398	rxvt_color empty;
399	empty.set (s, rgba (0, 0, 0, 0));
400	img->fill (empty);
401	}
402		576
403	// premultiply (yeah, these are not exact, sue me or fix it)	577	// premultiply (yeah, these are not exact, sue me or fix it)
404	r = (r * (a >> 8)) >> 8;	578	r = (r * (a >> 8)) >> 8;
405	g = (g * (a >> 8)) >> 8;	579	g = (g * (a >> 8)) >> 8;
406	b = (b * (a >> 8)) >> 8;	580	b = (b * (a >> 8)) >> 8;
407		581
408	Display *dpy = s->display->dpy;	582	Display *dpy = s->display->dpy;
409		583
410	Picture src = src_picture ();	584	Picture src = picture ();
411	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);	585	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
412	Picture mul = create_xrender_mask (dpy, pm, True, True);	586	Picture mul = create_xrender_mask (dpy, pm, True, True);
413		587
414	//TODO: this operator does not yet implement some useful contrast	588	//TODO: this operator does not yet implement some useful contrast
415	while (r \| g \| b \| a)	589	while (r \| g \| b \| a)
…		…
432	::swap (img->pm , pm );	606	::swap (img->pm , pm );
433		607
434	delete img;	608	delete img;
435	}	609	}
436		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) };
		625	XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
		626	}
		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);
		631	XRenderFreePicture (dpy, dst);
		632
		633	if (mask_p)
		634	XRenderFreePicture (dpy, mask_p);
		635	}
		636
437	rxvt_img *	637	rxvt_img *
438	rxvt_img::clone ()	638	rxvt_img::clone ()
439	{	639	{
440	return new rxvt_img (*this);	640	return new rxvt_img (*this);
441	}
442
443	static XRenderPictFormat *
444	find_alpha_format_for (Display dpy, XRenderPictFormat format)
445	{
446	if (format->direct.alphaMask)
447	return format; // already has alpha
448
449	// try to find a suitable alpha format, one bit alpha is enough for our purposes
450	if (format->type == PictTypeDirect)
451	for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
452	if (f->direct.alphaMask
453	&& f->type == PictTypeDirect
454	&& ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
455	&& ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
456	&& ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
457	return f;
458
459	// should be a very good fallback
460	return XRenderFindStandardFormat (dpy, PictStandardARGB32);
461	}	641	}
462		642
463	rxvt_img *	643	rxvt_img *
464	rxvt_img::reify ()	644	rxvt_img::reify ()
465	{	645	{
…		…
474	&& repeat == RepeatNone; // and we have no good pixels to fill with	654	&& repeat == RepeatNone; // and we have no good pixels to fill with
475		655
476	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);
477	img->alloc ();	657	img->alloc ();
478		658
479	Picture src = src_picture ();	659	Picture src = picture ();
480	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	660	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
481		661
482	if (alpha)	662	if (alpha)
483	{	663	{
484	XRenderColor rc = { 0, 0, 0, 0 };	664	XRenderColor rc = { 0, 0, 0, 0 };
485	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
486	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);
487	}	667	}
488	else	668	else
489	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);
490		670
491	XRenderFreePicture (dpy, src);	671	XRenderFreePicture (dpy, src);
492	XRenderFreePicture (dpy, dst);	672	XRenderFreePicture (dpy, dst);
493		673
494	return img;	674	return img;
…		…
497	rxvt_img *	677	rxvt_img *
498	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)
499	{	679	{
500	rxvt_img *img = clone ();	680	rxvt_img *img = clone ();
501		681
502	img->x += x;	682	img->x -= x;
503	img->y += y;	683	img->y -= y;
504		684
505	if (w != width \|\| h != height)	685	if (w != width \|\| h != height)
506	{	686	{
507	img->w = width;	687	img->w = width;
508	img->h = height;	688	img->h = height;
…		…
514		694
515	return img;	695	return img;
516	}	696	}
517		697
518	rxvt_img *	698	rxvt_img *
519	rxvt_img::transform (int new_width, int new_height, double matrix[9])	699	rxvt_img::transform (nv matrix[3][3])
520	{	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
521	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);
522	img->alloc ();	731	img->alloc ();
523		732
524	Display *dpy = s->display->dpy;	733	Display *dpy = s->display->dpy;
525	Picture src = src_picture ();	734	Picture src = picture ();
526	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	735	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
527		736
528	XTransform xfrm;	737	XTransform xfrm;
529		738
530	for (int i = 0; i < 3; ++i)	739	for (int i = 0; i < 3; ++i)
531	for (int j = 0; j < 3; ++j)	740	for (int j = 0; j < 3; ++j)
532	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);	741	xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);
533
534	xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
535	xfrm.matrix [1][2] -= XDoubleToFixed (y);
536		742
537	XRenderSetPictureFilter (dpy, src, "good", 0, 0);	743	XRenderSetPictureFilter (dpy, src, "good", 0, 0);
538	XRenderSetPictureTransform (dpy, src, &xfrm);	744	XRenderSetPictureTransform (dpy, src, &xfrm);
539	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
540		756
541	XRenderFreePicture (dpy, src);	757	XRenderFreePicture (dpy, src);
542	XRenderFreePicture (dpy, dst);	758	XRenderFreePicture (dpy, dst);
543		759
544	return img;	760	return img;
…		…
548	rxvt_img::scale (int new_width, int new_height)	764	rxvt_img::scale (int new_width, int new_height)
549	{	765	{
550	if (w == new_width && h == new_height)	766	if (w == new_width && h == new_height)
551	return clone ();	767	return clone ();
552		768
553	double matrix[9] = {	769	nv matrix[3][3] = {
554	w / (double)new_width, 0, 0,	770	{ new_width / (nv)w, 0, 0 },
555	0, h / (double)new_height, 0,	771	{ 0, new_height / (nv)h, 0 },
556	0, 0, 1	772	{ 0, 0, 1 }
557	};	773	};
558		774
559	int old_repeat_mode = repeat;	775	int old_repeat_mode = repeat;
560	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
561		777
562	rxvt_img *img = transform (new_width, new_height, matrix);	778	rxvt_img *img = transform (matrix);
563		779
564	repeat = old_repeat_mode;	780	repeat = old_repeat_mode;
565	img->repeat = repeat;	781	img->repeat = repeat;
566		782
567	return img;	783	return img;
568	}	784	}
569		785
570	rxvt_img *	786	rxvt_img *
571	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)
572	{	788	{
573	double s = sin (phi);	789	nv s = sin (phi);
574	double c = cos (phi);	790	nv c = cos (phi);
575		791
576	double matrix[9] = {	792	nv matrix[3][3] = {
		793	#if 0
577	c, -s, -c * x + s * y + x,	794	{ c, -s, cx - c * cx + s * cy },
578	s, c, -s * x - c * y + y,	795	{ s, c, cy - s * cx - c * cy },
579	0, 0, 1	796	{ 0, 0, 1 }
		797	#else
		798	{ c, -s, 0 },
		799	{ s, c, 0 },
		800	{ 0, 0, 1 }
		801	#endif
580	};	802	};
581		803
582	return transform (new_width, new_height, matrix);	804	move (-cx, -cy);
583	}	805	rxvt_img *img = transform (matrix);
		806	move ( cx, cy);
		807	img->move (cx, cy);
584		808
		809	return img;
		810	}
		811
585	rxvt_img *	812	rxvt_img *
586	rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg)	813	rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg)
587	{	814	{
588	if (new_format == format)	815	if (new_format == format)
589	return clone ();	816	return clone ();
590		817
591	rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);	818	rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);
592	img->alloc ();	819	img->alloc ();
593		820
594	Display *dpy = s->display->dpy;	821	Display *dpy = s->display->dpy;
595	Picture src = src_picture ();	822	Picture src = picture ();
596	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);	823	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
597	int op = PictOpSrc;	824	int op = PictOpSrc;
598		825
599	if (format->direct.alphaMask && !new_format->direct.alphaMask)	826	if (format->direct.alphaMask && !new_format->direct.alphaMask)
600	{	827	{
601	// does it have to be that complicated	828	// does it have to be that complicated
602	rgba c;
603	bg.get (c);
604
605	XRenderColor rc = { c.r, c.g, c.b, 0xffff };	829	XRenderColor rc = { bg.r, bg.g, bg.b, bg.a };
606	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);	830	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);
607		831
608	op = PictOpOver;	832	op = PictOpOver;
609	}	833	}
610		834
…		…
615		839
616	return img;	840	return img;
617	}	841	}
618		842
619	rxvt_img *	843	rxvt_img *
620	rxvt_img::blend (rxvt_img *img, double factor)	844	rxvt_img::blend (rxvt_img *img, nv factor)
621	{	845	{
622	rxvt_img *img2 = clone ();	846	rxvt_img *img2 = clone ();
623	Display *dpy = s->display->dpy;	847	Display *dpy = s->display->dpy;
624	Picture src = img->src_picture ();	848	Picture src = img->picture ();
625	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);	849	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
626	Picture mask = create_xrender_mask (dpy, img->pm, False, False);	850	Picture mask = create_xrender_mask (dpy, img->pm, False, False);
627		851
628	XRenderColor mask_c;	852	XRenderColor mask_c;
629		853

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.76 by root, Sun Jun 10 10:29:26 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.76 by root, Sun Jun 10 10:29:26 2012 UTC vs.
Revision 1.93 by root, Fri Jun 15 18:07:24 2012 UTC