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

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.50 by root, Thu Jun 7 19:42:09 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
6		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	}
		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	{
11	}	213	}
13	rxvt_img::rxvt_img (const rxvt_img &img)	215	rxvt_img::rxvt_img (const rxvt_img &img)
14	: s(img.s), x(img.x), y(img.y), w(img.w), h(img.h), format(img.format), repeat(img.repeat), pm(img.pm), ref(img.ref)	216	: s(img.s), x(img.x), y(img.y), w(img.w), h(img.h), format(img.format), repeat(img.repeat), pm(img.pm), ref(img.ref)
15	{	217	{
16	++ref->cnt;	218	++ref->cnt;
17	}	219	}
18
19	#if 0
20	rxvt_img::rxvt_img (rxvt_screen screen, XRenderPictFormat format, int width, int height, Pixmap pixmap)
21	: s(screen), x(0), y(0), w(width), h(height), format(format), repeat(RepeatNormal), shared(false), pm(pixmap)
22	{
23	}
24	#endif
25		220
26	rxvt_img *	221	rxvt_img *
27	rxvt_img::new_from_root (rxvt_screen *s)	222	rxvt_img::new_from_root (rxvt_screen *s)
28	{	223	{
29	Display *dpy = s->display->dpy;	224	Display *dpy = s->display->dpy;
…		…
56	img->ref->ours = false;	251	img->ref->ours = false;
57		252
58	return img;	253	return img;
59	}	254	}
60		255
		256	# if HAVE_PIXBUF
		257
61	rxvt_img *	258	rxvt_img *
62	rxvt_img::new_from_pixbuf (rxvt_screen s, GdkPixbuf pb)	259	rxvt_img::new_from_pixbuf (rxvt_screen s, GdkPixbuf pb)
63	{	260	{
64	Display *dpy = s->display->dpy;	261	Display *dpy = s->display->dpy;
65		262
…		…
69	if (width > 32767 \|\| height > 32767) // well, we could upload in chunks	266	if (width > 32767 \|\| height > 32767) // well, we could upload in chunks
70	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big (maximum size 32768x32768).\n");	267	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big (maximum size 32768x32768).\n");
71		268
72	// since we require rgb24/argb32 formats from xrender we assume	269	// since we require rgb24/argb32 formats from xrender we assume
73	// that both 24 and 32 bpp MUST be supported by any screen that supports xrender	270	// that both 24 and 32 bpp MUST be supported by any screen that supports xrender
74	int depth = gdk_pixbuf_get_has_alpha (pb) ? 32 : 24;	271
		272	int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
75		273
76	XImage xi;	274	XImage xi;
77		275
78	xi.width = width;	276	xi.width = width;
79	xi.height = height;	277	xi.height = height;
80	xi.xoffset = 0;	278	xi.xoffset = 0;
81	xi.format = ZPixmap;	279	xi.format = ZPixmap;
82	xi.byte_order = LSBFirst; // maybe go for host byte order, because servers are usually local?	280	xi.byte_order = ImageByteOrder (dpy);
83	xi.bitmap_unit = 32;	281	xi.bitmap_unit = 0; //XY only, unused
84	xi.bitmap_bit_order = LSBFirst;	282	xi.bitmap_bit_order = 0; //XY only, unused
85	xi.bitmap_pad = BitmapPad (dpy);	283	xi.bitmap_pad = BitmapPad (dpy);
86	xi.depth = depth;	284	xi.depth = 32;
87	xi.bytes_per_line = 0;	285	xi.bytes_per_line = 0;
88	xi.bits_per_pixel = 32;	286	xi.bits_per_pixel = 32; //Z only
89	xi.red_mask = 0x000000ff;	287	xi.red_mask = 0x00000000; //Z only, unused
90	xi.green_mask = 0x0000ff00;	288	xi.green_mask = 0x00000000; //Z only, unused
91	xi.blue_mask = 0x00ff0000;	289	xi.blue_mask = 0x00000000; //Z only, unused
		290	xi.obdata = 0; // probably unused
		291
		292	bool byte_order_mismatch = byte_order != xi.byte_order;
92		293
93	if (!XInitImage (&xi))	294	if (!XInitImage (&xi))
94	rxvt_fatal ("unable to initialise ximage, please report.\n");	295	rxvt_fatal ("unable to initialise ximage, please report.\n");
95		296
96	if (height > INT_MAX / xi.bytes_per_line)	297	if (height > INT_MAX / xi.bytes_per_line)
97	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n");	298	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n");
98		299
99	xi.data = (char )rxvt_malloc (height xi.bytes_per_line);	300	xi.data = (char )rxvt_malloc (height xi.bytes_per_line);
100		301
101	int rowstride = gdk_pixbuf_get_rowstride (pb);	302	int rowstride = gdk_pixbuf_get_rowstride (pb);
102		303	bool pb_has_alpha = gdk_pixbuf_get_has_alpha (pb);
103	assert (3 + (depth == 32) == gdk_pixbuf_get_n_channels (pb));
104	unsigned char *row = gdk_pixbuf_get_pixels (pb);	304	unsigned char *row = gdk_pixbuf_get_pixels (pb);
		305
