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

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.93 by root, Fri Jun 15 18:07:24 2012 UTC vs.
Revision 1.100 by root, Mon Jul 2 02:01:41 2012 UTC

…		…
		1	/----------------------------------------------------------------------
		2	* File: rxvtimg.C
		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
1	#include <string.h>	24	#include <string.h>
2	#include <math.h>	25	#include <math.h>
3	#include "../config.h"	26	#include "../config.h"
4	#include "rxvt.h"	27	#include "rxvt.h"
5		28
7		30
8	typedef rxvt_img::nv nv;	31	typedef rxvt_img::nv nv;
9		32
10	namespace	33	namespace
11	{	34	{
12
13	struct mat3x3	35	struct mat3x3
14	{	36	{
15	nv v[3][3];	37	nv v[3][3];
16		38
17	mat3x3 ()	39	mat3x3 ()
18	{	40	{
19	}	41	}
20		42
21	mat3x3 (nv matrix[3][3])	43	mat3x3 (const nv *matrix)
22	{	44	{
23	memcpy (v, matrix, sizeof (v));	45	memcpy (v, matrix, sizeof (v));
24	}	46	}
25		47
26	mat3x3 (nv v11, nv v12, nv v13, nv v21, nv v22, nv v23, nv v31, nv v32, nv v33)	48	mat3x3 (nv v11, nv v12, nv v13, nv v21, nv v22, nv v23, nv v31, nv v32, nv v33)
…		…
28	v[0][0] = v11; v[0][1] = v12; v[0][2] = v13;	50	v[0][0] = v11; v[0][1] = v12; v[0][2] = v13;
29	v[1][0] = v21; v[1][1] = v22; v[1][2] = v23;	51	v[1][0] = v21; v[1][1] = v22; v[1][2] = v23;
30	v[2][0] = v31; v[2][1] = v32; v[2][2] = v33;	52	v[2][0] = v31; v[2][1] = v32; v[2][2] = v33;
31	}	53	}
32		54
33	mat3x3 invert ();	55	mat3x3 inverse ();
34		56
35	nv *operator [](int i) { return &v[i][0]; }	57	nv *operator [](int i) { return &v[i][0]; }
36	const nv *operator [](int i) const { return &v[i][0]; }	58	const nv *operator [](int i) const { return &v[i][0]; }
37		59
		60	operator const nv * () const { return &v[0][0]; }
		61	operator nv * () { return &v[0][0]; }
		62
38	// quite inefficient, hopefully gcc pulls the w calc out of any loops	63	// quite inefficient, hopefully gcc pulls the w calc out of any loops
39	nv apply1 (int i, nv x, nv y)	64	nv apply1 (int i, nv x, nv y)
40	{	65	{
41	mat3x3 &m = *this;	66	mat3x3 &m = *this;
42		67
…		…
45		70
46	return v * (1. / w);	71	return v * (1. / w);
47	}	72	}
48		73
49	static mat3x3 translate (nv x, nv y);	74	static mat3x3 translate (nv x, nv y);
		75	static mat3x3 scale (nv s, nv t);
		76	static mat3x3 rotate (nv phi);
50	};	77	};
51		78
52	mat3x3	79	mat3x3
53	mat3x3::invert ()	80	mat3x3::inverse ()
54	{	81	{
55	mat3x3 &m = *this;	82	mat3x3 &m = *this;
56	mat3x3 inv;	83	mat3x3 inv;
57		84
58	nv s0 = m[2][2] * m[1][1] - m[2][1] * m[1][2];	85	nv s0 = m[2][2] * m[1][1] - m[2][1] * m[1][2];
…		…
98	0, 1, y,	125	0, 1, y,
99	0, 0, 1	126	0, 0, 1
100	);	127	);
101	}	128	}
102		129
103	}	130	mat3x3
104		131	mat3x3::scale (nv s, nv t)
105	#if 0
106	struct pict
107	{
108	Display *dpy;
109	Picture pic;
110
111	operator Picture () const
112	{	132	{
113	return pic;	133	return mat3x3 (
		134	s, 0, 0,
		135	0, t, 0,
		136	0, 0, 1
		137	);
114	}	138	}
115		139
116	pict ()	140	// clockwise
117	: pic (0)	141	mat3x3
		142	mat3x3::rotate (nv phi)
118	{	143	{
		144	nv s = sin (phi);
		145	nv c = cos (phi);
		146
		147	return mat3x3 (
		148	c, -s, 0,
		149	s, c, 0,
		150	0, 0, 1
		151	);
119	}	152	}
120		153
121	pict (rxvt_img img, XRenderPictFormat format = 0)	154	struct composer
122	: dpy (img->s->display->dpy)
123	{	155	{
		156	rxvt_img srcimg, dstimg;
		157	Picture src, dst, msk;
		158	Display *dpy;
		159
		160	ecb_noinline
		161	composer (rxvt_img srcimg, rxvt_img dstimg = 0)
		162	: srcimg (srcimg), dstimg (dstimg), msk (0)
		163	{
		164	if (!this->dstimg)
		165	this->dstimg = srcimg->new_empty ();
		166	else if (!this->dstimg->pm) // somewhat unsatisfying
		167	this->dstimg->alloc ();
		168
		169	dpy = srcimg->s->dpy;
		170	src = srcimg->picture ();
		171	dst = this->dstimg->picture ();
		172	}
		173
		174	ecb_noinline
		175	void mask (bool rgb = true, int x = 1, int y = 1)
		176	{
		177	Pixmap pixmap = XCreatePixmap (dpy, srcimg->pm, x, y, rgb ? 32 : 8);
		178
		179	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, rgb ? PictStandardARGB32 : PictStandardA8);
124	XRenderPictureAttributes pa;	180	XRenderPictureAttributes pa;
125	pa.repeat = img->repeat;	181	pa.repeat = RepeatNormal;
126	pic = XRenderCreatePicture (dpy, img->pm, format ? format : img->format, CPRepeat, &pa);	182	pa.component_alpha = rgb;
		183	msk = XRenderCreatePicture (dpy, pixmap, format, CPRepeat \| CPComponentAlpha, &pa);
		184
		185	XFreePixmap (dpy, pixmap);
		186
		187	ecb_assume (msk);
		188	}
		189
		190	// CreateSolidFill creates a very very very weird picture
		191	void mask (const rgba &c)
		192	{
		193	XRenderColor rc = {
		194	c.r * c.a / 65535,
		195	c.g * c.a / 65535,
		196	c.b * c.a / 65535,
		197	c.a
		198	};
		199	msk = XRenderCreateSolidFill (dpy, &rc);
		200	ecb_assume (msk);
		201	}
		202
		203	void fill (const rgba &c)
		204	{
		205	XRenderColor rc = {
		206	c.r * c.a / 65535,
		207	c.g * c.a / 65535,
		208	c.b * c.a / 65535,
		209	c.a
		210	};
		211
		212	XRenderFillRectangle (dpy, PictOpSrc, msk, &rc, 0, 0, 1, 1);
		213	}
		214
		215	operator rxvt_img *()
		216	{
		217	return dstimg;
		218	}
		219
		220	ecb_noinline
		221	~composer ()
		222	{
		223	XRenderFreePicture (dpy, src);
		224	XRenderFreePicture (dpy, dst);
		225	if (msk) XRenderFreePicture (dpy, msk);
		226	}
127	}	227	};
128		228	}
129	~pict ()
130	{
131	if (pic)
132	XRenderFreePicture (dpy, pic);
133	}
134	};
135	#endif
136		229
137	static XRenderPictFormat *	230	static XRenderPictFormat *
138	find_alpha_format_for (Display dpy, XRenderPictFormat format)	231	find_alpha_format_for (Display dpy, XRenderPictFormat format)
139	{	232	{
140	if (format->direct.alphaMask)	233	if (format->direct.alphaMask)
…		…
167	}	260	}
168		261
169	rxvt_img *	262	rxvt_img *
170	rxvt_img::new_from_root (rxvt_screen *s)	263	rxvt_img::new_from_root (rxvt_screen *s)
171	{	264	{
172	Display *dpy = s->display->dpy;	265	Display *dpy = s->dpy;
173	unsigned int root_pm_w, root_pm_h;	266	unsigned int root_pm_w, root_pm_h;
174	Pixmap root_pixmap = s->display->get_pixmap_property (s->display->xa[XA_XROOTPMAP_ID]);	267	Pixmap root_pixmap = s->display->get_pixmap_property (s->display->xa [XA_XROOTPMAP_ID]);
175	if (root_pixmap == None)	268	if (root_pixmap == None)
176	root_pixmap = s->display->get_pixmap_property (s->display->xa[XA_ESETROOT_PMAP_ID]);	269	root_pixmap = s->display->get_pixmap_property (s->display->xa [XA_ESETROOT_PMAP_ID]);
177		270
178	if (root_pixmap == None)	271	if (root_pixmap == None)
179	return 0;	272	return 0;
180		273
181	Window wdummy;	274	Window wdummy;
…		…
204	# if HAVE_PIXBUF	297	# if HAVE_PIXBUF
205		298
206	rxvt_img *	299	rxvt_img *
207	rxvt_img::new_from_pixbuf (rxvt_screen s, GdkPixbuf pb)	300	rxvt_img::new_from_pixbuf (rxvt_screen s, GdkPixbuf pb)
208	{	301	{
209	Display *dpy = s->display->dpy;	302	Display *dpy = s->dpy;
210		303
211	int width = gdk_pixbuf_get_width (pb);	304	int width = gdk_pixbuf_get_width (pb);
212	int height = gdk_pixbuf_get_height (pb);	305	int height = gdk_pixbuf_get_height (pb);
213		306
214	if (width > 32767 \|\| height > 32767) // well, we could upload in chunks	307	if (width > 32767 \|\| height > 32767) // well, we could upload in chunks
…		…
264	uint8_t r = *src++;	357	uint8_t r = *src++;
265	uint8_t g = *src++;	358	uint8_t g = *src++;
266	uint8_t b = *src++;	359	uint8_t b = *src++;
267		360
268	uint32_t v = (255 << 24) \| (r << 16) \| (g << 8) \| b;	361	uint32_t v = (255 << 24) \| (r << 16) \| (g << 8) \| b;
269		362
270	if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)	363	if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
271	v = ecb_bswap32 (v);	364	v = ecb_bswap32 (v);
272		365
273	*dst++ = v;	366	*dst++ = v;
274	}	367	}
…		…
327	{	420	{
328	if (--ref->cnt)	421	if (--ref->cnt)
329	return;	422	return;
330		423
331	if (pm && ref->ours)	424	if (pm && ref->ours)
332	XFreePixmap (s->display->dpy, pm);	425	XFreePixmap (s->dpy, pm);
333		426
334	delete ref;	427	delete ref;
335	}	428	}
336		429
337	rxvt_img::~rxvt_img ()	430	rxvt_img::~rxvt_img ()
…		…
340	}	433	}
341		434
342	void	435	void
343	rxvt_img::alloc ()	436	rxvt_img::alloc ()
344	{	437	{
345	pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);	438	pm = XCreatePixmap (s->dpy, s->display->root, w, h, format->depth);
346	ref = new pixref (w, h);	439	ref = new pixref (w, h);
		440	}
		441
		442	rxvt_img *
		443	rxvt_img::new_empty ()
		444	{
		445	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
		446	img->alloc ();
		447
		448	return img;
347	}	449	}
348		450
349	Picture	451	Picture
350	rxvt_img::picture ()	452	rxvt_img::picture ()
351	{	453	{
352	Display *dpy = s->display->dpy;	454	Display *dpy = s->dpy;
353		455
354	XRenderPictureAttributes pa;	456	XRenderPictureAttributes pa;
355	pa.repeat = repeat;	457	pa.repeat = repeat;
356	Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);	458	Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
357		459
…		…
362	rxvt_img::unshare ()	464	rxvt_img::unshare ()
363	{	465	{
364	if (ref->cnt == 1 && ref->ours)	466	if (ref->cnt == 1 && ref->ours)
365	return;	467	return;
366		468
367	Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth);	469	Pixmap pm2 = XCreatePixmap (s->dpy, s->display->root, ref->w, ref->h, format->depth);
368	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);	470	GC gc = XCreateGC (s->dpy, pm, 0, 0);
369	XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);	471	XCopyArea (s->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
370	XFreeGC (s->display->dpy, gc);	472	XFreeGC (s->dpy, gc);
371		473
372	destroy ();	474	destroy ();
373		475
374	pm = pm2;	476	pm = pm2;
375	ref = new pixref (ref->w, ref->h);	477	ref = new pixref (ref->w, ref->h);
376	}	478	}
377		479
378	void	480	void
		481	rxvt_img::fill (const rgba &c, int x, int y, int w, int h)
		482	{
		483	XRenderColor rc = { c.r, c.g, c.b, c.a };
		484
		485	Display *dpy = s->dpy;
		486	Picture src = picture ();
		487	XRenderFillRectangle (dpy, PictOpSrc, src, &rc, x, y, w, h);
		488	XRenderFreePicture (dpy, src);
		489	}
		490
		491	void
379	rxvt_img::fill (const rgba &c)	492	rxvt_img::fill (const rgba &c)
380	{	493	{
381	XRenderColor rc = { c.r, c.g, c.b, c.a };	494	fill (c, 0, 0, w, h);
382
383	Display *dpy = s->display->dpy;
384	Picture src = picture ();
385	XRenderFillRectangle (dpy, PictOpSrc, src, &rc, 0, 0, w, h);
386	XRenderFreePicture (dpy, src);
387	}	495	}
388		496
389	void	497	void
390	rxvt_img::add_alpha ()	498	rxvt_img::add_alpha ()
391	{	499	{
392	if (format->direct.alphaMask)	500	if (format->direct.alphaMask)
393	return;	501	return;
394		502
395	Display *dpy = s->display->dpy;
396
397	rxvt_img *img = new rxvt_img (s, find_alpha_format_for (dpy, format), x, y, w, h, repeat);	503	composer cc (this, new rxvt_img (s, find_alpha_format_for (s->dpy, format), x, y, w, h, repeat));
398	img->alloc ();
399
400	Picture src = picture ();
401	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
402		504
403	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	505	XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
404		506
405	XRenderFreePicture (dpy, src);	507	rxvt_img *img = cc;
406	XRenderFreePicture (dpy, dst);
407		508
408	::swap (img->ref, ref);	509	::swap (img->ref, ref);
409	::swap (img->pm , pm );	510	::swap (img->pm , pm );
410		511
411	delete img;	512	delete img;
…		…
436	rxvt_img::blur (int rh, int rv)	537	rxvt_img::blur (int rh, int rv)
437	{	538	{
438	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))	539	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))
439	return clone ();	540	return clone ();
440		541
441	Display *dpy = s->display->dpy;	542	Display *dpy = s->dpy;
442	int size = max (rh, rv) * 2 + 1;	543	int size = max (rh, rv) * 2 + 1;
443	nv kernel = (nv )malloc (size * sizeof (nv));	544	nv kernel = (nv )malloc (size * sizeof (nv));
444	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));	545	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
445	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);	546	rxvt_img *img = new_empty ();
446	img->alloc ();
447		547
448	XRenderPictureAttributes pa;	548	XRenderPictureAttributes pa;
449	pa.repeat = RepeatPad;	549	pa.repeat = RepeatPad;
450	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);	550	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
451	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);	551	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
…		…
494	XRenderFreePicture (dpy, tmp);	594	XRenderFreePicture (dpy, tmp);
495		595
496	return img;	596	return img;
497	}	597	}
498		598
499	static Picture	599	ecb_noinline static void
500	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha)
501	{
502	Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
503
504	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
505	XRenderPictureAttributes pa;
506	pa.repeat = RepeatNormal;
507	pa.component_alpha = component_alpha;
508	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat \| CPComponentAlpha, &pa);
509
510	XFreePixmap (dpy, pixmap);
511
512	return mask;
513	}
514
515	static void
516	extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)	600	extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)
517	{	601	{
518	int32_t x = clamp (c, cl0, cl1);	602	int32_t x = clamp (c, cl0, cl1);
519	c -= x;	603	c -= x;
520	xc = x;	604	xc = x;
521	}	605	}
522		606
523	static bool	607	ecb_noinline static bool
524	extract (int32_t cl0, int32_t cl1, int32_t &r, int32_t &g, int32_t &b, int32_t &a, unsigned short &xr, unsigned short &xg, unsigned short &xb, unsigned short &xa)	608	extract (int32_t cl0, int32_t cl1, int32_t &r, int32_t &g, int32_t &b, int32_t &a, unsigned short &xr, unsigned short &xg, unsigned short &xb, unsigned short &xa)
525	{	609	{
526	extract (cl0, cl1, r, xr);	610	extract (cl0, cl1, r, xr);
527	extract (cl0, cl1, g, xg);	611	extract (cl0, cl1, g, xg);
528	extract (cl0, cl1, b, xb);	612	extract (cl0, cl1, b, xb);
…		…
534	void	618	void
535	rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a)	619	rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a)
536	{	620	{
537	unshare ();	621	unshare ();
538		622
539	Display *dpy = s->display->dpy;	623	Display *dpy = s->dpy;
540	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	624	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
541		625
542	// loop should not be needed for brightness, as only -1..1 makes sense	626	// loop should not be needed for brightness, as only -1..1 makes sense
543	//while (r \| g \| b \| a)	627	//while (r \| g \| b \| a)
544	{	628	{
…		…
568	rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)	652	rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
569	{	653	{
570	if (r < 0 \|\| g < 0 \|\| b < 0 \|\| a < 0)	654	if (r < 0 \|\| g < 0 \|\| b < 0 \|\| a < 0)
571	rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");	655	rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");
572		656
573	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
574	img->alloc ();
575	img->fill (rgba (0, 0, 0, 0));
576
577	// premultiply (yeah, these are not exact, sue me or fix it)	657	// premultiply (yeah, these are not exact, sue me or fix it)
578	r = (r * (a >> 8)) >> 8;	658	r = (r * (a >> 8)) >> 8;
579	g = (g * (a >> 8)) >> 8;	659	g = (g * (a >> 8)) >> 8;
580	b = (b * (a >> 8)) >> 8;	660	b = (b * (a >> 8)) >> 8;
581		661
582	Display *dpy = s->display->dpy;	662	composer cc (this);
		663	rxvt_img *img = cc;
		664	img->fill (rgba (0, 0, 0, 0));
583		665
584	Picture src = picture ();	666	cc.mask (true);
585	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
586	Picture mul = create_xrender_mask (dpy, pm, True, True);
587		667
588	//TODO: this operator does not yet implement some useful contrast	668	//TODO: this operator does not yet implement some useful contrast
589	while (r \| g \| b \| a)	669	while (r \| g \| b \| a)
590	{	670	{
591	unsigned short xr, xg, xb, xa;	671	unsigned short xr, xg, xb, xa;
592	XRenderColor mask_c;	672	XRenderColor mask_c;
593		673
594	if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))	674	if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
595	{	675	{
596	XRenderFillRectangle (dpy, PictOpSrc, mul, &mask_c, 0, 0, 1, 1);	676	XRenderFillRectangle (cc.dpy, PictOpSrc, cc.msk, &mask_c, 0, 0, 1, 1);
597	XRenderComposite (dpy, PictOpAdd, src, mul, dst, 0, 0, 0, 0, 0, 0, w, h);	677	XRenderComposite (cc.dpy, PictOpAdd, cc.src, cc.msk, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
598	}	678	}
599	}	679	}
600
601	XRenderFreePicture (dpy, mul);
602	XRenderFreePicture (dpy, dst);
603	XRenderFreePicture (dpy, src);
604		680
605	::swap (img->ref, ref);	681	::swap (img->ref, ref);
606	::swap (img->pm , pm );	682	::swap (img->pm , pm );
607		683
608	delete img;	684	delete img;
…		…
611	void	687	void
612	rxvt_img::draw (rxvt_img *img, int op, nv mask)	688	rxvt_img::draw (rxvt_img *img, int op, nv mask)
613	{	689	{
614	unshare ();	690	unshare ();
615		691
616	Display *dpy = s->display->dpy;	692	composer cc (img, this);
617	Picture src = img->picture ();
618	Picture dst = picture ();
619	Picture mask_p = 0;
620		693
621	if (mask != 1.)	694	if (mask != 1.)
622	{	695	cc.mask (rgba (0, 0, 0, float_to_component (mask)));
623	mask_p = create_xrender_mask (dpy, img->pm, False, False);
624	XRenderColor mask_c = { 0, 0, 0, float_to_component (mask) };
625	XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
626	}
627		696
628	XRenderComposite (dpy, op, src, mask_p, dst, x - img->x, y - img->y, 0, 0, 0, 0, w, h);	697	XRenderComposite (cc.dpy, op, cc.src, cc.msk, cc.dst, x - img->x, y - img->y, 0, 0, 0, 0, w, h);
629
630	XRenderFreePicture (dpy, src);
631	XRenderFreePicture (dpy, dst);
632
633	if (mask_p)
634	XRenderFreePicture (dpy, mask_p);
635	}	698	}
636		699
637	rxvt_img *	700	rxvt_img *
638	rxvt_img::clone ()	701	rxvt_img::clone ()
639	{	702	{
…		…
644	rxvt_img::reify ()	707	rxvt_img::reify ()
645	{	708	{
646	if (x == 0 && y == 0 && w == ref->w && h == ref->h)	709	if (x == 0 && y == 0 && w == ref->w && h == ref->h)
647	return clone ();	710	return clone ();
648		711
649	Display *dpy = s->display->dpy;	712	Display *dpy = s->dpy;
650		713
651	// add an alpha channel if...	714	// add an alpha channel if...
652	bool alpha = !format->direct.alphaMask // pixmap has none yet	715	bool alpha = !format->direct.alphaMask // pixmap has none yet
653	&& (x \|\| y) // we need one because of non-zero offset	716	&& (x \|\| y) // we need one because of non-zero offset
654	&& repeat == RepeatNone; // and we have no good pixels to fill with	717	&& repeat == RepeatNone; // and we have no good pixels to fill with
655		718
656	rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);	719	composer cc (this, new rxvt_img (s, alpha ? find_alpha_format_for (s->dpy, format) : format,
657	img->alloc ();	720	0, 0, w, h, repeat));
658		721
659	Picture src = picture ();
660	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
661
662	if (alpha)	722	if (alpha)
663	{	723	{
664	XRenderColor rc = { 0, 0, 0, 0 };	724	XRenderColor rc = { 0, 0, 0, 0 };
665	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles	725	XRenderFillRectangle (cc.dpy, PictOpSrc, cc.dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
666	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, x, y, ref->w, ref->h);	726	XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, 0, 0, 0, 0, x, y, ref->w, ref->h);
667	}	727	}
668	else	728	else
669	XRenderComposite (dpy, PictOpSrc, src, None, dst, -x, -y, 0, 0, 0, 0, w, h);	729	XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, -x, -y, 0, 0, 0, 0, w, h);
670		730
671	XRenderFreePicture (dpy, src);
672	XRenderFreePicture (dpy, dst);
673
674	return img;	731	return cc;
675	}	732	}
676		733
677	rxvt_img *	734	rxvt_img *
678	rxvt_img::sub_rect (int x, int y, int width, int height)	735	rxvt_img::sub_rect (int x, int y, int width, int height)
679	{	736	{
…		…
694		751
695	return img;	752	return img;
696	}	753	}
697		754
698	rxvt_img *	755	rxvt_img *
699	rxvt_img::transform (nv matrix[3][3])	756	rxvt_img::transform (const nv matrix[3][3])
700	{	757	{
		758	return transform (mat3x3 (&matrix[0][0]));
		759	}
		760
		761	rxvt_img *
		762	rxvt_img::transform (const nv *matrix)
		763	{
		764	mat3x3 m (matrix);
		765
701	// calculate new pixel bounding box coordinates	766	// calculate new pixel bounding box coordinates
702	nv r[2], rmin[2], rmax[2];	767	nv rmin[2], rmax[2];
703
704	mat3x3 m (matrix);
705		768
706	for (int i = 0; i < 2; ++i)	769	for (int i = 0; i < 2; ++i)
707	{	770	{
708	nv v;	771	nv v;
709		772
710	v = m.apply1 (i, 0+x, 0+y); rmin [i] = rmax [i] = v; r [i] = v;	773	v = m.apply1 (i, 0+x, 0+y); rmin [i] = rmax [i] = v;
711	v = m.apply1 (i, w+x, 0+y); min_it (rmin [i], v); max_it (rmax [i], v);	774	v = m.apply1 (i, w+x, 0+y); min_it (rmin [i], v); max_it (rmax [i], v);
712	v = m.apply1 (i, 0+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v);	775	v = m.apply1 (i, 0+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v);
713	v = m.apply1 (i, w+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v);	776	v = m.apply1 (i, w+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v);
714	}	777	}
715		778
…		…
721	int ny = floor (rmin [1]);	784	int ny = floor (rmin [1]);
722		785
723	int new_width = ceil (rmax [0] - rmin [0]);	786	int new_width = ceil (rmax [0] - rmin [0]);
724	int new_height = ceil (rmax [1] - rmin [1]);	787	int new_height = ceil (rmax [1] - rmin [1]);
725		788
726	m = mat3x3::translate (-x, -y) * m * mat3x3::translate (x, y);	789	mat3x3 inv = (mat3x3::translate (-x, -y) * m * mat3x3::translate (x, y)).inverse ();
727		790
728	mat3x3 inv = m.invert ();	791	composer cc (this, new rxvt_img (s, format, nx, ny, new_width, new_height, repeat));
729
730	rxvt_img *img = new rxvt_img (s, format, nx, ny, new_width, new_height, repeat);
731	img->alloc ();
732
733	Display *dpy = s->display->dpy;
734	Picture src = picture ();
735	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
736		792
737	XTransform xfrm;	793	XTransform xfrm;
738		794
739	for (int i = 0; i < 3; ++i)	795	for (int i = 0; i < 3; ++i)
740	for (int j = 0; j < 3; ++j)	796	for (int j = 0; j < 3; ++j)
741	xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);	797	xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);
742		798
743	XRenderSetPictureFilter (dpy, src, "good", 0, 0);	799	XRenderSetPictureFilter (cc.dpy, cc.src, "good", 0, 0);
744	XRenderSetPictureTransform (dpy, src, &xfrm);	800	XRenderSetPictureTransform (cc.dpy, cc.src, &xfrm);
745	XRenderComposite (dpy, PictOpSrc, src, None, dst, sx, sy, 0, 0, 0, 0, new_width, new_height);	801	XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, sx, sy, 0, 0, 0, 0, new_width, new_height);
746	#if 1
747	{
748	XRenderColor rc = { 65535,0,0,65535 };
749	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, new_width, new_height);
750	}{
751	XRenderColor rc = { 0,0,0,65535 };
752	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 1, 1, new_width - 2, new_height - 2);
753	}
754	XRenderComposite (dpy, PictOpOver, src, None, dst, sx, sy, 0, 0, 0, 0, new_width, new_height);
755	#endif
756		802
757	XRenderFreePicture (dpy, src);
758	XRenderFreePicture (dpy, dst);
759
760	return img;	803	return cc;
761	}	804	}
762		805
763	rxvt_img *	806	rxvt_img *
764	rxvt_img::scale (int new_width, int new_height)	807	rxvt_img::scale (int new_width, int new_height)
765	{	808	{
766	if (w == new_width && h == new_height)	809	if (w == new_width && h == new_height)
767	return clone ();	810	return clone ();
768		811
769	nv matrix[3][3] = {
770	{ new_width / (nv)w, 0, 0 },
771	{ 0, new_height / (nv)h, 0 },
772	{ 0, 0, 1 }
773	};
774
775	int old_repeat_mode = repeat;	812	int old_repeat_mode = repeat;
776	repeat = RepeatPad; // not right, but xrender can't properly scale it seems	813	repeat = RepeatPad; // not right, but xrender can't properly scale it seems
777		814
778	rxvt_img *img = transform (matrix);	815	rxvt_img *img = transform (mat3x3::scale (new_width / (nv)w, new_height / (nv)h));
779		816
780	repeat = old_repeat_mode;	817	repeat = old_repeat_mode;
781	img->repeat = repeat;	818	img->repeat = repeat;
782		819
783	return img;	820	return img;
784	}	821	}
785		822
786	rxvt_img *	823	rxvt_img *
787	rxvt_img::rotate (int cx, int cy, nv phi)	824	rxvt_img::rotate (int cx, int cy, nv phi)
788	{	825	{
789	nv s = sin (phi);
790	nv c = cos (phi);
791
792	nv matrix[3][3] = {
793	#if 0
794	{ c, -s, cx - c * cx + s * cy },
795	{ s, c, cy - s * cx - c * cy },
796	{ 0, 0, 1 }
797	#else
798	{ c, -s, 0 },
799	{ s, c, 0 },
800	{ 0, 0, 1 }
801	#endif
802	};
803
804	move (-cx, -cy);	826	move (-cx, -cy);
805	rxvt_img *img = transform (matrix);	827	rxvt_img *img = transform (mat3x3::rotate (phi));
806	move ( cx, cy);	828	move ( cx, cy);
807	img->move (cx, cy);	829	img->move (cx, cy);
808		830
809	return img;	831	return img;
810	}	832	}
…		…
813	rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg)	835	rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg)
814	{	836	{
815	if (new_format == format)	837	if (new_format == format)
816	return clone ();	838	return clone ();
817		839
818	rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);	840	composer cc (this, new rxvt_img (s, new_format, x, y, w, h, repeat));
819	img->alloc ();
820		841
821	Display *dpy = s->display->dpy;
822	Picture src = picture ();
823	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
824	int op = PictOpSrc;	842	int op = PictOpSrc;
825		843
826	if (format->direct.alphaMask && !new_format->direct.alphaMask)	844	if (format->direct.alphaMask && !new_format->direct.alphaMask)
827	{	845	{
828	// does it have to be that complicated	846	// does it have to be that complicated
829	XRenderColor rc = { bg.r, bg.g, bg.b, bg.a };	847	XRenderColor rc = { bg.r, bg.g, bg.b, bg.a };
830	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);	848	XRenderFillRectangle (cc.dpy, PictOpSrc, cc.dst, &rc, 0, 0, w, h);
831		849
832	op = PictOpOver;	850	op = PictOpOver;
833	}	851	}
834		852
835	XRenderComposite (dpy, op, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	853	XRenderComposite (cc.dpy, op, cc.src, None, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
836		854
837	XRenderFreePicture (dpy, src);
838	XRenderFreePicture (dpy, dst);
839
840	return img;	855	return cc;
841	}	856	}
842		857
843	rxvt_img *	858	rxvt_img *
844	rxvt_img::blend (rxvt_img *img, nv factor)	859	rxvt_img::tint (const rgba &c)
845	{	860	{
846	rxvt_img *img2 = clone ();	861	composer cc (this);
847	Display *dpy = s->display->dpy;	862	cc.mask (true);
848	Picture src = img->picture ();	863	cc.fill (c);
849	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
850	Picture mask = create_xrender_mask (dpy, img->pm, False, False);
851		864
852	XRenderColor mask_c;
853
854	mask_c.alpha = float_to_component (factor);
855	mask_c.red =
856	mask_c.green =
857	mask_c.blue = 0;
858	XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
859
860	XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, w, h);	865	XRenderComposite (cc.dpy, PictOpSrc, cc.src, cc.msk, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
861		866
862	XRenderFreePicture (dpy, src);
863	XRenderFreePicture (dpy, dst);
864	XRenderFreePicture (dpy, mask);
865
866	return img2;	867	return cc;
		868	}
		869
		870	rxvt_img *
		871	rxvt_img::filter (const char name, int nparams, nv params)
		872	{
		873	composer cc (this);
		874
		875	XFixed *xparams = rxvt_temp_buf<XFixed> (nparams);
		876
		877	for (int i = 0; i < nparams; ++i)
		878	xparams [i] = XDoubleToFixed (params [i]);
		879
		880	XRenderSetPictureFilter (cc.dpy, cc.src, name, xparams, nparams);
		881
		882	XRenderComposite (cc.dpy, PictOpSrc, cc.src, 0, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
		883
		884	return cc;
867	}	885	}
868		886
869	#endif	887	#endif
870		888

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.93 by root, Fri Jun 15 18:07:24 2012 UTC vs. Revision 1.100 by root, Mon Jul 2 02:01:41 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.93 by root, Fri Jun 15 18:07:24 2012 UTC vs.
Revision 1.100 by root, Mon Jul 2 02:01:41 2012 UTC