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

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.34 by root, Thu Jun 7 08:36:09 2012 UTC vs.
Revision 1.77 by root, Sun Jun 10 10:35:03 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)
…		…
114		203
115	XRenderPictureAttributes pa;	204	XRenderPictureAttributes pa;
116	pa.repeat = repeat;	205	pa.repeat = repeat;
117	Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);	206	Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
118		207
119	XRectangle clip = { -x, -y, min (w, ref->w), min (h, ref->h) };
120	XRenderSetPictureClipRectangles (dpy, pic, 0, 0, &clip, 1);
121
122	return pic;	208	return pic;
123	}	209	}
124		210
125	void	211	void
126	rxvt_img::unshare ()	212	rxvt_img::unshare ()
127	{	213	{
128	if (ref->cnt == 1 && ref->ours)	214	if (ref->cnt == 1 && ref->ours)
129	return;	215	return;
130		216
131	//TODO: maybe should reify instead
132	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);
133	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);	218	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
134	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);
135	XFreeGC (s->display->dpy, gc);	220	XFreeGC (s->display->dpy, gc);
136		221
…		…
141	}	226	}
142		227
143	void	228	void
144	rxvt_img::fill (const rxvt_color &c)	229	rxvt_img::fill (const rxvt_color &c)
145	{	230	{
146	XGCValues gcv;	231	rgba cc;
147	gcv.foreground = c;	232	c.get (cc);
148	GC gc = XCreateGC (s->display->dpy, pm, GCForeground, &gcv);	233	XRenderColor rc = { cc.r, cc.g, cc.b, cc.a };
149	XFillRectangle (s->display->dpy, pm, gc, 0, 0, w, h);	234
150	XFreeGC (s->display->dpy, gc);	235	Display *dpy = s->display->dpy;
		236	Picture src = src_picture ();
		237	XRenderFillRectangle (dpy, PictOpSrc, src, &rc, 0, 0, w, h);
		238	XRenderFreePicture (dpy, src);
151	}	239	}
152		240
153	static void	241	static void
154	get_gaussian_kernel (int radius, int width, double kernel, XFixed params)	242	get_gaussian_kernel (int radius, int width, double kernel, XFixed params)
155	{	243	{
…		…
179		267
180	Display *dpy = s->display->dpy;	268	Display *dpy = s->display->dpy;
181	int size = max (rh, rv) * 2 + 1;	269	int size = max (rh, rv) * 2 + 1;
182	double kernel = (double )malloc (size * sizeof (double));	270	double kernel = (double )malloc (size * sizeof (double));
183	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));	271	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
184	rxvt_img *img = new rxvt_img (s, format, x, y, w, h);	272	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
185	img->alloc ();	273	img->alloc ();
186
187	Picture src = src_picture ();
188		274
189	XRenderPictureAttributes pa;	275	XRenderPictureAttributes pa;
190	pa.repeat = RepeatPad;	276	pa.repeat = RepeatPad;
191	Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa);	277	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
		278	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
192		279
193	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);	280	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
194	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);	281	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
195	XFreePixmap (dpy, tmp_pm);	282	XFreePixmap (dpy, tmp_pm);
196		283
…		…
212		299
213	size = rv * 2 + 1;	300	size = rv * 2 + 1;
214	get_gaussian_kernel (rv, size, kernel, params);	301	get_gaussian_kernel (rv, size, kernel, params);
215	::swap (params[0], params[1]);	302	::swap (params[0], params[1]);
216		303
217	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);	304	XRenderSetPictureFilter (dpy, tmp, FilterConvolution, params, size+2);
218	XRenderComposite (dpy,	305	XRenderComposite (dpy,
219	PictOpSrc,	306	PictOpSrc,
220	tmp,	307	tmp,
221	None,	308	None,
222	dst,	309	dst,
…		…
226	w, h);	313	w, h);
227	}	314	}
228		315
229	free (kernel);	316	free (kernel);
230	free (params);	317	free (params);
		318
231	XRenderFreePicture (dpy, src);	319	XRenderFreePicture (dpy, src);
232	XRenderFreePicture (dpy, dst);	320	XRenderFreePicture (dpy, dst);
233	XRenderFreePicture (dpy, tmp);	321	XRenderFreePicture (dpy, tmp);
234		322
235	return img;	323	return img;
236	}	324	}
237		325
238	static Picture	326	static Picture
239	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb)	327	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha)
240	{	328	{
241	Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);	329	Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
242		330
243	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);	331	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
244	XRenderPictureAttributes pa;	332	XRenderPictureAttributes pa;
245	pa.repeat = True;	333	pa.repeat = RepeatNormal;
		334	pa.component_alpha = component_alpha;
246	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);	335	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat \| CPComponentAlpha, &pa);
247		336
248	XFreePixmap (dpy, pixmap);	337	XFreePixmap (dpy, pixmap);
249		338
250	return mask;	339	return mask;
251	}	340	}
252		341
		342	static void
		343	extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)
		344	{
		345	int32_t x = clamp (c, cl0, cl1);
		346	c -= x;
		347	xc = x;
		348	}
		349
		350	static bool
		351	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)
		352	{
		353	extract (cl0, cl1, r, xr);
		354	extract (cl0, cl1, g, xg);
		355	extract (cl0, cl1, b, xb);
		356	extract (cl0, cl1, a, xa);
		357
		358	return xr \| xg \| xb \| xa;
		359	}
		360
253	void	361	void
254	rxvt_img::brightness (unsigned short r, unsigned short g, unsigned short b, unsigned short a)	362	rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a)
255	{	363	{
		364	unshare ();
		365
256	Display *dpy = s->display->dpy;	366	Display *dpy = s->display->dpy;
257	Picture src = create_xrender_mask (dpy, pm, True);
258	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	367	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
259		368
		369	// loop should not be needed for brightness, as only -1..1 makes sense
		370	//while (r \| g \| b \| a)
		371	{
		372	unsigned short xr, xg, xb, xa;
260	XRenderColor mask_c;	373	XRenderColor mask_c;
261	mask_c.red = r;	374
262	mask_c.green = g;	375	if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
263	mask_c.blue = b;	376	XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
264	mask_c.alpha = a;	377
		378	if (extract (-65535, 0, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
		379	{
		380	XRenderColor mask_w = { 65535, 65535, 65535, 65535 };
		381	XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
		382	mask_c.red = -mask_c.red; //TODO: verify that doing clamp, assign, and negation does the right thing
		383	mask_c.green = -mask_c.green;
		384	mask_c.blue = -mask_c.blue;
		385	mask_c.alpha = -mask_c.alpha;
		386	XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
		387	XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
		388	}
		389	}
		390
		391	XRenderFreePicture (dpy, dst);
		392	}
		393
		394	void
		395	rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
		396	{
		397	if (r < 0 \|\| g < 0 \|\| b < 0 \|\| a < 0)
		398	rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");
		399
		400	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
		401	img->alloc ();
		402
		403	{
		404	rxvt_color empty;
		405	empty.set (s, rgba (0, 0, 0, 0));
		406	img->fill (empty);
		407	}
		408
		409	// premultiply (yeah, these are not exact, sue me or fix it)
		410	r = (r * (a >> 8)) >> 8;
		411	g = (g * (a >> 8)) >> 8;
		412	b = (b * (a >> 8)) >> 8;
		413
		414	Display *dpy = s->display->dpy;
		415
		416	Picture src = src_picture ();
		417	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
		418	Picture mul = create_xrender_mask (dpy, pm, True, True);
		419
		420	//TODO: this operator does not yet implement some useful contrast
		421	while (r \| g \| b \| a)
		422	{
		423	unsigned short xr, xg, xb, xa;
		424	XRenderColor mask_c;
		425
		426	if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
		427	{
265	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);	428	XRenderFillRectangle (dpy, PictOpSrc, mul, &mask_c, 0, 0, 1, 1);
266
267	XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	429	XRenderComposite (dpy, PictOpAdd, src, mul, dst, 0, 0, 0, 0, 0, 0, w, h);
		430	}
		431	}
268		432
		433	XRenderFreePicture (dpy, mul);
		434	XRenderFreePicture (dpy, dst);
269	XRenderFreePicture (dpy, src);	435	XRenderFreePicture (dpy, src);
270	XRenderFreePicture (dpy, dst);
271	}
272		436
273	void	437	::swap (img->ref, ref);
274	rxvt_img::contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a)	438	::swap (img->pm , pm );
275	{
276	if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
277	return;
278		439
279	Display *dpy = s->display->dpy;	440	delete img;
280	Picture src = create_xrender_mask (dpy, pm, True);
281	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
282
283	XRenderColor mask_c;
284	mask_c.red = r;
285	mask_c.green = g;
286	mask_c.blue = b;
287	mask_c.alpha = a;
288	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
289
290	XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
291
292	XRenderFreePicture (dpy, src);
293	XRenderFreePicture (dpy, dst);
294	}
295
296	bool
297	rxvt_img::render_pixbuf (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y)
298	{
299	Display *dpy = s->display->dpy;
300
301	if (s->visual->c_class != TrueColor)
302	return false;
303
304	uint32_t red_mask, green_mask, blue_mask, alpha_mask;
305
306	red_mask = (uint32_t)format->direct.redMask << format->direct.red;
307	green_mask = (uint32_t)format->direct.greenMask << format->direct.green;
308	blue_mask = (uint32_t)format->direct.blueMask << format->direct.blue;
309	alpha_mask = (uint32_t)format->direct.alphaMask << format->direct.alpha;
310
311	int width_r = ecb_popcount32 (red_mask);
312	int width_g = ecb_popcount32 (green_mask);
313	int width_b = ecb_popcount32 (blue_mask);
314	int width_a = ecb_popcount32 (alpha_mask);
315
316	if (width_r > 8 \|\| width_g > 8 \|\| width_b > 8 \|\| width_a > 8)
317	return false;
318
319	int sh_r = ecb_ctz32 (red_mask);
320	int sh_g = ecb_ctz32 (green_mask);
321	int sh_b = ecb_ctz32 (blue_mask);
322	int sh_a = ecb_ctz32 (alpha_mask);
323
324	if (width > 32767 \|\| height > 32767)
325	return false;
326
327	XImage *ximage = XCreateImage (dpy, s->visual, format->depth, ZPixmap, 0, 0,
328	width, height, 32, 0);
329	if (!ximage)
330	return false;
331
332	if (height > INT_MAX / ximage->bytes_per_line
333	\|\| !(ximage->data = (char )malloc (height ximage->bytes_per_line)))
334	{
335	XDestroyImage (ximage);
336	return false;
337	}
338
339	GC gc = XCreateGC (dpy, pm, 0, 0);
340
341	ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
342
343	int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
344	int channels = gdk_pixbuf_get_n_channels (pixbuf);
345	unsigned char row = gdk_pixbuf_get_pixels (pixbuf) + src_y rowstride + src_x * channels;
346	char *line = ximage->data;
347
348	for (int y = 0; y < height; y++)
349	{
350	for (int x = 0; x < width; x++)
351	{
352	unsigned char pixel = row + x channels;
353	uint32_t value;
354	unsigned char r, g, b, a;
355
356	if (channels == 4)
357	{
358	a = pixel[3];
359	r = pixel[0] * a / 0xff;
360	g = pixel[1] * a / 0xff;
361	b = pixel[2] * a / 0xff;
362	}
363	else
364	{
365	a = 0xff;
366	r = pixel[0];
367	g = pixel[1];
368	b = pixel[2];
369	}
370
371	value = ((r >> (8 - width_r)) << sh_r)
372	\| ((g >> (8 - width_g)) << sh_g)
373	\| ((b >> (8 - width_b)) << sh_b)
374	\| ((a >> (8 - width_a)) << sh_a);
375
376	if (ximage->bits_per_pixel == 32)
377	((uint32_t *)line)[x] = value;
378	else
379	XPutPixel (ximage, x, y, value);
380	}
381
382	row += rowstride;
383	line += ximage->bytes_per_line;
384	}
385
386	XPutImage (dpy, pm, gc, ximage, 0, 0, dst_x, dst_y, width, height);
387	XDestroyImage (ximage);
388	XFreeGC (dpy, gc);
389
390	return true;
391	}	441	}
392		442
393	rxvt_img *	443	rxvt_img *
394	rxvt_img::clone ()	444	rxvt_img::clone ()
395	{	445	{
396	return new rxvt_img (*this);	446	return new rxvt_img (*this);
397	}	447	}
398		448
		449	static XRenderPictFormat *
		450	find_alpha_format_for (Display dpy, XRenderPictFormat format)
		451	{
		452	if (format->direct.alphaMask)
		453	return format; // already has alpha
		454
		455	// try to find a suitable alpha format, one bit alpha is enough for our purposes
		456	if (format->type == PictTypeDirect)
		457	for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
		458	if (f->direct.alphaMask
		459	&& f->type == PictTypeDirect
		460	&& ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
		461	&& ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
		462	&& ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
		463	return f;
		464
		465	// should be a very good fallback
		466	return XRenderFindStandardFormat (dpy, PictStandardARGB32);
		467	}
		468
399	rxvt_img *	469	rxvt_img *
400	rxvt_img::reify ()	470	rxvt_img::reify ()
401	{	471	{
402	rxvt_img *img = new rxvt_img (s, format, 0, 0, w, h);	472	if (x == 0 && y == 0 && w == ref->w && h == ref->h)
		473	return clone ();
		474
		475	Display *dpy = s->display->dpy;
		476
		477	// add an alpha channel if...
		478	bool alpha = !format->direct.alphaMask // pixmap has none yet
		479	&& (x \|\| y) // we need one because of non-zero offset
		480	&& repeat == RepeatNone; // and we have no good pixels to fill with
		481
		482	rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
403	img->alloc ();	483	img->alloc ();
404
405	// todo, if x==0 and y==0 and w==real width we could clone
406	// but that involves an rtt to find pixmap width.
407
408	Display *dpy = s->display->dpy;
409		484
410	Picture src = src_picture ();	485	Picture src = src_picture ();
411	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	486	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
412		487
		488	if (alpha)
		489	{
		490	XRenderColor rc = { 0, 0, 0, 0 };
		491	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
		492	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h);
		493	}
		494	else
413	XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);	495	XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);
414		496
415	XRenderFreePicture (dpy, src);	497	XRenderFreePicture (dpy, src);
416	XRenderFreePicture (dpy, dst);	498	XRenderFreePicture (dpy, dst);
417		499
418	return img;	500	return img;
419	}	501	}
…		…
421	rxvt_img *	503	rxvt_img *
422	rxvt_img::sub_rect (int x, int y, int width, int height)	504	rxvt_img::sub_rect (int x, int y, int width, int height)
423	{	505	{
424	rxvt_img *img = clone ();	506	rxvt_img *img = clone ();
425		507
426	//TODO: width > w, must reify
427
428	img->x += x;	508	img->x += x;
429	img->y += y;	509	img->y += y;
		510
		511	if (w != width \|\| h != height)
		512	{
430	img->w = width;	513	img->w = width;
431	img->h = height;	514	img->h = height;
		515
		516	rxvt_img *img2 = img->reify ();
		517	delete img;
		518	img = img2;
		519	}
432		520
433	return img;	521	return img;
434	}	522	}
435		523
436	rxvt_img *	524	rxvt_img *
437	rxvt_img::transform (int new_width, int new_height, double matrix[9])	525	rxvt_img::transform (int new_width, int new_height, double matrix[9])
438	{	526	{
439	rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height);	527	rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat);
440	img->alloc ();	528	img->alloc ();
441		529
442	Display *dpy = s->display->dpy;	530	Display *dpy = s->display->dpy;
443	Picture src = src_picture ();	531	Picture src = src_picture ();
444	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	532	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
…		…
447		535
448	for (int i = 0; i < 3; ++i)	536	for (int i = 0; i < 3; ++i)
449	for (int j = 0; j < 3; ++j)	537	for (int j = 0; j < 3; ++j)
450	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);	538	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
451		539
452	xfrm.matrix [0][2] += XDoubleToFixed (x);//TODO	540	xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
453	xfrm.matrix [0][3] += XDoubleToFixed (y);	541	xfrm.matrix [1][2] -= XDoubleToFixed (y);
454		542
455	XRenderSetPictureFilter (dpy, src, "good", 0, 0);	543	XRenderSetPictureFilter (dpy, src, "good", 0, 0);
456	XRenderSetPictureTransform (dpy, src, &xfrm);	544	XRenderSetPictureTransform (dpy, src, &xfrm);
457	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);	545	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
458		546
…		…
463	}	551	}
464		552
465	rxvt_img *	553	rxvt_img *
466	rxvt_img::scale (int new_width, int new_height)	554	rxvt_img::scale (int new_width, int new_height)
467	{	555	{
		556	if (w == new_width && h == new_height)
		557	return clone ();
		558
468	double matrix[9] = {	559	double matrix[9] = {
469	w / (double)new_width, 0, 0,	560	w / (double)new_width, 0, 0,
470	0, h / (double)new_height, 0,	561	0, h / (double)new_height, 0,
471	0, 0, 1	562	0, 0, 1
472	};	563	};
473		564
		565	int old_repeat_mode = repeat;
		566	repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems
		567
474	return transform (new_width, new_height, matrix);	568	rxvt_img *img = transform (new_width, new_height, matrix);
		569
		570	repeat = old_repeat_mode;
		571	img->repeat = repeat;
		572
		573	return img;
475	}	574	}
476		575
477	rxvt_img *	576	rxvt_img *
478	rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)	577	rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)
479	{	578	{
…		…
488		587
489	return transform (new_width, new_height, matrix);	588	return transform (new_width, new_height, matrix);
490	}	589	}
491		590
492	rxvt_img *	591	rxvt_img *
493	rxvt_img::convert_to (XRenderPictFormat *new_format, const rxvt_color &bg)	592	rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg)
494	{	593	{
495	if (new_format == format)	594	if (new_format == format)
496	return clone ();	595	return clone ();
497		596
498	rxvt_img *img = new rxvt_img (s, new_format, 0, 0, w, h);	597	rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);
499	img->alloc ();	598	img->alloc ();
500		599
501	Display *dpy = s->display->dpy;	600	Display *dpy = s->display->dpy;
502	Picture src = src_picture ();	601	Picture src = src_picture ();
503	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);	602	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
…		…
526	rxvt_img *	625	rxvt_img *
527	rxvt_img::blend (rxvt_img *img, double factor)	626	rxvt_img::blend (rxvt_img *img, double factor)
528	{	627	{
529	rxvt_img *img2 = clone ();	628	rxvt_img *img2 = clone ();
530	Display *dpy = s->display->dpy;	629	Display *dpy = s->display->dpy;
531	Picture src = src_picture ();	630	Picture src = img->src_picture ();
532	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);	631	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
533	Picture mask = create_xrender_mask (dpy, img->pm, False);	632	Picture mask = create_xrender_mask (dpy, img->pm, False, False);
534		633
535	XRenderColor mask_c;	634	XRenderColor mask_c;
536		635
537	mask_c.alpha = float_to_component (factor);	636	mask_c.alpha = float_to_component (factor);
538	mask_c.red =	637	mask_c.red =

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.34 by root, Thu Jun 7 08:36:09 2012 UTC vs. Revision 1.77 by root, Sun Jun 10 10:35:03 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.34 by root, Thu Jun 7 08:36:09 2012 UTC vs.
Revision 1.77 by root, Sun Jun 10 10:35:03 2012 UTC