105	char *line = xi.data;	306	char *line = xi.data;
106		307
107	for (int y = 0; y < height; y++)	308	for (int y = 0; y < height; y++)
108	{	309	{
109	unsigned char *src = row;	310	unsigned char *src = row;
110	uint32_t dst = (uint32_t )line;	311	uint32_t dst = (uint32_t )line;
111		312
112	if (depth == 24)	313	if (!pb_has_alpha)
113	for (int x = 0; x < width; x++)	314	for (int x = 0; x < width; x++)
114	{	315	{
115	uint8_t r = *src++;	316	uint8_t r = *src++;
116	uint8_t g = *src++;	317	uint8_t g = *src++;
117	uint8_t b = *src++;	318	uint8_t b = *src++;
118		319
119	uint32_t v = r \| (g << 8) \| (b << 16);	320	uint32_t v = (255 << 24) \| (r << 16) \| (g << 8) \| b;
120		321
121	if (ecb_big_endian ())	322	if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
122	v = ecb_bswap32 (v);	323	v = ecb_bswap32 (v);
123		324
124	*dst++ = x;	325	*dst++ = v;
125	}	326	}
126	else	327	else
127	for (int x = 0; x < width; x++)	328	for (int x = 0; x < width; x++)
128	{	329	{
129	uint32_t v = (uint32_t )src; src += 4;	330	uint32_t v = (uint32_t )src; src += 4;
130	v = ecb_big_endian () ? ecb_rotr32 (v, 8) : ecb_rotl32 (v, 8);	331
		332	if (ecb_big_endian ())
131	*dst++ = ecb_bswap32 (v);	333	v = ecb_bswap32 (v);
		334
		335	v = ecb_rotl32 (v, 8); // abgr to bgra
		336
		337	if (!byte_order_mismatch)
		338	v = ecb_bswap32 (v);
		339
		340	*dst++ = v;
132	}	341	}
133		342
134	row += rowstride;	343	row += rowstride;
135	line += xi.bytes_per_line;	344	line += xi.bytes_per_line;
136	}	345	}
137		346
138	rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, depth == 24 ? PictStandardRGB24 : PictStandardARGB32), 0, 0, width, height);	347	rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, PictStandardARGB32), 0, 0, width, height);
139	img->alloc ();	348	img->alloc ();
140		349
141	GC gc = XCreateGC (dpy, img->pm, 0, 0);	350	GC gc = XCreateGC (dpy, img->pm, 0, 0);
142	XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height);	351	XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height);
143	XFreeGC (dpy, gc);	352	XFreeGC (dpy, gc);
…		…
161	g_object_unref (pb);	370	g_object_unref (pb);
162		371
163	return img;	372	return img;
164	}	373	}
165		374
		375	# endif
		376
166	void	377	void
167	rxvt_img::destroy ()	378	rxvt_img::destroy ()
168	{	379	{
169	if (--ref->cnt)	380	if (--ref->cnt)
170	return;	381	return;
…		…
186	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);
187	ref = new pixref (w, h);	398	ref = new pixref (w, h);
188	}	399	}
189		400
190	Picture	401	Picture
191	rxvt_img::src_picture ()	402	rxvt_img::picture ()
192	{	403	{
193	Display *dpy = s->display->dpy;	404	Display *dpy = s->display->dpy;
194		405
195	XRenderPictureAttributes pa;	406	XRenderPictureAttributes pa;
196	pa.repeat = repeat;	407	pa.repeat = repeat;
…		…
203	rxvt_img::unshare ()	414	rxvt_img::unshare ()
204	{	415	{
205	if (ref->cnt == 1 && ref->ours)	416	if (ref->cnt == 1 && ref->ours)
206	return;	417	return;
207		418
208	//TODO: maybe should reify instead
209	Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth);	419	Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth);
210	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);	420	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
211	XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);	421	XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
212	XFreeGC (s->display->dpy, gc);	422	XFreeGC (s->display->dpy, gc);
213		423
…		…
216	pm = pm2;	426	pm = pm2;
217	ref = new pixref (ref->w, ref->h);	427	ref = new pixref (ref->w, ref->h);
218	}	428	}
219		429
220	void	430	void
221	rxvt_img::fill (const rxvt_color &c)	431	rxvt_img::fill (const rgba &c)
222	{	432	{
223	XGCValues gcv;	433	XRenderColor rc = { c.r, c.g, c.b, c.a };
224	gcv.foreground = c;	434
225	GC gc = XCreateGC (s->display->dpy, pm, GCForeground, &gcv);	435	Display *dpy = s->display->dpy;
226	XFillRectangle (s->display->dpy, pm, gc, 0, 0, w, h);	436	Picture src = picture ();
227	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;
228	}	464	}
229		465
230	static void	466	static void
231	get_gaussian_kernel (int radius, int width, double kernel, XFixed params)	467	get_gaussian_kernel (int radius, int width, nv kernel, XFixed params)
232	{	468	{
233	double sigma = radius / 2.0;	469	nv sigma = radius / 2.0;
234	double scale = sqrt (2.0 * M_PI) * sigma;	470	nv scale = sqrt (2.0 * M_PI) * sigma;
235	double sum = 0.0;	471	nv sum = 0.0;
236		472
237	for (int i = 0; i < width; i++)	473	for (int i = 0; i < width; i++)
238	{	474	{
239	double x = i - width / 2;	475	nv x = i - width / 2;
240	kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;	476	kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
241	sum += kernel[i];	477	sum += kernel[i];
242	}	478	}
243		479
244	params[0] = XDoubleToFixed (width);	480	params[0] = XDoubleToFixed (width);
…		…
254	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))	490	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))
255	return clone ();	491	return clone ();
256		492
257	Display *dpy = s->display->dpy;	493	Display *dpy = s->display->dpy;
258	int size = max (rh, rv) * 2 + 1;	494	int size = max (rh, rv) * 2 + 1;
259	double kernel = (double )malloc (size * sizeof (double));	495	nv kernel = (nv )malloc (size * sizeof (nv));
260	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));	496	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
261	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);
262	img->alloc ();	498	img->alloc ();
263		499
264	Picture src = src_picture ();
265
266	XRenderPictureAttributes pa;	500	XRenderPictureAttributes pa;
267	pa.repeat = RepeatPad;	501	pa.repeat = RepeatPad;
268	Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa);	502	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
		503	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
269		504
270	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);	505	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
271	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);	506	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
272	XFreePixmap (dpy, tmp_pm);	507	XFreePixmap (dpy, tmp_pm);
273		508
…		…
289		524
290	size = rv * 2 + 1;	525	size = rv * 2 + 1;
291	get_gaussian_kernel (rv, size, kernel, params);	526	get_gaussian_kernel (rv, size, kernel, params);
292	::swap (params[0], params[1]);	527	::swap (params[0], params[1]);
293		528
294	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);	529	XRenderSetPictureFilter (dpy, tmp, FilterConvolution, params, size+2);
295	XRenderComposite (dpy,	530	XRenderComposite (dpy,
296	PictOpSrc,	531	PictOpSrc,
297	tmp,	532	tmp,
298	None,	533	None,
299	dst,	534	dst,
…		…
303	w, h);	538	w, h);
304	}	539	}
305		540
306	free (kernel);	541	free (kernel);
307	free (params);	542	free (params);
		543
308	XRenderFreePicture (dpy, src);	544	XRenderFreePicture (dpy, src);
309	XRenderFreePicture (dpy, dst);	545	XRenderFreePicture (dpy, dst);
310	XRenderFreePicture (dpy, tmp);	546	XRenderFreePicture (dpy, tmp);
311		547
312	return img;	548	return img;
313	}	549	}
314		550
315	static Picture	551	static Picture
316	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb)	552	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha)
317	{	553	{
318	Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);	554	Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
319		555
320	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);	556	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
321	XRenderPictureAttributes pa;	557	XRenderPictureAttributes pa;
322	pa.repeat = True;	558	pa.repeat = RepeatNormal;
		559	pa.component_alpha = component_alpha;
323	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);	560	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat \| CPComponentAlpha, &pa);
324		561
325	XFreePixmap (dpy, pixmap);	562	XFreePixmap (dpy, pixmap);
326		563
327	return mask;	564	return mask;
328	}	565	}
329		566
		567	static void
		568	extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)
		569	{
		570	int32_t x = clamp (c, cl0, cl1);
		571	c -= x;
		572	xc = x;
		573	}
		574
		575	static bool
		576	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)
		577	{
		578	extract (cl0, cl1, r, xr);
		579	extract (cl0, cl1, g, xg);
		580	extract (cl0, cl1, b, xb);
		581	extract (cl0, cl1, a, xa);
		582
		583	return xr \| xg \| xb \| xa;
		584	}
		585
330	void	586	void
331	rxvt_img::brightness (unsigned short r, unsigned short g, unsigned short b, unsigned short a)	587	rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a)
332	{	588	{
		589	unshare ();
		590
333	Display *dpy = s->display->dpy;	591	Display *dpy = s->display->dpy;
334	Picture src = create_xrender_mask (dpy, pm, True);
335	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	592	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
336		593
		594	// loop should not be needed for brightness, as only -1..1 makes sense
		595	//while (r \| g \| b \| a)
		596	{
		597	unsigned short xr, xg, xb, xa;
337	XRenderColor mask_c;	598	XRenderColor mask_c;
338	mask_c.red = r;	599
339	mask_c.green = g;	600	if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
340	mask_c.blue = b;	601	XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
341	mask_c.alpha = a;	602
		603	if (extract (-65535, 0, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
		604	{
		605	XRenderColor mask_w = { 65535, 65535, 65535, 65535 };
		606	XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
		607	mask_c.red = -mask_c.red; //TODO: verify that doing clamp, assign, and negation does the right thing
		608	mask_c.green = -mask_c.green;
		609	mask_c.blue = -mask_c.blue;
		610	mask_c.alpha = -mask_c.alpha;
		611	XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
		612	XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
		613	}
		614	}
		615
		616	XRenderFreePicture (dpy, dst);
		617	}
		618
		619	void
		620	rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
		621	{
		622	if (r < 0 \|\| g < 0 \|\| b < 0 \|\| a < 0)
		623	rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");
		624
		625	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
		626	img->alloc ();
		627	img->fill (rgba (0, 0, 0, 0));
		628
		629	// premultiply (yeah, these are not exact, sue me or fix it)
		630	r = (r * (a >> 8)) >> 8;
		631	g = (g * (a >> 8)) >> 8;
		632	b = (b * (a >> 8)) >> 8;
		633
		634	Display *dpy = s->display->dpy;
		635
		636	Picture src = picture ();
		637	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
		638	Picture mul = create_xrender_mask (dpy, pm, True, True);
		639
		640	//TODO: this operator does not yet implement some useful contrast
		641	while (r \| g \| b \| a)
		642	{
		643	unsigned short xr, xg, xb, xa;
		644	XRenderColor mask_c;
		645
		646	if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
		647	{
		648	XRenderFillRectangle (dpy, PictOpSrc, mul, &mask_c, 0, 0, 1, 1);
		649	XRenderComposite (dpy, PictOpAdd, src, mul, dst, 0, 0, 0, 0, 0, 0, w, h);
		650	}
		651	}
		652
		653	XRenderFreePicture (dpy, mul);
		654	XRenderFreePicture (dpy, dst);
		655	XRenderFreePicture (dpy, src);
		656
		657	::swap (img->ref, ref);
		658	::swap (img->pm , pm );
		659
		660	delete img;
		661	}
		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) };
342	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);	677	XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
		678	}
