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

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.76 by root, Sun Jun 10 10:29:26 2012 UTC vs.
Revision 1.96 by root, Sat Jun 16 15:55:19 2012 UTC

…		…
		1	/----------------------------------------------------------------------
		2	* File: rxvtimg.h
		3	----------------------------------------------------------------------
		4	*
		5	* All portions of code are copyright by their respective author/s.
		6	* Copyright (c) 2012 Marc Lehmann <schmorp@schmorp.de>
		7	* Copyright (c) 2012 Emanuele Giaquinta <e.giaquinta@glauco.it>
		8	*
		9	* This program is free software; you can redistribute it and/or modify
		10	* it under the terms of the GNU General Public License as published by
		11	* the Free Software Foundation; either version 2 of the License, or
		12	* (at your option) any later version.
		13	*
		14	* This program is distributed in the hope that it will be useful,
		15	* but WITHOUT ANY WARRANTY; without even the implied warranty of
		16	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		17	* GNU General Public License for more details.
		18	*
		19	* You should have received a copy of the GNU General Public License
		20	* along with this program; if not, write to the Free Software
		21	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
		22	---------------------------------------------------------------------/
		23
		24	#include <string.h>
1	#include <math.h>	25	#include <math.h>
2	#include "../config.h"	26	#include "../config.h"
3	#include "rxvt.h"	27	#include "rxvt.h"
4		28
5	#if HAVE_IMG	29	#if HAVE_IMG
		30
		31	typedef rxvt_img::nv nv;
		32
		33	namespace
		34	{
		35
		36	struct mat3x3
		37	{
		38	nv v[3][3];
		39
		40	mat3x3 ()
		41	{
		42	}
		43
		44	mat3x3 (const nv *matrix)
		45	{
		46	memcpy (v, matrix, sizeof (v));
		47	}
		48
		49	mat3x3 (nv v11, nv v12, nv v13, nv v21, nv v22, nv v23, nv v31, nv v32, nv v33)
		50	{
		51	v[0][0] = v11; v[0][1] = v12; v[0][2] = v13;
		52	v[1][0] = v21; v[1][1] = v22; v[1][2] = v23;
		53	v[2][0] = v31; v[2][1] = v32; v[2][2] = v33;
		54	}
		55
		56	mat3x3 invert ();
		57
		58	nv *operator [](int i) { return &v[i][0]; }
		59	const nv *operator [](int i) const { return &v[i][0]; }
		60
		61	operator const nv * () const { return &v[0][0]; }
		62	operator nv * () { return &v[0][0]; }
		63
		64	// quite inefficient, hopefully gcc pulls the w calc out of any loops
		65	nv apply1 (int i, nv x, nv y)
		66	{
		67	mat3x3 &m = *this;
		68
		69	nv v = m[i][0] * x + m[i][1] * y + m[i][2];
		70	nv w = m[2][0] * x + m[2][1] * y + m[2][2];
		71
		72	return v * (1. / w);
		73	}
		74
		75	static mat3x3 translate (nv x, nv y);
		76	static mat3x3 scale (nv s, nv t);
		77	static mat3x3 rotate (nv phi);
		78	};
		79
		80	mat3x3
		81	mat3x3::invert ()
		82	{
		83	mat3x3 &m = *this;
		84	mat3x3 inv;
		85
		86	nv s0 = m[2][2] * m[1][1] - m[2][1] * m[1][2];
		87	nv s1 = m[2][1] * m[0][2] - m[2][2] * m[0][1];
		88	nv s2 = m[1][2] * m[0][1] - m[1][1] * m[0][2];
		89
		90	nv invdet = 1. / (m[0][0] * s0 + m[1][0] * s1 + m[2][0] * s2);
		91
		92	inv[0][0] = invdet * s0;
		93	inv[0][1] = invdet * s1;
		94	inv[0][2] = invdet * s2;
		95
		96	inv[1][0] = invdet * (m[2][0] * m[1][2] - m[2][2] * m[1][0]);
		97	inv[1][1] = invdet * (m[2][2] * m[0][0] - m[2][0] * m[0][2]);
		98	inv[1][2] = invdet * (m[1][0] * m[0][2] - m[1][2] * m[0][0]);
		99
		100	inv[2][0] = invdet * (m[2][1] * m[1][0] - m[2][0] * m[1][1]);
		101	inv[2][1] = invdet * (m[2][0] * m[0][1] - m[2][1] * m[0][0]);
		102	inv[2][2] = invdet * (m[1][1] * m[0][0] - m[1][0] * m[0][1]);
		103
		104	return inv;
		105	}
		106
		107	static mat3x3
		108	operator *(const mat3x3 &a, const mat3x3 &b)
		109	{
		110	mat3x3 r;
		111
		112	for (int i = 0; i < 3; ++i)
		113	for (int j = 0; j < 3; ++j)
		114	r[i][j] = a[i][0] * b[0][j]
		115	+ a[i][1] * b[1][j]
		116	+ a[i][2] * b[2][j];
		117
		118	return r;
		119	}
		120
		121	mat3x3
		122	mat3x3::translate (nv x, nv y)
		123	{
		124	return mat3x3 (
		125	1, 0, x,
		126	0, 1, y,
		127	0, 0, 1
		128	);
		129	}
		130
		131	mat3x3
		132	mat3x3::scale (nv s, nv t)
		133	{
		134	return mat3x3 (
		135	s, 0, 0,
		136	0, t, 0,
		137	0, 0, 1
		138	);
		139	}
		140
		141	// clockwise
		142	mat3x3
		143	mat3x3::rotate (nv phi)
		144	{
		145	nv s = sin (phi);
		146	nv c = cos (phi);
		147
		148	return mat3x3 (
		149	c, -s, 0,
		150	s, c, 0,
		151	0, 0, 1
		152	);
		153	}
		154
		155	}
		156
		157	#if 0
		158	struct pict
		159	{
		160	Display *dpy;
		161	Picture pic;
		162
		163	operator Picture () const
		164	{
		165	return pic;
		166	}
		167
		168	pict ()
		169	: pic (0)
		170	{
		171	}
		172
		173	pict (rxvt_img img, XRenderPictFormat format = 0)
		174	: dpy (img->s->display->dpy)
		175	{
		176	XRenderPictureAttributes pa;
		177	pa.repeat = img->repeat;
		178	pic = XRenderCreatePicture (dpy, img->pm, format ? format : img->format, CPRepeat, &pa);
		179	}
		180
		181	~pict ()
		182	{
		183	if (pic)
		184	XRenderFreePicture (dpy, pic);
		185	}
		186	};
		187	#endif
		188
		189	static XRenderPictFormat *
		190	find_alpha_format_for (Display dpy, XRenderPictFormat format)
		191	{
		192	if (format->direct.alphaMask)
		193	return format; // already has alpha
		194
		195	// try to find a suitable alpha format, one bit alpha is enough for our purposes
		196	if (format->type == PictTypeDirect)
		197	for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
		198	if (f->direct.alphaMask
		199	&& f->type == PictTypeDirect
		200	&& ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
		201	&& ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
		202	&& ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
		203	return f;
		204
		205	// should be a very good fallback
		206	return XRenderFindStandardFormat (dpy, PictStandardARGB32);
		207	}
6		208
7	rxvt_img::rxvt_img (rxvt_screen screen, XRenderPictFormat format, int x, int y, int width, int height, int repeat)	209	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),	210	: s(screen), x(x), y(y), w(width), h(height), format(format), repeat(repeat),
9	pm(0), ref(0)	211	pm(0), ref(0)
10	{	212	{
50		252
51	return img;	253	return img;
52	}	254	}
53		255
54	# if HAVE_PIXBUF	256	# if HAVE_PIXBUF
		257
55	rxvt_img *	258	rxvt_img *
56	rxvt_img::new_from_pixbuf (rxvt_screen s, GdkPixbuf pb)	259	rxvt_img::new_from_pixbuf (rxvt_screen s, GdkPixbuf pb)
57	{	260	{
58	Display *dpy = s->display->dpy;	261	Display *dpy = s->display->dpy;
59		262
…		…
166		369
167	g_object_unref (pb);	370	g_object_unref (pb);
168		371
169	return img;	372	return img;
170	}	373	}
		374
171	# endif	375	# endif
172		376
173	void	377	void
174	rxvt_img::destroy ()	378	rxvt_img::destroy ()
175	{	379	{
…		…
193	pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);	397	pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);
194	ref = new pixref (w, h);	398	ref = new pixref (w, h);
195	}	399	}
196		400
197	Picture	401	Picture
198	rxvt_img::src_picture ()	402	rxvt_img::picture ()
199	{	403	{
200	Display *dpy = s->display->dpy;	404	Display *dpy = s->display->dpy;
201		405
202	XRenderPictureAttributes pa;	406	XRenderPictureAttributes pa;
203	pa.repeat = repeat;	407	pa.repeat = repeat;
…		…
222	pm = pm2;	426	pm = pm2;
223	ref = new pixref (ref->w, ref->h);	427	ref = new pixref (ref->w, ref->h);
224	}	428	}
225		429
226	void	430	void
227	rxvt_img::fill (const rxvt_color &c)	431	rxvt_img::fill (const rgba &c)
228	{	432	{
229	XGCValues gcv;	433	XRenderColor rc = { c.r, c.g, c.b, c.a };
230	gcv.foreground = c;	434
231	GC gc = XCreateGC (s->display->dpy, pm, GCForeground, &gcv);	435	Display *dpy = s->display->dpy;
232	XFillRectangle (s->display->dpy, pm, gc, 0, 0, w, h);	436	Picture src = picture ();
233	XFreeGC (s->display->dpy, gc);	437	XRenderFillRectangle (dpy, PictOpSrc, src, &rc, 0, 0, w, h);
		438	XRenderFreePicture (dpy, src);
		439	}
		440
		441	void
		442	rxvt_img::add_alpha ()
		443	{
		444	if (format->direct.alphaMask)
		445	return;
		446
		447	Display *dpy = s->display->dpy;
		448
		449	rxvt_img *img = new rxvt_img (s, find_alpha_format_for (dpy, format), x, y, w, h, repeat);
		450	img->alloc ();
		451
		452	Picture src = picture ();
		453	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
		454
		455	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
		456
		457	XRenderFreePicture (dpy, src);
		458	XRenderFreePicture (dpy, dst);
		459
		460	::swap (img->ref, ref);
		461	::swap (img->pm , pm );
		462
		463	delete img;
234	}	464	}
235		465
236	static void	466	static void
237	get_gaussian_kernel (int radius, int width, double kernel, XFixed params)	467	get_gaussian_kernel (int radius, int width, nv kernel, XFixed params)
238	{	468	{
239	double sigma = radius / 2.0;	469	nv sigma = radius / 2.0;
240	double scale = sqrt (2.0 * M_PI) * sigma;	470	nv scale = sqrt (2.0 * M_PI) * sigma;
241	double sum = 0.0;	471	nv sum = 0.0;
242		472
243	for (int i = 0; i < width; i++)	473	for (int i = 0; i < width; i++)
244	{	474	{
245	double x = i - width / 2;	475	nv x = i - width / 2;
246	kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;	476	kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
247	sum += kernel[i];	477	sum += kernel[i];
248	}	478	}
249		479
250	params[0] = XDoubleToFixed (width);	480	params[0] = XDoubleToFixed (width);
…		…
260	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))	490	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))
261	return clone ();	491	return clone ();
262		492
263	Display *dpy = s->display->dpy;	493	Display *dpy = s->display->dpy;
264	int size = max (rh, rv) * 2 + 1;	494	int size = max (rh, rv) * 2 + 1;
265	double kernel = (double )malloc (size * sizeof (double));	495	nv kernel = (nv )malloc (size * sizeof (nv));
266	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));	496	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
267	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);	497	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
268	img->alloc ();	498	img->alloc ();
269		499
270	XRenderPictureAttributes pa;	500	XRenderPictureAttributes pa;
…		…
308	w, h);	538	w, h);
309	}	539	}
310		540
311	free (kernel);	541	free (kernel);
312	free (params);	542	free (params);
		543
