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

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.73 by sf-exg, Sat Jun 9 17:28:03 2012 UTC vs.
Revision 1.84 by root, Thu Jun 14 18:19:11 2012 UTC

…		…
1	#include <math.h>	1	#include <math.h>
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
		7	static XRenderPictFormat *
		8	find_alpha_format_for (Display dpy, XRenderPictFormat format)
		9	{
		10	if (format->direct.alphaMask)
		11	return format; // already has alpha
		12
		13	// try to find a suitable alpha format, one bit alpha is enough for our purposes
		14	if (format->type == PictTypeDirect)
		15	for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
		16	if (f->direct.alphaMask
		17	&& f->type == PictTypeDirect
		18	&& ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
		19	&& ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
		20	&& ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
		21	return f;
		22
		23	// should be a very good fallback
		24	return XRenderFindStandardFormat (dpy, PictStandardARGB32);
		25	}
6		26
7	rxvt_img::rxvt_img (rxvt_screen screen, XRenderPictFormat format, int x, int y, int width, int height, int repeat)	27	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(repeat),	28	: s(screen), x(x), y(y), w(width), h(height), format(format), repeat(repeat),
9	pm(0), ref(0)	29	pm(0), ref(0)
10	{	30	{
50		70
51	return img;	71	return img;
52	}	72	}
53		73
54	# if HAVE_PIXBUF	74	# if HAVE_PIXBUF
		75
55	rxvt_img *	76	rxvt_img *
56	rxvt_img::new_from_pixbuf (rxvt_screen s, GdkPixbuf pb)	77	rxvt_img::new_from_pixbuf (rxvt_screen s, GdkPixbuf pb)
57	{	78	{
58	Display *dpy = s->display->dpy;	79	Display *dpy = s->display->dpy;
59		80
…		…
63	if (width > 32767 \|\| height > 32767) // well, we could upload in chunks	84	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");	85	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big (maximum size 32768x32768).\n");
65		86
66	// since we require rgb24/argb32 formats from xrender we assume	87	// 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	88	// that both 24 and 32 bpp MUST be supported by any screen that supports xrender
68	int depth = gdk_pixbuf_get_has_alpha (pb) ? 32 : 24;
69		89
70	int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;	90	int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
71		91
72	XImage xi;	92	XImage xi;
73		93
…		…
77	xi.format = ZPixmap;	97	xi.format = ZPixmap;
78	xi.byte_order = ImageByteOrder (dpy);	98	xi.byte_order = ImageByteOrder (dpy);
79	xi.bitmap_unit = 0; //XY only, unused	99	xi.bitmap_unit = 0; //XY only, unused
80	xi.bitmap_bit_order = 0; //XY only, unused	100	xi.bitmap_bit_order = 0; //XY only, unused
81	xi.bitmap_pad = BitmapPad (dpy);	101	xi.bitmap_pad = BitmapPad (dpy);
82	xi.depth = depth;	102	xi.depth = 32;
83	xi.bytes_per_line = 0;	103	xi.bytes_per_line = 0;
84	xi.bits_per_pixel = 32; //Z only	104	xi.bits_per_pixel = 32; //Z only
85	xi.red_mask = 0x00000000; //Z only, unused	105	xi.red_mask = 0x00000000; //Z only, unused
86	xi.green_mask = 0x00000000; //Z only, unused	106	xi.green_mask = 0x00000000; //Z only, unused
87	xi.blue_mask = 0x00000000; //Z only, unused	107	xi.blue_mask = 0x00000000; //Z only, unused
…		…
96	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n");	116	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n");
97		117
98	xi.data = (char )rxvt_malloc (height xi.bytes_per_line);	118	xi.data = (char )rxvt_malloc (height xi.bytes_per_line);
99		119
100	int rowstride = gdk_pixbuf_get_rowstride (pb);	120	int rowstride = gdk_pixbuf_get_rowstride (pb);
101		121	bool pb_has_alpha = gdk_pixbuf_get_has_alpha (pb);
102	assert (3 + (depth == 32) == gdk_pixbuf_get_n_channels (pb));
103	unsigned char *row = gdk_pixbuf_get_pixels (pb);	122	unsigned char *row = gdk_pixbuf_get_pixels (pb);
		123
104	char *line = xi.data;	124	char *line = xi.data;
105		125
106	for (int y = 0; y < height; y++)	126	for (int y = 0; y < height; y++)
107	{	127	{
108	unsigned char *src = row;	128	unsigned char *src = row;
109	uint32_t dst = (uint32_t )line;	129	uint32_t dst = (uint32_t )line;
110		130
111	if (depth == 24)	131	if (!pb_has_alpha)
112	for (int x = 0; x < width; x++)	132	for (int x = 0; x < width; x++)
113	{	133	{
114	uint8_t r = *src++;	134	uint8_t r = *src++;
115	uint8_t g = *src++;	135	uint8_t g = *src++;
116	uint8_t b = *src++;	136	uint8_t b = *src++;
117		137
118	uint32_t v = (r << 16) \| (g << 8) \| b;	138	uint32_t v = (255 << 24) \| (r << 16) \| (g << 8) \| b;
119		139
120	if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)	140	if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
121	v = ecb_bswap32 (v);	141	v = ecb_bswap32 (v);
122		142
123	*dst++ = v;	143	*dst++ = v;
…		…
140		160
141	row += rowstride;	161	row += rowstride;
142	line += xi.bytes_per_line;	162	line += xi.bytes_per_line;
143	}	163	}
144		164
145	rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, depth == 24 ? PictStandardRGB24 : PictStandardARGB32), 0, 0, width, height);	165	rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, PictStandardARGB32), 0, 0, width, height);
146	img->alloc ();	166	img->alloc ();
147		167
148	GC gc = XCreateGC (dpy, img->pm, 0, 0);	168	GC gc = XCreateGC (dpy, img->pm, 0, 0);
149	XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height);	169	XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height);
150	XFreeGC (dpy, gc);	170	XFreeGC (dpy, gc);
…		…
167		187
168	g_object_unref (pb);	188	g_object_unref (pb);
169		189
170	return img;	190	return img;
171	}	191	}
		192
172	# endif	193	# endif
173		194
174	void	195	void
175	rxvt_img::destroy ()	196	rxvt_img::destroy ()
176	{	197	{
…		…
223	pm = pm2;	244	pm = pm2;
224	ref = new pixref (ref->w, ref->h);	245	ref = new pixref (ref->w, ref->h);
225	}	246	}
226		247
227	void	248	void
228	rxvt_img::fill (const rxvt_color &c)	249	rxvt_img::fill (const rgba &c)
229	{	250	{
230	XGCValues gcv;	251	XRenderColor rc = { c.r, c.g, c.b, c.a };
231	gcv.foreground = c;	252
232	GC gc = XCreateGC (s->display->dpy, pm, GCForeground, &gcv);	253	Display *dpy = s->display->dpy;
233	XFillRectangle (s->display->dpy, pm, gc, 0, 0, w, h);	254	Picture src = src_picture ();
234	XFreeGC (s->display->dpy, gc);	255	XRenderFillRectangle (dpy, PictOpSrc, src, &rc, 0, 0, w, h);
		256	XRenderFreePicture (dpy, src);
		257	}
		258
		259	void
		260	rxvt_img::add_alpha ()
		261	{
		262	if (format->direct.alphaMask)
		263	return;
		264
		265	Display *dpy = s->display->dpy;
		266
		267	rxvt_img *img = new rxvt_img (s, find_alpha_format_for (dpy, format), x, y, w, h, repeat);
		268	img->alloc ();
		269
		270	Picture src = src_picture ();
		271	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
		272
		273	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
		274
		275	XRenderFreePicture (dpy, src);
		276	XRenderFreePicture (dpy, dst);
		277
		278	::swap (img->ref, ref);
		279	::swap (img->pm , pm );
		280
		281	delete img;
235	}	282	}
236		283
237	static void	284	static void
238	get_gaussian_kernel (int radius, int width, double kernel, XFixed params)	285	get_gaussian_kernel (int radius, int width, rxvt_img::nv kernel, XFixed params)
239	{	286	{
240	double sigma = radius / 2.0;	287	rxvt_img::nv sigma = radius / 2.0;
241	double scale = sqrt (2.0 * M_PI) * sigma;	288	rxvt_img::nv scale = sqrt (2.0 * M_PI) * sigma;
242	double sum = 0.0;	289	rxvt_img::nv sum = 0.0;
243		290
244	for (int i = 0; i < width; i++)	291	for (int i = 0; i < width; i++)
245	{	292	{
246	double x = i - width / 2;	293	rxvt_img::nv x = i - width / 2;
247	kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;	294	kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
248	sum += kernel[i];	295	sum += kernel[i];
249	}	296	}
250		297
251	params[0] = XDoubleToFixed (width);	298	params[0] = XDoubleToFixed (width);
…		…
261	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))	308	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))
262	return clone ();	309	return clone ();
263		310
264	Display *dpy = s->display->dpy;	311	Display *dpy = s->display->dpy;
265	int size = max (rh, rv) * 2 + 1;	312	int size = max (rh, rv) * 2 + 1;
266	double kernel = (double )malloc (size * sizeof (double));	313	nv kernel = (nv )malloc (size * sizeof (nv));
267	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));	314	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
268	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);	315	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
269	img->alloc ();	316	img->alloc ();
270		317
271	XRenderPictureAttributes pa;	318	XRenderPictureAttributes pa;
…		…
309	w, h);	356	w, h);
310	}	357	}
311		358
312	free (kernel);	359	free (kernel);
313	free (params);	360	free (params);
		361
314	XRenderFreePicture (dpy, src);	362	XRenderFreePicture (dpy, src);
315	XRenderFreePicture (dpy, dst);	363	XRenderFreePicture (dpy, dst);
316	XRenderFreePicture (dpy, tmp);	364	XRenderFreePicture (dpy, tmp);
317		365
318	return img;	366	return img;
		367	}
		368
		369	static Picture
		370	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha)
		371	{
		372	Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
		373
		374	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
		375	XRenderPictureAttributes pa;
		376	pa.repeat = RepeatNormal;
		377	pa.component_alpha = component_alpha;
		378	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat \| CPComponentAlpha, &pa);
		379
		380	XFreePixmap (dpy, pixmap);
		381
		382	return mask;
319	}	383	}
320		384
321	static void	385	static void
322	extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)	386	extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)
323	{	387	{
…		…
365	XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);	429	XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
366	XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);	430	XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
367	}	431	}
368	}	432	}
369		433
370
371	XRenderFreePicture (dpy, dst);	434	XRenderFreePicture (dpy, dst);
372	}	435	}
373		436
374	void	437	void
375	rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)	438	rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
376	{	439	{
377	if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))	440	if (r < 0 \|\| g < 0 \|\| b < 0 \|\| a < 0)
378	{	441	rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");
379	rxvt_warn ("rxvt_img::contrast operation not supported on this display, RENDER extension too old.\n");
380	return;
381	}
382		442
383	unshare ();	443	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
		444	img->alloc ();
		445	img->fill (rgba (0, 0, 0, 0));
384		446
		447	// premultiply (yeah, these are not exact, sue me or fix it)
		448	r = (r * (a >> 8)) >> 8;
		449	g = (g * (a >> 8)) >> 8;
		450	b = (b * (a >> 8)) >> 8;
		451
385	Display *dpy = s->display->dpy;	452	Display *dpy = s->display->dpy;
		453
		454	Picture src = src_picture ();
386	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	455	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
		456	Picture mul = create_xrender_mask (dpy, pm, True, True);
