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

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.12 by root, Mon Jun 4 15:28:49 2012 UTC vs.
Revision 1.69 by root, Sat Jun 9 11:15:29 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
		358	Display *dpy = s->display->dpy;
		359	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
		360
		361	// loop should not be needed for brightness, as only -1..1 makes sense
		362
		363	while (r \| g \| b \| a)
		364	{
		365	unsigned short xr, xg, xb, xa;
		366	XRenderColor mask_c;
		367
		368	if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
		369	XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
		370
		371	if (extract (-65535, 0, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
		372	{
		373	XRenderColor mask_w = { 65535, 65535, 65535, 65535 };
		374	XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
		375	mask_c.red = -mask_c.red;
		376	mask_c.green = -mask_c.green;
		377	mask_c.blue = -mask_c.blue;
		378	mask_c.alpha = -mask_c.alpha;
		379	XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
		380	XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
		381	}
		382	}
		383
		384
		385	XRenderFreePicture (dpy, dst);
		386	}
		387
		388	void
		389	rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
		390	{
		391	if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
		392	{
		393	rxvt_warn ("rxvt_img::contrast operation not supported on this display, RENDER extension too old.\n");
		394	return;
		395	}
		396
		397	unshare ();
		398
169	Display *dpy = s->display->dpy;	399	Display *dpy = s->display->dpy;
170	Picture src = create_xrender_mask (dpy, pm, True);	400	Picture src = create_xrender_mask (dpy, pm, True);
171	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	401	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
172		402
173	XRenderColor mask_c;	403	XRenderColor mask_c;
174	mask_c.red = float_to_component (r);	404	mask_c.red = r;
175	mask_c.green = float_to_component (g);	405	mask_c.green = g;
176	mask_c.blue = float_to_component (b);	406	mask_c.blue = b;
177	mask_c.alpha = float_to_component (a);	407	mask_c.alpha = a;
178	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);	408	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
179		409
180	XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
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);	410	XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
201	}
202		411
203	void	412	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)	413	XRenderFreePicture (dpy, dst);
205	{
206	//TODO
207	}	414	}
208		415
209	rxvt_img *	416	rxvt_img *
210	rxvt_img::clone ()	417	rxvt_img::clone ()
211	{	418	{
212	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);	419	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	}	420	}
218		421
		422	static XRenderPictFormat *
		423	find_alpha_format_for (Display dpy, XRenderPictFormat format)
		424	{
		425	if (format->direct.alphaMask)
		426	return format; // already has alpha
		427
		428	// try to find a suitable alpha format, one bit alpha is enough for our purposes
		429	if (format->type == PictTypeDirect)
		430	for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
		431	if (f->direct.alphaMask
		432	&& f->type == PictTypeDirect
		433	&& ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
		434	&& ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
		435	&& ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
		436	return f;
		437
		438	// should be a very good fallback
		439	return XRenderFindStandardFormat (dpy, PictStandardARGB32);
		440	}
		441
219	rxvt_img *	442	rxvt_img *
		443	rxvt_img::reify ()
		444	{
		445	if (x == 0 && y == 0 && w == ref->w && h == ref->h)
		446	return clone ();
		447
		448	Display *dpy = s->display->dpy;
		449
		450	// add an alpha channel if...
		451	bool alpha = !format->direct.alphaMask // pixmap has none yet
		452	&& (x \|\| y) // we need one because of non-zero offset
		453	&& repeat == RepeatNone; // and we have no good pixels to fill with
		454
		455	rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
		456	img->alloc ();
		457
		458	Picture src = src_picture ();
		459	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
		460
		461	if (alpha)
		462	{
		463	XRenderColor rc = { 0, 0, 0, 0 };
		464	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
		465	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h);
		466	}
		467	else
		468	XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);
		469
		470	XRenderFreePicture (dpy, src);
		471	XRenderFreePicture (dpy, dst);
		472
		473	return img;
		474	}
		475
		476	rxvt_img *
		477	rxvt_img::sub_rect (int x, int y, int width, int height)
		478	{
		479	rxvt_img *img = clone ();
		480
		481	img->x += x;
		482	img->y += y;
		483
		484	if (w != width \|\| h != height)
		485	{
		486	img->w = width;
		487	img->h = height;
		488
		489	rxvt_img *img2 = img->reify ();
		490	delete img;
		491	img = img2;
		492	}
		493
		494	return img;
		495	}
		496
		497	rxvt_img *
