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.46 by sasha, Thu Jul 12 22:33:16 2007 UTC vs.
Revision 1.47 by root, Tue Jul 24 14:31:45 2007 UTC

388#ifdef ENABLE_TRANSPARENCY 388#ifdef ENABLE_TRANSPARENCY
389 if (!option(Opt_transparent) || !am_transparent) 389 if (!option(Opt_transparent) || !am_transparent)
390 /* will do that in check_our_parents otherwise */ 390 /* will do that in check_our_parents otherwise */
391#endif 391#endif
392 { 392 {
393 ASImage *scaled_im = scale_asimage( asv, original_asim, w, h, ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT ); 393 ASImage *scaled_im = scale_asimage (asv, original_asim, w, h, ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
394 if (scaled_im) 394 if (scaled_im)
395 { 395 {
396 pixmap = AFTERIMAGE_DPY_OP(asimage2pixmap( asv, display->root, scaled_im, gc, True )); 396 pixmap = AFTERIMAGE_DPY_OP (asimage2pixmap(asv, display->root, scaled_im, gc, True));
397 destroy_asimage( &scaled_im ); 397 destroy_asimage (&scaled_im);
398 } 398 }
399 } 399 }
400#else /* HAVE_AFTERIMAGE */ 400#else /* HAVE_AFTERIMAGE */
401 { 401 {
402 float incr, p; 402 float incr, p;
491 original_asim = get_asimage( asimman, f, 0xFFFFFFFF, 100 ); 491 original_asim = get_asimage( asimman, f, 0xFFFFFFFF, 100 );
492 free( f ); 492 free( f );
493 } 493 }
494 if (original_asim) 494 if (original_asim)
495 { 495 {
496 bgPixmap.pixmap = AFTERIMAGE_DPY_OP(asimage2pixmap( asv, display->root, original_asim, NULL, True )); 496 bgPixmap.pixmap = AFTERIMAGE_DPY_OP (asimage2pixmap (asv, display->root, original_asim, NULL, True));
497 xpmAttr.width = original_asim->width ; 497 xpmAttr.width = original_asim->width ;
498 xpmAttr.height = original_asim->height ; 498 xpmAttr.height = original_asim->height ;
499 } 499 }
500#else /* HAVE_AFTERIMAGE */ 500#else /* HAVE_AFTERIMAGE */
501 xpmAttr.closeness = 30000; 501 xpmAttr.closeness = 30000;
901 }}while(0) 901 }}while(0)
902 902
903 MAKE_ROOTPMAP_GEOM(x,w,width); 903 MAKE_ROOTPMAP_GEOM(x,w,width);
904 MAKE_ROOTPMAP_GEOM(y,h,height); 904 MAKE_ROOTPMAP_GEOM(y,h,height);
905 905
906 layers[0].im = AFTERIMAGE_DPY_OP(pixmap2asimage (asv, rootpixmap, back_x, back_y, back_w, back_h, AllPlanes, ASA_ASImage, 100)); 906 layers[0].im = AFTERIMAGE_DPY_OP (pixmap2asimage (asv, rootpixmap, back_x, back_y, back_w, back_h, AllPlanes, ASA_ASImage, 100));
907 layers[0].clip_x = (back_w == pmap_w)?root_x:0; 907 layers[0].clip_x = (back_w == pmap_w)?root_x:0;
908 layers[0].clip_y = (back_h == pmap_h)?root_y:0; 908 layers[0].clip_y = (back_h == pmap_h)?root_y:0;
909 layers[0].clip_width = szHint.width; 909 layers[0].clip_width = szHint.width;
910 layers[0].clip_height = szHint.height; 910 layers[0].clip_height = szHint.height;
911 layers[0].tint = tint; 911 layers[0].tint = tint;
959 if (layers[1].im != original_asim) 959 if (layers[1].im != original_asim)
960 destroy_asimage( &(layers[1].im) ); 960 destroy_asimage( &(layers[1].im) );
961 destroy_asimage( &(layers[0].im) ); 961 destroy_asimage( &(layers[0].im) );
962 if (merged_im != NULL) 962 if (merged_im != NULL)
963 { 963 {
964 tmp_pmap = AFTERIMAGE_DPY_OP(asimage2pixmap( asv, DefaultRootWindow(dpy), merged_im, gc, True )); 964 tmp_pmap = AFTERIMAGE_DPY_OP (asimage2pixmap (asv, DefaultRootWindow(dpy), merged_im, gc, True));
965 destroy_asimage( &merged_im ); 965 destroy_asimage( &merged_im );
966 } 966 }
967 free( layers ); 967 free( layers );
968 } 968 }
969 } 969 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines