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

Diff Legend

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