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

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

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.17 by root, Mon Jun 4 18:17:25 2012 UTC vs. Revision 1.74 by root, Sat Jun 9 19:20:04 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.17 by root, Mon Jun 4 18:17:25 2012 UTC vs.
Revision 1.74 by root, Sat Jun 9 19:20:04 2012 UTC