220	rxvt_img::transform (int new_width, int new_height, int repeat, double matrix[9])	498	rxvt_img::transform (int new_width, int new_height, double matrix[9])
221	{	499	{
222	rxvt_img *img = new rxvt_img (s, format, new_width, new_height);	500	rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat);
		501	img->alloc ();
223		502
224	Display *dpy = s->display->dpy;	503	Display *dpy = s->display->dpy;
225	Picture src = XRenderCreatePicture (dpy, pm, format, 0, 0);	504	Picture src = src_picture ();
226	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	505	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
227		506
228	XTransform xfrm;	507	XTransform xfrm;
229		508
230	for (int i = 0; i < 3; ++i)	509	for (int i = 0; i < 3; ++i)
231	for (int j = 0; j < 3; ++j)	510	for (int j = 0; j < 3; ++j)
232	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);	511	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
233		512
		513	xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
		514	xfrm.matrix [1][2] -= XDoubleToFixed (y);
		515
		516	XRenderSetPictureFilter (dpy, src, "good", 0, 0);
234	XRenderSetPictureTransform (dpy, src, &xfrm);	517	XRenderSetPictureTransform (dpy, src, &xfrm);
235	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);	518	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
236		519
237	XRenderFreePicture (dpy, src);	520	XRenderFreePicture (dpy, src);
238	XRenderFreePicture (dpy, dst);	521	XRenderFreePicture (dpy, dst);
…		…
241	}	524	}
242		525
243	rxvt_img *	526	rxvt_img *
244	rxvt_img::scale (int new_width, int new_height)	527	rxvt_img::scale (int new_width, int new_height)
245	{	528	{
		529	if (w == new_width && h == new_height)
		530	return clone ();
		531
246	double matrix[9] = {	532	double matrix[9] = {
247	new_width / (double)w, 0, 0,	533	w / (double)new_width, 0, 0,
248	0, new_height / (double)h, 0,	534	0, h / (double)new_height, 0,
249	0, 0, 1	535	0, 0, 1
250	};	536	};
251		537
		538	int old_repeat_mode = repeat;
		539	repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems
		540
		541	rxvt_img *img = transform (new_width, new_height, matrix);
		542
		543	repeat = old_repeat_mode;
		544	img->repeat = repeat;
		545
		546	return img;
		547	}
		548
		549	rxvt_img *
		550	rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)
		551	{
		552	double s = sin (phi);
		553	double c = cos (phi);
		554
		555	double matrix[9] = {
		556	c, -s, -c * x + s * y + x,
		557	s, c, -s * x - c * y + y,
		558	0, 0, 1
		559	};
		560
252	return transform (new_width, new_height, RepeatNormal, matrix);	561	return transform (new_width, new_height, matrix);
253	}	562	}
254		563
255	rxvt_img *	564	rxvt_img *
256	rxvt_img::convert_to (XRenderPictFormat *new_format)	565	rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg)
257	{	566	{
		567	if (new_format == format)
		568	return clone ();
		569
258	rxvt_img *img = new rxvt_img (s, new_format, w, h);	570	rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);
		571	img->alloc ();
259		572
260	Display *dpy = s->display->dpy;	573	Display *dpy = s->display->dpy;
261	Picture src = XRenderCreatePicture (dpy, pm, format, 0, 0);	574	Picture src = src_picture ();
262	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);	575	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
		576	int op = PictOpSrc;
263		577
		578	if (format->direct.alphaMask && !new_format->direct.alphaMask)
		579	{
		580	// does it have to be that complicated
		581	rgba c;
		582	bg.get (c);
		583
		584	XRenderColor rc = { c.r, c.g, c.b, 0xffff };
		585	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);
		586
		587	op = PictOpOver;
		588	}
		589
264	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	590	XRenderComposite (dpy, op, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
265		591
266	XRenderFreePicture (dpy, src);	592	XRenderFreePicture (dpy, src);
267	XRenderFreePicture (dpy, dst);	593	XRenderFreePicture (dpy, dst);
268		594
269	return img;	595	return img;
270	}	596	}
271		597
		598	rxvt_img *
		599	rxvt_img::blend (rxvt_img *img, double factor)
		600	{
		601	rxvt_img *img2 = clone ();
		602	Display *dpy = s->display->dpy;
		603	Picture src = img->src_picture ();
		604	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
		605	Picture mask = create_xrender_mask (dpy, img->pm, False);
		606
		607	XRenderColor mask_c;
		608
		609	mask_c.alpha = float_to_component (factor);
		610	mask_c.red =
		611	mask_c.green =
		612	mask_c.blue = 0;
		613	XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
		614
		615	XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, w, h);
		616
		617	XRenderFreePicture (dpy, src);
		618	XRenderFreePicture (dpy, dst);
		619	XRenderFreePicture (dpy, mask);
		620
		621	return img2;
		622	}
		623
272	#endif	624	#endif
273		625

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.12 by root, Mon Jun 4 15:28:49 2012 UTC vs. Revision 1.69 by root, Sat Jun 9 11:15:29 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.12 by root, Mon Jun 4 15:28:49 2012 UTC vs.
Revision 1.69 by root, Sat Jun 9 11:15:29 2012 UTC