[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.108 by sf-exg, Fri Nov 7 13:45:55 2014 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>
8	*	8	*
9	* This program is free software; you can redistribute it and/or modify	9	* This program is free software; you can redistribute it and/or modify
10	* it under the terms of the GNU General Public License as published by	10	* it under the terms of the GNU General Public License as published by
11	* the Free Software Foundation; either version 2 of the License, or	11	* the Free Software Foundation; either version 3 of the License, or
12	* (at your option) any later version.	12	* (at your option) any later version.
13	*	13	*
14	* This program is distributed in the hope that it will be useful,	14	* This program is distributed in the hope that it will be useful,
15	* but WITHOUT ANY WARRANTY; without even the implied warranty of	15	* but WITHOUT ANY WARRANTY; without even the implied warranty of
16	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	16	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
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 w = 1, int h = 1)
175	{	176	{
		177	Pixmap pixmap = XCreatePixmap (dpy, srcimg->pm, w, h, 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	// the casts are needed in C++11 (see 8.5.1)
		194	XRenderColor rc = {
		195	(unsigned short)(c.r * c.a / 65535),
		196	(unsigned short)(c.g * c.a / 65535),
		197	(unsigned short)(c.b * c.a / 65535),
		198	c.a
		199	};
		200	msk = XRenderCreateSolidFill (dpy, &rc);
		201	ecb_assume (msk);
		202	}
		203
		204	void fill (const rgba &c)
		205	{
		206	XRenderColor rc = {
		207	(unsigned short)(c.r * c.a / 65535),
		208	(unsigned short)(c.g * c.a / 65535),
		209	(unsigned short)(c.b * c.a / 65535),
		210	c.a
		211	};
		212
		213	XRenderFillRectangle (dpy, PictOpSrc, msk, &rc, 0, 0, 1, 1);
		214	}
		215
		216	operator rxvt_img *()
		217	{
		218	return dstimg;
		219	}
		220
		221	ecb_noinline
		222	~composer ()
		223	{
		224	XRenderFreePicture (dpy, src);
		225	XRenderFreePicture (dpy, dst);
		226	if (msk) XRenderFreePicture (dpy, msk);
		227	}
179	}	228	};
180		229	}
181	~pict ()
182	{
183	if (pic)
184	XRenderFreePicture (dpy, pic);
185	}
186	};
187	#endif
188		230
189	static XRenderPictFormat *	231	static XRenderPictFormat *
190	find_alpha_format_for (Display dpy, XRenderPictFormat format)	232	find_alpha_format_for (Display dpy, XRenderPictFormat format)
191	{	233	{
192	if (format->direct.alphaMask)	234	if (format->direct.alphaMask)
…		…
219	}	261	}
220		262
221	rxvt_img *	263	rxvt_img *
222	rxvt_img::new_from_root (rxvt_screen *s)	264	rxvt_img::new_from_root (rxvt_screen *s)
223	{	265	{
224	Display *dpy = s->display->dpy;	266	Display *dpy = s->dpy;
225	unsigned int root_pm_w, root_pm_h;	267	unsigned int root_pm_w, root_pm_h;
226	Pixmap root_pixmap = s->display->get_pixmap_property (s->display->xa[XA_XROOTPMAP_ID]);	268	Pixmap root_pixmap = s->display->get_pixmap_property (s->display->xa [XA_XROOTPMAP_ID]);
227	if (root_pixmap == None)	269	if (root_pixmap == None)
228	root_pixmap = s->display->get_pixmap_property (s->display->xa[XA_ESETROOT_PMAP_ID]);	270	root_pixmap = s->display->get_pixmap_property (s->display->xa [XA_ESETROOT_PMAP_ID]);
229		271
230	if (root_pixmap == None)	272	if (root_pixmap == None)
231	return 0;	273	return 0;
232		274
233	Window wdummy;	275	Window wdummy;
…		…
256	# if HAVE_PIXBUF	298	# if HAVE_PIXBUF
257		299
258	rxvt_img *	300	rxvt_img *
259	rxvt_img::new_from_pixbuf (rxvt_screen s, GdkPixbuf pb)	301	rxvt_img::new_from_pixbuf (rxvt_screen s, GdkPixbuf pb)
260	{	302	{
261	Display *dpy = s->display->dpy;	303	Display *dpy = s->dpy;
262		304
263	int width = gdk_pixbuf_get_width (pb);	305	int width = gdk_pixbuf_get_width (pb);
264	int height = gdk_pixbuf_get_height (pb);	306	int height = gdk_pixbuf_get_height (pb);
265		307
266	if (width > 32767 \|\| height > 32767) // well, we could upload in chunks	308	if (width > 32767 \|\| height > 32767) // well, we could upload in chunks
…		…
308	for (int y = 0; y < height; y++)	350	for (int y = 0; y < height; y++)
309	{	351	{
310	unsigned char *src = row;	352	unsigned char *src = row;
311	uint32_t dst = (uint32_t )line;	353	uint32_t dst = (uint32_t )line;
312		354
313	if (!pb_has_alpha)
314	for (int x = 0; x < width; x++)	355	for (int x = 0; x < width; x++)
315	{	356	{
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++;
		360	uint8_t a = *src;
319		361
		362	// this is done so it can be jump-free, but newer gcc's clone inner the loop
		363	a = pb_has_alpha ? a : 255;
		364	src += pb_has_alpha;
		365
		366	r = (r * a + 127) / 255;
		367	g = (g * a + 127) / 255;
		368	b = (b * a + 127) / 255;
		369
320	uint32_t v = (255 << 24) \| (r << 16) \| (g << 8) \| b;	370	uint32_t v = (a << 24) \| (r << 16) \| (g << 8) \| b;
321		371
322	if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)	372	if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
323	v = ecb_bswap32 (v);	373	v = ecb_bswap32 (v);
324		374
325	*dst++ = v;	375	*dst++ = v;
326	}	376	}
327	else
328	for (int x = 0; x < width; x++)
329	{
330	uint32_t v = (uint32_t )src; src += 4;
331
332	if (ecb_big_endian ())
333	v = ecb_bswap32 (v);
334
335	v = ecb_rotl32 (v, 8); // abgr to bgra
336
337	if (!byte_order_mismatch)
338	v = ecb_bswap32 (v);
339
340	*dst++ = v;
341	}
342		377
343	row += rowstride;	378	row += rowstride;
344	line += xi.bytes_per_line;	379	line += xi.bytes_per_line;
345	}	380	}
346		381
…		…
379	{	414	{
380	if (--ref->cnt)	415	if (--ref->cnt)
381	return;	416	return;
382		417
383	if (pm && ref->ours)	418	if (pm && ref->ours)
384	XFreePixmap (s->display->dpy, pm);	419	XFreePixmap (s->dpy, pm);
385		420
386	delete ref;	421	delete ref;
387	}	422	}
388		423
389	rxvt_img::~rxvt_img ()	424	rxvt_img::~rxvt_img ()
…		…
392	}	427	}
393		428
394	void	429	void
395	rxvt_img::alloc ()	430	rxvt_img::alloc ()
396	{	431	{
397	pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);	432	pm = XCreatePixmap (s->dpy, s->display->root, w, h, format->depth);
398	ref = new pixref (w, h);	433	ref = new pixref (w, h);
		434	}
		435
		436	rxvt_img *
		437	rxvt_img::new_empty ()
		438	{
		439	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
		440	img->alloc ();
		441
		442	return img;
399	}	443	}
400		444
401	Picture	445	Picture
402	rxvt_img::picture ()	446	rxvt_img::picture ()
403	{	447	{
404	Display *dpy = s->display->dpy;	448	Display *dpy = s->dpy;
405		449
406	XRenderPictureAttributes pa;	450	XRenderPictureAttributes pa;
407	pa.repeat = repeat;	451	pa.repeat = repeat;
408	Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);	452	Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
409		453
…		…
414	rxvt_img::unshare ()	458	rxvt_img::unshare ()
415	{	459	{
416	if (ref->cnt == 1 && ref->ours)	460	if (ref->cnt == 1 && ref->ours)
417	return;	461	return;
418		462
419	Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth);	463	Pixmap pm2 = XCreatePixmap (s->dpy, s->display->root, ref->w, ref->h, format->depth);
420	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);	464	GC gc = XCreateGC (s->dpy, pm, 0, 0);
421	XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);	465	XCopyArea (s->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
422	XFreeGC (s->display->dpy, gc);	466	XFreeGC (s->dpy, gc);
423		467
424	destroy ();	468	destroy ();
425		469
426	pm = pm2;	470	pm = pm2;
427	ref = new pixref (ref->w, ref->h);	471	ref = new pixref (ref->w, ref->h);
428	}	472	}
429		473
430	void	474	void
		475	rxvt_img::fill (const rgba &c, int x, int y, int w, int h)
		476	{
		477	XRenderColor rc = { c.r, c.g, c.b, c.a };
		478
		479	Display *dpy = s->dpy;
		480	Picture src = picture ();
		481	XRenderFillRectangle (dpy, PictOpSrc, src, &rc, x, y, w, h);
		482	XRenderFreePicture (dpy, src);
		483	}
		484
		485	void
431	rxvt_img::fill (const rgba &c)	486	rxvt_img::fill (const rgba &c)
432	{	487	{
433	XRenderColor rc = { c.r, c.g, c.b, c.a };	488	fill (c, 0, 0, w, h);
434
435	Display *dpy = s->display->dpy;
436	Picture src = picture ();
437	XRenderFillRectangle (dpy, PictOpSrc, src, &rc, 0, 0, w, h);
438	XRenderFreePicture (dpy, src);
439	}	489	}
440		490
441	void	491	void
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 = rxvt_temp_buf<XFixed> (size + 2);
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);
…		…
537	0, 0,	579	0, 0,
538	w, h);	580	w, h);
539	}	581	}
540		582
541	free (kernel);	583	free (kernel);
542	free (params);
543		584
544	XRenderFreePicture (dpy, src);	585	XRenderFreePicture (dpy, src);
545	XRenderFreePicture (dpy, dst);	586	XRenderFreePicture (dpy, dst);
546	XRenderFreePicture (dpy, tmp);	587	XRenderFreePicture (dpy, tmp);
547		588
548	return img;	589	return img;
549	}	590	}
550		591
551	static Picture	592	rxvt_img *
552	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha)	593	rxvt_img::muladd (nv mul, nv add)
553	{	594	{
554	Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);	595	// STEP 1: double the image width, fill all odd columns with white (==1)
555		596
556	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);	597	composer cc (this, new rxvt_img (s, format, 0, 0, w * 2, h, repeat));
557	XRenderPictureAttributes pa;
558	pa.repeat = RepeatNormal;
559	pa.component_alpha = component_alpha;
560	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat \| CPComponentAlpha, &pa);
561		598
562	XFreePixmap (dpy, pixmap);	599	// why the hell does XRenderSetPictureTransform want a writable matrix :(
		600	// that keeps us from just static const'ing this matrix.
		601	XTransform h_double = {
		602	0x08000, 0, 0,
		603	0, 0x10000, 0,
		604	0, 0, 0x10000
		605	};