387		457
		458	//TODO: this operator does not yet implement some useful contrast
		459	while (r \| g \| b \| a)
		460	{
		461	unsigned short xr, xg, xb, xa;
388	XRenderColor mask_c;	462	XRenderColor mask_c;
389	mask_c.red = r;	463
390	mask_c.green = g;	464	if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
391	mask_c.blue = b;	465	{
392	mask_c.alpha = a;
393	XRenderFillRectangle (dpy, PictOpMultiply, dst, &mask_c, 0, 0, w, h);	466	XRenderFillRectangle (dpy, PictOpSrc, mul, &mask_c, 0, 0, 1, 1);
		467	XRenderComposite (dpy, PictOpAdd, src, mul, dst, 0, 0, 0, 0, 0, 0, w, h);
		468	}
		469	}
394		470
		471	XRenderFreePicture (dpy, mul);
395	XRenderFreePicture (dpy, dst);	472	XRenderFreePicture (dpy, dst);
		473	XRenderFreePicture (dpy, src);
		474
		475	::swap (img->ref, ref);
		476	::swap (img->pm , pm );
		477
		478	delete img;
396	}	479	}
397		480
398	rxvt_img *	481	rxvt_img *
399	rxvt_img::clone ()	482	rxvt_img::clone ()
400	{	483	{
401	return new rxvt_img (*this);	484	return new rxvt_img (*this);
402	}
403
404	static XRenderPictFormat *
405	find_alpha_format_for (Display dpy, XRenderPictFormat format)
406	{
407	if (format->direct.alphaMask)
408	return format; // already has alpha
409
410	// try to find a suitable alpha format, one bit alpha is enough for our purposes
411	if (format->type == PictTypeDirect)
412	for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
413	if (f->direct.alphaMask
414	&& f->type == PictTypeDirect
415	&& ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
416	&& ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
417	&& ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
418	return f;
419
420	// should be a very good fallback
421	return XRenderFindStandardFormat (dpy, PictStandardARGB32);
422	}	485	}
423		486
424	rxvt_img *	487	rxvt_img *
425	rxvt_img::reify ()	488	rxvt_img::reify ()
426	{	489	{
…		…
474	}	537	}
475		538
476	return img;	539	return img;
477	}	540	}
478		541
479	rxvt_img *	542	static void
480	rxvt_img::transform (int new_width, int new_height, double matrix[9])	543	mat_invert (rxvt_img::nv mat[3][3], rxvt_img::nv (&inv)[3][3])
481	{	544	{
		545	rxvt_img::nv s0 = mat [2][2] * mat [1][1] - mat [2][1] * mat [1][2];
		546	rxvt_img::nv s1 = mat [2][1] * mat [0][2] - mat [2][2] * mat [0][1];
		547	rxvt_img::nv s2 = mat [1][2] * mat [0][1] - mat [1][1] * mat [0][2];
		548
		549	rxvt_img::nv invdet = 1. / (mat [0][0] * s0 + mat [1][0] * s1 + mat [2][0] * s2);
		550
		551	inv [0][0] = invdet * s0;
		552	inv [0][1] = invdet * s1;
		553	inv [0][2] = invdet * s2;
		554
		555	inv [1][0] = invdet * (mat [2][0] * mat [1][2] - mat [2][2] * mat [1][0]);
		556	inv [1][1] = invdet * (mat [2][2] * mat [0][0] - mat [2][0] * mat [0][2]);
		557	inv [1][2] = invdet * (mat [1][0] * mat [0][2] - mat [1][2] * mat [0][0]);
		558
		559	inv [2][0] = invdet * (mat [2][1] * mat [1][0] - mat [2][0] * mat [1][1]);
		560	inv [2][1] = invdet * (mat [2][0] * mat [0][1] - mat [2][1] * mat [0][0]);
		561	inv [2][2] = invdet * (mat [1][1] * mat [0][0] - mat [1][0] * mat [0][1]);
		562	}
		563
		564	static rxvt_img::nv
		565	mat_apply (rxvt_img::nv mat[3][3], int i, rxvt_img::nv x, rxvt_img::nv y)
		566	{
		567	rxvt_img::nv v = mat [i][0] * x + mat [i][1] * y + mat [i][2];
		568	rxvt_img::nv w = mat [2][0] * x + mat [2][1] * y + mat [2][2];
		569
		570	return v * (1. / w);
		571	}
		572
		573	rxvt_img *
		574	rxvt_img::transform (nv matrix[3][3])
		575	{
		576	// find new offset
		577	int ox = mat_apply (matrix, 0, x, y);
		578	int oy = mat_apply (matrix, 1, x, y);
		579
		580	// calculate new pixel bounding box coordinates
		581	nv d [2], rmin[2], rmax[2];
		582
		583	for (int i = 0; i < 2; ++i)
		584	{
		585	nv v;
		586	v = mat_apply (matrix, i, 0, 0); rmin [i] = rmax [i] = v; d [i] = v;
		587	v = mat_apply (matrix, i, w, 0); min_it (rmin [i], v); max_it (rmax [i], v);
		588	v = mat_apply (matrix, i, 0, h); min_it (rmin [i], v); max_it (rmax [i], v);
		589	v = mat_apply (matrix, i, w, h); min_it (rmin [i], v); max_it (rmax [i], v);
		590	}
		591
		592	int dx = floor (rmin [0]);
		593	int dy = floor (rmin [1]);
		594
		595	int new_width = ceil (rmax [0] - dx);
		596	int new_height = ceil (rmax [1] - dy);
		597
		598	nv inv[3][3];
		599	mat_invert (matrix, inv);
		600
482	rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat);	601	rxvt_img *img = new rxvt_img (s, format, ox - dx - d [0], oy - dy - d [1], new_width, new_height, repeat);
483	img->alloc ();	602	img->alloc ();
484		603
485	Display *dpy = s->display->dpy;	604	Display *dpy = s->display->dpy;
486	Picture src = src_picture ();	605	Picture src = src_picture ();
487	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	606	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
488		607
489	XTransform xfrm;	608	XTransform xfrm;
490		609
491	for (int i = 0; i < 3; ++i)	610	for (int i = 0; i < 3; ++i)
492	for (int j = 0; j < 3; ++j)	611	for (int j = 0; j < 3; ++j)
493	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);	612	xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);
494
495	xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
496	xfrm.matrix [1][2] -= XDoubleToFixed (y);
497		613
498	XRenderSetPictureFilter (dpy, src, "good", 0, 0);	614	XRenderSetPictureFilter (dpy, src, "good", 0, 0);
499	XRenderSetPictureTransform (dpy, src, &xfrm);	615	XRenderSetPictureTransform (dpy, src, &xfrm);
500	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);	616	XRenderComposite (dpy, PictOpSrc, src, None, dst, dx, dy, 0, 0, 0, 0, new_width, new_height);
501		617
502	XRenderFreePicture (dpy, src);	618	XRenderFreePicture (dpy, src);
503	XRenderFreePicture (dpy, dst);	619	XRenderFreePicture (dpy, dst);
504		620
505	return img;	621	return img;
…		…
509	rxvt_img::scale (int new_width, int new_height)	625	rxvt_img::scale (int new_width, int new_height)
510	{	626	{
511	if (w == new_width && h == new_height)	627	if (w == new_width && h == new_height)
512	return clone ();	628	return clone ();
513		629
514	double matrix[9] = {	630	nv matrix[3][3] = {
515	w / (double)new_width, 0, 0,	631	{ new_width / (nv)w, 0, 0 },
516	0, h / (double)new_height, 0,	632	{ 0, new_height / (nv)h, 0 },
517	0, 0, 1	633	{ 0, 0, 1 }
518	};	634	};
519		635
520	int old_repeat_mode = repeat;	636	int old_repeat_mode = repeat;
521	repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems	637	repeat = RepeatPad; // not right, but xrender can't properly scale it seems
522		638
523	rxvt_img *img = transform (new_width, new_height, matrix);	639	rxvt_img *img = transform (matrix);
524		640
525	repeat = old_repeat_mode;	641	repeat = old_repeat_mode;
526	img->repeat = repeat;	642	img->repeat = repeat;
527		643
528	return img;	644	return img;
529	}	645	}
530		646
531	rxvt_img *	647	rxvt_img *
532	rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)	648	rxvt_img::rotate (int cx, int cy, nv phi)
533	{	649	{
534	double s = sin (phi);	650	nv s = sin (phi);
535	double c = cos (phi);	651	nv c = cos (phi);
536		652
537	double matrix[9] = {	653	nv matrix[3][3] = {
538	c, -s, -c * x + s * y + x,	654	{ c, -s, cx - c * cx + s * cy },
539	s, c, -s * x - c * y + y,	655	{ s, c, cy - s * cx - c * cy },
540	0, 0, 1	656	{ 0, 0, 1 }
		657	//{ c, -s, 0 },
		658	//{ s, c, 0 },
		659	//{ 0, 0, 1 }
541	};	660	};
542		661
543	return transform (new_width, new_height, matrix);	662	//move (-cx, -cy);
544	}	663	rxvt_img *img = transform (matrix);
		664	//move ( cx, cy);
		665	//img->move (cx, cy);
545		666
		667	return img;
		668	}
		669
