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

Comparing rxvt-unicode/src/xpm.C (file contents):
Revision 1.47 by root, Tue Jul 24 14:31:45 2007 UTC vs.
Revision 1.52 by sasha, Fri Jul 27 22:52:08 2007 UTC

…		…
231	if (n < MAXLEN_GEOM)	231	if (n < MAXLEN_GEOM)
232	{	232	{
233	strncpy (str, geom, n);	233	strncpy (str, geom, n);
234	str[n] = '\0';	234	str[n] = '\0';
235		235
236	if (strcmp(str, "auto") == 0)	236	if (strcmp(str, "auto") == 0)
237	{	237	{
238	if (!bgpixmap->auto_resize)	238	if (!bgpixmap->auto_resize)
239	changed++;	239	changed++;
240	bgpixmap->auto_resize = True ;	240	bgpixmap->auto_resize = True ;
241	w = szHint.width ;	241	w = szHint.width ;
242	h = szHint.height ;	242	h = szHint.height ;
243	flags = WidthValue\|HeightValue ;	243	flags = WidthValue\|HeightValue ;
244	}	244	}
245	else	245	else
246	{	246	{
247	bgpixmap->auto_resize = False ;	247	bgpixmap->auto_resize = False ;
248	flags = XParseGeometry (str, &x, &y, &w, &h);	248	flags = XParseGeometry (str, &x, &y, &w, &h);
249	}	249	}
250		250
251	if (!flags)	251	if (!flags)
252	{	252	{
…		…
357	unsigned int w = bgPixmap.w, h = bgPixmap.h,	357	unsigned int w = bgPixmap.w, h = bgPixmap.h,
358	x = bgPixmap.x, y = bgPixmap.y;	358	x = bgPixmap.x, y = bgPixmap.y;
359	unsigned int xpmh = xpmAttr.height,	359	unsigned int xpmh = xpmAttr.height,
360	xpmw = xpmAttr.width;	360	xpmw = xpmAttr.width;
361		361
362	if (bgPixmap.auto_resize)	362	if (bgPixmap.auto_resize)
363	{	363	{
364	w = szHint.width ;	364	w = szHint.width ;
365	h = szHint.height ;	365	h = szHint.height ;
366	}	366	}
367	/*	367	/*
368	* don't zoom pixmap too much nor expand really small pixmaps	368	* don't zoom pixmap too much nor expand really small pixmaps
369	*/	369	*/
370	if (w > 32767 \|\| h > 32767)	370	if (w > 32767 \|\| h > 32767)
371	w = 1;	371	w = 1;
…		…
389	if (!option(Opt_transparent) \|\| !am_transparent)	389	if (!option(Opt_transparent) \|\| !am_transparent)
390	/* will do that in check_our_parents otherwise */	390	/* will do that in check_our_parents otherwise */
391	#endif	391	#endif
392	{	392	{
393	ASImage *scaled_im = scale_asimage (asv, original_asim, w, h, ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);	393	ASImage *scaled_im = scale_asimage (asv, original_asim, w, h, ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
394	if (scaled_im)	394	if (scaled_im)
395	{	395	{
396	pixmap = AFTERIMAGE_DPY_OP (asimage2pixmap(asv, display->root, scaled_im, gc, True));	396	pixmap = asimage2pixmap(asv, display->root, scaled_im, gc, True);
397	destroy_asimage (&scaled_im);	397	destroy_asimage (&scaled_im);
398	}	398	}
399	}	399	}
400	#else /* HAVE_AFTERIMAGE */	400	#else /* HAVE_AFTERIMAGE */
401	{	401	{
…		…
476	* we already have the required attributes	476	* we already have the required attributes
477	*/	477	*/
478	/* XGetWindowAttributes (dpy, vt, &attr); */	478	/* XGetWindowAttributes (dpy, vt, &attr); */
479		479
480	#ifdef HAVE_AFTERIMAGE	480	#ifdef HAVE_AFTERIMAGE
481	if (asimman == NULL)	481	if (asimman == NULL)
482	asimman = create_generic_imageman(rs[Rs_path]);	482	asimman = create_generic_imageman(rs[Rs_path]);
483	if ((f = strchr (file, ';')) == NULL)	483	if ((f = strchr (file, ';')) == NULL)
484	original_asim = get_asimage( asimman, file, 0xFFFFFFFF, 100 );	484	original_asim = get_asimage( asimman, file, 0xFFFFFFFF, 100 );
485	else	485	else
486	{	486	{
487	size_t len = f - file;	487	size_t len = f - file;
488	f = (char *)malloc (len + 1);	488	f = (char *)malloc (len + 1);
489	strncpy (f, file, len);	489	strncpy (f, file, len);
490	f[len] = '\0';	490	f[len] = '\0';
491	original_asim = get_asimage( asimman, f, 0xFFFFFFFF, 100 );	491	original_asim = get_asimage( asimman, f, 0xFFFFFFFF, 100 );
492	free( f );	492	free( f );
493	}	493	}
494	if (original_asim)	494	if (original_asim)
495	{	495	{
496	bgPixmap.pixmap = AFTERIMAGE_DPY_OP (asimage2pixmap (asv, display->root, original_asim, NULL, True));	496	bgPixmap.pixmap = asimage2pixmap (asv, display->root, original_asim, NULL, True);
497	xpmAttr.width = original_asim->width ;	497	xpmAttr.width = original_asim->width ;
498	xpmAttr.height = original_asim->height ;	498	xpmAttr.height = original_asim->height ;
499	}	499	}
500	#else /* HAVE_AFTERIMAGE */	500	#else /* HAVE_AFTERIMAGE */
501	xpmAttr.closeness = 30000;	501	xpmAttr.closeness = 30000;
502	xpmAttr.colormap = cmap;	502	xpmAttr.colormap = cmap;
503	xpmAttr.visual = visual;	503	xpmAttr.visual = visual;
…		…
776	}	776	}
777		777
778	void	778	void
779	rxvt_term::check_our_parents_cb (time_watcher &w)	779	rxvt_term::check_our_parents_cb (time_watcher &w)
780	{	780	{
781	int i, pchanged, aformat, have_pixmap, rootdepth;	781	int i, pchanged, aformat, rootdepth;
782	unsigned long nitems, bytes_after;	782	unsigned long nitems, bytes_after;
783	Atom atype;	783	Atom atype;
784	unsigned char *prop = NULL;	784	unsigned char *prop = NULL;
785	Window root, oldp, *list;	785	Window root, oldp, *list;
786	Pixmap rootpixmap = None;	786	Pixmap rootpixmap = None;
787	XWindowAttributes wattr, wrootattr;	787	XWindowAttributes wattr, wrootattr;
788	int sx, sy;	788	int sx, sy;
789	Window cr;	789	Window cr;
		790	unsigned int rootpixmap_w = 0, rootpixmap_h = 0;
790		791
791	pchanged = 0;	792	pchanged = 0;
792		793
793	if (!option (Opt_transparent))	794	if (!option (Opt_transparent))
794	return /pchanged/; /* Don't try any more */	795	return /pchanged/; /* Don't try any more */
		796
		797	#if 0
		798	struct timeval stv;
		799	gettimeofday (&stv,NULL);
		800	#define PRINT_BACKGROUND_OP_TIME do{ struct timeval tv;gettimeofday (&tv,NULL); tv.tv_sec-= stv.tv_sec;\
		801	fprintf (stderr,"%d: elapsed %ld usec\n",__LINE__,\
		802	tv.tv_sec*1000000+tv.tv_usec-stv.tv_usec );}while(0)
		803	#else
		804	#define PRINT_BACKGROUND_OP_TIME do{}while(0)
		805	#endif
		806
795		807
796	XGetWindowAttributes (dpy, display->root, &wrootattr);	808	XGetWindowAttributes (dpy, display->root, &wrootattr);
797	rootdepth = wrootattr.depth;	809	rootdepth = wrootattr.depth;
798		810
799	XGetWindowAttributes (dpy, parent[0], &wattr);	811	XGetWindowAttributes (dpy, parent[0], &wattr);
…		…
813	/* Get all X ops out of the queue so that our information is up-to-date. */	825	/* Get all X ops out of the queue so that our information is up-to-date. */
814	XSync (dpy, False);	826	XSync (dpy, False);
815		827
816	XTranslateCoordinates (dpy, parent[0], display->root,	828	XTranslateCoordinates (dpy, parent[0], display->root,
817	0, 0, &sx, &sy, &cr);	829	0, 0, &sx, &sy, &cr);
818
819	/* check if we are outside of the visible part of the virtual screen : */	830	/* check if we are outside of the visible part of the virtual screen : */
820	if( sx + (int)szHint.width <= 0 \|\| sy + (int)szHint.height <= 0	831	if( sx + (int)szHint.width <= 0 \|\| sy + (int)szHint.height <= 0
821	\|\| sx >= wrootattr.width \|\| sy >= wrootattr.height )	832	\|\| sx >= wrootattr.width \|\| sy >= wrootattr.height )
822	return /* 0 */ ;	833	return /* 0 */ ;
823	/*	834	/*
824	* Make the frame window set by the window manager have	835	* Make the frame window set by the window manager have
825	* the root background. Some window managers put multiple nested frame	836	* the root background. Some window managers put multiple nested frame
826	* windows for each client, so we have to take care about that.	837	* windows for each client, so we have to take care about that.
…		…
834	i = (xa[XA_ESETROOT_PMAP_ID]	845	i = (xa[XA_ESETROOT_PMAP_ID]
835	&& XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],	846	&& XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
836	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	847	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
837	&nitems, &bytes_after, &prop) == Success);	848	&nitems, &bytes_after, &prop) == Success);
838		849
		850	/* TODO: the below logic needs to be cleaned up */
839	if (!i \|\| prop == NULL	851	if (!i \|\| prop == NULL
840	#if TINTING	852	#if TINTING
841	\|\| (!ISSET_PIXCOLOR (Color_tint) && rs[Rs_shade] == NULL	853	\|\| (!ISSET_PIXCOLOR (Color_tint) && rs[Rs_shade] == NULL
842	#ifdef HAVE_AFTERIMAGE	854	#ifdef HAVE_AFTERIMAGE
843	&& original_asim == NULL && rs[Rs_blurradius] == NULL	855	&& original_asim == NULL && rs[Rs_blurradius] == NULL
844	#endif	856	#endif
845	)	857	)
846	#endif	858	#endif
847	)	859	)
848	have_pixmap = 0;	860	rootpixmap = None;
849	else	861	else
850	{	862	{
851	have_pixmap = 1;	863	int junk;
		864	unsigned int ujunk;
		865	/* root pixmap may be bad - allow a error */
		866	allowedxerror = -1;
852	rootpixmap = (Pixmap )prop;	867	if ((rootpixmap = (Pixmap )prop) != None)
		868	if (!XGetGeometry (dpy, rootpixmap, &root, &junk, &junk, &rootpixmap_w, &rootpixmap_h, &ujunk, &ujunk))
		869	rootpixmap = None;
		870	allowedxerror = 0;
		871	}
		872
		873	if (prop != NULL)
853	XFree (prop);	874	XFree (prop);
		875
		876	if (rootpixmap != None)
854	}	877	{
855
856	if (have_pixmap)
857	{
858	Bool success = False ;	878	Bool success = False;
859	GC gc = NULL;	879	GC gc = NULL;
860	XGCValues gcvalue;	880	XGCValues gcvalue;
		881	int shade = 100;
		882	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
		883	Bool whole_tint = False, no_tint = True;
		884
		885	while (sx < 0) sx += (int)wrootattr.width;
		886	while (sy < 0) sy += (int)wrootattr.height;
		887
		888	#if TINTING
		889	if (rs[Rs_shade])
		890	shade = atoi (rs[Rs_shade]);
		891	if (ISSET_PIXCOLOR (Color_tint))
		892	pix_colors_focused [Color_tint].get (c);
		893	#define IS_COMPONENT_WHOLESOME(c) ((c) <=0x000700 \|\| (c)>=0x00f700)
		894	if (shade >= 100)
		895	whole_tint = (IS_COMPONENT_WHOLESOME(c.r)
		896	&& IS_COMPONENT_WHOLESOME(c.g)
		897	&& IS_COMPONENT_WHOLESOME(c.b));
		898	no_tint = (c.r >= 0x00f700 && c.g >= 0x00f700 && c.b >= 0x00f700);
		899	#undef IS_COMPONENT_WHOLESOME
		900	#endif /* TINTING */
		901	/* theer are no performance advantages to reusing same pixmap */
		902	if (pixmap != None)
		903	XFreePixmap (dpy, pixmap);
		904	pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, rootdepth);
		905
		906	#if 0 /* TODO : identify cases where this will be detrimental to performance : */
		907	/* we want to tile root pixmap into our own pixmap in this cases :
		908	* 1) rootpixmap does not cover our window entirely
		909	* 2) whole_tint - we can use server-side tinting or tinting disabled
		910	*/
		911	if ( whole_tint \|\| no_tint \|\| pmap_w < sx + szHint.width \|\| pmap_h < sy + szHint.height)
		912	{
		913	}
		914	#endif
		915	gcvalue.tile = rootpixmap;
		916	gcvalue.fill_style = FillTiled;
		917	gcvalue.ts_x_origin = -sx;
		918	gcvalue.ts_y_origin = -sy;
		919	gc = XCreateGC (dpy, rootpixmap, GCFillStyle \| GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin, &gcvalue);
		920	XFillRectangle (dpy, pixmap, gc, 0, 0, szHint.width, szHint.height);
		921
		922	#if TINTING
		923	if (whole_tint && !no_tint)
		924	{
		925	/* In this case we can tint image server-side getting significant
		926	* performance improvements, as we eliminate XImage transfer
		927	*/
		928	gcvalue.foreground = Pixel (pix_colors_focused [Color_tint]);
		929	gcvalue.function = GXand;
		930	gcvalue.fill_style = FillSolid;
		931	XChangeGC (dpy, gc, GCFillStyle \| GCForeground \| GCFunction, &gcvalue);
		932	XFillRectangle (dpy, pixmap, gc, 0, 0, szHint.width, szHint.height);
		933	}
		934	#endif
		935	success = True;
861	#ifdef HAVE_AFTERIMAGE	936	#ifdef HAVE_AFTERIMAGE
		937	if (rs[Rs_blurradius] \|\| original_asim != NULL \|\| (!whole_tint && (!no_tint \|\| shade !=100)))
862	{	938	{
863	Pixmap tmp_pmap = None ;	939	ARGB32 tint = TINT_LEAVE_SAME;
864	ShadingInfo shade;	940	ASImage *back_im = NULL;
865	ARGB32 tint ;
866	unsigned int pmap_w = 0, pmap_h = 0;
867		941
868	if (get_drawable_size( rootpixmap, &pmap_w, &pmap_h ))	942	back_im = pixmap2ximage (asv, pixmap, 0, 0, szHint.width, szHint.height, AllPlanes, 100);
		943	if (back_im != NULL)
869	{	944	{
870	int root_x = 0, root_y = 0;	945	if (!whole_tint && (!no_tint \|\| shade !=100))
871
872	shade.shading = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
873	if (ISSET_PIXCOLOR (Color_tint))
874	{	946	{
875	rgba c;	947	ShadingInfo as_shade;
876	pix_colors_focused [Color_tint].get (c);	948	as_shade.shading = shade;
877	shade.tintColor.red = c.r;	949	as_shade.tintColor.red = c.r;
878	shade.tintColor.green = c.g;	950	as_shade.tintColor.green = c.g;
879	shade.tintColor.blue = c.b;	951	as_shade.tintColor.blue = c.b;
		952	tint = shading2tint32 (&as_shade);
880	}	953	}
881	else	954
882	shade.tintColor.red = shade.tintColor.green = shade.tintColor.blue = 0xFFFF;	955	if (rs[Rs_blurradius] && back_im)
883	tint = shading2tint32( &shade );
884	gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
885	if (GetWinPosition (parent[0], &root_x, &root_y) )
886	{	956	{
		957	double r = atof(rs[Rs_blurradius]);
		958	ASImage* tmp = blur_asimage_gauss (asv, back_im, r, r, 0xFFFFFFFF,
		959	(original_asim == NULL \|\| tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
		960	100, ASIMAGE_QUALITY_DEFAULT);
		961	if (tmp)
		962	{
		963	destroy_asimage (&back_im);
		964	back_im = tmp;
		965	}
		966	}
		967
		968	if (original_asim != NULL)
		969	{
887	ASImageLayer *layers = create_image_layers( 2 );	970	ASImageLayer *layers = create_image_layers (2);
888	ASImage *merged_im = NULL;	971	ASImage *merged_im = NULL;
889	int back_x, back_y, back_w, back_h;	972	int fore_w, fore_h;
890	/* merge_layers does good job at tiling background appropriately,
891	so all we need is to cut out smallest possible piece : */
892	#define MAKE_ROOTPMAP_GEOM(xy,wh,widthheight) \
893	do{ while( root_##xy < 0 ) root_##xy += (int)wrootattr.widthheight; \
894	back_##xy = root_##xy % pmap_##wh; /* that gives us left side of the closest tile : */ \
895	if( pmap_##wh >= back_##xy + szHint.widthheight ) \
896	back_##wh = szHint.widthheight;/* background is large - limit it by our size */ \
897	else \
898	{ /* small background - need the whole of it for successfull tiling :*/ \
899	back_##xy = 0; \
900	back_##wh = pmap_##wh; \
901	}}while(0)
902
903	MAKE_ROOTPMAP_GEOM(x,w,width);
904	MAKE_ROOTPMAP_GEOM(y,h,height);
905		973
906	layers[0].im = AFTERIMAGE_DPY_OP (pixmap2asimage (asv, rootpixmap, back_x, back_y, back_w, back_h, AllPlanes, ASA_ASImage, 100));	974	layers[0].im = back_im;
907	layers[0].clip_x = (back_w == pmap_w)?root_x:0;
908	layers[0].clip_y = (back_h == pmap_h)?root_y:0;
909	layers[0].clip_width = szHint.width;	975	layers[0].clip_width = szHint.width;
910	layers[0].clip_height = szHint.height;	976	layers[0].clip_height = szHint.height;
911	layers[0].tint = tint;	977	layers[0].tint = tint;
912	if (rs[Rs_blurradius] && layers[0].im)
913	{
914	double r = atof(rs[Rs_blurradius]);
915	ASImage* tmp = blur_asimage_gauss(asv, layers[0].im, r, r, 0xFFFFFFFF, ASA_ASImage, 100, ASIMAGE_QUALITY_DEFAULT );
916	if( tmp )
917	{
918	destroy_asimage( &layers[0].im );
919	layers[0].im = tmp;
920	}
921	}
922	if (original_asim != NULL)
923	{
924	int fore_w, fore_h;
925	layers[1].im = original_asim;	978	layers[1].im = original_asim;
926	if( bgPixmap.auto_resize )	979	if (bgPixmap.auto_resize)
927	{	980	{
928	fore_w = szHint.width;	981	fore_w = szHint.width;
929	fore_h = szHint.height;	982	fore_h = szHint.height;
930	}	983	}
931	else	984	else
932	{	985	{
933	fore_w = bgPixmap.w;	986	fore_w = bgPixmap.w;
934	fore_h = bgPixmap.h;	987	fore_h = bgPixmap.h;
935	}	988	}
936	if (fore_w != original_asim->width	989	if (fore_w != original_asim->width
937	\|\| fore_h != original_asim->height)	990	\|\| fore_h != original_asim->height)
938	{	991	{
939	layers[1].im = scale_asimage( asv,	992	layers[1].im = scale_asimage (asv,
940	original_asim,	993	original_asim,
941	fore_w, fore_h,	994	fore_w, fore_h,
942	ASA_ASImage, 100,	995	ASA_ASImage, 100,
943	ASIMAGE_QUALITY_DEFAULT );	996	ASIMAGE_QUALITY_DEFAULT);
944	}	997	}
945
946	layers[1].clip_width = szHint.width;	998	layers[1].clip_width = szHint.width;
947	layers[1].clip_height = szHint.height;	999	layers[1].clip_height = szHint.height;
948		1000
949	if (rs[Rs_blendtype])	1001	if (rs[Rs_blendtype])
950	{	1002	{
951	layers[1].merge_scanlines = blend_scanlines_name2func(rs[Rs_blendtype]);	1003	layers[1].merge_scanlines = blend_scanlines_name2func (rs[Rs_blendtype]);
952	if( layers[1].merge_scanlines == NULL )	1004	if (layers[1].merge_scanlines == NULL)
953	layers[1].merge_scanlines = alphablend_scanlines;	1005	layers[1].merge_scanlines = alphablend_scanlines;
954	}	1006	}
955	}	1007	PRINT_BACKGROUND_OP_TIME;
956	merged_im = merge_layers( asv, layers, layers[1].im?2:1,	1008	merged_im = merge_layers (asv, layers, 2, szHint.width, szHint.height,
957	szHint.width, szHint.height,
958	ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT );	1009	ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
959	if (layers[1].im != original_asim)	1010	if (layers[1].im != original_asim)
960	destroy_asimage( &(layers[1].im) );	1011	destroy_asimage (&(layers[1].im));
961	destroy_asimage( &(layers[0].im) );	1012	free (layers);
		1013
962	if (merged_im != NULL)	1014	if (merged_im != NULL)
963	{	1015	{
964	tmp_pmap = AFTERIMAGE_DPY_OP (asimage2pixmap (asv, DefaultRootWindow(dpy), merged_im, gc, True));
965	destroy_asimage( &merged_im );	1016	destroy_asimage (&back_im);
		1017	back_im = merged_im;
966	}	1018	}
967	free( layers );	1019	PRINT_BACKGROUND_OP_TIME;
968	}	1020	}
		1021	else if (tint != TINT_LEAVE_SAME)
		1022	{
		1023	ASImage* tmp = tile_asimage (asv, back_im, 0, 0, szHint.width, szHint.height, tint, ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
		1024	if (tmp)
		1025	{
		1026	destroy_asimage (&back_im);
		1027	back_im = tmp;
		1028	}
		1029	PRINT_BACKGROUND_OP_TIME;
		1030	}
		1031	asimage2drawable (asv, pixmap, back_im, gc, 0, 0, 0, 0, szHint.width, szHint.height, True);
		1032	destroy_asimage (&back_im);
		1033	} /* back_im != NULL */
		1034	else
		1035	success = False;
969	}	1036	}
970	if (tmp_pmap != None)
971	{
972	success = True;
973	if (pixmap != None)
974	XFreePixmap (dpy, pixmap);
975	pixmap = tmp_pmap;
976	}
977	}
978	#else /* HAVE_AFTERIMAGE */	1037	#else /* HAVE_AFTERIMAGE */
979	{
980	/*
981	* Copy display->root pixmap transparency
982	*/
983	int nx, ny;
984	unsigned int nw, nh;
985	XImage *image;
986
987	nw = (unsigned int)szHint.width;
988	nh = (unsigned int)szHint.height;
989	nx = ny = 0;
990
991	if (sx < 0)
992	{
993	nw += sx;
994	nx = -sx;
995	sx = 0;
996	}
997
998	if (sy < 0)
999	{
1000	nh += sy;
1001	ny = -sy;
1002	sy = 0;
1003	}
1004
1005	min_it (nw, (unsigned int) (wrootattr.width - sx));
1006	min_it (nh, (unsigned int) (wrootattr.height - sy));
1007
1008	XSync (dpy, False);
1009	allowedxerror = -1;
1010	image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1011
1012	/* XXX: handle BadMatch - usually because we're outside the pixmap */
1013	/* XXX: may need a delay here? */
1014	allowedxerror = 0;
1015	if (image != NULL)
1016	{
1017	if (pixmap != None)
1018	XFreePixmap (dpy, pixmap);
1019
1020	#if TINTING	1038	#if TINTING
1021	if (ISSET_PIXCOLOR (Color_tint))	1039	if (!whole_tint && (!no_tint \|\| shade !=100))
		1040	{
		1041	XImage *image = XGetImage (dpy, pixmap, 0, 0, szHint.width, szHint.height, AllPlanes, ZPixmap);
		1042	success = False;
		1043	if (image != NULL)
1022	{	1044	{
1023	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	1045	PRINT_BACKGROUND_OP_TIME;
1024		1046	if (gc == NULL)
1025	rgba c;	1047	gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
1026	pix_colors_focused [Color_tint].get (c);	1048	if (ISSET_PIXCOLOR (Color_tint) \|\| shade != 100)
1027	ShadeXImage (this, image, shade, c.r, c.g, c.b);	1049	ShadeXImage (this, image, shade, c.r, c.g, c.b);
		1050	XPutImage (dpy, pixmap, gc, image, 0, 0, 0, 0, image->width, image->height);
		1051	XDestroyImage (image);
		1052	success = True;
1028	}	1053	}
		1054	}
1029	#endif	1055	#endif
1030
1031	pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
1032	gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
1033	XPutImage (dpy, pixmap, gc, image, 0, 0,
1034	nx, ny, image->width, image->height);
1035	XDestroyImage (image);
1036	success = True ;
1037	}
1038	}
1039	#endif /* HAVE_AFTERIMAGE */	1056	#endif /* HAVE_AFTERIMAGE */
		1057	PRINT_BACKGROUND_OP_TIME;
		1058
1040	if (gc != NULL)	1059	if (gc != NULL)
1041	XFreeGC (dpy, gc);	1060	XFreeGC (dpy, gc);
1042		1061
1043	if (!success)	1062	if (!success)
1044	{	1063	{
1045	if (am_transparent && am_pixmap_trans)	1064	if (am_transparent && am_pixmap_trans)
…		…
1062	if (!am_transparent \|\| !am_pixmap_trans)	1081	if (!am_transparent \|\| !am_pixmap_trans)
1063	pchanged = 1;	1082	pchanged = 1;
1064		1083
1065	am_transparent = am_pixmap_trans = 1;	1084	am_transparent = am_pixmap_trans = 1;
1066	}	1085	}
1067	}	1086	} /* rootpixmap != None */
1068		1087
1069	if (am_pixmap_trans)	1088	if (am_pixmap_trans)
1070	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);	1089	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
1071	else	1090	else
1072	{	1091	{

Diff Legend

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

Comparing rxvt-unicode/src/xpm.C (file contents): Revision 1.47 by root, Tue Jul 24 14:31:45 2007 UTC vs. Revision 1.52 by sasha, Fri Jul 27 22:52:08 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/xpm.C (file contents):
Revision 1.47 by root, Tue Jul 24 14:31:45 2007 UTC vs.
Revision 1.52 by sasha, Fri Jul 27 22:52:08 2007 UTC