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

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

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.32 by root, Thu Jun 7 07:53:12 2012 UTC vs. Revision 1.78 by sf-exg, Mon Jun 11 12:08:30 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.32 by root, Thu Jun 7 07:53:12 2012 UTC vs.
Revision 1.78 by sf-exg, Mon Jun 11 12:08:30 2012 UTC