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

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.47 by root, Thu Jun 7 19:06:26 2012 UTC vs.
Revision 1.94 by root, Fri Jun 15 18:10:40 2012 UTC

…		…
		1	#include <string.h>
1	#include <math.h>	2	#include <math.h>
2	#include "../config.h"	3	#include "../config.h"
3	#include "rxvt.h"	4	#include "rxvt.h"
4		5
5	#if HAVE_IMG	6	#if HAVE_IMG
6		7
		8	typedef rxvt_img::nv nv;
		9
		10	namespace
		11	{
		12
		13	struct mat3x3
		14	{
		15	nv v[3][3];
		16
		17	mat3x3 ()
		18	{
		19	}
		20
		21	mat3x3 (nv matrix[3][3])
		22	{
		23	memcpy (v, matrix, sizeof (v));
		24	}
		25
		26	mat3x3 (nv v11, nv v12, nv v13, nv v21, nv v22, nv v23, nv v31, nv v32, nv v33)
		27	{
		28	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;
		30	v[2][0] = v31; v[2][1] = v32; v[2][2] = v33;
		31	}
		32
		33	mat3x3 invert ();
		34
		35	nv *operator [](int i) { return &v[i][0]; }
		36	const nv *operator [](int i) const { return &v[i][0]; }
		37
		38	// quite inefficient, hopefully gcc pulls the w calc out of any loops
		39	nv apply1 (int i, nv x, nv y)
		40	{
		41	mat3x3 &m = *this;
		42
		43	nv v = m[i][0] * x + m[i][1] * y + m[i][2];
		44	nv w = m[2][0] * x + m[2][1] * y + m[2][2];
		45
		46	return v * (1. / w);
		47	}
		48
		49	static mat3x3 translate (nv x, nv y);
		50	};
		51
		52	mat3x3
		53	mat3x3::invert ()
		54	{
		55	mat3x3 &m = *this;
		56	mat3x3 inv;
		57
		58	nv s0 = m[2][2] * m[1][1] - m[2][1] * m[1][2];
		59	nv s1 = m[2][1] * m[0][2] - m[2][2] * m[0][1];
		60	nv s2 = m[1][2] * m[0][1] - m[1][1] * m[0][2];
		61
		62	nv invdet = 1. / (m[0][0] * s0 + m[1][0] * s1 + m[2][0] * s2);
		63
		64	inv[0][0] = invdet * s0;
		65	inv[0][1] = invdet * s1;
		66	inv[0][2] = invdet * s2;
		67
		68	inv[1][0] = invdet * (m[2][0] * m[1][2] - m[2][2] * m[1][0]);
		69	inv[1][1] = invdet * (m[2][2] * m[0][0] - m[2][0] * m[0][2]);
		70	inv[1][2] = invdet * (m[1][0] * m[0][2] - m[1][2] * m[0][0]);
		71
		72	inv[2][0] = invdet * (m[2][1] * m[1][0] - m[2][0] * m[1][1]);
		73	inv[2][1] = invdet * (m[2][0] * m[0][1] - m[2][1] * m[0][0]);
		74	inv[2][2] = invdet * (m[1][1] * m[0][0] - m[1][0] * m[0][1]);
		75
		76	return inv;
		77	}
		78
		79	static mat3x3
		80	operator *(const mat3x3 &a, const mat3x3 &b)
		81	{
		82	mat3x3 r;
		83
		84	for (int i = 0; i < 3; ++i)
		85	for (int j = 0; j < 3; ++j)
		86	r[i][j] = a[i][0] * b[0][j]
		87	+ a[i][1] * b[1][j]
		88	+ a[i][2] * b[2][j];
		89
		90	return r;
		91	}
		92
		93	mat3x3
		94	mat3x3::translate (nv x, nv y)
		95	{
		96	return mat3x3 (
		97	1, 0, x,
		98	0, 1, y,
		99	0, 0, 1
		100	);
		101	}
		102
		103	}
		104
		105	#if 0
		106	struct pict
		107	{
		108	Display *dpy;
		109	Picture pic;
		110
		111	operator Picture () const
		112	{
		113	return pic;
		114	}
		115
		116	pict ()
		117	: pic (0)
		118	{
		119	}
		120
		121	pict (rxvt_img img, XRenderPictFormat format = 0)
		122	: dpy (img->s->display->dpy)
		123	{
		124	XRenderPictureAttributes pa;
		125	pa.repeat = img->repeat;
		126	pic = XRenderCreatePicture (dpy, img->pm, format ? format : img->format, CPRepeat, &pa);
		127	}
		128
		129	~pict ()
		130	{
		131	if (pic)
		132	XRenderFreePicture (dpy, pic);
		133	}
		134	};
		135	#endif
		136
		137	static XRenderPictFormat *
		138	find_alpha_format_for (Display dpy, XRenderPictFormat format)
		139	{
		140	if (format->direct.alphaMask)
		141	return format; // already has alpha
		142
		143	// try to find a suitable alpha format, one bit alpha is enough for our purposes
		144	if (format->type == PictTypeDirect)
		145	for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
		146	if (f->direct.alphaMask
		147	&& f->type == PictTypeDirect
		148	&& ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
		149	&& ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
		150	&& ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
		151	return f;
		152
		153	// should be a very good fallback
		154	return XRenderFindStandardFormat (dpy, PictStandardARGB32);
		155	}
		156
7	rxvt_img::rxvt_img (rxvt_screen screen, XRenderPictFormat format, int x, int y, int width, int height, int repeat)	157	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),	158	: s(screen), x(x), y(y), w(width), h(height), format(format), repeat(repeat),
9	pm(0), ref(0)	159	pm(0), ref(0)
10	{	160	{
11	}	161	}
13	rxvt_img::rxvt_img (const rxvt_img &img)	163	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)	164	: 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	{	165	{
16	++ref->cnt;	166	++ref->cnt;
17	}	167	}
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		168
26	rxvt_img *	169	rxvt_img *
27	rxvt_img::new_from_root (rxvt_screen *s)	170	rxvt_img::new_from_root (rxvt_screen *s)
28	{	171	{
29	Display *dpy = s->display->dpy;	172	Display *dpy = s->display->dpy;
…		…
56	img->ref->ours = false;	199	img->ref->ours = false;
57		200
58	return img;	201	return img;
59	}	202	}
60		203
		204	# if HAVE_PIXBUF
		205