343		679
344	XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	680	XRenderComposite (dpy, op, src, mask_p, dst, x - img->x, y - img->y, 0, 0, 0, 0, w, h);
345		681
346	XRenderFreePicture (dpy, src);	682	XRenderFreePicture (dpy, src);
347	XRenderFreePicture (dpy, dst);	683	XRenderFreePicture (dpy, dst);
348	}
349		684
350	void	685	if (mask_p)
351	rxvt_img::contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a)
352	{
353	if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
354	return;
355
356	Display *dpy = s->display->dpy;
357	Picture src = create_xrender_mask (dpy, pm, True);
358	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
359
360	XRenderColor mask_c;
361	mask_c.red = r;
362	mask_c.green = g;
363	mask_c.blue = b;
364	mask_c.alpha = a;
365	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
366
367	XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
368
369	XRenderFreePicture (dpy, src);	686	XRenderFreePicture (dpy, mask_p);
370	XRenderFreePicture (dpy, dst);
371	}	687	}
372		688
373	rxvt_img *	689	rxvt_img *
374	rxvt_img::clone ()	690	rxvt_img::clone ()
375	{	691	{
376	return new rxvt_img (*this);	692	return new rxvt_img (*this);
377	}
378
379	static XRenderPictFormat *
380	find_alpha_format_for (Display dpy, XRenderPictFormat format)
381	{
382	if (format->direct.alphaMask)
383	return format; // already has alpha
384
385	// try to find a suitable alpha format, one bit alpha is enough for our purposes
386	if (format->type == PictTypeDirect)
387	for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
388	if (f->direct.alphaMask
389	&& f->type == PictTypeDirect
390	&& ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
391	&& ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
392	&& ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
393	return f;
394
395	// should be a very good fallback
396	return XRenderFindStandardFormat (dpy, PictStandardARGB32);
397	}	693	}
398		694
399	rxvt_img *	695	rxvt_img *
400	rxvt_img::reify ()	696	rxvt_img::reify ()
401	{	697	{
402	if (x == 0 && y == 0 && w == ref->w && h == ref->h)	698	if (x == 0 && y == 0 && w == ref->w && h == ref->h)
403	return clone ();	699	return clone ();
404		700
405	Display *dpy = s->display->dpy;	701	Display *dpy = s->display->dpy;
406		702
		703	// add an alpha channel if...
407	bool alpha = !format->direct.alphaMask	704	bool alpha = !format->direct.alphaMask // pixmap has none yet
408	&& (x \|\| y)	705	&& (x \|\| y) // we need one because of non-zero offset
409	&& repeat == RepeatNone;	706	&& repeat == RepeatNone; // and we have no good pixels to fill with
410		707
411	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);
412	img->alloc ();	709	img->alloc ();
413		710
414	Picture src = src_picture ();	711	Picture src = picture ();
415	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	712	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
416		713
417	if (alpha)	714	if (alpha)
418	{	715	{
419	XRenderColor rc = { 0, 0, 0, 0 };	716	XRenderColor rc = { 0, 0, 0, 0 };
420	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
421	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);
422	}	719	}
423	else	720	else
424	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);
425		722
426	XRenderFreePicture (dpy, src);	723	XRenderFreePicture (dpy, src);
427	XRenderFreePicture (dpy, dst);	724	XRenderFreePicture (dpy, dst);
428		725
429	return img;	726	return img;
…		…
432	rxvt_img *	729	rxvt_img *
433	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)
434	{	731	{
435	rxvt_img *img = clone ();	732	rxvt_img *img = clone ();
436		733
437	img->x += x;	734	img->x -= x;
438	img->y += y;	735	img->y -= y;
439		736
440	if (w != width \|\| h != height)	737	if (w != width \|\| h != height)
441	{	738	{
442	img->w = width;	739	img->w = width;
443	img->h = height;	740	img->h = height;
…		…
449		746
450	return img;	747	return img;
451	}	748	}
452		749
453	rxvt_img *	750	rxvt_img *
454	rxvt_img::transform (int new_width, int new_height, double matrix[9])	751	rxvt_img::transform (const nv matrix[3][3])
455	{	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
456	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);
457	img->alloc ();	789	img->alloc ();
458		790
459	Display *dpy = s->display->dpy;	791	Display *dpy = s->display->dpy;
460	Picture src = src_picture ();	792	Picture src = picture ();
461	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	793	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
462		794
463	XTransform xfrm;	795	XTransform xfrm;
464		796
465	for (int i = 0; i < 3; ++i)	797	for (int i = 0; i < 3; ++i)
466	for (int j = 0; j < 3; ++j)	798	for (int j = 0; j < 3; ++j)
467	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);	799	xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);
468
469	#if 0
470	xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
471	xfrm.matrix [1][2] -= XDoubleToFixed (y);
472	#endif
473		800
474	XRenderSetPictureFilter (dpy, src, "good", 0, 0);	801	XRenderSetPictureFilter (dpy, src, "good", 0, 0);
475	XRenderSetPictureTransform (dpy, src, &xfrm);	802	XRenderSetPictureTransform (dpy, src, &xfrm);
476	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);
477		804
478	XRenderFreePicture (dpy, src);	805	XRenderFreePicture (dpy, src);
479	XRenderFreePicture (dpy, dst);	806	XRenderFreePicture (dpy, dst);
480		807
481	return img;	808	return img;
…		…
485	rxvt_img::scale (int new_width, int new_height)	812	rxvt_img::scale (int new_width, int new_height)
486	{	813	{
487	if (w == new_width && h == new_height)	814	if (w == new_width && h == new_height)
488	return clone ();	815	return clone ();
489		816
490	double matrix[9] = {
491	w / (double)new_width, 0, 0,
492	0, h / (double)new_height, 0,
493	0, 0, 1
494	};
495
496	int old_repeat_mode = repeat;	817	int old_repeat_mode = repeat;
497	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
498		819
499	rxvt_img *img = transform (new_width, new_height, matrix);	820	rxvt_img *img = transform (mat3x3::scale (new_width / (nv)w, new_height / (nv)h));
500		821
501	repeat = old_repeat_mode;	822	repeat = old_repeat_mode;
502	img->repeat = repeat;	823	img->repeat = repeat;
503		824
504	return img;	825	return img;
505	}	826	}
506		827
507	rxvt_img *	828	rxvt_img *
508	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)
509	{	830	{
510	double s = sin (phi);	831	#if 0
511	double c = cos (phi);
512
513	double matrix[9] = {
514	c, -s, -c * x + s * y + x,	832	{ c, -s, cx - c * cx + s * cy },
515	s, c, -s * x - c * y + y,	833	{ s, c, cy - s * cx - c * cy },
516	0, 0, 1	834	{ 0, 0, 1 }
517	};	835	#endif
518		836
519	return transform (new_width, new_height, matrix);	837	move (-cx, -cy);
520	}	838	rxvt_img *img = transform (mat3x3::rotate (phi));
		839	move ( cx, cy);
		840	img->move (cx, cy);
521		841
		842	return img;
		843	}
		844
