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

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.75 by sf-exg, Sun Jun 10 07:51:45 2012 UTC vs.
Revision 1.89 by root, Thu Jun 14 19:44:31 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	#if 0
		8	struct pict
		9	{
		10	Display *dpy;
		11	Picture pic;
		12
		13	operator Picture () const
		14	{
		15	return pic;
		16	}
		17
		18	pict ()
		19	: pic (0)
		20	{
		21	}
		22
		23	pict (rxvt_img img, XRenderPictFormat format = 0)
		24	: dpy (img->s->display->dpy)
		25	{
		26	XRenderPictureAttributes pa;
		27	pa.repeat = img->repeat;
		28	pic = XRenderCreatePicture (dpy, img->pm, format ? format : img->format, CPRepeat, &pa);
		29	}
		30
		31	~pict ()
		32	{
		33	if (pic)
		34	XRenderFreePicture (dpy, pic);
		35	}
		36	};
		37	#endif
		38
		39	static XRenderPictFormat *
		40	find_alpha_format_for (Display dpy, XRenderPictFormat format)
		41	{
		42	if (format->direct.alphaMask)
		43	return format; // already has alpha
		44
		45	// try to find a suitable alpha format, one bit alpha is enough for our purposes
		46	if (format->type == PictTypeDirect)
		47	for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
		48	if (f->direct.alphaMask
		49	&& f->type == PictTypeDirect
		50	&& ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
		51	&& ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
		52	&& ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
		53	return f;
		54
		55	// should be a very good fallback
		56	return XRenderFindStandardFormat (dpy, PictStandardARGB32);
		57	}
6		58
7	rxvt_img::rxvt_img (rxvt_screen screen, XRenderPictFormat format, int x, int y, int width, int height, int repeat)	59	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),	60	: s(screen), x(x), y(y), w(width), h(height), format(format), repeat(repeat),
9	pm(0), ref(0)	61	pm(0), ref(0)
10	{	62	{
50		102
51	return img;	103	return img;
52	}	104	}
53		105
54	# if HAVE_PIXBUF	106	# if HAVE_PIXBUF
		107
55	rxvt_img *	108	rxvt_img *
56	rxvt_img::new_from_pixbuf (rxvt_screen s, GdkPixbuf pb)	109	rxvt_img::new_from_pixbuf (rxvt_screen s, GdkPixbuf pb)
57	{	110	{
58	Display *dpy = s->display->dpy;	111	Display *dpy = s->display->dpy;
59		112
…		…
63	if (width > 32767 \|\| height > 32767) // well, we could upload in chunks	116	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");	117	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big (maximum size 32768x32768).\n");
65		118
66	// since we require rgb24/argb32 formats from xrender we assume	119	// 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	120	// 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		121
70	int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;	122	int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
71		123
72	XImage xi;	124	XImage xi;
73		125
…		…
77	xi.format = ZPixmap;	129	xi.format = ZPixmap;
78	xi.byte_order = ImageByteOrder (dpy);	130	xi.byte_order = ImageByteOrder (dpy);
79	xi.bitmap_unit = 0; //XY only, unused	131	xi.bitmap_unit = 0; //XY only, unused
80	xi.bitmap_bit_order = 0; //XY only, unused	132	xi.bitmap_bit_order = 0; //XY only, unused
81	xi.bitmap_pad = BitmapPad (dpy);	133	xi.bitmap_pad = BitmapPad (dpy);
82	xi.depth = depth;	134	xi.depth = 32;
83	xi.bytes_per_line = 0;	135	xi.bytes_per_line = 0;
84	xi.bits_per_pixel = 32; //Z only	136	xi.bits_per_pixel = 32; //Z only
85	xi.red_mask = 0x00000000; //Z only, unused	137	xi.red_mask = 0x00000000; //Z only, unused
86	xi.green_mask = 0x00000000; //Z only, unused	138	xi.green_mask = 0x00000000; //Z only, unused
87	xi.blue_mask = 0x00000000; //Z only, unused	139	xi.blue_mask = 0x00000000; //Z only, unused
…		…
96	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n");	148	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n");
97		149
98	xi.data = (char )rxvt_malloc (height xi.bytes_per_line);	150	xi.data = (char )rxvt_malloc (height xi.bytes_per_line);
99		151
100	int rowstride = gdk_pixbuf_get_rowstride (pb);	152	int rowstride = gdk_pixbuf_get_rowstride (pb);
101		153	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);	154	unsigned char *row = gdk_pixbuf_get_pixels (pb);
		155
