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

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

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.22 by sf-exg, Tue Jun 5 15:18:23 2012 UTC vs. Revision 1.47 by root, Thu Jun 7 19:06:26 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.22 by sf-exg, Tue Jun 5 15:18:23 2012 UTC vs.
Revision 1.47 by root, Thu Jun 7 19:06:26 2012 UTC