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

Comparing rxvt-unicode/src/xpm.C (file contents):
Revision 1.8 by pcg, Mon Feb 9 07:11:49 2004 UTC vs.
Revision 1.38 by sasha, Fri Jun 8 20:04:12 2007 UTC

…		…
1	/---------------------------------C----------------------------------	1	/----------------------------------------------------------------------
2	* File: xpm.c	2	* File: xpm.C
3	----------------------------------------------------------------------	3	----------------------------------------------------------------------
4	* $Id: xpm.C,v 1.8 2004/02/09 07:11:49 pcg Exp $
5	*	4	*
6	* All portions of code are copyright by their respective author/s.	5	* All portions of code are copyright by their respective author/s.
7	* Copyright (c) 1997 Carsten Haitzler <raster@zip.com.au>	6	* Copyright (c) 1997 Carsten Haitzler <raster@zip.com.au>
8	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>	7	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
9	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	8	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
		9	* Copyright (c) 2005-2006 Marc Lehmann <pcg@goof.com>
10	*	10	*
11	* This program is free software; you can redistribute it and/or modify	11	* This program is free software; you can redistribute it and/or modify
12	* it under the terms of the GNU General Public License as published by	12	* it under the terms of the GNU General Public License as published by
13	* the Free Software Foundation; either version 2 of the License, or	13	* the Free Software Foundation; either version 2 of the License, or
14	* (at your option) any later version.	14	* (at your option) any later version.
23	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	23	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
24	---------------------------------------------------------------------/	24	---------------------------------------------------------------------/
25		25
26	#include "../config.h" /* NECESSARY */	26	#include "../config.h" /* NECESSARY */
27	#include "rxvt.h" /* NECESSARY */	27	#include "rxvt.h" /* NECESSARY */
28	#include "xpm.intpro" /* PROTOS for internal routines */
29		28
30	#ifdef XPM_BACKGROUND	29	#ifdef XPM_BACKGROUND
		30
		31	static void rxvt_pixmap_incr (unsigned int wh, unsigned int xy, float incr, float p, unsigned int widthheight, unsigned int xpmwidthheight);
