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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.42 by sf-exg, Sun Aug 29 13:24:30 2010 UTC vs.
Revision 1.57 by sf-exg, Fri Sep 3 22:43:22 2010 UTC

…		…
52	* adjustment and may optionally be followed by a colon and one or more	52	* adjustment and may optionally be followed by a colon and one or more
53	* colon-delimited pixmap operations.	53	* colon-delimited pixmap operations.
54	* The following table shows the valid geometry strings and their	54	* The following table shows the valid geometry strings and their
55	* effects on the background image :	55	* effects on the background image :
56	*	56	*
57	* WxH+X+Y Set scaling to W% by H%, and position to X% by Y%.	57	* WxH+X+Y Set scaling to W% by H%, and position to X% by Y%.
58	* W and H are percentages of the terminal window size.	58	* W and H are percentages of the terminal window size.
59	* X and Y are also percentages; e.g., +50+50 centers	59	* X and Y are also percentages; e.g., +50+50 centers
60	* the image in the window.	60	* the image in the window.
61	* WxH+X Assumes Y == X	61	* WxH+X Assumes Y == X
62	* WxH Assumes Y == X == 50 (centers the image)	62	* WxH Assumes Y == X == 50 (centers the image)
63	* W+X+Y Assumes H == W	63	* W+X+Y Assumes H == W
64	* W+X Assumes H == W and Y == X	64	* W+X Assumes H == W and Y == X
65	* W Assumes H == W and Y == X == 50	65	* W Assumes H == W and Y == X == 50
66	*	66	*
67	* Adjusting position only :	67	* Adjusting position only :
68	* =+X+Y Set position to X% by Y% (absolute).	68	* =+X+Y Set position to X% by Y% (absolute).
69	* =+X Set position to X% by X%.	69	* =+X Set position to X% by X%.
70	* +X+Y Adjust position horizontally X% and vertically Y%	70	* +X+Y Adjust position horizontally X% and vertically Y%
71	* from current position (relative).	71	* from current position (relative).
72	* +X Adjust position horizontally X% and vertically X%	72	* +X Adjust position horizontally X% and vertically X%
73	* from current position.	73	* from current position.
74	*	74	*
75	* Adjusting scale only :	75	* Adjusting scale only :
76	* Wx0 Multiply horizontal scaling factor by W%	76	* Wx0 Multiply horizontal scaling factor by W%
77	* 0xH Multiply vertical scaling factor by H%	77	* 0xH Multiply vertical scaling factor by H%
78	* 0x0 No scaling (show image at normal size).	78	* 0x0 No scaling (show image at normal size).
79	*	79	*
80	* Pixmap Operations : (should be prepended by a colon)	80	* Pixmap Operations : (should be prepended by a colon)
81	* tile Tile image. Scaling/position modifiers above will affect	81	* tile Tile image. Scaling/position modifiers above will affect
82	* the tile size and origin.	82	* the tile size and origin.
83	* propscale When scaling, scale proportionally. That is, maintain the	83	* propscale When scaling, scale proportionally. That is, maintain the
84	* proper aspect ratio for the image. Any portion of the	84	* proper aspect ratio for the image. Any portion of the
85	* background not covered by the image is filled with the	85	* background not covered by the image is filled with the
86	* current background color.	86	* current background color.
87	* hscale Scale horizontally, tile vertically ?	87	* hscale Scale horizontally, tile vertically ?
88	* vscale Tile horizontally, scale vertically ?	88	* vscale Tile horizontally, scale vertically ?
…		…
96	// this is basically redundant as bgPixmap_t is only used in	96	// this is basically redundant as bgPixmap_t is only used in
97	// zero_initialised-derived structs	97	// zero_initialised-derived structs
98	#ifdef HAVE_AFTERIMAGE	98	#ifdef HAVE_AFTERIMAGE
99	original_asim = NULL;	99	original_asim = NULL;
100	#endif	100	#endif
		101	#ifdef HAVE_PIXBUF
		102	pixbuf = NULL;
		103	#endif
101	#ifdef BG_IMAGE_FROM_FILE	104	#ifdef BG_IMAGE_FROM_FILE
		105	have_image = false;
102	h_scale = v_scale = 0;	106	h_scale = v_scale = 0;
103	h_align = v_align = 0;	107	h_align = v_align = 0;
104	#endif	108	#endif
105	flags = 0;	109	flags = 0;
106	pixmap = None;	110	pixmap = None;
…		…
114	#ifdef HAVE_AFTERIMAGE	118	#ifdef HAVE_AFTERIMAGE
115	if (original_asim)	119	if (original_asim)
116	safe_asimage_destroy (original_asim);	120	safe_asimage_destroy (original_asim);
117	#endif	121	#endif
118		122
		123	#ifdef HAVE_PIXBUF
		124	if (pixbuf)
		125	g_object_unref (pixbuf);
		126	#endif
		127
119	if (pixmap && target)	128	if (pixmap && target)
120	XFreePixmap (target->dpy, pixmap);	129	XFreePixmap (target->dpy, pixmap);
121	}	130	}
122		131
123	bool	132	bool
…		…
127	if (flags & isTransparent)	136	if (flags & isTransparent)
128	return true;	137	return true;
129	# endif	138	# endif
130		139
131	# ifdef BG_IMAGE_FROM_FILE	140	# ifdef BG_IMAGE_FROM_FILE
132	# ifdef HAVE_AFTERIMAGE	141	if (have_image)
133	if (original_asim)
134	# endif
135	{	142	{
136	if (h_scale != 0 \|\| v_scale != 0	143	if (h_scale != 0 \|\| v_scale != 0
137	\|\| h_align != 0 \|\| v_align != 0)	144	\|\| h_align != 0 \|\| v_align != 0)
138	return true;	145	return true;
139	}	146	}
…		…
149	if (flags & isTransparent)	156	if (flags & isTransparent)
150	return true;	157	return true;
151	# endif	158	# endif
152		159
153	# ifdef BG_IMAGE_FROM_FILE	160	# ifdef BG_IMAGE_FROM_FILE
154	# ifdef HAVE_AFTERIMAGE	161	if (have_image)
155	if (original_asim)
156	# endif
157	{	162	{
158	if (h_align == rootAlign \|\| v_align == rootAlign)	163	if (h_align == rootAlign \|\| v_align == rootAlign)
159	return true;	164	return true;
160	}	165	}
161	# endif	166	# endif
…		…
223		228
224	static inline int	229	static inline int
225	make_align_position (int align, int window_size, int image_size)	230	make_align_position (int align, int window_size, int image_size)
226	{	231	{
227	int diff = window_size - image_size;	232	int diff = window_size - image_size;
228	int smaller = MIN (image_size,window_size);	233	int smaller = min (image_size, window_size);
229		234
230	if (align >= 0 && align <= 50)	235	if (align >= 0 && align <= 50)
231	return diff * align / 100;	236	return diff * align / 100;
232	else if (align > 50 && align <= 100)	237	else if (align > 50 && align <= 100)
233	return window_size - image_size - diff * (100 - align) / 100;	238	return window_size - image_size - diff * (100 - align) / 100;
…		…
441	{	446	{
442	flags = new_flags;	447	flags = new_flags;
443	changed++;	448	changed++;
444	}	449	}
445		450
446	//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",	451	//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
447	// flags, h_scale, v_scale, h_align, v_align);	452	// flags, h_scale, v_scale, h_align, v_align);
448	return (changed > 0);	453	return (changed > 0);
449	}	454	}
450		455
451	# ifdef HAVE_AFTERIMAGE	456	# ifdef HAVE_AFTERIMAGE
452	bool	457	bool
453	bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint)	458	bgPixmap_t::render_image (unsigned long background_flags)
454	{	459	{
455	if (target == NULL)	460	if (target == NULL)
456	return false;	461	return false;
457		462
458	target->init_asv ();	463	target->init_asv ();
		464
		465	ASImage *background = NULL;
		466	ARGB32 background_tint = TINT_LEAVE_SAME;
		467
		468	# ifdef ENABLE_TRANSPARENCY
		469	if (background_flags)
		470	background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
		471
		472	if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
		473	{
		474	ShadingInfo as_shade;
		475	as_shade.shading = (shade == 0) ? 100 : shade;
		476
		477	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
		478	if (flags & tintSet)
		479	tint.get (c);
		480	as_shade.tintColor.red = c.r;
		481	as_shade.tintColor.green = c.g;
		482	as_shade.tintColor.blue = c.b;
		483
		484	background_tint = shading2tint32 (&as_shade);
		485	}
		486
		487	if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
		488	{
		489	ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
		490	(original_asim == NULL \|\| tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
		491	100, ASIMAGE_QUALITY_DEFAULT);
		492	if (tmp)
		493	{
		494	destroy_asimage (&background);
		495	background = tmp;
		496	}
		497	}
		498	# endif
459		499
460	ASImage *result = 0;	500	ASImage *result = 0;
461		501
462	int target_width = target->szHint.width;	502	int target_width = target->szHint.width;
463	int target_height = target->szHint.height;	503	int target_height = target->szHint.height;
…		…
473		513
474	if (original_asim)	514	if (original_asim)
475	{	515	{
476	if (h_align == rootAlign \|\| v_align == rootAlign)	516	if (h_align == rootAlign \|\| v_align == rootAlign)
477	{	517	{
478	target->get_window_origin(x, y);	518	target->get_window_origin (x, y);
479	x = -x;	519	x = -x;
480	y = -y;	520	y = -y;
481	}	521	}
482		522
483	if (h_align != rootAlign)	523	if (h_align != rootAlign)
…		…
525	100, ASIMAGE_QUALITY_DEFAULT);	565	100, ASIMAGE_QUALITY_DEFAULT);
526	}	566	}
527		567
528	if (background == NULL)	568	if (background == NULL)
529	{	569	{
530	/* if tiling - pixmap has to be sized exactly as the image,
531	but there is no need to make it bigger than the window! */
532	if (h_scale == 0)
533	new_pmap_width = min (result->width, target_width);
534	if (v_scale == 0)
535	new_pmap_height = min (result->height, target_height);
536	/* we also need to tile our image in one or both directions */
537	if (h_scale == 0 \|\| v_scale == 0)	570	if (h_scale == 0 \|\| v_scale == 0)
538	{	571	{
		572	/* if tiling - pixmap has to be sized exactly as the image,
		573	but there is no need to make it bigger than the window! */
		574	new_pmap_width = min (result->width, target_width);
		575	new_pmap_height = min (result->height, target_height);
		576
		577	/* we also need to tile our image in both directions */
539	ASImage *tmp = tile_asimage (target->asv, result,	578	ASImage *tmp = tile_asimage (target->asv, result,
540	(h_scale > 0) ? 0 : (int)result->width - x,	579	(int)result->width - x,
541	(v_scale > 0) ? 0 : (int)result->height - y,	580	(int)result->height - y,
542	new_pmap_width,	581	new_pmap_width,
543	new_pmap_height,	582	new_pmap_height,
544	TINT_LEAVE_SAME, ASA_XImage,	583	TINT_LEAVE_SAME, ASA_XImage,
545	100, ASIMAGE_QUALITY_DEFAULT);	584	100, ASIMAGE_QUALITY_DEFAULT);
546	if (tmp)	585	if (tmp)
…		…
610	free (layers);	649	free (layers);
611	}	650	}
612	}	651	}
613	TIMING_TEST_PRINT_RESULT (asim);	652	TIMING_TEST_PRINT_RESULT (asim);
614		653
615	if (pixmap)	654	bool ret = false;
616	{
617	if (result == NULL
618	\|\| pmap_width != new_pmap_width
619	\|\| pmap_height != new_pmap_height
620	\|\| pmap_depth != target->depth)
621	{
622	XFreePixmap (target->dpy, pixmap);
623	pixmap = None;
624	}
625	}
626		655
627	if (result)	656	if (result)
628	{	657	{
629	XGCValues gcv;	658	XGCValues gcv;
630	GC gc;	659	GC gc;
		660
		661	if (pixmap)
		662	{
		663	if (pmap_width != new_pmap_width
		664	\|\| pmap_height != new_pmap_height
		665	\|\| pmap_depth != target->depth)
		666	{
		667	XFreePixmap (target->dpy, pixmap);
		668	pixmap = None;
		669	}
		670	}
631		671
632	/* create Pixmap */	672	/* create Pixmap */
633	if (pixmap == None)	673	if (pixmap == None)
634	{	674	{
635	pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);	675	pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
636	pmap_width = new_pmap_width;	676	pmap_width = new_pmap_width;
637	pmap_height = new_pmap_height;	677	pmap_height = new_pmap_height;
638	pmap_depth = target->depth;	678	pmap_depth = target->depth;
639	}	679	}
640	/* fill with background color ( if result's not completely overlapping it)*/	680	/* fill with background color (if result's not completely overlapping it) */
641	gcv.foreground = target->pix_colors[Color_bg];	681	gcv.foreground = target->pix_colors[Color_bg];
642	gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);	682	gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
643		683
644	int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;	684	int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
645	int dst_width = result->width, dst_height = result->height;	685	int dst_width = result->width, dst_height = result->height;
646	if (background == NULL)	686	if (background == NULL)
647	{	687	{
		688	if (!(h_scale == 0 \|\| v_scale == 0))
		689	{
648	if (h_scale > 0) src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );	690	src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
649	if (v_scale > 0) src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);	691	src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
		692	}
650		693
651	if (dst_x > 0 \|\| dst_y > 0	694	if (dst_x > 0 \|\| dst_y > 0
652	\|\| dst_x + dst_width < new_pmap_width	695	\|\| dst_x + dst_width < new_pmap_width
653	\|\| dst_y + dst_height < new_pmap_height)	696	\|\| dst_y + dst_height < new_pmap_height)
654	XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);	697	XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
…		…
661	if (result != background && result != original_asim)	704	if (result != background && result != original_asim)
662	destroy_asimage (&result);	705	destroy_asimage (&result);
663		706
664	XFreeGC (target->dpy, gc);	707	XFreeGC (target->dpy, gc);
665	TIMING_TEST_PRINT_RESULT (asim);	708	TIMING_TEST_PRINT_RESULT (asim);
666	}
667		709
		710	ret = true;
		711	}
		712
		713	if (background)
		714	destroy_asimage (&background);
		715
668	return true;	716	return ret;
669	}	717	}
670	# endif /* HAVE_AFTERIMAGE */	718	# endif /* HAVE_AFTERIMAGE */
		719
		720	# ifdef HAVE_PIXBUF
		721	bool
		722	bgPixmap_t::render_image (unsigned long background_flags)
		723	{
		724	if (target == NULL)
		725	return false;
		726
		727	if (!pixbuf)
		728	return false;
		729
		730	// TODO: add alpha blending
		731	if (background_flags)
		732	return false;
		733
		734	GdkPixbuf *result;
		735
		736	int image_width = gdk_pixbuf_get_width (pixbuf);
		737	int image_height = gdk_pixbuf_get_height (pixbuf);
		738
		739	int target_width = target->szHint.width;
		740	int target_height = target->szHint.height;
		741	int new_pmap_width = target_width;
		742	int new_pmap_height = target_height;
		743
		744	int x = 0;
		745	int y = 0;
		746	int w = h_scale * target_width / 100;
		747	int h = v_scale * target_height / 100;
		748
		749	if (h_align == rootAlign \|\| v_align == rootAlign)
		750	{
		751	target->get_window_origin (x, y);
		752	x = -x;
		753	y = -y;
		754	}
		755
		756	if (h_align != rootAlign)
		757	x = make_align_position (h_align, target_width, w > 0 ? w : image_width);
		758
		759	if (v_align != rootAlign)
		760	y = make_align_position (v_align, target_height, h > 0 ? h : image_height);
		761
		762	if (x >= target_width
		763	\|\| y >= target_height
		764	\|\| (w > 0 && x + w <= 0)
		765	\|\| (h > 0 && y + h <= 0))
		766	return false;
		767
		768	result = pixbuf;
		769
		770	if ((w > 0 && w != image_width)
		771	\|\| (h > 0 && h != image_height))
		772	{
		773	result = gdk_pixbuf_scale_simple (pixbuf,
		774	w > 0 ? w : image_width,
		775	h > 0 ? h : image_height,
		776	GDK_INTERP_BILINEAR);
		777	}
		778
		779	bool ret = false;
		780
		781	if (result)
		782	{
		783	XGCValues gcv;
		784	GC gc;
		785
		786	image_width = gdk_pixbuf_get_width (result);
		787	image_height = gdk_pixbuf_get_height (result);
		788
		789	if (h_scale == 0)
		790	new_pmap_width = min (image_width, target_width);
		791	if (v_scale == 0)
		792	new_pmap_height = min (image_height, target_height);
		793
		794	if (pixmap)
		795	{
		796	if (pmap_width != new_pmap_width
		797	\|\| pmap_height != new_pmap_height
		798	\|\| pmap_depth != target->depth)
		799	{
		800	XFreePixmap (target->dpy, pixmap);
		801	pixmap = None;
		802	}
		803	}
		804
		805	if (pixmap == None)
		806	{
		807	pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
		808	pmap_width = new_pmap_width;
		809	pmap_height = new_pmap_height;
		810	pmap_depth = target->depth;
		811	}
		812
		813	gcv.foreground = target->pix_colors[Color_bg];
		814	gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
		815
		816	if (h_scale == 0 \|\| v_scale == 0)
		817	{
		818	Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth);
		819	gdk_pixbuf_xlib_render_to_drawable (result, tile, gc,
		820	0, 0,
		821	0, 0,
		822	image_width, image_height,
		823	XLIB_RGB_DITHER_NONE,
		824	0, 0);
		825
		826	gcv.tile = tile;
		827	gcv.fill_style = FillTiled;
		828	gcv.ts_x_origin = x;
		829	gcv.ts_y_origin = y;
		830	XChangeGC (target->dpy, gc, GCFillStyle \| GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin, &gcv);
		831
		832	XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
		833	XFreePixmap (target->dpy, tile);
		834	}
		835	else
		836	{
		837	int src_x, src_y, dst_x, dst_y;
		838	int dst_width, dst_height;
		839
		840	src_x = make_clip_rectangle (x, image_width , new_pmap_width , dst_x, dst_width );
		841	src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height);
		842
		843	if (dst_x > 0 \|\| dst_y > 0
		844	\|\| dst_x + dst_width < new_pmap_width
		845	\|\| dst_y + dst_height < new_pmap_height)
		846	XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
		847
		848	if (dst_x < new_pmap_width && dst_y < new_pmap_height)
		849	gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc,
		850	src_x, src_y,
		851	dst_x, dst_y,
		852	dst_width, dst_height,
		853	XLIB_RGB_DITHER_NONE,
		854	0, 0);
		855	}
		856
		857	if (result != pixbuf)
		858	g_object_unref (result);
		859
		860	XFreeGC (target->dpy, gc);
		861
		862	ret = true;
		863	}
		864
		865	return ret;
		866	}
		867	# endif /* HAVE_PIXBUF */
