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

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.33 by root, Thu Jun 7 08:12:55 2012 UTC vs.
Revision 1.51 by root, Thu Jun 7 20:04:54 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	rxvt_img::rxvt_img (rxvt_screen screen, XRenderPictFormat format, int x, int y, int width, int height)	7	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(RepeatNormal),	8	: s(screen), x(x), y(y), w(width), h(height), format(format), repeat(repeat),
9	pm(0), refcnt(0)	9	pm(0), ref(0)
10	{	10	{
11	}	11	}
12		12
13	rxvt_img::rxvt_img (const rxvt_img &img)	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), refcnt(img.refcnt)	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	{	15	{
16	if (refcnt)
17	++*refcnt;	16	++ref->cnt;
18	}	17	}
19		18
20	#if 0	19	#if 0
21	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)
22	: s(screen), x(0), y(0), w(width), h(height), format(format), repeat(RepeatNormal), shared(false), pm(pixmap)	21	: s(screen), x(0), y(0), w(width), h(height), format(format), repeat(RepeatNormal), shared(false), pm(pixmap)
…		…
51	root_pm_w,	50	root_pm_w,
52	root_pm_h	51	root_pm_h
53	);	52	);
54		53
55	img->pm = root_pixmap;	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;
		59	}
		60
		61	rxvt_img *
		62	rxvt_img::new_from_pixbuf (rxvt_screen s, GdkPixbuf pb)
		63	{
		64	Display *dpy = s->display->dpy;
		65
		66	int width = gdk_pixbuf_get_width (pb);
		67	int height = gdk_pixbuf_get_height (pb);
		68
		69	if (width > 32767 \|\| height > 32767) // well, we could upload in chunks
		70	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big (maximum size 32768x32768).\n");
		71
		72	// since we require rgb24/argb32 formats from xrender we assume
		73	// that both 24 and 32 bpp MUST be supported by any screen that supports xrender
		74	int depth = gdk_pixbuf_get_has_alpha (pb) ? 32 : 24;
		75
		76	XImage xi;
		77
		78	xi.width = width;
		79	xi.height = height;
		80	xi.xoffset = 0;
		81	xi.format = ZPixmap;
		82	xi.byte_order = LSBFirst; // maybe go for host byte order, because servers are usually local?
		83	xi.bitmap_unit = 32; //XY only, unused
		84	xi.bitmap_bit_order = LSBFirst; //XY only, unused
		85	xi.bitmap_pad = BitmapPad (dpy);
		86	xi.depth = depth;
		87	xi.bytes_per_line = 0;
		88	xi.bits_per_pixel = 32; //Z only
		89	xi.red_mask = 0x000000ff; //Z only
		90	xi.green_mask = 0x0000ff00; //Z only
		91	xi.blue_mask = 0x00ff0000; //Z only
		92	xi.obdata = 0; // probbaly unused
		93
		94	if (!XInitImage (&xi))
		95	rxvt_fatal ("unable to initialise ximage, please report.\n");
		96
		97	if (height > INT_MAX / xi.bytes_per_line)
		98	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n");
		99
		100	xi.data = (char )rxvt_malloc (height xi.bytes_per_line);
		101
		102	int rowstride = gdk_pixbuf_get_rowstride (pb);
		103
		104	assert (3 + (depth == 32) == gdk_pixbuf_get_n_channels (pb));
		105	unsigned char *row = gdk_pixbuf_get_pixels (pb);
		106	char *line = xi.data;
		107
		108	for (int y = 0; y < height; y++)
		109	{
		110	unsigned char *src = row;
		111	uint32_t dst = (uint32_t )line;
		112
		113	if (depth == 24)
		114	for (int x = 0; x < width; x++)
		115	{
		116	uint8_t r = *src++;
		117	uint8_t g = *src++;
		118	uint8_t b = *src++;
		119
		120	uint32_t v = r \| (g << 8) \| (b << 16);
		121
		122	if (ecb_big_endian ())
		123	v = ecb_bswap32 (v);
		124
		125	*dst++ = v;
		126	}
		127	else
		128	for (int x = 0; x < width; x++)
		129	{
		130	uint32_t v = (uint32_t )src; src += 4;
		131
		132	if (ecb_big_endian ())
		133	v = ecb_bswap32 (v);
		134
		135	*dst++ = v;
		136	}
		137
		138	row += rowstride;
		139	line += xi.bytes_per_line;
		140	}
		141
		142	rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, depth == 24 ? PictStandardRGB24 : PictStandardARGB32), 0, 0, width, height);
		143	img->alloc ();
		144
		145	GC gc = XCreateGC (dpy, img->pm, 0, 0);
		146	XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height);
		147	XFreeGC (dpy, gc);
		148
		149	free (xi.data);
56		150
57	return img;	151	return img;
58	}	152	}
59		153
60	rxvt_img *	154	rxvt_img *
…		…
64	GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);	158	GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);
65		159
66	if (!pb)	160	if (!pb)
67	rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);	161	rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);
68		162
69	rxvt_img *img = new rxvt_img (	163	rxvt_img *img = new_from_pixbuf (s, pb);
70	s,
71	XRenderFindStandardFormat (s->display->dpy, gdk_pixbuf_get_has_alpha (pb) ? PictStandardARGB32 : PictStandardRGB24),
72	0,
73	0,
74	gdk_pixbuf_get_width (pb),
75	gdk_pixbuf_get_height (pb)
76	);
77	img->alloc ();
78	img->render_pixbuf (pb, 0, 0, img->w, img->h, 0, 0);
79		164
80	g_object_unref (pb);	165	g_object_unref (pb);
81		166
82	return img;	167	return img;
83	}	168	}
84		169
85	void	170	void
86	rxvt_img::destroy ()	171	rxvt_img::destroy ()
87	{	172	{
88	if (!refcnt \|\| --*refcnt)	173	if (--ref->cnt)
89	return;	174	return;
90		175
91	if (pm)	176	if (pm && ref->ours)
92	XFreePixmap (s->display->dpy, pm);	177	XFreePixmap (s->display->dpy, pm);
93		178
94	delete refcnt;	179	delete ref;
95	}	180	}
96		181
97	rxvt_img::~rxvt_img ()	182	rxvt_img::~rxvt_img ()
98	{	183	{
99	destroy ();	184	destroy ();
…		…
101		186
102	void	187	void
103	rxvt_img::alloc ()	188	rxvt_img::alloc ()
104	{	189	{
105	pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);	190	pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);
106	refcnt = new int (1);	191	ref = new pixref (w, h);
		192	}
		193
		194	Picture
		195	rxvt_img::src_picture ()
		196	{
		197	Display *dpy = s->display->dpy;
		198
		199	XRenderPictureAttributes pa;
		200	pa.repeat = repeat;
		201	Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
		202
		203	return pic;
107	}	204	}
108		205
109	void	206	void
110	rxvt_img::unshare ()	207	rxvt_img::unshare ()
111	{	208	{
112	if (refcnt && *refcnt == 1)	209	if (ref->cnt == 1 && ref->ours)
113	return;	210	return;
114		211
		212	//TODO: maybe should reify instead
115	Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);	213	Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth);
116	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);	214	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
117	XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, w, h, 0, 0);	215	XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
118	XFreeGC (s->display->dpy, gc);	216	XFreeGC (s->display->dpy, gc);
119		217
120	destroy ();	218	destroy ();
121		219
122	pm = pm2;	220	pm = pm2;
123	refcnt = new int (1);	221	ref = new pixref (ref->w, ref->h);
124	}	222	}
125		223
126	void	224	void
127	rxvt_img::fill (const rxvt_color &c)	225	rxvt_img::fill (const rxvt_color &c)
128	{	226	{
…		…
162		260
163	Display *dpy = s->display->dpy;	261	Display *dpy = s->display->dpy;
164	int size = max (rh, rv) * 2 + 1;	262	int size = max (rh, rv) * 2 + 1;
165	double kernel = (double )malloc (size * sizeof (double));	263	double kernel = (double )malloc (size * sizeof (double));
166	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));	264	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
167	rxvt_img *img = new rxvt_img (s, format, x, y, w, h);	265	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
168	img->alloc ();	266	img->alloc ();
169		267
		268	Picture src = src_picture ();
		269
170	XRenderPictureAttributes pa;	270	XRenderPictureAttributes pa;
171
172	pa.repeat = RepeatPad;	271	pa.repeat = RepeatPad;
173	Picture src = XRenderCreatePicture (dpy, pm , format, CPRepeat, &pa);
174	Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa);	272	Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa);
175		273
176	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);	274	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
177	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);	275	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
178	XFreePixmap (dpy, tmp_pm);	276	XFreePixmap (dpy, tmp_pm);
…		…
274		372
275	XRenderFreePicture (dpy, src);	373	XRenderFreePicture (dpy, src);
276	XRenderFreePicture (dpy, dst);	374	XRenderFreePicture (dpy, dst);
277	}	375	}
278		376
279	bool	377	rxvt_img *
280	rxvt_img::render_pixbuf (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y)	378	rxvt_img::clone ()
281	{	379	{
282	Display *dpy = s->display->dpy;	380	return new rxvt_img (*this);
		381	}
283		382
284	if (s->visual->c_class != TrueColor)	383	static XRenderPictFormat *
		384	find_alpha_format_for (Display dpy, XRenderPictFormat format)
		385	{
		386	if (format->direct.alphaMask)
		387	return format; // already has alpha
		388
		389	// try to find a suitable alpha format, one bit alpha is enough for our purposes
		390	if (format->type == PictTypeDirect)
		391	for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
		392	if (f->direct.alphaMask
		393	&& f->type == PictTypeDirect
		394	&& ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
		395	&& ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
		396	&& ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
285	return false;	397	return f;
286		398
287	uint32_t red_mask, green_mask, blue_mask, alpha_mask;	399	// should be a very good fallback
		400	return XRenderFindStandardFormat (dpy, PictStandardARGB32);
		401	}
288		402
289	red_mask = (uint32_t)format->direct.redMask << format->direct.red;	403	rxvt_img *
290	green_mask = (uint32_t)format->direct.greenMask << format->direct.green;	404	rxvt_img::reify ()
291	blue_mask = (uint32_t)format->direct.blueMask << format->direct.blue;	405	{
292	alpha_mask = (uint32_t)format->direct.alphaMask << format->direct.alpha;	406	if (x == 0 && y == 0 && w == ref->w && h == ref->h)
293
294	int width_r = ecb_popcount32 (red_mask);
295	int width_g = ecb_popcount32 (green_mask);
296	int width_b = ecb_popcount32 (blue_mask);
297	int width_a = ecb_popcount32 (alpha_mask);
298
299	if (width_r > 8 \|\| width_g > 8 \|\| width_b > 8 \|\| width_a > 8)
300	return false;	407	return clone ();
301		408
302	int sh_r = ecb_ctz32 (red_mask);	409	Display *dpy = s->display->dpy;
303	int sh_g = ecb_ctz32 (green_mask);
304	int sh_b = ecb_ctz32 (blue_mask);
305	int sh_a = ecb_ctz32 (alpha_mask);
306		410
307	if (width > 32767 \|\| height > 32767)	411	bool alpha = !format->direct.alphaMask
308	return false;	412	&& (x \|\| y)
		413	&& repeat == RepeatNone;
309		414
310	XImage *ximage = XCreateImage (dpy, s->visual, format->depth, ZPixmap, 0, 0,	415	rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
311	width, height, 32, 0);	416	img->alloc ();
312	if (!ximage)
313	return false;
314		417
315	if (height > INT_MAX / ximage->bytes_per_line	418	Picture src = src_picture ();
316	\|\| !(ximage->data = (char )malloc (height ximage->bytes_per_line)))	419	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
		420
		421	if (alpha)
317	{	422	{
318	XDestroyImage (ximage);	423	XRenderColor rc = { 0, 0, 0, 0 };
319	return false;	424	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
		425	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h);
320	}	426	}
321		427	else
322	GC gc = XCreateGC (dpy, pm, 0, 0);
323
324	ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
325
326	int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
327	int channels = gdk_pixbuf_get_n_channels (pixbuf);
328	unsigned char row = gdk_pixbuf_get_pixels (pixbuf) + src_y rowstride + src_x * channels;
329	char *line = ximage->data;
330
331	for (int y = 0; y < height; y++)
332	{
333	for (int x = 0; x < width; x++)
334	{
335	unsigned char pixel = row + x channels;
336	uint32_t value;
337	unsigned char r, g, b, a;
338
339	if (channels == 4)
340	{
341	a = pixel[3];
342	r = pixel[0] * a / 0xff;
343	g = pixel[1] * a / 0xff;
344	b = pixel[2] * a / 0xff;
345	}
346	else
347	{
348	a = 0xff;
349	r = pixel[0];
350	g = pixel[1];
351	b = pixel[2];
352	}
353
354	value = ((r >> (8 - width_r)) << sh_r)
355	\| ((g >> (8 - width_g)) << sh_g)
356	\| ((b >> (8 - width_b)) << sh_b)
357	\| ((a >> (8 - width_a)) << sh_a);
358
359	if (ximage->bits_per_pixel == 32)
360	((uint32_t *)line)[x] = value;
361	else
362	XPutPixel (ximage, x, y, value);
363	}
364
365	row += rowstride;
366	line += ximage->bytes_per_line;
367	}
368
369	XPutImage (dpy, pm, gc, ximage, 0, 0, dst_x, dst_y, width, height);
370	XDestroyImage (ximage);
371	XFreeGC (dpy, gc);
372
373	return true;
374	}
375
376	rxvt_img *
377	rxvt_img::clone ()
378	{
379	return new rxvt_img (*this);
380	}
381
382	rxvt_img *
383	rxvt_img::reify ()
384	{
385	rxvt_img *img = new rxvt_img (s, format, 0, 0, w, h);
386	img->alloc ();
387
388	// todo, if x==0 and y==0 and w==real width we could clone
389	// but that involves an rtt to find pixmap width.
390
391	Display *dpy = s->display->dpy;
392	XRenderPictureAttributes pa;
393	pa.repeat = repeat;
394	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
395	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
396
397	XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);	428	XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);
398		429
399	XRenderFreePicture (dpy, src);	430	XRenderFreePicture (dpy, src);
400	XRenderFreePicture (dpy, dst);	431	XRenderFreePicture (dpy, dst);
401		432
402	return img;	433	return img;
403	}	434	}
…		…
407	{	438	{
408	rxvt_img *img = clone ();	439	rxvt_img *img = clone ();
409		440
410	img->x += x;	441	img->x += x;
411	img->y += y;	442	img->y += y;
		443
		444	if (w != width \|\| h != height)
		445	{
412	img->w = width;	446	img->w = width;
413	img->h = height;	447	img->h = height;
		448
		449	rxvt_img *img2 = img->reify ();
		450	delete img;
		451	img = img2;
		452	}
414		453
415	return img;	454	return img;
416	}	455	}
417		456
418	rxvt_img *	457	rxvt_img *
419	rxvt_img::transform (int new_width, int new_height, double matrix[9])	458	rxvt_img::transform (int new_width, int new_height, double matrix[9])
420	{	459	{
421	rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height);	460	rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat);
422	img->alloc ();	461	img->alloc ();
423		462
424	Display *dpy = s->display->dpy;	463	Display *dpy = s->display->dpy;
425	XRenderPictureAttributes pa;	464	Picture src = src_picture ();
426	pa.repeat = repeat;
427	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
428	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	465	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
429		466
430	XTransform xfrm;	467	XTransform xfrm;
431		468
432	for (int i = 0; i < 3; ++i)	469	for (int i = 0; i < 3; ++i)
433	for (int j = 0; j < 3; ++j)	470	for (int j = 0; j < 3; ++j)
434	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);	471	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
435		472
		473	#if 0
436	xfrm.matrix [0][2] += XDoubleToFixed (x);//TODO	474	xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
437	xfrm.matrix [0][3] += XDoubleToFixed (y);	475	xfrm.matrix [1][2] -= XDoubleToFixed (y);
		476	#endif
438		477
439	XRenderSetPictureFilter (dpy, src, "good", 0, 0);	478	XRenderSetPictureFilter (dpy, src, "good", 0, 0);
440	XRenderSetPictureTransform (dpy, src, &xfrm);	479	XRenderSetPictureTransform (dpy, src, &xfrm);
441	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);	480	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
442		481
…		…
447	}	486	}
448		487
449	rxvt_img *	488	rxvt_img *
450	rxvt_img::scale (int new_width, int new_height)	489	rxvt_img::scale (int new_width, int new_height)
451	{	490	{
		491	if (w == new_width && h == new_height)
		492	return clone ();
		493
452	double matrix[9] = {	494	double matrix[9] = {
453	w / (double)new_width, 0, 0,	495	w / (double)new_width, 0, 0,
454	0, h / (double)new_height, 0,	496	0, h / (double)new_height, 0,
455	0, 0, 1	497	0, 0, 1
456	};	498	};
457		499
		500	int old_repeat_mode = repeat;
		501	repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems
		502
458	return transform (new_width, new_height, matrix);	503	rxvt_img *img = transform (new_width, new_height, matrix);
		504
		505	repeat = old_repeat_mode;
		506	img->repeat = repeat;
		507
		508	return img;
459	}	509	}
460		510
461	rxvt_img *	511	rxvt_img *
462	rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)	512	rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)
463	{	513	{
…		…
472		522
473	return transform (new_width, new_height, matrix);	523	return transform (new_width, new_height, matrix);
474	}	524	}
475		525
476	rxvt_img *	526	rxvt_img *
477	rxvt_img::convert_to (XRenderPictFormat *new_format, const rxvt_color &bg)	527	rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg)
478	{	528	{
479	if (new_format == format)	529	if (new_format == format)
480	return clone ();	530	return clone ();
481		531
482	rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h);	532	rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);
483	img->alloc ();	533	img->alloc ();
484		534
485	Display *dpy = s->display->dpy;	535	Display *dpy = s->display->dpy;
486	Picture src = XRenderCreatePicture (dpy, pm, format, 0, 0);	536	Picture src = src_picture ();
487	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);	537	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
488	int op = PictOpSrc;	538	int op = PictOpSrc;
489		539
490	if (format->direct.alphaMask && !new_format->direct.alphaMask)	540	if (format->direct.alphaMask && !new_format->direct.alphaMask)
491	{	541	{
…		…
510	rxvt_img *	560	rxvt_img *
511	rxvt_img::blend (rxvt_img *img, double factor)	561	rxvt_img::blend (rxvt_img *img, double factor)
512	{	562	{
513	rxvt_img *img2 = clone ();	563	rxvt_img *img2 = clone ();
514	Display *dpy = s->display->dpy;	564	Display *dpy = s->display->dpy;
515	Picture src = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	565	Picture src = img->src_picture ();
516	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);	566	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
517	Picture mask = create_xrender_mask (dpy, img->pm, False);	567	Picture mask = create_xrender_mask (dpy, img->pm, False);
518		568
519	XRenderColor mask_c;	569	XRenderColor mask_c;
520		570

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.33 by root, Thu Jun 7 08:12:55 2012 UTC vs. Revision 1.51 by root, Thu Jun 7 20:04:54 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.33 by root, Thu Jun 7 08:12:55 2012 UTC vs.
Revision 1.51 by root, Thu Jun 7 20:04:54 2012 UTC