104	char *line = xi.data;	156	char *line = xi.data;
105		157
106	for (int y = 0; y < height; y++)	158	for (int y = 0; y < height; y++)
107	{	159	{
108	unsigned char *src = row;	160	unsigned char *src = row;
109	uint32_t dst = (uint32_t )line;	161	uint32_t dst = (uint32_t )line;
110		162
111	if (depth == 24)	163	if (!pb_has_alpha)
112	for (int x = 0; x < width; x++)	164	for (int x = 0; x < width; x++)
113	{	165	{
114	uint8_t r = *src++;	166	uint8_t r = *src++;
115	uint8_t g = *src++;	167	uint8_t g = *src++;
116	uint8_t b = *src++;	168	uint8_t b = *src++;
117		169
118	uint32_t v = (r << 16) \| (g << 8) \| b;	170	uint32_t v = (255 << 24) \| (r << 16) \| (g << 8) \| b;
119		171
120	if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)	172	if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
121	v = ecb_bswap32 (v);	173	v = ecb_bswap32 (v);
122		174
123	*dst++ = v;	175	*dst++ = v;
…		…
140		192
141	row += rowstride;	193	row += rowstride;
142	line += xi.bytes_per_line;	194	line += xi.bytes_per_line;
143	}	195	}
144		196
145	rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, depth == 24 ? PictStandardRGB24 : PictStandardARGB32), 0, 0, width, height);	197	rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, PictStandardARGB32), 0, 0, width, height);
146	img->alloc ();	198	img->alloc ();
147		199
148	GC gc = XCreateGC (dpy, img->pm, 0, 0);	200	GC gc = XCreateGC (dpy, img->pm, 0, 0);
149	XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height);	201	XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height);
150	XFreeGC (dpy, gc);	202	XFreeGC (dpy, gc);
…		…
167		219
168	g_object_unref (pb);	220	g_object_unref (pb);
169		221
170	return img;	222	return img;
171	}	223	}
		224
