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

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.50 by root, Thu Jun 7 19:42:09 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.50 by root, Thu Jun 7 19:42:09 2012 UTC