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.242 by sasha, Wed Aug 15 22:41:52 2007 UTC vs.
Revision 1.243 by sasha, Thu Aug 16 21:26:20 2007 UTC

151rxvt_term::rxvt_term () 151rxvt_term::rxvt_term ()
152 : 152 :
153#if ENABLE_TRANSPARENCY || ENABLE_PERL 153#if ENABLE_TRANSPARENCY || ENABLE_PERL
154 rootwin_ev (this, &rxvt_term::rootwin_cb), 154 rootwin_ev (this, &rxvt_term::rootwin_cb),
155#endif 155#endif
156#if ENABLE_TRANSPARENCY 156#if HAVE_BG_PIXMAP
157 check_our_parents_ev(this, &rxvt_term::check_our_parents_cb), 157 update_background_ev(this, &rxvt_term::update_background_cb),
158#endif 158#endif
159#ifdef HAVE_SCROLLBARS 159#ifdef HAVE_SCROLLBARS
160 scrollbar_ev (this, &rxvt_term::x_cb), 160 scrollbar_ev (this, &rxvt_term::x_cb),
161#endif 161#endif
162#ifdef CURSOR_BLINK 162#ifdef CURSOR_BLINK
506 if (option (Opt_scrollBar)) 506 if (option (Opt_scrollBar))
507 resize_scrollbar (); /* create and map scrollbar */ 507 resize_scrollbar (); /* create and map scrollbar */
508#endif 508#endif
509#ifdef HAVE_BG_PIXMAP 509#ifdef HAVE_BG_PIXMAP
510 { 510 {
511 bool changed = false;
512 bgPixmap.set_target (this); 511 bgPixmap.set_target (this);
513 512
514#ifdef ENABLE_TRANSPARENCY 513#ifdef ENABLE_TRANSPARENCY
515 if (option (Opt_transparent)) 514 if (option (Opt_transparent))
516 { 515 {
521#endif 520#endif
522 if (ISSET_PIXCOLOR (Color_tint)) 521 if (ISSET_PIXCOLOR (Color_tint))
523 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 522 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
524 if (rs [Rs_shade]) 523 if (rs [Rs_shade])
525 bgPixmap.set_shade (rs [Rs_shade]); 524 bgPixmap.set_shade (rs [Rs_shade]);
526 changed = true;
527 525
528 bgPixmap.set_root_pixmap (); 526 bgPixmap.set_root_pixmap ();
529 XSelectInput (dpy, display->root, PropertyChangeMask); 527 XSelectInput (dpy, display->root, PropertyChangeMask);
530 rootwin_ev.start (display, display->root); 528 rootwin_ev.start (display, display->root);
531 } 529 }
542 bgPixmap.set_geometry (p); 540 bgPixmap.set_geometry (p);
543 } 541 }
544 else 542 else
545 bgPixmap.set_defaultGeometry (); 543 bgPixmap.set_defaultGeometry ();
546 544
547 changed = bgPixmap.set_file (rs[Rs_backgroundPixmap]); 545 bgPixmap.set_file (rs[Rs_backgroundPixmap]);
548 } 546 }
547 /* do not want to render Pixmap yet if we are size/position dependant -
548 * wait for ConfigureNotify at least */
549 if (!bgPixmap.window_size_sensitive ())
550 update_background();
549#endif 551#endif
550 if (changed)
551 {
552 bgPixmap.render ();
553 scr_touch (true);
554 }
555 } 552 }
556#endif 553#endif
557 554
558#if ENABLE_PERL 555#if ENABLE_PERL
559 rootwin_ev.start (display, display->root); 556 rootwin_ev.start (display, display->root);
1152 width, height); 1149 width, height);
1153 1150
1154#ifdef XPM_BACKGROUND 1151#ifdef XPM_BACKGROUND
1155 /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */ 1152 /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
1156 if (bgPixmap.window_size_sensitive ()) 1153 if (bgPixmap.window_size_sensitive ())
1157 bgPixmap.render (); 1154 update_background ();
1158#endif 1155#endif
1159 1156
1160 scr_clear (); 1157 scr_clear ();
1161 } 1158 }
1162 1159

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines