[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.61 by sf-exg, Fri Jun 8 10:28:30 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	//TODO: maybe should reify instead
		215	Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth);
		216	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
		217	XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
		218	XFreeGC (s->display->dpy, gc);
86		219
87	::swap (pm , img->pm);	220	destroy ();
88	::swap (shared, img->shared);
89		221
90	delete img;	222	pm = pm2;
		223	ref = new pixref (ref->w, ref->h);
91	}	224	}
92		225
93	void	226	void
94	rxvt_img::fill (const rxvt_color &c)	227	rxvt_img::fill (const rxvt_color &c)
95	{	228	{
…		…
119		252
120	for (int i = 0; i < width; i++)	253	for (int i = 0; i < width; i++)
121	params[i+2] = XDoubleToFixed (kernel[i] / sum);	254	params[i+2] = XDoubleToFixed (kernel[i] / sum);
122	}	255	}
123		256
124	void	257	rxvt_img *
125	rxvt_img::blur (int rh, int rv)	258	rxvt_img::blur (int rh, int rv)
126	{	259	{
127	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))	260	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))
128	return;	261	return clone ();
129		262
130	Display *dpy = s->display->dpy;	263	Display *dpy = s->display->dpy;
131	int size = max (rh, rv) * 2 + 1;	264	int size = max (rh, rv) * 2 + 1;
132	double kernel = (double )malloc (size * sizeof (double));	265	double kernel = (double )malloc (size * sizeof (double));
133	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));	266	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
		267	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
		268	img->alloc ();
134		269
135	XRenderPictureAttributes pa;	270	XRenderPictureAttributes pa;
136
137	pa.repeat = RepeatPad;	271	pa.repeat = RepeatPad;
138	Picture src = XRenderCreatePicture (dpy, pm , format, CPRepeat, &pa);	272	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
		273	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
		274
139	Pixmap tmp = XCreatePixmap (dpy, pm, w, h, format->depth);	275	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
140	Picture dst = XRenderCreatePicture (dpy, tmp, format, CPRepeat, &pa);	276	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
141	XFreePixmap (dpy, tmp);	277	XFreePixmap (dpy, tmp_pm);
142		278
143	if (kernel && params)	279	if (kernel && params)
144	{	280	{
145	size = rh * 2 + 1;	281	size = rh * 2 + 1;
146	get_gaussian_kernel (rh, size, kernel, params);	282	get_gaussian_kernel (rh, size, kernel, params);
…		…
148	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);	284	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
149	XRenderComposite (dpy,	285	XRenderComposite (dpy,
150	PictOpSrc,	286	PictOpSrc,
151	src,	287	src,
152	None,	288	None,
153	dst,	289	tmp,
154	0, 0,	290	0, 0,
155	0, 0,	291	0, 0,
156	0, 0,	292	0, 0,
157	w, h);	293	w, h);
158		294
159	::swap (src, dst);
160
161	size = rv * 2 + 1;	295	size = rv * 2 + 1;
162	get_gaussian_kernel (rv, size, kernel, params);	296	get_gaussian_kernel (rv, size, kernel, params);
163	::swap (params[0], params[1]);	297	::swap (params[0], params[1]);
164		298
165	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);	299	XRenderSetPictureFilter (dpy, tmp, FilterConvolution, params, size+2);
166	XRenderComposite (dpy,	300	XRenderComposite (dpy,
167	PictOpSrc,	301	PictOpSrc,
168	src,	302	tmp,
169	None,	303	None,
170	dst,	304	dst,
171	0, 0,	305	0, 0,
172	0, 0,	306	0, 0,
173	0, 0,	307	0, 0,
…		…
176		310
177	free (kernel);	311	free (kernel);
178	free (params);	312	free (params);
179	XRenderFreePicture (dpy, src);	313	XRenderFreePicture (dpy, src);
180	XRenderFreePicture (dpy, dst);	314	XRenderFreePicture (dpy, dst);
		315	XRenderFreePicture (dpy, tmp);
		316
		317	return img;
181	}	318	}
182		319
183	static Picture	320	static Picture
184	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb)	321	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb)
185	{	322	{
…		…
194		331
195	return mask;	332	return mask;
196	}	333	}
197		334
198	void	335	void
199	rxvt_img::brightness (double r, double g, double b, double a)	336	rxvt_img::brightness (unsigned short r, unsigned short g, unsigned short b, unsigned short a)
200	{	337	{
201	Display *dpy = s->display->dpy;	338	Display *dpy = s->display->dpy;
202	Picture src = create_xrender_mask (dpy, pm, True);	339	Picture src = create_xrender_mask (dpy, pm, True);
203	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	340	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
204		341
205	XRenderColor mask_c;	342	XRenderColor mask_c;
206	mask_c.red = float_to_component (r);	343	mask_c.red = r;
207	mask_c.green = float_to_component (g);	344	mask_c.green = g;
208	mask_c.blue = float_to_component (b);	345	mask_c.blue = b;
209	mask_c.alpha = float_to_component (a);	346	mask_c.alpha = a;
210	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);	347	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
211		348
212	XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	349	XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
		350
		351	XRenderFreePicture (dpy, src);
		352	XRenderFreePicture (dpy, dst);
213	}	353	}
214		354
215	void	355	void
216	rxvt_img::contrast (double r, double g, double b, double a)	356	rxvt_img::contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a)
217	{	357	{
218	if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))	358	if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
219	return;	359	return;
220		360
221	Display *dpy = s->display->dpy;	361	Display *dpy = s->display->dpy;
222	Picture src = create_xrender_mask (dpy, pm, True);	362	Picture src = create_xrender_mask (dpy, pm, True);
223	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	363	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
224		364
225	XRenderColor mask_c;	365	XRenderColor mask_c;
226	mask_c.red = float_to_component (r);	366	mask_c.red = r;
227	mask_c.green = float_to_component (g);	367	mask_c.green = g;
228	mask_c.blue = float_to_component (b);	368	mask_c.blue = b;
229	mask_c.alpha = float_to_component (a);	369	mask_c.alpha = a;
230	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);	370	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
231		371
232	XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	372	XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
233	}
234		373
235	bool	374	XRenderFreePicture (dpy, src);
236	rxvt_img::render_pixbuf (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y)	375	XRenderFreePicture (dpy, dst);
237	{	376	}
238	Display *dpy = s->display->dpy;
239		377
240	if (s->visual->c_class != TrueColor)	378	rxvt_img *
		379	rxvt_img::clone ()
		380	{
		381	return new rxvt_img (*this);
		382	}
		383
		384	static XRenderPictFormat *
		385	find_alpha_format_for (Display dpy, XRenderPictFormat format)
		386	{
		387	if (format->direct.alphaMask)
		388	return format; // already has alpha
		389
		390	// try to find a suitable alpha format, one bit alpha is enough for our purposes
		391	if (format->type == PictTypeDirect)
		392	for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
		393	if (f->direct.alphaMask
		394	&& f->type == PictTypeDirect
		395	&& ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
		396	&& ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
		397	&& ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
241	return false;	398	return f;
242		399
243	uint32_t red_mask, green_mask, blue_mask, alpha_mask;	400	// should be a very good fallback
		401	return XRenderFindStandardFormat (dpy, PictStandardARGB32);
		402	}
244		403
245	red_mask = (uint32_t)format->direct.redMask << format->direct.red;	404	rxvt_img *
246	green_mask = (uint32_t)format->direct.greenMask << format->direct.green;	405	rxvt_img::reify ()
247	blue_mask = (uint32_t)format->direct.blueMask << format->direct.blue;	406	{
248	alpha_mask = (uint32_t)format->direct.alphaMask << format->direct.alpha;	407	if (x == 0 && y == 0 && w == ref->w && h == ref->h)
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;	408	return clone ();
257		409
258	int sh_r = ecb_ctz32 (red_mask);	410	Display *dpy = s->display->dpy;
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		411
263	if (width > 32767 \|\| height > 32767)	412	bool alpha = !format->direct.alphaMask
264	return false;	413	&& (x \|\| y)
		414	&& repeat == RepeatNone;
265		415
266	XImage *ximage = XCreateImage (dpy, s->visual, format->depth, ZPixmap, 0, 0,	416	rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
267	width, height, 32, 0);	417	img->alloc ();
268	if (!ximage)
269	return false;
270		418
271	if (height > INT_MAX / ximage->bytes_per_line	419	Picture src = src_picture ();
272	\|\| !(ximage->data = (char )malloc (height ximage->bytes_per_line)))	420	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
		421
		422	if (alpha)
273	{	423	{
274	XDestroyImage (ximage);	424	XRenderColor rc = { 0, 0, 0, 0 };
275	return false;	425	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
		426	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h);
276	}	427	}
		428	else
		429	XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);
277		430
278	GC gc = XCreateGC (dpy, pm, 0, 0);	431	XRenderFreePicture (dpy, src);
		432	XRenderFreePicture (dpy, dst);
279		433
280	ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;	434	return img;
		435	}
281		436
282	int rowstride = gdk_pixbuf_get_rowstride (pixbuf);	437	rxvt_img *
283	int channels = gdk_pixbuf_get_n_channels (pixbuf);	438	rxvt_img::sub_rect (int x, int y, int width, int height)
284	unsigned char row = gdk_pixbuf_get_pixels (pixbuf) + src_y rowstride + src_x * channels;	439	{
285	char *line = ximage->data;	440	rxvt_img *img = clone ();
286		441
287	rgba c (0, 0, 0);	442	img->x += x;
		443	img->y += y;
288		444
289	if (channels == 4 && alpha_mask == 0)	445	if (w != width \|\| h != height)
290	{	446	{
291	//pix_colors[Color_bg].get (c);	447	img->w = width;
292	//TODO	448	img->h = height;
293	c.r = 0xffff; c.g = 0xc0c0; c.b = 0xcbcb;//D	449
294	c.r >>= 8;	450	rxvt_img *img2 = img->reify ();
295	c.g >>= 8;	451	delete img;
296	c.b >>= 8;	452	img = img2;
297	}	453	}
298		454
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;	455	return img;
354	}	456	}
355		457
356	rxvt_img *	458	rxvt_img *
357	rxvt_img::sub_rect (int x, int y, int width, int height, int repeat)	459	rxvt_img::transform (int new_width, int new_height, double matrix[9])
358	{	460	{
359	rxvt_img *img = new rxvt_img (s, format, width, height);	461	rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat);
		462	img->alloc ();
360		463
361	Display *dpy = s->display->dpy;	464	Display *dpy = s->display->dpy;
362	XRenderPictureAttributes pa;	465	Picture src = src_picture ();
363	pa.repeat = repeat;
364	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
365	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	466	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
369	XRenderFreePicture (dpy, src);
370	XRenderFreePicture (dpy, dst);
371
372	return img;
373	}
374
375	rxvt_img *
376	rxvt_img::transform (int new_width, int new_height, double matrix[9], int repeat)
377	{
378	rxvt_img *img = new rxvt_img (s, format, new_width, new_height);
379
380	Display *dpy = s->display->dpy;
381	XRenderPictureAttributes pa;
382	pa.repeat = repeat;
383	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
384	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
385		467
386	XTransform xfrm;	468	XTransform xfrm;
387		469
388	for (int i = 0; i < 3; ++i)	470	for (int i = 0; i < 3; ++i)
389	for (int j = 0; j < 3; ++j)	471	for (int j = 0; j < 3; ++j)
390	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);	472	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
391		473
		474	#if 0
		475	xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
		476	xfrm.matrix [1][2] -= XDoubleToFixed (y);
		477	#endif
		478
392	XRenderSetPictureFilter (dpy, src, "good", 0, 0);	479	XRenderSetPictureFilter (dpy, src, "good", 0, 0);
393	XRenderSetPictureTransform (dpy, src, &xfrm);	480	XRenderSetPictureTransform (dpy, src, &xfrm);
394	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);	481	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
395		482
396	XRenderFreePicture (dpy, src);	483	XRenderFreePicture (dpy, src);
…		…
400	}	487	}
401		488
402	rxvt_img *	489	rxvt_img *
403	rxvt_img::scale (int new_width, int new_height)	490	rxvt_img::scale (int new_width, int new_height)
404	{	491	{
		492	if (w == new_width && h == new_height)
		493	return clone ();
		494
405	double matrix[9] = {	495	double matrix[9] = {
406	w / (double)new_width, 0, 0,	496	w / (double)new_width, 0, 0,
407	0, h / (double)new_height, 0,	497	0, h / (double)new_height, 0,
408	0, 0, 1	498	0, 0, 1
409	};	499	};
410		500
		501	int old_repeat_mode = repeat;
		502	repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems
		503
411	return transform (new_width, new_height, matrix);	504	rxvt_img *img = transform (new_width, new_height, matrix);
412	}
413		505
		506	repeat = old_repeat_mode;
		507	img->repeat = repeat;
		508
		509	return img;
		510	}
		511
414	rxvt_img *	512	rxvt_img *
415	rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi, int repeat)	513	rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)
416	{	514	{
417	double s = sin (phi);	515	double s = sin (phi);
418	double c = cos (phi);	516	double c = cos (phi);
419		517
420	double matrix[9] = {	518	double matrix[9] = {
421	c, -s, -c * x + s * y + x,	519	c, -s, -c * x + s * y + x,
422	s, c, -s * x - c * y + y,	520	s, c, -s * x - c * y + y,
423	0, 0, 1	521	0, 0, 1
424	};	522	};
425		523
426	return transform (new_width, new_height, matrix, repeat);	524	return transform (new_width, new_height, matrix);
427	}	525	}
428		526
429	rxvt_img *	527	rxvt_img *
430	rxvt_img::convert_to (XRenderPictFormat *new_format)	528	rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg)
431	{	529	{
		530	if (new_format == format)
		531	return clone ();
		532
432	rxvt_img *img = new rxvt_img (s, new_format, w, h);	533	rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);
		534	img->alloc ();
433		535
434	Display *dpy = s->display->dpy;	536	Display *dpy = s->display->dpy;
435	Picture src = XRenderCreatePicture (dpy, pm, format, 0, 0);	537	Picture src = src_picture ();
436	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);	538	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
		539	int op = PictOpSrc;
437		540
		541	if (format->direct.alphaMask && !new_format->direct.alphaMask)
		542	{
		543	// does it have to be that complicated
		544	rgba c;
		545	bg.get (c);
		546
		547	XRenderColor rc = { c.r, c.g, c.b, 0xffff };
		548	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);
		549
		550	op = PictOpOver;
		551	}
		552
438	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	553	XRenderComposite (dpy, op, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
439		554
440	XRenderFreePicture (dpy, src);
441	XRenderFreePicture (dpy, dst);	555	XRenderFreePicture (dpy, src);
		556	XRenderFreePicture (dpy, dst);
442		557
		558	return img;
		559	}
		560
		561	rxvt_img *
		562	rxvt_img::blend (rxvt_img *img, double factor)
		563	{
		564	rxvt_img *img2 = clone ();
		565	Display *dpy = s->display->dpy;
		566	Picture src = img->src_picture ();
		567	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
		568	Picture mask = create_xrender_mask (dpy, img->pm, False);
		569
		570	XRenderColor mask_c;
		571
		572	mask_c.alpha = float_to_component (factor);
		573	mask_c.red =
		574	mask_c.green =
		575	mask_c.blue = 0;
		576	XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
		577
		578	XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, w, h);
		579
		580	XRenderFreePicture (dpy, src);
		581	XRenderFreePicture (dpy, dst);
		582	XRenderFreePicture (dpy, mask);
		583
443	return img;	584	return img2;
444	}	585	}
445		586
446	#endif	587	#endif
447		588

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.61 by sf-exg, Fri Jun 8 10:28:30 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.61 by sf-exg, Fri Jun 8 10:28:30 2012 UTC