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

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

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.13 by root, Mon Jun 4 15:30:41 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.13 by root, Mon Jun 4 15:30:41 2012 UTC vs.
Revision 1.50 by root, Thu Jun 7 19:42:09 2012 UTC