[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.71 by sf-exg, Sat Jun 9 14:18:53 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	Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth);
		215	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
		216	XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
		217	XFreeGC (s->display->dpy, gc);
54		218
55	::swap (pm , img->pm);	219	destroy ();
56	::swap (shared, img->shared);
57		220
58	delete img;	221	pm = pm2;
		222	ref = new pixref (ref->w, ref->h);
59	}	223	}
60		224
61	void	225	void
62	rxvt_img::fill (const rxvt_color &c)	226	rxvt_img::fill (const rxvt_color &c)
63	{	227	{
…		…
87		251
88	for (int i = 0; i < width; i++)	252	for (int i = 0; i < width; i++)
89	params[i+2] = XDoubleToFixed (kernel[i] / sum);	253	params[i+2] = XDoubleToFixed (kernel[i] / sum);
90	}	254	}
91		255
92	void	256	rxvt_img *
93	rxvt_img::blur (int rh, int rv)	257	rxvt_img::blur (int rh, int rv)
94	{	258	{
95	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))	259	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))
96	return;	260	return clone ();
97		261
98	Display *dpy = s->display->dpy;	262	Display *dpy = s->display->dpy;
99	int size = max (rh, rv) * 2 + 1;	263	int size = max (rh, rv) * 2 + 1;
100	double kernel = (double )malloc (size * sizeof (double));	264	double kernel = (double )malloc (size * sizeof (double));
101	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));	265	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
		266	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
		267	img->alloc ();
102		268
103	XRenderPictureAttributes pa;	269	XRenderPictureAttributes pa;
104
105	pa.repeat = RepeatPad;	270	pa.repeat = RepeatPad;
106	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);	271	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
		272	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
		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);
115		282
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,
		287	None,
		288	tmp,
		289	0, 0,
		290	0, 0,
		291	0, 0,
		292	w, h);
		293
		294	size = rv * 2 + 1;
		295	get_gaussian_kernel (rv, size, kernel, params);
		296	::swap (params[0], params[1]);
		297
		298	XRenderSetPictureFilter (dpy, tmp, FilterConvolution, params, size+2);
		299	XRenderComposite (dpy,
		300	PictOpSrc,
		301	tmp,
120	None,	302	None,
121	dst,	303	dst,
122	0, 0,	304	0, 0,
123	0, 0,	305	0, 0,
124	0, 0,	306	0, 0,
125	w, h);	307	w, h);
126
127	::swap (src, dst);
128
129	size = rv * 2 + 1;
130	get_gaussian_kernel (rv, size, kernel, params);
131	::swap (params[0], params[1]);
132
133	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
134	XRenderComposite (dpy,
135	PictOpSrc,
136	src,
137	None,
138	dst,
139	0, 0,
140	0, 0,
141	0, 0,
142	w, h);
143	}	308	}
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	{
…		…
161	XFreePixmap (dpy, pixmap);	329	XFreePixmap (dpy, pixmap);
162		330
163	return mask;	331	return mask;
164	}	332	}
165		333
		334	static void
		335	extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)
		336	{
		337	int32_t x = clamp (c, cl0, cl1);
		338	c -= x;
		339	xc = x;
		340	}
		341
		342	static bool
		343	extract (int32_t cl0, int32_t cl1, int32_t &r, int32_t &g, int32_t &b, int32_t &a, unsigned short &xr, unsigned short &xg, unsigned short &xb, unsigned short &xa)
		344	{
		345	extract (cl0, cl1, r, xr);
		346	extract (cl0, cl1, g, xg);
		347	extract (cl0, cl1, b, xb);
		348	extract (cl0, cl1, a, xa);
		349
		350	return xr \| xg \| xb \| xa;
		351	}
		352
