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

Comparing rxvt-unicode/src/xpm.C (file contents):
Revision 1.44 by ayin, Sat Jun 30 23:34:57 2007 UTC vs.
Revision 1.51 by ayin, Fri Jul 27 14:41:15 2007 UTC

…		…
26	#include "../config.h" /* NECESSARY */	26	#include "../config.h" /* NECESSARY */
27	#include "rxvt.h" /* NECESSARY */	27	#include "rxvt.h" /* NECESSARY */
28		28
29	#ifdef XPM_BACKGROUND	29	#ifdef XPM_BACKGROUND
30		30
		31	#ifndef HAVE_AFTERIMAGE
		32	/*
		33	* search for FILE in the current working directory, and within the
		34	* colon-delimited PATHLIST, adding the file extension EXT if required.
		35	*
		36	* FILE is either semi-colon or zero terminated
		37	*/
		38	static char *
		39	rxvt_File_search_path (const char pathlist, const char file, const char *ext)
		40	{
		41	int maxpath, len;
		42	const char p, path;
		43	char name[256];
		44
		45	if (!access (file, R_OK)) /* found (plain name) in current directory */
		46	return strdup (file);
		47
		48	/* semi-colon delimited */
		49	if ((p = strchr (file, ';')))
		50	len = (p - file);
		51	else
		52	len = strlen (file);
		53
		54	/* leave room for an extra '/' and trailing '\0' */
		55	maxpath = sizeof (name) - (len + (ext ? strlen (ext) : 0) + 2);
		56	if (maxpath <= 0)
		57	return NULL;
		58
		59	/* check if we can find it now */
		60	strncpy (name, file, len);
		61	name[len] = '\0';
		62
		63	if (!access (name, R_OK))
		64	return strdup (name);
		65	if (ext)
		66	{
		67	strcat (name, ext);
		68	if (!access (name, R_OK))
		69	return strdup (name);
		70	}
		71	for (path = pathlist; path != NULL && *path != '\0'; path = p)
		72	{
		73	int n;
		74
		75	/* colon delimited */
		76	if ((p = strchr (path, ':')) == NULL)
		77	p = strchr (path, '\0');
		78
		79	n = (p - path);
		80	if (*p != '\0')
		81	p++;
		82
		83	if (n > 0 && n <= maxpath)
		84	{
		85	strncpy (name, path, n);
		86	if (name[n - 1] != '/')
		87	name[n++] = '/';
		88	name[n] = '\0';
		89	strncat (name, file, len);
		90
		91	if (!access (name, R_OK))
		92	return strdup (name);
		93	if (ext)
		94	{
		95	strcat (name, ext);
		96	if (!access (name, R_OK))
		97	return strdup (name);
		98	}
		99	}
		100	}
		101	return NULL;
		102	}
		103
31	/*	104	/*
32	* Calculate tiling sizes and increments	105	* Calculate tiling sizes and increments
33	* At start, p == 0, incr == xpmwidthheight	106	* At start, p == 0, incr == xpmwidthheight
34	*/	107	*/
35	static void	108	static void
…		…
101	*wh = cwh;	174	*wh = cwh;
102	*xy = cxy;	175	*xy = cxy;
103	*incr = cincr;	176	*incr = cincr;
104	*p = cp;	177	*p = cp;
105	}	178	}
		179	#endif
106		180
107	/*	181	/*
108	* These GEOM strings indicate absolute size/position:	182	* These GEOM strings indicate absolute size/position:
109	* @ `WxH+X+Y'	183	* @ `WxH+X+Y'
110	* @ `WxH+X' -> Y = X	184	* @ `WxH+X' -> Y = X
…		…
157	if (n < MAXLEN_GEOM)	231	if (n < MAXLEN_GEOM)
158	{	232	{
159	strncpy (str, geom, n);	233	strncpy (str, geom, n);
160	str[n] = '\0';	234	str[n] = '\0';
161		235
162	if (strcmp(str, "auto") == 0)	236	if (strcmp(str, "auto") == 0)
163	{	237	{
164	if (!bgpixmap->auto_resize)	238	if (!bgpixmap->auto_resize)
165	changed++;	239	changed++;
166	bgpixmap->auto_resize = True ;	240	bgpixmap->auto_resize = True ;
167	w = szHint.width ;	241	w = szHint.width ;
168	h = szHint.height ;	242	h = szHint.height ;
169	flags = WidthValue\|HeightValue ;	243	flags = WidthValue\|HeightValue ;
170	}	244	}
171	else	245	else
172	{	246	{
173	bgpixmap->auto_resize = False ;	247	bgpixmap->auto_resize = False ;
174	flags = XParseGeometry (str, &x, &y, &w, &h);	248	flags = XParseGeometry (str, &x, &y, &w, &h);
175	}	249	}
176		250
177	if (!flags)	251	if (!flags)
178	{	252	{
…		…
283	unsigned int w = bgPixmap.w, h = bgPixmap.h,	357	unsigned int w = bgPixmap.w, h = bgPixmap.h,
284	x = bgPixmap.x, y = bgPixmap.y;	358	x = bgPixmap.x, y = bgPixmap.y;
285	unsigned int xpmh = xpmAttr.height,	359	unsigned int xpmh = xpmAttr.height,
286	xpmw = xpmAttr.width;	360	xpmw = xpmAttr.width;
287		361
288	if (bgPixmap.auto_resize)	362	if (bgPixmap.auto_resize)
289	{	363	{
290	w = szHint.width ;	364	w = szHint.width ;
291	h = szHint.height ;	365	h = szHint.height ;
292	}	366	}
293	/*	367	/*
294	* don't zoom pixmap too much nor expand really small pixmaps	368	* don't zoom pixmap too much nor expand really small pixmaps
295	*/	369	*/
296	if (w > 32767 \|\| h > 32767)	370	if (w > 32767 \|\| h > 32767)
297	w = 1;	371	w = 1;
…		…
314	#ifdef ENABLE_TRANSPARENCY	388	#ifdef ENABLE_TRANSPARENCY
315	if (!option(Opt_transparent) \|\| !am_transparent)	389	if (!option(Opt_transparent) \|\| !am_transparent)
316	/* will do that in check_our_parents otherwise */	390	/* will do that in check_our_parents otherwise */
317	#endif	391	#endif
318	{	392	{
319	ASImage *scaled_im = scale_asimage( display->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);
320	if (scaled_im)	394	if (scaled_im)
321	{	395	{
322	pixmap = asimage2pixmap( display->asv, display->root, scaled_im, gc, True );	396	pixmap = asimage2pixmap(asv, display->root, scaled_im, gc, True);
323	destroy_asimage( &scaled_im );	397	destroy_asimage (&scaled_im);
324	}	398	}
325	}	399	}
326	#else /* HAVE_AFTERIMAGE */	400	#else /* HAVE_AFTERIMAGE */
327	{	401	{
328	float incr, p;	402	float incr, p;
…		…
402	* we already have the required attributes	476	* we already have the required attributes
403	*/	477	*/
404	/* XGetWindowAttributes (dpy, vt, &attr); */	478	/* XGetWindowAttributes (dpy, vt, &attr); */
405		479
406	#ifdef HAVE_AFTERIMAGE	480	#ifdef HAVE_AFTERIMAGE
407	if (asimman == NULL)	481	if (asimman == NULL)
408	asimman = create_generic_imageman(rs[Rs_path]);	482	asimman = create_generic_imageman(rs[Rs_path]);
409	if ((f = strchr (file, ';')) == NULL)	483	if ((f = strchr (file, ';')) == NULL)
410	original_asim = get_asimage( asimman, file, 0xFFFFFFFF, 100 );	484	original_asim = get_asimage( asimman, file, 0xFFFFFFFF, 100 );
411	else	485	else
412	{	486	{
413	size_t len = f - file;	487	size_t len = f - file;
414	f = (char *)malloc (len + 1);	488	f = (char *)malloc (len + 1);
415	strncpy (f, file, len);	489	strncpy (f, file, len);
416	f[len] = '\0';	490	f[len] = '\0';
417	original_asim = get_asimage( asimman, f, 0xFFFFFFFF, 100 );	491	original_asim = get_asimage( asimman, f, 0xFFFFFFFF, 100 );
418	free( f );	492	free( f );
419	}	493	}
420	if (original_asim)	494	if (original_asim)
421	{	495	{
422	bgPixmap.pixmap = asimage2pixmap( display->asv, display->root, original_asim, NULL, True );	496	bgPixmap.pixmap = asimage2pixmap (asv, display->root, original_asim, NULL, True);
423	xpmAttr.width = original_asim->width ;	497	xpmAttr.width = original_asim->width ;
424	xpmAttr.height = original_asim->height ;	498	xpmAttr.height = original_asim->height ;
425	}	499	}
426	#else /* HAVE_AFTERIMAGE */	500	#else /* HAVE_AFTERIMAGE */
427	xpmAttr.closeness = 30000;	501	xpmAttr.closeness = 30000;
428	xpmAttr.colormap = cmap;	502	xpmAttr.colormap = cmap;
429	xpmAttr.visual = visual;	503	xpmAttr.visual = visual;
430	xpmAttr.depth = depth;	504	xpmAttr.depth = depth;
431	xpmAttr.valuemask = (XpmCloseness \| XpmColormap \| XpmVisual	505	xpmAttr.valuemask = (XpmCloseness \| XpmColormap \| XpmVisual
432	\| XpmDepth \| XpmSize \| XpmReturnPixels);	506	\| XpmDepth \| XpmSize \| XpmReturnPixels);
433		507
434	/* search environment variables here too */	508	/* search environment variables here too */
435	f = (char *)rxvt_File_find (file, ".xpm", rs[Rs_path]);	509	f = rxvt_File_search_path (rs[Rs_path], file, ".xpm");
436	if (f == NULL	510	if (f == NULL
437	\|\| XpmReadFileToPixmap (dpy, display->root, f,	511	\|\| XpmReadFileToPixmap (dpy, display->root, f,
438	&bgPixmap.pixmap, NULL,	512	&bgPixmap.pixmap, NULL,
439	&xpmAttr))	513	&xpmAttr))
440	{	514	{
…		…
741		815
742	XTranslateCoordinates (dpy, parent[0], display->root,	816	XTranslateCoordinates (dpy, parent[0], display->root,
743	0, 0, &sx, &sy, &cr);	817	0, 0, &sx, &sy, &cr);
744		818
745	/* check if we are outside of the visible part of the virtual screen : */	819	/* check if we are outside of the visible part of the virtual screen : */
746	if( sx + (int)szHint.width <= 0 \|\| sy + (int)szHint.height <= 0	820	if( sx + (int)szHint.width <= 0 \|\| sy + (int)szHint.height <= 0
747	\|\| sx >= wrootattr.width \|\| sy >= wrootattr.height )	821	\|\| sx >= wrootattr.width \|\| sy >= wrootattr.height )
748	return /* 0 */ ;	822	return /* 0 */ ;
749	/*	823	/*
750	* Make the frame window set by the window manager have	824	* Make the frame window set by the window manager have
751	* the root background. Some window managers put multiple nested frame	825	* the root background. Some window managers put multiple nested frame
752	* windows for each client, so we have to take care about that.	826	* windows for each client, so we have to take care about that.
…		…
779	XFree (prop);	853	XFree (prop);
780	}	854	}
781		855
782	if (have_pixmap)	856	if (have_pixmap)
783	{	857	{
784	Bool success = False ;	858	Bool success = False;
785	GC gc = NULL;	859	GC gc = NULL;
786	XGCValues gcvalue;	860	XGCValues gcvalue;
		861	unsigned int pmap_w = 0, pmap_h = 0;
		862
787	#ifdef HAVE_AFTERIMAGE	863	#ifdef HAVE_AFTERIMAGE
788	{	864	{
789	Pixmap tmp_pmap = None ;	865	Pixmap tmp_pmap = None;
790	ShadingInfo shade;	866	ShadingInfo shade;
791	ARGB32 tint ;	867	ARGB32 tint;
792	unsigned int pmap_w = 0, pmap_h = 0;
793		868
794	if (get_drawable_size( rootpixmap, &pmap_w, &pmap_h ))	869	if (get_dpy_drawable_size (dpy, rootpixmap, &pmap_w, &pmap_h))
795	{	870	{
796	int root_x = 0, root_y = 0;	871	int root_x = 0, root_y = 0;
797		872
798	shade.shading = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	873	shade.shading = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
799	if (ISSET_PIXCOLOR (Color_tint))	874	if (ISSET_PIXCOLOR (Color_tint))
800	{	875	{
801	rgba c;	876	rgba c;
802	pix_colors_focused [Color_tint].get (c);	877	pix_colors_focused [Color_tint].get (c);
803	shade.tintColor.red = c.r;	878	shade.tintColor.red = c.r;
804	shade.tintColor.green = c.g;	879	shade.tintColor.green = c.g;
805	shade.tintColor.blue = c.b;	880	shade.tintColor.blue = c.b;
806	}	881	}
807	else	882	else
808	shade.tintColor.red = shade.tintColor.green = shade.tintColor.blue = 0xFFFF;	883	shade.tintColor.red = shade.tintColor.green = shade.tintColor.blue = 0xFFFF;
809	tint = shading2tint32( &shade );	884	tint = shading2tint32 (&shade);
810	gc = XCreateGC (dpy, vt, 0UL, &gcvalue);	885	gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
811	if (GetWinPosition (parent[0], &root_x, &root_y) )	886	if (get_dpy_window_position (dpy, display->root, parent[0], NULL, NULL, &root_x, &root_y))
812	{	887	{
813	ASImageLayer *layers = create_image_layers( 2 );	888	ASImageLayer *layers = create_image_layers (2);
814	ASImage *merged_im = NULL;	889	ASImage *merged_im = NULL;
815	int back_x, back_y, back_w, back_h;	890	int back_x, back_y, back_w, back_h;
816	/* merge_layers does good job at tiling background appropriately,	891	/* merge_layers does good job at tiling background appropriately,
817	so all we need is to cut out smallest possible piece : */	892	so all we need is to cut out smallest possible piece : */
818	#define MAKE_ROOTPMAP_GEOM(xy,wh,widthheight) \	893	#define MAKE_ROOTPMAP_GEOM(xy,wh,widthheight) \
819	do{ while( root_##xy < 0 ) root_##xy += (int)wrootattr.widthheight; \	894	do{ while( root_##xy < 0 ) root_##xy += (int)wrootattr.widthheight; \
820	back_##xy = root_##xy % pmap_##wh; /* that gives us left side of the closest tile : */ \	895	back_##xy = root_##xy % pmap_##wh; /* that gives us left side of the closest tile : */ \
821	if( pmap_##wh >= back_##xy + szHint.widthheight ) \	896	if( pmap_##wh >= back_##xy + szHint.widthheight ) \
…		…
823	else \	898	else \
824	{ /* small background - need the whole of it for successfull tiling :*/ \	899	{ /* small background - need the whole of it for successfull tiling :*/ \
825	back_##xy = 0; \	900	back_##xy = 0; \
826	back_##wh = pmap_##wh; \	901	back_##wh = pmap_##wh; \
827	}}while(0)	902	}}while(0)
828		903
829	MAKE_ROOTPMAP_GEOM(x,w,width);	904	MAKE_ROOTPMAP_GEOM(x,w,width);
830	MAKE_ROOTPMAP_GEOM(y,h,height);	905	MAKE_ROOTPMAP_GEOM(y,h,height);
831		906
832	layers[0].im = pixmap2asimage (display->asv, rootpixmap, back_x, back_y, back_w, back_h, AllPlanes, ASA_ASImage, 100);	907	layers[0].im = pixmap2asimage (asv, rootpixmap, back_x, back_y, back_w, back_h, AllPlanes, ASA_ASImage, 100);
833	layers[0].clip_x = (back_w == pmap_w)?root_x:0;	908	layers[0].clip_x = (back_w == pmap_w)?root_x:0;
834	layers[0].clip_y = (back_h == pmap_h)?root_y:0;	909	layers[0].clip_y = (back_h == pmap_h)?root_y:0;
835	layers[0].clip_width = szHint.width;	910	layers[0].clip_width = szHint.width;
836	layers[0].clip_height = szHint.height;	911	layers[0].clip_height = szHint.height;
837	layers[0].tint = tint;	912	layers[0].tint = tint;
838	if (rs[Rs_blurradius] && layers[0].im)	913	if (rs[Rs_blurradius] && layers[0].im)
839	{	914	{
840	double r = atof(rs[Rs_blurradius]);	915	double r = atof(rs[Rs_blurradius]);
841	ASImage* tmp = blur_asimage_gauss(display->asv, layers[0].im, r, r, 0xFFFFFFFF, ASA_ASImage, 100, ASIMAGE_QUALITY_DEFAULT );	916	ASImage* tmp = blur_asimage_gauss (asv, layers[0].im, r, r, 0xFFFFFFFF, ASA_ASImage, 100, ASIMAGE_QUALITY_DEFAULT);
842	if( tmp )	917	if (tmp)
843	{	918	{
844	destroy_asimage( &layers[0].im );	919	destroy_asimage (&layers[0].im);
845	layers[0].im = tmp;	920	layers[0].im = tmp;
846	}	921	}
847	}	922	}
848	if (original_asim != NULL)	923	if (original_asim != NULL)
849	{	924	{
850	int fore_w, fore_h;	925	int fore_w, fore_h;
851	layers[1].im = original_asim;	926	layers[1].im = original_asim;
852	if( bgPixmap.auto_resize )	927	if (bgPixmap.auto_resize)
853	{	928	{
854	fore_w = szHint.width;	929	fore_w = szHint.width;
855	fore_h = szHint.height;	930	fore_h = szHint.height;
856	}	931	}
857	else	932	else
…		…
860	fore_h = bgPixmap.h;	935	fore_h = bgPixmap.h;
861	}	936	}
862	if (fore_w != original_asim->width	937	if (fore_w != original_asim->width
863	\|\| fore_h != original_asim->height)	938	\|\| fore_h != original_asim->height)
864	{	939	{
865	layers[1].im = scale_asimage( display->asv,	940	layers[1].im = scale_asimage (asv,
866	original_asim,	941	original_asim,
867	fore_w, fore_h,	942	fore_w, fore_h,
868	ASA_ASImage, 100,	943	ASA_ASImage, 100,
869	ASIMAGE_QUALITY_DEFAULT );	944	ASIMAGE_QUALITY_DEFAULT);
870	}	945	}
871		946
872	layers[1].clip_width = szHint.width;	947	layers[1].clip_width = szHint.width;
873	layers[1].clip_height = szHint.height;	948	layers[1].clip_height = szHint.height;
874		949
875	if (rs[Rs_blendtype])	950	if (rs[Rs_blendtype])
876	{	951	{
877	layers[1].merge_scanlines = blend_scanlines_name2func(rs[Rs_blendtype]);	952	layers[1].merge_scanlines = blend_scanlines_name2func (rs[Rs_blendtype]);
878	if( layers[1].merge_scanlines == NULL )	953	if (layers[1].merge_scanlines == NULL)
879	layers[1].merge_scanlines = alphablend_scanlines;	954	layers[1].merge_scanlines = alphablend_scanlines;
880	}	955	}
881	}	956	}
882	merged_im = merge_layers( display->asv, layers, layers[1].im?2:1,	957	merged_im = merge_layers (asv, layers, layers[1].im?2:1,
883	szHint.width, szHint.height,	958	szHint.width, szHint.height,
884	ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT );	959	ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
885	if (layers[1].im != original_asim)	960	if (layers[1].im != original_asim)
886	destroy_asimage( &(layers[1].im) );	961	destroy_asimage (&(layers[1].im));
887	destroy_asimage( &(layers[0].im) );	962	destroy_asimage (&(layers[0].im));
888	if (merged_im != NULL)	963	if (merged_im != NULL)
889	{	964	{
890	tmp_pmap = asimage2pixmap( display->asv, DefaultRootWindow(dpy), merged_im, gc, True );	965	tmp_pmap = asimage2pixmap (asv, DefaultRootWindow(dpy), merged_im, gc, True);
891	destroy_asimage( &merged_im );	966	destroy_asimage (&merged_im);
892	}	967	}
893	free( layers );	968	free (layers);
894	}	969	}
895	}	970	}
896	if (tmp_pmap != None)	971	if (tmp_pmap != None)
897	{	972	{
898	success = True;	973	success = True;
…		…
904	#else /* HAVE_AFTERIMAGE */	979	#else /* HAVE_AFTERIMAGE */
905	{	980	{
906	/*	981	/*
907	* Copy display->root pixmap transparency	982	* Copy display->root pixmap transparency
908	*/	983	*/
		984	Window wjunk;
909	int nx, ny;	985	int junk;
910	unsigned int nw, nh;	986	unsigned int ujunk;
911	XImage *image;	987	/* root pixmap may be bad - allow a error */
912		988	allowedxerror = -1;
913	nw = (unsigned int)szHint.width;	989	if (XGetGeometry (dpy, rootpixmap, &wjunk, &junk, &junk, &pmap_w, &pmap_h, &ujunk, &ujunk))
914	nh = (unsigned int)szHint.height;
915	nx = ny = 0;
916
917	if (sx < 0)
918	{	990	{
919	nw += sx;	991	XImage *image = NULL;
920	nx = -sx;
921	sx = 0;	992	int shade = 100;
922	}	993	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
		994	Bool whole_tint = False;
923		995
924	if (sy < 0)	996	while (sx < 0) sx += (int)wrootattr.width;
925	{	997	while (sy < 0) sy += (int)wrootattr.height;
926	nh += sy;
927	ny = -sy;
928	sy = 0;
929	}
930		998
931	min_it (nw, (unsigned int) (wrootattr.width - sx));
932	min_it (nh, (unsigned int) (wrootattr.height - sy));
933
934	XSync (dpy, False);
935	allowedxerror = -1;
936	image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
937
938	/* XXX: handle BadMatch - usually because we're outside the pixmap */
939	/* XXX: may need a delay here? */
940	allowedxerror = 0;
941	if (image != NULL)
942	{
943	if (pixmap != None)	999	if (pixmap != None)
944	XFreePixmap (dpy, pixmap);	1000	XFreePixmap (dpy, pixmap);
		1001	pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, rootdepth);
945		1002
946	#if TINTING	1003	#if TINTING
		1004	if (rs[Rs_shade])
		1005	shade = atoi (rs[Rs_shade]);
947	if (ISSET_PIXCOLOR (Color_tint))	1006	if (ISSET_PIXCOLOR (Color_tint))
		1007	pix_colors_focused [Color_tint].get (c);
		1008	#define IS_COMPONENT_WHOLESOME(c) ((c) <=0x000700 \|\| (c)>=0x00f700)
		1009	if (shade >= 100)
		1010	whole_tint = (IS_COMPONENT_WHOLESOME(c.r)
		1011	&& IS_COMPONENT_WHOLESOME(c.g)
		1012	&& IS_COMPONENT_WHOLESOME(c.b));
		1013	#undef IS_COMPONENT_WHOLESOME
		1014
		1015	/* If No tinting to be done - simply tile root pixmap on our pixmap -
		1016	* no need in XImage at all, thus following if() only for case with tinting */
		1017	if (whole_tint \|\| pmap_w < sx + szHint.width \|\| pmap_h < sy + szHint.height)
		1018	#endif /* TINTING */
948	{	1019	{
949	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	1020	gcvalue.tile = rootpixmap;
950		1021	gcvalue.fill_style = FillTiled;
		1022	gcvalue.ts_x_origin = -sx;
		1023	gcvalue.ts_y_origin = -sy;
		1024	gc = XCreateGC (dpy, rootpixmap, GCFillStyle \| GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin, &gcvalue);
		1025	XFillRectangle (dpy, pixmap, gc, 0, 0, szHint.width, szHint.height);
		1026	#if TINTING
		1027	if (whole_tint)
951	rgba c;	1028	{
952	pix_colors_focused [Color_tint].get (c);	1029	/* In this case we can tint image server-side getting significant
		1030	* performance improvements, as we eliminate XImage transfer
		1031	*/
		1032	gcvalue.foreground = Pixel (pix_colors_focused [Color_tint]);
		1033	gcvalue.function = GXand;
		1034	gcvalue.fill_style = FillSolid;
		1035	XChangeGC (dpy, gc, GCFillStyle \| GCForeground \| GCFunction, &gcvalue);
		1036	XFillRectangle (dpy, pixmap, gc, 0, 0, szHint.width, szHint.height);
		1037	success = True;
		1038	}
		1039	else
		1040	image = XGetImage (dpy, pixmap, 0, 0, szHint.width, szHint.height, AllPlanes, ZPixmap);
		1041	#else
		1042	success = True;
		1043	#endif /* TINTING */
		1044	}
		1045	#if TINTING
		1046	if (!success && image == NULL)
		1047	image = XGetImage (dpy, rootpixmap, sx, sy, szHint.width, szHint.height, AllPlanes, ZPixmap);
		1048	if (image != NULL)
		1049	{
		1050	if (gc == NULL)
		1051	gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
		1052	if (ISSET_PIXCOLOR (Color_tint) \|\| shade != 100)
953	ShadeXImage (this, image, shade, c.r, c.g, c.b);	1053	ShadeXImage (this, image, shade, c.r, c.g, c.b);
		1054	XPutImage (dpy, pixmap, gc, image, 0, 0, 0, 0, image->width, image->height);
		1055	XDestroyImage (image);
		1056	success = True;
954	}	1057	}
955	#endif	1058	#endif
956
957	pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
958	gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
959	XPutImage (dpy, pixmap, gc, image, 0, 0,
960	nx, ny, image->width, image->height);
961	XDestroyImage (image);
962	success = True ;
963	}	1059	}
		1060	allowedxerror = 0;
964	}	1061	}
965	#endif /* HAVE_AFTERIMAGE */	1062	#endif /* HAVE_AFTERIMAGE */
966	if (gc != NULL)	1063	if (gc != NULL)
967	XFreeGC (dpy, gc);	1064	XFreeGC (dpy, gc);
968		1065
969	if (!success)	1066	if (!success)
970	{	1067	{
971	if (am_transparent && am_pixmap_trans)	1068	if (am_transparent && am_pixmap_trans)

Diff Legend

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

Comparing rxvt-unicode/src/xpm.C (file contents): Revision 1.44 by ayin, Sat Jun 30 23:34:57 2007 UTC vs. Revision 1.51 by ayin, Fri Jul 27 14:41:15 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/xpm.C (file contents):
Revision 1.44 by ayin, Sat Jun 30 23:34:57 2007 UTC vs.
Revision 1.51 by ayin, Fri Jul 27 14:41:15 2007 UTC