31		32
32	/*	33	/*
33	* These GEOM strings indicate absolute size/position:	34	* These GEOM strings indicate absolute size/position:
34	* @ `WxH+X+Y'	35	* @ `WxH+X+Y'
35	* @ `WxH+X' -> Y = X	36	* @ `WxH+X' -> Y = X
…		…
50	* @ `?'	51	* @ `?'
51	*/	52	*/
52	int	53	int
53	rxvt_term::scale_pixmap (const char *geom)	54	rxvt_term::scale_pixmap (const char *geom)
54	{	55	{
55	int flags, changed = 0;	56	int flags, changed = 0;
56	int x = 0, y = 0;	57	int x = 0, y = 0;
57	unsigned int w = 0, h = 0;	58	unsigned int w = 0, h = 0;
58	unsigned int n;	59	unsigned int n;
59	char p, str;	60	char *p;
60	bgPixmap_t *bgpixmap = &(bgPixmap);	61	bgPixmap_t *bgpixmap = &bgPixmap;
61		62
62	#define MAXLEN_GEOM sizeof("[1000x1000+1000+1000]")	63	#define MAXLEN_GEOM sizeof("[10000x10000+10000+10000]")
63		64
64	if (geom == NULL)	65	if (geom == NULL)
65	return 0;	66	return 0;
66	str = (char *)rxvt_malloc (MAXLEN_GEOM + 1);	67
67	if (!STRCMP(geom, "?"))	68	char str[MAXLEN_GEOM];
		69
		70	if (!strcmp (geom, "?"))
68	{	71	{
69	sprintf(str, "[%dx%d+%d+%d]", /* can't presume snprintf() ! */	72	sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
70	min(bgpixmap->w, 9999), min(bgpixmap->h, 9999),	73	min (bgpixmap->w, 32767), min (bgpixmap->h, 32767),
71	min(bgpixmap->x, 9999), min(bgpixmap->y, 9999));	74	min (bgpixmap->x, 32767), min (bgpixmap->y, 32767));
72	xterm_seq (XTerm_title, str, CHAR_ST);	75	process_xterm_seq (XTerm_title, str, CHAR_ST);
73	free(str);
74	return 0;	76	return 0;
75	}	77	}
76		78
77	if ((p = STRCHR(geom, ';')) == NULL)	79	if ((p = strchr (geom, ';')) == NULL)
78	p = STRCHR(geom, '\0');	80	p = strchr (geom, '\0');
		81
79	n = (p - geom);	82	n = (p - geom);
80	if (n <= MAXLEN_GEOM)	83	if (n < MAXLEN_GEOM)
81	{	84	{
82	STRNCPY(str, geom, n);	85	strncpy (str, geom, n);
83	str[n] = '\0';	86	str[n] = '\0';
84		87
		88	if (strcmp(str, "auto") == 0)
		89	{
		90	if (!bgpixmap->auto_resize)
		91	changed++;
		92	bgpixmap->auto_resize = True ;
		93	w = szHint.width ;
		94	h = szHint.height ;
		95	flags = WidthValue\|HeightValue ;
		96	}
		97	else
		98	{
		99	bgpixmap->auto_resize = False ;
85	flags = XParseGeometry(str, &x, &y, &w, &h);	100	flags = XParseGeometry (str, &x, &y, &w, &h);
		101	}
		102
86	if (!flags)	103	if (!flags)
87	{	104	{
88	flags \|= WidthValue;	105	flags \|= WidthValue;
89	w = 0;	106	w = 0;
90	} /* default is tile */	107	} /* default is tile */
		108
91	if (flags & WidthValue)	109	if (flags & WidthValue)
92	{	110	{
93	if (!(flags & XValue))	111	if (!(flags & XValue))
94	x = 50;	112	x = 50;
		113
95	if (!(flags & HeightValue))	114	if (!(flags & HeightValue))
96	h = w;	115	h = w;
		116
97	if (w && !h)	117	if (w && !h)
98	{	118	{
99	w = (bgpixmap->w * w) / 100;	119	w = (bgpixmap->w * w) / 100;
100	h = bgpixmap->h;	120	h = bgpixmap->h;
101	}	121	}
102	else if (h && !w)	122	else if (h && !w)
103	{	123	{
104	w = bgpixmap->w;	124	w = bgpixmap->w;
105	h = (bgpixmap->h * h) / 100;	125	h = (bgpixmap->h * h) / 100;
106	}	126	}
107	if (w > 1000)	127
108	w = 1000;	128	min_it (w, 32767);
109	if (h > 1000)	129	min_it (h, 32767);
110	h = 1000;	130
111	if (bgpixmap->w != (short)w)	131	if (bgpixmap->w != (short)w)
112	{	132	{
113	bgpixmap->w = (short)w;	133	bgpixmap->w = (short)w;
114	changed++;	134	changed++;
115	}	135	}
		136
116	if (bgpixmap->h != (short)h)	137	if (bgpixmap->h != (short)h)
117	{	138	{
118	bgpixmap->h = (short)h;	139	bgpixmap->h = (short)h;
119	changed++;	140	changed++;
120	}	141	}
121	}	142	}
		143
122	if (!(flags & YValue))	144	if (!(flags & YValue))
123	{	145	{
124	if (flags & XNegative)	146	if (flags & XNegative)
125	flags \|= YNegative;	147	flags \|= YNegative;
		148
126	y = x;	149	y = x;
127	}	150	}
128		151
129	if (!(flags & WidthValue) && geom[0] != '=')	152	if (!(flags & WidthValue) && geom[0] != '=')
130	{	153	{
131	x += bgpixmap->x;	154	x += bgpixmap->x;
132	y += bgpixmap->y;	155	y += bgpixmap->y;
133	}	156	}
134	else	157
135	{	158	if (xpmAttr.width && xpmAttr.height)
136	if (flags & XNegative)
137	x += 100;
138	if (flags & YNegative)
139	y += 100;
140	}	159	{
141	MIN_IT(x, 100);	160	x = MOD(x, xpmAttr.width);
142	MIN_IT(y, 100);	161	y = MOD(y, xpmAttr.height);
143	MAX_IT(x, 0);	162	}
144	MAX_IT(y, 0);	163
145	if (bgpixmap->x != x)	164	if (bgpixmap->x != x)
146	{	165	{
147	bgpixmap->x = x;	166	bgpixmap->x = x;
148	changed++;	167	changed++;
149	}	168	}
		169
150	if (bgpixmap->y != y)	170	if (bgpixmap->y != y)
151	{	171	{
152	bgpixmap->y = y;	172	bgpixmap->y = y;
153	changed++;	173	changed++;
154	}	174	}
155	}	175	}
156	free(str);	176
157	return changed;	177	return changed;
158	}	178	}
159		179
160	void	180	void
161	rxvt_term::resize_pixmap ()	181	rxvt_term::resize_pixmap ()
162	{	182	{
163	XGCValues gcvalue;	183	XGCValues gcvalue;
164	GC gc;	184	GC gc;
165	unsigned int width = TermWin_TotalWidth();
166	unsigned int height = TermWin_TotalHeight();
167		185
168	if (TermWin.pixmap != None)	186	if (pixmap != None)
169	XFreePixmap(display->display, TermWin.pixmap);	187	{
		188	XFreePixmap (dpy, pixmap);
		189	pixmap = None ;
		190	}
170		191
171	if (bgPixmap.pixmap == None)	192	if (bgPixmap.pixmap == None)
172	{ /* So be it: I'm not using pixmaps */	193	{ /* So be it: I'm not using pixmaps */
173	TermWin.pixmap = None;	194	pixmap = None;
		195
		196	#ifdef TRANSPARENT
174	if (!(Options & Opt_transparent) \|\| am_transparent == 0)	197	if (!option (Opt_transparent) \|\| !am_transparent)
175	XSetWindowBackground(display->display, TermWin.vt,	198	#endif
176	PixColors[Color_bg]);	199	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
		200
177	return;	201	return;
178	}	202	}
179		203
180	gcvalue.foreground = PixColors[Color_bg];	204	gcvalue.foreground = pix_colors[Color_bg];
181	gc = XCreateGC(display->display, TermWin.vt, GCForeground, &gcvalue);	205	gc = XCreateGC (dpy, vt, GCForeground, &gcvalue);
182		206
183	if (bgPixmap.pixmap != None)	207	if (bgPixmap.pixmap != None)
184	{ /* we have a specified pixmap */	208	{ /* we have a specified pixmap */
185	unsigned int w = bgPixmap.w, h = bgPixmap.h,	209	unsigned int w = bgPixmap.w, h = bgPixmap.h,
186	x = bgPixmap.x, y = bgPixmap.y;	210	x = bgPixmap.x, y = bgPixmap.y;
187	unsigned int xpmh = xpmAttr.height,	211	unsigned int xpmh = xpmAttr.height,
188	xpmw = xpmAttr.width;	212	xpmw = xpmAttr.width;
189		213
		214	if (bgPixmap.auto_resize)
		215	{
		216	w = szHint.width ;
		217	h = szHint.height ;
		218	}
190	/*	219	/*
191	* don't zoom pixmap too much nor expand really small pixmaps	220	* don't zoom pixmap too much nor expand really small pixmaps
192	*/	221	*/
193	if (w > 1000 \|\| h > 1000)	222	if (w > 32767 \|\| h > 32767)
194	w = 1;	223	w = 1;
195	else if (width > (10 * xpmw)	224	else if (width > (10 * xpmw)
196	\|\| height > (10 * xpmh))	225	\|\| height > (10 * xpmh))
197	w = 0; /* tile */	226	w = 0; /* tile */
198		227
199	if (w == 0)	228	if (!w)
200	{	229	{
201	/* basic X tiling - let the X server do it */	230	/* basic X tiling - let the X server do it */
202	TermWin.pixmap = XCreatePixmap(display->display, TermWin.vt,	231	pixmap = XCreatePixmap (dpy, vt, xpmw, xpmh, depth);
203	xpmw, xpmh,	232
204	(unsigned int)XDEPTH);	233	XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, x, y, xpmw - x, xpmh - y, 0, 0);
205	XCopyArea(display->display, bgPixmap.pixmap, TermWin.pixmap, gc,	234	XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, x, 0, xpmw - x, y, 0, xpmh - y);
206	0, 0, xpmw, xpmh, 0, 0);	235	XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, 0, y, x, xpmh - y, xpmw - x, 0);
		236	XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, 0, 0, x, y, xpmw - x, xpmh - y);
207	}	237	}
208	else	238	else
		239	#ifdef HAVE_AFTERIMAGE
		240	#ifdef TRANSPARENT
		241	if (!option(Opt_transparent) \|\| !am_transparent)
		242	/* will do that in check_our_parents otherwise */
		243	#endif
		244	{
		245	ASImage *scaled_im = scale_asimage( display->asv, original_asim, w, h, ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT );
		246	if (scaled_im)
		247	{
		248	pixmap = asimage2pixmap( display->asv, display->root, scaled_im, gc, True );
		249	destroy_asimage( &scaled_im );
		250	}
209	{	251	}
		252	#else /* HAVE_AFTERIMAGE */
		253	{
210	float incr, p;	254	float incr, p;
211	Pixmap tmp;	255	Pixmap tmp;
212		256
213	TermWin.pixmap = XCreatePixmap(display->display, TermWin.vt,	257	pixmap = XCreatePixmap (dpy, vt, width, height, depth);
214	width, height,
215	(unsigned int)XDEPTH);
216	/*	258	/*
217	* horizontal scaling	259	* horizontal scaling
218	*/	260	*/
219	rxvt_pixmap_incr(&w, &x, &incr, &p, width, xpmw);	261	rxvt_pixmap_incr (&w, &x, &incr, &p, width, xpmw);
220		262
221	tmp = XCreatePixmap(display->display, TermWin.vt,	263	tmp = XCreatePixmap (dpy, vt, width, xpmh, depth);
222	width, xpmh, (unsigned int)XDEPTH);
223	XFillRectangle(display->display, tmp, gc, 0, 0, width,	264	XFillRectangle (dpy, tmp, gc, 0, 0, width, xpmh);
224	xpmh);
225		265
226	for ( /nil / ; x < w; x++, p += incr)	266	for ( /nil / ; x < w; x++, p += incr)
227	{	267	{
228	if (p >= xpmw)	268	if (p >= xpmw)
229	p = 0;	269	p = 0;
		270
230	/* copy one column from the original pixmap to the tmp pixmap */	271	/* copy one column from the original pixmap to the tmp pixmap */
231	XCopyArea(display->display, bgPixmap.pixmap, tmp, gc,	272	XCopyArea (dpy, bgPixmap.pixmap, tmp, gc, (int)p, 0, 1, xpmh, (int)x, 0);
232	(int)p, 0, 1, xpmh, (int)x, 0);
233	}	273	}
234		274
235	/*	275	/*
236	* vertical scaling	276	* vertical scaling
237	*/	277	*/
238	rxvt_pixmap_incr(&h, &y, &incr, &p, height, xpmh);	278	rxvt_pixmap_incr (&h, &y, &incr, &p, height, xpmh);
239		279
240	if (y > 0)	280	if (y > 0)
241	XFillRectangle(display->display, TermWin.pixmap, gc, 0, 0, width,	281	XFillRectangle (dpy, pixmap, gc, 0, 0, width, y);
242	y);	282
243	if (h < height)	283	if (h < height)
244	XFillRectangle(display->display, TermWin.pixmap, gc, 0, (int)h,	284	XFillRectangle (dpy, pixmap, gc, 0, (int)h, width, height - h + 1);
245	width, height - h + 1);	285
246	for ( /nil / ; y < h; y++, p += incr)	286	for ( /nil / ; y < h; y++, p += incr)
247	{	287	{
248	if (p >= xpmh)	288	if (p >= xpmh)
249	p = 0;	289	p = 0;
		290
250	/* copy one row from the tmp pixmap to the main pixmap */	291	/* copy one row from the tmp pixmap to the main pixmap */
251	XCopyArea(display->display, tmp, TermWin.pixmap, gc,	292	XCopyArea (dpy, tmp, pixmap, gc, 0, (int)p, width, 1, 0, (int)y);
252	0, (int)p, width, 1, 0, (int)y);
253	}	293	}
		294
254	XFreePixmap(display->display, tmp);	295	XFreePixmap (dpy, tmp);
255	}	296	}
		297	#endif /* HAVE_AFTERIMAGE */
256	}	298	}
		299
257	XSetWindowBackgroundPixmap(display->display, TermWin.vt, TermWin.pixmap);	300	XSetWindowBackgroundPixmap (dpy, vt, pixmap);
258	XFreeGC(display->display, gc);	301
		302	XFreeGC (dpy, gc);
		303	#ifdef TRANSPARENT
259	am_transparent = 0;	304	am_transparent = 0;
260		305	#endif
261	XClearWindow(display->display, TermWin.vt);
262
263	XSync(display->display, False);
264	}	306	}
265		307
266	/*	308	/*
267	* Calculate tiling sizes and increments	309	* Calculate tiling sizes and increments
268	* At start, p == 0, incr == xpmwidthheight	310	* At start, p == 0, incr == xpmwidthheight
269	*/	311	*/
270	/* INTPROTO */
271	static void	312	static void
272	rxvt_pixmap_incr(unsigned int wh, unsigned int xy, float incr, float p, unsigned int widthheight, unsigned int xpmwidthheight)	313	rxvt_pixmap_incr (unsigned int wh, unsigned int xy, float incr, float p, unsigned int widthheight, unsigned int xpmwidthheight)
273	{	314	{
274	unsigned int cwh, cxy;	315	unsigned int cwh, cxy;
275	float cincr, cp;	316	float cincr, cp;
276		317
277	cp = 0;	318	cp = 0;
…		…
341	}	382	}
342		383
343	Pixmap	384	Pixmap
344	rxvt_term::set_bgPixmap (const char *file)	385	rxvt_term::set_bgPixmap (const char *file)
345	{	386	{
346	char *f;	387	char *f;
347		388
348	assert(file != NULL);	389	assert (file != NULL);
349		390
350	if (bgPixmap.pixmap != None)	391	if (bgPixmap.pixmap != None)
351	{	392	{
352	XFreePixmap(display->display, bgPixmap.pixmap);	393	XFreePixmap (dpy, bgPixmap.pixmap);
353	bgPixmap.pixmap = None;	394	bgPixmap.pixmap = None;
354	}	395	}
		396
355	XSetWindowBackground(display->display, TermWin.vt, PixColors[Color_bg]);	397	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
356		398
357	if (*file != '\0')	399	if (*file != '\0')
358	{	400	{
359	/* XWindowAttributes attr; */	401	/* XWindowAttributes attr; */
360		402
361	/*	403	/*
362	* we already have the required attributes	404	* we already have the required attributes
363	*/	405	*/
364	/* XGetWindowAttributes(display->display, TermWin.vt, &attr); */	406	/* XGetWindowAttributes (dpy, vt, &attr); */
365		407
		408	#ifdef HAVE_AFTERIMAGE
		409	if (asimman == NULL)
		410	asimman = create_generic_imageman(rs[Rs_path]);
		411	if ((f = strchr (file, ';')) == NULL)
		412	original_asim = get_asimage( asimman, file, 0xFFFFFFFF, 100 );
		413	else
		414	{
		415	f = strndup( file, f - file );
		416	original_asim = get_asimage( asimman, f, 0xFFFFFFFF, 100 );
		417	free( f );
		418	}
		419	if (original_asim)
		420	{
		421	bgPixmap.pixmap = asimage2pixmap( display->asv, display->root, original_asim, NULL, True );
		422	xpmAttr.width = original_asim->width ;
		423	xpmAttr.height = original_asim->height ;
		424	}
		425	#else /* HAVE_AFTERIMAGE */
366	xpmAttr.closeness = 30000;	426	xpmAttr.closeness = 30000;
367	xpmAttr.colormap = XCMAP;	427	xpmAttr.colormap = cmap;
368	xpmAttr.visual = XVISUAL;	428	xpmAttr.visual = visual;
369	xpmAttr.depth = XDEPTH;	429	xpmAttr.depth = depth;
370	xpmAttr.valuemask = (XpmCloseness \| XpmColormap \| XpmVisual \|	430	xpmAttr.valuemask = (XpmCloseness \| XpmColormap \| XpmVisual
371	XpmDepth \| XpmSize \| XpmReturnPixels);	431	\| XpmDepth \| XpmSize \| XpmReturnPixels);
372		432
373	/* search environment variables here too */	433	/* search environment variables here too */
374	f = (char *)rxvt_File_find(file, ".xpm", rs[Rs_path]);	434	f = (char *)rxvt_File_find (file, ".xpm", rs[Rs_path]);
375	if (f == NULL	435	if (f == NULL
376	\|\| XpmReadFileToPixmap(display->display, display->root, f,	436	\|\| XpmReadFileToPixmap (dpy, display->root, f,
377	&bgPixmap.pixmap, NULL,	437	&bgPixmap.pixmap, NULL,
378	&xpmAttr))	438	&xpmAttr))
379	{	439	{
380	char *p;	440	char *p;
381		441
382	/* semi-colon delimited */	442	/* semi-colon delimited */
383	if ((p = STRCHR(file, ';')) == NULL)	443	if ((p = strchr (file, ';')) == NULL)
384	p = STRCHR(file, '\0');	444	p = strchr (file, '\0');
385		445
386	rxvt_print_error("couldn't load XPM file \"%.*s\"", (p - file),	446	rxvt_warn ("couldn't load XPM file \"%.*s\", ignoring.\n", (p - file), file);
387	file);
388	}	447	}
389	free(f);	448	free (f);
		449	#endif /* HAVE_AFTERIMAGE */
390	}	450	}
		451
391	resize_pixmap ();	452	resize_pixmap ();
392	return bgPixmap.pixmap;	453	return bgPixmap.pixmap;
393	}	454	}
394		455
395	#endif /* XPM_BACKGROUND */	456	#endif /* XPM_BACKGROUND */

Diff Legend

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

Comparing rxvt-unicode/src/xpm.C (file contents): Revision 1.8 by pcg, Mon Feb 9 07:11:49 2004 UTC vs. Revision 1.38 by sasha, Fri Jun 8 20:04:12 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/xpm.C (file contents):
Revision 1.8 by pcg, Mon Feb 9 07:11:49 2004 UTC vs.
Revision 1.38 by sasha, Fri Jun 8 20:04:12 2007 UTC