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.245 by sasha, Fri Aug 17 22:02:14 2007 UTC vs.
Revision 1.246 by sasha, Mon Aug 20 20:13:35 2007 UTC

540 bgPixmap.set_geometry (p); 540 bgPixmap.set_geometry (p);
541 } 541 }
542 else 542 else
543 bgPixmap.set_defaultGeometry (); 543 bgPixmap.set_defaultGeometry ();
544 544
545 bgPixmap.set_file (rs[Rs_backgroundPixmap]); 545 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
546 if (!option (Opt_transparent))
547 update_background ();
546 } 548 }
547 /* do not want to render Pixmap yet if we are size/position dependant -
548 * wait for ConfigureNotify at least
549 * TODO: this does not work for some reason when transparency is disabled !!!!
550 */
551 if (!bgPixmap.window_size_sensitive ())
552 update_background ();
553#endif 549#endif
554 } 550 }
555#endif 551#endif
556 552
557#if ENABLE_PERL 553#if ENABLE_PERL
1149 XMoveResizeWindow (dpy, vt, 1145 XMoveResizeWindow (dpy, vt,
1150 window_vt_x, window_vt_y, 1146 window_vt_x, window_vt_y,
1151 width, height); 1147 width, height);
1152 1148
1153#ifdef XPM_BACKGROUND 1149#ifdef XPM_BACKGROUND
1154 /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
1155 if (bgPixmap.window_size_sensitive ()) 1150 if (bgPixmap.window_size_sensitive ())
1156 update_background (); 1151 update_background ();
1157#endif 1152#endif
1158 1153
1159 scr_clear (); 1154 scr_clear ();

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines