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

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.33 by root, Thu Jun 7 08:12:55 2012 UTC vs.
Revision 1.82 by root, Thu Jun 14 17:06:57 2012 UTC

…		…
2	#include "../config.h"	2	#include "../config.h"
3	#include "rxvt.h"	3	#include "rxvt.h"
4		4
5	#if HAVE_IMG	5	#if HAVE_IMG
6		6
7	rxvt_img::rxvt_img (rxvt_screen screen, XRenderPictFormat format, int x, int y, int width, int height)	7	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(RepeatNormal),	8	: s(screen), x(x), y(y), w(width), h(height), format(format), repeat(repeat),
9	pm(0), refcnt(0)	9	pm(0), ref(0)
10	{	10	{
11	}	11	}
12		12
13	rxvt_img::rxvt_img (const rxvt_img &img)	13	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), refcnt(img.refcnt)	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)
15	{	15	{
16	if (refcnt)
17	++*refcnt;	16	++ref->cnt;
18	}	17	}
19
20	#if 0
21	rxvt_img::rxvt_img (rxvt_screen screen, XRenderPictFormat format, int width, int height, Pixmap pixmap)
22	: s(screen), x(0), y(0), w(width), h(height), format(format), repeat(RepeatNormal), shared(false), pm(pixmap)
23	{
24	}
25	#endif
26		18
27	rxvt_img *	19	rxvt_img *
28	rxvt_img::new_from_root (rxvt_screen *s)	20	rxvt_img::new_from_root (rxvt_screen *s)
29	{	21	{
30	Display *dpy = s->display->dpy;	22	Display *dpy = s->display->dpy;
…		…
51	root_pm_w,	43	root_pm_w,
52	root_pm_h	44	root_pm_h
53	);	45	);
54		46
55	img->pm = root_pixmap;	47	img->pm = root_pixmap;
		48	img->ref = new pixref (root_pm_w, root_pm_h);
		49	img->ref->ours = false;
		50
		51	return img;
		52	}
		53
		54	# if HAVE_PIXBUF
		55
		56	rxvt_img *
		57	rxvt_img::new_from_pixbuf (rxvt_screen s, GdkPixbuf pb)
		58	{
		59	Display *dpy = s->display->dpy;
		60
		61	int width = gdk_pixbuf_get_width (pb);
		62	int height = gdk_pixbuf_get_height (pb);
		63
		64	if (width > 32767 \|\| height > 32767) // well, we could upload in chunks
		65	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big (maximum size 32768x32768).\n");
		66
		67	// since we require rgb24/argb32 formats from xrender we assume
		68	// that both 24 and 32 bpp MUST be supported by any screen that supports xrender
		69
		70	int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
		71
		72	XImage xi;
		73
		74	xi.width = width;
		75	xi.height = height;
		76	xi.xoffset = 0;
		77	xi.format = ZPixmap;
		78	xi.byte_order = ImageByteOrder (dpy);
		79	xi.bitmap_unit = 0; //XY only, unused
		80	xi.bitmap_bit_order = 0; //XY only, unused
		81	xi.bitmap_pad = BitmapPad (dpy);
		82	xi.depth = 32;
		83	xi.bytes_per_line = 0;
		84	xi.bits_per_pixel = 32; //Z only
		85	xi.red_mask = 0x00000000; //Z only, unused
		86	xi.green_mask = 0x00000000; //Z only, unused
		87	xi.blue_mask = 0x00000000; //Z only, unused
		88	xi.obdata = 0; // probably unused
		89
		90	bool byte_order_mismatch = byte_order != xi.byte_order;
		91
		92	if (!XInitImage (&xi))
		93	rxvt_fatal ("unable to initialise ximage, please report.\n");
		94
		95	if (height > INT_MAX / xi.bytes_per_line)
		96	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n");
		97
		98	xi.data = (char )rxvt_malloc (height xi.bytes_per_line);
		99
		100	int rowstride = gdk_pixbuf_get_rowstride (pb);
		101	bool pb_has_alpha = gdk_pixbuf_get_has_alpha (pb);
		102	unsigned char *row = gdk_pixbuf_get_pixels (pb);
		103
		104	char *line = xi.data;
		105
		106	for (int y = 0; y < height; y++)
		107	{
		108	unsigned char *src = row;
		109	uint32_t dst = (uint32_t )line;
		110
		111	if (!pb_has_alpha)
		112	for (int x = 0; x < width; x++)
		113	{
		114	uint8_t r = *src++;
		115	uint8_t g = *src++;
		116	uint8_t b = *src++;
		117
		118	uint32_t v = (255 << 24) \| (r << 16) \| (g << 8) \| b;
		119
		120	if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
		121	v = ecb_bswap32 (v);
		122
		123	*dst++ = v;
		124	}
		125	else
		126	for (int x = 0; x < width; x++)
		127	{
		128	uint32_t v = (uint32_t )src; src += 4;
		129
		130	if (ecb_big_endian ())
		131	v = ecb_bswap32 (v);
		132
		133	v = ecb_rotl32 (v, 8); // abgr to bgra
		134
		135	if (!byte_order_mismatch)
		136	v = ecb_bswap32 (v);
		137
		138	*dst++ = v;
		139	}
		140
		141	row += rowstride;
		142	line += xi.bytes_per_line;
		143	}
		144
		145	rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, PictStandardARGB32), 0, 0, width, height);
		146	img->alloc ();
		147
		148	GC gc = XCreateGC (dpy, img->pm, 0, 0);
		149	XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height);
		150	XFreeGC (dpy, gc);
		151
		152	free (xi.data);
56		153
57	return img;	154	return img;
58	}	155	}
59		156
60	rxvt_img *	157	rxvt_img *
…		…
64	GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);	161	GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);
65		162
66	if (!pb)	163	if (!pb)
67	rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);	164	rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);
68		165
69	rxvt_img *img = new rxvt_img (	166	rxvt_img *img = new_from_pixbuf (s, pb);
70	s,
71	XRenderFindStandardFormat (s->display->dpy, gdk_pixbuf_get_has_alpha (pb) ? PictStandardARGB32 : PictStandardRGB24),
72	0,
73	0,
74	gdk_pixbuf_get_width (pb),
75	gdk_pixbuf_get_height (pb)
76	);
77	img->alloc ();
78	img->render_pixbuf (pb, 0, 0, img->w, img->h, 0, 0);
79		167
80	g_object_unref (pb);	168	g_object_unref (pb);
81		169
82	return img;	170	return img;
83	}	171	}
		172
		173	# endif
84		174
85	void	175	void
86	rxvt_img::destroy ()	176	rxvt_img::destroy ()
87	{	177	{
88	if (!refcnt \|\| --*refcnt)	178	if (--ref->cnt)
89	return;	179	return;
90		180
91	if (pm)	181	if (pm && ref->ours)
92	XFreePixmap (s->display->dpy, pm);	182	XFreePixmap (s->display->dpy, pm);
93		183
94	delete refcnt;	184	delete ref;
95	}	185	}
96		186
97	rxvt_img::~rxvt_img ()	187	rxvt_img::~rxvt_img ()
98	{	188	{
99	destroy ();	189	destroy ();
…		…
101		191
102	void	192	void
103	rxvt_img::alloc ()	193	rxvt_img::alloc ()
104	{	194	{
105	pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);	195	pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);
106	refcnt = new int (1);	196	ref = new pixref (w, h);
		197	}
		198
		199	Picture
		200	rxvt_img::src_picture ()
		201	{
		202	Display *dpy = s->display->dpy;
		203
		204	XRenderPictureAttributes pa;
		205	pa.repeat = repeat;
		206	Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
		207
		208	return pic;
107	}	209	}
108		210
109	void	211	void
110	rxvt_img::unshare ()	212	rxvt_img::unshare ()
111	{	213	{
112	if (refcnt && *refcnt == 1)	214	if (ref->cnt == 1 && ref->ours)
113	return;	215	return;
114		216
115	Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);	217	Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth);
116	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);	218	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
117	XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, w, h, 0, 0);	219	XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
118	XFreeGC (s->display->dpy, gc);	220	XFreeGC (s->display->dpy, gc);
119		221
120	destroy ();	222	destroy ();
121		223
122	pm = pm2;	224	pm = pm2;
123	refcnt = new int (1);	225	ref = new pixref (ref->w, ref->h);
124	}	226	}
125		227
126	void	228	void
127	rxvt_img::fill (const rxvt_color &c)	229	rxvt_img::fill (const rgba &c)
128	{	230	{
129	XGCValues gcv;	231	XRenderColor rc = { c.r, c.g, c.b, c.a };
130	gcv.foreground = c;	232
131	GC gc = XCreateGC (s->display->dpy, pm, GCForeground, &gcv);	233	Display *dpy = s->display->dpy;
132	XFillRectangle (s->display->dpy, pm, gc, 0, 0, w, h);	234	Picture src = src_picture ();
133	XFreeGC (s->display->dpy, gc);	235	XRenderFillRectangle (dpy, PictOpSrc, src, &rc, 0, 0, w, h);
		236	XRenderFreePicture (dpy, src);
134	}	237	}
135		238
136	static void	239	static void
137	get_gaussian_kernel (int radius, int width, double kernel, XFixed params)	240	get_gaussian_kernel (int radius, int width, double kernel, XFixed params)
138	{	241	{
…		…
162		265
163	Display *dpy = s->display->dpy;	266	Display *dpy = s->display->dpy;
164	int size = max (rh, rv) * 2 + 1;	267	int size = max (rh, rv) * 2 + 1;
165	double kernel = (double )malloc (size * sizeof (double));	268	double kernel = (double )malloc (size * sizeof (double));
166	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));	269	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
167	rxvt_img *img = new rxvt_img (s, format, x, y, w, h);	270	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
168	img->alloc ();	271	img->alloc ();
169		272
170	XRenderPictureAttributes pa;	273	XRenderPictureAttributes pa;
171
172	pa.repeat = RepeatPad;	274	pa.repeat = RepeatPad;
173	Picture src = XRenderCreatePicture (dpy, pm , format, CPRepeat, &pa);	275	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
174	Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa);	276	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
175		277
176	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);	278	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
177	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);	279	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
178	XFreePixmap (dpy, tmp_pm);	280	XFreePixmap (dpy, tmp_pm);
179		281
…		…
195		297
196	size = rv * 2 + 1;	298	size = rv * 2 + 1;
197	get_gaussian_kernel (rv, size, kernel, params);	299	get_gaussian_kernel (rv, size, kernel, params);
198	::swap (params[0], params[1]);	300	::swap (params[0], params[1]);
199		301
200	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);	302	XRenderSetPictureFilter (dpy, tmp, FilterConvolution, params, size+2);
201	XRenderComposite (dpy,	303	XRenderComposite (dpy,
202	PictOpSrc,	304	PictOpSrc,
203	tmp,	305	tmp,
204	None,	306	None,
205	dst,	307	dst,
…		…
209	w, h);	311	w, h);
210	}	312	}
211		313
212	free (kernel);	314	free (kernel);
213	free (params);	315	free (params);
		316
