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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.179 by sf-exg, Sat Dec 24 09:44:10 2011 UTC vs.
Revision 1.204 by sf-exg, Tue Apr 10 15:19:22 2012 UTC

…		…
20	* You should have received a copy of the GNU General Public License	20	* You should have received a copy of the GNU General Public License
21	* along with this program; if not, write to the Free Software	21	* along with this program; if not, write to the Free Software
22	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	22	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
23	---------------------------------------------------------------------/	23	---------------------------------------------------------------------/
24		24
25	#include <cmath>	25	#include <math.h>
26	#include "../config.h" /* NECESSARY */	26	#include "../config.h" /* NECESSARY */
27	#include "rxvt.h" /* NECESSARY */	27	#include "rxvt.h" /* NECESSARY */
28		28
29	#if XRENDER	29	#if XRENDER
30	# include <X11/extensions/Xrender.h>	30	# include <X11/extensions/Xrender.h>
…		…
32		32
33	#ifndef FilterConvolution	33	#ifndef FilterConvolution
34	#define FilterConvolution "convolution"	34	#define FilterConvolution "convolution"
35	#endif	35	#endif
36		36
		37	#ifndef RepeatPad
		38	#define RepeatPad True
		39	#endif
		40
37	#ifdef HAVE_BG_PIXMAP	41	#ifdef HAVE_BG_PIXMAP
		42	# if XRENDER
		43	static Picture
		44	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha)
		45	{
		46	Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
		47
		48	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
		49	XRenderPictureAttributes pa;
		50	pa.repeat = True;
		51	pa.component_alpha = component_alpha;
		52	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat \| CPComponentAlpha, &pa);
		53
		54	XFreePixmap (dpy, pixmap);
		55
		56	return mask;
		57	}
		58	# endif
		59
38	void	60	void
39	rxvt_term::bg_destroy ()	61	rxvt_term::bg_destroy ()
40	{	62	{
41	#ifdef HAVE_AFTERIMAGE
42	if (original_asim)
43	safe_asimage_destroy (original_asim);
44	if (asv)
45	destroy_asvisual (asv, 0);
46	if (asimman)
47	destroy_image_manager (asimman, 0);
48	#endif
49
50	#ifdef HAVE_PIXBUF	63	#ifdef HAVE_PIXBUF
51	if (pixbuf)	64	if (pixbuf)
52	g_object_unref (pixbuf);	65	g_object_unref (pixbuf);
53	#endif	66	#endif
54		67
…		…
107		120
108	return false;	121	return false;
109	}	122	}
110		123
111	# ifdef BG_IMAGE_FROM_FILE	124	# ifdef BG_IMAGE_FROM_FILE
112	static inline bool
113	check_set_scale_value (int geom_flags, int flag, unsigned int &scale, unsigned int new_value)
114	{
115	if (geom_flags & flag)
116	{
117	if (new_value > 1000)
118	new_value = 1000;
119	if (new_value != scale)
120	{
121	scale = new_value;
122	return true;
123	}
124	}
125	return false;
126	}
127
128	static inline bool
129	check_set_align_value (int geom_flags, int flag, int &align, int new_value)
130	{
131	if (geom_flags & flag)
132	{
133	if (new_value < -100)
134	new_value = -100;
135	else if (new_value > 200)
136	new_value = 200;
137	if (new_value != align)
138	{
139	align = new_value;
140	return true;
141	}
142	}
143	return false;
144	}
145
146	static inline int	125	static inline int
147	make_align_position (int align, int window_size, int image_size)	126	make_align_position (int align, int window_size, int image_size)
148	{	127	{
149	int diff = window_size - image_size;	128	int diff = window_size - image_size;
150	int smaller = min (image_size, window_size);	129	int smaller = min (image_size, window_size);
…		…
169	src_pos = -pos;	148	src_pos = -pos;
170	dst_pos = 0;	149	dst_pos = 0;
171	dst_size += pos;	150	dst_size += pos;
172	}	151	}
173		152
174	if (dst_pos + dst_size > target_size)
175	dst_size = target_size - dst_pos;	153	min_it (dst_size, target_size - dst_pos);
176	return src_pos;	154	return src_pos;
177	}	155	}
178		156
179	bool	157	bool
180	rxvt_term::bg_set_geometry (const char *geom, bool update)	158	rxvt_term::bg_set_geometry (const char *geom, bool update)
181	{	159	{
182	bool changed = false;	160	bool changed = false;
183	int geom_flags = 0;	161	int geom_flags = 0;
184	int x = 0, y = 0;	162	int x = h_align;
		163	int y = v_align;
185	unsigned int w = 0, h = 0;	164	unsigned int w = h_scale;
186	unsigned long new_flags = bg_flags & ~BG_GEOMETRY_FLAGS;	165	unsigned int h = v_scale;
		166	unsigned long new_flags = 0;
187		167
188	if (geom == NULL)	168	if (geom == NULL)
189	return false;	169	return false;
190		170
191	if (geom[0])	171	if (geom[0])
…		…
284	} /* done parsing ops */	264	} /* done parsing ops */
285		265
286	rxvt_free_strsplit (arr);	266	rxvt_free_strsplit (arr);
287	}	267	}
288		268
		269	new_flags \|= bg_flags & ~BG_GEOMETRY_FLAGS;
		270
289	if (!update)	271	if (!update)
290	{	272	{
291	if (!(geom_flags & XValue))	273	if (!(geom_flags & XValue))
292	x = y = defaultAlign;	274	x = y = defaultAlign;
293	else if (!(geom_flags & YValue))	275	else if (!(geom_flags & YValue))
…		…
297	w = h = defaultScale;	279	w = h = defaultScale;
298	else if (!(geom_flags & HeightValue))	280	else if (!(geom_flags & HeightValue))
299	h = w;	281	h = w;
300	else if (!(geom_flags & WidthValue))	282	else if (!(geom_flags & WidthValue))
301	w = h;	283	w = h;
302
303	geom_flags \|= WidthValue\|HeightValue\|XValue\|YValue;
304	}	284	}
305		285
306	if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;	286	min_it (w, 1000);
307	if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;	287	min_it (h, 1000);
308	if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;	288	clamp_it (x, -100, 200);
309	if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;	289	clamp_it (y, -100, 200);
310		290
311	if (new_flags != bg_flags)	291	if (bg_flags != new_flags
		292	\|\| h_scale != w
		293	\|\| v_scale != h
		294	\|\| h_align != x
		295	\|\| v_align != y)
312	{	296	{
313	bg_flags = new_flags;	297	bg_flags = new_flags;
		298	h_scale = w;
		299	v_scale = h;
		300	h_align = x;
		301	v_align = y;
314	changed = true;	302	changed = true;
315	}	303	}
316		304
317	return changed;	305	return changed;
318	}	306	}
…		…
346	{	334	{
347	x = make_align_position (h_align, target_width, w);	335	x = make_align_position (h_align, target_width, w);
348	y = make_align_position (v_align, target_height, h);	336	y = make_align_position (v_align, target_height, h);
349	}	337	}
350		338
351	bg_flags &= ~BG_IS_SIZE_SENSITIVE;
352	if (!(bg_flags & BG_TILE)	339	if (!(bg_flags & BG_TILE)
353	\|\| h_scale \|\| v_scale	340	\|\| h_scale \|\| v_scale
354	\|\| (!(bg_flags & BG_ROOT_ALIGN) && (h_align \|\| v_align))	341	\|\| (!(bg_flags & BG_ROOT_ALIGN) && (h_align \|\| v_align))
355	\|\| w > target_width \|\| h > target_height)	342	\|\| image_width > target_width \|\| image_height > target_height)
356	bg_flags \|= BG_IS_SIZE_SENSITIVE;	343	bg_flags \|= BG_IS_SIZE_SENSITIVE;
357	}
358
359	# ifdef HAVE_AFTERIMAGE
360	bool
361	rxvt_term::render_image (unsigned long tr_flags)
362	{
363	init_asv ();
364
365	ASImage *background = NULL;
366	ARGB32 background_tint = TINT_LEAVE_SAME;
367
368	# ifdef ENABLE_TRANSPARENCY
369	if (tr_flags)
370	background = pixmap2ximage (asv, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, 100);
371
372	if (tr_flags & BG_NEEDS_TINT)
373	{
374	ShadingInfo as_shade;
375	as_shade.shading = shade;
376
377	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
378	if (bg_flags & BG_TINT_SET)
379	tint.get (c);
380	as_shade.tintColor.red = c.r;
381	as_shade.tintColor.green = c.g;
382	as_shade.tintColor.blue = c.b;
383
384	background_tint = shading2tint32 (&as_shade);
385	}
386
387	if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
388	{
389	ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
390	ASA_XImage,
391	100, ASIMAGE_QUALITY_DEFAULT);
392	if (tmp)
393	{
394	destroy_asimage (&background);
395	background = tmp;
396	}
397	}
398	# endif
399
400	ASImage *result = 0;
401
402	int target_width = szHint.width;
403	int target_height = szHint.height;
404	int new_pmap_width = target_width;
405	int new_pmap_height = target_height;
406
407	int x = 0;
408	int y = 0;
409	int w = 0;
410	int h = 0;
411
412	if (original_asim)
413	get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
414
415	if (!original_asim
416	\|\| (!(bg_flags & BG_ROOT_ALIGN)
417	&& (x >= target_width
418	\|\| y >= target_height
419	\|\| x + w <= 0
420	\|\| y + h <= 0)))
421	{
422	if (background)
423	{
424	new_pmap_width = background->width;
425	new_pmap_height = background->height;
426	result = background;
427
428	if (background_tint != TINT_LEAVE_SAME)
429	{
430	ASImage *tmp = tile_asimage (asv, background, 0, 0,
431	target_width, target_height, background_tint,
432	ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
433	if (tmp)
434	result = tmp;
435	}
436	}
437	else
438	new_pmap_width = new_pmap_height = 0;
439	}
440	else	344	else
441	{	345	bg_flags &= ~BG_IS_SIZE_SENSITIVE;
442	result = original_asim;
443
444	if (w != original_asim->width
445	\|\| h != original_asim->height)
446	{
447	result = scale_asimage (asv, original_asim,
448	w, h,
449	ASA_XImage,
450	100, ASIMAGE_QUALITY_DEFAULT);
451	}
452
453	if (background == NULL)
454	{
455	if (bg_flags & BG_TILE)
456	{
457	/* if tiling - pixmap has to be sized exactly as the image,
458	but there is no need to make it bigger than the window! */
459	new_pmap_width = min (result->width, target_width);
460	new_pmap_height = min (result->height, target_height);
461
462	/* we also need to tile our image in both directions */
463	ASImage *tmp = tile_asimage (asv, result,
464	(int)result->width - x,
465	(int)result->height - y,
466	new_pmap_width,
467	new_pmap_height,
468	TINT_LEAVE_SAME, ASA_XImage,
469	100, ASIMAGE_QUALITY_DEFAULT);
470	if (tmp)
471	{
472	if (result != original_asim)
473	destroy_asimage (&result);
474
475	result = tmp;
476	}
477	}
478	}
479	else
480	{
481	/* if blending background and image - pixmap has to be sized same as target window */
482	ASImageLayer *layers = create_image_layers (2);
483
484	layers[0].im = background;
485	layers[0].clip_width = target_width;
486	layers[0].clip_height = target_height;
487	layers[0].tint = background_tint;
488	layers[1].im = result;
489
490	if (bg_flags & BG_TILE)
491	{
492	/* tile horizontally */
493	while (x > 0) x -= (int)result->width;
494	layers[1].dst_x = x;
495	layers[1].clip_width = result->width+target_width;
496	}
497	else
498	{
499	/* clip horizontally */
500	layers[1].dst_x = x;
501	layers[1].clip_width = result->width;
502	}
503
504	if (bg_flags & BG_TILE)
505	{
506	while (y > 0) y -= (int)result->height;
507	layers[1].dst_y = y;
508	layers[1].clip_height = result->height + target_height;
509	}
510	else
511	{
512	layers[1].dst_y = y;
513	layers[1].clip_height = result->height;
514	}
515
516	if (rs[Rs_blendtype])
517	{
518	layers[1].merge_scanlines = blend_scanlines_name2func (rs[Rs_blendtype]);
519	if (layers[1].merge_scanlines == NULL)
520	layers[1].merge_scanlines = alphablend_scanlines;
521	}
522
523	ASImage *tmp = merge_layers (asv, layers, 2, target_width, target_height,
524	ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
525
526	if (tmp)
527	{
528	if (result != original_asim)
529	destroy_asimage (&result);
530
531	result = tmp;
532	}
533
534	free (layers);
535	}
536	}
537
538	bool ret = false;
539
540	if (result)
541	{
542	XGCValues gcv;
543	GC gc;
544
545	/* create Pixmap */
546	if (bg_pixmap == None
547	\|\| bg_pmap_width != new_pmap_width
548	\|\| bg_pmap_height != new_pmap_height)
549	{
550	if (bg_pixmap)
551	XFreePixmap (dpy, bg_pixmap);
552	bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth);
553	bg_pmap_width = new_pmap_width;
554	bg_pmap_height = new_pmap_height;
555	}
556	/* fill with background color (if result's not completely overlapping it) */
557	gcv.foreground = pix_colors[Color_bg];
558	gc = XCreateGC (dpy, vt, GCForeground, &gcv);
559
560	int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
561	int dst_width = result->width, dst_height = result->height;
562	if (background == NULL)
563	{
564	if (!(bg_flags & BG_TILE))
565	{
566	src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
567	src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
568	}
569
570	if (dst_x > 0 \|\| dst_y > 0
571	\|\| dst_x + dst_width < new_pmap_width
572	\|\| dst_y + dst_height < new_pmap_height)
573	XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
574	}
575
576	/* put result on pixmap */
577	if (dst_x < new_pmap_width && dst_y < new_pmap_height)
578	asimage2drawable (asv, bg_pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True);
579
580	if (result != background && result != original_asim)
581	destroy_asimage (&result);
582
583	XFreeGC (dpy, gc);
584
585	ret = true;
586	}
587
588	if (background)
589	destroy_asimage (&background);
590
591	return ret;
592	}	346	}
593	# endif /* HAVE_AFTERIMAGE */
594		347
595	# ifdef HAVE_PIXBUF	348	# ifdef HAVE_PIXBUF
596	bool	349	bool
597	rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,	350	rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
598	int src_x, int src_y, int dst_x, int dst_y,	351	int src_x, int src_y, int dst_x, int dst_y,
…		…
675	XDestroyImage (ximage);	428	XDestroyImage (ximage);
676	return true;	429	return true;
677	}	430	}
678		431
679	bool	432	bool
680	rxvt_term::render_image (unsigned long tr_flags)	433	rxvt_term::render_image (bool transparent)
681	{	434	{
682	if (!pixbuf)	435	if (!pixbuf)
683	return false;	436	return false;
684		437
685	if (tr_flags	438	if (transparent
686	&& !(bg_flags & BG_HAS_RENDER))	439	&& !(bg_flags & BG_HAS_RENDER))
687	return false;	440	return false;
688		441
689	GdkPixbuf *result;	442	GdkPixbuf *result;
690		443
…		…
730	Pixmap root_pmap;	483	Pixmap root_pmap;
731		484
732	image_width = gdk_pixbuf_get_width (result);	485	image_width = gdk_pixbuf_get_width (result);
733	image_height = gdk_pixbuf_get_height (result);	486	image_height = gdk_pixbuf_get_height (result);
734		487
735	if (tr_flags)	488	if (transparent)
736	{	489	{
737	root_pmap = bg_pixmap;	490	root_pmap = bg_pixmap;
738	bg_pixmap = None;	491	bg_pixmap = None;
739	}	492	}
740	else	493	else
…		…
798	dst_x, dst_y,	551	dst_x, dst_y,
799	dst_width, dst_height);	552	dst_width, dst_height);
800	}	553	}
801		554
802	#if XRENDER	555	#if XRENDER
803	if (tr_flags)	556	if (transparent)
804	{	557	{
805	XRenderPictureAttributes pa;
806
807	XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, visual);	558	XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
		559
808	Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);	560	Picture src = XRenderCreatePicture (dpy, root_pmap, format, 0, 0);
809		561
810	XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
811	Picture dst = XRenderCreatePicture (dpy, bg_pixmap, dst_format, 0, &pa);	562	Picture dst = XRenderCreatePicture (dpy, bg_pixmap, format, 0, 0);
812		563
813	pa.repeat = True;	564	Picture mask = create_xrender_mask (dpy, vt, False, False);
814	Pixmap mask_pmap = XCreatePixmap (dpy, vt, 1, 1, 8);
815	XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
816	Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
817	XFreePixmap (dpy, mask_pmap);
818		565
819	XRenderColor mask_c;	566	XRenderColor mask_c;
820		567
821	mask_c.alpha = 0x8000;	568	mask_c.alpha = 0x8000;
822	mask_c.red = 0;	569	mask_c.red =
823	mask_c.green = 0;	570	mask_c.green =
824	mask_c.blue = 0;	571	mask_c.blue = 0;
825	XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);	572	XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
		573
826	XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);	574	XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
827		575
828	XRenderFreePicture (dpy, src);	576	XRenderFreePicture (dpy, src);
829	XRenderFreePicture (dpy, dst);	577	XRenderFreePicture (dpy, dst);
830	XRenderFreePicture (dpy, mask);	578	XRenderFreePicture (dpy, mask);
…		…
837	}	585	}
838		586
839	if (result != pixbuf)	587	if (result != pixbuf)
840	g_object_unref (result);	588	g_object_unref (result);
841		589
842	if (tr_flags)	590	if (transparent)
843	XFreePixmap (dpy, root_pmap);	591	XFreePixmap (dpy, root_pmap);
844		592
845	return ret;	593	return ret;
846	}	594	}
847	# endif /* HAVE_PIXBUF */	595	# endif /* HAVE_PIXBUF */
…		…
862	memcpy (f, file, len);	610	memcpy (f, file, len);
863	f[len] = '\0';	611	f[len] = '\0';
864	file = f;	612	file = f;
865	}	613	}
866		614
867	# ifdef HAVE_AFTERIMAGE
868	if (!asimman)
869	asimman = create_generic_imageman (rs[Rs_path]);
870	ASImage *image = get_asimage (asimman, file, 0xFFFFFFFF, 100);
871	if (image)
872	{
873	if (original_asim)
874	safe_asimage_destroy (original_asim);
875	original_asim = image;
876	bg_flags \|= BG_IS_FROM_FILE \| BG_CLIENT_RENDER;
877	ret = true;
878	}
879	# endif
880
881	# ifdef HAVE_PIXBUF	615	# ifdef HAVE_PIXBUF
882	GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);	616	GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
883	if (image)	617	if (image)
884	{	618	{
885	if (pixbuf)	619	if (pixbuf)
…		…
942	{	676	{
943	changed = true;	677	changed = true;
944	v_blurRadius = vr;	678	v_blurRadius = vr;
945	}	679	}
946		680
947	if (v_blurRadius == 0 && h_blurRadius == 0)	681	if (h_blurRadius && v_blurRadius)
		682	bg_flags \|= BG_NEEDS_BLUR;
		683	else
948	bg_flags &= ~BG_NEEDS_BLUR;	684	bg_flags &= ~BG_NEEDS_BLUR;
949	else
950	bg_flags \|= BG_NEEDS_BLUR;
951		685
952	return changed;	686	return changed;
953	}	687	}
954		688
955	void	689	void
956	rxvt_term::set_tint_shade_flags ()	690	rxvt_term::set_tint_shade_flags ()
957	{	691	{
958	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);	692	if (shade != 100 \|\| (bg_flags & BG_TINT_SET))
959	bool has_shade = shade != 100;	693	bg_flags \|= BG_NEEDS_TINT;
		694	else
		695	bg_flags &= ~BG_NEEDS_TINT;
		696	}
960		697
		698	bool
		699	rxvt_term::bg_set_tint (rxvt_color &new_tint)
		700	{
		701	if (!(bg_flags & BG_TINT_SET) \|\| tint != new_tint)
		702	{
		703	tint = new_tint;
961	bg_flags &= ~BG_TINT_FLAGS;	704	bg_flags \|= BG_TINT_SET;
962		705
963	if (bg_flags & BG_TINT_SET)	706	rgba c;
964	{
965	tint.get (c);	707	tint.get (c);
966	if (!has_shade
967	&& (c.r <= 0x00ff \|\| c.r >= 0xff00)	708	if ((c.r <= 0x00ff \|\| c.r >= 0xff00)
968	&& (c.g <= 0x00ff \|\| c.g >= 0xff00)	709	&& (c.g <= 0x00ff \|\| c.g >= 0xff00)
969	&& (c.b <= 0x00ff \|\| c.b >= 0xff00))	710	&& (c.b <= 0x00ff \|\| c.b >= 0xff00))
970	bg_flags \|= BG_TINT_BITAND;	711	bg_flags \|= BG_TINT_BITAND;
971	}	712	else
972
973	if (has_shade \|\| (bg_flags & BG_TINT_SET))
974	bg_flags \|= BG_NEEDS_TINT;
975	}
976
977	bool
978	rxvt_term::bg_set_tint (rxvt_color &new_tint)
979	{
980	if (!(bg_flags & BG_TINT_SET) \|\| tint != new_tint)
981	{
982	tint = new_tint;
983	bg_flags \|= BG_TINT_SET;	713	bg_flags &= ~BG_TINT_BITAND;
		714
984	set_tint_shade_flags ();	715	set_tint_shade_flags ();
985	return true;	716	return true;
986	}	717	}
987		718
988	return false;	719	return false;
989	}	720	}
990		721
991	bool	722	bool
992	rxvt_term::bg_set_shade (const char *shade_str)	723	rxvt_term::bg_set_shade (const char *shade_str)
993	{	724	{
994	int new_shade = (shade_str) ? atoi (shade_str) : 100;	725	int new_shade = atoi (shade_str);
995		726
996	clamp_it (new_shade, -100, 200);	727	clamp_it (new_shade, -100, 200);
997	if (new_shade < 0)	728	if (new_shade < 0)
998	new_shade = 200 - (100 + new_shade);	729	new_shade = 200 - (100 + new_shade);
999		730
…		…
1029	params[i+2] = XDoubleToFixed (kernel[i] / sum);	760	params[i+2] = XDoubleToFixed (kernel[i] / sum);
1030	}	761	}
1031	#endif	762	#endif
1032		763
1033	bool	764	bool
1034	rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)	765	rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height, int depth)
1035	{	766	{
1036	bool ret = false;	767	bool ret = false;
1037	#if XRENDER	768	#if XRENDER
		769	if (!(bg_flags & BG_HAS_RENDER_CONV))
		770	return false;
		771
1038	int size = max (h_blurRadius, v_blurRadius) * 2 + 1;	772	int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1039	double kernel = (double )malloc (size * sizeof (double));	773	double kernel = (double )malloc (size * sizeof (double));
1040	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));	774	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
1041		775
1042	XRenderPictureAttributes pa;	776	XRenderPictureAttributes pa;
1043	XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);	777	XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1044		778
		779	pa.repeat = RepeatPad;
