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

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

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.24 by sf-exg, Tue Jun 5 18:52:48 2012 UTC vs. Revision 1.49 by root, Thu Jun 7 19:24:13 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.24 by sf-exg, Tue Jun 5 18:52:48 2012 UTC vs.
Revision 1.49 by root, Thu Jun 7 19:24:13 2012 UTC