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

Comparing rxvt-unicode/src/xpm.C (file contents):
Revision 1.22 by root, Wed Feb 16 20:32:05 2005 UTC vs.
Revision 1.32 by root, Sat Feb 18 15:24:39 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 ()
162	{	168	{
163	XGCValues gcvalue;	169	XGCValues gcvalue;
164	GC gc;	170	GC gc;
165	unsigned int width = TermWin_TotalWidth ();
166	unsigned int height = TermWin_TotalHeight ();
167	dDisp;
168		171
169	if (TermWin.pixmap != None)	172	if (pixmap != None)
170	XFreePixmap (disp, TermWin.pixmap);	173	XFreePixmap (dpy, pixmap);
171		174
172	if (bgPixmap.pixmap == None)	175	if (bgPixmap.pixmap == None)
173	{ /* So be it: I'm not using pixmaps */	176	{ /* So be it: I'm not using pixmaps */
174	TermWin.pixmap = None;	177	pixmap = None;
175		178
176	if (!(options & Opt_transparent) \|\| !am_transparent)	179	if (!OPTION (Opt_transparent) \|\| !am_transparent)
177	XSetWindowBackground (disp, TermWin.vt,	180	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
178	pix_colors[Color_bg]);
179		181
180	return;	182	return;
181	}	183	}
182		184
183	gcvalue.foreground = pix_colors[Color_bg];	185	gcvalue.foreground = pix_colors[Color_bg];
184	gc = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);	186	gc = XCreateGC (dpy, vt, GCForeground, &gcvalue);
185		187
186	if (bgPixmap.pixmap != None)	188	if (bgPixmap.pixmap != None)
187	{ /* we have a specified pixmap */	189	{ /* we have a specified pixmap */
188	unsigned int w = bgPixmap.w, h = bgPixmap.h,	190	unsigned int w = bgPixmap.w, h = bgPixmap.h,
189	x = bgPixmap.x, y = bgPixmap.y;	191	x = bgPixmap.x, y = bgPixmap.y;
190	unsigned int xpmh = xpmAttr.height,	192	unsigned int xpmh = xpmAttr.height,
191	xpmw = xpmAttr.width;	193	xpmw = xpmAttr.width;
192		194
193	/*	195	/*
194	* don't zoom pixmap too much nor expand really small pixmaps	196	* don't zoom pixmap too much nor expand really small pixmaps
195	*/	197	*/
196	if (w > 1000 \|\| h > 1000)	198	if (w > 32767 \|\| h > 32767)
197	w = 1;	199	w = 1;
198	else if (width > (10 * xpmw)	200	else if (width > (10 * xpmw)
199	\|\| height > (10 * xpmh))	201	\|\| height > (10 * xpmh))
200	w = 0; /* tile */	202	w = 0; /* tile */
201		203
202	if (w == 0)	204	if (!w)
203	{	205	{
204	/* basic X tiling - let the X server do it */	206	/* basic X tiling - let the X server do it */
205	TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,	207	pixmap = XCreatePixmap (dpy, vt, xpmw, xpmh, depth);
206	xpmw, xpmh,	208
207	(unsigned int)display->depth);	209	XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, x, y, xpmw - x, xpmh - y, 0, 0);
208	XCopyArea (disp, bgPixmap.pixmap, TermWin.pixmap, gc,	210	XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, x, 0, xpmw - x, y, 0, xpmh - y);
209	0, 0, xpmw, xpmh, 0, 0);	211	XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, 0, y, x, xpmh - y, xpmw - x, 0);
		212	XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, 0, 0, x, y, xpmw - x, xpmh - y);
210	}	213	}
211	else	214	else
212	{	215	{
213	float incr, p;	216	float incr, p;
214	Pixmap tmp;	217	Pixmap tmp;
215		218
216	TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,	219	pixmap = XCreatePixmap (dpy, vt, width, height, depth);
217	width, height,
218	(unsigned int)display->depth);
219	/*	220	/*
220	* horizontal scaling	221	* horizontal scaling
221	*/	222	*/
222	rxvt_pixmap_incr (&w, &x, &incr, &p, width, xpmw);	223	rxvt_pixmap_incr (&w, &x, &incr, &p, width, xpmw);
223		224
224	tmp = XCreatePixmap (disp, TermWin.vt,	225	tmp = XCreatePixmap (dpy, vt, width, xpmh, depth);
225	width, xpmh, (unsigned int)display->depth);
226	XFillRectangle (disp, tmp, gc, 0, 0, width,	226	XFillRectangle (dpy, tmp, gc, 0, 0, width, xpmh);
227	xpmh);
228		227
229	for ( /nil / ; x < w; x++, p += incr)	228	for ( /nil / ; x < w; x++, p += incr)
230	{	229	{
231	if (p >= xpmw)	230	if (p >= xpmw)
232	p = 0;	231	p = 0;
		232
233	/* copy one column from the original pixmap to the tmp pixmap */	233	/* copy one column from the original pixmap to the tmp pixmap */
234	XCopyArea (disp, bgPixmap.pixmap, tmp, gc,	234	XCopyArea (dpy, bgPixmap.pixmap, tmp, gc, (int)p, 0, 1, xpmh, (int)x, 0);
235	(int)p, 0, 1, xpmh, (int)x, 0);
236	}	235	}
237		236
238	/*	237	/*
239	* vertical scaling	238	* vertical scaling
240	*/	239	*/
241	rxvt_pixmap_incr (&h, &y, &incr, &p, height, xpmh);	240	rxvt_pixmap_incr (&h, &y, &incr, &p, height, xpmh);
242		241
243	if (y > 0)	242	if (y > 0)
244	XFillRectangle (disp, TermWin.pixmap, gc, 0, 0, width, y);	243	XFillRectangle (dpy, pixmap, gc, 0, 0, width, y);
245		244
246	if (h < height)	245	if (h < height)
247	XFillRectangle (disp, TermWin.pixmap, gc, 0, (int)h, width, height - h + 1);	246	XFillRectangle (dpy, pixmap, gc, 0, (int)h, width, height - h + 1);
248		247
249	for ( /nil / ; y < h; y++, p += incr)	248	for ( /nil / ; y < h; y++, p += incr)
250	{	249	{
251	if (p >= xpmh)	250	if (p >= xpmh)
252	p = 0;	251	p = 0;
253		252
254	/* copy one row from the tmp pixmap to the main pixmap */	253	/* copy one row from the tmp pixmap to the main pixmap */
255	XCopyArea (disp, tmp, TermWin.pixmap, gc,	254	XCopyArea (dpy, tmp, pixmap, gc, 0, (int)p, width, 1, 0, (int)y);
256	0, (int)p, width, 1, 0, (int)y);
257	}	255	}
258		256
259	XFreePixmap (disp, tmp);	257	XFreePixmap (dpy, tmp);
260	}	258	}
261	}	259	}
262		260
263	XSetWindowBackgroundPixmap (disp, TermWin.vt, TermWin.pixmap);	261	XSetWindowBackgroundPixmap (dpy, vt, pixmap);
		262
264	XFreeGC (disp, gc);	263	XFreeGC (dpy, gc);
265	am_transparent = 0;	264	am_transparent = 0;
266	}	265	}
267		266
268	/*	267	/*
269	* Calculate tiling sizes and increments	268	* Calculate tiling sizes and increments
270	* At start, p == 0, incr == xpmwidthheight	269	* At start, p == 0, incr == xpmwidthheight
271	*/	270	*/
272	/* INTPROTO */
273	static void	271	static void
274	rxvt_pixmap_incr (unsigned int wh, unsigned int xy, float incr, float p, unsigned int widthheight, unsigned int xpmwidthheight)	272	rxvt_pixmap_incr (unsigned int wh, unsigned int xy, float incr, float p, unsigned int widthheight, unsigned int xpmwidthheight)
275	{	273	{
276	unsigned int cwh, cxy;	274	unsigned int cwh, cxy;
277	float cincr, cp;	275	float cincr, cp;
…		…
349		347
350	assert (file != NULL);	348	assert (file != NULL);
351		349
352	if (bgPixmap.pixmap != None)	350	if (bgPixmap.pixmap != None)
353	{	351	{
354	XFreePixmap (display->display, bgPixmap.pixmap);	352	XFreePixmap (dpy, bgPixmap.pixmap);
355	bgPixmap.pixmap = None;	353	bgPixmap.pixmap = None;
356	}	354	}
357		355
358	XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]);	356	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
359		357
360	if (*file != '\0')	358	if (*file != '\0')
361	{	359	{
362	/* XWindowAttributes attr; */	360	/* XWindowAttributes attr; */
363		361
364	/*	362	/*
365	* we already have the required attributes	363	* we already have the required attributes
366	*/	364	*/
367	/* XGetWindowAttributes (display->display, TermWin.vt, &attr); */	365	/* XGetWindowAttributes (dpy, vt, &attr); */
368		366
369	xpmAttr.closeness = 30000;	367	xpmAttr.closeness = 30000;
370	xpmAttr.colormap = display->cmap;	368	xpmAttr.colormap = cmap;
371	xpmAttr.visual = display->visual;	369	xpmAttr.visual = visual;
372	xpmAttr.depth = display->depth;	370	xpmAttr.depth = depth;
373	xpmAttr.valuemask = (XpmCloseness \| XpmColormap \| XpmVisual \|	371	xpmAttr.valuemask = (XpmCloseness \| XpmColormap \| XpmVisual
374	XpmDepth \| XpmSize \| XpmReturnPixels);	372	\| XpmDepth \| XpmSize \| XpmReturnPixels);
375		373
376	/* search environment variables here too */	374	/* search environment variables here too */
377	f = (char *)rxvt_File_find (file, ".xpm", rs[Rs_path]);	375	f = (char *)rxvt_File_find (file, ".xpm", rs[Rs_path]);
378	if (f == NULL	376	if (f == NULL
379	\|\| XpmReadFileToPixmap (display->display, display->root, f,	377	\|\| XpmReadFileToPixmap (dpy, display->root, f,
380	&bgPixmap.pixmap, NULL,	378	&bgPixmap.pixmap, NULL,
381	&xpmAttr))	379	&xpmAttr))
382	{	380	{
383	char *p;	381	char *p;
384		382
385	/* semi-colon delimited */	383	/* semi-colon delimited */
386	if ((p = strchr (file, ';')) == NULL)	384	if ((p = strchr (file, ';')) == NULL)

Diff Legend

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

Comparing rxvt-unicode/src/xpm.C (file contents): Revision 1.22 by root, Wed Feb 16 20:32:05 2005 UTC vs. Revision 1.32 by root, Sat Feb 18 15:24:39 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/xpm.C (file contents):
Revision 1.22 by root, Wed Feb 16 20:32:05 2005 UTC vs.
Revision 1.32 by root, Sat Feb 18 15:24:39 2006 UTC