[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.86 by root, Thu Jun 14 19:31:17 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;
		399	}
		400
		401	static Picture
		402	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha)
		403	{
		404	Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
		405
		406	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
		407	XRenderPictureAttributes pa;
		408	pa.repeat = RepeatNormal;
		409	pa.component_alpha = component_alpha;
		410	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat \| CPComponentAlpha, &pa);
		411
		412	XFreePixmap (dpy, pixmap);
		413
		414	return mask;
319	}	415	}
320		416
321	static void	417	static void
322	extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)	418	extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)
323	{	419	{
…		…
365	XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);	461	XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
366	XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);	462	XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
367	}	463	}
368	}	464	}
369		465
370
371	XRenderFreePicture (dpy, dst);	466	XRenderFreePicture (dpy, dst);
372	}	467	}
373		468
374	void	469	void
375	rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)	470	rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
376	{	471	{
377	if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))	472	if (r < 0 \|\| g < 0 \|\| b < 0 \|\| a < 0)
378	{	473	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");	474
380	return;	475	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
		476	img->alloc ();
		477	img->fill (rgba (0, 0, 0, 0));
		478
		479	// premultiply (yeah, these are not exact, sue me or fix it)
		480	r = (r * (a >> 8)) >> 8;
		481	g = (g * (a >> 8)) >> 8;
		482	b = (b * (a >> 8)) >> 8;
		483
		484	Display *dpy = s->display->dpy;
		485
		486	Picture src = picture ();
		487	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
		488	Picture mul = create_xrender_mask (dpy, pm, True, True);
		489
		490	//TODO: this operator does not yet implement some useful contrast
		491	while (r \| g \| b \| a)
381	}	492	{
		493	unsigned short xr, xg, xb, xa;
		494	XRenderColor mask_c;
382		495
		496	if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
		497	{
		498	XRenderFillRectangle (dpy, PictOpSrc, mul, &mask_c, 0, 0, 1, 1);
		499	XRenderComposite (dpy, PictOpAdd, src, mul, dst, 0, 0, 0, 0, 0, 0, w, h);
		500	}
		501	}
		502
		503	XRenderFreePicture (dpy, mul);
		504	XRenderFreePicture (dpy, dst);
		505	XRenderFreePicture (dpy, src);
		506
		507	::swap (img->ref, ref);
		508	::swap (img->pm , pm );
		509
		510	delete img;
		511	}
		512
		513	void
		514	rxvt_img::draw (rxvt_img *img, int op, nv mask)
		515	{
383	unshare ();	516	unshare ();
384		517
385	Display *dpy = s->display->dpy;	518	Display *dpy = s->display->dpy;
386	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	519	Picture src = img->picture ();
387		520	Picture dst = picture ();
388	XRenderColor mask_c;	521	Picture mask_p = 0;
389	mask_c.red = r;	522
390	mask_c.green = g;	523	if (mask != 1.)
391	mask_c.blue = b;	524	{
392	mask_c.alpha = a;	525	mask_p = create_xrender_mask (dpy, img->pm, False, False);
		526	XRenderColor mask_c = { 0, 0, 0, float_to_component (mask) };
393	XRenderFillRectangle (dpy, PictOpMultiply, dst, &mask_c, 0, 0, w, h);	527	XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
		528	}
394		529
		530	XRenderComposite (dpy, op, src, mask_p, dst, x - img->x, y - img->y, 0, 0, 0, 0, w, h);
		531
395	XRenderFreePicture (dpy, dst);	532	XRenderFreePicture (dpy, src);
		533	XRenderFreePicture (dpy, dst);
		534
		535	if (mask_p)
		536	XRenderFreePicture (dpy, mask_p);
396	}	537	}
397		538
398	rxvt_img *	539	rxvt_img *
399	rxvt_img::clone ()	540	rxvt_img::clone ()
400	{	541	{
401	return new rxvt_img (*this);	542	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	}	543	}
423		544
424	rxvt_img *	545	rxvt_img *
425	rxvt_img::reify ()	546	rxvt_img::reify ()
426	{	547	{
…		…
435	&& repeat == RepeatNone; // and we have no good pixels to fill with	556	&& repeat == RepeatNone; // and we have no good pixels to fill with
436		557
437	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);
438	img->alloc ();	559	img->alloc ();
439		560
440	Picture src = src_picture ();	561	Picture src = picture ();
441	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	562	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
442		563
443	if (alpha)	564	if (alpha)
444	{	565	{
445	XRenderColor rc = { 0, 0, 0, 0 };	566	XRenderColor rc = { 0, 0, 0, 0 };
446	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
447	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);
448	}	569	}
449	else	570	else
450	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);
451		572
452	XRenderFreePicture (dpy, src);	573	XRenderFreePicture (dpy, src);
453	XRenderFreePicture (dpy, dst);	574	XRenderFreePicture (dpy, dst);
454		575
455	return img;	576	return img;
…		…
458	rxvt_img *	579	rxvt_img *
459	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)
460	{	581	{
461	rxvt_img *img = clone ();	582	rxvt_img *img = clone ();
462		583
463	img->x += x;	584	img->x -= x;
464	img->y += y;	585	img->y -= y;
465		586
466	if (w != width \|\| h != height)	587	if (w != width \|\| h != height)
467	{	588	{
468	img->w = width;	589	img->w = width;
469	img->h = height;	590	img->h = height;
…		…
474	}	595	}
475		596
476	return img;	597	return img;
477	}	598	}
478		599
479	rxvt_img *	600	static void
480	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])
481	{	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	// find new offset
		635	int ox = mat_apply (matrix, 0, -x, -y);
		636	int oy = mat_apply (matrix, 1, -x, -y);
		637
		638	// calculate new pixel bounding box coordinates
		639	nv d [2], rmin[2], rmax[2];
		640
		641	for (int i = 0; i < 2; ++i)
		642	{
		643	nv v;
		644	v = mat_apply (matrix, i, 0, 0); rmin [i] = rmax [i] = v; d [i] = v;
		645	v = mat_apply (matrix, i, w, 0); min_it (rmin [i], v); max_it (rmax [i], v);
		646	v = mat_apply (matrix, i, 0, h); min_it (rmin [i], v); max_it (rmax [i], v);
		647	v = mat_apply (matrix, i, w, h); min_it (rmin [i], v); max_it (rmax [i], v);
		648	}
		649
		650	int dx = floor (rmin [0]);
		651	int dy = floor (rmin [1]);
		652
		653	int new_width = ceil (rmax [0] - dx);
		654	int new_height = ceil (rmax [1] - dy);
		655
		656	nv inv[3][3];
		657	mat_invert (matrix, inv);
		658
482	rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat);	659	rxvt_img *img = new rxvt_img (s, format, ox - dx - d [0], oy - dy - d [1], new_width, new_height, repeat);
483	img->alloc ();	660	img->alloc ();
484		661
485	Display *dpy = s->display->dpy;	662	Display *dpy = s->display->dpy;
486	Picture src = src_picture ();	663	Picture src = picture ();
487	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	664	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
488		665
489	XTransform xfrm;	666	XTransform xfrm;
490		667
491	for (int i = 0; i < 3; ++i)	668	for (int i = 0; i < 3; ++i)
492	for (int j = 0; j < 3; ++j)	669	for (int j = 0; j < 3; ++j)
493	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);	670	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		671
498	XRenderSetPictureFilter (dpy, src, "good", 0, 0);	672	XRenderSetPictureFilter (dpy, src, "good", 0, 0);
499	XRenderSetPictureTransform (dpy, src, &xfrm);	673	XRenderSetPictureTransform (dpy, src, &xfrm);
500	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);	674	XRenderComposite (dpy, PictOpSrc, src, None, dst, dx, dy, 0, 0, 0, 0, new_width, new_height);
501		675
502	XRenderFreePicture (dpy, src);	676	XRenderFreePicture (dpy, src);
503	XRenderFreePicture (dpy, dst);	677	XRenderFreePicture (dpy, dst);
504		678
505	return img;	679	return img;
…		…
509	rxvt_img::scale (int new_width, int new_height)	683	rxvt_img::scale (int new_width, int new_height)
510	{	684	{
511	if (w == new_width && h == new_height)	685	if (w == new_width && h == new_height)
512	return clone ();	686	return clone ();
513		687
514	double matrix[9] = {	688	nv matrix[3][3] = {
515	w / (double)new_width, 0, 0,	689	{ new_width / (nv)w, 0, 0 },
516	0, h / (double)new_height, 0,	690	{ 0, new_height / (nv)h, 0 },
517	0, 0, 1	691	{ 0, 0, 1 }
518	};	692	};
519		693
520	int old_repeat_mode = repeat;	694	int old_repeat_mode = repeat;
521	repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems	695	repeat = RepeatPad; // not right, but xrender can't properly scale it seems
522		696
523	rxvt_img *img = transform (new_width, new_height, matrix);	697	rxvt_img *img = transform (matrix);
524		698
525	repeat = old_repeat_mode;	699	repeat = old_repeat_mode;
526	img->repeat = repeat;	700	img->repeat = repeat;
527		701
528	return img;	702	return img;
529	}	703	}
530		704
531	rxvt_img *	705	rxvt_img *
532	rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)	706	rxvt_img::rotate (int cx, int cy, nv phi)
533	{	707	{
534	double s = sin (phi);	708	nv s = sin (phi);
535	double c = cos (phi);	709	nv c = cos (phi);
536		710
537	double matrix[9] = {	711	nv matrix[3][3] = {
538	c, -s, -c * x + s * y + x,	712	{ c, -s, cx - c * cx + s * cy },
539	s, c, -s * x - c * y + y,	713	{ s, c, cy - s * cx - c * cy },
540	0, 0, 1	714	{ 0, 0, 1 }
		715	//{ c, -s, 0 },
		716	//{ s, c, 0 },
		717	//{ 0, 0, 1 }
541	};	718	};
542		719
543	return transform (new_width, new_height, matrix);	720	//move (-cx, -cy);
544	}	721	rxvt_img *img = transform (matrix);
		722	//move ( cx, cy);
		723	//img->move (cx, cy);
545		724
		725	return img;
		726	}
		727
546	rxvt_img *	728	rxvt_img *
547	rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg)	729	rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg)
548	{	730	{
549	if (new_format == format)	731	if (new_format == format)
550	return clone ();	732	return clone ();
551		733
552	rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);	734	rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);
553	img->alloc ();	735	img->alloc ();
554		736
555	Display *dpy = s->display->dpy;	737	Display *dpy = s->display->dpy;
556	Picture src = src_picture ();	738	Picture src = picture ();
557	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);	739	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
558	int op = PictOpSrc;	740	int op = PictOpSrc;
559		741
560	if (format->direct.alphaMask && !new_format->direct.alphaMask)	742	if (format->direct.alphaMask && !new_format->direct.alphaMask)
561	{	743	{
562	// does it have to be that complicated	744	// 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 };	745	XRenderColor rc = { bg.r, bg.g, bg.b, bg.a };
567	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);	746	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);
568		747
569	op = PictOpOver;	748	op = PictOpOver;
570	}	749	}
571		750
…		…
576		755
577	return img;	756	return img;
578	}	757	}
579		758
580	rxvt_img *	759	rxvt_img *
581	rxvt_img::blend (rxvt_img *img, double factor)	760	rxvt_img::blend (rxvt_img *img, nv factor)
582	{	761	{
583	rxvt_img *img2 = clone ();	762	rxvt_img *img2 = clone ();
584	Display *dpy = s->display->dpy;	763	Display *dpy = s->display->dpy;
585	Picture src = img->src_picture ();	764	Picture src = img->picture ();
586	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);	765	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
587		766	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		767
595	XRenderColor mask_c;	768	XRenderColor mask_c;
596		769
597	mask_c.alpha = float_to_component (factor);	770	mask_c.alpha = float_to_component (factor);
598	mask_c.red =	771	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.86 by root, Thu Jun 14 19:31:17 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.86 by root, Thu Jun 14 19:31:17 2012 UTC