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

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.4 by root, Sun Jun 3 18:14:13 2012 UTC vs.
Revision 1.73 by sf-exg, Sat Jun 9 17:28:03 2012 UTC

…		…
		1	#include <math.h>
1	#include "../config.h"	2	#include "../config.h"
2	#include "rxvt.h"	3	#include "rxvt.h"
3		4
4	#if HAVE_IMG	5	#if HAVE_IMG
5		6
6	rxvt_img::rxvt_img (rxvt_screen screen, XRenderPictFormat format, int width, int height)	7	rxvt_img::rxvt_img (rxvt_screen screen, XRenderPictFormat format, int x, int y, int width, int height, int repeat)
7	: s(screen), w(width), h(height), format(format), shared(false)
8	{
9	pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);
10	}
11
12	rxvt_img::rxvt_img (rxvt_screen screen, XRenderPictFormat format, int width, int height, Pixmap pixmap)
13	: s(screen), pm(pixmap), w(width), h(height), format(format), shared(false)	8	: s(screen), x(x), y(y), w(width), h(height), format(format), repeat(repeat),
		9	pm(0), ref(0)
14	{	10	{
15	}	11	}
16		12
17	rxvt_img *	13	rxvt_img::rxvt_img (const rxvt_img &img)
18	rxvt_img::new_from_file (rxvt_screen s, const char filename)	14	: s(img.s), x(img.x), y(img.y), w(img.w), h(img.h), format(img.format), repeat(img.repeat), pm(img.pm), ref(img.ref)
19	{	15	{
20	GError *err;	16	++ref->cnt;
21	GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);	17	}
22		18
23	if (!pb)	19	rxvt_img *
		20	rxvt_img::new_from_root (rxvt_screen *s)
		21	{
		22	Display *dpy = s->display->dpy;
		23	unsigned int root_pm_w, root_pm_h;
		24	Pixmap root_pixmap = s->display->get_pixmap_property (s->display->xa[XA_XROOTPMAP_ID]);
		25	if (root_pixmap == None)
		26	root_pixmap = s->display->get_pixmap_property (s->display->xa[XA_ESETROOT_PMAP_ID]);
		27
		28	if (root_pixmap == None)
24	return 0;	29	return 0;
25		30
26	int w = gdk_pixbuf_get_width (pb);	31	Window wdummy;
27	int h = gdk_pixbuf_get_height (pb);	32	int idummy;
		33	unsigned int udummy;
		34
		35	if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pm_w, &root_pm_h, &udummy, &udummy))
		36	return 0;
28		37
29	rxvt_img *img = new rxvt_img (	38	rxvt_img *img = new rxvt_img (
30	s,	39	s,
31	XRenderFindStandardFormat (s->display->dpy, gdk_pixbuf_get_has_alpha (pb) ? PictStandardARGB32 : PictStandardRGB24),	40	XRenderFindVisualFormat (dpy, DefaultVisual (dpy, s->display->screen)),
32	gdk_pixbuf_get_width (pb),	41	0,
33	gdk_pixbuf_get_height (pb)	42	0,
		43	root_pm_w,
		44	root_pm_h
34	);	45	);
35		46
36	img->render (pb, 0, 0, w, h, 0, 0);	47	img->pm = root_pixmap;
		48	img->ref = new pixref (root_pm_w, root_pm_h);
		49	img->ref->ours = false;
37		50
		51	return img;
		52	}
		53
		54	# if HAVE_PIXBUF
		55	rxvt_img *
		56	rxvt_img::new_from_pixbuf (rxvt_screen s, GdkPixbuf pb)
		57	{
		58	Display *dpy = s->display->dpy;
		59
		60	int width = gdk_pixbuf_get_width (pb);
		61	int height = gdk_pixbuf_get_height (pb);
		62
		63	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");
		65
		66	// 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
		68	int depth = gdk_pixbuf_get_has_alpha (pb) ? 32 : 24;
		69
		70	int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
		71
		72	XImage xi;
		73
		74	xi.width = width;
		75	xi.height = height;
		76	xi.xoffset = 0;
		77	xi.format = ZPixmap;
		78	xi.byte_order = ImageByteOrder (dpy);
		79	xi.bitmap_unit = 0; //XY only, unused
		80	xi.bitmap_bit_order = 0; //XY only, unused
		81	xi.bitmap_pad = BitmapPad (dpy);
		82	xi.depth = depth;
		83	xi.bytes_per_line = 0;
		84	xi.bits_per_pixel = 32; //Z only
		85	xi.red_mask = 0x00000000; //Z only, unused
		86	xi.green_mask = 0x00000000; //Z only, unused
		87	xi.blue_mask = 0x00000000; //Z only, unused
		88	xi.obdata = 0; // probably unused
		89
		90	bool byte_order_mismatch = byte_order != xi.byte_order;
		91
		92	if (!XInitImage (&xi))
		93	rxvt_fatal ("unable to initialise ximage, please report.\n");
		94
		95	if (height > INT_MAX / xi.bytes_per_line)
		96	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n");
		97
		98	xi.data = (char )rxvt_malloc (height xi.bytes_per_line);
		99
		100	int rowstride = gdk_pixbuf_get_rowstride (pb);
		101
		102	assert (3 + (depth == 32) == gdk_pixbuf_get_n_channels (pb));
		103	unsigned char *row = gdk_pixbuf_get_pixels (pb);
		104	char *line = xi.data;
		105
		106	for (int y = 0; y < height; y++)
		107	{
		108	unsigned char *src = row;
		109	uint32_t dst = (uint32_t )line;
		110
		111	if (depth == 24)
		112	for (int x = 0; x < width; x++)
		113	{
		114	uint8_t r = *src++;
		115	uint8_t g = *src++;
		116	uint8_t b = *src++;
		117
		118	uint32_t v = (r << 16) \| (g << 8) \| b;
		119
		120	if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
		121	v = ecb_bswap32 (v);
		122
		123	*dst++ = v;
		124	}
		125	else
		126	for (int x = 0; x < width; x++)
		127	{
		128	uint32_t v = (uint32_t )src; src += 4;
		129
		130	if (ecb_big_endian ())
		131	v = ecb_bswap32 (v);
		132
		133	v = ecb_rotl32 (v, 8); // abgr to bgra
		134
		135	if (!byte_order_mismatch)
		136	v = ecb_bswap32 (v);
		137
		138	*dst++ = v;
		139	}
		140
		141	row += rowstride;
		142	line += xi.bytes_per_line;
		143	}
		144
		145	rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, depth == 24 ? PictStandardRGB24 : PictStandardARGB32), 0, 0, width, height);
		146	img->alloc ();
		147
		148	GC gc = XCreateGC (dpy, img->pm, 0, 0);
		149	XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height);
		150	XFreeGC (dpy, gc);
		151
		152	free (xi.data);
		153
		154	return img;
		155	}
		156
		157	rxvt_img *
		158	rxvt_img::new_from_file (rxvt_screen s, const char filename)
		159	{
		160	GError *err = 0;
		161	GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);
		162
		163	if (!pb)
		164	rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);
		165
		166	rxvt_img *img = new_from_pixbuf (s, pb);
		167
		168	g_object_unref (pb);
		169
		170	return img;
		171	}
		172	# endif
		173
		174	void
		175	rxvt_img::destroy ()
		176	{
		177	if (--ref->cnt)
38	return img;	178	return;
		179
		180	if (pm && ref->ours)
		181	XFreePixmap (s->display->dpy, pm);
		182
		183	delete ref;
39	}	184	}
40		185
41	rxvt_img::~rxvt_img ()	186	rxvt_img::~rxvt_img ()
42	{	187	{
43	if (!shared)	188	destroy ();
		189	}
		190
		191	void
		192	rxvt_img::alloc ()
		193	{
		194	pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);
		195	ref = new pixref (w, h);
		196	}
		197
		198	Picture
		199	rxvt_img::src_picture ()
		200	{
		201	Display *dpy = s->display->dpy;
		202
		203	XRenderPictureAttributes pa;
		204	pa.repeat = repeat;
		205	Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
		206
		207	return pic;
		208	}
		209
		210	void
		211	rxvt_img::unshare ()
		212	{
		213	if (ref->cnt == 1 && ref->ours)
		214	return;
		215
		216	Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth);
		217	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
		218	XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
44	XFreePixmap (s->display->dpy, pm);	219	XFreeGC (s->display->dpy, gc);
		220
		221	destroy ();
		222
		223	pm = pm2;
		224	ref = new pixref (ref->w, ref->h);
45	}	225	}
46		226
47	void	227	void
48	rxvt_img::fill (const rxvt_color &c)	228	rxvt_img::fill (const rxvt_color &c)
49	{	229	{
52	GC gc = XCreateGC (s->display->dpy, pm, GCForeground, &gcv);	232	GC gc = XCreateGC (s->display->dpy, pm, GCForeground, &gcv);
53	XFillRectangle (s->display->dpy, pm, gc, 0, 0, w, h);	233	XFillRectangle (s->display->dpy, pm, gc, 0, 0, w, h);
54	XFreeGC (s->display->dpy, gc);	234	XFreeGC (s->display->dpy, gc);
55	}	235	}
56		236
		237	static void
		238	get_gaussian_kernel (int radius, int width, double kernel, XFixed params)
		239	{
		240	double sigma = radius / 2.0;
		241	double scale = sqrt (2.0 * M_PI) * sigma;
		242	double sum = 0.0;
		243
		244	for (int i = 0; i < width; i++)
		245	{
		246	double x = i - width / 2;
		247	kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
		248	sum += kernel[i];
		249	}
		250
		251	params[0] = XDoubleToFixed (width);
		252	params[1] = XDoubleToFixed (1);
		253
		254	for (int i = 0; i < width; i++)
		255	params[i+2] = XDoubleToFixed (kernel[i] / sum);
		256	}
		257
		258	rxvt_img *
		259	rxvt_img::blur (int rh, int rv)
		260	{
		261	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))
		262	return clone ();
		263
		264	Display *dpy = s->display->dpy;
		265	int size = max (rh, rv) * 2 + 1;
		266	double kernel = (double )malloc (size * sizeof (double));
		267	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
		268	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
		269	img->alloc ();
		270
		271	XRenderPictureAttributes pa;
		272	pa.repeat = RepeatPad;
		273	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
		274	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
		275
		276	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
		277	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
		278	XFreePixmap (dpy, tmp_pm);
		279
		280	if (kernel && params)
		281	{
		282	size = rh * 2 + 1;
		283	get_gaussian_kernel (rh, size, kernel, params);
		284
		285	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
		286	XRenderComposite (dpy,
		287	PictOpSrc,
		288	src,
		289	None,
		290	tmp,
		291	0, 0,
		292	0, 0,
		293	0, 0,
		294	w, h);
		295
		296	size = rv * 2 + 1;
		297	get_gaussian_kernel (rv, size, kernel, params);
		298	::swap (params[0], params[1]);
		299
		300	XRenderSetPictureFilter (dpy, tmp, FilterConvolution, params, size+2);
		301	XRenderComposite (dpy,
		302	PictOpSrc,
		303	tmp,
		304	None,
		305	dst,
		306	0, 0,
		307	0, 0,
		308	0, 0,
		309	w, h);
		310	}
		311
		312	free (kernel);
		313	free (params);
		314	XRenderFreePicture (dpy, src);
		315	XRenderFreePicture (dpy, dst);
		316	XRenderFreePicture (dpy, tmp);
		317
		318	return img;
		319	}
		320
		321	static void
		322	extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)
		323	{
		324	int32_t x = clamp (c, cl0, cl1);
		325	c -= x;
		326	xc = x;
		327	}
		328
		329	static bool
		330	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)
		331	{
		332	extract (cl0, cl1, r, xr);
		333	extract (cl0, cl1, g, xg);
		334	extract (cl0, cl1, b, xb);
		335	extract (cl0, cl1, a, xa);
		336
		337	return xr \| xg \| xb \| xa;
		338	}
		339
57	void	340	void
58	rxvt_img::blur (int rh, int rv)	341	rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a)
59	{	342	{
60	//TODO	343	unshare ();
		344
		345	Display *dpy = s->display->dpy;
		346	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
		347
		348	// loop should not be needed for brightness, as only -1..1 makes sense
		349	//while (r \| g \| b \| a)
		350	{
		351	unsigned short xr, xg, xb, xa;
		352	XRenderColor mask_c;
		353
		354	if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
		355	XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
		356
		357	if (extract (-65535, 0, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
		358	{
		359	XRenderColor mask_w = { 65535, 65535, 65535, 65535 };
		360	XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
		361	mask_c.red = -mask_c.red; //TODO: verify that doing clamp, assign, and negation does the right thing
		362	mask_c.green = -mask_c.green;
		363	mask_c.blue = -mask_c.blue;
		364	mask_c.alpha = -mask_c.alpha;
		365	XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
		366	XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
		367	}
		368	}
		369
		370
		371	XRenderFreePicture (dpy, dst);
61	}	372	}
62		373
63	void	374	void
64	rxvt_img::brightness (double r, double g, double b, double a)	375	rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
65	{	376	{
66	//TODO	377	if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
67	}	378	{
		379	rxvt_warn ("rxvt_img::contrast operation not supported on this display, RENDER extension too old.\n");
		380	return;
		381	}
68		382
69	void	383	unshare ();
70	rxvt_img::contrast (double r, double g, double b, double a)
71	{
72	//TODO
73	}
74		384
75	void	385	Display *dpy = s->display->dpy;
76	rxvt_img::render (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y)	386	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
77	{
78	//TODO
79	}
80		387
		388	XRenderColor mask_c;
		389	mask_c.red = r;
		390	mask_c.green = g;
		391	mask_c.blue = b;
		392	mask_c.alpha = a;
		393	XRenderFillRectangle (dpy, PictOpMultiply, dst, &mask_c, 0, 0, w, h);
		394
		395	XRenderFreePicture (dpy, dst);
		396	}
		397
81	rxvt_img *	398	rxvt_img *
82	rxvt_img::copy ()	399	rxvt_img::clone ()
83	{	400	{
84	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);	401	return new rxvt_img (*this);
85	Pixmap pm2 = XCreatePixmap (s->display->dpy, pm, w, h, format->depth);
86	XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, w, h, 0, 0);
87	XFreeGC (s->display->dpy, gc);
88	return new rxvt_img (s, format, w, h, pm2);
89	}	402	}
90		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	}
		423
91	rxvt_img *	424	rxvt_img *
		425	rxvt_img::reify ()
		426	{
		427	if (x == 0 && y == 0 && w == ref->w && h == ref->h)
		428	return clone ();
		429
		430	Display *dpy = s->display->dpy;
		431
		432	// add an alpha channel if...
		433	bool alpha = !format->direct.alphaMask // pixmap has none yet
		434	&& (x \|\| y) // we need one because of non-zero offset
		435	&& repeat == RepeatNone; // and we have no good pixels to fill with
		436
		437	rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
		438	img->alloc ();
		439
		440	Picture src = src_picture ();
		441	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
		442
		443	if (alpha)
		444	{
		445	XRenderColor rc = { 0, 0, 0, 0 };
		446	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);
		448	}
		449	else
		450	XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);
		451
		452	XRenderFreePicture (dpy, src);
		453	XRenderFreePicture (dpy, dst);
		454
		455	return img;
		456	}
		457
		458	rxvt_img *
		459	rxvt_img::sub_rect (int x, int y, int width, int height)
		460	{
		461	rxvt_img *img = clone ();
		462
		463	img->x += x;
		464	img->y += y;
		465
		466	if (w != width \|\| h != height)
		467	{
		468	img->w = width;
		469	img->h = height;
		470
		471	rxvt_img *img2 = img->reify ();
		472	delete img;
		473	img = img2;
		474	}
		475
		476	return img;
		477	}
		478
		479	rxvt_img *
92	rxvt_img::transform (int new_width, int new_height, double matrix[16])	480	rxvt_img::transform (int new_width, int new_height, double matrix[9])
93	{	481	{
94	//TODO	482	rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat);
		483	img->alloc ();
		484
		485	Display *dpy = s->display->dpy;
		486	Picture src = src_picture ();
		487	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
		488
		489	XTransform xfrm;
		490
		491	for (int i = 0; i < 3; ++i)
		492	for (int j = 0; j < 3; ++j)
		493	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
		494
		495	xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
		496	xfrm.matrix [1][2] -= XDoubleToFixed (y);
		497
		498	XRenderSetPictureFilter (dpy, src, "good", 0, 0);
		499	XRenderSetPictureTransform (dpy, src, &xfrm);
		500	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
		501
		502	XRenderFreePicture (dpy, src);
		503	XRenderFreePicture (dpy, dst);
		504
		505	return img;
95	}	506	}
96		507
97	rxvt_img *	508	rxvt_img *
98	rxvt_img::scale (int new_width, int new_height)	509	rxvt_img::scale (int new_width, int new_height)
99	{	510	{
100	// use transform	511	if (w == new_width && h == new_height)
101	//TODO	512	return clone ();
102	}
103		513
		514	double matrix[9] = {
		515	w / (double)new_width, 0, 0,
		516	0, h / (double)new_height, 0,
		517	0, 0, 1
		518	};
		519
		520	int old_repeat_mode = repeat;
		521	repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems
		522
		523	rxvt_img *img = transform (new_width, new_height, matrix);
		524
		525	repeat = old_repeat_mode;
		526	img->repeat = repeat;
		527
		528	return img;
		529	}
		530
		531	rxvt_img *
		532	rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)
		533	{
		534	double s = sin (phi);
		535	double c = cos (phi);
		536
		537	double matrix[9] = {
		538	c, -s, -c * x + s * y + x,
		539	s, c, -s * x - c * y + y,
		540	0, 0, 1
		541	};
		542
		543	return transform (new_width, new_height, matrix);
		544	}
		545
		546	rxvt_img *
		547	rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg)
		548	{
		549	if (new_format == format)
		550	return clone ();
		551
		552	rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);
		553	img->alloc ();
		554
		555	Display *dpy = s->display->dpy;
		556	Picture src = src_picture ();
		557	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
		558	int op = PictOpSrc;
		559
		560	if (format->direct.alphaMask && !new_format->direct.alphaMask)
		561	{
		562	// 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 };
		567	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);
		568
		569	op = PictOpOver;
		570	}
		571
		572	XRenderComposite (dpy, op, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
		573
		574	XRenderFreePicture (dpy, src);
		575	XRenderFreePicture (dpy, dst);
		576
		577	return img;
		578	}
		579
		580	rxvt_img *
		581	rxvt_img::blend (rxvt_img *img, double factor)
		582	{
		583	rxvt_img *img2 = clone ();
		584	Display *dpy = s->display->dpy;
		585	Picture src = img->src_picture ();
		586	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
		587
		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
		595	XRenderColor mask_c;
		596
		597	mask_c.alpha = float_to_component (factor);
		598	mask_c.red =
		599	mask_c.green =
		600	mask_c.blue = 0;
		601	XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
		602
		603	XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, w, h);
		604
		605	XRenderFreePicture (dpy, src);
		606	XRenderFreePicture (dpy, dst);
		607	XRenderFreePicture (dpy, mask);
		608
		609	return img2;
		610	}
104		611
105	#endif	612	#endif
106		613

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.4 by root, Sun Jun 3 18:14:13 2012 UTC vs. Revision 1.73 by sf-exg, Sat Jun 9 17:28:03 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.4 by root, Sun Jun 3 18:14:13 2012 UTC vs.
Revision 1.73 by sf-exg, Sat Jun 9 17:28:03 2012 UTC