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.341 by sf-exg, Sun Dec 12 23:13:29 2010 UTC vs.
Revision 1.342 by sf-exg, Sun Dec 19 00:49:32 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines