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

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.50 by root, Thu Jun 7 19:42:09 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
…		…
70	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big (maximum size 32768x32768).\n");	64	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big (maximum size 32768x32768).\n");
71		65
72	// since we require rgb24/argb32 formats from xrender we assume	66	// since we require rgb24/argb32 formats from xrender we assume
73	// that both 24 and 32 bpp MUST be supported by any screen that supports xrender	67	// that both 24 and 32 bpp MUST be supported by any screen that supports xrender
74	int depth = gdk_pixbuf_get_has_alpha (pb) ? 32 : 24;	68	int depth = gdk_pixbuf_get_has_alpha (pb) ? 32 : 24;
		69
		70	int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
75		71
76	XImage xi;	72	XImage xi;
77		73
78	xi.width = width;	74	xi.width = width;
79	xi.height = height;	75	xi.height = height;
80	xi.xoffset = 0;	76	xi.xoffset = 0;
81	xi.format = ZPixmap;	77	xi.format = ZPixmap;
82	xi.byte_order = LSBFirst; // maybe go for host byte order, because servers are usually local?	78	xi.byte_order = ImageByteOrder (dpy);
83	xi.bitmap_unit = 32;	79	xi.bitmap_unit = 0; //XY only, unused
84	xi.bitmap_bit_order = LSBFirst;	80	xi.bitmap_bit_order = 0; //XY only, unused
85	xi.bitmap_pad = BitmapPad (dpy);	81	xi.bitmap_pad = BitmapPad (dpy);
86	xi.depth = depth;	82	xi.depth = depth;
87	xi.bytes_per_line = 0;	83	xi.bytes_per_line = 0;
88	xi.bits_per_pixel = 32;	84	xi.bits_per_pixel = 32; //Z only
89	xi.red_mask = 0x000000ff;	85	xi.red_mask = 0x00000000; //Z only, unused
90	xi.green_mask = 0x0000ff00;	86	xi.green_mask = 0x00000000; //Z only, unused
91	xi.blue_mask = 0x00ff0000;	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;
92		91
93	if (!XInitImage (&xi))	92	if (!XInitImage (&xi))
94	rxvt_fatal ("unable to initialise ximage, please report.\n");	93	rxvt_fatal ("unable to initialise ximage, please report.\n");
95		94
96	if (height > INT_MAX / xi.bytes_per_line)	95	if (height > INT_MAX / xi.bytes_per_line)
…		…
114	{	113	{
115	uint8_t r = *src++;	114	uint8_t r = *src++;
116	uint8_t g = *src++;	115	uint8_t g = *src++;
117	uint8_t b = *src++;	116	uint8_t b = *src++;
118		117
119	uint32_t v = r \| (g << 8) \| (b << 16);	118	uint32_t v = (r << 16) \| (g << 8) \| b;
120		119
121	if (ecb_big_endian ())	120	if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
122	v = ecb_bswap32 (v);	121	v = ecb_bswap32 (v);
123		122
124	*dst++ = x;	123	*dst++ = v;
125	}	124	}
126	else	125	else
127	for (int x = 0; x < width; x++)	126	for (int x = 0; x < width; x++)
128	{	127	{
129	uint32_t v = (uint32_t )src; src += 4;	128	uint32_t v = (uint32_t )src; src += 4;
130	v = ecb_big_endian () ? ecb_rotr32 (v, 8) : ecb_rotl32 (v, 8);	129
		130	if (ecb_big_endian ())
131	*dst++ = ecb_bswap32 (v);	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;
132	}	139	}
133		140
134	row += rowstride;	141	row += rowstride;
135	line += xi.bytes_per_line;	142	line += xi.bytes_per_line;
136	}	143	}
…		…
160		167
161	g_object_unref (pb);	168	g_object_unref (pb);
162		169
163	return img;	170	return img;
164	}	171	}
		172	# endif
165		173
166	void	174	void
167	rxvt_img::destroy ()	175	rxvt_img::destroy ()
168	{	176	{
169	if (--ref->cnt)	177	if (--ref->cnt)
…		…
203	rxvt_img::unshare ()	211	rxvt_img::unshare ()
204	{	212	{
205	if (ref->cnt == 1 && ref->ours)	213	if (ref->cnt == 1 && ref->ours)
206	return;	214	return;
207		215
208	//TODO: maybe should reify instead
209	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);
210	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);	217	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
211	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);
212	XFreeGC (s->display->dpy, gc);	219	XFreeGC (s->display->dpy, gc);
213		220
…		…
259	double kernel = (double )malloc (size * sizeof (double));	266	double kernel = (double )malloc (size * sizeof (double));
260	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));	267	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
261	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);
262	img->alloc ();	269	img->alloc ();
263		270
264	Picture src = src_picture ();
265
266	XRenderPictureAttributes pa;	271	XRenderPictureAttributes pa;
267	pa.repeat = RepeatPad;	272	pa.repeat = RepeatPad;
268	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);
269		275
270	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);	276	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
271	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);	277	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
272	XFreePixmap (dpy, tmp_pm);	278	XFreePixmap (dpy, tmp_pm);
273		279
…		…
289		295
290	size = rv * 2 + 1;	296	size = rv * 2 + 1;
291	get_gaussian_kernel (rv, size, kernel, params);	297	get_gaussian_kernel (rv, size, kernel, params);
292	::swap (params[0], params[1]);	298	::swap (params[0], params[1]);
293		299
294	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);	300	XRenderSetPictureFilter (dpy, tmp, FilterConvolution, params, size+2);
295	XRenderComposite (dpy,	301	XRenderComposite (dpy,
296	PictOpSrc,	302	PictOpSrc,
297	tmp,	303	tmp,
298	None,	304	None,
299	dst,	305	dst,
…		…
311		317
312	return img;	318	return img;
313	}	319	}
314		320
315	static Picture	321	static Picture
316	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb)	322	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha)
317	{	323	{
318	Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);	324	Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
319		325
320	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);	326	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
321	XRenderPictureAttributes pa;	327	XRenderPictureAttributes pa;
322	pa.repeat = True;	328	pa.repeat = RepeatNormal;
		329	pa.component_alpha = component_alpha;
323	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);	330	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat \| CPComponentAlpha, &pa);
324		331
325	XFreePixmap (dpy, pixmap);	332	XFreePixmap (dpy, pixmap);
326		333
327	return mask;	334	return mask;
328	}	335	}
329		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
330	void	356	void
331	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)
332	{	358	{
		359	unshare ();
		360
333	Display *dpy = s->display->dpy;	361	Display *dpy = s->display->dpy;
334	Picture src = create_xrender_mask (dpy, pm, True);
335	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	362	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
336		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;
337	XRenderColor mask_c;	368	XRenderColor mask_c;
338	mask_c.red = r;	369
339	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))
340	mask_c.blue = b;	371	XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
341	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	{
342	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);	423	XRenderFillRectangle (dpy, PictOpSrc, mul, &mask_c, 0, 0, 1, 1);
343
344	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	}
345		427
		428	XRenderFreePicture (dpy, mul);
		429	XRenderFreePicture (dpy, dst);
346	XRenderFreePicture (dpy, src);	430	XRenderFreePicture (dpy, src);
347	XRenderFreePicture (dpy, dst);
348	}
349		431
350	void	432	::swap (img->ref, ref);
351	rxvt_img::contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a)	433	::swap (img->pm , pm );
352	{
353	if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
354	return;
355		434
356	Display *dpy = s->display->dpy;	435	delete img;
357	Picture src = create_xrender_mask (dpy, pm, True);
358	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
359
360	XRenderColor mask_c;
361	mask_c.red = r;
362	mask_c.green = g;
363	mask_c.blue = b;
364	mask_c.alpha = a;
365	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
366
367	XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
368
369	XRenderFreePicture (dpy, src);
370	XRenderFreePicture (dpy, dst);
371	}	436	}
372		437
373	rxvt_img *	438	rxvt_img *
374	rxvt_img::clone ()	439	rxvt_img::clone ()
375	{	440	{
…		…
402	if (x == 0 && y == 0 && w == ref->w && h == ref->h)	467	if (x == 0 && y == 0 && w == ref->w && h == ref->h)
403	return clone ();	468	return clone ();
404		469
405	Display *dpy = s->display->dpy;	470	Display *dpy = s->display->dpy;
406		471
		472	// add an alpha channel if...
407	bool alpha = !format->direct.alphaMask	473	bool alpha = !format->direct.alphaMask // pixmap has none yet
408	&& (x \|\| y)	474	&& (x \|\| y) // we need one because of non-zero offset
409	&& repeat == RepeatNone;	475	&& repeat == RepeatNone; // and we have no good pixels to fill with
410		476
411	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);
412	img->alloc ();	478	img->alloc ();
413		479
414	Picture src = src_picture ();	480	Picture src = src_picture ();
…		…
464		530
465	for (int i = 0; i < 3; ++i)	531	for (int i = 0; i < 3; ++i)
466	for (int j = 0; j < 3; ++j)	532	for (int j = 0; j < 3; ++j)
467	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);	533	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
468		534
469	#if 0
470	xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO	535	xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
471	xfrm.matrix [1][2] -= XDoubleToFixed (y);	536	xfrm.matrix [1][2] -= XDoubleToFixed (y);
472	#endif
473		537
474	XRenderSetPictureFilter (dpy, src, "good", 0, 0);	538	XRenderSetPictureFilter (dpy, src, "good", 0, 0);
475	XRenderSetPictureTransform (dpy, src, &xfrm);	539	XRenderSetPictureTransform (dpy, src, &xfrm);
476	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);
477		541
…		…
558	{	622	{
559	rxvt_img *img2 = clone ();	623	rxvt_img *img2 = clone ();
560	Display *dpy = s->display->dpy;	624	Display *dpy = s->display->dpy;
561	Picture src = img->src_picture ();	625	Picture src = img->src_picture ();
562	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);	626	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
563	Picture mask = create_xrender_mask (dpy, img->pm, False);	627	Picture mask = create_xrender_mask (dpy, img->pm, False, False);
564		628
565	XRenderColor mask_c;	629	XRenderColor mask_c;
566		630
567	mask_c.alpha = float_to_component (factor);	631	mask_c.alpha = float_to_component (factor);
568	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.50 by root, Thu Jun 7 19:42:09 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.50 by root, Thu Jun 7 19:42:09 2012 UTC vs.
Revision 1.75 by sf-exg, Sun Jun 10 07:51:45 2012 UTC