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

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.79 by root, Tue Jun 12 10:45:53 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	{
195	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);
196	ref = new pixref (w, h);	375	ref = new pixref (w, h);
197	}	376	}
198		377
199	Picture	378	Picture
200	rxvt_img::src_picture ()	379	rxvt_img::picture ()
201	{	380	{
202	Display *dpy = s->display->dpy;	381	Display *dpy = s->display->dpy;
203		382
204	XRenderPictureAttributes pa;	383	XRenderPictureAttributes pa;
205	pa.repeat = repeat;	384	pa.repeat = repeat;
…		…
224	pm = pm2;	403	pm = pm2;
225	ref = new pixref (ref->w, ref->h);	404	ref = new pixref (ref->w, ref->h);
226	}	405	}
227		406
228	void	407	void
229	rxvt_img::fill (const rxvt_color &c)	408	rxvt_img::fill (const rgba &c)
230	{	409	{
231	rgba cc;
232	c.get (cc);
233	XRenderColor rc = { cc.r, cc.g, cc.b, cc.a };	410	XRenderColor rc = { c.r, c.g, c.b, c.a };
234		411
235	Display *dpy = s->display->dpy;	412	Display *dpy = s->display->dpy;
236	Picture src = src_picture ();	413	Picture src = picture ();
237	XRenderFillRectangle (dpy, PictOpSrc, src, &rc, 0, 0, w, h);	414	XRenderFillRectangle (dpy, PictOpSrc, src, &rc, 0, 0, w, h);
238	XRenderFreePicture (dpy, src);	415	XRenderFreePicture (dpy, src);
239	}	416	}
240		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;
		441	}
		442
241	static void	443	static void
242	get_gaussian_kernel (int radius, int width, double kernel, XFixed params)	444	get_gaussian_kernel (int radius, int width, nv kernel, XFixed params)
243	{	445	{
244	double sigma = radius / 2.0;	446	nv sigma = radius / 2.0;
245	double scale = sqrt (2.0 * M_PI) * sigma;	447	nv scale = sqrt (2.0 * M_PI) * sigma;
246	double sum = 0.0;	448	nv sum = 0.0;
247		449
248	for (int i = 0; i < width; i++)	450	for (int i = 0; i < width; i++)
249	{	451	{
250	double x = i - width / 2;	452	nv x = i - width / 2;
251	kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;	453	kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
252	sum += kernel[i];	454	sum += kernel[i];
253	}	455	}
254		456
255	params[0] = XDoubleToFixed (width);	457	params[0] = XDoubleToFixed (width);
…		…
265	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))	467	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))
266	return clone ();	468	return clone ();
267		469
268	Display *dpy = s->display->dpy;	470	Display *dpy = s->display->dpy;
269	int size = max (rh, rv) * 2 + 1;	471	int size = max (rh, rv) * 2 + 1;
270	double kernel = (double )malloc (size * sizeof (double));	472	nv kernel = (nv )malloc (size * sizeof (nv));
271	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));	473	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
272	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);
273	img->alloc ();	475	img->alloc ();
274		476
275	XRenderPictureAttributes pa;	477	XRenderPictureAttributes pa;
…		…
397	if (r < 0 \|\| g < 0 \|\| b < 0 \|\| a < 0)	599	if (r < 0 \|\| g < 0 \|\| b < 0 \|\| a < 0)
398	rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");	600	rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");
399		601
400	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);	602	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
401	img->alloc ();	603	img->alloc ();
402		604	img->fill (rgba (0, 0, 0, 0));
403	{
404	rxvt_color empty;
405	empty.set (s, rgba (0, 0, 0, 0));
406	img->fill (empty);
407	}
408		605
409	// premultiply (yeah, these are not exact, sue me or fix it)	606	// premultiply (yeah, these are not exact, sue me or fix it)
410	r = (r * (a >> 8)) >> 8;	607	r = (r * (a >> 8)) >> 8;
411	g = (g * (a >> 8)) >> 8;	608	g = (g * (a >> 8)) >> 8;
412	b = (b * (a >> 8)) >> 8;	609	b = (b * (a >> 8)) >> 8;
413		610
414	Display *dpy = s->display->dpy;	611	Display *dpy = s->display->dpy;
415		612
416	Picture src = src_picture ();	613	Picture src = picture ();
417	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);	614	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
418	Picture mul = create_xrender_mask (dpy, pm, True, True);	615	Picture mul = create_xrender_mask (dpy, pm, True, True);
419		616
420	//TODO: this operator does not yet implement some useful contrast	617	//TODO: this operator does not yet implement some useful contrast
421	while (r \| g \| b \| a)	618	while (r \| g \| b \| a)
…		…
438	::swap (img->pm , pm );	635	::swap (img->pm , pm );
439		636
440	delete img;	637	delete img;
441	}	638	}
442		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) };
		654	XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
		655	}
		656
		657	XRenderComposite (dpy, op, src, mask_p, dst, x - img->x, y - img->y, 0, 0, 0, 0, w, h);
		658
		659	XRenderFreePicture (dpy, src);
		660	XRenderFreePicture (dpy, dst);
		661
		662	if (mask_p)
		663	XRenderFreePicture (dpy, mask_p);
		664	}
		665
