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.72 by sasha, Thu Aug 23 20:53:36 2007 UTC vs.
Revision 1.75 by ayin, Mon Aug 27 21:02:41 2007 UTC

582 582
583 if (*file != '\0') 583 if (*file != '\0')
584 { 584 {
585# ifdef HAVE_AFTERIMAGE 585# ifdef HAVE_AFTERIMAGE
586 if (target->asimman == NULL) 586 if (target->asimman == NULL)
587 target->asimman = create_generic_imageman(target->rs[Rs_path]); 587 target->asimman = create_generic_imageman (target->rs[Rs_path]);
588 if ((f = strchr (file, ';')) == NULL) 588 if ((f = strchr (file, ';')) == NULL)
589 original_asim = get_asimage( target->asimman, file, 0xFFFFFFFF, 100 ); 589 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
590 else 590 else
591 { 591 {
592 size_t len = f - file; 592 size_t len = f - file;
593 f = (char *)malloc (len + 1); 593 f = (char *)malloc (len + 1);
594 strncpy (f, file, len); 594 strncpy (f, file, len);
595 f[len] = '\0'; 595 f[len] = '\0';
596 original_asim = get_asimage( target->asimman, f, 0xFFFFFFFF, 100 ); 596 original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100);
597 free( f ); 597 free (f);
598 } 598 }
599 return (original_asim != NULL); 599 return (original_asim != NULL);
600# endif 600# endif
601 } 601 }
602 return false; 602 return false;
611 if (!(flags & isTransparent)) 611 if (!(flags & isTransparent))
612 { 612 {
613 flags |= isTransparent; 613 flags |= isTransparent;
614 return true; 614 return true;
615 } 615 }
616 return false;
616} 617}
617 618
618bool 619bool
619bgPixmap_t::set_blur_radius (const char *geom) 620bgPixmap_t::set_blur_radius (const char *geom)
620{ 621{
1218rxvt_term::get_pixmap_property (int prop_id) 1219rxvt_term::get_pixmap_property (int prop_id)
1219{ 1220{
1220 if (prop_id > 0 && prop_id < NUM_XA) 1221 if (prop_id > 0 && prop_id < NUM_XA)
1221 if (xa[prop_id]) 1222 if (xa[prop_id])
1222 { 1223 {
1223 int aformat, rootdepth; 1224 int aformat;
1224 unsigned long nitems, bytes_after; 1225 unsigned long nitems, bytes_after;
1225 Atom atype; 1226 Atom atype;
1226 unsigned char *prop = NULL; 1227 unsigned char *prop = NULL;
1227 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1228 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1228 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1229 0L, 1L, False, XA_PIXMAP, &atype, &aformat,

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines