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.35 by root, Fri Aug 18 23:03:31 2006 UTC vs.
Revision 1.37 by root, Tue May 1 21:30:01 2007 UTC

175 175
176 if (bgPixmap.pixmap == None) 176 if (bgPixmap.pixmap == None)
177 { /* So be it: I'm not using pixmaps */ 177 { /* So be it: I'm not using pixmaps */
178 pixmap = None; 178 pixmap = None;
179 179
180#ifdef TRANSPARENT
180 if (!OPTION (Opt_transparent) || !am_transparent) 181 if (!option (Opt_transparent) || !am_transparent)
182#endif
181 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 183 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
182 184
183 return; 185 return;
184 } 186 }
185 187
260 } 262 }
261 263
262 XSetWindowBackgroundPixmap (dpy, vt, pixmap); 264 XSetWindowBackgroundPixmap (dpy, vt, pixmap);
263 265
264 XFreeGC (dpy, gc); 266 XFreeGC (dpy, gc);
267#ifdef TRANSPARENT
265 am_transparent = 0; 268 am_transparent = 0;
269#endif
266} 270}
267 271
268/* 272/*
269 * Calculate tiling sizes and increments 273 * Calculate tiling sizes and increments
270 * At start, p == 0, incr == xpmwidthheight 274 * At start, p == 0, incr == xpmwidthheight

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines