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.12 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.20 by root, Wed Jan 26 07:08:15 2005 UTC

… …
61#define MAXLEN_GEOM sizeof("[1000x1000+1000+1000]") 61#define MAXLEN_GEOM sizeof("[1000x1000+1000+1000]")
62 62
63 if (geom == NULL) 63 if (geom == NULL)
64 return 0; 64 return 0;
65 str = (char *)rxvt_malloc (MAXLEN_GEOM + 1); 65 str = (char *)rxvt_malloc (MAXLEN_GEOM + 1);
66 if (!STRCMP (geom, "?")) 66 if (!strcmp (geom, "?"))
67 { 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 process_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 { 80 {
81 STRNCPY (str, geom, n); 81 strncpy (str, geom, n);
82 str[n] = '\0'; 82 str[n] = '\0';
83 83
84 flags = XParseGeometry (str, &x, &y, &w, &h); 84 flags = XParseGeometry (str, &x, &y, &w, &h);
85 if (!flags) 85 if (!flags)
86 { 86 {
… …
168 XFreePixmap (display->display, TermWin.pixmap); 168 XFreePixmap (display->display, TermWin.pixmap);
169 169
170 if (bgPixmap.pixmap == None) 170 if (bgPixmap.pixmap == None)
171 { /* So be it: I'm not using pixmaps */ 171 { /* So be it: I'm not using pixmaps */
172 TermWin.pixmap = None; 172 TermWin.pixmap = None;
173
173 if (! (Options & Opt_transparent) || am_transparent == 0) 174 if (!(options & Opt_transparent) || !am_transparent)
174 XSetWindowBackground (display->display, TermWin.vt, 175 XSetWindowBackground (display->display, TermWin.vt,
175 PixColors[Color_bg]); 176 pix_colors[Color_bg]);
177
176 return; 178 return;
177 } 179 }
178 180
179 gcvalue.foreground = PixColors[Color_bg]; 181 gcvalue.foreground = pix_colors[Color_bg];
180 gc = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 182 gc = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
181 183
182 if (bgPixmap.pixmap != None) 184 if (bgPixmap.pixmap != None)
183 { /* we have a specified pixmap */ 185 { /* we have a specified pixmap */
184 unsigned int w = bgPixmap.w, h = bgPixmap.h, 186 unsigned int w = bgPixmap.w, h = bgPixmap.h,
185 x = bgPixmap.x, y = bgPixmap.y; 187 x = bgPixmap.x, y = bgPixmap.y;
186 unsigned int xpmh = xpmAttr.height, 188 unsigned int xpmh = xpmAttr.height,
187 xpmw = xpmAttr.width; 189 xpmw = xpmAttr.width;
188 190
189 /* 191 /*
190 * don't zoom pixmap too much nor expand really small pixmaps 192 * don't zoom pixmap too much nor expand really small pixmaps
191 */ 193 */
192 if (w > 1000 || h > 1000) 194 if (w > 1000 || h > 1000)
… …
198 if (w == 0) 200 if (w == 0)
199 { 201 {
200 /* basic X tiling - let the X server do it */ 202 /* basic X tiling - let the X server do it */
201 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 203 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
202 xpmw, xpmh, 204 xpmw, xpmh,
203 (unsigned int)XDEPTH); 205 (unsigned int)display->depth);
204 XCopyArea (display->display, bgPixmap.pixmap, TermWin.pixmap, gc, 206 XCopyArea (display->display, bgPixmap.pixmap, TermWin.pixmap, gc,
205 0, 0, xpmw, xpmh, 0, 0); 207 0, 0, xpmw, xpmh, 0, 0);
206 } 208 }
207 else 209 else
208 { 210 {
209 float incr, p; 211 float incr, p;
210 Pixmap tmp; 212 Pixmap tmp;
211 213
212 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 214 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
213 width, height, 215 width, height,
214 (unsigned int)XDEPTH); 216 (unsigned int)display->depth);
215 /* 217 /*
216 * horizontal scaling 218 * horizontal scaling
217 */ 219 */
218 rxvt_pixmap_incr (&w, &x, &incr, &p, width, xpmw); 220 rxvt_pixmap_incr (&w, &x, &incr, &p, width, xpmw);
219 221
220 tmp = XCreatePixmap (display->display, TermWin.vt, 222 tmp = XCreatePixmap (display->display, TermWin.vt,
221 width, xpmh, (unsigned int)XDEPTH); 223 width, xpmh, (unsigned int)display->depth);
222 XFillRectangle (display->display, tmp, gc, 0, 0, width, 224 XFillRectangle (display->display, tmp, gc, 0, 0, width,
223 xpmh); 225 xpmh);
224 226
225 for ( /*nil */ ; x < w; x++, p += incr) 227 for ( /*nil */ ; x < w; x++, p += incr)
226 { 228 {
… …
235 * vertical scaling 237 * vertical scaling
236 */ 238 */
237 rxvt_pixmap_incr (&h, &y, &incr, &p, height, xpmh); 239 rxvt_pixmap_incr (&h, &y, &incr, &p, height, xpmh);
238 240
239 if (y > 0) 241 if (y > 0)
240 XFillRectangle (display->display, TermWin.pixmap, gc, 0, 0, width, 242 XFillRectangle (display->display, TermWin.pixmap, gc, 0, 0, width, y);
241 y); 243
242 if (h < height) 244 if (h < height)
243 XFillRectangle (display->display, TermWin.pixmap, gc, 0, (int)h, 245 XFillRectangle (display->display, TermWin.pixmap, gc, 0, (int)h, width, height - h + 1);
244 width, height - h + 1); 246
245 for ( /*nil */ ; y < h; y++, p += incr) 247 for ( /*nil */ ; y < h; y++, p += incr)
246 { 248 {
247 if (p >= xpmh) 249 if (p >= xpmh)
248 p = 0; 250 p = 0;
251
249 /* copy one row from the tmp pixmap to the main pixmap */ 252 /* copy one row from the tmp pixmap to the main pixmap */
250 XCopyArea (display->display, tmp, TermWin.pixmap, gc, 253 XCopyArea (display->display, tmp, TermWin.pixmap, gc,
251 0, (int)p, width, 1, 0, (int)y); 254 0, (int)p, width, 1, 0, (int)y);
252 } 255 }
256
253 XFreePixmap (display->display, tmp); 257 XFreePixmap (display->display, tmp);
254 } 258 }
255 } 259 }
260
256 XSetWindowBackgroundPixmap (display->display, TermWin.vt, TermWin.pixmap); 261 XSetWindowBackgroundPixmap (display->display, TermWin.vt, TermWin.pixmap);
257 XFreeGC (display->display, gc); 262 XFreeGC (display->display, gc);
258 am_transparent = 0; 263 am_transparent = 0;
259
260 XClearWindow (display->display, TermWin.vt);
261
262 XSync (display->display, False);
263} 264}
264 265
265/* 266/*
266 * Calculate tiling sizes and increments 267 * Calculate tiling sizes and increments
267 * At start, p == 0, incr == xpmwidthheight 268 * At start, p == 0, incr == xpmwidthheight
… …
349 if (bgPixmap.pixmap != None) 350 if (bgPixmap.pixmap != None)
350 { 351 {
351 XFreePixmap (display->display, bgPixmap.pixmap); 352 XFreePixmap (display->display, bgPixmap.pixmap);
352 bgPixmap.pixmap = None; 353 bgPixmap.pixmap = None;
353 } 354 }
355
354 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 356 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]);
355 357
356 if (*file != '\0') 358 if (*file != '\0')
357 { 359 {
358 /* XWindowAttributes attr; */ 360 /* XWindowAttributes attr; */
359 361
… …
361 * we already have the required attributes 363 * we already have the required attributes
362 */ 364 */
363 /* XGetWindowAttributes (display->display, TermWin.vt, &attr); */ 365 /* XGetWindowAttributes (display->display, TermWin.vt, &attr); */
364 366
365 xpmAttr.closeness = 30000; 367 xpmAttr.closeness = 30000;
366 xpmAttr.colormap = XCMAP; 368 xpmAttr.colormap = display->cmap;
367 xpmAttr.visual = XVISUAL; 369 xpmAttr.visual = display->visual;
368 xpmAttr.depth = XDEPTH; 370 xpmAttr.depth = display->depth;
369 xpmAttr.valuemask = (XpmCloseness | XpmColormap | XpmVisual | 371 xpmAttr.valuemask = (XpmCloseness | XpmColormap | XpmVisual |
370 XpmDepth | XpmSize | XpmReturnPixels); 372 XpmDepth | XpmSize | XpmReturnPixels);
371 373
372 /* search environment variables here too */ 374 /* search environment variables here too */
373 f = (char *)rxvt_File_find (file, ".xpm", rs[Rs_path]); 375 f = (char *)rxvt_File_find (file, ".xpm", rs[Rs_path]);
… …
377 &xpmAttr)) 379 &xpmAttr))
378 { 380 {
379 char *p; 381 char *p;
380 382
381 /* semi-colon delimited */ 383 /* semi-colon delimited */
382 if ((p = STRCHR (file, ';')) == NULL) 384 if ((p = strchr (file, ';')) == NULL)
383 p = STRCHR (file, '\0'); 385 p = strchr (file, '\0');
384 386
385 rxvt_warn ("couldn't load XPM file \"%.*s\", ignoring.", (p - file), file); 387 rxvt_warn ("couldn't load XPM file \"%.*s\", ignoring.\n", (p - file), file);
386 } 388 }
387 389
388 free (f); 390 free (f);
389 } 391 }
390 392

Diff Legend

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