1045	Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);	780	Picture src = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);
		781	Pixmap tmp = XCreatePixmap (dpy, pixmap, width, height, depth);
1046	Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);	782	Picture dst = XRenderCreatePicture (dpy, tmp, format, CPRepeat, &pa);
		783	XFreePixmap (dpy, tmp);
1047		784
1048	if (kernel && params)	785	if (kernel && params)
1049	{	786	{
1050	if (h_blurRadius)
1051	{
1052	size = h_blurRadius * 2 + 1;	787	size = h_blurRadius * 2 + 1;
1053	get_gaussian_kernel (h_blurRadius, size, kernel, params);	788	get_gaussian_kernel (h_blurRadius, size, kernel, params);
1054		789
1055	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);	790	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1056	XRenderComposite (dpy,	791	XRenderComposite (dpy,
1057	PictOpSrc,	792	PictOpSrc,
1058	src,	793	src,
1059	None,	794	None,
1060	dst,	795	dst,
1061	0, 0,	796	0, 0,
1062	0, 0,	797	0, 0,
1063	0, 0,	798	0, 0,
1064	width, height);	799	width, height);
1065	}
1066		800
1067	if (v_blurRadius)	801	::swap (src, dst);
1068	{	802
1069	size = v_blurRadius * 2 + 1;	803	size = v_blurRadius * 2 + 1;
1070	get_gaussian_kernel (v_blurRadius, size, kernel, params);	804	get_gaussian_kernel (v_blurRadius, size, kernel, params);
1071	::swap (params[0], params[1]);	805	::swap (params[0], params[1]);
1072		806
1073	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);	807	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1074	XRenderComposite (dpy,	808	XRenderComposite (dpy,
1075	PictOpSrc,	809	PictOpSrc,
1076	src,	810	src,
1077	None,	811	None,
1078	dst,	812	dst,
1079	0, 0,	813	0, 0,
1080	0, 0,	814	0, 0,
1081	0, 0,	815	0, 0,
1082	width, height);	816	width, height);
1083	}
1084		817
1085	ret = true;	818	ret = true;
1086	}	819	}
1087		820
1088	free (kernel);	821	free (kernel);
…		…
1096	bool	829	bool
1097	rxvt_term::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)	830	rxvt_term::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1098	{	831	{
1099	bool ret = false;	832	bool ret = false;
1100		833
1101	if (bg_flags & BG_TINT_BITAND)	834	if (shade == 100 && (bg_flags & BG_TINT_BITAND))
1102	{	835	{
1103	XGCValues gcv;	836	XGCValues gcv;
1104	GC gc;	837	GC gc;
1105		838
1106	/* In this case we can tint image server-side getting significant	839	/* In this case we can tint image server-side getting significant
…		…
1115	XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);	848	XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1116	ret = true;	849	ret = true;
1117	XFreeGC (dpy, gc);	850	XFreeGC (dpy, gc);
1118	}	851	}
1119	}	852	}
1120	else
1121	{
1122	# if XRENDER	853	# if XRENDER
		854	else if (bg_flags & BG_HAS_RENDER)
		855	{
1123	rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);	856	rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1124		857
1125	if (bg_flags & BG_TINT_SET)	858	if (bg_flags & BG_TINT_SET)
1126	tint.get (c);	859	tint.get (c);
1127		860
…		…
1136	c.r = c.r * (200 - shade) / 100;	869	c.r = c.r * (200 - shade) / 100;
1137	c.g = c.g * (200 - shade) / 100;	870	c.g = c.g * (200 - shade) / 100;
1138	c.b = c.b * (200 - shade) / 100;	871	c.b = c.b * (200 - shade) / 100;
1139	}	872	}
1140		873
1141	XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1142	XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);	874	XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1143	XRenderPictureAttributes pa;
1144		875
1145	Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);	876	Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, 0);
1146		877
1147	pa.repeat = True;	878	Picture overlay_pic = create_xrender_mask (dpy, pixmap, True, False);
1148		879
1149	Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);	880	Picture mask_pic = create_xrender_mask (dpy, pixmap, True, True);
1150	Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1151	XFreePixmap (dpy, overlay_pmap);
1152
1153	pa.component_alpha = True;
1154	Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1155	Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat \| CPComponentAlpha, &pa);
1156	XFreePixmap (dpy, mask_pmap);
1157		881
1158	XRenderColor mask_c;	882	XRenderColor mask_c;
1159		883
1160	mask_c.alpha = 0xffff;	884	mask_c.alpha = 0xffff;
1161	mask_c.red =	885	mask_c.red =
…		…
1166	mask_c.alpha = 0;	890	mask_c.alpha = 0;
1167	mask_c.red = 0xffff - c.r;	891	mask_c.red = 0xffff - c.r;
1168	mask_c.green = 0xffff - c.g;	892	mask_c.green = 0xffff - c.g;
1169	mask_c.blue = 0xffff - c.b;	893	mask_c.blue = 0xffff - c.b;
1170	XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);	894	XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
		895
1171	XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);	896	XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1172		897
1173	if (shade > 100)	898	if (shade > 100)
1174	{	899	{
1175	mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1176	mask_c.alpha = 0;	900	mask_c.alpha = 0;
		901	mask_c.red =
		902	mask_c.green =
		903	mask_c.blue = 0xffff * (shade - 100) / 100;
1177	XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);	904	XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1178		905
1179	XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);	906	XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1180	}	907	}
1181		908
1182	ret = true;	909	ret = true;
1183		910
1184	XRenderFreePicture (dpy, mask_pic);	911	XRenderFreePicture (dpy, mask_pic);
1185	XRenderFreePicture (dpy, overlay_pic);	912	XRenderFreePicture (dpy, overlay_pic);
1186	XRenderFreePicture (dpy, back_pic);	913	XRenderFreePicture (dpy, back_pic);
		914	}
1187	# endif	915	# endif
1188	}
1189		916
1190	return ret;	917	return ret;
1191	}	918	}
1192		919
1193	/*	920	/*
1194	* Builds a pixmap of the same size as the terminal window that contains	921	* Builds a pixmap of the same size as the terminal window that contains
1195	* the tiled portion of the root pixmap that is supposed to be covered by	922	* the tiled portion of the root pixmap that is supposed to be covered by
1196	* our window.	923	* our window.
1197	*/	924	*/
1198	unsigned long	925	bool
1199	rxvt_term::make_transparency_pixmap ()	926	rxvt_term::make_transparency_pixmap ()
1200	{	927	{
1201	unsigned long result = 0;	928	bool ret = false;
1202		929
1203	/* root dimensions may change from call to call - but Display structure should	930	/* root dimensions may change from call to call - but Display structure should
1204	* be always up-to-date, so let's use it :	931	* be always up-to-date, so let's use it :
1205	*/	932	*/
1206	int screen = display->screen;	933	int screen = display->screen;
…		…
1244	#if XRENDER	971	#if XRENDER
1245	if (bg_flags & BG_HAS_RENDER)	972	if (bg_flags & BG_HAS_RENDER)
1246	{	973	{
1247	recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth);	974	recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth);
1248		975
1249	XRenderPictureAttributes pa;
1250
1251	XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));	976	XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1252	Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);	977	Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, 0);
1253		978
1254	XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);	979	XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
1255	Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);	980	Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, 0);
1256		981
1257	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);	982	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1258		983
1259	XRenderFreePicture (dpy, src);	984	XRenderFreePicture (dpy, src);
1260	XRenderFreePicture (dpy, dst);	985	XRenderFreePicture (dpy, dst);
…		…
1289	gc = XCreateGC (dpy, vt, GCFillStyle \| GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin, &gcv);	1014	gc = XCreateGC (dpy, vt, GCFillStyle \| GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin, &gcv);
1290		1015
1291	if (gc)	1016	if (gc)
1292	{	1017	{
1293	XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);	1018	XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);
1294	result \|= BG_IS_VALID \| (bg_flags & BG_EFFECTS_FLAGS);	1019	ret = true;
		1020	unsigned long tr_flags = bg_flags & BG_EFFECTS_FLAGS;
		1021
		1022	if (!(bg_flags & BG_CLIENT_RENDER))
		1023	{
		1024	if (bg_flags & BG_NEEDS_BLUR)
		1025	{
		1026	if (blur_pixmap (bg_pixmap, visual, window_width, window_height, depth))
		1027	tr_flags &= ~BG_NEEDS_BLUR;
		1028	}
		1029	if (bg_flags & BG_NEEDS_TINT)
		1030	{
		1031	if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
		1032	tr_flags &= ~BG_NEEDS_TINT;
		1033	}
		1034	if (tr_flags & BG_NEEDS_TINT)
		1035	{
		1036	XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
		1037	if (ximage)
		1038	{
		1039	/* our own client-side tinting */
		1040	tint_ximage (DefaultVisual (dpy, display->screen), ximage);
		1041
		1042	XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height);
		1043	XDestroyImage (ximage);
		1044	}
		1045	}
		1046	} /* server side rendering completed */
		1047
