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

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

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.68 by root, Sat Jun 9 11:14:35 2012 UTC vs. Revision 1.92 by root, Fri Jun 15 18:05:15 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.68 by root, Sat Jun 9 11:14:35 2012 UTC vs.
Revision 1.92 by root, Fri Jun 15 18:05:15 2012 UTC