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

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.36 by root, Thu Jun 7 08:45:34 2012 UTC vs.
Revision 1.76 by root, Sun Jun 10 10:29:26 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 x, int y, 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(x), y(y), w(width), h(height), format(format), repeat(RepeatNormal),	8	: s(screen), x(x), y(y), w(width), h(height), format(format), repeat(repeat),
9	pm(0), ref(0)	9	pm(0), ref(0)
10	{	10	{
11	}	11	}
12		12
13	rxvt_img::rxvt_img (const rxvt_img &img)	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)	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	++ref->cnt;
17	}	17	}
18
19	#if 0
20	rxvt_img::rxvt_img (rxvt_screen screen, XRenderPictFormat format, int width, int height, Pixmap pixmap)
21	: s(screen), x(0), y(0), w(width), h(height), format(format), repeat(RepeatNormal), shared(false), pm(pixmap)
22	{
23	}
24	#endif
25		18
26	rxvt_img *	19	rxvt_img *
27	rxvt_img::new_from_root (rxvt_screen *s)	20	rxvt_img::new_from_root (rxvt_screen *s)
28	{	21	{
29	Display *dpy = s->display->dpy;	22	Display *dpy = s->display->dpy;
…		…
56	img->ref->ours = false;	49	img->ref->ours = false;
57		50
58	return img;	51	return img;
59	}	52	}
60		53
		54	# if HAVE_PIXBUF
		55	rxvt_img *
		56	rxvt_img::new_from_pixbuf (rxvt_screen s, GdkPixbuf pb)
		57	{
		58	Display *dpy = s->display->dpy;
		59
		60	int width = gdk_pixbuf_get_width (pb);
		61	int height = gdk_pixbuf_get_height (pb);
		62
		63	if (width > 32767 \|\| height > 32767) // well, we could upload in chunks
		64	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big (maximum size 32768x32768).\n");
		65
		66	// since we require rgb24/argb32 formats from xrender we assume
		67	// that both 24 and 32 bpp MUST be supported by any screen that supports xrender
		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 = 32;
		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	bool pb_has_alpha = gdk_pixbuf_get_has_alpha (pb);
		101	unsigned char *row = gdk_pixbuf_get_pixels (pb);
		102
		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 (!pb_has_alpha)
		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 = (255 << 24) \| (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, 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;
		154	}
		155
61	rxvt_img *	156	rxvt_img *
62	rxvt_img::new_from_file (rxvt_screen s, const char filename)	157	rxvt_img::new_from_file (rxvt_screen s, const char filename)
63	{	158	{
64	GError *err = 0;	159	GError *err = 0;
65	GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);	160	GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);
66		161
67	if (!pb)	162	if (!pb)
68	rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);	163	rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);
69		164
70	rxvt_img *img = new rxvt_img (	165	rxvt_img *img = new_from_pixbuf (s, pb);
71	s,
72	XRenderFindStandardFormat (s->display->dpy, gdk_pixbuf_get_has_alpha (pb) ? PictStandardARGB32 : PictStandardRGB24),
73	0,
74	0,
75	gdk_pixbuf_get_width (pb),
76	gdk_pixbuf_get_height (pb)
77	);
78	img->alloc ();
79	img->render_pixbuf (pb, 0, 0, img->w, img->h, 0, 0);
80		166
81	g_object_unref (pb);	167	g_object_unref (pb);
82		168
83	return img;	169	return img;
84	}	170	}
		171	# endif
85		172
86	void	173	void
87	rxvt_img::destroy ()	174	rxvt_img::destroy ()
88	{	175	{
89	if (--ref->cnt)	176	if (--ref->cnt)
…		…
123	rxvt_img::unshare ()	210	rxvt_img::unshare ()
124	{	211	{
125	if (ref->cnt == 1 && ref->ours)	212	if (ref->cnt == 1 && ref->ours)
126	return;	213	return;
127		214
128	//TODO: maybe should reify instead
129	Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth);	215	Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth);
130	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);	216	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
131	XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);	217	XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
132	XFreeGC (s->display->dpy, gc);	218	XFreeGC (s->display->dpy, gc);
133		219
…		…
176		262
177	Display *dpy = s->display->dpy;	263	Display *dpy = s->display->dpy;
178	int size = max (rh, rv) * 2 + 1;	264	int size = max (rh, rv) * 2 + 1;
179	double kernel = (double )malloc (size * sizeof (double));	265	double kernel = (double )malloc (size * sizeof (double));
180	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));	266	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
181	rxvt_img *img = new rxvt_img (s, format, x, y, w, h);	267	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
182	img->alloc ();	268	img->alloc ();
183
184	Picture src = src_picture ();
185		269
186	XRenderPictureAttributes pa;	270	XRenderPictureAttributes pa;
187	pa.repeat = RepeatPad;	271	pa.repeat = RepeatPad;
188	Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa);	272	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
		273	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
189		274
190	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);	275	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
191	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);	276	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
192	XFreePixmap (dpy, tmp_pm);	277	XFreePixmap (dpy, tmp_pm);
193		278
…		…
209		294
210	size = rv * 2 + 1;	295	size = rv * 2 + 1;
211	get_gaussian_kernel (rv, size, kernel, params);	296	get_gaussian_kernel (rv, size, kernel, params);
212	::swap (params[0], params[1]);	297	::swap (params[0], params[1]);
213		298
214	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);	299	XRenderSetPictureFilter (dpy, tmp, FilterConvolution, params, size+2);
215	XRenderComposite (dpy,	300	XRenderComposite (dpy,
216	PictOpSrc,	301	PictOpSrc,
217	tmp,	302	tmp,
218	None,	303	None,
219	dst,	304	dst,
…		…
231		316
232	return img;	317	return img;
233	}	318	}
234		319
235	static Picture	320	static Picture
236	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb)	321	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha)
237	{	322	{
238	Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);	323	Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
239		324
240	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);	325	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
241	XRenderPictureAttributes pa;	326	XRenderPictureAttributes pa;
242	pa.repeat = True;	327	pa.repeat = RepeatNormal;
		328	pa.component_alpha = component_alpha;
243	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);	329	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat \| CPComponentAlpha, &pa);
244		330
245	XFreePixmap (dpy, pixmap);	331	XFreePixmap (dpy, pixmap);
246		332
247	return mask;	333	return mask;
248	}	334	}
249		335
		336	static void
		337	extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)
		338	{
		339	int32_t x = clamp (c, cl0, cl1);
		340	c -= x;
		341	xc = x;
		342	}
		343
		344	static bool
		345	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)
		346	{
		347	extract (cl0, cl1, r, xr);
		348	extract (cl0, cl1, g, xg);
		349	extract (cl0, cl1, b, xb);
		350	extract (cl0, cl1, a, xa);
		351
		352	return xr \| xg \| xb \| xa;
		353	}
		354
250	void	355	void
251	rxvt_img::brightness (unsigned short r, unsigned short g, unsigned short b, unsigned short a)	356	rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a)
252	{	357	{
		358	unshare ();
		359
253	Display *dpy = s->display->dpy;	360	Display *dpy = s->display->dpy;
254	Picture src = create_xrender_mask (dpy, pm, True);
255	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	361	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
256		362
		363	// loop should not be needed for brightness, as only -1..1 makes sense
		364	//while (r \| g \| b \| a)
		365	{
		366	unsigned short xr, xg, xb, xa;
257	XRenderColor mask_c;	367	XRenderColor mask_c;
258	mask_c.red = r;	368
259	mask_c.green = g;	369	if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
260	mask_c.blue = b;	370	XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
261	mask_c.alpha = a;	371
		372	if (extract (-65535, 0, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
		373	{
		374	XRenderColor mask_w = { 65535, 65535, 65535, 65535 };
		375	XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
		376	mask_c.red = -mask_c.red; //TODO: verify that doing clamp, assign, and negation does the right thing
		377	mask_c.green = -mask_c.green;
		378	mask_c.blue = -mask_c.blue;
		379	mask_c.alpha = -mask_c.alpha;
		380	XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
		381	XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
		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 (r < 0 \|\| g < 0 \|\| b < 0 \|\| a < 0)
		392	rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");
		393
		394	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
		395	img->alloc ();
		396
		397	{
		398	rxvt_color empty;
		399	empty.set (s, rgba (0, 0, 0, 0));
		400	img->fill (empty);
		401	}
		402
		403	// premultiply (yeah, these are not exact, sue me or fix it)
		404	r = (r * (a >> 8)) >> 8;
		405	g = (g * (a >> 8)) >> 8;
		406	b = (b * (a >> 8)) >> 8;
		407
		408	Display *dpy = s->display->dpy;
		409
		410	Picture src = src_picture ();
		411	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
		412	Picture mul = create_xrender_mask (dpy, pm, True, True);
		413
		414	//TODO: this operator does not yet implement some useful contrast
		415	while (r \| g \| b \| a)
		416	{
		417	unsigned short xr, xg, xb, xa;
		418	XRenderColor mask_c;
		419
		420	if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
		421	{
262	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);	422	XRenderFillRectangle (dpy, PictOpSrc, mul, &mask_c, 0, 0, 1, 1);
263
264	XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	423	XRenderComposite (dpy, PictOpAdd, src, mul, dst, 0, 0, 0, 0, 0, 0, w, h);
		424	}
		425	}
265		426
		427	XRenderFreePicture (dpy, mul);
		428	XRenderFreePicture (dpy, dst);
266	XRenderFreePicture (dpy, src);	429	XRenderFreePicture (dpy, src);
267	XRenderFreePicture (dpy, dst);
268	}
269		430
270	void	431	::swap (img->ref, ref);
271	rxvt_img::contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a)	432	::swap (img->pm , pm );
272	{
273	if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
274	return;
275		433
276	Display *dpy = s->display->dpy;	434	delete img;
277	Picture src = create_xrender_mask (dpy, pm, True);
278	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
279
280	XRenderColor mask_c;
281	mask_c.red = r;
282	mask_c.green = g;
283	mask_c.blue = b;
284	mask_c.alpha = a;
285	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
286
287	XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
288
289	XRenderFreePicture (dpy, src);
290	XRenderFreePicture (dpy, dst);
291	}
292
293	bool
294	rxvt_img::render_pixbuf (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y)
295	{
296	Display *dpy = s->display->dpy;
297
298	if (s->visual->c_class != TrueColor)
299	return false;
300
301	uint32_t red_mask, green_mask, blue_mask, alpha_mask;
302
303	red_mask = (uint32_t)format->direct.redMask << format->direct.red;
304	green_mask = (uint32_t)format->direct.greenMask << format->direct.green;
305	blue_mask = (uint32_t)format->direct.blueMask << format->direct.blue;
306	alpha_mask = (uint32_t)format->direct.alphaMask << format->direct.alpha;
307
308	int width_r = ecb_popcount32 (red_mask);
309	int width_g = ecb_popcount32 (green_mask);
310	int width_b = ecb_popcount32 (blue_mask);
311	int width_a = ecb_popcount32 (alpha_mask);
312
313	if (width_r > 8 \|\| width_g > 8 \|\| width_b > 8 \|\| width_a > 8)
314	return false;
315
316	int sh_r = ecb_ctz32 (red_mask);
317	int sh_g = ecb_ctz32 (green_mask);
318	int sh_b = ecb_ctz32 (blue_mask);
319	int sh_a = ecb_ctz32 (alpha_mask);
320
321	if (width > 32767 \|\| height > 32767)
322	return false;
323
324	XImage *ximage = XCreateImage (dpy, s->visual, format->depth, ZPixmap, 0, 0,
325	width, height, 32, 0);
326	if (!ximage)
327	return false;
328
329	if (height > INT_MAX / ximage->bytes_per_line
330	\|\| !(ximage->data = (char )malloc (height ximage->bytes_per_line)))
331	{
332	XDestroyImage (ximage);
333	return false;
334	}
335
336	GC gc = XCreateGC (dpy, pm, 0, 0);
337
338	ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
339
340	int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
341	int channels = gdk_pixbuf_get_n_channels (pixbuf);
342	unsigned char row = gdk_pixbuf_get_pixels (pixbuf) + src_y rowstride + src_x * channels;
343	char *line = ximage->data;
344
345	for (int y = 0; y < height; y++)
346	{
347	for (int x = 0; x < width; x++)
348	{
349	unsigned char pixel = row + x channels;
350	uint32_t value;
351	unsigned char r, g, b, a;
352
353	if (channels == 4)
354	{
355	a = pixel[3];
356	r = pixel[0] * a / 0xff;
357	g = pixel[1] * a / 0xff;
358	b = pixel[2] * a / 0xff;
359	}
360	else
361	{
362	a = 0xff;
363	r = pixel[0];
364	g = pixel[1];
365	b = pixel[2];
366	}
367
368	value = ((r >> (8 - width_r)) << sh_r)
369	\| ((g >> (8 - width_g)) << sh_g)
370	\| ((b >> (8 - width_b)) << sh_b)
371	\| ((a >> (8 - width_a)) << sh_a);
372
373	if (ximage->bits_per_pixel == 32)
374	((uint32_t *)line)[x] = value;
375	else
376	XPutPixel (ximage, x, y, value);
377	}
378
379	row += rowstride;
380	line += ximage->bytes_per_line;
381	}
382
383	XPutImage (dpy, pm, gc, ximage, 0, 0, dst_x, dst_y, width, height);
384	XDestroyImage (ximage);
385	XFreeGC (dpy, gc);
386
387	return true;
388	}	435	}
389		436
390	rxvt_img *	437	rxvt_img *
391	rxvt_img::clone ()	438	rxvt_img::clone ()
392	{	439	{
393	return new rxvt_img (*this);	440	return new rxvt_img (*this);
		441	}
		442
		443	static XRenderPictFormat *
		444	find_alpha_format_for (Display dpy, XRenderPictFormat format)
		445	{
		446	if (format->direct.alphaMask)
		447	return format; // already has alpha
		448
		449	// try to find a suitable alpha format, one bit alpha is enough for our purposes
		450	if (format->type == PictTypeDirect)
		451	for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
		452	if (f->direct.alphaMask
		453	&& f->type == PictTypeDirect
		454	&& ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
		455	&& ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
		456	&& ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
		457	return f;
		458
		459	// should be a very good fallback
		460	return XRenderFindStandardFormat (dpy, PictStandardARGB32);
394	}	461	}
395		462
396	rxvt_img *	463	rxvt_img *
397	rxvt_img::reify ()	464	rxvt_img::reify ()
398	{	465	{
399	if (x == 0 && y == 0 && w == ref->w && h == ref->h)	466	if (x == 0 && y == 0 && w == ref->w && h == ref->h)
400	return clone ();	467	return clone ();
401		468
402	rxvt_img *img = new rxvt_img (s, format, 0, 0, w, h);	469	Display *dpy = s->display->dpy;
		470
		471	// add an alpha channel if...
		472	bool alpha = !format->direct.alphaMask // pixmap has none yet
		473	&& (x \|\| y) // we need one because of non-zero offset
		474	&& repeat == RepeatNone; // and we have no good pixels to fill with
		475
		476	rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
403	img->alloc ();	477	img->alloc ();
404
405	Display *dpy = s->display->dpy;
406		478
407	Picture src = src_picture ();	479	Picture src = src_picture ();
408	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	480	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
409		481
		482	if (alpha)
		483	{
		484	XRenderColor rc = { 0, 0, 0, 0 };
		485	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
		486	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h);
		487	}
		488	else
410	XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);	489	XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);
411		490
412	XRenderFreePicture (dpy, src);	491	XRenderFreePicture (dpy, src);
413	XRenderFreePicture (dpy, dst);	492	XRenderFreePicture (dpy, dst);
414		493
415	return img;	494	return img;
416	}	495	}
417		496
418	rxvt_img *	497	rxvt_img *
419	rxvt_img::sub_rect (int x, int y, int width, int height)	498	rxvt_img::sub_rect (int x, int y, int width, int height)
420	{	499	{
421	bool need_reify = w < width \|\| h < height;
422
423	rxvt_img *img = clone ();	500	rxvt_img *img = clone ();
424		501
425	img->x += x;	502	img->x += x;
426	img->y += y;	503	img->y += y;
		504
		505	if (w != width \|\| h != height)
		506	{
427	img->w = width;	507	img->w = width;
428	img->h = height;	508	img->h = height;
429		509
430	if (need_reify)	510	rxvt_img *img2 = img->reify ();
431	img->reify ();	511	delete img;
		512	img = img2;
		513	}
432		514
433	return img;	515	return img;
434	}	516	}
435		517
436	rxvt_img *	518	rxvt_img *
437	rxvt_img::transform (int new_width, int new_height, double matrix[9])	519	rxvt_img::transform (int new_width, int new_height, double matrix[9])
438	{	520	{
439	rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height);	521	rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat);
440	img->alloc ();	522	img->alloc ();
441		523
442	Display *dpy = s->display->dpy;	524	Display *dpy = s->display->dpy;
443	Picture src = src_picture ();	525	Picture src = src_picture ();
444	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	526	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
…		…
447		529
448	for (int i = 0; i < 3; ++i)	530	for (int i = 0; i < 3; ++i)
449	for (int j = 0; j < 3; ++j)	531	for (int j = 0; j < 3; ++j)
450	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);	532	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
451		533
452	xfrm.matrix [0][2] += XDoubleToFixed (x);//TODO	534	xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
453	xfrm.matrix [0][3] += XDoubleToFixed (y);	535	xfrm.matrix [1][2] -= XDoubleToFixed (y);
454		536
455	XRenderSetPictureFilter (dpy, src, "good", 0, 0);	537	XRenderSetPictureFilter (dpy, src, "good", 0, 0);
456	XRenderSetPictureTransform (dpy, src, &xfrm);	538	XRenderSetPictureTransform (dpy, src, &xfrm);
457	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);	539	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
458		540
…		…
463	}	545	}
464		546
465	rxvt_img *	547	rxvt_img *
466	rxvt_img::scale (int new_width, int new_height)	548	rxvt_img::scale (int new_width, int new_height)
467	{	549	{
		550	if (w == new_width && h == new_height)
		551	return clone ();
		552
468	double matrix[9] = {	553	double matrix[9] = {
469	w / (double)new_width, 0, 0,	554	w / (double)new_width, 0, 0,
470	0, h / (double)new_height, 0,	555	0, h / (double)new_height, 0,
471	0, 0, 1	556	0, 0, 1
472	};	557	};
473		558
		559	int old_repeat_mode = repeat;
		560	repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems
		561
474	return transform (new_width, new_height, matrix);	562	rxvt_img *img = transform (new_width, new_height, matrix);
		563
		564	repeat = old_repeat_mode;
		565	img->repeat = repeat;
		566
		567	return img;
475	}	568	}
476		569
477	rxvt_img *	570	rxvt_img *
478	rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)	571	rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)
479	{	572	{
…		…
488		581
489	return transform (new_width, new_height, matrix);	582	return transform (new_width, new_height, matrix);
490	}	583	}
491		584
492	rxvt_img *	585	rxvt_img *
493	rxvt_img::convert_to (XRenderPictFormat *new_format, const rxvt_color &bg)	586	rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg)
494	{	587	{
495	if (new_format == format)	588	if (new_format == format)
496	return clone ();	589	return clone ();
497		590
498	rxvt_img *img = new rxvt_img (s, new_format, 0, 0, w, h);	591	rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);
499	img->alloc ();	592	img->alloc ();
500		593
501	Display *dpy = s->display->dpy;	594	Display *dpy = s->display->dpy;
502	Picture src = src_picture ();	595	Picture src = src_picture ();
503	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);	596	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
…		…
526	rxvt_img *	619	rxvt_img *
527	rxvt_img::blend (rxvt_img *img, double factor)	620	rxvt_img::blend (rxvt_img *img, double factor)
528	{	621	{
529	rxvt_img *img2 = clone ();	622	rxvt_img *img2 = clone ();
530	Display *dpy = s->display->dpy;	623	Display *dpy = s->display->dpy;
531	Picture src = src_picture ();	624	Picture src = img->src_picture ();
532	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);	625	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
533	Picture mask = create_xrender_mask (dpy, img->pm, False);	626	Picture mask = create_xrender_mask (dpy, img->pm, False, False);
534		627
535	XRenderColor mask_c;	628	XRenderColor mask_c;
536		629
537	mask_c.alpha = float_to_component (factor);	630	mask_c.alpha = float_to_component (factor);
538	mask_c.red =	631	mask_c.red =

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.36 by root, Thu Jun 7 08:45:34 2012 UTC vs. Revision 1.76 by root, Sun Jun 10 10:29:26 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.36 by root, Thu Jun 7 08:45:34 2012 UTC vs.
Revision 1.76 by root, Sun Jun 10 10:29:26 2012 UTC