214	XRenderFreePicture (dpy, src);	317	XRenderFreePicture (dpy, src);
215	XRenderFreePicture (dpy, dst);	318	XRenderFreePicture (dpy, dst);
216	XRenderFreePicture (dpy, tmp);	319	XRenderFreePicture (dpy, tmp);
217		320
218	return img;	321	return img;
219	}	322	}
220		323
221	static Picture	324	static Picture
222	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb)	325	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha)
223	{	326	{
224	Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);	327	Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
225		328
226	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);	329	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
227	XRenderPictureAttributes pa;	330	XRenderPictureAttributes pa;
228	pa.repeat = True;	331	pa.repeat = RepeatNormal;
		332	pa.component_alpha = component_alpha;
229	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);	333	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat \| CPComponentAlpha, &pa);
230		334
231	XFreePixmap (dpy, pixmap);	335	XFreePixmap (dpy, pixmap);
232		336
233	return mask;	337	return mask;
234	}	338	}
235		339
		340	static void
		341	extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)
		342	{
		343	int32_t x = clamp (c, cl0, cl1);
		344	c -= x;
		345	xc = x;
		346	}
		347
		348	static bool
		349	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)
		350	{
		351	extract (cl0, cl1, r, xr);
		352	extract (cl0, cl1, g, xg);
		353	extract (cl0, cl1, b, xb);
		354	extract (cl0, cl1, a, xa);
		355
		356	return xr \| xg \| xb \| xa;
		357	}
		358
236	void	359	void
237	rxvt_img::brightness (unsigned short r, unsigned short g, unsigned short b, unsigned short a)	360	rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a)
238	{	361	{
		362	unshare ();
		363
239	Display *dpy = s->display->dpy;	364	Display *dpy = s->display->dpy;
240	Picture src = create_xrender_mask (dpy, pm, True);
241	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	365	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
242		366
		367	// loop should not be needed for brightness, as only -1..1 makes sense
		368	//while (r \| g \| b \| a)
		369	{
		370	unsigned short xr, xg, xb, xa;
243	XRenderColor mask_c;	371	XRenderColor mask_c;
244	mask_c.red = r;	372
245	mask_c.green = g;	373	if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
246	mask_c.blue = b;	374	XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
247	mask_c.alpha = a;	375
		376	if (extract (-65535, 0, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
		377	{
		378	XRenderColor mask_w = { 65535, 65535, 65535, 65535 };
		379	XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
		380	mask_c.red = -mask_c.red; //TODO: verify that doing clamp, assign, and negation does the right thing
		381	mask_c.green = -mask_c.green;
		382	mask_c.blue = -mask_c.blue;
		383	mask_c.alpha = -mask_c.alpha;
		384	XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
		385	XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
		386	}
		387	}
		388
		389	XRenderFreePicture (dpy, dst);
		390	}
		391
		392	void
		393	rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
		394	{
		395	if (r < 0 \|\| g < 0 \|\| b < 0 \|\| a < 0)
		396	rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");
		397
		398	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
		399	img->alloc ();
		400	img->fill (rgba (0, 0, 0, 0));
		401
		402	// premultiply (yeah, these are not exact, sue me or fix it)
		403	r = (r * (a >> 8)) >> 8;
		404	g = (g * (a >> 8)) >> 8;
		405	b = (b * (a >> 8)) >> 8;
		406
		407	Display *dpy = s->display->dpy;
		408
		409	Picture src = src_picture ();
		410	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
		411	Picture mul = create_xrender_mask (dpy, pm, True, True);
		412
		413	//TODO: this operator does not yet implement some useful contrast
		414	while (r \| g \| b \| a)
		415	{
		416	unsigned short xr, xg, xb, xa;
		417	XRenderColor mask_c;
		418
		419	if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
		420	{
248	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);	421	XRenderFillRectangle (dpy, PictOpSrc, mul, &mask_c, 0, 0, 1, 1);
249
250	XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	422	XRenderComposite (dpy, PictOpAdd, src, mul, dst, 0, 0, 0, 0, 0, 0, w, h);
		423	}
		424	}
		425
		426	XRenderFreePicture (dpy, mul);
		427	XRenderFreePicture (dpy, dst);
		428	XRenderFreePicture (dpy, src);
		429
		430	::swap (img->ref, ref);
		431	::swap (img->pm , pm );
		432
		433	delete img;
		434	}
		435
		436	rxvt_img *
		437	rxvt_img::clone ()
		438	{
		439	return new rxvt_img (*this);
		440	}
		441
		442	static XRenderPictFormat *
		443	find_alpha_format_for (Display dpy, XRenderPictFormat format)
		444	{
		445	if (format->direct.alphaMask)
		446	return format; // already has alpha
		447
		448	// try to find a suitable alpha format, one bit alpha is enough for our purposes
		449	if (format->type == PictTypeDirect)
		450	for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
		451	if (f->direct.alphaMask
		452	&& f->type == PictTypeDirect
		453	&& ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
		454	&& ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
		455	&& ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
		456	return f;
		457
		458	// should be a very good fallback
		459	return XRenderFindStandardFormat (dpy, PictStandardARGB32);
		460	}
		461
		462	rxvt_img *
		463	rxvt_img::reify ()
		464	{
		465	if (x == 0 && y == 0 && w == ref->w && h == ref->h)
		466	return clone ();
		467
		468	Display *dpy = s->display->dpy;
		469
		470	// add an alpha channel if...
		471	bool alpha = !format->direct.alphaMask // pixmap has none yet
		472	&& (x \|\| y) // we need one because of non-zero offset
		473	&& repeat == RepeatNone; // and we have no good pixels to fill with
		474
		475	rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
		476	img->alloc ();
		477
		478	Picture src = src_picture ();
		479	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
		480
		481	if (alpha)
		482	{
		483	XRenderColor rc = { 0, 0, 0, 0 };
		484	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
		485	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h);
		486	}
		487	else
		488	XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);
251		489
252	XRenderFreePicture (dpy, src);	490	XRenderFreePicture (dpy, src);
253	XRenderFreePicture (dpy, dst);	491	XRenderFreePicture (dpy, dst);
254	}
255		492
256	void
257	rxvt_img::contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a)
258	{
259	if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
260	return;	493	return img;
		494	}
261		495
		496	rxvt_img *
		497	rxvt_img::sub_rect (int x, int y, int width, int height)
		498	{
		499	rxvt_img *img = clone ();
		500
		501	img->x += x;
		502	img->y += y;
		503
		504	if (w != width \|\| h != height)
		505	{
		506	img->w = width;
		507	img->h = height;
		508
		509	rxvt_img *img2 = img->reify ();
		510	delete img;
		511	img = img2;
		512	}
		513
		514	return img;
		515	}
		516
		517	static void
		518	mat_invert (double mat[3][3], double (&inv)[3][3])
		519	{
		520	double s0 = mat [2][2] * mat [1][1] - mat [2][1] * mat [1][2];
		521	double s1 = mat [2][1] * mat [0][2] - mat [2][2] * mat [0][1];
		522	double s2 = mat [1][2] * mat [0][1] - mat [1][1] * mat [0][2];
		523
		524	double invdet = 1. / (mat [0][0] * s0 + mat [1][0] * s1 + mat [2][0] * s2);
		525
		526	inv [0][0] = invdet * s0;
		527	inv [0][1] = invdet * s1;
		528	inv [0][2] = invdet * s2;
		529
		530	inv [1][0] = invdet * (mat [2][0] * mat [1][2] - mat [2][2] * mat [1][0]);
		531	inv [1][1] = invdet * (mat [2][2] * mat [0][0] - mat [2][0] * mat [0][2]);
		532	inv [1][2] = invdet * (mat [1][0] * mat [0][2] - mat [1][2] * mat [0][0]);
		533
		534	inv [2][0] = invdet * (mat [2][1] * mat [1][0] - mat [2][0] * mat [1][1]);
		535	inv [2][1] = invdet * (mat [2][0] * mat [0][1] - mat [2][1] * mat [0][0]);
		536	inv [2][2] = invdet * (mat [1][1] * mat [0][0] - mat [1][0] * mat [0][1]);
		537	}
		538
		539	static double
		540	mat_apply (double mat[3][3], int i, double x, double y)
		541	{
		542	double v = mat [i][0] * x + mat [i][1] * y + mat [i][2];
		543	double w = mat [2][0] * x + mat [2][1] * y + mat [2][2];
		544
		545	return v * (1. / w);
		546	}
		547
		548	rxvt_img *
		549	rxvt_img::transform (double matrix[3][3])
		550	{
		551	// find new offset
		552	int ox = mat_apply (matrix, 0, x, y);
		553	int oy = mat_apply (matrix, 1, x, y);
		554
		555	// calculate new pixel bounding box coordinates
		556	double d [2], rmin[2], rmax[2];
		557
		558	for (int i = 0; i < 2; ++i)
		559	{
		560	double v;
		561	v = mat_apply (matrix, i, 0, 0); rmin [i] = rmax [i] = v; d [i] = v;
		562	v = mat_apply (matrix, i, w, 0); min_it (rmin [i], v); max_it (rmax [i], v);
		563	v = mat_apply (matrix, i, 0, h); min_it (rmin [i], v); max_it (rmax [i], v);
		564	v = mat_apply (matrix, i, w, h); min_it (rmin [i], v); max_it (rmax [i], v);
		565	}
		566
		567	int dx = floor (rmin [0]);
		568	int dy = floor (rmin [1]);
		569
		570	int new_width = ceil (rmax [0] - dx);
		571	int new_height = ceil (rmax [1] - dy);
		572
		573	double inv[3][3];
		574	mat_invert (matrix, inv);
		575
		576	rxvt_img *img = new rxvt_img (s, format, ox - dx - d [0], oy - dy - d [1], new_width, new_height, repeat);
		577	img->alloc ();
		578
262	Display *dpy = s->display->dpy;	579	Display *dpy = s->display->dpy;
263	Picture src = create_xrender_mask (dpy, pm, True);	580	Picture src = src_picture ();
264	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	581	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
265		582
266	XRenderColor mask_c;	583	XTransform xfrm;
267	mask_c.red = r;
268	mask_c.green = g;
269	mask_c.blue = b;
270	mask_c.alpha = a;
271	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
272		584
		585	for (int i = 0; i < 3; ++i)
		586	for (int j = 0; j < 3; ++j)
		587	xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);
		588
		589	XRenderSetPictureFilter (dpy, src, "good", 0, 0);
		590	XRenderSetPictureTransform (dpy, src, &xfrm);
273	XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	591	XRenderComposite (dpy, PictOpSrc, src, None, dst, dx, dy, 0, 0, 0, 0, new_width, new_height);
274		592
275	XRenderFreePicture (dpy, src);	593	XRenderFreePicture (dpy, src);
276	XRenderFreePicture (dpy, dst);	594	XRenderFreePicture (dpy, dst);
277	}
278		595
279	bool	596	return img;
280	rxvt_img::render_pixbuf (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y)	597	}
281	{
282	Display *dpy = s->display->dpy;
283		598
284	if (s->visual->c_class != TrueColor)	599	rxvt_img *
		600	rxvt_img::scale (int new_width, int new_height)
		601	{
		602	if (w == new_width && h == new_height)
285	return false;	603	return clone ();
286		604
287	uint32_t red_mask, green_mask, blue_mask, alpha_mask;	605	double matrix[3][3] = {
		606	{ new_width / (double)w, 0, 0 },
		607	{ 0, new_height / (double)h, 0 },
		608	{ 0, 0, 1 }
		609	};
288		610
289	red_mask = (uint32_t)format->direct.redMask << format->direct.red;	611	int old_repeat_mode = repeat;
290	green_mask = (uint32_t)format->direct.greenMask << format->direct.green;	612	repeat = RepeatPad; // not right, but xrender can't properly scale it seems
291	blue_mask = (uint32_t)format->direct.blueMask << format->direct.blue;
292	alpha_mask = (uint32_t)format->direct.alphaMask << format->direct.alpha;
293		613
294	int width_r = ecb_popcount32 (red_mask);	614	rxvt_img *img = transform (matrix);
295	int width_g = ecb_popcount32 (green_mask);
296	int width_b = ecb_popcount32 (blue_mask);
297	int width_a = ecb_popcount32 (alpha_mask);
298		615
299	if (width_r > 8 \|\| width_g > 8 \|\| width_b > 8 \|\| width_a > 8)	616	repeat = old_repeat_mode;
		617	img->repeat = repeat;
		618
		619	return img;
		620	}
		621
		622	rxvt_img *
		623	rxvt_img::rotate (int cx, int cy, double phi)
		624	{
		625	double s = sin (phi);
		626	double c = cos (phi);
		627
		628	double matrix[3][3] = {
		629	{ c, -s, cx - c * cx + s * cy },
		630	{ s, c, cy - s * cx - c * cy },
		631	{ 0, 0, 1 }
		632	//{ c, -s, 0 },
		633	//{ s, c, 0 },
		634	//{ 0, 0, 1 }
		635	};
		636
		637	//move (-cx, -cy);
		638	rxvt_img *img = transform (matrix);
		639	//move ( cx, cy);
		640	//img->move (cx, cy);
		641
		642	return img;
		643	}
		644
		645	rxvt_img *
		646	rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg)
		647	{
		648	if (new_format == format)
300	return false;	649	return clone ();
301		650
302	int sh_r = ecb_ctz32 (red_mask);
303	int sh_g = ecb_ctz32 (green_mask);
304	int sh_b = ecb_ctz32 (blue_mask);
305	int sh_a = ecb_ctz32 (alpha_mask);
306
307	if (width > 32767 \|\| height > 32767)
308	return false;
309
310	XImage *ximage = XCreateImage (dpy, s->visual, format->depth, ZPixmap, 0, 0,
311	width, height, 32, 0);
312	if (!ximage)
313	return false;
314
315	if (height > INT_MAX / ximage->bytes_per_line
316	\|\| !(ximage->data = (char )malloc (height ximage->bytes_per_line)))
317	{
318	XDestroyImage (ximage);
319	return false;
320	}
321
322	GC gc = XCreateGC (dpy, pm, 0, 0);
323
324	ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
325
326	int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
327	int channels = gdk_pixbuf_get_n_channels (pixbuf);
328	unsigned char row = gdk_pixbuf_get_pixels (pixbuf) + src_y rowstride + src_x * channels;
329	char *line = ximage->data;
330
331	for (int y = 0; y < height; y++)
332	{
333	for (int x = 0; x < width; x++)
334	{
335	unsigned char pixel = row + x channels;
336	uint32_t value;
337	unsigned char r, g, b, a;
338
339	if (channels == 4)
340	{
341	a = pixel[3];
342	r = pixel[0] * a / 0xff;
343	g = pixel[1] * a / 0xff;
344	b = pixel[2] * a / 0xff;
345	}
346	else
347	{
348	a = 0xff;
349	r = pixel[0];
350	g = pixel[1];
351	b = pixel[2];
352	}
353
354	value = ((r >> (8 - width_r)) << sh_r)
355	\| ((g >> (8 - width_g)) << sh_g)
356	\| ((b >> (8 - width_b)) << sh_b)
357	\| ((a >> (8 - width_a)) << sh_a);
358
359	if (ximage->bits_per_pixel == 32)
360	((uint32_t *)line)[x] = value;
361	else
362	XPutPixel (ximage, x, y, value);
363	}
364
365	row += rowstride;
366	line += ximage->bytes_per_line;
367	}
368
369	XPutImage (dpy, pm, gc, ximage, 0, 0, dst_x, dst_y, width, height);
370	XDestroyImage (ximage);
371	XFreeGC (dpy, gc);
372
373	return true;
374	}
375
376	rxvt_img *
377	rxvt_img::clone ()
378	{
379	return new rxvt_img (*this);
380	}
381
382	rxvt_img *
383	rxvt_img::reify ()
384	{
385	rxvt_img *img = new rxvt_img (s, format, 0, 0, w, h);	651	rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);
386	img->alloc ();	652	img->alloc ();
387		653
388	// todo, if x==0 and y==0 and w==real width we could clone
389	// but that involves an rtt to find pixmap width.
390
391	Display *dpy = s->display->dpy;	654	Display *dpy = s->display->dpy;
392	XRenderPictureAttributes pa;	655	Picture src = src_picture ();
393	pa.repeat = repeat;
394	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
395	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	656	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
396		657	int op = PictOpSrc;
		658
		659	if (format->direct.alphaMask && !new_format->direct.alphaMask)
		660	{
		661	// does it have to be that complicated
		662	XRenderColor rc = { bg.r, bg.g, bg.b, bg.a };
		663	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);
		664
		665	op = PictOpOver;
		666	}
		667
397	XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);	668	XRenderComposite (dpy, op, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
398		669
399	XRenderFreePicture (dpy, src);	670	XRenderFreePicture (dpy, src);
400	XRenderFreePicture (dpy, dst);	671	XRenderFreePicture (dpy, dst);
401		672
402	return img;	673	return img;
403	}	674	}
404		675
405	rxvt_img *	676	rxvt_img *
406	rxvt_img::sub_rect (int x, int y, int width, int height)
407	{
408	rxvt_img *img = clone ();
409
410	img->x += x;
411	img->y += y;
412	img->w = width;
413	img->h = height;
414
415	return img;
416	}
417
418	rxvt_img *
419	rxvt_img::transform (int new_width, int new_height, double matrix[9])
420	{
421	rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height);
422	img->alloc ();
423
424	Display *dpy = s->display->dpy;
425	XRenderPictureAttributes pa;
426	pa.repeat = repeat;
427	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
428	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
429
430	XTransform xfrm;
431
432	for (int i = 0; i < 3; ++i)
433	for (int j = 0; j < 3; ++j)
434	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
435
436	xfrm.matrix [0][2] += XDoubleToFixed (x);//TODO
437	xfrm.matrix [0][3] += XDoubleToFixed (y);
438
439	XRenderSetPictureFilter (dpy, src, "good", 0, 0);
440	XRenderSetPictureTransform (dpy, src, &xfrm);
441	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
442
443	XRenderFreePicture (dpy, src);
444	XRenderFreePicture (dpy, dst);
445
446	return img;
447	}
448
449	rxvt_img *
450	rxvt_img::scale (int new_width, int new_height)
451	{
452	double matrix[9] = {
453	w / (double)new_width, 0, 0,
454	0, h / (double)new_height, 0,
455	0, 0, 1
456	};
457
458	return transform (new_width, new_height, matrix);
459	}
460
461	rxvt_img *
462	rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)
463	{
464	double s = sin (phi);
465	double c = cos (phi);
466
467	double matrix[9] = {
468	c, -s, -c * x + s * y + x,
469	s, c, -s * x - c * y + y,
470	0, 0, 1
471	};
472
473	return transform (new_width, new_height, matrix);
474	}
475
476	rxvt_img *
477	rxvt_img::convert_to (XRenderPictFormat *new_format, const rxvt_color &bg)
478	{
479	if (new_format == format)
480	return clone ();
481
482	rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h);
483	img->alloc ();
484
485	Display *dpy = s->display->dpy;
486	Picture src = XRenderCreatePicture (dpy, pm, format, 0, 0);
487	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
488	int op = PictOpSrc;
489
490	if (format->direct.alphaMask && !new_format->direct.alphaMask)
491	{
492	// does it have to be that complicated
493	rgba c;
494	bg.get (c);
495
496	XRenderColor rc = { c.r, c.g, c.b, 0xffff };
497	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);
498
499	op = PictOpOver;
500	}
501
502	XRenderComposite (dpy, op, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
503
504	XRenderFreePicture (dpy, src);
505	XRenderFreePicture (dpy, dst);
506
507	return img;
508	}
509
510	rxvt_img *
511	rxvt_img::blend (rxvt_img *img, double factor)	677	rxvt_img::blend (rxvt_img *img, double factor)
512	{	678	{
513	rxvt_img *img2 = clone ();	679	rxvt_img *img2 = clone ();
514	Display *dpy = s->display->dpy;	680	Display *dpy = s->display->dpy;
515	Picture src = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	681	Picture src = img->src_picture ();
516	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);	682	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
517	Picture mask = create_xrender_mask (dpy, img->pm, False);	683	Picture mask = create_xrender_mask (dpy, img->pm, False, False);
518		684
519	XRenderColor mask_c;	685	XRenderColor mask_c;
520		686
521	mask_c.alpha = float_to_component (factor);	687	mask_c.alpha = float_to_component (factor);
522	mask_c.red =	688	mask_c.red =

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.33 by root, Thu Jun 7 08:12:55 2012 UTC vs. Revision 1.82 by root, Thu Jun 14 17:06:57 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.33 by root, Thu Jun 7 08:12:55 2012 UTC vs.
Revision 1.82 by root, Thu Jun 14 17:06:57 2012 UTC