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

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

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.22 by sf-exg, Tue Jun 5 15:18:23 2012 UTC vs. Revision 1.75 by sf-exg, Sun Jun 10 07:51:45 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.22 by sf-exg, Tue Jun 5 15:18:23 2012 UTC vs.
Revision 1.75 by sf-exg, Sun Jun 10 07:51:45 2012 UTC