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

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.96 by root, Sat Jun 16 15:55:19 2012 UTC vs.
Revision 1.98 by root, Sun Jun 17 21:58:18 2012 UTC

…		…
1	/----------------------------------------------------------------------	1	/----------------------------------------------------------------------
2	* File: rxvtimg.h	2	* File: rxvtimg.C
3	----------------------------------------------------------------------	3	----------------------------------------------------------------------
4	*	4	*
5	* All portions of code are copyright by their respective author/s.	5	* All portions of code are copyright by their respective author/s.
6	* Copyright (c) 2012 Marc Lehmann <schmorp@schmorp.de>	6	* Copyright (c) 2012 Marc Lehmann <schmorp@schmorp.de>
7	* Copyright (c) 2012 Emanuele Giaquinta <e.giaquinta@glauco.it>	7	* Copyright (c) 2012 Emanuele Giaquinta <e.giaquinta@glauco.it>
30		30
31	typedef rxvt_img::nv nv;	31	typedef rxvt_img::nv nv;
32		32
33	namespace	33	namespace
34	{	34	{
35
36	struct mat3x3	35	struct mat3x3
37	{	36	{
38	nv v[3][3];	37	nv v[3][3];
39		38
40	mat3x3 ()	39	mat3x3 ()
…		…
51	v[0][0] = v11; v[0][1] = v12; v[0][2] = v13;	50	v[0][0] = v11; v[0][1] = v12; v[0][2] = v13;
52	v[1][0] = v21; v[1][1] = v22; v[1][2] = v23;	51	v[1][0] = v21; v[1][1] = v22; v[1][2] = v23;
53	v[2][0] = v31; v[2][1] = v32; v[2][2] = v33;	52	v[2][0] = v31; v[2][1] = v32; v[2][2] = v33;
54	}	53	}
55		54
56	mat3x3 invert ();	55	mat3x3 inverse ();
57		56
58	nv *operator [](int i) { return &v[i][0]; }	57	nv *operator [](int i) { return &v[i][0]; }
59	const nv *operator [](int i) const { return &v[i][0]; }	58	const nv *operator [](int i) const { return &v[i][0]; }
60		59
61	operator const nv * () const { return &v[0][0]; }	60	operator const nv * () const { return &v[0][0]; }
…		…
76	static mat3x3 scale (nv s, nv t);	75	static mat3x3 scale (nv s, nv t);
77	static mat3x3 rotate (nv phi);	76	static mat3x3 rotate (nv phi);
78	};	77	};
79		78
80	mat3x3	79	mat3x3
81	mat3x3::invert ()	80	mat3x3::inverse ()
82	{	81	{
83	mat3x3 &m = *this;	82	mat3x3 &m = *this;
84	mat3x3 inv;	83	mat3x3 inv;
85		84
86	nv s0 = m[2][2] * m[1][1] - m[2][1] * m[1][2];	85	nv s0 = m[2][2] * m[1][1] - m[2][1] * m[1][2];
…		…
150	s, c, 0,	149	s, c, 0,
151	0, 0, 1	150	0, 0, 1
152	);	151	);
153	}	152	}
154		153
155	}	154	struct composer
156
157	#if 0
158	struct pict
159	{
160	Display *dpy;
161	Picture pic;
162
163	operator Picture () const
164	{	155	{
165	return pic;	156	rxvt_img srcimg, dstimg;
166	}	157	Picture src, dst, msk;
		158	Display *dpy;
167		159
168	pict ()	160	ecb_noinline
169	: pic (0)	161	composer (rxvt_img srcimg, rxvt_img dstimg = 0)
		162	: srcimg (srcimg), dstimg (dstimg), msk (0)
170	{	163	{
		164	if (!this->dstimg)
		165	this->dstimg = srcimg->new_empty ();
		166	else if (!this->dstimg->pm) // somewhat unsatisfying
		167	this->dstimg->alloc ();
		168
		169	dpy = srcimg->s->dpy;
		170	src = srcimg->picture ();
		171	dst = this->dstimg->picture ();
171	}	172	}
172		173
173	pict (rxvt_img img, XRenderPictFormat format = 0)	174	ecb_noinline
174	: dpy (img->s->display->dpy)	175	void mask (bool rgb = true, int x = 1, int y = 1)
175	{	176	{
		177	Pixmap pixmap = XCreatePixmap (dpy, srcimg->pm, x, y, rgb ? 32 : 8);
		178
		179	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, rgb ? PictStandardARGB32 : PictStandardA8);
176	XRenderPictureAttributes pa;	180	XRenderPictureAttributes pa;
177	pa.repeat = img->repeat;	181	pa.repeat = RepeatNormal;
178	pic = XRenderCreatePicture (dpy, img->pm, format ? format : img->format, CPRepeat, &pa);	182	pa.component_alpha = rgb;
		183	msk = XRenderCreatePicture (dpy, pixmap, format, CPRepeat \| CPComponentAlpha, &pa);
		184
		185	XFreePixmap (dpy, pixmap);
		186
		187	ecb_assume (msk);
		188	}
		189
		190	// CreateSolidFill creates a very very very weird picture
		191	void mask (const rgba &c)
		192	{
		193	XRenderColor rc = {
		194	c.r * c.a / 65535,
		195	c.g * c.a / 65535,
		196	c.b * c.a / 65535,
		197	c.a
		198	};
		199	msk = XRenderCreateSolidFill (dpy, &rc);
		200	ecb_assume (msk);
		201	}
		202
		203	void fill (const rgba &c)
		204	{
		205	XRenderColor rc = {
		206	c.r * c.a / 65535,
		207	c.g * c.a / 65535,
		208	c.b * c.a / 65535,
		209	c.a
		210	};
		211
		212	XRenderFillRectangle (dpy, PictOpSrc, msk, &rc, 0, 0, 1, 1);
		213	}
		214
		215	operator rxvt_img *()
		216	{
		217	return dstimg;
		218	}
		219
		220	ecb_noinline
		221	~composer ()
		222	{
		223	XRenderFreePicture (dpy, src);
		224	XRenderFreePicture (dpy, dst);
		225	if (msk) XRenderFreePicture (dpy, msk);
		226	}
179	}	227	};
180		228	}
181	~pict ()
182	{
183	if (pic)
184	XRenderFreePicture (dpy, pic);
185	}
186	};
187	#endif
188		229
189	static XRenderPictFormat *	230	static XRenderPictFormat *
190	find_alpha_format_for (Display dpy, XRenderPictFormat format)	231	find_alpha_format_for (Display dpy, XRenderPictFormat format)
191	{	232	{
192	if (format->direct.alphaMask)	233	if (format->direct.alphaMask)
…		…
219	}	260	}
220		261
221	rxvt_img *	262	rxvt_img *
222	rxvt_img::new_from_root (rxvt_screen *s)	263	rxvt_img::new_from_root (rxvt_screen *s)
223	{	264	{
224	Display *dpy = s->display->dpy;	265	Display *dpy = s->dpy;
225	unsigned int root_pm_w, root_pm_h;	266	unsigned int root_pm_w, root_pm_h;
226	Pixmap root_pixmap = s->display->get_pixmap_property (s->display->xa[XA_XROOTPMAP_ID]);	267	Pixmap root_pixmap = s->display->get_pixmap_property (s->display->xa [XA_XROOTPMAP_ID]);
227	if (root_pixmap == None)	268	if (root_pixmap == None)
228	root_pixmap = s->display->get_pixmap_property (s->display->xa[XA_ESETROOT_PMAP_ID]);	269	root_pixmap = s->display->get_pixmap_property (s->display->xa [XA_ESETROOT_PMAP_ID]);
229		270
230	if (root_pixmap == None)	271	if (root_pixmap == None)
231	return 0;	272	return 0;
232		273
233	Window wdummy;	274	Window wdummy;
…		…
256	# if HAVE_PIXBUF	297	# if HAVE_PIXBUF
257		298
258	rxvt_img *	299	rxvt_img *
259	rxvt_img::new_from_pixbuf (rxvt_screen s, GdkPixbuf pb)	300	rxvt_img::new_from_pixbuf (rxvt_screen s, GdkPixbuf pb)
260	{	301	{
261	Display *dpy = s->display->dpy;	302	Display *dpy = s->dpy;
262		303
263	int width = gdk_pixbuf_get_width (pb);	304	int width = gdk_pixbuf_get_width (pb);
264	int height = gdk_pixbuf_get_height (pb);	305	int height = gdk_pixbuf_get_height (pb);
265		306
266	if (width > 32767 \|\| height > 32767) // well, we could upload in chunks	307	if (width > 32767 \|\| height > 32767) // well, we could upload in chunks
…		…
316	uint8_t r = *src++;	357	uint8_t r = *src++;
317	uint8_t g = *src++;	358	uint8_t g = *src++;
318	uint8_t b = *src++;	359	uint8_t b = *src++;
319		360
320	uint32_t v = (255 << 24) \| (r << 16) \| (g << 8) \| b;	361	uint32_t v = (255 << 24) \| (r << 16) \| (g << 8) \| b;
321		362
322	if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)	363	if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
323	v = ecb_bswap32 (v);	364	v = ecb_bswap32 (v);
324		365
325	*dst++ = v;	366	*dst++ = v;
326	}	367	}
…		…
379	{	420	{
380	if (--ref->cnt)	421	if (--ref->cnt)
381	return;	422	return;
382		423
383	if (pm && ref->ours)	424	if (pm && ref->ours)
384	XFreePixmap (s->display->dpy, pm);	425	XFreePixmap (s->dpy, pm);
385		426
386	delete ref;	427	delete ref;
387	}	428	}
388		429
389	rxvt_img::~rxvt_img ()	430	rxvt_img::~rxvt_img ()
…		…
392	}	433	}
393		434
394	void	435	void
395	rxvt_img::alloc ()	436	rxvt_img::alloc ()
396	{	437	{
397	pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);	438	pm = XCreatePixmap (s->dpy, s->display->root, w, h, format->depth);
398	ref = new pixref (w, h);	439	ref = new pixref (w, h);
		440	}
		441
		442	rxvt_img *
		443	rxvt_img::new_empty ()
		444	{
		445	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
		446	img->alloc ();
		447
		448	return img;
399	}	449	}
400		450
401	Picture	451	Picture
402	rxvt_img::picture ()	452	rxvt_img::picture ()
403	{	453	{
404	Display *dpy = s->display->dpy;	454	Display *dpy = s->dpy;
405		455
406	XRenderPictureAttributes pa;	456	XRenderPictureAttributes pa;
407	pa.repeat = repeat;	457	pa.repeat = repeat;
408	Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);	458	Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
409		459
…		…
414	rxvt_img::unshare ()	464	rxvt_img::unshare ()
415	{	465	{
416	if (ref->cnt == 1 && ref->ours)	466	if (ref->cnt == 1 && ref->ours)
417	return;	467	return;
418		468
419	Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth);	469	Pixmap pm2 = XCreatePixmap (s->dpy, s->display->root, ref->w, ref->h, format->depth);
420	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);	470	GC gc = XCreateGC (s->dpy, pm, 0, 0);
421	XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);	471	XCopyArea (s->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
422	XFreeGC (s->display->dpy, gc);	472	XFreeGC (s->dpy, gc);
423		473
424	destroy ();	474	destroy ();
425		475
426	pm = pm2;	476	pm = pm2;
427	ref = new pixref (ref->w, ref->h);	477	ref = new pixref (ref->w, ref->h);
…		…
430	void	480	void
431	rxvt_img::fill (const rgba &c)	481	rxvt_img::fill (const rgba &c)
432	{	482	{
433	XRenderColor rc = { c.r, c.g, c.b, c.a };	483	XRenderColor rc = { c.r, c.g, c.b, c.a };
434		484
435	Display *dpy = s->display->dpy;	485	Display *dpy = s->dpy;
436	Picture src = picture ();	486	Picture src = picture ();
437	XRenderFillRectangle (dpy, PictOpSrc, src, &rc, 0, 0, w, h);	487	XRenderFillRectangle (dpy, PictOpSrc, src, &rc, 0, 0, w, h);
438	XRenderFreePicture (dpy, src);	488	XRenderFreePicture (dpy, src);
439	}	489	}
440		490
…		…
442	rxvt_img::add_alpha ()	492	rxvt_img::add_alpha ()
443	{	493	{
444	if (format->direct.alphaMask)	494	if (format->direct.alphaMask)
445	return;	495	return;
446		496
447	Display *dpy = s->display->dpy;
448
449	rxvt_img *img = new rxvt_img (s, find_alpha_format_for (dpy, format), x, y, w, h, repeat);	497	composer cc (this, new rxvt_img (s, find_alpha_format_for (s->dpy, format), x, y, w, h, repeat));
450	img->alloc ();
451
452	Picture src = picture ();
453	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
454		498
455	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	499	XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
456		500
457	XRenderFreePicture (dpy, src);	501	rxvt_img *img = cc;
458	XRenderFreePicture (dpy, dst);
459		502
460	::swap (img->ref, ref);	503	::swap (img->ref, ref);
461	::swap (img->pm , pm );	504	::swap (img->pm , pm );
462		505
463	delete img;	506	delete img;
…		…
488	rxvt_img::blur (int rh, int rv)	531	rxvt_img::blur (int rh, int rv)
489	{	532	{
490	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))	533	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))
491	return clone ();	534	return clone ();
492		535
493	Display *dpy = s->display->dpy;	536	Display *dpy = s->dpy;
494	int size = max (rh, rv) * 2 + 1;	537	int size = max (rh, rv) * 2 + 1;
495	nv kernel = (nv )malloc (size * sizeof (nv));	538	nv kernel = (nv )malloc (size * sizeof (nv));
496	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));	539	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
497	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);	540	rxvt_img *img = new_empty ();
498	img->alloc ();
499		541
500	XRenderPictureAttributes pa;	542	XRenderPictureAttributes pa;
501	pa.repeat = RepeatPad;	543	pa.repeat = RepeatPad;
502	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);	544	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
503	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);	545	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
…		…
546	XRenderFreePicture (dpy, tmp);	588	XRenderFreePicture (dpy, tmp);
547		589
548	return img;	590	return img;
549	}	591	}
550		592
551	static Picture	593	ecb_noinline static void
552	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha)
553	{
554	Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
555
556	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
557	XRenderPictureAttributes pa;
558	pa.repeat = RepeatNormal;
559	pa.component_alpha = component_alpha;
560	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat \| CPComponentAlpha, &pa);
561
562	XFreePixmap (dpy, pixmap);
563
564	return mask;
565	}
566
567	static void
568	extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)	594	extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)
569	{	595	{
570	int32_t x = clamp (c, cl0, cl1);	596	int32_t x = clamp (c, cl0, cl1);
571	c -= x;	597	c -= x;
572	xc = x;	598	xc = x;
573	}	599	}
574		600
575	static bool	601	ecb_noinline static bool
576	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)	602	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)
577	{	603	{
578	extract (cl0, cl1, r, xr);	604	extract (cl0, cl1, r, xr);
579	extract (cl0, cl1, g, xg);	605	extract (cl0, cl1, g, xg);
580	extract (cl0, cl1, b, xb);	606	extract (cl0, cl1, b, xb);
…		…
586	void	612	void
587	rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a)	613	rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a)
588	{	614	{
589	unshare ();	615	unshare ();
590		616
591	Display *dpy = s->display->dpy;	617	Display *dpy = s->dpy;
592	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	618	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
593		619
594	// loop should not be needed for brightness, as only -1..1 makes sense	620	// loop should not be needed for brightness, as only -1..1 makes sense
595	//while (r \| g \| b \| a)	621	//while (r \| g \| b \| a)
596	{	622	{
…		…
620	rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)	646	rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
621	{	647	{
622	if (r < 0 \|\| g < 0 \|\| b < 0 \|\| a < 0)	648	if (r < 0 \|\| g < 0 \|\| b < 0 \|\| a < 0)
623	rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");	649	rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");
624		650
625	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
626	img->alloc ();
627	img->fill (rgba (0, 0, 0, 0));
628
629	// premultiply (yeah, these are not exact, sue me or fix it)	651	// premultiply (yeah, these are not exact, sue me or fix it)
630	r = (r * (a >> 8)) >> 8;	652	r = (r * (a >> 8)) >> 8;
631	g = (g * (a >> 8)) >> 8;	653	g = (g * (a >> 8)) >> 8;
632	b = (b * (a >> 8)) >> 8;	654	b = (b * (a >> 8)) >> 8;
633		655
634	Display *dpy = s->display->dpy;	656	composer cc (this);
		657	rxvt_img *img = cc;
		658	img->fill (rgba (0, 0, 0, 0));
635		659
636	Picture src = picture ();	660	cc.mask (true);
637	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
638	Picture mul = create_xrender_mask (dpy, pm, True, True);
639		661
640	//TODO: this operator does not yet implement some useful contrast	662	//TODO: this operator does not yet implement some useful contrast
641	while (r \| g \| b \| a)	663	while (r \| g \| b \| a)
642	{	664	{
643	unsigned short xr, xg, xb, xa;	665	unsigned short xr, xg, xb, xa;
644	XRenderColor mask_c;	666	XRenderColor mask_c;
645		667
646	if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))	668	if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
647	{	669	{
648	XRenderFillRectangle (dpy, PictOpSrc, mul, &mask_c, 0, 0, 1, 1);	670	XRenderFillRectangle (cc.dpy, PictOpSrc, cc.msk, &mask_c, 0, 0, 1, 1);
649	XRenderComposite (dpy, PictOpAdd, src, mul, dst, 0, 0, 0, 0, 0, 0, w, h);	671	XRenderComposite (cc.dpy, PictOpAdd, cc.src, cc.msk, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
650	}	672	}
651	}	673	}
652
653	XRenderFreePicture (dpy, mul);
654	XRenderFreePicture (dpy, dst);
655	XRenderFreePicture (dpy, src);
656		674
657	::swap (img->ref, ref);	675	::swap (img->ref, ref);
658	::swap (img->pm , pm );	676	::swap (img->pm , pm );
659		677
660	delete img;	678	delete img;
…		…
663	void	681	void
664	rxvt_img::draw (rxvt_img *img, int op, nv mask)	682	rxvt_img::draw (rxvt_img *img, int op, nv mask)
665	{	683	{
666	unshare ();	684	unshare ();
667		685
668	Display *dpy = s->display->dpy;	686	composer cc (img, this);
669	Picture src = img->picture ();
670	Picture dst = picture ();
671	Picture mask_p = 0;
672		687
673	if (mask != 1.)	688	if (mask != 1.)
674	{	689	cc.mask (rgba (0, 0, 0, float_to_component (mask)));
675	mask_p = create_xrender_mask (dpy, img->pm, False, False);
676	XRenderColor mask_c = { 0, 0, 0, float_to_component (mask) };
677	XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
678	}
679		690
680	XRenderComposite (dpy, op, src, mask_p, dst, x - img->x, y - img->y, 0, 0, 0, 0, w, h);	691	XRenderComposite (cc.dpy, op, cc.src, cc.msk, cc.dst, x - img->x, y - img->y, 0, 0, 0, 0, w, h);
681
682	XRenderFreePicture (dpy, src);
683	XRenderFreePicture (dpy, dst);
684
685	if (mask_p)
686	XRenderFreePicture (dpy, mask_p);
687	}	692	}
688		693
689	rxvt_img *	694	rxvt_img *
690	rxvt_img::clone ()	695	rxvt_img::clone ()
691	{	696	{
…		…
696	rxvt_img::reify ()	701	rxvt_img::reify ()
697	{	702	{
698	if (x == 0 && y == 0 && w == ref->w && h == ref->h)	703	if (x == 0 && y == 0 && w == ref->w && h == ref->h)
699	return clone ();	704	return clone ();
700		705
701	Display *dpy = s->display->dpy;	706	Display *dpy = s->dpy;
702		707
703	// add an alpha channel if...	708	// add an alpha channel if...
704	bool alpha = !format->direct.alphaMask // pixmap has none yet	709	bool alpha = !format->direct.alphaMask // pixmap has none yet
705	&& (x \|\| y) // we need one because of non-zero offset	710	&& (x \|\| y) // we need one because of non-zero offset
706	&& repeat == RepeatNone; // and we have no good pixels to fill with	711	&& repeat == RepeatNone; // and we have no good pixels to fill with
707		712
708	rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);	713	composer cc (this, new rxvt_img (s, alpha ? find_alpha_format_for (s->dpy, format) : format,
709	img->alloc ();	714	0, 0, w, h, repeat));
710		715
711	Picture src = picture ();
712	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
713
714	if (alpha)	716	if (alpha)
715	{	717	{
716	XRenderColor rc = { 0, 0, 0, 0 };	718	XRenderColor rc = { 0, 0, 0, 0 };
717	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles	719	XRenderFillRectangle (cc.dpy, PictOpSrc, cc.dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
718	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, x, y, ref->w, ref->h);	720	XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, 0, 0, 0, 0, x, y, ref->w, ref->h);
719	}	721	}
720	else	722	else
721	XRenderComposite (dpy, PictOpSrc, src, None, dst, -x, -y, 0, 0, 0, 0, w, h);	723	XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, -x, -y, 0, 0, 0, 0, w, h);
722		724
723	XRenderFreePicture (dpy, src);
724	XRenderFreePicture (dpy, dst);
725
726	return img;	725	return cc;
727	}	726	}
728		727
729	rxvt_img *	728	rxvt_img *
730	rxvt_img::sub_rect (int x, int y, int width, int height)	729	rxvt_img::sub_rect (int x, int y, int width, int height)
731	{	730	{
…		…
757	rxvt_img::transform (const nv *matrix)	756	rxvt_img::transform (const nv *matrix)
758	{	757	{
759	mat3x3 m (matrix);	758	mat3x3 m (matrix);
760		759
761	// calculate new pixel bounding box coordinates	760	// calculate new pixel bounding box coordinates
762	nv r[2], rmin[2], rmax[2];	761	nv rmin[2], rmax[2];
763		762
764	for (int i = 0; i < 2; ++i)	763	for (int i = 0; i < 2; ++i)
765	{	764	{
766	nv v;	765	nv v;
767		766
768	v = m.apply1 (i, 0+x, 0+y); rmin [i] = rmax [i] = v; r [i] = v;	767	v = m.apply1 (i, 0+x, 0+y); rmin [i] = rmax [i] = v;
769	v = m.apply1 (i, w+x, 0+y); min_it (rmin [i], v); max_it (rmax [i], v);	768	v = m.apply1 (i, w+x, 0+y); min_it (rmin [i], v); max_it (rmax [i], v);
770	v = m.apply1 (i, 0+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v);	769	v = m.apply1 (i, 0+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v);
771	v = m.apply1 (i, w+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v);	770	v = m.apply1 (i, w+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v);
772	}	771	}
773		772
…		…
779	int ny = floor (rmin [1]);	778	int ny = floor (rmin [1]);
780		779
781	int new_width = ceil (rmax [0] - rmin [0]);	780	int new_width = ceil (rmax [0] - rmin [0]);
782	int new_height = ceil (rmax [1] - rmin [1]);	781	int new_height = ceil (rmax [1] - rmin [1]);
783		782
784	m = mat3x3::translate (-x, -y) * m * mat3x3::translate (x, y);	783	mat3x3 inv = (mat3x3::translate (-x, -y) * m * mat3x3::translate (x, y)).inverse ();
785		784
786	mat3x3 inv = m.invert ();	785	composer cc (this, new rxvt_img (s, format, nx, ny, new_width, new_height, repeat));
787
788	rxvt_img *img = new rxvt_img (s, format, nx, ny, new_width, new_height, repeat);
789	img->alloc ();
790
791	Display *dpy = s->display->dpy;
792	Picture src = picture ();
793	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
794		786
795	XTransform xfrm;	787	XTransform xfrm;
796		788
797	for (int i = 0; i < 3; ++i)	789	for (int i = 0; i < 3; ++i)
798	for (int j = 0; j < 3; ++j)	790	for (int j = 0; j < 3; ++j)
799	xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);	791	xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);
800		792
801	XRenderSetPictureFilter (dpy, src, "good", 0, 0);	793	XRenderSetPictureFilter (cc.dpy, cc.src, "good", 0, 0);
802	XRenderSetPictureTransform (dpy, src, &xfrm);	794	XRenderSetPictureTransform (cc.dpy, cc.src, &xfrm);
803	XRenderComposite (dpy, PictOpSrc, src, None, dst, sx, sy, 0, 0, 0, 0, new_width, new_height);	795	XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, sx, sy, 0, 0, 0, 0, new_width, new_height);
804		796
805	XRenderFreePicture (dpy, src);
806	XRenderFreePicture (dpy, dst);
807
808	return img;	797	return cc;
809	}	798	}
810		799
811	rxvt_img *	800	rxvt_img *
812	rxvt_img::scale (int new_width, int new_height)	801	rxvt_img::scale (int new_width, int new_height)
813	{	802	{
…		…
846	rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg)	835	rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg)
847	{	836	{
848	if (new_format == format)	837	if (new_format == format)
849	return clone ();	838	return clone ();
850		839
851	rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);	840	composer cc (this, new rxvt_img (s, new_format, x, y, w, h, repeat));
852	img->alloc ();
853		841
854	Display *dpy = s->display->dpy;
855	Picture src = picture ();
856	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
857	int op = PictOpSrc;	842	int op = PictOpSrc;
858		843
859	if (format->direct.alphaMask && !new_format->direct.alphaMask)	844	if (format->direct.alphaMask && !new_format->direct.alphaMask)
860	{	845	{
861	// does it have to be that complicated	846	// does it have to be that complicated
862	XRenderColor rc = { bg.r, bg.g, bg.b, bg.a };	847	XRenderColor rc = { bg.r, bg.g, bg.b, bg.a };
863	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);	848	XRenderFillRectangle (cc.dpy, PictOpSrc, cc.dst, &rc, 0, 0, w, h);
864		849
865	op = PictOpOver;	850	op = PictOpOver;
866	}	851	}
867		852
868	XRenderComposite (dpy, op, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	853	XRenderComposite (cc.dpy, op, cc.src, None, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
869		854
870	XRenderFreePicture (dpy, src);
871	XRenderFreePicture (dpy, dst);
872
873	return img;	855	return cc;
874	}	856	}
875		857
876	rxvt_img *	858	rxvt_img *
877	rxvt_img::blend (rxvt_img *img, nv factor)	859	rxvt_img::tint (const rgba &c)
878	{	860	{
879	rxvt_img *img2 = clone ();	861	composer cc (this);
880	Display *dpy = s->display->dpy;	862	cc.mask (true);
881	Picture src = img->picture ();	863	cc.fill (c);
882	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
883	Picture mask = create_xrender_mask (dpy, img->pm, False, False);
884		864
885	XRenderColor mask_c;
886
887	mask_c.alpha = float_to_component (factor);
888	mask_c.red =
889	mask_c.green =
890	mask_c.blue = 0;
891	XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
892
893	XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, w, h);	865	XRenderComposite (cc.dpy, PictOpSrc, cc.src, cc.msk, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
894		866
895	XRenderFreePicture (dpy, src);
896	XRenderFreePicture (dpy, dst);
897	XRenderFreePicture (dpy, mask);
898
899	return img2;	867	return cc;
		868	}
		869
		870	rxvt_img *
		871	rxvt_img::filter (const char name, int nparams, nv params)
		872	{
		873	rxvt_img *img = new_empty ();
		874
		875	composer cc (img);
		876
		877	XFixed *xparams = rxvt_temp_buf<XFixed> (nparams);
		878
		879	for (int i = 0; i < nparams; ++i)
		880	xparams [i] = XDoubleToFixed (params [i]);
		881
		882	XRenderSetPictureFilter (cc.dpy, cc.src, name, xparams, nparams);
		883
		884	XRenderComposite (cc.dpy, PictOpSrc, cc.src, 0, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
		885
		886	return cc;
900	}	887	}
901		888
902	#endif	889	#endif
903		890

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.96 by root, Sat Jun 16 15:55:19 2012 UTC vs. Revision 1.98 by root, Sun Jun 17 21:58:18 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.96 by root, Sat Jun 16 15:55:19 2012 UTC vs.
Revision 1.98 by root, Sun Jun 17 21:58:18 2012 UTC