313	XRenderFreePicture (dpy, src);	544	XRenderFreePicture (dpy, src);
314	XRenderFreePicture (dpy, dst);	545	XRenderFreePicture (dpy, dst);
315	XRenderFreePicture (dpy, tmp);	546	XRenderFreePicture (dpy, tmp);
316		547
317	return img;	548	return img;
…		…
391	if (r < 0 \|\| g < 0 \|\| b < 0 \|\| a < 0)	622	if (r < 0 \|\| g < 0 \|\| b < 0 \|\| a < 0)
392	rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");	623	rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");
393		624
394	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);	625	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
395	img->alloc ();	626	img->alloc ();
396		627	img->fill (rgba (0, 0, 0, 0));
397	{
398	rxvt_color empty;
399	empty.set (s, rgba (0, 0, 0, 0));
400	img->fill (empty);
401	}
402		628
403	// premultiply (yeah, these are not exact, sue me or fix it)	629	// premultiply (yeah, these are not exact, sue me or fix it)
404	r = (r * (a >> 8)) >> 8;	630	r = (r * (a >> 8)) >> 8;
405	g = (g * (a >> 8)) >> 8;	631	g = (g * (a >> 8)) >> 8;
406	b = (b * (a >> 8)) >> 8;	632	b = (b * (a >> 8)) >> 8;
407		633
408	Display *dpy = s->display->dpy;	634	Display *dpy = s->display->dpy;
409		635
410	Picture src = src_picture ();	636	Picture src = picture ();
411	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);	637	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
412	Picture mul = create_xrender_mask (dpy, pm, True, True);	638	Picture mul = create_xrender_mask (dpy, pm, True, True);
413		639
414	//TODO: this operator does not yet implement some useful contrast	640	//TODO: this operator does not yet implement some useful contrast
415	while (r \| g \| b \| a)	641	while (r \| g \| b \| a)
…		…
432	::swap (img->pm , pm );	658	::swap (img->pm , pm );
433		659
434	delete img;	660	delete img;
435	}	661	}
436		662
		663	void
		664	rxvt_img::draw (rxvt_img *img, int op, nv mask)
		665	{
		666	unshare ();
		667
		668	Display *dpy = s->display->dpy;
		669	Picture src = img->picture ();
		670	Picture dst = picture ();
		671	Picture mask_p = 0;
		672
		673	if (mask != 1.)
		674	{
		675	mask_p = create_xrender_mask (dpy, img->pm, False, False);
		676	XRenderColor mask_c = { 0, 0, 0, float_to_component (mask) };
		677	XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
		678	}
		679
		680	XRenderComposite (dpy, op, src, mask_p, dst, x - img->x, y - img->y, 0, 0, 0, 0, w, h);
		681
		682	XRenderFreePicture (dpy, src);
		683	XRenderFreePicture (dpy, dst);
		684
		685	if (mask_p)
		686	XRenderFreePicture (dpy, mask_p);
		687	}
		688
437	rxvt_img *	689	rxvt_img *
438	rxvt_img::clone ()	690	rxvt_img::clone ()
439	{	691	{
440	return new rxvt_img (*this);	692	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);
461	}	693	}
462		694
463	rxvt_img *	695	rxvt_img *
464	rxvt_img::reify ()	696	rxvt_img::reify ()
465	{	697	{
…		…
474	&& repeat == RepeatNone; // and we have no good pixels to fill with	706	&& repeat == RepeatNone; // and we have no good pixels to fill with
475		707
476	rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);	708	rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
477	img->alloc ();	709	img->alloc ();
478		710
479	Picture src = src_picture ();	711	Picture src = picture ();
480	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	712	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
481		713
482	if (alpha)	714	if (alpha)
483	{	715	{
484	XRenderColor rc = { 0, 0, 0, 0 };	716	XRenderColor rc = { 0, 0, 0, 0 };
485	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles	717	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);	718	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, x, y, ref->w, ref->h);
487	}	719	}
488	else	720	else
489	XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);	721	XRenderComposite (dpy, PictOpSrc, src, None, dst, -x, -y, 0, 0, 0, 0, w, h);
490		722
491	XRenderFreePicture (dpy, src);	723	XRenderFreePicture (dpy, src);
492	XRenderFreePicture (dpy, dst);	724	XRenderFreePicture (dpy, dst);
493		725
494	return img;	726	return img;
…		…
497	rxvt_img *	729	rxvt_img *
498	rxvt_img::sub_rect (int x, int y, int width, int height)	730	rxvt_img::sub_rect (int x, int y, int width, int height)
499	{	731	{
500	rxvt_img *img = clone ();	732	rxvt_img *img = clone ();
501		733
502	img->x += x;	734	img->x -= x;
503	img->y += y;	735	img->y -= y;
504		736
505	if (w != width \|\| h != height)	737	if (w != width \|\| h != height)
506	{	738	{
507	img->w = width;	739	img->w = width;
508	img->h = height;	740	img->h = height;
…		…
514		746
515	return img;	747	return img;
516	}	748	}
517		749
518	rxvt_img *	750	rxvt_img *
519	rxvt_img::transform (int new_width, int new_height, double matrix[9])	751	rxvt_img::transform (const nv matrix[3][3])
520	{	752	{
		753	return transform (mat3x3 (&matrix[0][0]));
		754	}
		755
		756	rxvt_img *
		757	rxvt_img::transform (const nv *matrix)
		758	{
		759	mat3x3 m (matrix);
		760
		761	// calculate new pixel bounding box coordinates
		762	nv r[2], rmin[2], rmax[2];
		763
		764	for (int i = 0; i < 2; ++i)
		765	{
		766	nv v;
		767
		768	v = m.apply1 (i, 0+x, 0+y); rmin [i] = rmax [i] = v; r [i] = v;
		769	v = m.apply1 (i, w+x, 0+y); min_it (rmin [i], v); max_it (rmax [i], v);
		770	v = m.apply1 (i, 0+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v);
		771	v = m.apply1 (i, w+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v);
		772	}
		773
		774	float sx = rmin [0] - x;
		775	float sy = rmin [1] - y;
		776
		777	// TODO: adjust matrix for subpixel accuracy
		778	int nx = floor (rmin [0]);
		779	int ny = floor (rmin [1]);
		780
		781	int new_width = ceil (rmax [0] - rmin [0]);
		782	int new_height = ceil (rmax [1] - rmin [1]);
		783
		784	m = mat3x3::translate (-x, -y) * m * mat3x3::translate (x, y);
		785
		786	mat3x3 inv = m.invert ();
		787
521	rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat);	788	rxvt_img *img = new rxvt_img (s, format, nx, ny, new_width, new_height, repeat);
522	img->alloc ();	789	img->alloc ();
523		790
524	Display *dpy = s->display->dpy;	791	Display *dpy = s->display->dpy;
525	Picture src = src_picture ();	792	Picture src = picture ();
526	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	793	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
527		794
528	XTransform xfrm;	795	XTransform xfrm;
529		796
530	for (int i = 0; i < 3; ++i)	797	for (int i = 0; i < 3; ++i)
531	for (int j = 0; j < 3; ++j)	798	for (int j = 0; j < 3; ++j)
532	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);	799	xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);
533
534	xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
535	xfrm.matrix [1][2] -= XDoubleToFixed (y);
536		800
537	XRenderSetPictureFilter (dpy, src, "good", 0, 0);	801	XRenderSetPictureFilter (dpy, src, "good", 0, 0);
538	XRenderSetPictureTransform (dpy, src, &xfrm);	802	XRenderSetPictureTransform (dpy, src, &xfrm);
539	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);	803	XRenderComposite (dpy, PictOpSrc, src, None, dst, sx, sy, 0, 0, 0, 0, new_width, new_height);
540		804
541	XRenderFreePicture (dpy, src);	805	XRenderFreePicture (dpy, src);
542	XRenderFreePicture (dpy, dst);	806	XRenderFreePicture (dpy, dst);
543		807
544	return img;	808	return img;
…		…
548	rxvt_img::scale (int new_width, int new_height)	812	rxvt_img::scale (int new_width, int new_height)
549	{	813	{
550	if (w == new_width && h == new_height)	814	if (w == new_width && h == new_height)
551	return clone ();	815	return clone ();
552		816
553	double matrix[9] = {
554	w / (double)new_width, 0, 0,
555	0, h / (double)new_height, 0,
556	0, 0, 1
557	};
558
559	int old_repeat_mode = repeat;	817	int old_repeat_mode = repeat;
560	repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems	818	repeat = RepeatPad; // not right, but xrender can't properly scale it seems
561		819
562	rxvt_img *img = transform (new_width, new_height, matrix);	820	rxvt_img *img = transform (mat3x3::scale (new_width / (nv)w, new_height / (nv)h));
563		821
564	repeat = old_repeat_mode;	822	repeat = old_repeat_mode;
565	img->repeat = repeat;	823	img->repeat = repeat;
566		824
567	return img;	825	return img;
568	}	826	}
569		827
570	rxvt_img *	828	rxvt_img *
571	rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)	829	rxvt_img::rotate (int cx, int cy, nv phi)
572	{	830	{
573	double s = sin (phi);	831	#if 0
574	double c = cos (phi);
575
576	double matrix[9] = {
577	c, -s, -c * x + s * y + x,	832	{ c, -s, cx - c * cx + s * cy },
578	s, c, -s * x - c * y + y,	833	{ s, c, cy - s * cx - c * cy },
579	0, 0, 1	834	{ 0, 0, 1 }
580	};	835	#endif
581		836
582	return transform (new_width, new_height, matrix);	837	move (-cx, -cy);
583	}	838	rxvt_img *img = transform (mat3x3::rotate (phi));
		839	move ( cx, cy);
		840	img->move (cx, cy);
584		841
		842	return img;
		843	}
		844
585	rxvt_img *	845	rxvt_img *
586	rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg)	846	rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg)
587	{	847	{
588	if (new_format == format)	848	if (new_format == format)
589	return clone ();	849	return clone ();
590		850
591	rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);	851	rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);
592	img->alloc ();	852	img->alloc ();
593		853
594	Display *dpy = s->display->dpy;	854	Display *dpy = s->display->dpy;
595	Picture src = src_picture ();	855	Picture src = picture ();
596	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);	856	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
597	int op = PictOpSrc;	857	int op = PictOpSrc;
598		858
599	if (format->direct.alphaMask && !new_format->direct.alphaMask)	859	if (format->direct.alphaMask && !new_format->direct.alphaMask)
600	{	860	{
601	// does it have to be that complicated	861	// does it have to be that complicated
602	rgba c;
603	bg.get (c);
604
605	XRenderColor rc = { c.r, c.g, c.b, 0xffff };	862	XRenderColor rc = { bg.r, bg.g, bg.b, bg.a };
606	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);	863	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);
607		864
608	op = PictOpOver;	865	op = PictOpOver;
609	}	866	}
610		867
…		…
615		872
616	return img;	873	return img;
617	}	874	}
618		875
619	rxvt_img *	876	rxvt_img *
620	rxvt_img::blend (rxvt_img *img, double factor)	877	rxvt_img::blend (rxvt_img *img, nv factor)
621	{	878	{
622	rxvt_img *img2 = clone ();	879	rxvt_img *img2 = clone ();
623	Display *dpy = s->display->dpy;	880	Display *dpy = s->display->dpy;
624	Picture src = img->src_picture ();	881	Picture src = img->picture ();
625	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);	882	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
626	Picture mask = create_xrender_mask (dpy, img->pm, False, False);	883	Picture mask = create_xrender_mask (dpy, img->pm, False, False);
627		884
628	XRenderColor mask_c;	885	XRenderColor mask_c;
629		886

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.76 by root, Sun Jun 10 10:29:26 2012 UTC vs. Revision 1.96 by root, Sat Jun 16 15:55:19 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.76 by root, Sun Jun 10 10:29:26 2012 UTC vs.
Revision 1.96 by root, Sat Jun 16 15:55:19 2012 UTC