671		868
672	bool	869	bool
673	bgPixmap_t::set_file (const char *file)	870	bgPixmap_t::set_file (const char *file)
674	{	871	{
675	assert (file);	872	assert (file);
676		873
677	if (*file)	874	if (*file)
678	{	875	{
		876	if (const char *p = strchr (file, ';'))
		877	{
		878	size_t len = p - file;
		879	char *f = rxvt_temp_buf<char> (len + 1);
		880	memcpy (f, file, len);
		881	f[len] = '\0';
		882	file = f;
		883	}
		884
679	# ifdef HAVE_AFTERIMAGE	885	# ifdef HAVE_AFTERIMAGE
680	if (!target->asimman)	886	if (!target->asimman)
681	target->asimman = create_generic_imageman (target->rs[Rs_path]);	887	target->asimman = create_generic_imageman (target->rs[Rs_path]);
682
683	if (const char *p = strchr (file, ';'))
684	{
685	size_t len = p - file;
686	char f = (char )malloc (len + 1);
687	memcpy (f, file, len);
688	f[len] = '\0';
689	original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100);
690	free (f);
691	}
692	else
693	original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);	888	original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
		889	if (original_asim)
		890	have_image = true;
		891	return have_image;
		892	# endif
694		893
695	return original_asim;	894	# ifdef HAVE_PIXBUF
		895	pixbuf = gdk_pixbuf_new_from_file (file, NULL);
		896	if (pixbuf)
		897	have_image = true;
		898	return have_image;
696	# endif	899	# endif
697	}	900	}
698		901
699	return false;	902	return false;
700	}	903	}
…		…
720	int changed = 0;	923	int changed = 0;
721	unsigned int hr, vr;	924	unsigned int hr, vr;
722	int junk;	925	int junk;
723	int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);	926	int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
724		927
725	if (!(geom_flags&WidthValue))	928	if (!(geom_flags & WidthValue))
726	hr = 1;	929	hr = 1;
727	if (!(geom_flags&HeightValue))	930	if (!(geom_flags & HeightValue))
728	vr = hr;	931	vr = hr;
729		932
730	if (h_blurRadius != hr)	933	if (h_blurRadius != hr)
731	{	934	{
732	++changed;	935	++changed;
…		…
742	if (v_blurRadius == 0 && h_blurRadius == 0)	945	if (v_blurRadius == 0 && h_blurRadius == 0)
743	flags &= ~blurNeeded;	946	flags &= ~blurNeeded;
744	else	947	else
745	flags \|= blurNeeded;	948	flags \|= blurNeeded;
746		949
747	return (changed>0);	950	return (changed > 0);
748	}	951	}
749		952
750	static inline unsigned long	953	static inline unsigned long
751	compute_tint_shade_flags (rxvt_color *tint, int shade)	954	compute_tint_shade_flags (rxvt_color *tint, int shade)
752	{	955	{
…		…
769	flags \|= bgPixmap_t::tintNeeded;	972	flags \|= bgPixmap_t::tintNeeded;
770	else if (tint)	973	else if (tint)
771	{	974	{
772	if ((c.r > 0x000700 \|\| c.g > 0x000700 \|\| c.b > 0x000700)	975	if ((c.r > 0x000700 \|\| c.g > 0x000700 \|\| c.b > 0x000700)
773	&& (c.r < 0x00f700 \|\| c.g < 0x00f700 \|\| c.b < 0x00f700))	976	&& (c.r < 0x00f700 \|\| c.g < 0x00f700 \|\| c.b < 0x00f700))
774	{	977	{
775	flags \|= bgPixmap_t::tintNeeded;	978	flags \|= bgPixmap_t::tintNeeded;
776	}	979	}
777	}	980	}
778		981
779	if (flags & bgPixmap_t::tintNeeded)	982	if (flags & bgPixmap_t::tintNeeded)
780	{	983	{
781	if (flags & bgPixmap_t::tintWholesome)	984	if (flags & bgPixmap_t::tintWholesome)
…		…
810	{	1013	{
811	unsigned long new_flags = compute_tint_shade_flags (NULL, shade);	1014	unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
812		1015
813	if (new_flags != (flags & tintFlags))	1016	if (new_flags != (flags & tintFlags))
814	{	1017	{
815	flags = (flags&~tintFlags)\|new_flags;	1018	flags = (flags & ~tintFlags) \| new_flags;
816	return true;	1019	return true;
817	}	1020	}
818		1021
819	return false;	1022	return false;
820	}	1023	}
821		1024
…		…
906		1109
907	attr.background_pixmap = ParentRelative;	1110	attr.background_pixmap = ParentRelative;
908	attr.backing_store = Always;	1111	attr.backing_store = Always;
909	attr.event_mask = ExposureMask;	1112	attr.event_mask = ExposureMask;
910	attr.override_redirect = True;	1113	attr.override_redirect = True;
911	src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,	1114	src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
912	CopyFromParent, CopyFromParent, CopyFromParent,	1115	CopyFromParent, CopyFromParent, CopyFromParent,
913	CWBackPixmap\|CWBackingStore\|CWOverrideRedirect\|CWEventMask,	1116	CWBackPixmap\|CWBackingStore\|CWOverrideRedirect\|CWEventMask,
914	&attr);	1117	&attr);
915		1118
916	if (src != None)	1119	if (src != None)
…		…
940	XDestroyWindow (dpy, src);	1143	XDestroyWindow (dpy, src);
941	XUngrabServer (dpy);	1144	XUngrabServer (dpy);
942	//fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);	1145	//fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
943	}	1146	}
944		1147
945	if (!success)	1148	if (!success)
946	{	1149	{
947	XFreePixmap (dpy, tiled_root_pmap);	1150	XFreePixmap (dpy, tiled_root_pmap);
948	tiled_root_pmap = None;	1151	tiled_root_pmap = None;
949	}	1152	}
950	else	1153	else
951	result \|= transpPmapTiled;	1154	result \|= transpPmapTiled;
952	}	1155	}
953	else	1156	else
954	{	1157	{
955	/* straightforward pixmap copy */	1158	/* straightforward pixmap copy */
956	gcv.tile = root_pixmap;	1159	gcv.tile = root_pixmap;
…		…
1073	# if DO_TIMING_TEST	1276	# if DO_TIMING_TEST
1074	XSync (dpy, False);	1277	XSync (dpy, False);
1075	# endif	1278	# endif
1076	# endif	1279	# endif
1077	}	1280	}
1078	}	1281	}
1079	} /* server side rendering completed */	1282	} /* server side rendering completed */
1080		1283
1081	if (pixmap)	1284	if (pixmap)
1082	XFreePixmap (dpy, pixmap);	1285	XFreePixmap (dpy, pixmap);
1083		1286
…		…
1133	/* we need to re-generate transparency pixmap in that case ! */	1336	/* we need to re-generate transparency pixmap in that case ! */
1134	background_flags = make_transparency_pixmap ();	1337	background_flags = make_transparency_pixmap ();
1135	if (background_flags == 0)	1338	if (background_flags == 0)
1136	return false;	1339	return false;
1137	else if ((background_flags & transpTransformations) == (flags & transpTransformations)	1340	else if ((background_flags & transpTransformations) == (flags & transpTransformations)
1138	&& pmap_depth == target->depth)	1341	&& pmap_depth == target->depth)
1139	flags = flags & ~isInvalid;	1342	flags = flags & ~isInvalid;
1140	}	1343	}
1141	# endif	1344	# endif
1142		1345
		1346	# ifdef BG_IMAGE_FROM_FILE
		1347	if (have_image
		1348	\|\| (background_flags & transpTransformations) != (flags & transpTransformations))
		1349	{
		1350	if (render_image (background_flags))
		1351	flags = flags & ~isInvalid;
		1352	}
		1353	# endif
		1354
1143	XImage *result = NULL;	1355	XImage *result = NULL;
1144	# ifdef HAVE_AFTERIMAGE	1356
1145	if (original_asim	1357	if (background_flags && (flags & isInvalid))
1146	\|\| (background_flags & transpTransformations) != (flags & transpTransformations))	1358	{
		1359	result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1147	{	1360	}
1148	target->init_asv ();
1149		1361
1150	ASImage *background = NULL;	1362	if (result)
1151	ARGB32 as_tint = TINT_LEAVE_SAME;	1363	{
1152	if (background_flags)	1364	# if !defined(HAVE_AFTERIMAGE) && !XFT
1153	background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);	1365	/* our own client-side tinting */
1154		1366	/* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1155	# ifdef ENABLE_TRANSPARENCY	1367	This may need to be changed in need_client_side_rendering() logic is altered !!! */
1156	if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))	1368	if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1157	{
1158	ShadingInfo as_shade;
1159	as_shade.shading = (shade == 0) ? 100 : shade;
1160
1161	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1162	if (flags & tintSet)
1163	tint.get (c);
1164	as_shade.tintColor.red = c.r;
1165	as_shade.tintColor.green = c.g;
1166	as_shade.tintColor.blue = c.b;
1167
1168	as_tint = shading2tint32 (&as_shade);
1169	}
1170
1171	if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
1172	{
1173	ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
1174	(original_asim == NULL \|\| tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
1175	100, ASIMAGE_QUALITY_DEFAULT);
1176	if (tmp)
1177	{
1178	destroy_asimage (&background);
1179	background = tmp;
1180	}
1181	}
1182	# endif
1183
1184	if (render_asim (background, as_tint))
1185	flags = flags & ~isInvalid;
1186	if (background)
1187	destroy_asimage (&background);
1188	}
1189	else if (background_flags && pmap_depth != target->depth)
1190	result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1191
1192	# elif !XFT /* our own client-side tinting */
1193
1194	/* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1195	This may need to be changed in need_client_side_rendering() logic is altered !!! */
1196
1197	if (background_flags && (flags & isInvalid))
1198	{
1199	result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1200
1201	if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))
1202	{	1369	{
1203	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);	1370	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1204	if (flags & tintSet)	1371	if (flags & tintSet)
1205	tint.get (c);	1372	tint.get (c);
1206	ShadeXImage (target, result, shade, c.r, c.g, c.b);	1373	ShadeXImage (target, result, shade, c.r, c.g, c.b);
1207	}	1374	}
1208	}	1375	# endif
1209	# endif /* HAVE_AFTERIMAGE */
1210		1376
1211	if (result)
1212	{
1213	GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);	1377	GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1214		1378
1215	if (gc)	1379	if (gc)
1216	{	1380	{
1217	if (/pmap_depth != target->depth &&/ pixmap != None)	1381	if (/pmap_depth != target->depth &&/ pixmap != None)
…		…
1246		1410
1247	XFreeGC (target->dpy, gc);	1411	XFreeGC (target->dpy, gc);
1248	flags = flags & ~isInvalid;	1412	flags = flags & ~isInvalid;
1249	}	1413	}
1250		1414
1251	XDestroyImage (result);	1415	XDestroyImage (result);
1252	}	1416	}
1253		1417
1254	if (flags & isInvalid)	1418	if (flags & isInvalid)
1255	{	1419	{
1256	if (pixmap != None)	1420	if (pixmap != None)

Diff Legend

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

Comparing rxvt-unicode/src/background.C (file contents): Revision 1.42 by sf-exg, Sun Aug 29 13:24:30 2010 UTC vs. Revision 1.57 by sf-exg, Fri Sep 3 22:43:22 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.42 by sf-exg, Sun Aug 29 13:24:30 2010 UTC vs.
Revision 1.57 by sf-exg, Fri Sep 3 22:43:22 2010 UTC