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.239 by sasha, Fri Aug 3 22:40:10 2007 UTC vs.
Revision 1.242 by sasha, Wed Aug 15 22:41:52 2007 UTC

504 504
505#ifdef HAVE_SCROLLBARS 505#ifdef HAVE_SCROLLBARS
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
510 {
511 bool changed = false;
512 bgPixmap.set_target (this);
513
509#ifdef ENABLE_TRANSPARENCY 514#ifdef ENABLE_TRANSPARENCY
510 if (option (Opt_transparent)) 515 if (option (Opt_transparent))
511 { 516 {
517 bgPixmap.set_transparent ();
518#ifdef HAVE_AFTERIMAGE
519 if (rs [Rs_blurradius])
520 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
521#endif
522 if (ISSET_PIXCOLOR (Color_tint))
523 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
524 if (rs [Rs_shade])
525 bgPixmap.set_shade (rs [Rs_shade]);
526 changed = true;
527
528 bgPixmap.set_root_pixmap ();
512 XSelectInput (dpy, display->root, PropertyChangeMask); 529 XSelectInput (dpy, display->root, PropertyChangeMask);
513 check_our_parents ();
514 rootwin_ev.start (display, display->root); 530 rootwin_ev.start (display, display->root);
515 } 531 }
516#endif 532#endif
533
534#ifdef XPM_BACKGROUND
535 if (rs[Rs_backgroundPixmap] != NULL)
536 {
537 const char *p = rs[Rs_backgroundPixmap];
538
539 if ((p = strchr (p, ';')) != NULL)
540 {
541 p++;
542 bgPixmap.set_geometry (p);
543 }
544 else
545 bgPixmap.set_defaultGeometry ();
546
547 changed = bgPixmap.set_file (rs[Rs_backgroundPixmap]);
548 }
549#endif
550 if (changed)
551 {
552 bgPixmap.render ();
553 scr_touch (true);
554 }
555 }
556#endif
557
517#if ENABLE_PERL 558#if ENABLE_PERL
518 rootwin_ev.start (display, display->root); 559 rootwin_ev.start (display, display->root);
519#endif 560#endif
520 561
521 set_colorfgbg (); 562 set_colorfgbg ();
1108 1149
1109 XMoveResizeWindow (dpy, vt, 1150 XMoveResizeWindow (dpy, vt,
1110 window_vt_x, window_vt_y, 1151 window_vt_x, window_vt_y,
1111 width, height); 1152 width, height);
1112 1153
1154#ifdef XPM_BACKGROUND
1155 /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
1156 if (bgPixmap.window_size_sensitive ())
1157 bgPixmap.render ();
1158#endif
1159
1113 scr_clear (); 1160 scr_clear ();
1114#ifdef XPM_BACKGROUND
1115 resize_pixmap ();
1116#endif
1117 } 1161 }
1118 1162
1119 if (fix_screen || old_height == 0) 1163 if (fix_screen || old_height == 0)
1120 scr_reset (); 1164 scr_reset ();
1121 1165
1122 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version 1166 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1123 //scr_touch (false); 1167 //scr_touch (false);
1124 1168
1125#ifdef HAVE_BG_PIXMAP 1169#ifdef HAVE_BG_PIXMAP
1170// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1126 if (bgPixmap.pixmap) 1171// if (bgPixmap.pixmap)
1127 scr_touch (false); 1172// scr_touch (false);
1128#endif 1173#endif
1129 1174
1130#ifdef USE_XIM 1175#ifdef USE_XIM
1131 IMSetPosition (); 1176 IMSetPosition ();
1132#endif 1177#endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines