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

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.51 by root, Thu Jun 7 20:04:54 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.51 by root, Thu Jun 7 20:04:54 2012 UTC