546	rxvt_img *	670	rxvt_img *
547	rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg)	671	rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg)
548	{	672	{
549	if (new_format == format)	673	if (new_format == format)
550	return clone ();	674	return clone ();
551		675
552	rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);	676	rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);
…		…
558	int op = PictOpSrc;	682	int op = PictOpSrc;
559		683
560	if (format->direct.alphaMask && !new_format->direct.alphaMask)	684	if (format->direct.alphaMask && !new_format->direct.alphaMask)
561	{	685	{
562	// does it have to be that complicated	686	// does it have to be that complicated
563	rgba c;
564	bg.get (c);
565
566	XRenderColor rc = { c.r, c.g, c.b, 0xffff };	687	XRenderColor rc = { bg.r, bg.g, bg.b, bg.a };
567	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);	688	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);
568		689
569	op = PictOpOver;	690	op = PictOpOver;
570	}	691	}
571		692
…		…
576		697
577	return img;	698	return img;
578	}	699	}
579		700
580	rxvt_img *	701	rxvt_img *
581	rxvt_img::blend (rxvt_img *img, double factor)	702	rxvt_img::blend (rxvt_img *img, nv factor)
582	{	703	{
583	rxvt_img *img2 = clone ();	704	rxvt_img *img2 = clone ();
584	Display *dpy = s->display->dpy;	705	Display *dpy = s->display->dpy;
585	Picture src = img->src_picture ();	706	Picture src = img->src_picture ();
586	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);	707	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
587		708	Picture mask = create_xrender_mask (dpy, img->pm, False, False);
588	Pixmap pixmap = XCreatePixmap (dpy, img->pm, 1, 1, 8);
589	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, PictStandardA8);
590	XRenderPictureAttributes pa;
591	pa.repeat = True;
592	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);
593	XFreePixmap (dpy, pixmap);
594		709
595	XRenderColor mask_c;	710	XRenderColor mask_c;
596		711
597	mask_c.alpha = float_to_component (factor);	712	mask_c.alpha = float_to_component (factor);
598	mask_c.red =	713	mask_c.red =

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.73 by sf-exg, Sat Jun 9 17:28:03 2012 UTC vs. Revision 1.84 by root, Thu Jun 14 18:19:11 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.73 by sf-exg, Sat Jun 9 17:28:03 2012 UTC vs.
Revision 1.84 by root, Thu Jun 14 18:19:11 2012 UTC