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

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

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.31 by sf-exg, Thu Jun 7 06:08:09 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.31 by sf-exg, Thu Jun 7 06:08:09 2012 UTC vs.
Revision 1.69 by root, Sat Jun 9 11:15:29 2012 UTC