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

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.28 by root, Wed Jun 6 20:22:03 2012 UTC vs.
Revision 1.73 by sf-exg, Sat Jun 9 17:28: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	{
		11	}
		12
		13	rxvt_img::rxvt_img (const rxvt_img &img)
		14	: s(img.s), x(img.x), y(img.y), w(img.w), h(img.h), format(img.format), repeat(img.repeat), pm(img.pm), ref(img.ref)
		15	{
		16	++ref->cnt;
18	}	17	}
19		18
20	rxvt_img *	19	rxvt_img *
21	rxvt_img::new_from_root (rxvt_screen *s)	20	rxvt_img::new_from_root (rxvt_screen *s)
22	{	21	{
…		…
37	return 0;	36	return 0;
38		37
39	rxvt_img *img = new rxvt_img (	38	rxvt_img *img = new rxvt_img (
40	s,	39	s,
41	XRenderFindVisualFormat (dpy, DefaultVisual (dpy, s->display->screen)),	40	XRenderFindVisualFormat (dpy, DefaultVisual (dpy, s->display->screen)),
		41	0,
		42	0,
42	root_pm_w,	43	root_pm_w,
43	root_pm_h,	44	root_pm_h
44	root_pixmap
45	);	45	);
46		46
47	img->shared = true;	47	img->pm = root_pixmap;
		48	img->ref = new pixref (root_pm_w, root_pm_h);
		49	img->ref->ours = false;
		50
		51	return img;
		52	}
		53
		54	# 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);
48		153
49	return img;	154	return img;
50	}	155	}
51		156
52	rxvt_img *	157	rxvt_img *
…		…
56	GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);	161	GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);
57		162
58	if (!pb)	163	if (!pb)
59	rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);	164	rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);
60		165
61	rxvt_img *img = new rxvt_img (	166	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
68	img->render_pixbuf (pb, 0, 0, img->w, img->h, 0, 0);
69		167
70	g_object_unref (pb);	168	g_object_unref (pb);
71		169
72	return img;	170	return img;
73	}	171	}
		172	# endif
		173
		174	void
		175	rxvt_img::destroy ()
		176	{
		177	if (--ref->cnt)
		178	return;
		179
		180	if (pm && ref->ours)
		181	XFreePixmap (s->display->dpy, pm);
		182
		183	delete ref;
		184	}
74		185
75	rxvt_img::~rxvt_img ()	186	rxvt_img::~rxvt_img ()
76	{	187	{
77	if (!shared)	188	destroy ();
78	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;
79	}	208	}
80		209
81	void	210	void
82	rxvt_img::unshare ()	211	rxvt_img::unshare ()
83	{	212	{
84	if (!shared)	213	if (ref->cnt == 1 && ref->ours)
85	return;	214	return;
86		215
87	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);
88		220
89	::swap (pm , img->pm);	221	destroy ();
90	::swap (shared, img->shared);
91		222
92	delete img;	223	pm = pm2;
		224	ref = new pixref (ref->w, ref->h);
93	}	225	}
94		226
95	void	227	void
96	rxvt_img::fill (const rxvt_color &c)	228	rxvt_img::fill (const rxvt_color &c)
97	{	229	{
…		…
131		263
132	Display *dpy = s->display->dpy;	264	Display *dpy = s->display->dpy;
133	int size = max (rh, rv) * 2 + 1;	265	int size = max (rh, rv) * 2 + 1;
134	double kernel = (double )malloc (size * sizeof (double));	266	double kernel = (double )malloc (size * sizeof (double));
135	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));	267	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
136	rxvt_img *img = new rxvt_img (s, format, w, h);	268	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
		269	img->alloc ();
137		270
138	XRenderPictureAttributes pa;	271	XRenderPictureAttributes pa;
139
140	pa.repeat = RepeatPad;	272	pa.repeat = RepeatPad;
141	Picture src = XRenderCreatePicture (dpy, pm , format, CPRepeat, &pa);	273	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
142	Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa);	274	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
143		275
144	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);	276	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
145	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);	277	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
146	XFreePixmap (dpy, tmp_pm);	278	XFreePixmap (dpy, tmp_pm);
147		279
…		…
163		295
164	size = rv * 2 + 1;	296	size = rv * 2 + 1;
165	get_gaussian_kernel (rv, size, kernel, params);	297	get_gaussian_kernel (rv, size, kernel, params);
166	::swap (params[0], params[1]);	298	::swap (params[0], params[1]);
167		299
168	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);	300	XRenderSetPictureFilter (dpy, tmp, FilterConvolution, params, size+2);
169	XRenderComposite (dpy,	301	XRenderComposite (dpy,
170	PictOpSrc,	302	PictOpSrc,
171	tmp,	303	tmp,
172	None,	304	None,
173	dst,	305	dst,
…		…
184	XRenderFreePicture (dpy, tmp);	316	XRenderFreePicture (dpy, tmp);
185		317
186	return img;	318	return img;
187	}	319	}
188		320
189	static Picture	321	static void
190	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb)	322	extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)
191	{	323	{
192	Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);	324	int32_t x = clamp (c, cl0, cl1);
		325	c -= x;
		326	xc = x;
		327	}
193		328
194	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);	329	static bool
195	XRenderPictureAttributes pa;	330	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)
196	pa.repeat = True;	331	{
197	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);	332	extract (cl0, cl1, r, xr);
		333	extract (cl0, cl1, g, xg);
		334	extract (cl0, cl1, b, xb);
		335	extract (cl0, cl1, a, xa);
198		336
199	XFreePixmap (dpy, pixmap);	337	return xr \| xg \| xb \| xa;
200
201	return mask;
202	}	338	}
203		339
204	void	340	void
205	rxvt_img::brightness (double r, double g, double b, double a)	341	rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a)
206	{	342	{
		343	unshare ();
		344
207	Display *dpy = s->display->dpy;	345	Display *dpy = s->display->dpy;
208	Picture src = create_xrender_mask (dpy, pm, True);
209	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	346	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
210		347
		348	// loop should not be needed for brightness, as only -1..1 makes sense
		349	//while (r \| g \| b \| a)
		350	{
		351	unsigned short xr, xg, xb, xa;
		352	XRenderColor mask_c;
		353
		354	if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
		355	XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
		356
		357	if (extract (-65535, 0, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
		358	{
		359	XRenderColor mask_w = { 65535, 65535, 65535, 65535 };
		360	XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
		361	mask_c.red = -mask_c.red; //TODO: verify that doing clamp, assign, and negation does the right thing
		362	mask_c.green = -mask_c.green;
		363	mask_c.blue = -mask_c.blue;
		364	mask_c.alpha = -mask_c.alpha;
		365	XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
		366	XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
		367	}
		368	}
		369
		370
		371	XRenderFreePicture (dpy, dst);
		372	}
		373
		374	void
		375	rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
		376	{
		377	if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
		378	{
		379	rxvt_warn ("rxvt_img::contrast operation not supported on this display, RENDER extension too old.\n");
		380	return;
		381	}
		382
		383	unshare ();
		384
		385	Display *dpy = s->display->dpy;
		386	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
		387
211	XRenderColor mask_c;	388	XRenderColor mask_c;
212	mask_c.red = float_to_component (r);	389	mask_c.red = r;
213	mask_c.green = float_to_component (g);	390	mask_c.green = g;
214	mask_c.blue = float_to_component (b);	391	mask_c.blue = b;
215	mask_c.alpha = float_to_component (a);	392	mask_c.alpha = a;
216	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);	393	XRenderFillRectangle (dpy, PictOpMultiply, dst, &mask_c, 0, 0, w, h);
217		394
		395	XRenderFreePicture (dpy, dst);
		396	}
		397
		398	rxvt_img *
		399	rxvt_img::clone ()
		400	{
		401	return new rxvt_img (*this);
		402	}
		403
		404	static XRenderPictFormat *
		405	find_alpha_format_for (Display dpy, XRenderPictFormat format)
		406	{
		407	if (format->direct.alphaMask)
		408	return format; // already has alpha
		409
		410	// try to find a suitable alpha format, one bit alpha is enough for our purposes
		411	if (format->type == PictTypeDirect)
		412	for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
		413	if (f->direct.alphaMask
		414	&& f->type == PictTypeDirect
		415	&& ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
		416	&& ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
		417	&& ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
		418	return f;
		419
		420	// should be a very good fallback
		421	return XRenderFindStandardFormat (dpy, PictStandardARGB32);
		422	}
		423
		424	rxvt_img *
		425	rxvt_img::reify ()
		426	{
		427	if (x == 0 && y == 0 && w == ref->w && h == ref->h)
		428	return clone ();
		429
		430	Display *dpy = s->display->dpy;
		431
		432	// add an alpha channel if...
		433	bool alpha = !format->direct.alphaMask // pixmap has none yet
		434	&& (x \|\| y) // we need one because of non-zero offset
		435	&& repeat == RepeatNone; // and we have no good pixels to fill with
		436
		437	rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
		438	img->alloc ();
		439
		440	Picture src = src_picture ();
		441	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
		442
		443	if (alpha)
		444	{
		445	XRenderColor rc = { 0, 0, 0, 0 };
		446	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
		447	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h);
		448	}
		449	else
218	XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	450	XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);
219		451
220	XRenderFreePicture (dpy, src);	452	XRenderFreePicture (dpy, src);
221	XRenderFreePicture (dpy, dst);	453	XRenderFreePicture (dpy, dst);
222	}
223		454
224	void
225	rxvt_img::contrast (double r, double g, double b, double a)
226	{
227	if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
228	return;	455	return img;
229
230	Display *dpy = s->display->dpy;
231	Picture src = create_xrender_mask (dpy, pm, True);
232	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
233
234	XRenderColor mask_c;
235	mask_c.red = float_to_component (r);
236	mask_c.green = float_to_component (g);
237	mask_c.blue = float_to_component (b);
238	mask_c.alpha = float_to_component (a);
239	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
240
241	XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
242
243	XRenderFreePicture (dpy, src);
244	XRenderFreePicture (dpy, dst);
245	}	456	}
246		457
247	bool
248	rxvt_img::render_pixbuf (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y)
249	{
250	Display *dpy = s->display->dpy;
251
252	if (s->visual->c_class != TrueColor)
253	return false;
254
255	uint32_t red_mask, green_mask, blue_mask, alpha_mask;
256
257	red_mask = (uint32_t)format->direct.redMask << format->direct.red;
258	green_mask = (uint32_t)format->direct.greenMask << format->direct.green;
259	blue_mask = (uint32_t)format->direct.blueMask << format->direct.blue;
260	alpha_mask = (uint32_t)format->direct.alphaMask << format->direct.alpha;
261
262	int width_r = ecb_popcount32 (red_mask);
263	int width_g = ecb_popcount32 (green_mask);
264	int width_b = ecb_popcount32 (blue_mask);
265	int width_a = ecb_popcount32 (alpha_mask);
266
267	if (width_r > 8 \|\| width_g > 8 \|\| width_b > 8 \|\| width_a > 8)
268	return false;
269
270	int sh_r = ecb_ctz32 (red_mask);
271	int sh_g = ecb_ctz32 (green_mask);
272	int sh_b = ecb_ctz32 (blue_mask);
273	int sh_a = ecb_ctz32 (alpha_mask);
274
275	if (width > 32767 \|\| height > 32767)
276	return false;
277
278	XImage *ximage = XCreateImage (dpy, s->visual, format->depth, ZPixmap, 0, 0,
279	width, height, 32, 0);
280	if (!ximage)
281	return false;
282
283	if (height > INT_MAX / ximage->bytes_per_line
284	\|\| !(ximage->data = (char )malloc (height ximage->bytes_per_line)))
285	{
286	XDestroyImage (ximage);
287	return false;
288	}
289
290	GC gc = XCreateGC (dpy, pm, 0, 0);
291
292	ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
293
294	int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
295	int channels = gdk_pixbuf_get_n_channels (pixbuf);
296	unsigned char row = gdk_pixbuf_get_pixels (pixbuf) + src_y rowstride + src_x * channels;
297	char *line = ximage->data;
298
299	for (int y = 0; y < height; y++)
300	{
301	for (int x = 0; x < width; x++)
302	{
303	unsigned char pixel = row + x channels;
304	uint32_t value;
305	unsigned char r, g, b, a;
306
307	if (channels == 4)
308	{
309	a = pixel[3];
310	r = pixel[0] * a / 0xff;
311	g = pixel[1] * a / 0xff;
312	b = pixel[2] * a / 0xff;
313	}
314	else
315	{
316	a = 0xff;
317	r = pixel[0];
318	g = pixel[1];
319	b = pixel[2];
320	}
321
322	value = ((r >> (8 - width_r)) << sh_r)
323	\| ((g >> (8 - width_g)) << sh_g)
324	\| ((b >> (8 - width_b)) << sh_b)
325	\| ((a >> (8 - width_a)) << sh_a);
326
327	if (ximage->bits_per_pixel == 32)
328	((uint32_t *)line)[x] = value;
329	else
330	XPutPixel (ximage, x, y, value);
331	}
332
333	row += rowstride;
334	line += ximage->bytes_per_line;
335	}
336
337	XPutImage (dpy, pm, gc, ximage, 0, 0, dst_x, dst_y, width, height);
338	XDestroyImage (ximage);
339	XFreeGC (dpy, gc);
340
341	return true;
342	}
343
344	rxvt_img *	458	rxvt_img *
345	rxvt_img::clone ()
346	{
347	rxvt_img *img = new rxvt_img (s, format, w, h);
348
349	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
350	XCopyArea (s->display->dpy, pm, img->pm, gc, 0, 0, w, h, 0, 0);
351	XFreeGC (s->display->dpy, gc);
352
353	return img;
354	}
355
356	rxvt_img *
357	rxvt_img::sub_rect (int x, int y, int width, int height, int repeat)	459	rxvt_img::sub_rect (int x, int y, int width, int height)
358	{	460	{
		461	rxvt_img *img = clone ();
		462
		463	img->x += x;
		464	img->y += y;
		465
		466	if (w != width \|\| h != height)
		467	{
		468	img->w = width;
		469	img->h = height;
		470
		471	rxvt_img *img2 = img->reify ();
		472	delete img;
		473	img = img2;
		474	}
		475
		476	return img;
		477	}
		478
		479	rxvt_img *
		480	rxvt_img::transform (int new_width, int new_height, double matrix[9])
		481	{
359	rxvt_img *img = new rxvt_img (s, format, width, height);	482	rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat);
		483	img->alloc ();
360		484
361	Display *dpy = s->display->dpy;	485	Display *dpy = s->display->dpy;
362	XRenderPictureAttributes pa;	486	Picture src = src_picture ();
363	pa.repeat = repeat;
364	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
365	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	487	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
366
367	XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, width, height);
368
369	XRenderFreePicture (dpy, src);
370	XRenderFreePicture (dpy, dst);
371
372	return img;
373	}
374
375	rxvt_img *
376	rxvt_img::transform (int new_width, int new_height, double matrix[9], int repeat)
377	{
378	rxvt_img *img = new rxvt_img (s, format, new_width, new_height);
379
380	Display *dpy = s->display->dpy;
381	XRenderPictureAttributes pa;
382	pa.repeat = repeat;
383	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
384	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
385		488
386	XTransform xfrm;	489	XTransform xfrm;
387		490
388	for (int i = 0; i < 3; ++i)	491	for (int i = 0; i < 3; ++i)
389	for (int j = 0; j < 3; ++j)	492	for (int j = 0; j < 3; ++j)
390	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);	493	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
391		494
		495	xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
		496	xfrm.matrix [1][2] -= XDoubleToFixed (y);
		497
