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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.177 by root, Mon Dec 13 07:18:52 2004 UTC vs.
Revision 1.178 by root, Wed Dec 15 00:53:23 2004 UTC

1668 case PropertyNotify: 1668 case PropertyNotify:
1669 /* 1669 /*
1670 * if user used some Esetroot compatible prog to set the root bg, 1670 * if user used some Esetroot compatible prog to set the root bg,
1671 * use the property to determine the pixmap. We use it later on. 1671 * use the property to determine the pixmap. We use it later on.
1672 */ 1672 */
1673 if (xa[XA_XROOTPMAPID] == 0)
1674 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1675
1676 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1673 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1674 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1677 return; 1675 return;
1678 1676
1679 /* FALLTHROUGH */ 1677 /* FALLTHROUGH */
1680 case ReparentNotify: 1678 case ReparentNotify:
1681 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1679 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
2351 /* 2349 /*
2352 * Make the frame window set by the window manager have 2350 * Make the frame window set by the window manager have
2353 * the root background. Some window managers put multiple nested frame 2351 * the root background. Some window managers put multiple nested frame
2354 * windows for each client, so we have to take care about that. 2352 * windows for each client, so we have to take care about that.
2355 */ 2353 */
2356 i = (xa[XA_XROOTPMAPID] 2354 i = (xa[XA_XROOTPMAP_ID]
2357 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2355 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID],
2358 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2356 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2359 &nitems, &bytes_after, &prop) == Success); 2357 &nitems, &bytes_after, &prop) == Success);
2360 2358
2361 if (!i || prop == NULL) 2359 if (!i || prop == NULL)
2362 i = (xa[XA_XSETROOTID] 2360 i = (xa[XA_ESETROOT_PMAP_ID]
2363 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2361 && XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID],
2364 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2362 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2365 &nitems, &bytes_after, &prop) == Success); 2363 &nitems, &bytes_after, &prop) == Success);
2366 2364
2367 if (!i || prop == NULL 2365 if (!i || prop == NULL
2368#if TINTING 2366#if TINTING

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines