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

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.19 by root, Tue Jun 5 13:39:26 2012 UTC vs.
Revision 1.35 by root, Thu Jun 7 08:36:53 2012 UTC

…		…
2	#include "../config.h"	2	#include "../config.h"
3	#include "rxvt.h"	3	#include "rxvt.h"
4		4
5	#if HAVE_IMG	5	#if HAVE_IMG
6		6
7	#define float_to_component(d) ((d) * 65535.99)
8
9	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)
10	: s(screen), w(width), h(height), format(format), shared(false)	8	: s(screen), x(x), y(y), w(width), h(height), format(format), repeat(RepeatNormal),
		9	pm(0), ref(0)
11	{	10	{
12	pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);
13	}	11	}
14		12
		13	rxvt_img::rxvt_img (const rxvt_img &img)
		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)
		15	{
		16	++ref->cnt;
		17	}
		18
		19	#if 0
15	rxvt_img::rxvt_img (rxvt_screen screen, XRenderPictFormat format, int width, int height, Pixmap pixmap)	20	rxvt_img::rxvt_img (rxvt_screen screen, XRenderPictFormat format, int width, int height, Pixmap pixmap)
16	: s(screen), pm(pixmap), w(width), h(height), format(format), shared(false)	21	: s(screen), x(0), y(0), w(width), h(height), format(format), repeat(RepeatNormal), shared(false), pm(pixmap)
17	{	22	{
		23	}
		24	#endif
		25
		26	rxvt_img *
		27	rxvt_img::new_from_root (rxvt_screen *s)
		28	{
		29	Display *dpy = s->display->dpy;
		30	unsigned int root_pm_w, root_pm_h;
		31	Pixmap root_pixmap = s->display->get_pixmap_property (s->display->xa[XA_XROOTPMAP_ID]);
		32	if (root_pixmap == None)
		33	root_pixmap = s->display->get_pixmap_property (s->display->xa[XA_ESETROOT_PMAP_ID]);
		34
		35	if (root_pixmap == None)
		36	return 0;
		37
		38	Window wdummy;
		39	int idummy;
		40	unsigned int udummy;
		41
		42	if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pm_w, &root_pm_h, &udummy, &udummy))
		43	return 0;
		44
		45	rxvt_img *img = new rxvt_img (
		46	s,
		47	XRenderFindVisualFormat (dpy, DefaultVisual (dpy, s->display->screen)),
		48	0,
		49	0,
		50	root_pm_w,
		51	root_pm_h
		52	);
		53
		54	img->pm = root_pixmap;
		55	img->ref = new pixref (root_pm_w, root_pm_h);
		56	img->ref->ours = false;
		57
		58	return img;
18	}	59	}
19		60
20	rxvt_img *	61	rxvt_img *
21	rxvt_img::new_from_file (rxvt_screen s, const char filename)	62	rxvt_img::new_from_file (rxvt_screen s, const char filename)
22	{	63	{
…		…
27	rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);	68	rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);
28		69
29	rxvt_img *img = new rxvt_img (	70	rxvt_img *img = new rxvt_img (
30	s,	71	s,
31	XRenderFindStandardFormat (s->display->dpy, gdk_pixbuf_get_has_alpha (pb) ? PictStandardARGB32 : PictStandardRGB24),	72	XRenderFindStandardFormat (s->display->dpy, gdk_pixbuf_get_has_alpha (pb) ? PictStandardARGB32 : PictStandardRGB24),
		73	0,
		74	0,
32	gdk_pixbuf_get_width (pb),	75	gdk_pixbuf_get_width (pb),
33	gdk_pixbuf_get_height (pb)	76	gdk_pixbuf_get_height (pb)
34	);	77	);
35		78	img->alloc ();
36	img->render_pixbuf (pb, 0, 0, img->w, img->h, 0, 0);	79	img->render_pixbuf (pb, 0, 0, img->w, img->h, 0, 0);
37		80
		81	g_object_unref (pb);
		82
		83	return img;
		84	}
		85
		86	void
		87	rxvt_img::destroy ()
		88	{
		89	if (--ref->cnt)
38	return img;	90	return;
		91
		92	if (pm && ref->ours)
		93	XFreePixmap (s->display->dpy, pm);
		94
		95	delete ref;
39	}	96	}
40		97
41	rxvt_img::~rxvt_img ()	98	rxvt_img::~rxvt_img ()
42	{	99	{
43	if (!shared)	100	destroy ();
44	XFreePixmap (s->display->dpy, pm);	101	}
		102
		103	void
		104	rxvt_img::alloc ()
		105	{
		106	pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);
		107	ref = new pixref (w, h);
		108	}
		109
		110	Picture
		111	rxvt_img::src_picture ()
		112	{
		113	Display *dpy = s->display->dpy;
		114
		115	XRenderPictureAttributes pa;
		116	pa.repeat = repeat;
		117	Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
		118
		119	XRectangle clip = { -x, -y, min (w, ref->w), min (h, ref->h) };
		120	XRenderSetPictureClipRectangles (dpy, pic, 0, 0, &clip, 1);
		121
		122	return pic;
45	}	123	}
46		124
47	void	125	void
48	rxvt_img::unshare ()	126	rxvt_img::unshare ()
49	{	127	{
50	if (!shared)	128	if (ref->cnt == 1 && ref->ours)
51	return;	129	return;
52		130
53	rxvt_img *img = clone ();	131	//TODO: maybe should reify instead
		132	Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth);
		133	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
		134	XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
		135	XFreeGC (s->display->dpy, gc);
54		136
55	::swap (pm , img->pm);	137	destroy ();
56	::swap (shared, img->shared);
57		138
58	delete img;	139	pm = pm2;
		140	ref = new pixref (ref->w, ref->h);
59	}	141	}
60		142
61	void	143	void
62	rxvt_img::fill (const rxvt_color &c)	144	rxvt_img::fill (const rxvt_color &c)
63	{	145	{
…		…
87		169
88	for (int i = 0; i < width; i++)	170	for (int i = 0; i < width; i++)
89	params[i+2] = XDoubleToFixed (kernel[i] / sum);	171	params[i+2] = XDoubleToFixed (kernel[i] / sum);
90	}	172	}
91		173
92	void	174	rxvt_img *
93	rxvt_img::blur (int rh, int rv)	175	rxvt_img::blur (int rh, int rv)
94	{	176	{
95	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))	177	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))
96	return;	178	return clone ();
97		179
98	Display *dpy = s->display->dpy;	180	Display *dpy = s->display->dpy;
99	int size = max (rh, rv) * 2 + 1;	181	int size = max (rh, rv) * 2 + 1;
100	double kernel = (double )malloc (size * sizeof (double));	182	double kernel = (double )malloc (size * sizeof (double));
101	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));	183	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
		184	rxvt_img *img = new rxvt_img (s, format, x, y, w, h);
		185	img->alloc ();
		186
		187	Picture src = src_picture ();
102		188
103	XRenderPictureAttributes pa;	189	XRenderPictureAttributes pa;
104
105	pa.repeat = RepeatPad;	190	pa.repeat = RepeatPad;
106	Picture src = XRenderCreatePicture (dpy, pm , format, CPRepeat, &pa);	191	Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa);
		192
107	Pixmap tmp = XCreatePixmap (dpy, pm, w, h, format->depth);	193	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
108	Picture dst = XRenderCreatePicture (dpy, tmp, format, CPRepeat, &pa);	194	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
109	XFreePixmap (dpy, tmp);	195	XFreePixmap (dpy, tmp_pm);
110		196
111	if (kernel && params)	197	if (kernel && params)
112	{	198	{
113	size = rh * 2 + 1;	199	size = rh * 2 + 1;
114	get_gaussian_kernel (rh, size, kernel, params);	200	get_gaussian_kernel (rh, size, kernel, params);
…		…
116	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);	202	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
117	XRenderComposite (dpy,	203	XRenderComposite (dpy,
118	PictOpSrc,	204	PictOpSrc,
119	src,	205	src,
120	None,	206	None,
121	dst,	207	tmp,
122	0, 0,	208	0, 0,
123	0, 0,	209	0, 0,
124	0, 0,	210	0, 0,
125	w, h);	211	w, h);
126		212
127	::swap (src, dst);
128
129	size = rv * 2 + 1;	213	size = rv * 2 + 1;
130	get_gaussian_kernel (rv, size, kernel, params);	214	get_gaussian_kernel (rv, size, kernel, params);
131	::swap (params[0], params[1]);	215	::swap (params[0], params[1]);
132		216
133	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);	217	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
134	XRenderComposite (dpy,	218	XRenderComposite (dpy,
135	PictOpSrc,	219	PictOpSrc,
136	src,	220	tmp,
137	None,	221	None,
138	dst,	222	dst,
139	0, 0,	223	0, 0,
140	0, 0,	224	0, 0,
141	0, 0,	225	0, 0,
…		…
144		228
145	free (kernel);	229	free (kernel);
146	free (params);	230	free (params);
147	XRenderFreePicture (dpy, src);	231	XRenderFreePicture (dpy, src);
148	XRenderFreePicture (dpy, dst);	232	XRenderFreePicture (dpy, dst);
		233	XRenderFreePicture (dpy, tmp);
		234
		235	return img;
149	}	236	}
150		237
151	static Picture	238	static Picture
152	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb)	239	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb)
153	{	240	{
…		…
162		249
163	return mask;	250	return mask;
164	}	251	}
165		252
166	void	253	void
167	rxvt_img::brightness (double r, double g, double b, double a)	254	rxvt_img::brightness (unsigned short r, unsigned short g, unsigned short b, unsigned short a)
168	{	255	{
169	Display *dpy = s->display->dpy;	256	Display *dpy = s->display->dpy;
170	Picture src = create_xrender_mask (dpy, pm, True);	257	Picture src = create_xrender_mask (dpy, pm, True);
171	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	258	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
172		259
173	XRenderColor mask_c;	260	XRenderColor mask_c;
174	mask_c.red = float_to_component (r);	261	mask_c.red = r;
175	mask_c.green = float_to_component (g);	262	mask_c.green = g;
176	mask_c.blue = float_to_component (b);	263	mask_c.blue = b;
177	mask_c.alpha = float_to_component (a);	264	mask_c.alpha = a;
178	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);	265	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
179		266
180	XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	267	XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
		268
		269	XRenderFreePicture (dpy, src);
		270	XRenderFreePicture (dpy, dst);
181	}	271	}
182		272
183	void	273	void
184	rxvt_img::contrast (double r, double g, double b, double a)	274	rxvt_img::contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a)
185	{	275	{
186	if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))	276	if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
187	return;	277	return;
188		278
189	Display *dpy = s->display->dpy;	279	Display *dpy = s->display->dpy;
190	Picture src = create_xrender_mask (dpy, pm, True);	280	Picture src = create_xrender_mask (dpy, pm, True);
191	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	281	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
192		282
193	XRenderColor mask_c;	283	XRenderColor mask_c;
194	mask_c.red = float_to_component (r);	284	mask_c.red = r;
195	mask_c.green = float_to_component (g);	285	mask_c.green = g;
196	mask_c.blue = float_to_component (b);	286	mask_c.blue = b;
197	mask_c.alpha = float_to_component (a);	287	mask_c.alpha = a;
198	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);	288	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
199		289
200	XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	290	XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
		291
		292	XRenderFreePicture (dpy, src);
		293	XRenderFreePicture (dpy, dst);
201	}	294	}
202		295
203	bool	296	bool
204	rxvt_img::render_pixbuf (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y)	297	rxvt_img::render_pixbuf (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y)
205	{	298	{
…		…
249		342
250	int rowstride = gdk_pixbuf_get_rowstride (pixbuf);	343	int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
251	int channels = gdk_pixbuf_get_n_channels (pixbuf);	344	int channels = gdk_pixbuf_get_n_channels (pixbuf);
252	unsigned char row = gdk_pixbuf_get_pixels (pixbuf) + src_y rowstride + src_x * channels;	345	unsigned char row = gdk_pixbuf_get_pixels (pixbuf) + src_y rowstride + src_x * channels;
253	char *line = ximage->data;	346	char *line = ximage->data;
254
255	rgba c (0, 0, 0);
256
257	if (channels == 4 && alpha_mask == 0)
258	{
259	//pix_colors[Color_bg].get (c);
260	//TODO
261	c.r = 0xffff; c.g = 0xc0c0; c.b = 0xcbcb;//D
262	c.r >>= 8;
263	c.g >>= 8;
264	c.b >>= 8;
265	}
266		347
267	for (int y = 0; y < height; y++)	348	for (int y = 0; y < height; y++)
268	{	349	{
269	for (int x = 0; x < width; x++)	350	for (int x = 0; x < width; x++)
270	{	351	{
…		…
273	unsigned char r, g, b, a;	354	unsigned char r, g, b, a;
274		355
275	if (channels == 4)	356	if (channels == 4)
276	{	357	{
277	a = pixel[3];	358	a = pixel[3];
278	r = (pixel[0] * a + c.r * (0xff - a)) / 0xff;	359	r = pixel[0] * a / 0xff;
279	g = (pixel[1] * a + c.g * (0xff - a)) / 0xff;	360	g = pixel[1] * a / 0xff;
280	b = (pixel[2] * a + c.b * (0xff - a)) / 0xff;	361	b = pixel[2] * a / 0xff;
281	}	362	}
282	else	363	else
283	{	364	{
284	a = 0xff;	365	a = 0xff;
285	r = pixel[0];	366	r = pixel[0];
…		…
310	}	391	}
311		392
312	rxvt_img *	393	rxvt_img *
313	rxvt_img::clone ()	394	rxvt_img::clone ()
314	{	395	{
		396	return new rxvt_img (*this);
		397	}
		398
		399	rxvt_img *
		400	rxvt_img::reify ()
		401	{
		402	if (x == 0 && y == 0 && w == ref->w && h == ref->h)
		403	return clone ();
		404
315	rxvt_img *img = new rxvt_img (s, format, w, h);	405	rxvt_img *img = new rxvt_img (s, format, 0, 0, w, h);
		406	img->alloc ();
316		407
317	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
318	XCopyArea (s->display->dpy, pm, img->pm, gc, 0, 0, w, h, 0, 0);
319	XFreeGC (s->display->dpy, gc);
320	}
321
322	rxvt_img *
323	rxvt_img::sub_rect (int x, int y, int width, int height, int repeat)
324	{
325	rxvt_img *img = new rxvt_img (s, format, width, height);
326
327	Display *dpy = s->display->dpy;	408	Display *dpy = s->display->dpy;
328	XRenderPictureAttributes pa;	409
329	pa.repeat = repeat;	410	Picture src = src_picture ();
330	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
331	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	411	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
332		412
333	XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, width, height);	413	XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);
334		414
335	XRenderFreePicture (dpy, src);
336	XRenderFreePicture (dpy, dst);	415	XRenderFreePicture (dpy, src);
		416	XRenderFreePicture (dpy, dst);
337		417
338	return img;	418	return img;
339	}	419	}
340		420
341	rxvt_img *	421	rxvt_img *
		422	rxvt_img::sub_rect (int x, int y, int width, int height)
		423	{
		424	rxvt_img *img = clone ();
		425
		426	//TODO: width > w, must reify
		427
		428	img->x += x;
		429	img->y += y;
		430	img->w = width;
		431	img->h = height;
		432
		433	return img;
		434	}
		435
		436	rxvt_img *
342	rxvt_img::transform (int new_width, int new_height, double matrix[9], int repeat)	437	rxvt_img::transform (int new_width, int new_height, double matrix[9])
343	{	438	{
344	rxvt_img *img = new rxvt_img (s, format, new_width, new_height);	439	rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height);
		440	img->alloc ();
345		441
346	Display *dpy = s->display->dpy;	442	Display *dpy = s->display->dpy;
347	XRenderPictureAttributes pa;	443	Picture src = src_picture ();
348	pa.repeat = repeat;
349	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
350	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	444	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
351		445
352	XTransform xfrm;	446	XTransform xfrm;
353		447
354	for (int i = 0; i < 3; ++i)	448	for (int i = 0; i < 3; ++i)
355	for (int j = 0; j < 3; ++j)	449	for (int j = 0; j < 3; ++j)
356	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);	450	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
		451
		452	xfrm.matrix [0][2] += XDoubleToFixed (x);//TODO
		453	xfrm.matrix [0][3] += XDoubleToFixed (y);
357		454
358	XRenderSetPictureFilter (dpy, src, "good", 0, 0);	455	XRenderSetPictureFilter (dpy, src, "good", 0, 0);
359	XRenderSetPictureTransform (dpy, src, &xfrm);	456	XRenderSetPictureTransform (dpy, src, &xfrm);
360	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);	457	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
361		458
…		…
376		473
377	return transform (new_width, new_height, matrix);	474	return transform (new_width, new_height, matrix);
378	}	475	}
379		476
380	rxvt_img *	477	rxvt_img *
381	rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi, int repeat)	478	rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)
382	{	479	{
383	double s = sin (phi);	480	double s = sin (phi);
384	double c = cos (phi);	481	double c = cos (phi);
385		482
386	double matrix[9] = {	483	double matrix[9] = {
387	c, -s, -c * x + s * y + x,	484	c, -s, -c * x + s * y + x,
388	s, c, -s * x - c * y + y,	485	s, c, -s * x - c * y + y,
389	0, 0, 1	486	0, 0, 1
390	};	487	};
391		488
392	return transform (new_width, new_height, matrix, repeat);	489	return transform (new_width, new_height, matrix);
393	}	490	}
394		491
395	rxvt_img *	492	rxvt_img *
396	rxvt_img::convert_to (XRenderPictFormat *new_format)	493	rxvt_img::convert_to (XRenderPictFormat *new_format, const rxvt_color &bg)
397	{	494	{
		495	if (new_format == format)
		496	return clone ();
		497
398	rxvt_img *img = new rxvt_img (s, new_format, w, h);	498	rxvt_img *img = new rxvt_img (s, new_format, 0, 0, w, h);
		499	img->alloc ();
399		500
400	Display *dpy = s->display->dpy;	501	Display *dpy = s->display->dpy;
401	Picture src = XRenderCreatePicture (dpy, pm, format, 0, 0);	502	Picture src = src_picture ();
402	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);	503	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
		504	int op = PictOpSrc;
403		505
		506	if (format->direct.alphaMask && !new_format->direct.alphaMask)
		507	{
		508	// does it have to be that complicated
		509	rgba c;
		510	bg.get (c);
		511
		512	XRenderColor rc = { c.r, c.g, c.b, 0xffff };
		513	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);
		514
		515	op = PictOpOver;
		516	}
		517
404	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	518	XRenderComposite (dpy, op, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
405		519
406	XRenderFreePicture (dpy, src);
407	XRenderFreePicture (dpy, dst);	520	XRenderFreePicture (dpy, src);
		521	XRenderFreePicture (dpy, dst);
408		522
		523	return img;
		524	}
		525
		526	rxvt_img *
		527	rxvt_img::blend (rxvt_img *img, double factor)
		528	{
		529	rxvt_img *img2 = clone ();
		530	Display *dpy = s->display->dpy;
		531	Picture src = src_picture ();
		532	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
		533	Picture mask = create_xrender_mask (dpy, img->pm, False);
		534
		535	XRenderColor mask_c;
		536
		537	mask_c.alpha = float_to_component (factor);
		538	mask_c.red =
		539	mask_c.green =
		540	mask_c.blue = 0;
		541	XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
		542
		543	XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, w, h);
		544
		545	XRenderFreePicture (dpy, src);
		546	XRenderFreePicture (dpy, dst);
		547	XRenderFreePicture (dpy, mask);
		548
409	return img;	549	return img2;
410	}	550	}
411		551
412	#endif	552	#endif
413		553

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.19 by root, Tue Jun 5 13:39:26 2012 UTC vs. Revision 1.35 by root, Thu Jun 7 08:36:53 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.19 by root, Tue Jun 5 13:39:26 2012 UTC vs.
Revision 1.35 by root, Thu Jun 7 08:36:53 2012 UTC