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.243 by sasha, Thu Aug 16 21:26:20 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 check_our_parents_ev(this, &rxvt_term::check_our_parents_cb), 155#endif
156#if HAVE_BG_PIXMAP
157 update_background_ev(this, &rxvt_term::update_background_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
160#ifdef CURSOR_BLINK 162#ifdef CURSOR_BLINK
… …
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 bgPixmap.set_target (this);
512
507#ifdef TRANSPARENT 513#ifdef ENABLE_TRANSPARENCY
508 if (option (Opt_transparent)) 514 if (option (Opt_transparent))
509 { 515 {
516 bgPixmap.set_transparent ();
517#ifdef HAVE_AFTERIMAGE
518 if (rs [Rs_blurradius])
519 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
520#endif
521 if (ISSET_PIXCOLOR (Color_tint))
522 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
523 if (rs [Rs_shade])
524 bgPixmap.set_shade (rs [Rs_shade]);
525
526 bgPixmap.set_root_pixmap ();
510 XSelectInput (dpy, display->root, PropertyChangeMask); 527 XSelectInput (dpy, display->root, PropertyChangeMask);
511 check_our_parents ();
512 rootwin_ev.start (display, display->root); 528 rootwin_ev.start (display, display->root);
513 } 529 }
514#endif 530#endif
531
532#ifdef XPM_BACKGROUND
533 if (rs[Rs_backgroundPixmap] != NULL)
534 {
535 const char *p = rs[Rs_backgroundPixmap];
536
537 if ((p = strchr (p, ';')) != NULL)
538 {
539 p++;
540 bgPixmap.set_geometry (p);
541 }
542 else
543 bgPixmap.set_defaultGeometry ();
544
545 bgPixmap.set_file (rs[Rs_backgroundPixmap]);
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();
551#endif
552 }
553#endif
554
515#if ENABLE_PERL 555#if ENABLE_PERL
516 rootwin_ev.start (display, display->root); 556 rootwin_ev.start (display, display->root);
517#endif 557#endif
518 558
519 set_colorfgbg (); 559 set_colorfgbg ();
… …
628 return p; 668 return p;
629} 669}
630 670
631/*----------------------------------------------------------------------*/ 671/*----------------------------------------------------------------------*/
632/* 672/*
633 * window size/position calculcations for XSizeHint and other storage. 673 * window size/position calculations for XSizeHint and other storage.
634 * if width/height are non-zero then override calculated width/height 674 * if width/height are non-zero then override calculated width/height
635 */ 675 */
636void 676void
637rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 677rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
638{ 678{
… …
1106 1146
1107 XMoveResizeWindow (dpy, vt, 1147 XMoveResizeWindow (dpy, vt,
1108 window_vt_x, window_vt_y, 1148 window_vt_x, window_vt_y,
1109 width, height); 1149 width, height);
1110 1150
1151#ifdef XPM_BACKGROUND
1152 /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
1153 if (bgPixmap.window_size_sensitive ())
1154 update_background ();
1155#endif
1156
1111 scr_clear (); 1157 scr_clear ();
1112#ifdef XPM_BACKGROUND
1113 resize_pixmap ();
1114#endif
1115 } 1158 }
1116 1159
1117 if (fix_screen || old_height == 0) 1160 if (fix_screen || old_height == 0)
1118 scr_reset (); 1161 scr_reset ();
1119 1162
1120 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version 1163 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1121 //scr_touch (false); 1164 //scr_touch (false);
1122 1165
1123#ifdef XPM_BACKGROUND 1166#ifdef HAVE_BG_PIXMAP
1124 if (pixmap) 1167// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1168// if (bgPixmap.pixmap)
1125 scr_touch (false); 1169// scr_touch (false);
1126#endif 1170#endif
1127 1171
1128#ifdef USE_XIM 1172#ifdef USE_XIM
1129 IMSetPosition (); 1173 IMSetPosition ();
1130#endif 1174#endif

Diff Legend

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