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

Comparing rxvt-unicode/src/xpm.C (file contents):
Revision 1.27 by root, Wed Jan 4 04:42:45 2006 UTC vs.
Revision 1.28 by root, Wed Jan 18 17:49:47 2006 UTC

…		…
50	* @ `?'	50	* @ `?'
51	*/	51	*/
52	int	52	int
53	rxvt_term::scale_pixmap (const char *geom)	53	rxvt_term::scale_pixmap (const char *geom)
54	{	54	{
55	int flags, changed = 0;	55	int flags, changed = 0;
56	int x = 0, y = 0;	56	int x = 0, y = 0;
57	unsigned int w = 0, h = 0;	57	unsigned int w = 0, h = 0;
58	unsigned int n;	58	unsigned int n;
59	char p, str;	59	char *p;
60	bgPixmap_t *bgpixmap = & (bgPixmap);	60	bgPixmap_t *bgpixmap = & (bgPixmap);
61		61
62	#define MAXLEN_GEOM sizeof("[1000x1000+1000+1000]")	62	#define MAXLEN_GEOM sizeof("[10000x10000+10000+10000]")
63		63
64	if (geom == NULL)	64	if (geom == NULL)
65	return 0;	65	return 0;
66	str = (char *)rxvt_malloc (MAXLEN_GEOM + 1);	66
		67	char str[MAXLEN_GEOM];
		68
67	if (!strcmp (geom, "?"))	69	if (!strcmp (geom, "?"))
68	{	70	{
69	sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */	71	sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
70	min (bgpixmap->w, 9999), min (bgpixmap->h, 9999),	72	min (bgpixmap->w, 32767), min (bgpixmap->h, 32767),
71	min (bgpixmap->x, 9999), min (bgpixmap->y, 9999));	73	min (bgpixmap->x, 32767), min (bgpixmap->y, 32767));
72	process_xterm_seq (XTerm_title, str, CHAR_ST);	74	process_xterm_seq (XTerm_title, str, CHAR_ST);
73	free (str);
74	return 0;	75	return 0;
75	}	76	}
76		77
77	if ((p = strchr (geom, ';')) == NULL)	78	if ((p = strchr (geom, ';')) == NULL)
78	p = strchr (geom, '\0');	79	p = strchr (geom, '\0');
		80
79	n = (p - geom);	81	n = (p - geom);
80	if (n <= MAXLEN_GEOM)	82	if (n <= MAXLEN_GEOM)
81	{	83	{
82	strncpy (str, geom, n);	84	strncpy (str, geom, n);
83	str[n] = '\0';	85	str[n] = '\0';
84		86
85	flags = XParseGeometry (str, &x, &y, &w, &h);	87	flags = XParseGeometry (str, &x, &y, &w, &h);
		88
86	if (!flags)	89	if (!flags)
87	{	90	{
88	flags \|= WidthValue;	91	flags \|= WidthValue;
89	w = 0;	92	w = 0;
90	} /* default is tile */	93	} /* default is tile */
		94
91	if (flags & WidthValue)	95	if (flags & WidthValue)
92	{	96	{
93	if (! (flags & XValue))	97	if (!(flags & XValue))
94	x = 50;	98	x = 50;
		99
95	if (! (flags & HeightValue))	100	if (!(flags & HeightValue))
96	h = w;	101	h = w;
		102
97	if (w && !h)	103	if (w && !h)
98	{	104	{
99	w = (bgpixmap->w * w) / 100;	105	w = (bgpixmap->w * w) / 100;
100	h = bgpixmap->h;	106	h = bgpixmap->h;
101	}	107	}
102	else if (h && !w)	108	else if (h && !w)
103	{	109	{
104	w = bgpixmap->w;	110	w = bgpixmap->w;
105	h = (bgpixmap->h * h) / 100;	111	h = (bgpixmap->h * h) / 100;
106	}	112	}
107	if (w > 1000)	113
108	w = 1000;	114	min_it (w, 32767);
109	if (h > 1000)	115	min_it (h, 32767);
110	h = 1000;	116
111	if (bgpixmap->w != (short)w)	117	if (bgpixmap->w != (short)w)
112	{	118	{
113	bgpixmap->w = (short)w;	119	bgpixmap->w = (short)w;
114	changed++;	120	changed++;
115	}	121	}
		122
116	if (bgpixmap->h != (short)h)	123	if (bgpixmap->h != (short)h)
117	{	124	{
118	bgpixmap->h = (short)h;	125	bgpixmap->h = (short)h;
119	changed++;	126	changed++;
120	}	127	}
121	}	128	}
		129
122	if (! (flags & YValue))	130	if (!(flags & YValue))
123	{	131	{
124	if (flags & XNegative)	132	if (flags & XNegative)
125	flags \|= YNegative;	133	flags \|= YNegative;
		134
126	y = x;	135	y = x;
127	}	136	}
128		137
129	if (! (flags & WidthValue) && geom[0] != '=')	138	if (!(flags & WidthValue) && geom[0] != '=')
130	{	139	{
131	x += bgpixmap->x;	140	x += bgpixmap->x;
132	y += bgpixmap->y;	141	y += bgpixmap->y;
133	}	142	}
134	else	143
135	{	144	if (xpmAttr.width && xpmAttr.height)
136	if (flags & XNegative)
137	x += 100;
138	if (flags & YNegative)
139	y += 100;
140	}	145	{
141	min_it (x, 100);	146	x = MOD(x, xpmAttr.width);
142	min_it (y, 100);	147	y = MOD(y, xpmAttr.height);
143	max_it (x, 0);	148	}
144	max_it (y, 0);	149
145	if (bgpixmap->x != x)	150	if (bgpixmap->x != x)
146	{	151	{
147	bgpixmap->x = x;	152	bgpixmap->x = x;
148	changed++;	153	changed++;
149	}	154	}
		155
150	if (bgpixmap->y != y)	156	if (bgpixmap->y != y)
151	{	157	{
152	bgpixmap->y = y;	158	bgpixmap->y = y;
153	changed++;	159	changed++;
154	}	160	}
155	}	161	}
156	free (str);	162
157	return changed;	163	return changed;
158	}	164	}
159		165
160	void	166	void
161	rxvt_term::resize_pixmap ()	167	rxvt_term::resize_pixmap ()
…		…
180	gcvalue.foreground = pix_colors[Color_bg];	186	gcvalue.foreground = pix_colors[Color_bg];
181	gc = XCreateGC (disp, vt, GCForeground, &gcvalue);	187	gc = XCreateGC (disp, vt, GCForeground, &gcvalue);
182		188
183	if (bgPixmap.pixmap != None)	189	if (bgPixmap.pixmap != None)
184	{ /* we have a specified pixmap */	190	{ /* we have a specified pixmap */
185	unsigned int w = bgPixmap.w, h = bgPixmap.h,	191	unsigned int w = bgPixmap.w, h = bgPixmap.h,
186	x = bgPixmap.x, y = bgPixmap.y;	192	x = bgPixmap.x, y = bgPixmap.y;
187	unsigned int xpmh = xpmAttr.height,	193	unsigned int xpmh = xpmAttr.height,
188	xpmw = xpmAttr.width;	194	xpmw = xpmAttr.width;
189		195
190	/*	196	/*
191	* don't zoom pixmap too much nor expand really small pixmaps	197	* don't zoom pixmap too much nor expand really small pixmaps
192	*/	198	*/
193	if (w > 1000 \|\| h > 1000)	199	if (w > 32767 \|\| h > 32767)
194	w = 1;	200	w = 1;
195	else if (width > (10 * xpmw)	201	else if (width > (10 * xpmw)
196	\|\| height > (10 * xpmh))	202	\|\| height > (10 * xpmh))
197	w = 0; /* tile */	203	w = 0; /* tile */
198		204
199	if (w == 0)	205	if (!w)
200	{	206	{
201	/* basic X tiling - let the X server do it */	207	/* basic X tiling - let the X server do it */
202	pixmap = XCreatePixmap (disp, vt, xpmw, xpmh,	208	pixmap = XCreatePixmap (disp, vt, xpmw, xpmh, display->depth);
203	(unsigned int)display->depth);	209
204	XCopyArea (disp, bgPixmap.pixmap, pixmap, gc,	210	XCopyArea (disp, bgPixmap.pixmap, pixmap, gc, x, y, xpmw - x, xpmh - y, 0, 0);
205	0, 0, xpmw, xpmh, 0, 0);	211	XCopyArea (disp, bgPixmap.pixmap, pixmap, gc, x, 0, xpmw - x, y, 0, xpmh - y);
		212	XCopyArea (disp, bgPixmap.pixmap, pixmap, gc, 0, y, x, xpmh - y, xpmw - x, 0);
		213	XCopyArea (disp, bgPixmap.pixmap, pixmap, gc, 0, 0, x, y, xpmw - x, xpmh - y);
206	}	214	}
207	else	215	else
208	{	216	{
209	float incr, p;	217	float incr, p;
210	Pixmap tmp;	218	Pixmap tmp;
…		…
221		229
222	for ( /nil / ; x < w; x++, p += incr)	230	for ( /nil / ; x < w; x++, p += incr)
223	{	231	{
224	if (p >= xpmw)	232	if (p >= xpmw)
225	p = 0;	233	p = 0;
		234
226	/* copy one column from the original pixmap to the tmp pixmap */	235	/* copy one column from the original pixmap to the tmp pixmap */
227	XCopyArea (disp, bgPixmap.pixmap, tmp, gc,	236	XCopyArea (disp, bgPixmap.pixmap, tmp, gc,
228	(int)p, 0, 1, xpmh, (int)x, 0);	237	(int)p, 0, 1, xpmh, (int)x, 0);
229	}	238	}
230		239
…		…
252	XFreePixmap (disp, tmp);	261	XFreePixmap (disp, tmp);
253	}	262	}
254	}	263	}
255		264
256	XSetWindowBackgroundPixmap (disp, vt, pixmap);	265	XSetWindowBackgroundPixmap (disp, vt, pixmap);
		266
		267	if (pixmap != None)
		268	{
		269	XFreePixmap (disp, pixmap);
		270	pixmap = None;
		271	}
		272
257	XFreeGC (disp, gc);	273	XFreeGC (disp, gc);
258	am_transparent = 0;	274	am_transparent = 0;
259	}	275	}
260		276
261	/*	277	/*

Diff Legend

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

Comparing rxvt-unicode/src/xpm.C (file contents): Revision 1.27 by root, Wed Jan 4 04:42:45 2006 UTC vs. Revision 1.28 by root, Wed Jan 18 17:49:47 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/xpm.C (file contents):
Revision 1.27 by root, Wed Jan 4 04:42:45 2006 UTC vs.
Revision 1.28 by root, Wed Jan 18 17:49:47 2006 UTC