61	rxvt_img *	206	rxvt_img *
62	rxvt_img::new_from_pixbuf (rxvt_screen s, GdkPixbuf pb)	207	rxvt_img::new_from_pixbuf (rxvt_screen s, GdkPixbuf pb)
63	{	208	{
		209	Display *dpy = s->display->dpy;
		210
64	int width = gdk_pixbuf_get_width (pb);	211	int width = gdk_pixbuf_get_width (pb);
65	int height = gdk_pixbuf_get_height (pb);	212	int height = gdk_pixbuf_get_height (pb);
66		213
67	if (width > 32767 \|\| height > 32767) // well, we could upload in chunks	214	if (width > 32767 \|\| height > 32767) // well, we could upload in chunks
68	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big (maximum size 32768x32768).\n");	215	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big (maximum size 32768x32768).\n");
69		216
70	// since we require rgb24/argb32 formats from xrender we assume	217	// since we require rgb24/argb32 formats from xrender we assume
71	// that both 24 and 32 bpp MUST be supported by any screen that supports xrender	218	// that both 24 and 32 bpp MUST be supported by any screen that supports xrender
72	int depth = gdk_pixbuf_get_has_alpha (pb) ? 32 : 24;	219
		220	int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
73		221
74	XImage xi;	222	XImage xi;
75		223
76	xi.width = width;	224	xi.width = width;
77	xi.height = height;	225	xi.height = height;
78	xi.xoffset = 0;	226	xi.xoffset = 0;
79	xi.format = ZPixmap;	227	xi.format = ZPixmap;
80	xi.byte_order = MSBFirst; // maybe go for host byte order, because servers are usually local?	228	xi.byte_order = ImageByteOrder (dpy);
81	xi.bitmap_unit = 32;	229	xi.bitmap_unit = 0; //XY only, unused
82	xi.bitmap_bit_order = MSBFirst;	230	xi.bitmap_bit_order = 0; //XY only, unused
83	xi.bitmap_pad = 32;	231	xi.bitmap_pad = BitmapPad (dpy);
84	xi.depth = depth;	232	xi.depth = 32;
85	xi.bytes_per_line = 0;	233	xi.bytes_per_line = 0;
86	xi.bits_per_pixel = 32;	234	xi.bits_per_pixel = 32; //Z only
87	xi.red_mask = 0x00ff0000;	235	xi.red_mask = 0x00000000; //Z only, unused
88	xi.green_mask = 0x0000ff00;	236	xi.green_mask = 0x00000000; //Z only, unused
89	xi.blue_mask = 0x000000ff;	237	xi.blue_mask = 0x00000000; //Z only, unused
		238	xi.obdata = 0; // probably unused
		239
		240	bool byte_order_mismatch = byte_order != xi.byte_order;
90		241
91	if (!XInitImage (&xi))	242	if (!XInitImage (&xi))
92	rxvt_fatal ("unable to initialise ximage, please report.\n");	243	rxvt_fatal ("unable to initialise ximage, please report.\n");
93		244
94	if (height > INT_MAX / xi.bytes_per_line)	245	if (height > INT_MAX / xi.bytes_per_line)
95	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n");	246	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n");
96		247
97	xi.data = (char )rxvt_malloc (height xi.bytes_per_line);	248	xi.data = (char )rxvt_malloc (height xi.bytes_per_line);
98		249
99	int rowstride = gdk_pixbuf_get_rowstride (pb);	250	int rowstride = gdk_pixbuf_get_rowstride (pb);
100		251	bool pb_has_alpha = gdk_pixbuf_get_has_alpha (pb);
101	assert (3 + (depth == 32) == gdk_pixbuf_get_n_channels (pb));
102	unsigned char *row = gdk_pixbuf_get_pixels (pb);	252	unsigned char *row = gdk_pixbuf_get_pixels (pb);
		253
103	char *line = xi.data;	254	char *line = xi.data;
104		255
105	for (int y = 0; y < height; y++)	256	for (int y = 0; y < height; y++)
106	{	257	{
107	unsigned char r, g, b, a;
108	unsigned char *data = row;	258	unsigned char *src = row;
		259	uint32_t dst = (uint32_t )line;
109		260
110	if (depth == 24)	261	if (!pb_has_alpha)
111	for (int x = 0; x < width; x++)	262	for (int x = 0; x < width; x++)
112	{	263	{
113	r = *data++;	264	uint8_t r = *src++;
114	g = *data++;	265	uint8_t g = *src++;
115	b = *data++;	266	uint8_t b = *src++;
		267
		268	uint32_t v = (255 << 24) \| (r << 16) \| (g << 8) \| b;
		269
		270	if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
		271	v = ecb_bswap32 (v);
		272
116	*line++ = 0;	273	*dst++ = v;
117	*line++ = r;
118	*line++ = g;
119	*line++ = b;
120	}	274	}
121	else	275	else
122	for (int x = 0; x < width; x++)	276	for (int x = 0; x < width; x++)
123	{	277	{
124	r = *data++;	278	uint32_t v = (uint32_t )src; src += 4;
125	g = *data++;	279
126	b = *data++;	280	if (ecb_big_endian ())
127	a = *data++;	281	v = ecb_bswap32 (v);
		282
		283	v = ecb_rotl32 (v, 8); // abgr to bgra
		284
		285	if (!byte_order_mismatch)
		286	v = ecb_bswap32 (v);
		287
128	*line++ = a;	288	*dst++ = v;
129	*line++ = r;
130	*line++ = g;
131	*line++ = b;
132	}	289	}
133		290
134	row += rowstride;	291	row += rowstride;
		292	line += xi.bytes_per_line;
135	}	293	}
136		294
137	Display *dpy = s->display->dpy;
138
139	rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, depth == 24 ? PictStandardRGB24 : PictStandardARGB32), 0, 0, width, height);	295	rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, PictStandardARGB32), 0, 0, width, height);
140	img->alloc ();	296	img->alloc ();
141		297
142	GC gc = XCreateGC (dpy, img->pm, 0, 0);	298	GC gc = XCreateGC (dpy, img->pm, 0, 0);
143	XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height);	299	XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height);
144	XFreeGC (dpy, gc);	300	XFreeGC (dpy, gc);
…		…
162	g_object_unref (pb);	318	g_object_unref (pb);
163		319
164	return img;	320	return img;
165	}	321	}
166		322
		323	# endif
		324
167	void	325	void
168	rxvt_img::destroy ()	326	rxvt_img::destroy ()
169	{	327	{
170	if (--ref->cnt)	328	if (--ref->cnt)
171	return;	329	return;
…		…
187	pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);	345	pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);
188	ref = new pixref (w, h);	346	ref = new pixref (w, h);
189	}	347	}
190		348
191	Picture	349	Picture
192	rxvt_img::src_picture ()	350	rxvt_img::picture ()
193	{	351	{
194	Display *dpy = s->display->dpy;	352	Display *dpy = s->display->dpy;
195		353
196	XRenderPictureAttributes pa;	354	XRenderPictureAttributes pa;
197	pa.repeat = repeat;	355	pa.repeat = repeat;
…		…
204	rxvt_img::unshare ()	362	rxvt_img::unshare ()
205	{	363	{
206	if (ref->cnt == 1 && ref->ours)	364	if (ref->cnt == 1 && ref->ours)
207	return;	365	return;
208		366
209	//TODO: maybe should reify instead
210	Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth);	367	Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth);
211	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);	368	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
212	XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);	369	XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
213	XFreeGC (s->display->dpy, gc);	370	XFreeGC (s->display->dpy, gc);
214		371
…		…
217	pm = pm2;	374	pm = pm2;
218	ref = new pixref (ref->w, ref->h);	375	ref = new pixref (ref->w, ref->h);
219	}	376	}
220		377
221	void	378	void
222	rxvt_img::fill (const rxvt_color &c)	379	rxvt_img::fill (const rgba &c)
223	{	380	{
224	XGCValues gcv;	381	XRenderColor rc = { c.r, c.g, c.b, c.a };
225	gcv.foreground = c;	382
226	GC gc = XCreateGC (s->display->dpy, pm, GCForeground, &gcv);	383	Display *dpy = s->display->dpy;
227	XFillRectangle (s->display->dpy, pm, gc, 0, 0, w, h);	384	Picture src = picture ();
228	XFreeGC (s->display->dpy, gc);	385	XRenderFillRectangle (dpy, PictOpSrc, src, &rc, 0, 0, w, h);
		386	XRenderFreePicture (dpy, src);
		387	}
		388
		389	void
		390	rxvt_img::add_alpha ()
		391	{
		392	if (format->direct.alphaMask)
		393	return;
		394
		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);
		398	img->alloc ();
		399
		400	Picture src = picture ();
		401	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
		402
		403	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
		404
		405	XRenderFreePicture (dpy, src);
		406	XRenderFreePicture (dpy, dst);
		407
		408	::swap (img->ref, ref);
		409	::swap (img->pm , pm );
		410
		411	delete img;
229	}	412	}
230		413
231	static void	414	static void
232	get_gaussian_kernel (int radius, int width, double kernel, XFixed params)	415	get_gaussian_kernel (int radius, int width, nv kernel, XFixed params)
233	{	416	{
234	double sigma = radius / 2.0;	417	nv sigma = radius / 2.0;
235	double scale = sqrt (2.0 * M_PI) * sigma;	418	nv scale = sqrt (2.0 * M_PI) * sigma;
236	double sum = 0.0;	419	nv sum = 0.0;
237		420
238	for (int i = 0; i < width; i++)	421	for (int i = 0; i < width; i++)
239	{	422	{
240	double x = i - width / 2;	423	nv x = i - width / 2;
241	kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;	424	kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
242	sum += kernel[i];	425	sum += kernel[i];
243	}	426	}
244		427
245	params[0] = XDoubleToFixed (width);	428	params[0] = XDoubleToFixed (width);
…		…
255	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))	438	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))
256	return clone ();	439	return clone ();
257		440
258	Display *dpy = s->display->dpy;	441	Display *dpy = s->display->dpy;
259	int size = max (rh, rv) * 2 + 1;	442	int size = max (rh, rv) * 2 + 1;
260	double kernel = (double )malloc (size * sizeof (double));	443	nv kernel = (nv )malloc (size * sizeof (nv));
261	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));	444	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
262	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);	445	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
263	img->alloc ();	446	img->alloc ();
264		447
265	Picture src = src_picture ();
266
267	XRenderPictureAttributes pa;	448	XRenderPictureAttributes pa;
268	pa.repeat = RepeatPad;	449	pa.repeat = RepeatPad;
269	Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa);	450	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
		451	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