522	rxvt_img *	845	rxvt_img *
523	rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg)	846	rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg)
524	{	847	{
525	if (new_format == format)	848	if (new_format == format)
526	return clone ();	849	return clone ();
527		850
528	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);
529	img->alloc ();	852	img->alloc ();
530		853
531	Display *dpy = s->display->dpy;	854	Display *dpy = s->display->dpy;
532	Picture src = src_picture ();	855	Picture src = picture ();
533	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);	856	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
534	int op = PictOpSrc;	857	int op = PictOpSrc;
535		858
536	if (format->direct.alphaMask && !new_format->direct.alphaMask)	859	if (format->direct.alphaMask && !new_format->direct.alphaMask)
537	{	860	{
538	// does it have to be that complicated	861	// does it have to be that complicated
539	rgba c;
540	bg.get (c);
541
542	XRenderColor rc = { c.r, c.g, c.b, 0xffff };	862	XRenderColor rc = { bg.r, bg.g, bg.b, bg.a };
543	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);	863	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);
544		864
545	op = PictOpOver;	865	op = PictOpOver;
546	}	866	}
547		867
…		…
552		872
553	return img;	873	return img;
554	}	874	}
555		875
556	rxvt_img *	876	rxvt_img *
557	rxvt_img::blend (rxvt_img *img, double factor)	877	rxvt_img::blend (rxvt_img *img, nv factor)
558	{	878	{
559	rxvt_img *img2 = clone ();	879	rxvt_img *img2 = clone ();
560	Display *dpy = s->display->dpy;	880	Display *dpy = s->display->dpy;
561	Picture src = img->src_picture ();	881	Picture src = img->picture ();
562	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);	882	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
563	Picture mask = create_xrender_mask (dpy, img->pm, False);	883	Picture mask = create_xrender_mask (dpy, img->pm, False, False);
564		884
565	XRenderColor mask_c;	885	XRenderColor mask_c;
566		886
567	mask_c.alpha = float_to_component (factor);	887	mask_c.alpha = float_to_component (factor);
568	mask_c.red =	888	mask_c.red =

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.50 by root, Thu Jun 7 19:42:09 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.50 by root, Thu Jun 7 19:42:09 2012 UTC vs.
Revision 1.96 by root, Sat Jun 16 15:55:19 2012 UTC