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

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.54 by root, Thu Jun 7 20:24:39 2012 UTC vs.
Revision 1.75 by sf-exg, Sun Jun 10 07:51:45 2012 UTC

…		…
13	rxvt_img::rxvt_img (const rxvt_img &img)	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)	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	{	15	{
16	++ref->cnt;	16	++ref->cnt;
17	}	17	}
18
19	#if 0
20	rxvt_img::rxvt_img (rxvt_screen screen, XRenderPictFormat format, int width, int height, Pixmap pixmap)
21	: s(screen), x(0), y(0), w(width), h(height), format(format), repeat(RepeatNormal), shared(false), pm(pixmap)
22	{
23	}
24	#endif
25		18
26	rxvt_img *	19	rxvt_img *
27	rxvt_img::new_from_root (rxvt_screen *s)	20	rxvt_img::new_from_root (rxvt_screen *s)
28	{	21	{
29	Display *dpy = s->display->dpy;	22	Display *dpy = s->display->dpy;
…		…
56	img->ref->ours = false;	49	img->ref->ours = false;
57		50
58	return img;	51	return img;
59	}	52	}
60		53
		54	# if HAVE_PIXBUF
61	rxvt_img *	55	rxvt_img *
62	rxvt_img::new_from_pixbuf (rxvt_screen s, GdkPixbuf pb)	56	rxvt_img::new_from_pixbuf (rxvt_screen s, GdkPixbuf pb)
63	{	57	{
64	Display *dpy = s->display->dpy;	58	Display *dpy = s->display->dpy;
65		59
…		…
80	xi.width = width;	74	xi.width = width;
81	xi.height = height;	75	xi.height = height;
82	xi.xoffset = 0;	76	xi.xoffset = 0;
83	xi.format = ZPixmap;	77	xi.format = ZPixmap;
84	xi.byte_order = ImageByteOrder (dpy);	78	xi.byte_order = ImageByteOrder (dpy);
85	xi.bitmap_unit = 32; //XY only, unused	79	xi.bitmap_unit = 0; //XY only, unused
86	xi.bitmap_bit_order = LSBFirst; //XY only, unused	80	xi.bitmap_bit_order = 0; //XY only, unused
87	xi.bitmap_pad = BitmapPad (dpy);	81	xi.bitmap_pad = BitmapPad (dpy);
88	xi.depth = depth;	82	xi.depth = depth;
89	xi.bytes_per_line = 0;	83	xi.bytes_per_line = 0;
90	xi.bits_per_pixel = 32; //Z only	84	xi.bits_per_pixel = 32; //Z only
91	xi.red_mask = 0x00000000; //Z only, unused	85	xi.red_mask = 0x00000000; //Z only, unused
…		…
121	uint8_t g = *src++;	115	uint8_t g = *src++;
122	uint8_t b = *src++;	116	uint8_t b = *src++;
123		117
124	uint32_t v = (r << 16) \| (g << 8) \| b;	118	uint32_t v = (r << 16) \| (g << 8) \| b;
125		119
126	if (ecb_big_endian ())	120	if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
127	v = ecb_bswap32 (v);
128
129	if (byte_order_mismatch)
130	v = ecb_bswap32 (v);	121	v = ecb_bswap32 (v);
131		122
132	*dst++ = v;	123	*dst++ = v;
133	}	124	}
134	else	125	else
135	for (int x = 0; x < width; x++)	126	for (int x = 0; x < width; x++)
136	{	127	{
137	uint32_t v = (uint32_t )src; src += 4;	128	uint32_t v = (uint32_t )src; src += 4;
138		129
139	if (ecb_little_endian ())	130	if (ecb_big_endian ())
140	v = ecb_bswap32 (v);	131	v = ecb_bswap32 (v);
141		132
142	v = ecb_rotr32 (v, 8);	133	v = ecb_rotl32 (v, 8); // abgr to bgra
143		134
144	if (byte_order_mismatch)	135	if (!byte_order_mismatch)
145	v = ecb_bswap32 (v);	136	v = ecb_bswap32 (v);
146		137
147	*dst++ = v;	138	*dst++ = v;
148	}	139	}
149		140
…		…
176		167
177	g_object_unref (pb);	168	g_object_unref (pb);
178		169
179	return img;	170	return img;
180	}	171	}
		172	# endif
181		173
182	void	174	void
183	rxvt_img::destroy ()	175	rxvt_img::destroy ()
184	{	176	{
185	if (--ref->cnt)	177	if (--ref->cnt)
…		…
219	rxvt_img::unshare ()	211	rxvt_img::unshare ()
220	{	212	{
221	if (ref->cnt == 1 && ref->ours)	213	if (ref->cnt == 1 && ref->ours)
222	return;	214	return;
223		215
224	//TODO: maybe should reify instead
225	Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth);	216	Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth);
226	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);	217	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
227	XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);	218	XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
228	XFreeGC (s->display->dpy, gc);	219	XFreeGC (s->display->dpy, gc);
229		220
…		…
275	double kernel = (double )malloc (size * sizeof (double));	266	double kernel = (double )malloc (size * sizeof (double));
276	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));	267	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
277	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);	268	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
278	img->alloc ();	269	img->alloc ();
279		270
280	Picture src = src_picture ();
281
282	XRenderPictureAttributes pa;	271	XRenderPictureAttributes pa;
283	pa.repeat = RepeatPad;	272	pa.repeat = RepeatPad;
284	Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa);	273	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
		274	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
285		275
286	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);	276	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
287	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);	277	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
288	XFreePixmap (dpy, tmp_pm);	278	XFreePixmap (dpy, tmp_pm);
289		279
…		…
305		295
306	size = rv * 2 + 1;	296	size = rv * 2 + 1;
307	get_gaussian_kernel (rv, size, kernel, params);	297	get_gaussian_kernel (rv, size, kernel, params);
308	::swap (params[0], params[1]);	298	::swap (params[0], params[1]);
309		299
310	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);	300	XRenderSetPictureFilter (dpy, tmp, FilterConvolution, params, size+2);
311	XRenderComposite (dpy,	301	XRenderComposite (dpy,
312	PictOpSrc,	302	PictOpSrc,
313	tmp,	303	tmp,
314	None,	304	None,
315	dst,	305	dst,
…		…
327		317
328	return img;	318	return img;
329	}	319	}
330		320
331	static Picture	321	static Picture
332	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb)	322	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha)
333	{	323	{
334	Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);	324	Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
335		325
336	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);	326	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
337	XRenderPictureAttributes pa;	327	XRenderPictureAttributes pa;
338	pa.repeat = True;	328	pa.repeat = RepeatNormal;
		329	pa.component_alpha = component_alpha;
339	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);	330	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat \| CPComponentAlpha, &pa);
340		331
341	XFreePixmap (dpy, pixmap);	332	XFreePixmap (dpy, pixmap);
342		333
343	return mask;	334	return mask;
344	}	335	}
345		336
		337	static void
		338	extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)
		339	{
		340	int32_t x = clamp (c, cl0, cl1);
		341	c -= x;
		342	xc = x;
		343	}
		344
		345	static bool
		346	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)
		347	{
		348	extract (cl0, cl1, r, xr);
		349	extract (cl0, cl1, g, xg);
		350	extract (cl0, cl1, b, xb);
		351	extract (cl0, cl1, a, xa);
		352
		353	return xr \| xg \| xb \| xa;
		354	}
		355
