ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.339 by root, Tue Dec 7 19:53:20 2010 UTC vs.
Revision 1.340 by sf-exg, Sun Dec 12 19:30:10 2010 UTC

1644} 1644}
1645 1645
1646Pixmap 1646Pixmap
1647rxvt_term::get_pixmap_property (int prop_id) 1647rxvt_term::get_pixmap_property (int prop_id)
1648{ 1648{
1649 Pixmap pixmap = None;
1650
1649 if (prop_id > 0 && prop_id < NUM_XA) 1651 if (prop_id > 0 && prop_id < NUM_XA)
1650 if (xa[prop_id]) 1652 if (xa[prop_id])
1651 { 1653 {
1652 int aformat; 1654 int aformat;
1653 unsigned long nitems, bytes_after; 1655 unsigned long nitems, bytes_after;
1655 unsigned char *prop = NULL; 1657 unsigned char *prop = NULL;
1656 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1658 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1657 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1659 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1658 &nitems, &bytes_after, &prop); 1660 &nitems, &bytes_after, &prop);
1659 if (result == Success && prop && atype == XA_PIXMAP) 1661 if (result == Success && prop && atype == XA_PIXMAP)
1660 return *(Pixmap *)prop; 1662 pixmap = *(Pixmap *)prop;
1663 XFree (prop);
1661 } 1664 }
1662 1665
1663 return None; 1666 return pixmap;
1664} 1667}
1665 1668
1666#ifdef HAVE_BG_PIXMAP 1669#ifdef HAVE_BG_PIXMAP
1667 1670
1668void 1671void

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines