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

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.9 by root, Sun Jun 3 20:47:00 2012 UTC vs.
Revision 1.77 by root, Sun Jun 10 10:35:03 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	{
18	}	11	}
19		12
20	rxvt_img *	13	rxvt_img::rxvt_img (const rxvt_img &img)
21	rxvt_img::new_from_file (rxvt_screen s, const char filename)	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)
22	{	15	{
23	GError *err;	16	++ref->cnt;
24	GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);	17	}
25		18
26	if (!pb)	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))
27	return 0;	36	return 0;
28		37
29	rxvt_img *img = new rxvt_img (	38	rxvt_img *img = new rxvt_img (
30	s,	39	s,
31	XRenderFindStandardFormat (s->display->dpy, gdk_pixbuf_get_has_alpha (pb) ? PictStandardARGB32 : PictStandardRGB24),	40	XRenderFindVisualFormat (dpy, DefaultVisual (dpy, s->display->screen)),
32	gdk_pixbuf_get_width (pb),	41	0,
33	gdk_pixbuf_get_height (pb)	42	0,
		43	root_pm_w,
		44	root_pm_h
34	);	45	);
35		46
36	img->render (pb, 0, 0, img->w, img->h, 0, 0);	47	img->pm = root_pixmap;
		48	img->ref = new pixref (root_pm_w, root_pm_h);
		49	img->ref->ours = false;
37		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);
		153
		154	return img;
		155	}
		156
		157	rxvt_img *
		158	rxvt_img::new_from_file (rxvt_screen s, const char filename)
		159	{
		160	GError *err = 0;
		161	GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);
		162
		163	if (!pb)
		164	rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);
		165
		166	rxvt_img *img = new_from_pixbuf (s, pb);
		167
		168	g_object_unref (pb);
		169
		170	return img;
		171	}
		172
		173	# endif
		174
		175	void
		176	rxvt_img::destroy ()
		177	{
		178	if (--ref->cnt)
38	return img;	179	return;
		180
		181	if (pm && ref->ours)
		182	XFreePixmap (s->display->dpy, pm);
		183
		184	delete ref;
39	}	185	}
40		186
41	rxvt_img::~rxvt_img ()	187	rxvt_img::~rxvt_img ()
42	{	188	{
43	if (!shared)	189	destroy ();
		190	}
		191
		192	void
		193	rxvt_img::alloc ()
		194	{
		195	pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);
		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;
		209	}
		210
		211	void
		212	rxvt_img::unshare ()
		213	{
		214	if (ref->cnt == 1 && ref->ours)
		215	return;
		216
		217	Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth);
		218	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
		219	XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
44	XFreePixmap (s->display->dpy, pm);	220	XFreeGC (s->display->dpy, gc);
		221
		222	destroy ();
		223
		224	pm = pm2;
		225	ref = new pixref (ref->w, ref->h);
45	}	226	}
46		227
47	void	228	void
48	rxvt_img::fill (const rxvt_color &c)	229	rxvt_img::fill (const rxvt_color &c)
49	{	230	{
50	XGCValues gcv;	231	rgba cc;
51	gcv.foreground = c;	232	c.get (cc);
52	GC gc = XCreateGC (s->display->dpy, pm, GCForeground, &gcv);	233	XRenderColor rc = { cc.r, cc.g, cc.b, cc.a };
53	XFillRectangle (s->display->dpy, pm, gc, 0, 0, w, h);	234
54	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);
55	}	239	}
56		240
57	static void	241	static void
58	get_gaussian_kernel (int radius, int width, double kernel, XFixed params)	242	get_gaussian_kernel (int radius, int width, double kernel, XFixed params)
59	{	243	{
…		…
73		257
74	for (int i = 0; i < width; i++)	258	for (int i = 0; i < width; i++)
75	params[i+2] = XDoubleToFixed (kernel[i] / sum);	259	params[i+2] = XDoubleToFixed (kernel[i] / sum);
76	}	260	}
77		261
78	void	262	rxvt_img *
79	rxvt_img::blur (int rh, int rv)	263	rxvt_img::blur (int rh, int rv)
80	{	264	{
81	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))	265	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))
82	return;	266	return clone ();
83		267
84	Display *dpy = s->display->dpy;	268	Display *dpy = s->display->dpy;
85	int size = max (rh, rv) * 2 + 1;	269	int size = max (rh, rv) * 2 + 1;
86	double kernel = (double )malloc (size * sizeof (double));	270	double kernel = (double )malloc (size * sizeof (double));
87	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));	271	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
		272	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
		273	img->alloc ();
88		274
89	XRenderPictureAttributes pa;	275	XRenderPictureAttributes pa;
90
91	pa.repeat = RepeatPad;	276	pa.repeat = RepeatPad;
92	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);	277	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
		278	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
		279
93	Pixmap tmp = XCreatePixmap (dpy, pm, w, h, format->depth);	280	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
94	Picture dst = XRenderCreatePicture (dpy, tmp, format, CPRepeat, &pa);	281	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
95	XFreePixmap (dpy, tmp);	282	XFreePixmap (dpy, tmp_pm);
96		283
97	if (kernel && params)	284	if (kernel && params)
98	{	285	{
99	size = rh * 2 + 1;	286	size = rh * 2 + 1;
100	get_gaussian_kernel (rh, size, kernel, params);	287	get_gaussian_kernel (rh, size, kernel, params);
101		288
102	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);	289	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
103	XRenderComposite (dpy,	290	XRenderComposite (dpy,
104	PictOpSrc,	291	PictOpSrc,
105	src,	292	src,
		293	None,
		294	tmp,
		295	0, 0,
		296	0, 0,
		297	0, 0,
		298	w, h);
		299
		300	size = rv * 2 + 1;
		301	get_gaussian_kernel (rv, size, kernel, params);
		302	::swap (params[0], params[1]);
		303
		304	XRenderSetPictureFilter (dpy, tmp, FilterConvolution, params, size+2);
		305	XRenderComposite (dpy,
		306	PictOpSrc,
		307	tmp,
106	None,	308	None,
107	dst,	309	dst,
108	0, 0,	310	0, 0,
109	0, 0,	311	0, 0,
110	0, 0,	312	0, 0,
111	w, h);	313	w, h);
112
113	::swap (src, dst);
114
115	size = rv * 2 + 1;
116	get_gaussian_kernel (rv, size, kernel, params);
117	::swap (params[0], params[1]);
118
119	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
120	XRenderComposite (dpy,
121	PictOpSrc,
122	src,
123	None,
124	dst,
125	0, 0,
126	0, 0,
127	0, 0,
128	w, h);
129	}	314	}
130		315
131	free (kernel);	316	free (kernel);
132	free (params);	317	free (params);
		318
133	XRenderFreePicture (dpy, src);	319	XRenderFreePicture (dpy, src);
134	XRenderFreePicture (dpy, dst);	320	XRenderFreePicture (dpy, dst);
		321	XRenderFreePicture (dpy, tmp);
		322
		323	return img;
135	}	324	}
136		325
137	static Picture	326	static Picture
138	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb)	327	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha)
139	{	328	{
140	Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);	329	Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
141		330
142	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);	331	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
143	XRenderPictureAttributes pa;	332	XRenderPictureAttributes pa;
144	pa.repeat = True;	333	pa.repeat = RepeatNormal;
		334	pa.component_alpha = component_alpha;
145	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);	335	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat \| CPComponentAlpha, &pa);
146		336
147	XFreePixmap (dpy, pixmap);	337	XFreePixmap (dpy, pixmap);
148		338
149	return mask;	339	return mask;
150	}	340	}
151		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
152	void	361	void
153	rxvt_img::brightness (double r, double g, double b, double a)	362	rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a)
154	{	363	{
		364	unshare ();
		365
155	Display *dpy = s->display->dpy;	366	Display *dpy = s->display->dpy;
156	Picture src = create_xrender_mask (dpy, pm, True);
157	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	367	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
158		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;
159	XRenderColor mask_c;	373	XRenderColor mask_c;
160	mask_c.red = float_to_component (r);	374
161	mask_c.green = float_to_component (g);	375	if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
162	mask_c.blue = float_to_component (b);
163	mask_c.alpha = float_to_component (a);
164	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);	376	XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
165		377
166	XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	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);
167	}	392	}
168		393
169	void	394	void
170	rxvt_img::contrast (double r, double g, double b, double a)	395	rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
171	{	396	{
172	if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))	397	if (r < 0 \|\| g < 0 \|\| b < 0 \|\| a < 0)
173	return;	398	rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");
174		399
175	Display *dpy = s->display->dpy;
176	Picture src = create_xrender_mask (dpy, pm, True);
177	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
178
179	XRenderColor mask_c;
180	mask_c.red = float_to_component (r);
181	mask_c.green = float_to_component (g);
182	mask_c.blue = float_to_component (b);
183	mask_c.alpha = float_to_component (a);
184	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
185
186	XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
187	}
188
189	void
190	rxvt_img::render (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y)
191	{
192	//TODO
193	}
194
195	rxvt_img *
196	rxvt_img::copy ()
197	{
198	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
199	Pixmap pm2 = XCreatePixmap (s->display->dpy, pm, w, h, format->depth);
200	XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, w, h, 0, 0);
201	XFreeGC (s->display->dpy, gc);
202	return new rxvt_img (s, format, w, h, pm2);
203	}
204
205	rxvt_img *
206	rxvt_img::transform (int new_width, int new_height, double matrix[16])
207	{
208	//TODO
209	}
210
211	rxvt_img *
212	rxvt_img::scale (int new_width, int new_height)
213	{
214	// use transform
215	//TODO
216	}
217
218	rxvt_img *
219	rxvt_img::convert_to (XRenderPictFormat *new_format)
220	{
221	rxvt_img *img = new rxvt_img (s,new_format,w, h);	400	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
		401	img->alloc ();
222		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
223	Display *dpy = s->display->dpy;	414	Display *dpy = s->display->dpy;
224	Picture src = XRenderCreatePicture (dpy, pm, format, 0, 0);	415
		416	Picture src = src_picture ();
225	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);	417	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
		418	Picture mul = create_xrender_mask (dpy, pm, True, True);
226		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	{
		428	XRenderFillRectangle (dpy, PictOpSrc, mul, &mask_c, 0, 0, 1, 1);
		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
227	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	495	XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);
228		496
229	XRenderFreePicture (dpy, src);	497	XRenderFreePicture (dpy, src);
230	XRenderFreePicture (dpy, dst);	498	XRenderFreePicture (dpy, dst);
231		499
232	return img;	500	return img;
233	}	501	}
234		502
		503	rxvt_img *
		504	rxvt_img::sub_rect (int x, int y, int width, int height)
		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	{
		527	rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat);
		528	img->alloc ();
		529
		530	Display *dpy = s->display->dpy;
		531	Picture src = src_picture ();
		532	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
		533
		534	XTransform xfrm;
		535
		536	for (int i = 0; i < 3; ++i)
		537	for (int j = 0; j < 3; ++j)
		538	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
		539
		540	xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
		541	xfrm.matrix [1][2] -= XDoubleToFixed (y);
		542
		543	XRenderSetPictureFilter (dpy, src, "good", 0, 0);
		544	XRenderSetPictureTransform (dpy, src, &xfrm);
		545	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
		546
		547	XRenderFreePicture (dpy, src);
		548	XRenderFreePicture (dpy, dst);
		549
		550	return img;
		551	}
		552
		553	rxvt_img *
		554	rxvt_img::scale (int new_width, int new_height)
		555	{
		556	if (w == new_width && h == new_height)
		557	return clone ();
		558
		559	double matrix[9] = {
		560	w / (double)new_width, 0, 0,
		561	0, h / (double)new_height, 0,
		562	0, 0, 1
		563	};
		564
		565	int old_repeat_mode = repeat;
		566	repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems
		567
		568	rxvt_img *img = transform (new_width, new_height, matrix);
		569
		570	repeat = old_repeat_mode;
		571	img->repeat = repeat;
		572
		573	return img;
		574	}
		575
		576	rxvt_img *
		577	rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)
		578	{
		579	double s = sin (phi);
		580	double c = cos (phi);
		581
		582	double matrix[9] = {
		583	c, -s, -c * x + s * y + x,
		584	s, c, -s * x - c * y + y,
		585	0, 0, 1
		586	};
		587
		588	return transform (new_width, new_height, matrix);
		589	}
		590
		591	rxvt_img *
		592	rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg)
		593	{
		594	if (new_format == format)
		595	return clone ();
		596
		597	rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);
		598	img->alloc ();
		599
		600	Display *dpy = s->display->dpy;
		601	Picture src = src_picture ();
		602	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
		603	int op = PictOpSrc;
		604
		605	if (format->direct.alphaMask && !new_format->direct.alphaMask)
		606	{
		607	// does it have to be that complicated
		608	rgba c;
		609	bg.get (c);
		610
		611	XRenderColor rc = { c.r, c.g, c.b, 0xffff };
		612	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);
		613
		614	op = PictOpOver;
		615	}
		616
		617	XRenderComposite (dpy, op, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
		618
		619	XRenderFreePicture (dpy, src);
		620	XRenderFreePicture (dpy, dst);
		621
		622	return img;
		623	}
		624
		625	rxvt_img *
		626	rxvt_img::blend (rxvt_img *img, double factor)
		627	{
		628	rxvt_img *img2 = clone ();
		629	Display *dpy = s->display->dpy;
		630	Picture src = img->src_picture ();
		631	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
		632	Picture mask = create_xrender_mask (dpy, img->pm, False, False);
		633
		634	XRenderColor mask_c;
		635
		636	mask_c.alpha = float_to_component (factor);
		637	mask_c.red =
		638	mask_c.green =
		639	mask_c.blue = 0;
		640	XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
		641
		642	XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, w, h);
		643
		644	XRenderFreePicture (dpy, src);
		645	XRenderFreePicture (dpy, dst);
		646	XRenderFreePicture (dpy, mask);
		647
		648	return img2;
		649	}
		650
235	#endif	651	#endif
236		652

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.9 by root, Sun Jun 3 20:47:00 2012 UTC vs. Revision 1.77 by root, Sun Jun 10 10:35:03 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.9 by root, Sun Jun 3 20:47:00 2012 UTC vs.
Revision 1.77 by root, Sun Jun 10 10:35:03 2012 UTC