563		606
564	return mask;	607	XRenderSetPictureFilter (cc.dpy, cc.src, "nearest", 0, 0);
565	}	608	XRenderSetPictureTransform (cc.dpy, cc.src, &h_double);
		609	XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, 0, 0, 0, 0, 0, 0, w * 2, h);
566		610
567	static void	611	cc.mask (false, 2, 1);
		612
		613	static const XRenderColor c0 = { 0, 0, 0, 0 };
		614	XRenderFillRectangle (cc.dpy, PictOpSrc, cc.msk, &c0, 0, 0, 1, 1);
		615	static const XRenderColor c1 = { 65535, 65535, 65535, 65535 };
		616	XRenderFillRectangle (cc.dpy, PictOpSrc, cc.msk, &c1, 1, 0, 1, 1);
		617
		618	Picture white = XRenderCreateSolidFill (cc.dpy, &c1);
		619
		620	XRenderComposite (cc.dpy, PictOpOver, white, cc.msk, cc.dst, 0, 0, 0, 0, 0, 0, w * 2, h);
		621
		622	XRenderFreePicture (cc.dpy, white);
		623
		624	// STEP 2: convolve the image with a 3x1 filter
		625	// a 2x1 filter would obviously suffice, but given the total lack of specification
		626	// for xrender, I expect different xrender implementations to randomly diverge.
		627	// we also halve the image, and hope for the best (again, for lack of specs).
		628	composer cc2 (cc.dstimg);
		629
		630	XFixed kernel [] = {
		631	XDoubleToFixed (3), XDoubleToFixed (1),
		632	XDoubleToFixed (0), XDoubleToFixed (mul), XDoubleToFixed (add)
		633	};
		634
		635	XTransform h_halve = {
		636	0x20000, 0, 0,
		637	0, 0x10000, 0,
		638	0, 0, 0x10000
		639	};
		640
		641	XRenderSetPictureFilter (cc.dpy, cc2.src, "nearest", 0, 0);
		642	XRenderSetPictureTransform (cc.dpy, cc2.src, &h_halve);
		643	XRenderSetPictureFilter (cc.dpy, cc2.src, FilterConvolution, kernel, ecb_array_length (kernel));
		644
		645	XRenderComposite (cc.dpy, PictOpSrc, cc2.src, None, cc2.dst, 0, 0, 0, 0, 0, 0, w * 2, h);
		646
		647	return cc2;
		648	}
		649
		650	ecb_noinline static void
568	extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)	651	extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)
569	{	652	{
570	int32_t x = clamp (c, cl0, cl1);	653	int32_t x = clamp (c, cl0, cl1);
571	c -= x;	654	c -= x;
572	xc = x;	655	xc = x;
573	}	656	}
574		657
575	static bool	658	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)	659	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	{	660	{
578	extract (cl0, cl1, r, xr);	661	extract (cl0, cl1, r, xr);
579	extract (cl0, cl1, g, xg);	662	extract (cl0, cl1, g, xg);
580	extract (cl0, cl1, b, xb);	663	extract (cl0, cl1, b, xb);
…		…
586	void	669	void
587	rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a)	670	rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a)
588	{	671	{
589	unshare ();	672	unshare ();
590		673
591	Display *dpy = s->display->dpy;	674	Display *dpy = s->dpy;
592	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	675	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
593		676
594	// loop should not be needed for brightness, as only -1..1 makes sense	677	// loop should not be needed for brightness, as only -1..1 makes sense
595	//while (r \| g \| b \| a)	678	//while (r \| g \| b \| a)
596	{	679	{
…		…
620	rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)	703	rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
621	{	704	{
622	if (r < 0 \|\| g < 0 \|\| b < 0 \|\| a < 0)	705	if (r < 0 \|\| g < 0 \|\| b < 0 \|\| a < 0)
623	rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");	706	rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");
624		707
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)	708	// premultiply (yeah, these are not exact, sue me or fix it)
630	r = (r * (a >> 8)) >> 8;	709	r = (r * (a >> 8)) >> 8;
631	g = (g * (a >> 8)) >> 8;	710	g = (g * (a >> 8)) >> 8;
632	b = (b * (a >> 8)) >> 8;	711	b = (b * (a >> 8)) >> 8;
633		712
634	Display *dpy = s->display->dpy;	713	composer cc (this);
		714	rxvt_img *img = cc;
		715	img->fill (rgba (0, 0, 0, 0));
635		716
636	Picture src = picture ();	717	cc.mask (true);
637	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
638	Picture mul = create_xrender_mask (dpy, pm, True, True);
639		718
640	//TODO: this operator does not yet implement some useful contrast	719	//TODO: this operator does not yet implement some useful contrast
641	while (r \| g \| b \| a)	720	while (r \| g \| b \| a)
642	{	721	{
643	unsigned short xr, xg, xb, xa;	722	unsigned short xr, xg, xb, xa;
644	XRenderColor mask_c;	723	XRenderColor mask_c;
645		724
646	if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))	725	if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
647	{	726	{
648	XRenderFillRectangle (dpy, PictOpSrc, mul, &mask_c, 0, 0, 1, 1);	727	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);	728	XRenderComposite (cc.dpy, PictOpAdd, cc.src, cc.msk, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
650	}	729	}
651	}	730	}
652
653	XRenderFreePicture (dpy, mul);
654	XRenderFreePicture (dpy, dst);
655	XRenderFreePicture (dpy, src);
656		731
657	::swap (img->ref, ref);	732	::swap (img->ref, ref);
658	::swap (img->pm , pm );	733	::swap (img->pm , pm );
659		734
660	delete img;	735	delete img;
…		…
663	void	738	void
664	rxvt_img::draw (rxvt_img *img, int op, nv mask)	739	rxvt_img::draw (rxvt_img *img, int op, nv mask)
665	{	740	{
666	unshare ();	741	unshare ();
667		742
668	Display *dpy = s->display->dpy;	743	composer cc (img, this);
669	Picture src = img->picture ();
670	Picture dst = picture ();
671	Picture mask_p = 0;
672		744
673	if (mask != 1.)	745	if (mask != 1.)
674	{	746	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		747
680	XRenderComposite (dpy, op, src, mask_p, dst, x - img->x, y - img->y, 0, 0, 0, 0, w, h);	748	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	}	749	}
688		750
689	rxvt_img *	751	rxvt_img *
690	rxvt_img::clone ()	752	rxvt_img::clone ()
691	{	753	{
…		…
695	rxvt_img *	757	rxvt_img *
696	rxvt_img::reify ()	758	rxvt_img::reify ()
697	{	759	{
698	if (x == 0 && y == 0 && w == ref->w && h == ref->h)	760	if (x == 0 && y == 0 && w == ref->w && h == ref->h)
699	return clone ();	761	return clone ();
700
701	Display *dpy = s->display->dpy;
702		762
703	// add an alpha channel if...	763	// add an alpha channel if...
704	bool alpha = !format->direct.alphaMask // pixmap has none yet	764	bool alpha = !format->direct.alphaMask // pixmap has none yet
705	&& (x \|\| y) // we need one because of non-zero offset	765	&& (x \|\| y) // we need one because of non-zero offset
706	&& repeat == RepeatNone; // and we have no good pixels to fill with	766	&& repeat == RepeatNone; // and we have no good pixels to fill with
707		767
708	rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);	768	composer cc (this, new rxvt_img (s, alpha ? find_alpha_format_for (s->dpy, format) : format,
709	img->alloc ();	769	0, 0, w, h, repeat));
710		770
711	Picture src = picture ();	771	if (repeat == RepeatNone)
712	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
713
714	if (alpha)
715	{	772	{
716	XRenderColor rc = { 0, 0, 0, 0 };	773	XRenderColor rc = { 0, 0, 0, 0 };
717	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles	774	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);	775	XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, 0, 0, 0, 0, x, y, ref->w, ref->h);
719	}	776	}
720	else	777	else
721	XRenderComposite (dpy, PictOpSrc, src, None, dst, -x, -y, 0, 0, 0, 0, w, h);	778	XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, -x, -y, 0, 0, 0, 0, w, h);
722		779
723	XRenderFreePicture (dpy, src);
724	XRenderFreePicture (dpy, dst);
725
726	return img;	780	return cc;
727	}	781	}
728		782
729	rxvt_img *	783	rxvt_img *
730	rxvt_img::sub_rect (int x, int y, int width, int height)	784	rxvt_img::sub_rect (int x, int y, int width, int height)
731	{	785	{
…		…
757	rxvt_img::transform (const nv *matrix)	811	rxvt_img::transform (const nv *matrix)
758	{	812	{
759	mat3x3 m (matrix);	813	mat3x3 m (matrix);
760		814
761	// calculate new pixel bounding box coordinates	815	// calculate new pixel bounding box coordinates
762	nv r[2], rmin[2], rmax[2];	816	nv rmin[2], rmax[2];
763		817
764	for (int i = 0; i < 2; ++i)	818	for (int i = 0; i < 2; ++i)
765	{	819	{
766	nv v;	820	nv v;
767		821
768	v = m.apply1 (i, 0+x, 0+y); rmin [i] = rmax [i] = v; r [i] = v;	822	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);	823	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);	824	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);	825	v = m.apply1 (i, w+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v);
772	}	826	}
773		827
…		…
779	int ny = floor (rmin [1]);	833	int ny = floor (rmin [1]);
780		834
781	int new_width = ceil (rmax [0] - rmin [0]);	835	int new_width = ceil (rmax [0] - rmin [0]);
782	int new_height = ceil (rmax [1] - rmin [1]);	836	int new_height = ceil (rmax [1] - rmin [1]);
783		837
784	m = mat3x3::translate (-x, -y) * m * mat3x3::translate (x, y);	838	mat3x3 inv = (mat3x3::translate (-x, -y) * m * mat3x3::translate (x, y)).inverse ();
785		839
786	mat3x3 inv = m.invert ();	840	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		841
795	XTransform xfrm;	842	XTransform xfrm;
796		843
797	for (int i = 0; i < 3; ++i)	844	for (int i = 0; i < 3; ++i)
798	for (int j = 0; j < 3; ++j)	845	for (int j = 0; j < 3; ++j)
799	xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);	846	xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);
800		847
801	XRenderSetPictureFilter (dpy, src, "good", 0, 0);	848	XRenderSetPictureFilter (cc.dpy, cc.src, "good", 0, 0);
802	XRenderSetPictureTransform (dpy, src, &xfrm);	849	XRenderSetPictureTransform (cc.dpy, cc.src, &xfrm);
803	XRenderComposite (dpy, PictOpSrc, src, None, dst, sx, sy, 0, 0, 0, 0, new_width, new_height);	850	XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, sx, sy, 0, 0, 0, 0, new_width, new_height);
804		851
805	XRenderFreePicture (dpy, src);
806	XRenderFreePicture (dpy, dst);
807
808	return img;	852	return cc;
809	}	853	}
810		854
811	rxvt_img *	855	rxvt_img *
812	rxvt_img::scale (int new_width, int new_height)	856	rxvt_img::scale (int new_width, int new_height)
813	{	857	{
…		…
826	}	870	}
827		871
828	rxvt_img *	872	rxvt_img *
829	rxvt_img::rotate (int cx, int cy, nv phi)	873	rxvt_img::rotate (int cx, int cy, nv phi)
830	{	874	{
831	#if 0
832	{ c, -s, cx - c * cx + s * cy },
833	{ s, c, cy - s * cx - c * cy },
834	{ 0, 0, 1 }
835	#endif
836
837	move (-cx, -cy);	875	move (-cx, -cy);
838	rxvt_img *img = transform (mat3x3::rotate (phi));	876	rxvt_img *img = transform (mat3x3::rotate (phi));
839	move ( cx, cy);	877	move ( cx, cy);
840	img->move (cx, cy);	878	img->move (cx, cy);
841		879
…		…
846	rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg)	884	rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg)
847	{	885	{
848	if (new_format == format)	886	if (new_format == format)
849	return clone ();	887	return clone ();
850		888
851	rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);	889	composer cc (this, new rxvt_img (s, new_format, x, y, w, h, repeat));
852	img->alloc ();
853		890
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;	891	int op = PictOpSrc;
858		892
859	if (format->direct.alphaMask && !new_format->direct.alphaMask)	893	if (format->direct.alphaMask && !new_format->direct.alphaMask)
860	{	894	{
861	// does it have to be that complicated	895	// does it have to be that complicated
862	XRenderColor rc = { bg.r, bg.g, bg.b, bg.a };	896	XRenderColor rc = { bg.r, bg.g, bg.b, bg.a };
863	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);	897	XRenderFillRectangle (cc.dpy, PictOpSrc, cc.dst, &rc, 0, 0, w, h);
864		898
865	op = PictOpOver;	899	op = PictOpOver;
866	}	900	}
867		901
868	XRenderComposite (dpy, op, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	902	XRenderComposite (cc.dpy, op, cc.src, None, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
869		903
870	XRenderFreePicture (dpy, src);	904	return cc;
871	XRenderFreePicture (dpy, dst);	905	}
		906
		907	rxvt_img *
		908	rxvt_img::tint (const rgba &c)
		909	{
		910	composer cc (this);
		911	cc.mask (true);
		912	cc.fill (c);
		913
		914	XRenderComposite (cc.dpy, PictOpSrc, cc.src, cc.msk, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
		915
		916	return cc;
		917	}
		918
		919	rxvt_img *
		920	rxvt_img::shade (nv factor, rgba c)
		921	{
		922	clamp_it (factor, -1., 1.);
		923	factor++;
		924
		925	if (factor > 1)
		926	{
		927	c.r = c.r * (2 - factor);
		928	c.g = c.g * (2 - factor);
		929	c.b = c.b * (2 - factor);
		930	}
		931	else
		932	{
		933	c.r = c.r * factor;
		934	c.g = c.g * factor;
		935	c.b = c.b * factor;
		936	}
		937
		938	rxvt_img *img = this->tint (c);
		939
		940	if (factor > 1)
		941	{
		942	c.a = 0xffff;
		943	c.r =
		944	c.g =
		945	c.b = 0xffff * (factor - 1);
		946
		947	img->brightness (c.r, c.g, c.b, c.a);
		948	}
872		949
873	return img;	950	return img;
874	}	951	}
875		952
876	rxvt_img *	953	rxvt_img *
877	rxvt_img::blend (rxvt_img *img, nv factor)	954	rxvt_img::filter (const char name, int nparams, nv params)
878	{	955	{
879	rxvt_img *img2 = clone ();	956	composer cc (this);
880	Display *dpy = s->display->dpy;
881	Picture src = img->picture ();
882	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
883	Picture mask = create_xrender_mask (dpy, img->pm, False, False);
884		957
885	XRenderColor mask_c;	958	XFixed *xparams = rxvt_temp_buf<XFixed> (nparams);
886		959
887	mask_c.alpha = float_to_component (factor);	960	for (int i = 0; i < nparams; ++i)
888	mask_c.red =	961	xparams [i] = XDoubleToFixed (params [i]);
889	mask_c.green =
890	mask_c.blue = 0;
891	XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
892		962
		963	XRenderSetPictureFilter (cc.dpy, cc.src, name, xparams, nparams);
		964
893	XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, w, h);	965	XRenderComposite (cc.dpy, PictOpSrc, cc.src, 0, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
894		966
895	XRenderFreePicture (dpy, src);
896	XRenderFreePicture (dpy, dst);
897	XRenderFreePicture (dpy, mask);
898
899	return img2;	967	return cc;
900	}	968	}
901		969
902	#endif	970	#endif
903		971

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.108 by sf-exg, Fri Nov 7 13:45:55 2014 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.108 by sf-exg, Fri Nov 7 13:45:55 2014 UTC