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

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.48 by root, Thu Jun 7 19:24:02 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.48 by root, Thu Jun 7 19:24:02 2012 UTC