443	rxvt_img *	666	rxvt_img *
444	rxvt_img::clone ()	667	rxvt_img::clone ()
445	{	668	{
446	return new rxvt_img (*this);	669	return new rxvt_img (*this);
447	}
448
449	static XRenderPictFormat *
450	find_alpha_format_for (Display dpy, XRenderPictFormat format)
451	{
452	if (format->direct.alphaMask)
453	return format; // already has alpha
454
455	// try to find a suitable alpha format, one bit alpha is enough for our purposes
456	if (format->type == PictTypeDirect)
457	for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
458	if (f->direct.alphaMask
459	&& f->type == PictTypeDirect
460	&& ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
461	&& ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
462	&& ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
463	return f;
464
465	// should be a very good fallback
466	return XRenderFindStandardFormat (dpy, PictStandardARGB32);
467	}	670	}
468		671
469	rxvt_img *	672	rxvt_img *
470	rxvt_img::reify ()	673	rxvt_img::reify ()
471	{	674	{
…		…
480	&& repeat == RepeatNone; // and we have no good pixels to fill with	683	&& repeat == RepeatNone; // and we have no good pixels to fill with
481		684
482	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);
483	img->alloc ();	686	img->alloc ();
484		687
485	Picture src = src_picture ();	688	Picture src = picture ();
486	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	689	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
487		690
488	if (alpha)	691	if (alpha)
489	{	692	{
490	XRenderColor rc = { 0, 0, 0, 0 };	693	XRenderColor rc = { 0, 0, 0, 0 };
491	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
492	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);
493	}	696	}
494	else	697	else
495	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);
496		699
497	XRenderFreePicture (dpy, src);	700	XRenderFreePicture (dpy, src);
498	XRenderFreePicture (dpy, dst);	701	XRenderFreePicture (dpy, dst);
499		702
500	return img;	703	return img;
…		…
503	rxvt_img *	706	rxvt_img *
504	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)
505	{	708	{
506	rxvt_img *img = clone ();	709	rxvt_img *img = clone ();
507		710
508	img->x += x;	711	img->x -= x;
509	img->y += y;	712	img->y -= y;
510		713
511	if (w != width \|\| h != height)	714	if (w != width \|\| h != height)
512	{	715	{
513	img->w = width;	716	img->w = width;
514	img->h = height;	717	img->h = height;
…		…
520		723
521	return img;	724	return img;
522	}	725	}
523		726
524	rxvt_img *	727	rxvt_img *
525	rxvt_img::transform (double matrix[9], int new_width, int new_height)	728	rxvt_img::transform (const nv matrix[3][3])
526	{	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
527	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);
528	img->alloc ();	766	img->alloc ();
529		767
530	Display *dpy = s->display->dpy;	768	Display *dpy = s->display->dpy;
531	Picture src = src_picture ();	769	Picture src = picture ();
532	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	770	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
533		771
534	XTransform xfrm;	772	XTransform xfrm;
535		773
536	for (int i = 0; i < 3; ++i)	774	for (int i = 0; i < 3; ++i)
537	for (int j = 0; j < 3; ++j)	775	for (int j = 0; j < 3; ++j)
538	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);	776	xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);
539
540	xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
541	xfrm.matrix [1][2] -= XDoubleToFixed (y);
542		777
543	XRenderSetPictureFilter (dpy, src, "good", 0, 0);	778	XRenderSetPictureFilter (dpy, src, "good", 0, 0);
544	XRenderSetPictureTransform (dpy, src, &xfrm);	779	XRenderSetPictureTransform (dpy, src, &xfrm);
545	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);
546		781
547	XRenderFreePicture (dpy, src);	782	XRenderFreePicture (dpy, src);
548	XRenderFreePicture (dpy, dst);	783	XRenderFreePicture (dpy, dst);
549		784
550	return img;	785	return img;
…		…
554	rxvt_img::scale (int new_width, int new_height)	789	rxvt_img::scale (int new_width, int new_height)
555	{	790	{
556	if (w == new_width && h == new_height)	791	if (w == new_width && h == new_height)
557	return clone ();	792	return clone ();
558		793
559	double matrix[9] = {
560	w / (double)new_width, 0, 0,
561	0, h / (double)new_height, 0,
562	0, 0, 1
563	};
564
565	int old_repeat_mode = repeat;	794	int old_repeat_mode = repeat;
566	repeat = RepeatPad; // not right, but xrender can't properly scale it seems	795	repeat = RepeatPad; // not right, but xrender can't properly scale it seems
567		796
568	rxvt_img *img = transform (matrix, new_width, new_height);	797	rxvt_img *img = transform (mat3x3::scale (new_width / (nv)w, new_height / (nv)h));
569		798
570	repeat = old_repeat_mode;	799	repeat = old_repeat_mode;
571	img->repeat = repeat;	800	img->repeat = repeat;
572		801
573	return img;	802	return img;
574	}	803	}
575		804
576	rxvt_img *	805	rxvt_img *
577	rxvt_img::rotate (int x, int y, double phi, int new_width, int new_height)	806	rxvt_img::rotate (int cx, int cy, nv phi)
578	{	807	{
579	double s = sin (phi);	808	#if 0
580	double c = cos (phi);
581
582	double matrix[9] = {
583	c, -s, -c * x + s * y + x,	809	{ c, -s, cx - c * cx + s * cy },
584	s, c, -s * x - c * y + y,	810	{ s, c, cy - s * cx - c * cy },
585	0, 0, 1	811	{ 0, 0, 1 }
586	};	812	#endif
587		813
588	return transform (matrix, new_width, new_height);	814	move (-cx, -cy);
589	}	815	rxvt_img *img = transform (mat3x3::rotate (phi));
		816	move ( cx, cy);
		817	img->move (cx, cy);
590		818
		819	return img;
		820	}
		821
