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

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.51 by root, Thu Jun 7 20:04:54 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.51 by root, Thu Jun 7 20:04:54 2012 UTC