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

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.30 by root, Wed Jun 6 22:01:44 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), x(0), y(0), w(width), h(height), format(format), repeat(RepeatNormal), 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
15	rxvt_img::rxvt_img (rxvt_screen screen, XRenderPictFormat format, int width, int height, Pixmap pixmap)	13	rxvt_img::rxvt_img (const rxvt_img &img)
16	: s(screen), x(0), y(0), w(width), h(height), format(format), repeat(RepeatNormal), shared(false), pm(pixmap)	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)
17	{	15	{
		16	++ref->cnt;
18	}	17	}
19		18
20	rxvt_img *	19	rxvt_img *
21	rxvt_img::new_from_root (rxvt_screen *s)	20	rxvt_img::new_from_root (rxvt_screen *s)
22	{	21	{
…		…
37	return 0;	36	return 0;
38		37
39	rxvt_img *img = new rxvt_img (	38	rxvt_img *img = new rxvt_img (
40	s,	39	s,
41	XRenderFindVisualFormat (dpy, DefaultVisual (dpy, s->display->screen)),	40	XRenderFindVisualFormat (dpy, DefaultVisual (dpy, s->display->screen)),
		41	0,
		42	0,
42	root_pm_w,	43	root_pm_w,
43	root_pm_h,	44	root_pm_h
44	root_pixmap
45	);	45	);
46		46
47	img->shared = true;	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);
48		152
49	return img;	153	return img;
50	}	154	}
51		155
52	rxvt_img *	156	rxvt_img *
…		…
56	GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);	160	GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);
57		161
58	if (!pb)	162	if (!pb)
59	rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);	163	rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);
60		164
61	rxvt_img *img = new rxvt_img (	165	rxvt_img *img = new_from_pixbuf (s, pb);
62	s,
63	XRenderFindStandardFormat (s->display->dpy, gdk_pixbuf_get_has_alpha (pb) ? PictStandardARGB32 : PictStandardRGB24),
64	gdk_pixbuf_get_width (pb),
65	gdk_pixbuf_get_height (pb)
66	);
67
68	img->render_pixbuf (pb, 0, 0, img->w, img->h, 0, 0);
69		166
70	g_object_unref (pb);	167	g_object_unref (pb);
71		168
72	return img;	169	return img;
73	}	170	}
74		171
		172	void
		173	rxvt_img::destroy ()
		174	{
		175	if (--ref->cnt)
		176	return;
		177
		178	if (pm && ref->ours)
		179	XFreePixmap (s->display->dpy, pm);
		180
		181	delete ref;
		182	}
		183
75	rxvt_img::~rxvt_img ()	184	rxvt_img::~rxvt_img ()
76	{	185	{
77	if (!shared)	186	destroy ();
78	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;
79	}	206	}
80		207
81	void	208	void
82	rxvt_img::unshare ()	209	rxvt_img::unshare ()
83	{	210	{
84	if (!shared)	211	if (ref->cnt == 1 && ref->ours)
85	return;	212	return;
86		213
87	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);
88		218
89	::swap (pm , img->pm);	219	destroy ();
90	::swap (shared, img->shared);
91		220
92	delete img;	221	pm = pm2;
		222	ref = new pixref (ref->w, ref->h);
93	}	223	}
94		224
95	void	225	void
96	rxvt_img::fill (const rxvt_color &c)	226	rxvt_img::fill (const rxvt_color &c)
97	{	227	{
…		…
131		261
132	Display *dpy = s->display->dpy;	262	Display *dpy = s->display->dpy;
133	int size = max (rh, rv) * 2 + 1;	263	int size = max (rh, rv) * 2 + 1;
134	double kernel = (double )malloc (size * sizeof (double));	264	double kernel = (double )malloc (size * sizeof (double));
135	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));	265	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
136	rxvt_img *img = new rxvt_img (s, format, w, h);	266	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
		267	img->alloc ();
