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

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.7 by sf-exg, Sun Jun 3 20:34:25 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	{
18	}	11	}
19		12
20	rxvt_img *	13	rxvt_img::rxvt_img (const rxvt_img &img)
21	rxvt_img::new_from_file (rxvt_screen s, const char filename)	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)
22	{	15	{
23	GError *err;	16	++ref->cnt;
24	GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);	17	}
25		18
26	if (!pb)	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))
27	return 0;	36	return 0;
28		37
29	rxvt_img *img = new rxvt_img (	38	rxvt_img *img = new rxvt_img (
30	s,	39	s,
31	XRenderFindStandardFormat (s->display->dpy, gdk_pixbuf_get_has_alpha (pb) ? PictStandardARGB32 : PictStandardRGB24),	40	XRenderFindVisualFormat (dpy, DefaultVisual (dpy, s->display->screen)),
32	gdk_pixbuf_get_width (pb),	41	0,
33	gdk_pixbuf_get_height (pb)	42	0,
		43	root_pm_w,
		44	root_pm_h
34	);	45	);
35		46
36	img->render (pb, 0, 0, img->w, img->h, 0, 0);	47	img->pm = root_pixmap;
		48	img->ref = new pixref (root_pm_w, root_pm_h);
		49	img->ref->ours = false;
37		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;
		154	}
		155
		156	rxvt_img *
		157	rxvt_img::new_from_file (rxvt_screen s, const char filename)
		158	{
		159	GError *err = 0;
		160	GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);
		161
		162	if (!pb)
		163	rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);
		164
		165	rxvt_img *img = new_from_pixbuf (s, pb);
		166
		167	g_object_unref (pb);
		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 ();
		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;
		206	}
		207
		208	void
		209	rxvt_img::unshare ()
		210	{
		211	if (ref->cnt == 1 && ref->ours)
		212	return;
		213
		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);
44	XFreePixmap (s->display->dpy, pm);	218	XFreeGC (s->display->dpy, gc);
		219
		220	destroy ();
		221
		222	pm = pm2;
		223	ref = new pixref (ref->w, ref->h);
45	}	224	}
46		225
47	void	226	void
48	rxvt_img::fill (const rxvt_color &c)	227	rxvt_img::fill (const rxvt_color &c)
49	{	228	{
…		…
73		252
74	for (int i = 0; i < width; i++)	253	for (int i = 0; i < width; i++)
75	params[i+2] = XDoubleToFixed (kernel[i] / sum);	254	params[i+2] = XDoubleToFixed (kernel[i] / sum);
76	}	255	}
77		256
78	void	257	rxvt_img *
79	rxvt_img::blur (int rh, int rv)	258	rxvt_img::blur (int rh, int rv)
80	{	259	{
81	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))	260	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))
82	return;	261	return clone ();
83		262
84	Display *dpy = s->display->dpy;	263	Display *dpy = s->display->dpy;
85	int size = max (rh, rv) * 2 + 1;	264	int size = max (rh, rv) * 2 + 1;
86	double kernel = (double )malloc (size * sizeof (double));	265	double kernel = (double )malloc (size * sizeof (double));
87	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 ();
88		269
89	XRenderPictureAttributes pa;	270	XRenderPictureAttributes pa;
90
91	pa.repeat = RepeatPad;	271	pa.repeat = RepeatPad;
92	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
93	Pixmap tmp = XCreatePixmap (dpy, pm, w, h, format->depth);	275	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
94	Picture dst = XRenderCreatePicture (dpy, tmp, format, CPRepeat, &pa);	276	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
95	XFreePixmap (dpy, tmp);	277	XFreePixmap (dpy, tmp_pm);
96		278
97	if (kernel && params)	279	if (kernel && params)
98	{	280	{
99	size = rh * 2 + 1;	281	size = rh * 2 + 1;
100	get_gaussian_kernel (rh, size, kernel, params);	282	get_gaussian_kernel (rh, size, kernel, params);
…		…
102	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);	284	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
103	XRenderComposite (dpy,	285	XRenderComposite (dpy,
104	PictOpSrc,	286	PictOpSrc,
105	src,	287	src,
106	None,	288	None,
107	dst,	289	tmp,
108	0, 0,	290	0, 0,
109	0, 0,	291	0, 0,
110	0, 0,	292	0, 0,
111	w, h);	293	w, h);
112		294
113	::swap (src, dst);
114
115	size = rv * 2 + 1;	295	size = rv * 2 + 1;
116	get_gaussian_kernel (rv, size, kernel, params);	296	get_gaussian_kernel (rv, size, kernel, params);
117	::swap (params[0], params[1]);	297	::swap (params[0], params[1]);
118		298
119	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);	299	XRenderSetPictureFilter (dpy, tmp, FilterConvolution, params, size+2);
120	XRenderComposite (dpy,	300	XRenderComposite (dpy,
121	PictOpSrc,	301	PictOpSrc,
122	src,	302	tmp,
123	None,	303	None,
124	dst,	304	dst,
125	0, 0,	305	0, 0,
126	0, 0,	306	0, 0,
127	0, 0,	307	0, 0,
…		…
130		310
131	free (kernel);	311	free (kernel);
132	free (params);	312	free (params);
133	XRenderFreePicture (dpy, src);	313	XRenderFreePicture (dpy, src);
134	XRenderFreePicture (dpy, dst);	314	XRenderFreePicture (dpy, dst);
		315	XRenderFreePicture (dpy, tmp);
		316
		317	return img;
135	}	318	}
136		319
137	static Picture	320	static Picture
138	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb)	321	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb)
139	{	322	{
…		…
148		331
149	return mask;	332	return mask;
150	}	333	}
151		334
152	void	335	void
153	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)
154	{	337	{
155	Display *dpy = s->display->dpy;	338	Display *dpy = s->display->dpy;
156	Picture src = create_xrender_mask (dpy, pm, True);	339	Picture src = create_xrender_mask (dpy, pm, True);
157	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	340	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
158		341
159	XRenderColor mask_c;	342	XRenderColor mask_c;
160	mask_c.red = float_to_component (r);	343	mask_c.red = r;
161	mask_c.green = float_to_component (g);	344	mask_c.green = g;
162	mask_c.blue = float_to_component (b);	345	mask_c.blue = b;
163	mask_c.alpha = float_to_component (a);	346	mask_c.alpha = a;
164	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);	347	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
165		348
166	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);
167	}	353	}
168		354
169	void	355	void
170	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)
171	{	357	{
172	if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))	358	if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
173	return;	359	return;
174		360
175	Display *dpy = s->display->dpy;	361	Display *dpy = s->display->dpy;
176	Picture src = create_xrender_mask (dpy, pm, True);	362	Picture src = create_xrender_mask (dpy, pm, True);
177	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	363	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
178		364
179	XRenderColor mask_c;	365	XRenderColor mask_c;
180	mask_c.red = float_to_component (r);	366	mask_c.red = r;
181	mask_c.green = float_to_component (g);	367	mask_c.green = g;
182	mask_c.blue = float_to_component (b);	368	mask_c.blue = b;
183	mask_c.alpha = float_to_component (a);	369	mask_c.alpha = a;
184	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);	370	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
185		371
186	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);
187	}
188		373
189	void	374	XRenderFreePicture (dpy, src);
190	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);
191	{
192	//TODO
193	}	376	}
194		377
195	rxvt_img *	378	rxvt_img *
196	rxvt_img::copy ()	379	rxvt_img::clone ()
197	{	380	{
198	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);	381	return new rxvt_img (*this);
199	Pixmap pm2 = XCreatePixmap (s->display->dpy, pm, w, h, format->depth);
200	XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, w, h, 0, 0);
201	XFreeGC (s->display->dpy, gc);
202	return new rxvt_img (s, format, w, h, pm2);
203	}	382	}
204		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
205	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 *
206	rxvt_img::transform (int new_width, int new_height, double matrix[16])	459	rxvt_img::transform (int new_width, int new_height, double matrix[9])
207	{	460	{
208	//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;
209	}	487	}
210		488
211	rxvt_img *	489	rxvt_img *
212	rxvt_img::scale (int new_width, int new_height)	490	rxvt_img::scale (int new_width, int new_height)
213	{	491	{
214	// use transform	492	if (w == new_width && h == new_height)
215	//TODO	493	return clone ();
216	}
217		494
		495	double matrix[9] = {
		496	w / (double)new_width, 0, 0,
		497	0, h / (double)new_height, 0,
		498	0, 0, 1
		499	};
		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
218	rxvt_img *	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
		524	return transform (new_width, new_height, matrix);
		525	}
		526
		527	rxvt_img *
219	rxvt_img::convert_to (XRenderPictFormat *new_format)	528	rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg)
220	{	529	{
		530	if (new_format == format)
		531	return clone ();
		532
		533	rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);
		534	img->alloc ();
		535
221	Display *dpy = s->display->dpy;	536	Display *dpy = s->display->dpy;
222	Pixmap new_pm = XCreatePixmap (dpy, pm, w, h, new_format->depth);	537	Picture src = src_picture ();
223	Picture src = XRenderCreatePicture (dpy, pm, format, 0, 0);
224	Picture dst = XRenderCreatePicture (dpy, new_pm, new_format, 0, 0);	538	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
		539	int op = PictOpSrc;
225		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
226	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);
227		554
228	XRenderFreePicture (dpy, src);
229	XRenderFreePicture (dpy, dst);	555	XRenderFreePicture (dpy, src);
		556	XRenderFreePicture (dpy, dst);
230		557
231	rxvt_img *img = new rxvt_img (	558	return img;
232	s,	559	}
233	new_format,
234	w,
235	h,
236	new_pm
237	);
238		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
239	return img;	584	return img2;
240	}	585	}
241		586
242	#endif	587	#endif
243		588

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.7 by sf-exg, Sun Jun 3 20:34:25 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.7 by sf-exg, Sun Jun 3 20:34:25 2012 UTC vs.
Revision 1.61 by sf-exg, Fri Jun 8 10:28:30 2012 UTC