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.40 by ayin, Wed Jun 20 13:46:25 2007 UTC vs.
Revision 1.41 by root, Tue Jun 26 00:40:19 2007 UTC

191 191
192 if (bgPixmap.pixmap == None) 192 if (bgPixmap.pixmap == None)
193 { /* So be it: I'm not using pixmaps */ 193 { /* So be it: I'm not using pixmaps */
194 pixmap = None; 194 pixmap = None;
195 195
196#ifdef TRANSPARENT 196#ifdef ENABLE_TRANSPARENCY
197 if (!option (Opt_transparent) || !am_transparent) 197 if (!option (Opt_transparent) || !am_transparent)
198#endif 198#endif
199 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 199 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
200 200
201 return; 201 return;
235 XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, 0, y, x, xpmh - y, xpmw - x, 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); 236 XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, 0, 0, x, y, xpmw - x, xpmh - y);
237 } 237 }
238 else 238 else
239#ifdef HAVE_AFTERIMAGE 239#ifdef HAVE_AFTERIMAGE
240#ifdef TRANSPARENT 240#ifdef ENABLE_TRANSPARENCY
241 if (!option(Opt_transparent) || !am_transparent) 241 if (!option(Opt_transparent) || !am_transparent)
242 /* will do that in check_our_parents otherwise */ 242 /* will do that in check_our_parents otherwise */
243#endif 243#endif
244 { 244 {
245 ASImage *scaled_im = scale_asimage( display->asv, original_asim, w, h, ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT ); 245 ASImage *scaled_im = scale_asimage( display->asv, original_asim, w, h, ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT );
298 } 298 }
299 299
300 XSetWindowBackgroundPixmap (dpy, vt, pixmap); 300 XSetWindowBackgroundPixmap (dpy, vt, pixmap);
301 301
302 XFreeGC (dpy, gc); 302 XFreeGC (dpy, gc);
303#ifdef TRANSPARENT 303#ifdef ENABLE_TRANSPARENCY
304 am_transparent = 0; 304 am_transparent = 0;
305#endif 305#endif
306} 306}
307 307
308/* 308/*
453 return bgPixmap.pixmap; 453 return bgPixmap.pixmap;
454} 454}
455 455
456#endif /* XPM_BACKGROUND */ 456#endif /* XPM_BACKGROUND */
457 457
458#ifdef TRANSPARENT 458#ifdef ENABLE_TRANSPARENCY
459#if TINTING && !defined(HAVE_AFTERIMAGE) 459#if TINTING && !defined(HAVE_AFTERIMAGE)
460/* taken from aterm-0.4.2 */ 460/* taken from aterm-0.4.2 */
461 461
462typedef uint32_t RUINT32T; 462typedef uint32_t RUINT32T;
463 463

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines