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.239 by sasha, Fri Aug 3 22:40:10 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
507#ifdef TRANSPARENT 509#ifdef ENABLE_TRANSPARENCY
508 if (option (Opt_transparent)) 510 if (option (Opt_transparent))
509 { 511 {
510 XSelectInput (dpy, display->root, PropertyChangeMask); 512 XSelectInput (dpy, display->root, PropertyChangeMask);
511 check_our_parents (); 513 check_our_parents ();
512 rootwin_ev.start (display, display->root); 514 rootwin_ev.start (display, display->root);
… …
628 return p; 630 return p;
629} 631}
630 632
631/*----------------------------------------------------------------------*/ 633/*----------------------------------------------------------------------*/
632/* 634/*
633 * window size/position calculcations for XSizeHint and other storage. 635 * window size/position calculations for XSizeHint and other storage.
634 * if width/height are non-zero then override calculated width/height 636 * if width/height are non-zero then override calculated width/height
635 */ 637 */
636void 638void
637rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 639rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
638{ 640{
… …
1118 scr_reset (); 1120 scr_reset ();
1119 1121
1120 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version 1122 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1121 //scr_touch (false); 1123 //scr_touch (false);
1122 1124
1123#ifdef XPM_BACKGROUND 1125#ifdef HAVE_BG_PIXMAP
1124 if (pixmap) 1126 if (bgPixmap.pixmap)
1125 scr_touch (false); 1127 scr_touch (false);
1126#endif 1128#endif
1127 1129
1128#ifdef USE_XIM 1130#ifdef USE_XIM
1129 IMSetPosition (); 1131 IMSetPosition ();

Diff Legend

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