392	XRenderSetPictureFilter (dpy, src, "good", 0, 0);	498	XRenderSetPictureFilter (dpy, src, "good", 0, 0);
393	XRenderSetPictureTransform (dpy, src, &xfrm);	499	XRenderSetPictureTransform (dpy, src, &xfrm);
394	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);	500	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
395		501
396	XRenderFreePicture (dpy, src);	502	XRenderFreePicture (dpy, src);
…		…
400	}	506	}
401		507
402	rxvt_img *	508	rxvt_img *
403	rxvt_img::scale (int new_width, int new_height)	509	rxvt_img::scale (int new_width, int new_height)
404	{	510	{
		511	if (w == new_width && h == new_height)
		512	return clone ();
		513
405	double matrix[9] = {	514	double matrix[9] = {
406	w / (double)new_width, 0, 0,	515	w / (double)new_width, 0, 0,
407	0, h / (double)new_height, 0,	516	0, h / (double)new_height, 0,
408	0, 0, 1	517	0, 0, 1
409	};	518	};
410		519
		520	int old_repeat_mode = repeat;
		521	repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems
		522
411	return transform (new_width, new_height, matrix);	523	rxvt_img *img = transform (new_width, new_height, matrix);
412	}
413		524
		525	repeat = old_repeat_mode;
		526	img->repeat = repeat;
		527
		528	return img;
		529	}
		530
414	rxvt_img *	531	rxvt_img *
415	rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi, int repeat)	532	rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)
416	{	533	{
417	double s = sin (phi);	534	double s = sin (phi);
418	double c = cos (phi);	535	double c = cos (phi);
419		536
420	double matrix[9] = {	537	double matrix[9] = {
421	c, -s, -c * x + s * y + x,	538	c, -s, -c * x + s * y + x,
422	s, c, -s * x - c * y + y,	539	s, c, -s * x - c * y + y,
423	0, 0, 1	540	0, 0, 1
424	};	541	};
425		542
426	return transform (new_width, new_height, matrix, repeat);	543	return transform (new_width, new_height, matrix);
427	}	544	}
428		545
429	rxvt_img *	546	rxvt_img *
430	rxvt_img::convert_to (XRenderPictFormat *new_format, const rxvt_color &bg)	547	rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg)
431	{	548	{
		549	if (new_format == format)
		550	return clone ();
		551
432	rxvt_img *img = new rxvt_img (s, new_format, w, h);	552	rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);
		553	img->alloc ();
433		554
434	Display *dpy = s->display->dpy;	555	Display *dpy = s->display->dpy;
435	Picture src = XRenderCreatePicture (dpy, pm, format, 0, 0);	556	Picture src = src_picture ();
436	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);	557	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
437	int op = PictOpSrc;	558	int op = PictOpSrc;
438		559
439	printf ("fa %x,%x fb %x,%x\n", format->direct.alpha, format->direct.alphaMask, new_format->direct.alpha, new_format->direct.alphaMask);//D
440
441	if (format->direct.alpha && !new_format->direct.alpha)	560	if (format->direct.alphaMask && !new_format->direct.alphaMask)
442	{	561	{
443	// does it have to be that complicated	562	// does it have to be that complicated
444	rgba c;	563	rgba c;
445	bg.get (c);	564	bg.get (c);
446		565
…		…
461	rxvt_img *	580	rxvt_img *
462	rxvt_img::blend (rxvt_img *img, double factor)	581	rxvt_img::blend (rxvt_img *img, double factor)
463	{	582	{
464	rxvt_img *img2 = clone ();	583	rxvt_img *img2 = clone ();
465	Display *dpy = s->display->dpy;	584	Display *dpy = s->display->dpy;
466	Picture src = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	585	Picture src = img->src_picture ();
467	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);	586	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
468	Picture mask = create_xrender_mask (dpy, img->pm, False);	587
		588	Pixmap pixmap = XCreatePixmap (dpy, img->pm, 1, 1, 8);
		589	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, PictStandardA8);
		590	XRenderPictureAttributes pa;
		591	pa.repeat = True;
		592	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);
		593	XFreePixmap (dpy, pixmap);
469		594
470	XRenderColor mask_c;	595	XRenderColor mask_c;
471		596
472	mask_c.alpha = float_to_component (factor);	597	mask_c.alpha = float_to_component (factor);
473	mask_c.red =	598	mask_c.red =

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.28 by root, Wed Jun 6 20:22:03 2012 UTC vs. Revision 1.73 by sf-exg, Sat Jun 9 17:28:03 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.28 by root, Wed Jun 6 20:22:03 2012 UTC vs.
Revision 1.73 by sf-exg, Sat Jun 9 17:28:03 2012 UTC