137		268
138	XRenderPictureAttributes pa;	269	XRenderPictureAttributes pa;
139
140	pa.repeat = RepeatPad;	270	pa.repeat = RepeatPad;
141	Picture src = XRenderCreatePicture (dpy, pm , format, CPRepeat, &pa);	271	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
142	Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa);	272	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
143		273
144	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);	274	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
145	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);	275	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
146	XFreePixmap (dpy, tmp_pm);	276	XFreePixmap (dpy, tmp_pm);
147		277
…		…
163		293
164	size = rv * 2 + 1;	294	size = rv * 2 + 1;
165	get_gaussian_kernel (rv, size, kernel, params);	295	get_gaussian_kernel (rv, size, kernel, params);
166	::swap (params[0], params[1]);	296	::swap (params[0], params[1]);
167		297
168	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);	298	XRenderSetPictureFilter (dpy, tmp, FilterConvolution, params, size+2);
169	XRenderComposite (dpy,	299	XRenderComposite (dpy,
170	PictOpSrc,	300	PictOpSrc,
171	tmp,	301	tmp,
172	None,	302	None,
173	dst,	303	dst,
…		…
199	XFreePixmap (dpy, pixmap);	329	XFreePixmap (dpy, pixmap);
200		330
201	return mask;	331	return mask;
202	}	332	}
203		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
204	void	353	void
205	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)
206	{	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
207	Display *dpy = s->display->dpy;	399	Display *dpy = s->display->dpy;
208	Picture src = create_xrender_mask (dpy, pm, True);	400	Picture src = create_xrender_mask (dpy, pm, True);
209	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	401	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
210		402
211	XRenderColor mask_c;	403	XRenderColor mask_c;
212	mask_c.red = float_to_component (r);	404	mask_c.red = r;
213	mask_c.green = float_to_component (g);	405	mask_c.green = g;
214	mask_c.blue = float_to_component (b);	406	mask_c.blue = b;
215	mask_c.alpha = float_to_component (a);	407	mask_c.alpha = a;
216	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);	408	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
217		409
218	XRenderComposite (dpy, PictOpAdd, 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);
219		411
220	XRenderFreePicture (dpy, src);	412	XRenderFreePicture (dpy, src);
221	XRenderFreePicture (dpy, dst);	413	XRenderFreePicture (dpy, dst);
222	}	414	}
223		415
224	void	416	rxvt_img *
225	rxvt_img::contrast (double r, double g, double b, double a)	417	rxvt_img::clone ()
226	{	418	{
227	if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))	419	return new rxvt_img (*this);
		420	}
		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 ))