591	rxvt_img *	822	rxvt_img *
592	rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg)	823	rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg)
593	{	824	{
594	if (new_format == format)	825	if (new_format == format)
595	return clone ();	826	return clone ();
596		827
597	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);
598	img->alloc ();	829	img->alloc ();
599		830
600	Display *dpy = s->display->dpy;	831	Display *dpy = s->display->dpy;
601	Picture src = src_picture ();	832	Picture src = picture ();
602	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);	833	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
603	int op = PictOpSrc;	834	int op = PictOpSrc;
604		835
605	if (format->direct.alphaMask && !new_format->direct.alphaMask)	836	if (format->direct.alphaMask && !new_format->direct.alphaMask)
606	{	837	{
607	// does it have to be that complicated	838	// does it have to be that complicated
608	rgba c;
609	bg.get (c);
610
611	XRenderColor rc = { c.r, c.g, c.b, 0xffff };	839	XRenderColor rc = { bg.r, bg.g, bg.b, bg.a };
612	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);	840	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);
613		841
614	op = PictOpOver;	842	op = PictOpOver;
615	}	843	}
616		844
…		…
621		849
622	return img;	850	return img;
623	}	851	}
624		852
625	rxvt_img *	853	rxvt_img *
626	rxvt_img::blend (rxvt_img *img, double factor)	854	rxvt_img::blend (rxvt_img *img, nv factor)
627	{	855	{
628	rxvt_img *img2 = clone ();	856	rxvt_img *img2 = clone ();
629	Display *dpy = s->display->dpy;	857	Display *dpy = s->display->dpy;
630	Picture src = img->src_picture ();	858	Picture src = img->picture ();
631	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);	859	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
632	Picture mask = create_xrender_mask (dpy, img->pm, False, False);	860	Picture mask = create_xrender_mask (dpy, img->pm, False, False);
633		861
634	XRenderColor mask_c;	862	XRenderColor mask_c;
635		863

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.79 by root, Tue Jun 12 10:45:53 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.79 by root, Tue Jun 12 10:45:53 2012 UTC vs.
Revision 1.95 by root, Fri Jun 15 18:36:26 2012 UTC