1295	XFreeGC (dpy, gc);	1048	XFreeGC (dpy, gc);
1296
1297	if (!(bg_flags & BG_CLIENT_RENDER))
1298	{
1299	if ((bg_flags & BG_NEEDS_BLUR)
1300	&& (bg_flags & BG_HAS_RENDER_CONV))
1301	{
1302	if (blur_pixmap (bg_pixmap, visual, window_width, window_height))
1303	result &= ~BG_NEEDS_BLUR;
1304	}
1305	if ((bg_flags & BG_NEEDS_TINT)
1306	&& (bg_flags & (BG_TINT_BITAND \| BG_HAS_RENDER)))
1307	{
1308	if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1309	result &= ~BG_NEEDS_TINT;
1310	}
1311	} /* server side rendering completed */
1312	}	1049	}
1313		1050
1314	if (recoded_root_pmap != root_pixmap)	1051	if (recoded_root_pmap != root_pixmap)
1315	XFreePixmap (dpy, recoded_root_pmap);	1052	XFreePixmap (dpy, recoded_root_pmap);
1316		1053
1317	return result;	1054	return ret;
1318	}	1055	}
1319		1056
1320	void	1057	void
1321	rxvt_term::bg_set_root_pixmap ()	1058	rxvt_term::bg_set_root_pixmap ()
1322	{	1059	{
…		…
1326		1063
1327	root_pixmap = new_root_pixmap;	1064	root_pixmap = new_root_pixmap;
1328	}	1065	}
1329	# endif /* ENABLE_TRANSPARENCY */	1066	# endif /* ENABLE_TRANSPARENCY */
1330		1067
1331	#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1332	static void shade_ximage (Visual visual, XImage ximage, int shade, const rgba &c);
1333	# endif
1334
1335	bool	1068	bool
1336	rxvt_term::bg_render ()	1069	rxvt_term::bg_render ()
1337	{	1070	{
1338	unsigned long tr_flags = 0;	1071	bool transparent = false;
1339		1072
1340	bg_invalidate ();	1073	bg_invalidate ();
1341	# ifdef ENABLE_TRANSPARENCY	1074	# ifdef ENABLE_TRANSPARENCY
1342	if (bg_flags & BG_IS_TRANSPARENT)	1075	if (bg_flags & BG_IS_TRANSPARENT)
1343	{	1076	{
1344	/* we need to re-generate transparency pixmap in that case ! */	1077	/* we need to re-generate transparency pixmap in that case ! */
1345	tr_flags = make_transparency_pixmap ();	1078	transparent = make_transparency_pixmap ();
1346	if (tr_flags == 0)	1079	if (transparent)
1347	return false;
1348	bg_flags \|= BG_IS_VALID;	1080	bg_flags \|= BG_IS_VALID;
1349	}	1081	}
1350	# endif	1082	# endif
1351		1083
1352	# ifdef BG_IMAGE_FROM_FILE	1084	# ifdef BG_IMAGE_FROM_FILE
1353	if ((bg_flags & BG_IS_FROM_FILE)	1085	if (bg_flags & BG_IS_FROM_FILE)
1354	\|\| (tr_flags & BG_EFFECTS_FLAGS))
1355	{	1086	{
1356	if (render_image (tr_flags))	1087	if (render_image (transparent))
1357	bg_flags \|= BG_IS_VALID;	1088	bg_flags \|= BG_IS_VALID;
1358	}
1359	# endif
1360
1361	# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1362	XImage *result = NULL;
1363
1364	if (tr_flags & BG_NEEDS_TINT)
1365	{
1366	result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1367	}
1368
1369	if (result)
1370	{
1371	/* our own client-side tinting */
1372	//if (tr_flags & BG_NEEDS_TINT)
1373	if (1)
1374	{
1375	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1376	if (bg_flags & BG_TINT_SET)
1377	tint.get (c);
1378	shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c);
1379	}
1380
1381	GC gc = XCreateGC (dpy, vt, 0UL, NULL);
1382
1383	if (gc)
1384	{
1385	XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1386
1387	XFreeGC (dpy, gc);
1388	}
1389
1390	XDestroyImage (result);
1391	}	1089	}
1392	# endif	1090	# endif
1393		1091
1394	if (!(bg_flags & BG_IS_VALID))	1092	if (!(bg_flags & BG_IS_VALID))
1395	{	1093	{
…		…
1432	#endif	1130	#endif
1433	}	1131	}
1434		1132
1435	#endif /* HAVE_BG_PIXMAP */	1133	#endif /* HAVE_BG_PIXMAP */
1436		1134
1437	#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)	1135	#ifdef ENABLE_TRANSPARENCY
1438	/* based on code from aterm-0.4.2 */	1136	/* based on code from aterm-0.4.2 */
1439		1137
1440	static inline void	1138	static inline void
1441	fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)	1139	fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)
1442	{	1140	{
…		…
1447	tmp += (mask >> sh) * low;	1145	tmp += (mask >> sh) * low;
1448	lookup[i] = (tmp / 0xffff) << sh;	1146	lookup[i] = (tmp / 0xffff) << sh;
1449	}	1147	}
1450	}	1148	}
1451		1149
1452	static void	1150	void
1453	shade_ximage (Visual visual, XImage ximage, int shade, const rgba &c)	1151	rxvt_term::tint_ximage (Visual visual, XImage ximage)
1454	{	1152	{
1455	int sh_r, sh_g, sh_b;	1153	int sh_r, sh_g, sh_b;
1456	uint32_t mask_r, mask_g, mask_b;	1154	uint32_t mask_r, mask_g, mask_b;
1457	uint32_t lookup, lookup_r, lookup_g, lookup_b;	1155	uint32_t lookup, lookup_r, lookup_g, lookup_b;
1458	rgba low;	1156	unsigned short low;
1459	rgba high;
1460	int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;	1157	int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1461		1158
1462	if (visual->c_class != TrueColor \|\| ximage->format != ZPixmap) return;	1159	if (visual->c_class != TrueColor \|\| ximage->format != ZPixmap) return;
1463		1160
1464	/* for convenience */	1161	/* for convenience */
…		…
1523	break;	1220	break;
1524	default:	1221	default:
1525	return; /* we do not support this color depth */	1222	return; /* we do not support this color depth */
1526	}	1223	}
1527		1224
		1225	rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
		1226
		1227	if (bg_flags & BG_TINT_SET)
		1228	tint.get (c);
		1229
1528	/* prepare limits for color transformation (each channel is handled separately) */	1230	/* prepare limits for color transformation (each channel is handled separately) */
1529	if (shade > 100)	1231	if (shade > 100)
1530	{	1232	{
1531	shade = 200 - shade;
1532
1533	high.r = c.r * shade / 100;
1534	high.g = c.g * shade / 100;
1535	high.b = c.b * shade / 100;
1536
1537	low.r = 65535 * (100 - shade) / 100;	1233	c.r = c.r * (200 - shade) / 100;
1538	low.g = 65535 * (100 - shade) / 100;	1234	c.g = c.g * (200 - shade) / 100;
1539	low.b = 65535 * (100 - shade) / 100;	1235	c.b = c.b * (200 - shade) / 100;
		1236
		1237	low = 0xffff * (shade - 100) / 100;
1540	}	1238	}
1541	else	1239	else
1542	{	1240	{
1543	high.r = c.r * shade / 100;	1241	c.r = c.r * shade / 100;
1544	high.g = c.g * shade / 100;	1242	c.g = c.g * shade / 100;
1545	high.b = c.b * shade / 100;	1243	c.b = c.b * shade / 100;
1546		1244
1547	low.r = low.g = low.b = 0;	1245	low = 0;
1548	}	1246	}
1549		1247
1550	/* fill our lookup tables */	1248	/* fill our lookup tables */
1551	fill_lut (lookup_r, mask_r, sh_r, low.r, high.r);	1249	fill_lut (lookup_r, mask_r, sh_r, low, c.r);
1552	fill_lut (lookup_g, mask_g, sh_g, low.g, high.g);	1250	fill_lut (lookup_g, mask_g, sh_g, low, c.g);
1553	fill_lut (lookup_b, mask_b, sh_b, low.b, high.b);	1251	fill_lut (lookup_b, mask_b, sh_b, low, c.b);
1554		1252
1555	/* apply table to input image (replacing colors by newly calculated ones) */	1253	/* apply table to input image (replacing colors by newly calculated ones) */
1556	if (ximage->bits_per_pixel == 32	1254	if (ximage->bits_per_pixel == 32
1557	&& (ximage->depth == 24 \|\| ximage->depth == 32)	1255	&& (ximage->depth == 24 \|\| ximage->depth == 32)
1558	&& ximage->byte_order == host_byte_order)	1256	&& ximage->byte_order == host_byte_order)
…		…
1588	}	1286	}
1589	}	1287	}
1590		1288
1591	free (lookup);	1289	free (lookup);
1592	}	1290	}
1593	#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */	1291	#endif /* ENABLE_TRANSPARENCY */

Diff Legend

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

Comparing rxvt-unicode/src/background.C (file contents): Revision 1.179 by sf-exg, Sat Dec 24 09:44:10 2011 UTC vs. Revision 1.204 by sf-exg, Tue Apr 10 15:19:22 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.179 by sf-exg, Sat Dec 24 09:44:10 2011 UTC vs.
Revision 1.204 by sf-exg, Tue Apr 10 15:19:22 2012 UTC