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.529 by sf-exg, Sun Dec 30 15:05:19 2012 UTC vs.
Revision 1.532 by sf-exg, Mon Dec 31 12:05:34 2012 UTC

1472 bool moved = false; 1472 bool moved = false;
1473#ifdef HAVE_BG_PIXMAP 1473#ifdef HAVE_BG_PIXMAP
1474 if (bg_window_position_sensitive ()) 1474 if (bg_window_position_sensitive ())
1475 { 1475 {
1476 want_position_change = true; 1476 want_position_change = true;
1477 if (!(bg_flags & BG_IS_VALID)) 1477 if (bg_img == 0)
1478 moved = true; 1478 moved = true;
1479 } 1479 }
1480#endif 1480#endif
1481 1481
1482 if (want_position_change) 1482 if (want_position_change)
1536 // defer bg image updates if the window is not mapped. The 1536 // defer bg image updates if the window is not mapped. The
1537 // short delay is to optimize for multiple ConfigureNotify 1537 // short delay is to optimize for multiple ConfigureNotify
1538 // events at startup when the window manager reparents the 1538 // events at startup when the window manager reparents the
1539 // window, so as to perform the computation after we have 1539 // window, so as to perform the computation after we have
1540 // received all of them. 1540 // received all of them.
1541 if (!(bg_flags & BG_IS_VALID)) 1541 if (bg_img == 0)
1542 update_background_ev.start (0.025); 1542 update_background_ev.start (0.025);
1543#endif 1543#endif
1544 mapped = 1; 1544 mapped = 1;
1545#ifdef TEXT_BLINK 1545#ifdef TEXT_BLINK
1546 text_blink_ev.start (); 1546 text_blink_ev.start ();
1854 */ 1854 */
1855 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1855 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1856 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1856 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1857 { 1857 {
1858#if BG_IMAGE_FROM_ROOT 1858#if BG_IMAGE_FROM_ROOT
1859 bg_set_root_pixmap (); 1859 if (option (Opt_transparent))
1860 {
1861 rxvt_img::new_from_root (this)->replace (root_img);
1860 update_background (); 1862 update_background ();
1863 }
1861#endif 1864#endif
1862#if ENABLE_PERL 1865#if ENABLE_PERL
1863 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END)); 1866 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1864#endif 1867#endif
1865 } 1868 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines