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

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

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.11 by root, Mon Jun 4 15:15:49 2012 UTC vs. Revision 1.61 by sf-exg, Fri Jun 8 10:28:30 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.11 by root, Mon Jun 4 15:15:49 2012 UTC vs.
Revision 1.61 by sf-exg, Fri Jun 8 10:28:30 2012 UTC