346	void	356	void
347	rxvt_img::brightness (unsigned short r, unsigned short g, unsigned short b, unsigned short a)	357	rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a)
348	{	358	{
		359	unshare ();
		360
349	Display *dpy = s->display->dpy;	361	Display *dpy = s->display->dpy;
350	Picture src = create_xrender_mask (dpy, pm, True);
351	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	362	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
352		363
		364	// loop should not be needed for brightness, as only -1..1 makes sense
		365	//while (r \| g \| b \| a)
		366	{
		367	unsigned short xr, xg, xb, xa;
353	XRenderColor mask_c;	368	XRenderColor mask_c;
354	mask_c.red = r;	369
355	mask_c.green = g;	370	if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
356	mask_c.blue = b;	371	XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
357	mask_c.alpha = a;	372
		373	if (extract (-65535, 0, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
		374	{
		375	XRenderColor mask_w = { 65535, 65535, 65535, 65535 };
		376	XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
		377	mask_c.red = -mask_c.red; //TODO: verify that doing clamp, assign, and negation does the right thing
		378	mask_c.green = -mask_c.green;
		379	mask_c.blue = -mask_c.blue;
		380	mask_c.alpha = -mask_c.alpha;
		381	XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
		382	XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
		383	}
		384	}
		385
		386	XRenderFreePicture (dpy, dst);
		387	}
		388
		389	void
		390	rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
		391	{
		392	if (r < 0 \|\| g < 0 \|\| b < 0 \|\| a < 0)
		393	rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");
		394
		395	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
		396	img->alloc ();
		397
		398	{
		399	rxvt_color empty;
		400	empty.set (s, rgba (0, 0, 0, 0));
		401	img->fill (empty);
		402	}
		403
		404	// premultiply (yeah, these are not exact, sue me or fix it)
		405	r = (r * (a >> 8)) >> 8;
		406	g = (g * (a >> 8)) >> 8;
		407	b = (b * (a >> 8)) >> 8;
		408
		409	Display *dpy = s->display->dpy;
		410
		411	Picture src = src_picture ();
		412	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
		413	Picture mul = create_xrender_mask (dpy, pm, True, True);
		414
		415	//TODO: this operator does not yet implement some useful contrast
		416	while (r \| g \| b \| a)
		417	{
		418	unsigned short xr, xg, xb, xa;
		419	XRenderColor mask_c;
		420
		421	if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
		422	{
358	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);	423	XRenderFillRectangle (dpy, PictOpSrc, mul, &mask_c, 0, 0, 1, 1);
359
360	XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	424	XRenderComposite (dpy, PictOpAdd, src, mul, dst, 0, 0, 0, 0, 0, 0, w, h);
		425	}
		426	}
361		427
		428	XRenderFreePicture (dpy, mul);
		429	XRenderFreePicture (dpy, dst);
362	XRenderFreePicture (dpy, src);	430	XRenderFreePicture (dpy, src);
363	XRenderFreePicture (dpy, dst);
364	}
365		431
366	void	432	::swap (img->ref, ref);
367	rxvt_img::contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a)	433	::swap (img->pm , pm );
368	{
369	if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
370	return;
371		434
372	Display *dpy = s->display->dpy;	435	delete img;
373	Picture src = create_xrender_mask (dpy, pm, True);
374	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
375
376	XRenderColor mask_c;
377	mask_c.red = r;
378	mask_c.green = g;
379	mask_c.blue = b;
380	mask_c.alpha = a;
381	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
382
383	XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
384
385	XRenderFreePicture (dpy, src);
386	XRenderFreePicture (dpy, dst);
387	}	436	}
388		437
389	rxvt_img *	438	rxvt_img *
390	rxvt_img::clone ()	439	rxvt_img::clone ()
391	{	440	{
…		…
418	if (x == 0 && y == 0 && w == ref->w && h == ref->h)	467	if (x == 0 && y == 0 && w == ref->w && h == ref->h)
419	return clone ();	468	return clone ();
420		469
421	Display *dpy = s->display->dpy;	470	Display *dpy = s->display->dpy;
422		471
		472	// add an alpha channel if...
423	bool alpha = !format->direct.alphaMask	473	bool alpha = !format->direct.alphaMask // pixmap has none yet
424	&& (x \|\| y)	474	&& (x \|\| y) // we need one because of non-zero offset
425	&& repeat == RepeatNone;	475	&& repeat == RepeatNone; // and we have no good pixels to fill with
426		476
427	rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);	477	rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
428	img->alloc ();	478	img->alloc ();
429		479
430	Picture src = src_picture ();	480	Picture src = src_picture ();
…		…
480		530
481	for (int i = 0; i < 3; ++i)	531	for (int i = 0; i < 3; ++i)
482	for (int j = 0; j < 3; ++j)	532	for (int j = 0; j < 3; ++j)
483	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);	533	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
484		534
485	#if 0
486	xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO	535	xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
487	xfrm.matrix [1][2] -= XDoubleToFixed (y);	536	xfrm.matrix [1][2] -= XDoubleToFixed (y);
488	#endif
489		537
490	XRenderSetPictureFilter (dpy, src, "good", 0, 0);	538	XRenderSetPictureFilter (dpy, src, "good", 0, 0);
491	XRenderSetPictureTransform (dpy, src, &xfrm);	539	XRenderSetPictureTransform (dpy, src, &xfrm);
492	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);	540	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
493		541
…		…
574	{	622	{
575	rxvt_img *img2 = clone ();	623	rxvt_img *img2 = clone ();
576	Display *dpy = s->display->dpy;	624	Display *dpy = s->display->dpy;
577	Picture src = img->src_picture ();	625	Picture src = img->src_picture ();
578	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);	626	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
579	Picture mask = create_xrender_mask (dpy, img->pm, False);	627	Picture mask = create_xrender_mask (dpy, img->pm, False, False);
580		628
581	XRenderColor mask_c;	629	XRenderColor mask_c;
582		630
583	mask_c.alpha = float_to_component (factor);	631	mask_c.alpha = float_to_component (factor);
584	mask_c.red =	632	mask_c.red =

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.54 by root, Thu Jun 7 20:24:39 2012 UTC vs. Revision 1.75 by sf-exg, Sun Jun 10 07:51:45 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.54 by root, Thu Jun 7 20:24:39 2012 UTC vs.
Revision 1.75 by sf-exg, Sun Jun 10 07:51:45 2012 UTC