172	# endif	225	# endif
173		226
174	void	227	void
175	rxvt_img::destroy ()	228	rxvt_img::destroy ()
176	{	229	{
…		…
194	pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);	247	pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);
195	ref = new pixref (w, h);	248	ref = new pixref (w, h);
196	}	249	}
197		250
198	Picture	251	Picture
199	rxvt_img::src_picture ()	252	rxvt_img::picture ()
200	{	253	{
201	Display *dpy = s->display->dpy;	254	Display *dpy = s->display->dpy;
202		255
203	XRenderPictureAttributes pa;	256	XRenderPictureAttributes pa;
204	pa.repeat = repeat;	257	pa.repeat = repeat;
…		…
223	pm = pm2;	276	pm = pm2;
224	ref = new pixref (ref->w, ref->h);	277	ref = new pixref (ref->w, ref->h);
225	}	278	}
226		279
227	void	280	void
228	rxvt_img::fill (const rxvt_color &c)	281	rxvt_img::fill (const rgba &c)
229	{	282	{
230	XGCValues gcv;	283	XRenderColor rc = { c.r, c.g, c.b, c.a };
231	gcv.foreground = c;	284
232	GC gc = XCreateGC (s->display->dpy, pm, GCForeground, &gcv);	285	Display *dpy = s->display->dpy;
233	XFillRectangle (s->display->dpy, pm, gc, 0, 0, w, h);	286	Picture src = picture ();
234	XFreeGC (s->display->dpy, gc);	287	XRenderFillRectangle (dpy, PictOpSrc, src, &rc, 0, 0, w, h);
		288	XRenderFreePicture (dpy, src);
		289	}
		290
		291	void
		292	rxvt_img::add_alpha ()
		293	{
		294	if (format->direct.alphaMask)
		295	return;
		296
		297	Display *dpy = s->display->dpy;
		298
		299	rxvt_img *img = new rxvt_img (s, find_alpha_format_for (dpy, format), x, y, w, h, repeat);
		300	img->alloc ();
		301
		302	Picture src = picture ();
		303	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
		304
		305	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
		306
		307	XRenderFreePicture (dpy, src);
		308	XRenderFreePicture (dpy, dst);
		309
		310	::swap (img->ref, ref);
		311	::swap (img->pm , pm );
		312
		313	delete img;
235	}	314	}
236		315
237	static void	316	static void
238	get_gaussian_kernel (int radius, int width, double kernel, XFixed params)	317	get_gaussian_kernel (int radius, int width, rxvt_img::nv kernel, XFixed params)
239	{	318	{
240	double sigma = radius / 2.0;	319	rxvt_img::nv sigma = radius / 2.0;
241	double scale = sqrt (2.0 * M_PI) * sigma;	320	rxvt_img::nv scale = sqrt (2.0 * M_PI) * sigma;
242	double sum = 0.0;	321	rxvt_img::nv sum = 0.0;
243		322
244	for (int i = 0; i < width; i++)	323	for (int i = 0; i < width; i++)
245	{	324	{
246	double x = i - width / 2;	325	rxvt_img::nv x = i - width / 2;
247	kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;	326	kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
248	sum += kernel[i];	327	sum += kernel[i];
249	}	328	}
250		329
251	params[0] = XDoubleToFixed (width);	330	params[0] = XDoubleToFixed (width);
…		…
261	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))	340	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))
262	return clone ();	341	return clone ();
263		342
264	Display *dpy = s->display->dpy;	343	Display *dpy = s->display->dpy;
265	int size = max (rh, rv) * 2 + 1;	344	int size = max (rh, rv) * 2 + 1;
266	double kernel = (double )malloc (size * sizeof (double));	345	nv kernel = (nv )malloc (size * sizeof (nv));
267	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));	346	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
268	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);	347	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
269	img->alloc ();	348	img->alloc ();
270		349
271	XRenderPictureAttributes pa;	350	XRenderPictureAttributes pa;
…		…
309	w, h);	388	w, h);
310	}	389	}
311		390
312	free (kernel);	391	free (kernel);
313	free (params);	392	free (params);
		393
314	XRenderFreePicture (dpy, src);	394	XRenderFreePicture (dpy, src);
315	XRenderFreePicture (dpy, dst);	395	XRenderFreePicture (dpy, dst);
316	XRenderFreePicture (dpy, tmp);	396	XRenderFreePicture (dpy, tmp);
317		397
318	return img;	398	return img;
…		…
392	if (r < 0 \|\| g < 0 \|\| b < 0 \|\| a < 0)	472	if (r < 0 \|\| g < 0 \|\| b < 0 \|\| a < 0)
393	rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");	473	rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");
394		474
395	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);	475	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
396	img->alloc ();	476	img->alloc ();
397		477	img->fill (rgba (0, 0, 0, 0));
398	{
399	rxvt_color empty;
400	empty.set (s, rgba (0, 0, 0, 0));
401	img->fill (empty);
402	}
403		478
404	// premultiply (yeah, these are not exact, sue me or fix it)	479	// premultiply (yeah, these are not exact, sue me or fix it)
405	r = (r * (a >> 8)) >> 8;	480	r = (r * (a >> 8)) >> 8;
406	g = (g * (a >> 8)) >> 8;	481	g = (g * (a >> 8)) >> 8;
407	b = (b * (a >> 8)) >> 8;	482	b = (b * (a >> 8)) >> 8;
408		483
409	Display *dpy = s->display->dpy;	484	Display *dpy = s->display->dpy;
410		485
411	Picture src = src_picture ();	486	Picture src = picture ();
412	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);	487	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
413	Picture mul = create_xrender_mask (dpy, pm, True, True);	488	Picture mul = create_xrender_mask (dpy, pm, True, True);
414		489
415	//TODO: this operator does not yet implement some useful contrast	490	//TODO: this operator does not yet implement some useful contrast
416	while (r \| g \| b \| a)	491	while (r \| g \| b \| a)
…		…
433	::swap (img->pm , pm );	508	::swap (img->pm , pm );
434		509
435	delete img;	510	delete img;
436	}	511	}
437		512
		513	void
		514	rxvt_img::draw (rxvt_img *img, int op, nv mask)
		515	{
		516	unshare ();
		517
		518	Display *dpy = s->display->dpy;
		519	Picture src = img->picture ();
		520	Picture dst = picture ();
		521	Picture mask_p = 0;
		522
		523	if (mask != 1.)
		524	{
		525	mask_p = create_xrender_mask (dpy, img->pm, False, False);
		526	XRenderColor mask_c = { 0, 0, 0, float_to_component (mask) };
		527	XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
		528	}
		529
		530	XRenderComposite (dpy, op, src, mask_p, dst, x - img->x, y - img->y, 0, 0, 0, 0, w, h);
		531
		532	XRenderFreePicture (dpy, src);
		533	XRenderFreePicture (dpy, dst);
		534
		535	if (mask_p)
		536	XRenderFreePicture (dpy, mask_p);
		537	}
		538
