[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.66 by root, Fri Jun 8 21:48:07 2012 UTC

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

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.66 by root, Fri Jun 8 21:48:07 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.66 by root, Fri Jun 8 21:48:07 2012 UTC