[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.49 by root, Thu Jun 7 19:24:13 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	: s(screen), x(x), y(y), w(width), h(height), format(format), repeat(repeat),
		9	pm(0), ref(0)
8	{	10	{
9	pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);
10	}	11	}
11		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
12	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)
13	: 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)
14	{	22	{
15	}	23	}
		24	#endif
16		25
17	rxvt_img *	26	rxvt_img *
18	rxvt_img::new_from_file (rxvt_screen s, const char filename)	27	rxvt_img::new_from_root (rxvt_screen *s)
19	{	28	{
20	GError *err;	29	Display *dpy = s->display->dpy;
21	GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);	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]);
22		34
23	if (!pb)	35	if (root_pixmap == None)
24	return 0;	36	return 0;
25		37
26	int w = gdk_pixbuf_get_width (pb);	38	Window wdummy;
27	int h = gdk_pixbuf_get_height (pb);	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;
28		44
29	rxvt_img *img = new rxvt_img (	45	rxvt_img *img = new rxvt_img (
30	s,	46	s,
31	XRenderFindStandardFormat (s->display->dpy, gdk_pixbuf_get_has_alpha (pb) ? PictStandardARGB32 : PictStandardRGB24),	47	XRenderFindVisualFormat (dpy, DefaultVisual (dpy, s->display->screen)),
32	gdk_pixbuf_get_width (pb),	48	0,
33	gdk_pixbuf_get_height (pb)	49	0,
		50	root_pm_w,
		51	root_pm_h
34	);	52	);
35		53
36	img->render (pb, 0, 0, w, h, 0, 0);	54	img->pm = root_pixmap;
		55	img->ref = new pixref (root_pm_w, root_pm_h);
		56	img->ref->ours = false;
37		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 = MSBFirst; // maybe go for host byte order, because servers are usually local?
		83	xi.bitmap_unit = 32;
		84	xi.bitmap_bit_order = MSBFirst;
		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 = 0x00ff0000;
		90	xi.green_mask = 0x0000ff00;
		91	xi.blue_mask = 0x000000ff;
		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 r, g, b, a;
		110	unsigned char *data = row;
		111
		112	if (depth == 24)
		113	for (int x = 0; x < width; x++)
		114	{
		115	r = *data++;
		116	g = *data++;
		117	b = *data++;
		118	*line++ = 0;
		119	*line++ = r;
		120	*line++ = g;
		121	*line++ = b;
		122	}
		123	else
		124	for (int x = 0; x < width; x++)
		125	{
		126	uint32_t v = (uint32_t )data; data += 4;
		127	v = ecb_big_endian () ? ecb_rotr32 (v, 8) : ecb_rotl32 (v, 8);
		128	(uint32_t )line = x; line += 4;
		129	}
		130
		131	row += rowstride;
		132	}
		133
		134	rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, depth == 24 ? PictStandardRGB24 : PictStandardARGB32), 0, 0, width, height);
		135	img->alloc ();
		136
		137	GC gc = XCreateGC (dpy, img->pm, 0, 0);
		138	XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height);
		139	XFreeGC (dpy, gc);
		140
		141	free (xi.data);
		142
		143	return img;
		144	}
		145
		146	rxvt_img *
		147	rxvt_img::new_from_file (rxvt_screen s, const char filename)
		148	{
		149	GError *err = 0;
		150	GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);
		151
		152	if (!pb)
		153	rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);
		154
		155	rxvt_img *img = new_from_pixbuf (s, pb);
		156
		157	g_object_unref (pb);
		158
		159	return img;
		160	}
		161
		162	void
		163	rxvt_img::destroy ()
		164	{
		165	if (--ref->cnt)
38	return img;	166	return;
		167
		168	if (pm && ref->ours)
		169	XFreePixmap (s->display->dpy, pm);
		170
		171	delete ref;
39	}	172	}
40		173
41	rxvt_img::~rxvt_img ()	174	rxvt_img::~rxvt_img ()
42	{	175	{
43	if (!shared)	176	destroy ();
		177	}
		178
		179	void
		180	rxvt_img::alloc ()
		181	{
		182	pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);
		183	ref = new pixref (w, h);
		184	}
		185
		186	Picture
		187	rxvt_img::src_picture ()
		188	{
		189	Display *dpy = s->display->dpy;
		190
		191	XRenderPictureAttributes pa;
		192	pa.repeat = repeat;
		193	Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
		194
		195	return pic;
		196	}
		197
		198	void
		199	rxvt_img::unshare ()
		200	{
		201	if (ref->cnt == 1 && ref->ours)
		202	return;
		203
		204	//TODO: maybe should reify instead
		205	Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth);
		206	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
		207	XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
44	XFreePixmap (s->display->dpy, pm);	208	XFreeGC (s->display->dpy, gc);
		209
		210	destroy ();
		211
		212	pm = pm2;
		213	ref = new pixref (ref->w, ref->h);
45	}	214	}
46		215
47	void	216	void
48	rxvt_img::fill (const rxvt_color &c)	217	rxvt_img::fill (const rxvt_color &c)
49	{	218	{
52	GC gc = XCreateGC (s->display->dpy, pm, GCForeground, &gcv);	221	GC gc = XCreateGC (s->display->dpy, pm, GCForeground, &gcv);
53	XFillRectangle (s->display->dpy, pm, gc, 0, 0, w, h);	222	XFillRectangle (s->display->dpy, pm, gc, 0, 0, w, h);
54	XFreeGC (s->display->dpy, gc);	223	XFreeGC (s->display->dpy, gc);
55	}	224	}
56		225
		226	static void
		227	get_gaussian_kernel (int radius, int width, double kernel, XFixed params)
		228	{
		229	double sigma = radius / 2.0;
		230	double scale = sqrt (2.0 * M_PI) * sigma;
		231	double sum = 0.0;
		232
		233	for (int i = 0; i < width; i++)
		234	{
		235	double x = i - width / 2;
		236	kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
		237	sum += kernel[i];
		238	}
		239
		240	params[0] = XDoubleToFixed (width);
		241	params[1] = XDoubleToFixed (1);
		242
		243	for (int i = 0; i < width; i++)
		244	params[i+2] = XDoubleToFixed (kernel[i] / sum);
		245	}
		246
		247	rxvt_img *
		248	rxvt_img::blur (int rh, int rv)
		249	{
		250	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))
		251	return clone ();
		252
		253	Display *dpy = s->display->dpy;
		254	int size = max (rh, rv) * 2 + 1;
		255	double kernel = (double )malloc (size * sizeof (double));
		256	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
		257	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
		258	img->alloc ();
		259
		260	Picture src = src_picture ();
		261
		262	XRenderPictureAttributes pa;
		263	pa.repeat = RepeatPad;
		264	Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa);
		265
		266	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
		267	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
		268	XFreePixmap (dpy, tmp_pm);
		269
		270	if (kernel && params)
		271	{
		272	size = rh * 2 + 1;
		273	get_gaussian_kernel (rh, size, kernel, params);
		274
		275	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
		276	XRenderComposite (dpy,
		277	PictOpSrc,
		278	src,
		279	None,
		280	tmp,
		281	0, 0,
		282	0, 0,
		283	0, 0,
		284	w, h);
		285
		286	size = rv * 2 + 1;
		287	get_gaussian_kernel (rv, size, kernel, params);
		288	::swap (params[0], params[1]);
		289
		290	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
		291	XRenderComposite (dpy,
		292	PictOpSrc,
		293	tmp,
		294	None,
		295	dst,
		296	0, 0,
		297	0, 0,
		298	0, 0,
		299	w, h);
		300	}
		301
		302	free (kernel);
		303	free (params);
		304	XRenderFreePicture (dpy, src);
		305	XRenderFreePicture (dpy, dst);
		306	XRenderFreePicture (dpy, tmp);
		307
		308	return img;
		309	}
		310
		311	static Picture
		312	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb)
		313	{
		314	Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
		315
		316	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
		317	XRenderPictureAttributes pa;
		318	pa.repeat = True;
		319	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);
		320
		321	XFreePixmap (dpy, pixmap);
		322
		323	return mask;
		324	}
		325
57	void	326	void
58	rxvt_img::blur (int rh, int rv)	327	rxvt_img::brightness (unsigned short r, unsigned short g, unsigned short b, unsigned short a)
59	{	328	{
60	//TODO	329	Display *dpy = s->display->dpy;
		330	Picture src = create_xrender_mask (dpy, pm, True);
		331	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
		332
		333	XRenderColor mask_c;
		334	mask_c.red = r;
		335	mask_c.green = g;
		336	mask_c.blue = b;
		337	mask_c.alpha = a;
		338	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
		339
		340	XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
		341
		342	XRenderFreePicture (dpy, src);
		343	XRenderFreePicture (dpy, dst);
61	}	344	}
62		345
63	void	346	void
64	rxvt_img::brightness (double r, double g, double b, double a)	347	rxvt_img::contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a)
65	{	348	{
66	//TODO	349	if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
67	}	350	return;
68		351
69	void	352	Display *dpy = s->display->dpy;
70	rxvt_img::contrast (double r, double g, double b, double a)	353	Picture src = create_xrender_mask (dpy, pm, True);
71	{	354	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
72	//TODO
73	}
74		355
75	void	356	XRenderColor mask_c;
76	rxvt_img::render (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y)	357	mask_c.red = r;
77	{	358	mask_c.green = g;
78	//TODO	359	mask_c.blue = b;
79	}	360	mask_c.alpha = a;
		361	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
80		362
		363	XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
		364
		365	XRenderFreePicture (dpy, src);
		366	XRenderFreePicture (dpy, dst);
		367	}
		368
81	rxvt_img *	369	rxvt_img *
82	rxvt_img::copy ()	370	rxvt_img::clone ()
83	{	371	{
84	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);	372	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	}	373	}
90		374
		375	static XRenderPictFormat *
		376	find_alpha_format_for (Display dpy, XRenderPictFormat format)
		377	{
		378	if (format->direct.alphaMask)
		379	return format; // already has alpha
		380
		381	// try to find a suitable alpha format, one bit alpha is enough for our purposes
		382	if (format->type == PictTypeDirect)
		383	for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
		384	if (f->direct.alphaMask
		385	&& f->type == PictTypeDirect
		386	&& ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
		387	&& ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
		388	&& ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
		389	return f;
		390
		391	// should be a very good fallback
		392	return XRenderFindStandardFormat (dpy, PictStandardARGB32);
		393	}
		394
91	rxvt_img *	395	rxvt_img *
		396	rxvt_img::reify ()
		397	{
		398	if (x == 0 && y == 0 && w == ref->w && h == ref->h)
		399	return clone ();
		400
		401	Display *dpy = s->display->dpy;
		402
		403	bool alpha = !format->direct.alphaMask
		404	&& (x \|\| y)
		405	&& repeat == RepeatNone;
		406
		407	rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
		408	img->alloc ();
		409
		410	Picture src = src_picture ();
		411	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
		412
		413	if (alpha)
		414	{
		415	XRenderColor rc = { 0, 0, 0, 0 };
		416	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
		417	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h);
		418	}
		419	else
		420	XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);
		421
		422	XRenderFreePicture (dpy, src);
		423	XRenderFreePicture (dpy, dst);
		424
		425	return img;
		426	}
		427
		428	rxvt_img *
		429	rxvt_img::sub_rect (int x, int y, int width, int height)
		430	{
		431	rxvt_img *img = clone ();
		432
		433	img->x += x;
		434	img->y += y;
		435
		436	if (w != width \|\| h != height)
		437	{
		438	img->w = width;
		439	img->h = height;
		440
		441	rxvt_img *img2 = img->reify ();
		442	delete img;
		443	img = img2;
		444	}
		445
		446	return img;
		447	}
		448
		449	rxvt_img *
92	rxvt_img::transform (int new_width, int new_height, double matrix[16])	450	rxvt_img::transform (int new_width, int new_height, double matrix[9])
93	{	451	{
94	//TODO	452	rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat);
		453	img->alloc ();
		454
		455	Display *dpy = s->display->dpy;
		456	Picture src = src_picture ();
		457	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
		458
		459	XTransform xfrm;
		460
		461	for (int i = 0; i < 3; ++i)
		462	for (int j = 0; j < 3; ++j)
		463	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
		464
		465	#if 0
		466	xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
		467	xfrm.matrix [1][2] -= XDoubleToFixed (y);
		468	#endif
		469
		470	XRenderSetPictureFilter (dpy, src, "good", 0, 0);
		471	XRenderSetPictureTransform (dpy, src, &xfrm);
		472	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
		473
		474	XRenderFreePicture (dpy, src);
		475	XRenderFreePicture (dpy, dst);
		476
		477	return img;
95	}	478	}
96		479
97	rxvt_img *	480	rxvt_img *
98	rxvt_img::scale (int new_width, int new_height)	481	rxvt_img::scale (int new_width, int new_height)
99	{	482	{
100	// use transform	483	if (w == new_width && h == new_height)
101	//TODO	484	return clone ();
102	}
103		485
		486	double matrix[9] = {
		487	w / (double)new_width, 0, 0,
		488	0, h / (double)new_height, 0,
		489	0, 0, 1
		490	};
		491
		492	int old_repeat_mode = repeat;
		493	repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems
		494
		495	rxvt_img *img = transform (new_width, new_height, matrix);
		496
		497	repeat = old_repeat_mode;
		498	img->repeat = repeat;
		499
		500	return img;
		501	}
		502
		503	rxvt_img *
		504	rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)
		505	{
		506	double s = sin (phi);
		507	double c = cos (phi);
		508
		509	double matrix[9] = {
		510	c, -s, -c * x + s * y + x,
		511	s, c, -s * x - c * y + y,
		512	0, 0, 1
		513	};
		514
		515	return transform (new_width, new_height, matrix);
		516	}
		517
		518	rxvt_img *
		519	rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg)
		520	{
		521	if (new_format == format)
		522	return clone ();
		523
		524	rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);
		525	img->alloc ();
		526
		527	Display *dpy = s->display->dpy;
		528	Picture src = src_picture ();
		529	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
		530	int op = PictOpSrc;
		531
		532	if (format->direct.alphaMask && !new_format->direct.alphaMask)
		533	{
		534	// does it have to be that complicated
		535	rgba c;
		536	bg.get (c);
		537
		538	XRenderColor rc = { c.r, c.g, c.b, 0xffff };
		539	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);
		540
		541	op = PictOpOver;
		542	}
		543
		544	XRenderComposite (dpy, op, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
		545
		546	XRenderFreePicture (dpy, src);
		547	XRenderFreePicture (dpy, dst);
		548
		549	return img;
		550	}
		551
		552	rxvt_img *
		553	rxvt_img::blend (rxvt_img *img, double factor)
		554	{
		555	rxvt_img *img2 = clone ();
		556	Display *dpy = s->display->dpy;
		557	Picture src = img->src_picture ();
		558	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
		559	Picture mask = create_xrender_mask (dpy, img->pm, False);
		560
		561	XRenderColor mask_c;
		562
		563	mask_c.alpha = float_to_component (factor);
		564	mask_c.red =
		565	mask_c.green =
		566	mask_c.blue = 0;
		567	XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
		568
		569	XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, w, h);
		570
		571	XRenderFreePicture (dpy, src);
		572	XRenderFreePicture (dpy, dst);
		573	XRenderFreePicture (dpy, mask);
		574
		575	return img2;
		576	}
104		577
105	#endif	578	#endif
106		579

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.49 by root, Thu Jun 7 19:24:13 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.49 by root, Thu Jun 7 19:24:13 2012 UTC