438	rxvt_img *	539	rxvt_img *
439	rxvt_img::clone ()	540	rxvt_img::clone ()
440	{	541	{
441	return new rxvt_img (*this);	542	return new rxvt_img (*this);
442	}
443
444	static XRenderPictFormat *
445	find_alpha_format_for (Display dpy, XRenderPictFormat format)
446	{
447	if (format->direct.alphaMask)
448	return format; // already has alpha
449
450	// try to find a suitable alpha format, one bit alpha is enough for our purposes
451	if (format->type == PictTypeDirect)
452	for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
453	if (f->direct.alphaMask
454	&& f->type == PictTypeDirect
455	&& ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
456	&& ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
457	&& ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
458	return f;
459
460	// should be a very good fallback
461	return XRenderFindStandardFormat (dpy, PictStandardARGB32);
462	}	543	}
463		544
464	rxvt_img *	545	rxvt_img *
465	rxvt_img::reify ()	546	rxvt_img::reify ()
466	{	547	{
…		…
475	&& repeat == RepeatNone; // and we have no good pixels to fill with	556	&& repeat == RepeatNone; // and we have no good pixels to fill with
476		557
477	rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);	558	rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
478	img->alloc ();	559	img->alloc ();
479		560
480	Picture src = src_picture ();	561	Picture src = picture ();
481	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	562	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
482		563
483	if (alpha)	564	if (alpha)
484	{	565	{
485	XRenderColor rc = { 0, 0, 0, 0 };	566	XRenderColor rc = { 0, 0, 0, 0 };
486	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles	567	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
487	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h);	568	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, x, y, ref->w, ref->h);
488	}	569	}
489	else	570	else
490	XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);	571	XRenderComposite (dpy, PictOpSrc, src, None, dst, -x, -y, 0, 0, 0, 0, w, h);
491		572
492	XRenderFreePicture (dpy, src);	573	XRenderFreePicture (dpy, src);
493	XRenderFreePicture (dpy, dst);	574	XRenderFreePicture (dpy, dst);
494		575
495	return img;	576	return img;
…		…
498	rxvt_img *	579	rxvt_img *
499	rxvt_img::sub_rect (int x, int y, int width, int height)	580	rxvt_img::sub_rect (int x, int y, int width, int height)
500	{	581	{
501	rxvt_img *img = clone ();	582	rxvt_img *img = clone ();
502		583
503	img->x += x;	584	img->x -= x;
504	img->y += y;	585	img->y -= y;
505		586
506	if (w != width \|\| h != height)	587	if (w != width \|\| h != height)
507	{	588	{
508	img->w = width;	589	img->w = width;
509	img->h = height;	590	img->h = height;
…		…
514	}	595	}
515		596
516	return img;	597	return img;
517	}	598	}
518		599
519	rxvt_img *	600	static void
520	rxvt_img::transform (int new_width, int new_height, double matrix[9])	601	mat_invert (rxvt_img::nv mat[3][3], rxvt_img::nv (&inv)[3][3])
521	{	602	{
		603	rxvt_img::nv s0 = mat [2][2] * mat [1][1] - mat [2][1] * mat [1][2];
		604	rxvt_img::nv s1 = mat [2][1] * mat [0][2] - mat [2][2] * mat [0][1];
		605	rxvt_img::nv s2 = mat [1][2] * mat [0][1] - mat [1][1] * mat [0][2];
		606
		607	rxvt_img::nv invdet = 1. / (mat [0][0] * s0 + mat [1][0] * s1 + mat [2][0] * s2);
		608
		609	inv [0][0] = invdet * s0;
		610	inv [0][1] = invdet * s1;
		611	inv [0][2] = invdet * s2;
		612
		613	inv [1][0] = invdet * (mat [2][0] * mat [1][2] - mat [2][2] * mat [1][0]);
		614	inv [1][1] = invdet * (mat [2][2] * mat [0][0] - mat [2][0] * mat [0][2]);
		615	inv [1][2] = invdet * (mat [1][0] * mat [0][2] - mat [1][2] * mat [0][0]);
		616
		617	inv [2][0] = invdet * (mat [2][1] * mat [1][0] - mat [2][0] * mat [1][1]);
		618	inv [2][1] = invdet * (mat [2][0] * mat [0][1] - mat [2][1] * mat [0][0]);
		619	inv [2][2] = invdet * (mat [1][1] * mat [0][0] - mat [1][0] * mat [0][1]);
		620	}
		621
		622	static rxvt_img::nv
		623	mat_apply (rxvt_img::nv mat[3][3], int i, rxvt_img::nv x, rxvt_img::nv y)
		624	{
		625	rxvt_img::nv v = mat [i][0] * x + mat [i][1] * y + mat [i][2];
		626	rxvt_img::nv w = mat [2][0] * x + mat [2][1] * y + mat [2][2];
		627
		628	return v * (1. / w);
		629	}
		630
		631	rxvt_img *
		632	rxvt_img::transform (nv matrix[3][3])
		633	{
		634	// calculate new pixel bounding box coordinates
		635	nv rmin[2], rmax[2];
		636
		637	for (int i = 0; i < 2; ++i)
		638	{
		639	nv v;
		640	v = mat_apply (matrix, i, 0+x, 0+y); rmin [i] = rmax [i] = v;
		641	v = mat_apply (matrix, i, w+x, 0+y); min_it (rmin [i], v); max_it (rmax [i], v);
		642	v = mat_apply (matrix, i, 0+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v);
		643	v = mat_apply (matrix, i, w+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v);
		644	}
		645
		646	// TODO: adjust matrix for subpixel accuracy
		647	int dx = floor (rmin [0]);
		648	int dy = floor (rmin [1]);
		649
		650	int new_width = ceil (rmax [0] - dx);
		651	int new_height = ceil (rmax [1] - dy);
		652
		653	nv inv[3][3];
		654	mat_invert (matrix, inv);
		655
522	rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat);	656	rxvt_img *img = new rxvt_img (s, format, dx, dy, new_width, new_height, repeat);
523	img->alloc ();	657	img->alloc ();
524		658
525	Display *dpy = s->display->dpy;	659	Display *dpy = s->display->dpy;
526	Picture src = src_picture ();	660	Picture src = picture ();
527	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	661	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
528		662
529	XTransform xfrm;	663	XTransform xfrm;
530		664
531	for (int i = 0; i < 3; ++i)	665	for (int i = 0; i < 3; ++i)
532	for (int j = 0; j < 3; ++j)	666	for (int j = 0; j < 3; ++j)
533	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);	667	xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);
534
535	xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
536	xfrm.matrix [1][2] -= XDoubleToFixed (y);
537		668
538	XRenderSetPictureFilter (dpy, src, "good", 0, 0);	669	XRenderSetPictureFilter (dpy, src, "good", 0, 0);
539	XRenderSetPictureTransform (dpy, src, &xfrm);	670	XRenderSetPictureTransform (dpy, src, &xfrm);
540	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);	671	XRenderComposite (dpy, PictOpSrc, src, None, dst, dx, dy, 0, 0, 0, 0, new_width, new_height);
541		672
542	XRenderFreePicture (dpy, src);	673	XRenderFreePicture (dpy, src);
543	XRenderFreePicture (dpy, dst);	674	XRenderFreePicture (dpy, dst);
544		675
545	return img;	676	return img;
…		…
549	rxvt_img::scale (int new_width, int new_height)	680	rxvt_img::scale (int new_width, int new_height)
550	{	681	{
551	if (w == new_width && h == new_height)	682	if (w == new_width && h == new_height)
552	return clone ();	683	return clone ();
553		684
554	double matrix[9] = {	685	nv matrix[3][3] = {
555	w / (double)new_width, 0, 0,	686	{ new_width / (nv)w, 0, 0 },
556	0, h / (double)new_height, 0,	687	{ 0, new_height / (nv)h, 0 },
557	0, 0, 1	688	{ 0, 0, 1 }
558	};	689	};
559		690
560	int old_repeat_mode = repeat;	691	int old_repeat_mode = repeat;
561	repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems	692	repeat = RepeatPad; // not right, but xrender can't properly scale it seems
562		693
563	rxvt_img *img = transform (new_width, new_height, matrix);	694	rxvt_img *img = transform (matrix);
564		695
565	repeat = old_repeat_mode;	696	repeat = old_repeat_mode;
566	img->repeat = repeat;	697	img->repeat = repeat;
567		698
568	return img;	699	return img;
569	}	700	}
570		701
571	rxvt_img *	702	rxvt_img *
572	rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)	703	rxvt_img::rotate (int cx, int cy, nv phi)
573	{	704	{
574	double s = sin (phi);	705	nv s = sin (phi);
575	double c = cos (phi);	706	nv c = cos (phi);
576		707
577	double matrix[9] = {	708	nv matrix[3][3] = {
578	c, -s, -c * x + s * y + x,	709	{ c, -s, cx - c * cx + s * cy + 200 },
579	s, c, -s * x - c * y + y,	710	{ s, c, cy - s * cx - c * cy },
580	0, 0, 1	711	{ 0, 0, 1 }
		712	//{ c, -s, 0 },
		713	//{ s, c, 0 },
		714	//{ 0, 0, 1 }
581	};	715	};
582		716
583	return transform (new_width, new_height, matrix);	717	//move (-cx, -cy);
584	}	718	rxvt_img *img = transform (matrix);
		719	//move ( cx, cy);
		720	//img->move (cx, cy);
585		721
		722	return img;
		723	}
		724
586	rxvt_img *	725	rxvt_img *
587	rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg)	726	rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg)
588	{	727	{
589	if (new_format == format)	728	if (new_format == format)
590	return clone ();	729	return clone ();
591		730
592	rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);	731	rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);
593	img->alloc ();	732	img->alloc ();
594		733
595	Display *dpy = s->display->dpy;	734	Display *dpy = s->display->dpy;
596	Picture src = src_picture ();	735	Picture src = picture ();
597	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);	736	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
598	int op = PictOpSrc;	737	int op = PictOpSrc;
599		738
600	if (format->direct.alphaMask && !new_format->direct.alphaMask)	739	if (format->direct.alphaMask && !new_format->direct.alphaMask)
601	{	740	{
602	// does it have to be that complicated	741	// does it have to be that complicated
603	rgba c;
604	bg.get (c);
605
606	XRenderColor rc = { c.r, c.g, c.b, 0xffff };	742	XRenderColor rc = { bg.r, bg.g, bg.b, bg.a };
607	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);	743	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);
608		744
609	op = PictOpOver;	745	op = PictOpOver;
610	}	746	}
611		747
…		…
616		752
617	return img;	753	return img;
618	}	754	}
619		755
620	rxvt_img *	756	rxvt_img *
621	rxvt_img::blend (rxvt_img *img, double factor)	757	rxvt_img::blend (rxvt_img *img, nv factor)
622	{	758	{
623	rxvt_img *img2 = clone ();	759	rxvt_img *img2 = clone ();
624	Display *dpy = s->display->dpy;	760	Display *dpy = s->display->dpy;
625	Picture src = img->src_picture ();	761	Picture src = img->picture ();
626	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);	762	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
627	Picture mask = create_xrender_mask (dpy, img->pm, False, False);	763	Picture mask = create_xrender_mask (dpy, img->pm, False, False);
628		764
629	XRenderColor mask_c;	765	XRenderColor mask_c;
630		766

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.75 by sf-exg, Sun Jun 10 07:51:45 2012 UTC vs. Revision 1.89 by root, Thu Jun 14 19:44:31 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.75 by sf-exg, Sun Jun 10 07:51:45 2012 UTC vs.
Revision 1.89 by root, Thu Jun 14 19:44:31 2012 UTC