270		452
271	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);	453	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
272	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);	454	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
273	XFreePixmap (dpy, tmp_pm);	455	XFreePixmap (dpy, tmp_pm);
274		456
…		…
290		472
291	size = rv * 2 + 1;	473	size = rv * 2 + 1;
292	get_gaussian_kernel (rv, size, kernel, params);	474	get_gaussian_kernel (rv, size, kernel, params);
293	::swap (params[0], params[1]);	475	::swap (params[0], params[1]);
294		476
295	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);	477	XRenderSetPictureFilter (dpy, tmp, FilterConvolution, params, size+2);
296	XRenderComposite (dpy,	478	XRenderComposite (dpy,
297	PictOpSrc,	479	PictOpSrc,
298	tmp,	480	tmp,
299	None,	481	None,
300	dst,	482	dst,
…		…
304	w, h);	486	w, h);
305	}	487	}
306		488
307	free (kernel);	489	free (kernel);
308	free (params);	490	free (params);
		491
309	XRenderFreePicture (dpy, src);	492	XRenderFreePicture (dpy, src);
310	XRenderFreePicture (dpy, dst);	493	XRenderFreePicture (dpy, dst);
311	XRenderFreePicture (dpy, tmp);	494	XRenderFreePicture (dpy, tmp);
312		495
313	return img;	496	return img;
314	}	497	}
315		498
316	static Picture	499	static Picture
317	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb)	500	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha)
318	{	501	{
319	Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);	502	Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
320		503
321	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);	504	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
322	XRenderPictureAttributes pa;	505	XRenderPictureAttributes pa;
323	pa.repeat = True;	506	pa.repeat = RepeatNormal;
		507	pa.component_alpha = component_alpha;
324	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);	508	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat \| CPComponentAlpha, &pa);
325		509
326	XFreePixmap (dpy, pixmap);	510	XFreePixmap (dpy, pixmap);
327		511
328	return mask;	512	return mask;
329	}	513	}
330		514
		515	static void
		516	extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)
		517	{
		518	int32_t x = clamp (c, cl0, cl1);
		519	c -= x;
		520	xc = x;
		521	}
		522
		523	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)
		525	{
		526	extract (cl0, cl1, r, xr);
		527	extract (cl0, cl1, g, xg);
		528	extract (cl0, cl1, b, xb);
		529	extract (cl0, cl1, a, xa);
		530
		531	return xr \| xg \| xb \| xa;
		532	}
		533
331	void	534	void
332	rxvt_img::brightness (unsigned short r, unsigned short g, unsigned short b, unsigned short a)	535	rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a)
333	{	536	{
		537	unshare ();
		538
334	Display *dpy = s->display->dpy;	539	Display *dpy = s->display->dpy;
335	Picture src = create_xrender_mask (dpy, pm, True);
336	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	540	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
337		541
		542	// loop should not be needed for brightness, as only -1..1 makes sense
		543	//while (r \| g \| b \| a)
		544	{
		545	unsigned short xr, xg, xb, xa;
338	XRenderColor mask_c;	546	XRenderColor mask_c;
339	mask_c.red = r;	547
340	mask_c.green = g;	548	if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
341	mask_c.blue = b;	549	XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
342	mask_c.alpha = a;	550
		551	if (extract (-65535, 0, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
		552	{
		553	XRenderColor mask_w = { 65535, 65535, 65535, 65535 };
		554	XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
		555	mask_c.red = -mask_c.red; //TODO: verify that doing clamp, assign, and negation does the right thing
		556	mask_c.green = -mask_c.green;
		557	mask_c.blue = -mask_c.blue;
		558	mask_c.alpha = -mask_c.alpha;
		559	XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
		560	XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
		561	}
		562	}
		563
		564	XRenderFreePicture (dpy, dst);
		565	}
		566
		567	void
		568	rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
		569	{
		570	if (r < 0 \|\| g < 0 \|\| b < 0 \|\| a < 0)
		571	rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");
		572
		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)
		578	r = (r * (a >> 8)) >> 8;
		579	g = (g * (a >> 8)) >> 8;
		580	b = (b * (a >> 8)) >> 8;
		581
		582	Display *dpy = s->display->dpy;
		583
		584	Picture src = picture ();
		585	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
		586	Picture mul = create_xrender_mask (dpy, pm, True, True);
		587
		588	//TODO: this operator does not yet implement some useful contrast
		589	while (r \| g \| b \| a)
		590	{
		591	unsigned short xr, xg, xb, xa;
		592	XRenderColor mask_c;
		593
		594	if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
		595	{
		596	XRenderFillRectangle (dpy, PictOpSrc, mul, &mask_c, 0, 0, 1, 1);
		597	XRenderComposite (dpy, PictOpAdd, src, mul, dst, 0, 0, 0, 0, 0, 0, w, h);
		598	}
		599	}
		600
		601	XRenderFreePicture (dpy, mul);
		602	XRenderFreePicture (dpy, dst);
		603	XRenderFreePicture (dpy, src);
		604
		605	::swap (img->ref, ref);
		606	::swap (img->pm , pm );
		607
		608	delete img;
		609	}
		610
		611	void
		612	rxvt_img::draw (rxvt_img *img, int op, nv mask)
		613	{
		614	unshare ();
		615
		616	Display *dpy = s->display->dpy;
		617	Picture src = img->picture ();
		618	Picture dst = picture ();
		619	Picture mask_p = 0;
		620
		621	if (mask != 1.)
		622	{
		623	mask_p = create_xrender_mask (dpy, img->pm, False, False);
		624	XRenderColor mask_c = { 0, 0, 0, float_to_component (mask) };
343	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);	625	XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
		626	}
344		627
345	XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	628	XRenderComposite (dpy, op, src, mask_p, dst, x - img->x, y - img->y, 0, 0, 0, 0, w, h);
346		629
347	XRenderFreePicture (dpy, src);	630	XRenderFreePicture (dpy, src);
348	XRenderFreePicture (dpy, dst);	631	XRenderFreePicture (dpy, dst);
349	}
350		632
351	void	633	if (mask_p)
352	rxvt_img::contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a)
353	{
354	if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
355	return;
356
357	Display *dpy = s->display->dpy;
358	Picture src = create_xrender_mask (dpy, pm, True);
359	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
360
361	XRenderColor mask_c;
362	mask_c.red = r;
363	mask_c.green = g;
364	mask_c.blue = b;
365	mask_c.alpha = a;
366	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
367
368	XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
369
370	XRenderFreePicture (dpy, src);	634	XRenderFreePicture (dpy, mask_p);
371	XRenderFreePicture (dpy, dst);
372	}	635	}
373		636
374	rxvt_img *	637	rxvt_img *
375	rxvt_img::clone ()	638	rxvt_img::clone ()
376	{	639	{
377	return new rxvt_img (*this);	640	return new rxvt_img (*this);
378	}
379
380	static XRenderPictFormat *
381	find_alpha_format_for (Display dpy, XRenderPictFormat format)
382	{
383	if (format->direct.alphaMask)
384	return format; // already has alpha
385
386	// try to find a suitable alpha format, one bit alpha is enough for our purposes
387	if (format->type == PictTypeDirect)
388	for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
389	if (f->direct.alphaMask
390	&& f->type == PictTypeDirect
391	&& ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
392	&& ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
393	&& ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
394	return f;
395
396	// should be a very good fallback
397	return XRenderFindStandardFormat (dpy, PictStandardARGB32);
398	}	641	}
399		642
400	rxvt_img *	643	rxvt_img *
401	rxvt_img::reify ()	644	rxvt_img::reify ()
402	{	645	{
403	if (x == 0 && y == 0 && w == ref->w && h == ref->h)	646	if (x == 0 && y == 0 && w == ref->w && h == ref->h)
404	return clone ();	647	return clone ();
405		648
406	Display *dpy = s->display->dpy;	649	Display *dpy = s->display->dpy;
407		650
		651	// add an alpha channel if...
408	bool alpha = !format->direct.alphaMask	652	bool alpha = !format->direct.alphaMask // pixmap has none yet
409	&& (x \|\| y)	653	&& (x \|\| y) // we need one because of non-zero offset
410	&& repeat == RepeatNone;	654	&& repeat == RepeatNone; // and we have no good pixels to fill with
411		655
412	rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);	656	rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
413	img->alloc ();	657	img->alloc ();
414		658
415	Picture src = src_picture ();	659	Picture src = picture ();
416	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	660	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
417		661
418	if (alpha)	662	if (alpha)
419	{	663	{
420	XRenderColor rc = { 0, 0, 0, 0 };	664	XRenderColor rc = { 0, 0, 0, 0 };
421	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles	665	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
422	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h);	666	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, x, y, ref->w, ref->h);
423	}	667	}
424	else	668	else
425	XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);	669	XRenderComposite (dpy, PictOpSrc, src, None, dst, -x, -y, 0, 0, 0, 0, w, h);
426		670
427	XRenderFreePicture (dpy, src);	671	XRenderFreePicture (dpy, src);
428	XRenderFreePicture (dpy, dst);	672	XRenderFreePicture (dpy, dst);
429		673
430	return img;	674	return img;
…		…
433	rxvt_img *	677	rxvt_img *
434	rxvt_img::sub_rect (int x, int y, int width, int height)	678	rxvt_img::sub_rect (int x, int y, int width, int height)
435	{	679	{
436	rxvt_img *img = clone ();	680	rxvt_img *img = clone ();
437		681
438	img->x += x;	682	img->x -= x;
439	img->y += y;	683	img->y -= y;
440		684
441	if (w != width \|\| h != height)	685	if (w != width \|\| h != height)
442	{	686	{
443	img->w = width;	687	img->w = width;
444	img->h = height;	688	img->h = height;
…		…
450		694
451	return img;	695	return img;
452	}	696	}
453		697
454	rxvt_img *	698	rxvt_img *
455	rxvt_img::transform (int new_width, int new_height, double matrix[9])	699	rxvt_img::transform (nv matrix[3][3])
456	{	700	{
		701	// calculate new pixel bounding box coordinates
		702	nv r[2], rmin[2], rmax[2];
		703
		704	mat3x3 m (matrix);
		705
		706	for (int i = 0; i < 2; ++i)
		707	{
		708	nv v;
		709
		710	v = m.apply1 (i, 0+x, 0+y); rmin [i] = rmax [i] = v; r [i] = v;
		711	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);
		713	v = m.apply1 (i, w+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v);
		714	}
		715
		716	float sx = rmin [0] - x;
		717	float sy = rmin [1] - y;
		718
		719	// TODO: adjust matrix for subpixel accuracy
		720	int nx = floor (rmin [0]);
		721	int ny = floor (rmin [1]);
		722
		723	int new_width = ceil (rmax [0] - rmin [0]);
		724	int new_height = ceil (rmax [1] - rmin [1]);
		725
		726	m = mat3x3::translate (-x, -y) * m * mat3x3::translate (x, y);
		727
		728	mat3x3 inv = m.invert ();
		729
457	rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat);	730	rxvt_img *img = new rxvt_img (s, format, nx, ny, new_width, new_height, repeat);
458	img->alloc ();	731	img->alloc ();
459		732
460	Display *dpy = s->display->dpy;	733	Display *dpy = s->display->dpy;
461	Picture src = src_picture ();	734	Picture src = picture ();
462	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	735	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
463		736
464	XTransform xfrm;	737	XTransform xfrm;
465		738
466	for (int i = 0; i < 3; ++i)	739	for (int i = 0; i < 3; ++i)
467	for (int j = 0; j < 3; ++j)	740	for (int j = 0; j < 3; ++j)
468	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);	741	xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);
469
470	#if 0
471	xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
472	xfrm.matrix [1][2] -= XDoubleToFixed (y);
473	#endif
474		742
475	XRenderSetPictureFilter (dpy, src, "good", 0, 0);	743	XRenderSetPictureFilter (dpy, src, "good", 0, 0);
476	XRenderSetPictureTransform (dpy, src, &xfrm);	744	XRenderSetPictureTransform (dpy, src, &xfrm);
477	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);	745	XRenderComposite (dpy, PictOpSrc, src, None, dst, sx, sy, 0, 0, 0, 0, new_width, new_height);
478		746
479	XRenderFreePicture (dpy, src);	747	XRenderFreePicture (dpy, src);
480	XRenderFreePicture (dpy, dst);	748	XRenderFreePicture (dpy, dst);
481		749
482	return img;	750	return img;
…		…
486	rxvt_img::scale (int new_width, int new_height)	754	rxvt_img::scale (int new_width, int new_height)
487	{	755	{
488	if (w == new_width && h == new_height)	756	if (w == new_width && h == new_height)
489	return clone ();	757	return clone ();
490		758
491	double matrix[9] = {	759	nv matrix[3][3] = {
492	w / (double)new_width, 0, 0,	760	{ new_width / (nv)w, 0, 0 },
493	0, h / (double)new_height, 0,	761	{ 0, new_height / (nv)h, 0 },
494	0, 0, 1	762	{ 0, 0, 1 }
495	};	763	};
496		764
497	int old_repeat_mode = repeat;	765	int old_repeat_mode = repeat;
498	repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems	766	repeat = RepeatPad; // not right, but xrender can't properly scale it seems
499		767
500	rxvt_img *img = transform (new_width, new_height, matrix);	768	rxvt_img *img = transform (matrix);
501		769
502	repeat = old_repeat_mode;	770	repeat = old_repeat_mode;
503	img->repeat = repeat;	771	img->repeat = repeat;
504		772
505	return img;	773	return img;
506	}	774	}
507		775
508	rxvt_img *	776	rxvt_img *
509	rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)	777	rxvt_img::rotate (int cx, int cy, nv phi)
510	{	778	{
511	double s = sin (phi);	779	nv s = sin (phi);
512	double c = cos (phi);	780	nv c = cos (phi);
513		781
514	double matrix[9] = {	782	nv matrix[3][3] = {
		783	#if 0
515	c, -s, -c * x + s * y + x,	784	{ c, -s, cx - c * cx + s * cy },
516	s, c, -s * x - c * y + y,	785	{ s, c, cy - s * cx - c * cy },
517	0, 0, 1	786	{ 0, 0, 1 }
		787	#else
		788	{ c, -s, 0 },
		789	{ s, c, 0 },
		790	{ 0, 0, 1 }
		791	#endif
518	};	792	};
519		793
520	return transform (new_width, new_height, matrix);	794	move (-cx, -cy);
521	}	795	rxvt_img *img = transform (matrix);
		796	move ( cx, cy);
		797	img->move (cx, cy);
522		798
		799	return img;
		800	}
		801
523	rxvt_img *	802	rxvt_img *
524	rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg)	803	rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg)
525	{	804	{
526	if (new_format == format)	805	if (new_format == format)
527	return clone ();	806	return clone ();
528		807
529	rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);	808	rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);
530	img->alloc ();	809	img->alloc ();
531		810
532	Display *dpy = s->display->dpy;	811	Display *dpy = s->display->dpy;
533	Picture src = src_picture ();	812	Picture src = picture ();
534	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);	813	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
535	int op = PictOpSrc;	814	int op = PictOpSrc;
536		815
537	if (format->direct.alphaMask && !new_format->direct.alphaMask)	816	if (format->direct.alphaMask && !new_format->direct.alphaMask)
538	{	817	{
539	// does it have to be that complicated	818	// does it have to be that complicated
540	rgba c;
541	bg.get (c);
542
543	XRenderColor rc = { c.r, c.g, c.b, 0xffff };	819	XRenderColor rc = { bg.r, bg.g, bg.b, bg.a };
544	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);	820	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);
545		821
546	op = PictOpOver;	822	op = PictOpOver;
547	}	823	}
548		824
…		…
553		829
554	return img;	830	return img;
555	}	831	}
556		832
557	rxvt_img *	833	rxvt_img *
558	rxvt_img::blend (rxvt_img *img, double factor)	834	rxvt_img::blend (rxvt_img *img, nv factor)
559	{	835	{
560	rxvt_img *img2 = clone ();	836	rxvt_img *img2 = clone ();
561	Display *dpy = s->display->dpy;	837	Display *dpy = s->display->dpy;
562	Picture src = img->src_picture ();	838	Picture src = img->picture ();
563	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);	839	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
564	Picture mask = create_xrender_mask (dpy, img->pm, False);	840	Picture mask = create_xrender_mask (dpy, img->pm, False, False);
565		841
566	XRenderColor mask_c;	842	XRenderColor mask_c;
567		843
568	mask_c.alpha = float_to_component (factor);	844	mask_c.alpha = float_to_component (factor);
569	mask_c.red =	845	mask_c.red =

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.47 by root, Thu Jun 7 19:06:26 2012 UTC vs. Revision 1.94 by root, Fri Jun 15 18:10:40 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.47 by root, Thu Jun 7 19:06:26 2012 UTC vs.
Revision 1.94 by root, Fri Jun 15 18:10:40 2012 UTC