[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.50 by root, Thu Jun 7 19:42:09 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;
		84	xi.bitmap_bit_order = LSBFirst;
		85	xi.bitmap_pad = BitmapPad (dpy);
		86	xi.depth = depth;
		87	xi.bytes_per_line = 0;
		88	xi.bits_per_pixel = 32;
		89	xi.red_mask = 0x000000ff;
		90	xi.green_mask = 0x0000ff00;
		91	xi.blue_mask = 0x00ff0000;
		92
		93	if (!XInitImage (&xi))
		94	rxvt_fatal ("unable to initialise ximage, please report.\n");
		95
		96	if (height > INT_MAX / xi.bytes_per_line)
		97	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n");
		98
		99	xi.data = (char )rxvt_malloc (height xi.bytes_per_line);
		100
		101	int rowstride = gdk_pixbuf_get_rowstride (pb);
		102
		103	assert (3 + (depth == 32) == gdk_pixbuf_get_n_channels (pb));
		104	unsigned char *row = gdk_pixbuf_get_pixels (pb);
		105	char *line = xi.data;
		106
		107	for (int y = 0; y < height; y++)
		108	{
		109	unsigned char *src = row;
		110	uint32_t dst = (uint32_t )line;
		111
		112	if (depth == 24)
		113	for (int x = 0; x < width; x++)
		114	{
		115	uint8_t r = *src++;
		116	uint8_t g = *src++;
		117	uint8_t b = *src++;
		118
		119	uint32_t v = r \| (g << 8) \| (b << 16);
		120
		121	if (ecb_big_endian ())
		122	v = ecb_bswap32 (v);
		123
		124	*dst++ = x;
		125	}
		126	else
		127	for (int x = 0; x < width; x++)
		128	{
		129	uint32_t v = (uint32_t )src; src += 4;
		130	v = ecb_big_endian () ? ecb_rotr32 (v, 8) : ecb_rotl32 (v, 8);
		131	*dst++ = ecb_bswap32 (v);
		132	}
		133
		134	row += rowstride;
		135	line += xi.bytes_per_line;
		136	}
		137
		138	rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, depth == 24 ? PictStandardRGB24 : PictStandardARGB32), 0, 0, width, height);
		139	img->alloc ();
		140
		141	GC gc = XCreateGC (dpy, img->pm, 0, 0);
		142	XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height);
		143	XFreeGC (dpy, gc);
		144
		145	free (xi.data);
56		146
57	return img;	147	return img;
58	}	148	}
59		149
60	rxvt_img *	150	rxvt_img *
…		…
64	GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);	154	GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);
65		155
66	if (!pb)	156	if (!pb)
67	rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);	157	rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);
68		158
69	rxvt_img *img = new rxvt_img (	159	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		160
80	g_object_unref (pb);	161	g_object_unref (pb);
81		162
82	return img;	163	return img;
83	}	164	}
84		165
85	void	166	void
86	rxvt_img::destroy ()	167	rxvt_img::destroy ()
87	{	168	{
88	if (!refcnt \|\| --*refcnt)	169	if (--ref->cnt)
89	return;	170	return;
90		171
91	if (pm)	172	if (pm && ref->ours)
92	XFreePixmap (s->display->dpy, pm);	173	XFreePixmap (s->display->dpy, pm);
93		174
94	delete refcnt;	175	delete ref;
95	}	176	}
96		177
97	rxvt_img::~rxvt_img ()	178	rxvt_img::~rxvt_img ()
98	{	179	{
99	destroy ();	180	destroy ();
…		…
101		182
102	void	183	void
103	rxvt_img::alloc ()	184	rxvt_img::alloc ()
104	{	185	{
105	pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);	186	pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);
106	refcnt = new int (1);	187	ref = new pixref (w, h);
		188	}
		189
		190	Picture
		191	rxvt_img::src_picture ()
		192	{
		193	Display *dpy = s->display->dpy;
		194
		195	XRenderPictureAttributes pa;
		196	pa.repeat = repeat;
		197	Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
		198
		199	return pic;
107	}	200	}
108		201
109	void	202	void
110	rxvt_img::unshare ()	203	rxvt_img::unshare ()
111	{	204	{
112	if (refcnt && *refcnt == 1)	205	if (ref->cnt == 1 && ref->ours)
113	return;	206	return;
114		207
		208	//TODO: maybe should reify instead
115	Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);	209	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);	210	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
117	XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, w, h, 0, 0);	211	XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
118	XFreeGC (s->display->dpy, gc);	212	XFreeGC (s->display->dpy, gc);
119		213
120	destroy ();	214	destroy ();
121		215
122	pm = pm2;	216	pm = pm2;
123	refcnt = new int (1);	217	ref = new pixref (ref->w, ref->h);
124	}	218	}
125		219
126	void	220	void
127	rxvt_img::fill (const rxvt_color &c)	221	rxvt_img::fill (const rxvt_color &c)
128	{	222	{
…		…
162		256
163	Display *dpy = s->display->dpy;	257	Display *dpy = s->display->dpy;
164	int size = max (rh, rv) * 2 + 1;	258	int size = max (rh, rv) * 2 + 1;
165	double kernel = (double )malloc (size * sizeof (double));	259	double kernel = (double )malloc (size * sizeof (double));
166	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));	260	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
167	rxvt_img *img = new rxvt_img (s, format, x, y, w, h);	261	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
168	img->alloc ();	262	img->alloc ();
169		263
		264	Picture src = src_picture ();
		265
170	XRenderPictureAttributes pa;	266	XRenderPictureAttributes pa;
171
172	pa.repeat = RepeatPad;	267	pa.repeat = RepeatPad;
173	Picture src = XRenderCreatePicture (dpy, pm , format, CPRepeat, &pa);
174	Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa);	268	Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa);
175		269
176	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);	270	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
177	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);	271	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
178	XFreePixmap (dpy, tmp_pm);	272	XFreePixmap (dpy, tmp_pm);
…		…
274		368
275	XRenderFreePicture (dpy, src);	369	XRenderFreePicture (dpy, src);
276	XRenderFreePicture (dpy, dst);	370	XRenderFreePicture (dpy, dst);
277	}	371	}
278		372
279	bool	373	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)	374	rxvt_img::clone ()
281	{	375	{
282	Display *dpy = s->display->dpy;	376	return new rxvt_img (*this);
		377	}
283		378
284	if (s->visual->c_class != TrueColor)	379	static XRenderPictFormat *
		380	find_alpha_format_for (Display dpy, XRenderPictFormat format)
		381	{
		382	if (format->direct.alphaMask)
		383	return format; // already has alpha
		384
		385	// try to find a suitable alpha format, one bit alpha is enough for our purposes
		386	if (format->type == PictTypeDirect)
		387	for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
		388	if (f->direct.alphaMask
		389	&& f->type == PictTypeDirect
		390	&& ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
		391	&& ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
		392	&& ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
285	return false;	393	return f;
286		394
287	uint32_t red_mask, green_mask, blue_mask, alpha_mask;	395	// should be a very good fallback
		396	return XRenderFindStandardFormat (dpy, PictStandardARGB32);
		397	}
288		398
289	red_mask = (uint32_t)format->direct.redMask << format->direct.red;	399	rxvt_img *
290	green_mask = (uint32_t)format->direct.greenMask << format->direct.green;	400	rxvt_img::reify ()
291	blue_mask = (uint32_t)format->direct.blueMask << format->direct.blue;	401	{
292	alpha_mask = (uint32_t)format->direct.alphaMask << format->direct.alpha;	402	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;	403	return clone ();
301		404
302	int sh_r = ecb_ctz32 (red_mask);	405	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		406
307	if (width > 32767 \|\| height > 32767)	407	bool alpha = !format->direct.alphaMask
308	return false;	408	&& (x \|\| y)
		409	&& repeat == RepeatNone;
309		410
310	XImage *ximage = XCreateImage (dpy, s->visual, format->depth, ZPixmap, 0, 0,	411	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);	412	img->alloc ();
312	if (!ximage)
313	return false;
314		413
315	if (height > INT_MAX / ximage->bytes_per_line	414	Picture src = src_picture ();
316	\|\| !(ximage->data = (char )malloc (height ximage->bytes_per_line)))	415	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
		416
		417	if (alpha)
317	{	418	{
318	XDestroyImage (ximage);	419	XRenderColor rc = { 0, 0, 0, 0 };
319	return false;	420	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
		421	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h);
320	}	422	}
321		423	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);	424	XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);
398		425
399	XRenderFreePicture (dpy, src);	426	XRenderFreePicture (dpy, src);
400	XRenderFreePicture (dpy, dst);	427	XRenderFreePicture (dpy, dst);
401		428
402	return img;	429	return img;
403	}	430	}
…		…
407	{	434	{
408	rxvt_img *img = clone ();	435	rxvt_img *img = clone ();
409		436
410	img->x += x;	437	img->x += x;
411	img->y += y;	438	img->y += y;
		439
		440	if (w != width \|\| h != height)
		441	{
412	img->w = width;	442	img->w = width;
413	img->h = height;	443	img->h = height;
		444
		445	rxvt_img *img2 = img->reify ();
		446	delete img;
		447	img = img2;
		448	}
414		449
415	return img;	450	return img;
416	}	451	}
417		452
418	rxvt_img *	453	rxvt_img *
419	rxvt_img::transform (int new_width, int new_height, double matrix[9])	454	rxvt_img::transform (int new_width, int new_height, double matrix[9])
420	{	455	{
421	rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height);	456	rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat);
422	img->alloc ();	457	img->alloc ();
423		458
424	Display *dpy = s->display->dpy;	459	Display *dpy = s->display->dpy;
425	XRenderPictureAttributes pa;	460	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);	461	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
429		462
430	XTransform xfrm;	463	XTransform xfrm;
431		464
432	for (int i = 0; i < 3; ++i)	465	for (int i = 0; i < 3; ++i)
433	for (int j = 0; j < 3; ++j)	466	for (int j = 0; j < 3; ++j)
434	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);	467	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
435		468
		469	#if 0
436	xfrm.matrix [0][2] += XDoubleToFixed (x);//TODO	470	xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
437	xfrm.matrix [0][3] += XDoubleToFixed (y);	471	xfrm.matrix [1][2] -= XDoubleToFixed (y);
		472	#endif
438		473
439	XRenderSetPictureFilter (dpy, src, "good", 0, 0);	474	XRenderSetPictureFilter (dpy, src, "good", 0, 0);
440	XRenderSetPictureTransform (dpy, src, &xfrm);	475	XRenderSetPictureTransform (dpy, src, &xfrm);
441	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);	476	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
442		477
…		…
447	}	482	}
448		483
449	rxvt_img *	484	rxvt_img *
450	rxvt_img::scale (int new_width, int new_height)	485	rxvt_img::scale (int new_width, int new_height)
451	{	486	{
		487	if (w == new_width && h == new_height)
		488	return clone ();
		489
452	double matrix[9] = {	490	double matrix[9] = {
453	w / (double)new_width, 0, 0,	491	w / (double)new_width, 0, 0,
454	0, h / (double)new_height, 0,	492	0, h / (double)new_height, 0,
455	0, 0, 1	493	0, 0, 1
456	};	494	};
457		495
		496	int old_repeat_mode = repeat;
		497	repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems
		498
458	return transform (new_width, new_height, matrix);	499	rxvt_img *img = transform (new_width, new_height, matrix);
		500
		501	repeat = old_repeat_mode;
		502	img->repeat = repeat;
		503
		504	return img;
459	}	505	}
460		506
461	rxvt_img *	507	rxvt_img *
462	rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)	508	rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)
463	{	509	{
…		…
472		518
473	return transform (new_width, new_height, matrix);	519	return transform (new_width, new_height, matrix);
474	}	520	}
475		521
476	rxvt_img *	522	rxvt_img *
477	rxvt_img::convert_to (XRenderPictFormat *new_format, const rxvt_color &bg)	523	rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg)
478	{	524	{
479	if (new_format == format)	525	if (new_format == format)
480	return clone ();	526	return clone ();
481		527
482	rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h);	528	rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);
483	img->alloc ();	529	img->alloc ();
484		530
485	Display *dpy = s->display->dpy;	531	Display *dpy = s->display->dpy;
486	Picture src = XRenderCreatePicture (dpy, pm, format, 0, 0);	532	Picture src = src_picture ();
487	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);	533	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
488	int op = PictOpSrc;	534	int op = PictOpSrc;
489		535
490	if (format->direct.alphaMask && !new_format->direct.alphaMask)	536	if (format->direct.alphaMask && !new_format->direct.alphaMask)
491	{	537	{
…		…
510	rxvt_img *	556	rxvt_img *
511	rxvt_img::blend (rxvt_img *img, double factor)	557	rxvt_img::blend (rxvt_img *img, double factor)
512	{	558	{
513	rxvt_img *img2 = clone ();	559	rxvt_img *img2 = clone ();
514	Display *dpy = s->display->dpy;	560	Display *dpy = s->display->dpy;
515	Picture src = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	561	Picture src = img->src_picture ();
516	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);	562	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
517	Picture mask = create_xrender_mask (dpy, img->pm, False);	563	Picture mask = create_xrender_mask (dpy, img->pm, False);
518		564
519	XRenderColor mask_c;	565	XRenderColor mask_c;
520		566

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.50 by root, Thu Jun 7 19:42:09 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.50 by root, Thu Jun 7 19:42:09 2012 UTC