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

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

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.21 by sf-exg, Tue Jun 5 14:59:44 2012 UTC vs. Revision 1.70 by root, Sat Jun 9 11:41:28 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.21 by sf-exg, Tue Jun 5 14:59:44 2012 UTC vs.
Revision 1.70 by root, Sat Jun 9 11:41:28 2012 UTC