228	return;	436	return f;
229		437
		438	// should be a very good fallback
		439	return XRenderFindStandardFormat (dpy, PictStandardARGB32);
		440	}
		441
		442	rxvt_img *
		443	rxvt_img::reify ()
		444	{
		445	if (x == 0 && y == 0 && w == ref->w && h == ref->h)
		446	return clone ();
		447
230	Display *dpy = s->display->dpy;	448	Display *dpy = s->display->dpy;
231	Picture src = create_xrender_mask (dpy, pm, True);	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 ();
232	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	459	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
233		460
234	XRenderColor mask_c;	461	if (alpha)
235	mask_c.red = float_to_component (r);	462	{
236	mask_c.green = float_to_component (g);	463	XRenderColor rc = { 0, 0, 0, 0 };
237	mask_c.blue = float_to_component (b);	464	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
238	mask_c.alpha = float_to_component (a);	465	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h);
239	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);	466	}
240		467	else
241	XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	468	XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);
242		469
243	XRenderFreePicture (dpy, src);	470	XRenderFreePicture (dpy, src);
244	XRenderFreePicture (dpy, dst);	471	XRenderFreePicture (dpy, dst);
245	}
246
247	bool
248	rxvt_img::render_pixbuf (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y)
249	{
250	Display *dpy = s->display->dpy;
251
252	if (s->visual->c_class != TrueColor)
253	return false;
254
255	uint32_t red_mask, green_mask, blue_mask, alpha_mask;
256
257	red_mask = (uint32_t)format->direct.redMask << format->direct.red;
258	green_mask = (uint32_t)format->direct.greenMask << format->direct.green;
259	blue_mask = (uint32_t)format->direct.blueMask << format->direct.blue;
260	alpha_mask = (uint32_t)format->direct.alphaMask << format->direct.alpha;
261
262	int width_r = ecb_popcount32 (red_mask);
263	int width_g = ecb_popcount32 (green_mask);
264	int width_b = ecb_popcount32 (blue_mask);
265	int width_a = ecb_popcount32 (alpha_mask);
266
267	if (width_r > 8 \|\| width_g > 8 \|\| width_b > 8 \|\| width_a > 8)
268	return false;
269
270	int sh_r = ecb_ctz32 (red_mask);
271	int sh_g = ecb_ctz32 (green_mask);
272	int sh_b = ecb_ctz32 (blue_mask);
273	int sh_a = ecb_ctz32 (alpha_mask);
274
275	if (width > 32767 \|\| height > 32767)
276	return false;
277
278	XImage *ximage = XCreateImage (dpy, s->visual, format->depth, ZPixmap, 0, 0,
279	width, height, 32, 0);
280	if (!ximage)
281	return false;
282
283	if (height > INT_MAX / ximage->bytes_per_line
284	\|\| !(ximage->data = (char )malloc (height ximage->bytes_per_line)))
285	{
286	XDestroyImage (ximage);
287	return false;
288	}
289
290	GC gc = XCreateGC (dpy, pm, 0, 0);
291
292	ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
293
294	int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
295	int channels = gdk_pixbuf_get_n_channels (pixbuf);
296	unsigned char row = gdk_pixbuf_get_pixels (pixbuf) + src_y rowstride + src_x * channels;
297	char *line = ximage->data;
298
299	for (int y = 0; y < height; y++)
300	{
301	for (int x = 0; x < width; x++)
302	{
303	unsigned char pixel = row + x channels;
304	uint32_t value;
305	unsigned char r, g, b, a;
306
307	if (channels == 4)
308	{
309	a = pixel[3];
310	r = pixel[0] * a / 0xff;
311	g = pixel[1] * a / 0xff;
312	b = pixel[2] * a / 0xff;
313	}
314	else
315	{
316	a = 0xff;
317	r = pixel[0];
318	g = pixel[1];
319	b = pixel[2];
320	}
321
322	value = ((r >> (8 - width_r)) << sh_r)
323	\| ((g >> (8 - width_g)) << sh_g)
324	\| ((b >> (8 - width_b)) << sh_b)
325	\| ((a >> (8 - width_a)) << sh_a);
326
327	if (ximage->bits_per_pixel == 32)
328	((uint32_t *)line)[x] = value;
329	else
330	XPutPixel (ximage, x, y, value);
331	}
332
333	row += rowstride;
334	line += ximage->bytes_per_line;
335	}
336
337	XPutImage (dpy, pm, gc, ximage, 0, 0, dst_x, dst_y, width, height);
338	XDestroyImage (ximage);
339	XFreeGC (dpy, gc);
340
341	return true;
342	}
343
344	rxvt_img *
345	rxvt_img::clone ()
346	{
347	rxvt_img *img = new rxvt_img (s, format, w, h);
348
349	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
350	XCopyArea (s->display->dpy, pm, img->pm, gc, 0, 0, w, h, 0, 0);
351	XFreeGC (s->display->dpy, gc);
352		472
353	return img;	473	return img;
354	}	474	}
355		475
356	rxvt_img *	476	rxvt_img *
357	rxvt_img::sub_rect (int x, int y, int width, int height)	477	rxvt_img::sub_rect (int x, int y, int width, int height)
358	{	478	{
359	rxvt_img *img = new rxvt_img (s, format, width, height);	479	rxvt_img *img = clone ();
360		480
361	Display *dpy = s->display->dpy;	481	img->x += x;
362	XRenderPictureAttributes pa;	482	img->y += y;
363	pa.repeat = repeat;
364	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
365	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
366		483
367	XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, width, height);	484	if (w != width \|\| h != height)
		485	{
		486	img->w = width;
		487	img->h = height;
368		488
369	XRenderFreePicture (dpy, src);	489	rxvt_img *img2 = img->reify ();
370	XRenderFreePicture (dpy, dst);	490	delete img;
		491	img = img2;
		492	}
371		493
372	return img;	494	return img;
373	}	495	}
374		496
375	rxvt_img *	497	rxvt_img *
376	rxvt_img::transform (int new_width, int new_height, double matrix[9])	498	rxvt_img::transform (int new_width, int new_height, double matrix[9])
377	{	499	{
378	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 ();
379		502
380	Display *dpy = s->display->dpy;	503	Display *dpy = s->display->dpy;
381	XRenderPictureAttributes pa;	504	Picture src = src_picture ();
382	pa.repeat = repeat;
383	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
384	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	505	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
385		506
386	XTransform xfrm;	507	XTransform xfrm;
387		508
388	for (int i = 0; i < 3; ++i)	509	for (int i = 0; i < 3; ++i)
389	for (int j = 0; j < 3; ++j)	510	for (int j = 0; j < 3; ++j)
390	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);	511	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
391		512
		513	xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
		514	xfrm.matrix [1][2] -= XDoubleToFixed (y);
		515
392	XRenderSetPictureFilter (dpy, src, "good", 0, 0);	516	XRenderSetPictureFilter (dpy, src, "good", 0, 0);
393	XRenderSetPictureTransform (dpy, src, &xfrm);	517	XRenderSetPictureTransform (dpy, src, &xfrm);
394	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);
395		519
396	XRenderFreePicture (dpy, src);	520	XRenderFreePicture (dpy, src);
…		…
400	}	524	}
401		525
402	rxvt_img *	526	rxvt_img *
403	rxvt_img::scale (int new_width, int new_height)	527	rxvt_img::scale (int new_width, int new_height)
404	{	528	{
		529	if (w == new_width && h == new_height)
		530	return clone ();
		531
405	double matrix[9] = {	532	double matrix[9] = {
406	w / (double)new_width, 0, 0,	533	w / (double)new_width, 0, 0,
407	0, h / (double)new_height, 0,	534	0, h / (double)new_height, 0,
408	0, 0, 1	535	0, 0, 1
409	};	536	};
410		537
		538	int old_repeat_mode = repeat;
		539	repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems
		540
411	return transform (new_width, new_height, matrix);	541	rxvt_img *img = transform (new_width, new_height, matrix);
		542
		543	repeat = old_repeat_mode;
		544	img->repeat = repeat;
		545
		546	return img;
412	}	547	}
413		548
414	rxvt_img *	549	rxvt_img *
415	rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)	550	rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)
416	{	551	{
…		…
425		560
426	return transform (new_width, new_height, matrix);	561	return transform (new_width, new_height, matrix);
427	}	562	}
428		563
429	rxvt_img *	564	rxvt_img *
430	rxvt_img::convert_to (XRenderPictFormat *new_format, const rxvt_color &bg)	565	rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg)
431	{	566	{
		567	if (new_format == format)
		568	return clone ();
		569
432	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 ();
433		572
434	Display *dpy = s->display->dpy;	573	Display *dpy = s->display->dpy;
435	Picture src = XRenderCreatePicture (dpy, pm, format, 0, 0);	574	Picture src = src_picture ();
436	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);	575	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
437	int op = PictOpSrc;	576	int op = PictOpSrc;
438		577
439	if (format->direct.alphaMask && !new_format->direct.alphaMask)	578	if (format->direct.alphaMask && !new_format->direct.alphaMask)
440	{	579	{
…		…
459	rxvt_img *	598	rxvt_img *
460	rxvt_img::blend (rxvt_img *img, double factor)	599	rxvt_img::blend (rxvt_img *img, double factor)
461	{	600	{
462	rxvt_img *img2 = clone ();	601	rxvt_img *img2 = clone ();
463	Display *dpy = s->display->dpy;	602	Display *dpy = s->display->dpy;
464	Picture src = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	603	Picture src = img->src_picture ();
465	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);	604	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
466	Picture mask = create_xrender_mask (dpy, img->pm, False);	605	Picture mask = create_xrender_mask (dpy, img->pm, False);
467		606
468	XRenderColor mask_c;	607	XRenderColor mask_c;
469		608

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.30 by root, Wed Jun 6 22:01:44 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.30 by root, Wed Jun 6 22:01:44 2012 UTC vs.
Revision 1.69 by root, Sat Jun 9 11:15:29 2012 UTC