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

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.37 by root, Thu Jun 7 09:25:23 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), ref(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), ref(img.ref)	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	++ref->cnt;	16	++ref->cnt;
17	}	17	}
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		18
26	rxvt_img *	19	rxvt_img *
27	rxvt_img::new_from_root (rxvt_screen *s)	20	rxvt_img::new_from_root (rxvt_screen *s)
28	{	21	{
29	Display *dpy = s->display->dpy;	22	Display *dpy = s->display->dpy;
…		…
56	img->ref->ours = false;	49	img->ref->ours = false;
57		50
58	return img;	51	return img;
59	}	52	}
60		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);
		153
		154	return img;
		155	}
		156
61	rxvt_img *	157	rxvt_img *
62	rxvt_img::new_from_file (rxvt_screen s, const char filename)	158	rxvt_img::new_from_file (rxvt_screen s, const char filename)
63	{	159	{
64	GError *err = 0;	160	GError *err = 0;
65	GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);	161	GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);
66		162
67	if (!pb)	163	if (!pb)
68	rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);	164	rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);
69		165
70	rxvt_img *img = new rxvt_img (	166	rxvt_img *img = new_from_pixbuf (s, pb);
71	s,
72	XRenderFindStandardFormat (s->display->dpy, gdk_pixbuf_get_has_alpha (pb) ? PictStandardARGB32 : PictStandardRGB24),
73	0,
74	0,
75	gdk_pixbuf_get_width (pb),
76	gdk_pixbuf_get_height (pb)
77	);
78	img->alloc ();
79	img->render_pixbuf (pb, 0, 0, img->w, img->h, 0, 0);
80		167
81	g_object_unref (pb);	168	g_object_unref (pb);
82		169
83	return img;	170	return img;
84	}	171	}
		172
		173	# endif
85		174
86	void	175	void
87	rxvt_img::destroy ()	176	rxvt_img::destroy ()
88	{	177	{
89	if (--ref->cnt)	178	if (--ref->cnt)
…		…
123	rxvt_img::unshare ()	212	rxvt_img::unshare ()
124	{	213	{
125	if (ref->cnt == 1 && ref->ours)	214	if (ref->cnt == 1 && ref->ours)
126	return;	215	return;
127		216
128	//TODO: maybe should reify instead
129	Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth);	217	Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth);
130	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);	218	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
131	XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);	219	XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
132	XFreeGC (s->display->dpy, gc);	220	XFreeGC (s->display->dpy, gc);
133		221
…		…
136	pm = pm2;	224	pm = pm2;
137	ref = new pixref (ref->w, ref->h);	225	ref = new pixref (ref->w, ref->h);
138	}	226	}
139		227
140	void	228	void
141	rxvt_img::fill (const rxvt_color &c)	229	rxvt_img::fill (const rgba &c)
142	{	230	{
143	XGCValues gcv;	231	XRenderColor rc = { c.r, c.g, c.b, c.a };
144	gcv.foreground = c;	232
145	GC gc = XCreateGC (s->display->dpy, pm, GCForeground, &gcv);	233	Display *dpy = s->display->dpy;
146	XFillRectangle (s->display->dpy, pm, gc, 0, 0, w, h);	234	Picture src = src_picture ();
147	XFreeGC (s->display->dpy, gc);	235	XRenderFillRectangle (dpy, PictOpSrc, src, &rc, 0, 0, w, h);
		236	XRenderFreePicture (dpy, src);
148	}	237	}
149		238
150	static void	239	static void
151	get_gaussian_kernel (int radius, int width, double kernel, XFixed params)	240	get_gaussian_kernel (int radius, int width, double kernel, XFixed params)
152	{	241	{
…		…
176		265
177	Display *dpy = s->display->dpy;	266	Display *dpy = s->display->dpy;
178	int size = max (rh, rv) * 2 + 1;	267	int size = max (rh, rv) * 2 + 1;
179	double kernel = (double )malloc (size * sizeof (double));	268	double kernel = (double )malloc (size * sizeof (double));
180	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));	269	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
181	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);
182	img->alloc ();	271	img->alloc ();
183
184	Picture src = src_picture ();
185		272
186	XRenderPictureAttributes pa;	273	XRenderPictureAttributes pa;
187	pa.repeat = RepeatPad;	274	pa.repeat = RepeatPad;
188	Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa);	275	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
		276	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
189		277
190	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);	278	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
191	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);	279	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
192	XFreePixmap (dpy, tmp_pm);	280	XFreePixmap (dpy, tmp_pm);
193		281
…		…
209		297
210	size = rv * 2 + 1;	298	size = rv * 2 + 1;
211	get_gaussian_kernel (rv, size, kernel, params);	299	get_gaussian_kernel (rv, size, kernel, params);
212	::swap (params[0], params[1]);	300	::swap (params[0], params[1]);
213		301
214	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);	302	XRenderSetPictureFilter (dpy, tmp, FilterConvolution, params, size+2);
215	XRenderComposite (dpy,	303	XRenderComposite (dpy,
216	PictOpSrc,	304	PictOpSrc,
217	tmp,	305	tmp,
218	None,	306	None,
219	dst,	307	dst,
…		…
223	w, h);	311	w, h);
224	}	312	}
225		313
226	free (kernel);	314	free (kernel);
227	free (params);	315	free (params);
		316
228	XRenderFreePicture (dpy, src);	317	XRenderFreePicture (dpy, src);
229	XRenderFreePicture (dpy, dst);	318	XRenderFreePicture (dpy, dst);
230	XRenderFreePicture (dpy, tmp);	319	XRenderFreePicture (dpy, tmp);
231		320
232	return img;	321	return img;
233	}	322	}
234		323
235	static Picture	324	static Picture
236	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb)	325	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha)
237	{	326	{
238	Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);	327	Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
239		328
240	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);	329	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
241	XRenderPictureAttributes pa;	330	XRenderPictureAttributes pa;
242	pa.repeat = True;	331	pa.repeat = RepeatNormal;
		332	pa.component_alpha = component_alpha;
243	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);	333	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat \| CPComponentAlpha, &pa);
244		334
245	XFreePixmap (dpy, pixmap);	335	XFreePixmap (dpy, pixmap);
246		336
247	return mask;	337	return mask;
248	}	338	}
249		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
250	void	359	void
251	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)
252	{	361	{
		362	unshare ();
		363
253	Display *dpy = s->display->dpy;	364	Display *dpy = s->display->dpy;
254	Picture src = create_xrender_mask (dpy, pm, True);
255	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	365	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
256		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;
257	XRenderColor mask_c;	371	XRenderColor mask_c;
258	mask_c.red = r;	372
259	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))
260	mask_c.blue = b;	374	XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
261	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	{
262	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);	421	XRenderFillRectangle (dpy, PictOpSrc, mul, &mask_c, 0, 0, 1, 1);
263
264	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	}
265		425
		426	XRenderFreePicture (dpy, mul);
		427	XRenderFreePicture (dpy, dst);
266	XRenderFreePicture (dpy, src);	428	XRenderFreePicture (dpy, src);
267	XRenderFreePicture (dpy, dst);
268	}
269		429
270	void	430	::swap (img->ref, ref);
271	rxvt_img::contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a)	431	::swap (img->pm , pm );
272	{
273	if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
274	return;
275		432
276	Display *dpy = s->display->dpy;	433	delete img;
277	Picture src = create_xrender_mask (dpy, pm, True);
278	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
279
280	XRenderColor mask_c;
281	mask_c.red = r;
282	mask_c.green = g;
283	mask_c.blue = b;
284	mask_c.alpha = a;
285	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
286
287	XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
288
289	XRenderFreePicture (dpy, src);
290	XRenderFreePicture (dpy, dst);
291	}
292
293	bool
294	rxvt_img::render_pixbuf (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y)
295	{
296	Display *dpy = s->display->dpy;
297
298	if (s->visual->c_class != TrueColor)
299	return false;
300
301	uint32_t red_mask, green_mask, blue_mask, alpha_mask;
302
303	red_mask = (uint32_t)format->direct.redMask << format->direct.red;
304	green_mask = (uint32_t)format->direct.greenMask << format->direct.green;
305	blue_mask = (uint32_t)format->direct.blueMask << format->direct.blue;
306	alpha_mask = (uint32_t)format->direct.alphaMask << format->direct.alpha;
307
308	int width_r = ecb_popcount32 (red_mask);
309	int width_g = ecb_popcount32 (green_mask);
310	int width_b = ecb_popcount32 (blue_mask);
311	int width_a = ecb_popcount32 (alpha_mask);
312
313	if (width_r > 8 \|\| width_g > 8 \|\| width_b > 8 \|\| width_a > 8)
314	return false;
315
316	int sh_r = ecb_ctz32 (red_mask);
317	int sh_g = ecb_ctz32 (green_mask);
318	int sh_b = ecb_ctz32 (blue_mask);
319	int sh_a = ecb_ctz32 (alpha_mask);
320
321	if (width > 32767 \|\| height > 32767)
322	return false;
323
324	XImage *ximage = XCreateImage (dpy, s->visual, format->depth, ZPixmap, 0, 0,
325	width, height, 32, 0);
326	if (!ximage)
327	return false;
328
329	if (height > INT_MAX / ximage->bytes_per_line
330	\|\| !(ximage->data = (char )malloc (height ximage->bytes_per_line)))
331	{
332	XDestroyImage (ximage);
333	return false;
334	}
335
336	GC gc = XCreateGC (dpy, pm, 0, 0);
337
338	ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
339
340	int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
341	int channels = gdk_pixbuf_get_n_channels (pixbuf);
342	unsigned char row = gdk_pixbuf_get_pixels (pixbuf) + src_y rowstride + src_x * channels;
343	char *line = ximage->data;
344
345	for (int y = 0; y < height; y++)
346	{
347	for (int x = 0; x < width; x++)
348	{
349	unsigned char pixel = row + x channels;
350	uint32_t value;
351	unsigned char r, g, b, a;
352
353	if (channels == 4)
354	{
355	a = pixel[3];
356	r = pixel[0] * a / 0xff;
357	g = pixel[1] * a / 0xff;
358	b = pixel[2] * a / 0xff;
359	}
360	else
361	{
362	a = 0xff;
363	r = pixel[0];
364	g = pixel[1];
365	b = pixel[2];
366	}
367
368	value = ((r >> (8 - width_r)) << sh_r)
369	\| ((g >> (8 - width_g)) << sh_g)
370	\| ((b >> (8 - width_b)) << sh_b)
371	\| ((a >> (8 - width_a)) << sh_a);
372
373	if (ximage->bits_per_pixel == 32)
374	((uint32_t *)line)[x] = value;
375	else
376	XPutPixel (ximage, x, y, value);
377	}
378
379	row += rowstride;
380	line += ximage->bytes_per_line;
381	}
382
383	XPutImage (dpy, pm, gc, ximage, 0, 0, dst_x, dst_y, width, height);
384	XDestroyImage (ximage);
385	XFreeGC (dpy, gc);
386
387	return true;
388	}	434	}
389		435
390	rxvt_img *	436	rxvt_img *
391	rxvt_img::clone ()	437	rxvt_img::clone ()
392	{	438	{
393	return new rxvt_img (*this);	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);
394	}	460	}
395		461
396	rxvt_img *	462	rxvt_img *
397	rxvt_img::reify ()	463	rxvt_img::reify ()
398	{	464	{
399	if (x == 0 && y == 0 && w == ref->w && h == ref->h)	465	if (x == 0 && y == 0 && w == ref->w && h == ref->h)
400	return clone ();	466	return clone ();
401		467
402	rxvt_img *img = new rxvt_img (s, format, 0, 0, w, h);	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);
403	img->alloc ();	476	img->alloc ();
404
405	Display *dpy = s->display->dpy;
406		477
407	Picture src = src_picture ();	478	Picture src = src_picture ();
408	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	479	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
409		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
410	XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);	488	XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);
411		489
412	XRenderFreePicture (dpy, src);	490	XRenderFreePicture (dpy, src);
413	XRenderFreePicture (dpy, dst);	491	XRenderFreePicture (dpy, dst);
414		492
415	return img;	493	return img;
416	}	494	}
…		…
426	if (w != width \|\| h != height)	504	if (w != width \|\| h != height)
427	{	505	{
428	img->w = width;	506	img->w = width;
429	img->h = height;	507	img->h = height;
430		508
431	img->reify ();	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)
432	}	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	}
433		566
434	return img;	567	int dx = floor (rmin [0]);
435	}	568	int dy = floor (rmin [1]);
436		569
437	rxvt_img *	570	int new_width = ceil (rmax [0] - dx);
438	rxvt_img::transform (int new_width, int new_height, double matrix[9])	571	int new_height = ceil (rmax [1] - dy);
439	{	572
		573	double inv[3][3];
		574	mat_invert (matrix, inv);
		575
440	rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height);	576	rxvt_img *img = new rxvt_img (s, format, ox - dx - d [0], oy - dy - d [1], new_width, new_height, repeat);
441	img->alloc ();	577	img->alloc ();
442		578
443	Display *dpy = s->display->dpy;	579	Display *dpy = s->display->dpy;
444	Picture src = src_picture ();	580	Picture src = src_picture ();
445	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	581	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
446		582
447	XTransform xfrm;	583	XTransform xfrm;
448		584
449	for (int i = 0; i < 3; ++i)	585	for (int i = 0; i < 3; ++i)
450	for (int j = 0; j < 3; ++j)	586	for (int j = 0; j < 3; ++j)
451	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);	587	xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);
452
453	xfrm.matrix [0][2] += XDoubleToFixed (x);//TODO
454	xfrm.matrix [0][3] += XDoubleToFixed (y);
455		588
456	XRenderSetPictureFilter (dpy, src, "good", 0, 0);	589	XRenderSetPictureFilter (dpy, src, "good", 0, 0);
457	XRenderSetPictureTransform (dpy, src, &xfrm);	590	XRenderSetPictureTransform (dpy, src, &xfrm);
458	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);	591	XRenderComposite (dpy, PictOpSrc, src, None, dst, dx, dy, 0, 0, 0, 0, new_width, new_height);
459		592
460	XRenderFreePicture (dpy, src);	593	XRenderFreePicture (dpy, src);
461	XRenderFreePicture (dpy, dst);	594	XRenderFreePicture (dpy, dst);
462		595
463	return img;	596	return img;
464	}	597	}
465		598
466	rxvt_img *	599	rxvt_img *
467	rxvt_img::scale (int new_width, int new_height)	600	rxvt_img::scale (int new_width, int new_height)
468	{	601	{
		602	if (w == new_width && h == new_height)
		603	return clone ();
		604
469	double matrix[9] = {	605	double matrix[3][3] = {
470	w / (double)new_width, 0, 0,	606	{ new_width / (double)w, 0, 0 },
471	0, h / (double)new_height, 0,	607	{ 0, new_height / (double)h, 0 },
472	0, 0, 1	608	{ 0, 0, 1 }
473	};	609	};
474		610
475	return transform (new_width, new_height, matrix);	611	int old_repeat_mode = repeat;
476	}	612	repeat = RepeatPad; // not right, but xrender can't properly scale it seems
477		613
		614	rxvt_img *img = transform (matrix);
		615
		616	repeat = old_repeat_mode;
		617	img->repeat = repeat;
		618
		619	return img;
		620	}
		621
478	rxvt_img *	622	rxvt_img *
479	rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)	623	rxvt_img::rotate (int cx, int cy, double phi)
480	{	624	{
481	double s = sin (phi);	625	double s = sin (phi);
482	double c = cos (phi);	626	double c = cos (phi);
483		627
484	double matrix[9] = {	628	double matrix[3][3] = {
485	c, -s, -c * x + s * y + x,	629	{ c, -s, cx - c * cx + s * cy },
486	s, c, -s * x - c * y + y,	630	{ s, c, cy - s * cx - c * cy },
487	0, 0, 1	631	{ 0, 0, 1 }
		632	//{ c, -s, 0 },
		633	//{ s, c, 0 },
		634	//{ 0, 0, 1 }
488	};	635	};
489		636
490	return transform (new_width, new_height, matrix);	637	//move (-cx, -cy);
491	}	638	rxvt_img *img = transform (matrix);
		639	//move ( cx, cy);
		640	//img->move (cx, cy);
492		641
		642	return img;
		643	}
		644
493	rxvt_img *	645	rxvt_img *
494	rxvt_img::convert_to (XRenderPictFormat *new_format, const rxvt_color &bg)	646	rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg)
495	{	647	{
496	if (new_format == format)	648	if (new_format == format)
497	return clone ();	649	return clone ();
498		650
499	rxvt_img *img = new rxvt_img (s, new_format, 0, 0, w, h);	651	rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);
500	img->alloc ();	652	img->alloc ();
501		653
502	Display *dpy = s->display->dpy;	654	Display *dpy = s->display->dpy;
503	Picture src = src_picture ();	655	Picture src = src_picture ();
504	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);	656	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
505	int op = PictOpSrc;	657	int op = PictOpSrc;
506		658
507	if (format->direct.alphaMask && !new_format->direct.alphaMask)	659	if (format->direct.alphaMask && !new_format->direct.alphaMask)
508	{	660	{
509	// does it have to be that complicated	661	// does it have to be that complicated
510	rgba c;
511	bg.get (c);
512
513	XRenderColor rc = { c.r, c.g, c.b, 0xffff };	662	XRenderColor rc = { bg.r, bg.g, bg.b, bg.a };
514	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);	663	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);
515		664
516	op = PictOpOver;	665	op = PictOpOver;
517	}	666	}
518		667
…		…
527	rxvt_img *	676	rxvt_img *
528	rxvt_img::blend (rxvt_img *img, double factor)	677	rxvt_img::blend (rxvt_img *img, double factor)
529	{	678	{
530	rxvt_img *img2 = clone ();	679	rxvt_img *img2 = clone ();
531	Display *dpy = s->display->dpy;	680	Display *dpy = s->display->dpy;
532	Picture src = src_picture ();	681	Picture src = img->src_picture ();
533	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);	682	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
534	Picture mask = create_xrender_mask (dpy, img->pm, False);	683	Picture mask = create_xrender_mask (dpy, img->pm, False, False);
535		684
536	XRenderColor mask_c;	685	XRenderColor mask_c;
537		686
538	mask_c.alpha = float_to_component (factor);	687	mask_c.alpha = float_to_component (factor);
539	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.37 by root, Thu Jun 7 09:25:23 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.37 by root, Thu Jun 7 09:25:23 2012 UTC vs.
Revision 1.82 by root, Thu Jun 14 17:06:57 2012 UTC