166	void	353	void
167	rxvt_img::brightness (double r, double g, double b, double a)	354	rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a)
168	{	355	{
		356	unshare ();
		357
169	Display *dpy = s->display->dpy;	358	Display *dpy = s->display->dpy;
170	Picture src = create_xrender_mask (dpy, pm, True);
171	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	359	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
172		360
		361	// loop should not be needed for brightness, as only -1..1 makes sense
		362	//while (r \| g \| b \| a)
		363	{
		364	unsigned short xr, xg, xb, xa;
		365	XRenderColor mask_c;
		366
		367	if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
		368	XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
		369
		370	if (extract (-65535, 0, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
		371	{
		372	XRenderColor mask_w = { 65535, 65535, 65535, 65535 };
		373	XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
		374	mask_c.red = -mask_c.red; //TODO: verify that doing clamp, assign, and negation does the right thing
		375	mask_c.green = -mask_c.green;
		376	mask_c.blue = -mask_c.blue;
		377	mask_c.alpha = -mask_c.alpha;
		378	XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
		379	XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
		380	}
		381	}
		382
		383
		384	XRenderFreePicture (dpy, dst);
		385	}
		386
		387	void
		388	rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
		389	{
		390	if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
		391	{
		392	rxvt_warn ("rxvt_img::contrast operation not supported on this display, RENDER extension too old.\n");
		393	return;
		394	}
		395
		396	unshare ();
		397
		398	Display *dpy = s->display->dpy;
		399	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
		400
173	XRenderColor mask_c;	401	XRenderColor mask_c;
174	mask_c.red = float_to_component (r);	402	mask_c.red = r;
175	mask_c.green = float_to_component (g);	403	mask_c.green = g;
176	mask_c.blue = float_to_component (b);	404	mask_c.blue = b;
177	mask_c.alpha = float_to_component (a);	405	mask_c.alpha = a;
178	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);	406	XRenderFillRectangle (dpy, PictOpMultiply, dst, &mask_c, 0, 0, w, h);
179		407
180	XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	408	XRenderFreePicture (dpy, dst);
181	}
182
183	void
184	rxvt_img::contrast (double r, double g, double b, double a)
185	{
186	if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
187	return;
188
189	Display *dpy = s->display->dpy;
190	Picture src = create_xrender_mask (dpy, pm, True);
191	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
192
193	XRenderColor mask_c;
194	mask_c.red = float_to_component (r);
195	mask_c.green = float_to_component (g);
196	mask_c.blue = float_to_component (b);
197	mask_c.alpha = float_to_component (a);
198	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
199
200	XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
201	}
202
203	void
204	rxvt_img::render (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y)
205	{
206	//TODO
207	}	409	}
208		410
209	rxvt_img *	411	rxvt_img *
210	rxvt_img::clone ()	412	rxvt_img::clone ()
211	{	413	{
212	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);	414	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	}	415	}
218		416
		417	static XRenderPictFormat *
		418	find_alpha_format_for (Display dpy, XRenderPictFormat format)
		419	{
		420	if (format->direct.alphaMask)
		421	return format; // already has alpha
		422
		423	// try to find a suitable alpha format, one bit alpha is enough for our purposes
		424	if (format->type == PictTypeDirect)
		425	for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
		426	if (f->direct.alphaMask
		427	&& f->type == PictTypeDirect
		428	&& ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
		429	&& ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
		430	&& ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
		431	return f;
		432
		433	// should be a very good fallback
		434	return XRenderFindStandardFormat (dpy, PictStandardARGB32);
		435	}
		436
219	rxvt_img *	437	rxvt_img *
		438	rxvt_img::reify ()
		439	{
		440	if (x == 0 && y == 0 && w == ref->w && h == ref->h)
		441	return clone ();
		442
		443	Display *dpy = s->display->dpy;
		444
		445	// add an alpha channel if...
		446	bool alpha = !format->direct.alphaMask // pixmap has none yet
		447	&& (x \|\| y) // we need one because of non-zero offset
		448	&& repeat == RepeatNone; // and we have no good pixels to fill with
		449
		450	rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
		451	img->alloc ();
		452
		453	Picture src = src_picture ();
		454	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
		455
		456	if (alpha)
		457	{
		458	XRenderColor rc = { 0, 0, 0, 0 };
		459	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
		460	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h);
		461	}
		462	else
		463	XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);
		464
		465	XRenderFreePicture (dpy, src);
		466	XRenderFreePicture (dpy, dst);
		467
		468	return img;
		469	}
		470
		471	rxvt_img *
		472	rxvt_img::sub_rect (int x, int y, int width, int height)
		473	{
		474	rxvt_img *img = clone ();
		475
		476	img->x += x;
		477	img->y += y;
		478
		479	if (w != width \|\| h != height)
		480	{
		481	img->w = width;
		482	img->h = height;
		483
		484	rxvt_img *img2 = img->reify ();
		485	delete img;
		486	img = img2;
		487	}
		488
		489	return img;
		490	}
		491
		492	rxvt_img *
220	rxvt_img::transform (int new_width, int new_height, int repeat, double matrix[9])	493	rxvt_img::transform (int new_width, int new_height, double matrix[9])
221	{	494	{
222	//TODO	495	rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat);
		496	img->alloc ();
		497
		498	Display *dpy = s->display->dpy;
		499	Picture src = src_picture ();
		500	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
		501
		502	XTransform xfrm;
		503
		504	for (int i = 0; i < 3; ++i)
		505	for (int j = 0; j < 3; ++j)
		506	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
		507
		508	xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
		509	xfrm.matrix [1][2] -= XDoubleToFixed (y);
		510
		511	XRenderSetPictureFilter (dpy, src, "good", 0, 0);
		512	XRenderSetPictureTransform (dpy, src, &xfrm);
		513	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
		514
		515	XRenderFreePicture (dpy, src);
		516	XRenderFreePicture (dpy, dst);
		517
		518	return img;
223	}	519	}
224		520
225	rxvt_img *	521	rxvt_img *
226	rxvt_img::scale (int new_width, int new_height)	522	rxvt_img::scale (int new_width, int new_height)
227	{	523	{
		524	if (w == new_width && h == new_height)
		525	return clone ();
		526
228	double matrix[9] = {	527	double matrix[9] = {
229	new_width / (double)w, 0, 0,	528	w / (double)new_width, 0, 0,
230	0, new_height / (double)h, 0,	529	0, h / (double)new_height, 0,
231	0, 0, 1	530	0, 0, 1
232	};	531	};
233		532
		533	int old_repeat_mode = repeat;
		534	repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems
		535
		536	rxvt_img *img = transform (new_width, new_height, matrix);
		537
		538	repeat = old_repeat_mode;
		539	img->repeat = repeat;
		540
		541	return img;
		542	}
		543
		544	rxvt_img *
		545	rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)
		546	{
		547	double s = sin (phi);
		548	double c = cos (phi);
		549
		550	double matrix[9] = {
		551	c, -s, -c * x + s * y + x,
		552	s, c, -s * x - c * y + y,
		553	0, 0, 1
		554	};
		555
234	return transform (new_width, new_height, RepeatNormal, matrix);	556	return transform (new_width, new_height, matrix);
235	}	557	}
236		558
237	rxvt_img *	559	rxvt_img *
238	rxvt_img::convert_to (XRenderPictFormat *new_format)	560	rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg)
239	{	561	{
		562	if (new_format == format)
		563	return clone ();
		564
240	rxvt_img *img = new rxvt_img (s, new_format, w, h);	565	rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);
		566	img->alloc ();
241		567
242	Display *dpy = s->display->dpy;	568	Display *dpy = s->display->dpy;
243	Picture src = XRenderCreatePicture (dpy, pm, format, 0, 0);	569	Picture src = src_picture ();
244	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);	570	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
		571	int op = PictOpSrc;
245		572
		573	if (format->direct.alphaMask && !new_format->direct.alphaMask)
		574	{
		575	// does it have to be that complicated
		576	rgba c;
		577	bg.get (c);
		578
		579	XRenderColor rc = { c.r, c.g, c.b, 0xffff };
		580	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);
		581
		582	op = PictOpOver;
		583	}
		584
246	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	585	XRenderComposite (dpy, op, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
247		586
248	XRenderFreePicture (dpy, src);	587	XRenderFreePicture (dpy, src);
249	XRenderFreePicture (dpy, dst);	588	XRenderFreePicture (dpy, dst);
250		589
251	return img;	590	return img;
252	}	591	}
253		592
		593	rxvt_img *
		594	rxvt_img::blend (rxvt_img *img, double factor)
		595	{
		596	rxvt_img *img2 = clone ();
		597	Display *dpy = s->display->dpy;
		598	Picture src = img->src_picture ();
		599	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
		600	Picture mask = create_xrender_mask (dpy, img->pm, False);
		601
		602	XRenderColor mask_c;
		603
		604	mask_c.alpha = float_to_component (factor);
		605	mask_c.red =
		606	mask_c.green =
		607	mask_c.blue = 0;
		608	XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
		609
		610	XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, w, h);
		611
		612	XRenderFreePicture (dpy, src);
		613	XRenderFreePicture (dpy, dst);
		614	XRenderFreePicture (dpy, mask);
		615
		616	return img2;
		617	}
		618
254	#endif	619	#endif
255		620

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.71 by sf-exg, Sat Jun 9 14:18:53 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.71 by sf-exg, Sat Jun 9 14:18:53 2012 UTC