ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/xpm.C
(Generate patch)

Comparing rxvt-unicode/src/xpm.C (file contents):
Revision 1.6 by pcg, Sat Jan 31 02:15:02 2004 UTC vs.
Revision 1.21 by root, Fri Feb 4 11:41:23 2005 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: xpm.c 2 * File: xpm.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: xpm.C,v 1.6 2004/01/31 02:15:02 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>
… …
50 * @ `?' 49 * @ `?'
51 */ 50 */
52int 51int
53rxvt_term::scale_pixmap (const char *geom) 52rxvt_term::scale_pixmap (const char *geom)
54{ 53{
55 int flags, changed = 0; 54 int flags, changed = 0;
56 int x = 0, y = 0; 55 int x = 0, y = 0;
57 unsigned int w = 0, h = 0; 56 unsigned int w = 0, h = 0;
58 unsigned int n; 57 unsigned int n;
59 char *p, *str; 58 char *p, *str;
60 bgPixmap_t *bgpixmap = &(bgPixmap); 59 bgPixmap_t *bgpixmap = & (bgPixmap);
61 60
62#define MAXLEN_GEOM sizeof("[1000x1000+1000+1000]") 61#define MAXLEN_GEOM sizeof("[1000x1000+1000+1000]")
63 62
64 if (geom == NULL) 63 if (geom == NULL)
65 return 0; 64 return 0;
66 str = (char *)rxvt_malloc (MAXLEN_GEOM + 1); 65 str = (char *)rxvt_malloc (MAXLEN_GEOM + 1);
67 if (!STRCMP(geom, "?")) { 66 if (!strcmp (geom, "?"))
67 {
68 sprintf(str, "[%dx%d+%d+%d]", /* can't presume snprintf() ! */ 68 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
69 min(bgpixmap->w, 9999), min(bgpixmap->h, 9999), 69 min (bgpixmap->w, 9999), min (bgpixmap->h, 9999),
70 min(bgpixmap->x, 9999), min(bgpixmap->y, 9999)); 70 min (bgpixmap->x, 9999), min (bgpixmap->y, 9999));
71 xterm_seq (XTerm_title, str, CHAR_ST); 71 process_xterm_seq (XTerm_title, str, CHAR_ST);
72 free(str); 72 free (str);
73 return 0; 73 return 0;
74 } 74 }
75 75
76 if ((p = STRCHR(geom, ';')) == NULL) 76 if ((p = strchr (geom, ';')) == NULL)
77 p = STRCHR(geom, '\0'); 77 p = strchr (geom, '\0');
78 n = (p - geom); 78 n = (p - geom);
79 if (n <= MAXLEN_GEOM) { 79 if (n <= MAXLEN_GEOM)
80 STRNCPY(str, geom, n); 80 {
81 strncpy (str, geom, n);
81 str[n] = '\0'; 82 str[n] = '\0';
82 83
83 flags = XParseGeometry(str, &x, &y, &w, &h); 84 flags = XParseGeometry (str, &x, &y, &w, &h);
84 if (!flags) { 85 if (!flags)
86 {
85 flags |= WidthValue; 87 flags |= WidthValue;
86 w = 0; 88 w = 0;
87 } /* default is tile */ 89 } /* default is tile */
88 if (flags & WidthValue) { 90 if (flags & WidthValue)
91 {
92 if (! (flags & XValue))
93 x = 50;
94 if (! (flags & HeightValue))
95 h = w;
96 if (w && !h)
97 {
98 w = (bgpixmap->w * w) / 100;
99 h = bgpixmap->h;
100 }
101 else if (h && !w)
102 {
103 w = bgpixmap->w;
104 h = (bgpixmap->h * h) / 100;
105 }
106 if (w > 1000)
107 w = 1000;
108 if (h > 1000)
109 h = 1000;
110 if (bgpixmap->w != (short)w)
111 {
112 bgpixmap->w = (short)w;
113 changed++;
114 }
115 if (bgpixmap->h != (short)h)
116 {
117 bgpixmap->h = (short)h;
118 changed++;
119 }
120 }
89 if (!(flags & XValue)) 121 if (! (flags & YValue))
90 x = 50; 122 {
91 if (!(flags & HeightValue)) 123 if (flags & XNegative)
92 h = w; 124 flags |= YNegative;
93 if (w && !h) { 125 y = x;
94 w = (bgpixmap->w * w) / 100; 126 }
95 h = bgpixmap->h; 127
96 } else if (h && !w) { 128 if (! (flags & WidthValue) && geom[0] != '=')
97 w = bgpixmap->w; 129 {
98 h = (bgpixmap->h * h) / 100; 130 x += bgpixmap->x;
131 y += bgpixmap->y;
132 }
133 else
134 {
135 if (flags & XNegative)
136 x += 100;
137 if (flags & YNegative)
138 y += 100;
139 }
140 MIN_IT (x, 100);
141 MIN_IT (y, 100);
142 MAX_IT (x, 0);
143 MAX_IT (y, 0);
144 if (bgpixmap->x != x)
145 {
146 bgpixmap->x = x;
147 changed++;
148 }
149 if (bgpixmap->y != y)
150 {
151 bgpixmap->y = y;
152 changed++;
153 }
99 } 154 }
100 if (w > 1000)
101 w = 1000;
102 if (h > 1000)
103 h = 1000;
104 if (bgpixmap->w != (short)w) {
105 bgpixmap->w = (short)w;
106 changed++;
107 }
108 if (bgpixmap->h != (short)h) {
109 bgpixmap->h = (short)h;
110 changed++;
111 }
112 }
113 if (!(flags & YValue)) {
114 if (flags & XNegative)
115 flags |= YNegative;
116 y = x;
117 }
118
119 if (!(flags & WidthValue) && geom[0] != '=') {
120 x += bgpixmap->x;
121 y += bgpixmap->y;
122 } else {
123 if (flags & XNegative)
124 x += 100;
125 if (flags & YNegative)
126 y += 100;
127 }
128 MIN_IT(x, 100);
129 MIN_IT(y, 100);
130 MAX_IT(x, 0);
131 MAX_IT(y, 0);
132 if (bgpixmap->x != x) {
133 bgpixmap->x = x;
134 changed++;
135 }
136 if (bgpixmap->y != y) {
137 bgpixmap->y = y;
138 changed++;
139 }
140 }
141 free(str); 155 free (str);
142 return changed; 156 return changed;
143} 157}
144 158
145void 159void
146rxvt_term::resize_pixmap () 160rxvt_term::resize_pixmap ()
147{ 161{
148 XGCValues gcvalue; 162 XGCValues gcvalue;
149 GC gc; 163 GC gc;
150 unsigned int width = TermWin_TotalWidth(); 164 unsigned int width = TermWin_TotalWidth ();
151 unsigned int height = TermWin_TotalHeight(); 165 unsigned int height = TermWin_TotalHeight ();
166 dDisp;
152 167
153 if (TermWin.pixmap != None) 168 if (TermWin.pixmap != None)
154 XFreePixmap(Xdisplay, TermWin.pixmap); 169 XFreePixmap (disp, TermWin.pixmap);
155 170
156 if (bgPixmap.pixmap == None) { /* So be it: I'm not using pixmaps */ 171 if (bgPixmap.pixmap == None)
172 { /* So be it: I'm not using pixmaps */
157 TermWin.pixmap = None; 173 TermWin.pixmap = None;
174
158 if (!(Options & Opt_transparent) || am_transparent == 0) 175 if (!(options & Opt_transparent) || !am_transparent)
159 XSetWindowBackground(Xdisplay, TermWin.vt, 176 XSetWindowBackground (disp, TermWin.vt,
160 PixColors[Color_bg]); 177 pix_colors[Color_bg]);
161 return;
162 }
163 178
179 return;
180 }
181
164 gcvalue.foreground = PixColors[Color_bg]; 182 gcvalue.foreground = pix_colors[Color_bg];
165 gc = XCreateGC(Xdisplay, TermWin.vt, GCForeground, &gcvalue); 183 gc = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
166 184
167 if (bgPixmap.pixmap != None) { /* we have a specified pixmap */ 185 if (bgPixmap.pixmap != None)
186 { /* we have a specified pixmap */
168 unsigned int w = bgPixmap.w, h = bgPixmap.h, 187 unsigned int w = bgPixmap.w, h = bgPixmap.h,
169 x = bgPixmap.x, y = bgPixmap.y; 188 x = bgPixmap.x, y = bgPixmap.y;
170 unsigned int xpmh = xpmAttr.height, 189 unsigned int xpmh = xpmAttr.height,
171 xpmw = xpmAttr.width; 190 xpmw = xpmAttr.width;
172 191
173 /* 192 /*
174 * don't zoom pixmap too much nor expand really small pixmaps 193 * don't zoom pixmap too much nor expand really small pixmaps
175 */ 194 */
176 if (w > 1000 || h > 1000) 195 if (w > 1000 || h > 1000)
177 w = 1; 196 w = 1;
178 else if (width > (10 * xpmw) 197 else if (width > (10 * xpmw)
179 || height > (10 * xpmh)) 198 || height > (10 * xpmh))
180 w = 0; /* tile */ 199 w = 0; /* tile */
181 200
182 if (w == 0) { 201 if (w == 0)
202 {
183 /* basic X tiling - let the X server do it */ 203 /* basic X tiling - let the X server do it */
184 TermWin.pixmap = XCreatePixmap(Xdisplay, TermWin.vt, 204 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
185 xpmw, xpmh, 205 xpmw, xpmh,
186 (unsigned int)XDEPTH); 206 (unsigned int)display->depth);
187 XCopyArea(Xdisplay, bgPixmap.pixmap, TermWin.pixmap, gc, 207 XCopyArea (disp, bgPixmap.pixmap, TermWin.pixmap, gc,
188 0, 0, xpmw, xpmh, 0, 0); 208 0, 0, xpmw, xpmh, 0, 0);
189 } else { 209 }
210 else
211 {
190 float incr, p; 212 float incr, p;
191 Pixmap tmp; 213 Pixmap tmp;
192 214
193 TermWin.pixmap = XCreatePixmap(Xdisplay, TermWin.vt, 215 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
194 width, height, 216 width, height,
195 (unsigned int)XDEPTH); 217 (unsigned int)display->depth);
196 /* 218 /*
197 * horizontal scaling 219 * horizontal scaling
198 */ 220 */
199 rxvt_pixmap_incr(&w, &x, &incr, &p, width, xpmw); 221 rxvt_pixmap_incr (&w, &x, &incr, &p, width, xpmw);
200 222
201 tmp = XCreatePixmap(Xdisplay, TermWin.vt, 223 tmp = XCreatePixmap (disp, TermWin.vt,
202 width, xpmh, (unsigned int)XDEPTH); 224 width, xpmh, (unsigned int)display->depth);
203 XFillRectangle(Xdisplay, tmp, gc, 0, 0, width, 225 XFillRectangle (disp, tmp, gc, 0, 0, width,
204 xpmh); 226 xpmh);
205 227
206 for ( /*nil */ ; x < w; x++, p += incr) { 228 for ( /*nil */ ; x < w; x++, p += incr)
207 if (p >= xpmw) 229 {
208 p = 0; 230 if (p >= xpmw)
231 p = 0;
209 /* copy one column from the original pixmap to the tmp pixmap */ 232 /* copy one column from the original pixmap to the tmp pixmap */
210 XCopyArea(Xdisplay, bgPixmap.pixmap, tmp, gc, 233 XCopyArea (disp, bgPixmap.pixmap, tmp, gc,
211 (int)p, 0, 1, xpmh, (int)x, 0); 234 (int)p, 0, 1, xpmh, (int)x, 0);
212 } 235 }
213 236
214 /* 237 /*
215 * vertical scaling 238 * vertical scaling
216 */ 239 */
217 rxvt_pixmap_incr(&h, &y, &incr, &p, height, xpmh); 240 rxvt_pixmap_incr (&h, &y, &incr, &p, height, xpmh);
218 241
219 if (y > 0) 242 if (y > 0)
220 XFillRectangle(Xdisplay, TermWin.pixmap, gc, 0, 0, width, 243 XFillRectangle (disp, TermWin.pixmap, gc, 0, 0, width, y);
221 y); 244
222 if (h < height) 245 if (h < height)
223 XFillRectangle(Xdisplay, TermWin.pixmap, gc, 0, (int)h, 246 XFillRectangle (disp, TermWin.pixmap, gc, 0, (int)h, width, height - h + 1);
224 width, height - h + 1); 247
225 for ( /*nil */ ; y < h; y++, p += incr) { 248 for ( /*nil */ ; y < h; y++, p += incr)
226 if (p >= xpmh) 249 {
227 p = 0; 250 if (p >= xpmh)
251 p = 0;
252
228 /* copy one row from the tmp pixmap to the main pixmap */ 253 /* copy one row from the tmp pixmap to the main pixmap */
229 XCopyArea(Xdisplay, tmp, TermWin.pixmap, gc, 254 XCopyArea (disp, tmp, TermWin.pixmap, gc,
230 0, (int)p, width, 1, 0, (int)y); 255 0, (int)p, width, 1, 0, (int)y);
256 }
257
258 XFreePixmap (disp, tmp);
259 }
231 } 260 }
232 XFreePixmap(Xdisplay, tmp); 261
233 }
234 }
235 XSetWindowBackgroundPixmap(Xdisplay, TermWin.vt, TermWin.pixmap); 262 XSetWindowBackgroundPixmap (disp, TermWin.vt, TermWin.pixmap);
236 XFreeGC(Xdisplay, gc); 263 XFreeGC (disp, gc);
237 am_transparent = 0; 264 am_transparent = 0;
238
239 XClearWindow(Xdisplay, TermWin.vt);
240
241 XSync(Xdisplay, False);
242} 265}
243 266
244/* 267/*
245 * Calculate tiling sizes and increments 268 * Calculate tiling sizes and increments
246 * At start, p == 0, incr == xpmwidthheight 269 * At start, p == 0, incr == xpmwidthheight
247 */ 270 */
248/* INTPROTO */ 271/* INTPROTO */
249static void 272static void
250rxvt_pixmap_incr(unsigned int *wh, unsigned int *xy, float *incr, float *p, unsigned int widthheight, unsigned int xpmwidthheight) 273rxvt_pixmap_incr (unsigned int *wh, unsigned int *xy, float *incr, float *p, unsigned int widthheight, unsigned int xpmwidthheight)
251{ 274{
252 unsigned int cwh, cxy; 275 unsigned int cwh, cxy;
253 float cincr, cp; 276 float cincr, cp;
254 277
255 cp = 0; 278 cp = 0;
256 cincr = (float)xpmwidthheight; 279 cincr = (float)xpmwidthheight;
257 cxy = *xy; 280 cxy = *xy;
258 cwh = *wh; 281 cwh = *wh;
282 if (cwh == 1)
259 if (cwh == 1) { /* display one image, no horizontal/vertical scaling */ 283 { /* display one image, no horizontal/vertical scaling */
260 cincr = (float)widthheight; 284 cincr = (float)widthheight;
261 if (xpmwidthheight <= widthheight) { 285 if (xpmwidthheight <= widthheight)
286 {
262 cwh = xpmwidthheight; 287 cwh = xpmwidthheight;
263 cxy = (cxy * (widthheight - cwh)) / 100; /* beware! order */ 288 cxy = (cxy * (widthheight - cwh)) / 100; /* beware! order */
264 cwh += cxy; 289 cwh += cxy;
265 } else { 290 }
291 else
292 {
293 cxy = 0;
294 cwh = widthheight;
295 }
296 }
297 else if (cwh < 10)
298 { /* fit WH images across/down screen */
299 cincr *= cwh;
266 cxy = 0; 300 cxy = 0;
267 cwh = widthheight; 301 cwh = widthheight;
268 } 302 }
269 } else if (cwh < 10) { /* fit WH images across/down screen */ 303 else
270 cincr *= cwh; 304 {
271 cxy = 0;
272 cwh = widthheight;
273 } else {
274 cincr *= 100.0 / cwh; 305 cincr *= 100.0 / cwh;
275 if (cwh < 100) { /* contract */ 306 if (cwh < 100)
307 { /* contract */
276 float pos; 308 float pos;
277 309
278 cwh = (cwh * widthheight) / 100; 310 cwh = (cwh * widthheight) / 100;
279 pos = (float)cxy / 100 * widthheight - (cwh / 2); 311 pos = (float)cxy / 100 * widthheight - (cwh / 2);
280 312
281 cxy = (widthheight - cwh); 313 cxy = (widthheight - cwh);
282 if (pos <= 0) 314 if (pos <= 0)
283 cxy = 0; 315 cxy = 0;
284 else if (pos < cxy) 316 else if (pos < cxy)
285 cxy = (int) pos; 317 cxy = (int) pos;
286 cwh += cxy; 318 cwh += cxy;
287 } else { /* expand */ 319 }
288 if (cxy > 0) { /* position */ 320 else
289 float pos; 321 { /* expand */
322 if (cxy > 0)
323 { /* position */
324 float pos;
290 325
291 pos = (float)cxy / 100 * xpmwidthheight - (cincr / 2); 326 pos = (float)cxy / 100 * xpmwidthheight - (cincr / 2);
292 cp = xpmwidthheight - cincr; 327 cp = xpmwidthheight - cincr;
293 if (pos <= 0) 328 if (pos <= 0)
294 cp = 0; 329 cp = 0;
295 else if (pos < cp) 330 else if (pos < cp)
296 cp = pos; 331 cp = pos;
332 }
333 cxy = 0;
334 cwh = widthheight;
335 }
297 } 336 }
298 cxy = 0;
299 cwh = widthheight;
300 }
301 }
302 cincr /= widthheight; 337 cincr /= widthheight;
303 *wh = cwh; 338 *wh = cwh;
304 *xy = cxy; 339 *xy = cxy;
305 *incr = cincr; 340 *incr = cincr;
306 *p = cp; 341 *p = cp;
307} 342}
308 343
309Pixmap 344Pixmap
310rxvt_term::set_bgPixmap (const char *file) 345rxvt_term::set_bgPixmap (const char *file)
311{ 346{
312 char *f; 347 char *f;
313 348
314 assert(file != NULL); 349 assert (file != NULL);
315 350
316 if (bgPixmap.pixmap != None) { 351 if (bgPixmap.pixmap != None)
352 {
317 XFreePixmap(Xdisplay, bgPixmap.pixmap); 353 XFreePixmap (display->display, bgPixmap.pixmap);
318 bgPixmap.pixmap = None; 354 bgPixmap.pixmap = None;
319 } 355 }
356
320 XSetWindowBackground(Xdisplay, TermWin.vt, PixColors[Color_bg]); 357 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]);
321 358
322 if (*file != '\0') { 359 if (*file != '\0')
360 {
323/* XWindowAttributes attr; */ 361 /* XWindowAttributes attr; */
324 362
325 /* 363 /*
326 * we already have the required attributes 364 * we already have the required attributes
327 */ 365 */
328/* XGetWindowAttributes(Xdisplay, TermWin.vt, &attr); */ 366 /* XGetWindowAttributes (display->display, TermWin.vt, &attr); */
329 367
330 xpmAttr.closeness = 30000; 368 xpmAttr.closeness = 30000;
331 xpmAttr.colormap = XCMAP; 369 xpmAttr.colormap = display->cmap;
332 xpmAttr.visual = XVISUAL; 370 xpmAttr.visual = display->visual;
333 xpmAttr.depth = XDEPTH; 371 xpmAttr.depth = display->depth;
334 xpmAttr.valuemask = (XpmCloseness | XpmColormap | XpmVisual | 372 xpmAttr.valuemask = (XpmCloseness | XpmColormap | XpmVisual |
335 XpmDepth | XpmSize | XpmReturnPixels); 373 XpmDepth | XpmSize | XpmReturnPixels);
336 374
337 /* search environment variables here too */ 375 /* search environment variables here too */
338 f = (char *)rxvt_File_find(file, ".xpm", rs[Rs_path]); 376 f = (char *)rxvt_File_find (file, ".xpm", rs[Rs_path]);
339 if (f == NULL 377 if (f == NULL
340 || XpmReadFileToPixmap(Xdisplay, Xroot, f, 378 || XpmReadFileToPixmap (display->display, display->root, f,
341 &bgPixmap.pixmap, NULL, 379 &bgPixmap.pixmap, NULL,
342 &xpmAttr)) { 380 &xpmAttr))
343 char *p; 381 {
382 char *p;
344 383
345 /* semi-colon delimited */ 384 /* semi-colon delimited */
346 if ((p = STRCHR(file, ';')) == NULL) 385 if ((p = strchr (file, ';')) == NULL)
347 p = STRCHR(file, '\0'); 386 p = strchr (file, '\0');
348 387
349 rxvt_print_error("couldn't load XPM file \"%.*s\"", (p - file), 388 rxvt_warn ("couldn't load XPM file \"%.*s\", ignoring.\n", (p - file), file);
350 file); 389 }
351 } 390
352 free(f); 391 free (f);
353 } 392 }
393
354 resize_pixmap (); 394 resize_pixmap ();
355 return bgPixmap.pixmap; 395 return bgPixmap.pixmap;
356} 396}
357 397
358#endif /* XPM_BACKGROUND */ 398#endif /* XPM_BACKGROUND */

Diff Legend

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