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.234 by root, Sat Jun 9 13:04:27 2007 UTC vs.
Revision 1.242 by sasha, Wed Aug 15 22:41:52 2007 UTC

… …
148} 148}
149#endif 149#endif
150 150
151rxvt_term::rxvt_term () 151rxvt_term::rxvt_term ()
152 : 152 :
153#if TRANSPARENT || 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
156#if ENABLE_TRANSPARENCY
155 check_our_parents_ev(this, &rxvt_term::check_our_parents_cb), 157 check_our_parents_ev(this, &rxvt_term::check_our_parents_cb),
156#endif 158#endif
157#ifdef HAVE_SCROLLBARS 159#ifdef HAVE_SCROLLBARS
158 scrollbar_ev (this, &rxvt_term::x_cb), 160 scrollbar_ev (this, &rxvt_term::x_cb),
159#endif 161#endif
… …
332 im_ev.stop (display); 334 im_ev.stop (display);
333#endif 335#endif
334#if HAVE_SCROLLBARS 336#if HAVE_SCROLLBARS
335 scrollbar_ev.stop (display); 337 scrollbar_ev.stop (display);
336#endif 338#endif
337#if TRANSPARENT || ENABLE_PERL 339#if ENABLE_TRANSPARENCY || ENABLE_PERL
338 rootwin_ev.stop (display); 340 rootwin_ev.stop (display);
339#endif 341#endif
340 incr_ev.stop (); 342 incr_ev.stop ();
341 termwin_ev.stop (display); 343 termwin_ev.stop (display);
342 vt_ev.stop (display); 344 vt_ev.stop (display);
… …
502 504
503#ifdef HAVE_SCROLLBARS 505#ifdef HAVE_SCROLLBARS
504 if (option (Opt_scrollBar)) 506 if (option (Opt_scrollBar))
505 resize_scrollbar (); /* create and map scrollbar */ 507 resize_scrollbar (); /* create and map scrollbar */
506#endif 508#endif
509#ifdef HAVE_BG_PIXMAP
510 {
511 bool changed = false;
512 bgPixmap.set_target (this);
513
507#ifdef TRANSPARENT 514#ifdef ENABLE_TRANSPARENCY
508 if (option (Opt_transparent)) 515 if (option (Opt_transparent))
509 { 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 ();
510 XSelectInput (dpy, display->root, PropertyChangeMask); 529 XSelectInput (dpy, display->root, PropertyChangeMask);
511 check_our_parents ();
512 rootwin_ev.start (display, display->root); 530 rootwin_ev.start (display, display->root);
513 } 531 }
514#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
515#if ENABLE_PERL 558#if ENABLE_PERL
516 rootwin_ev.start (display, display->root); 559 rootwin_ev.start (display, display->root);
517#endif 560#endif
518 561
519 set_colorfgbg (); 562 set_colorfgbg ();
… …
628 return p; 671 return p;
629} 672}
630 673
631/*----------------------------------------------------------------------*/ 674/*----------------------------------------------------------------------*/
632/* 675/*
633 * window size/position calculcations for XSizeHint and other storage. 676 * window size/position calculations for XSizeHint and other storage.
634 * if width/height are non-zero then override calculated width/height 677 * if width/height are non-zero then override calculated width/height
635 */ 678 */
636void 679void
637rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 680rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
638{ 681{
… …
1106 1149
1107 XMoveResizeWindow (dpy, vt, 1150 XMoveResizeWindow (dpy, vt,
1108 window_vt_x, window_vt_y, 1151 window_vt_x, window_vt_y,
1109 width, height); 1152 width, height);
1110 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
1111 scr_clear (); 1160 scr_clear ();
1112#ifdef XPM_BACKGROUND
1113 resize_pixmap ();
1114#endif
1115 } 1161 }
1116 1162
1117 if (fix_screen || old_height == 0) 1163 if (fix_screen || old_height == 0)
1118 scr_reset (); 1164 scr_reset ();
1119 1165
1120 // 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
1121 //scr_touch (false); 1167 //scr_touch (false);
1122 1168
1123#ifdef XPM_BACKGROUND 1169#ifdef HAVE_BG_PIXMAP
1124 if (pixmap) 1170// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1171// if (bgPixmap.pixmap)
1125 scr_touch (false); 1172// scr_touch (false);
1126#endif 1173#endif
1127 1174
1128#ifdef USE_XIM 1175#ifdef USE_XIM
1129 IMSetPosition (); 1176 IMSetPosition ();
1130#endif 1177#endif

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines