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.228 by root, Wed Aug 2 09:14:19 2006 UTC vs.
Revision 1.245 by sasha, Fri Aug 17 22:02:14 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 HAVE_BG_PIXMAP
157 update_background_ev(this, &rxvt_term::update_background_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
… …
270 } 273 }
271 274
272 clear (); 275 clear ();
273 } 276 }
274 277
275 delete pix_colors_focused; 278 delete [] pix_colors_focused;
276#if OFF_FOCUS_FADING 279#if OFF_FOCUS_FADING
277 delete pix_colors_unfocused; 280 delete [] pix_colors_unfocused;
278#endif 281#endif
279 282
280 displays.put (display); 283 displays.put (display);
281 284
282 scr_release (); 285 scr_release ();
… …
307{ 310{
308 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 311 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
309 312
310 cmd_pid = 0; 313 cmd_pid = 0;
311 314
312 if (!OPTION (Opt_hold)) 315 if (!option (Opt_hold))
313 destroy (); 316 destroy ();
314} 317}
315 318
316void 319void
317rxvt_term::destroy () 320rxvt_term::destroy ()
… …
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);
… …
481#ifdef KEYSYM_RESOURCE 484#ifdef KEYSYM_RESOURCE
482 keyboard->register_done (); 485 keyboard->register_done ();
483#endif 486#endif
484 487
485#ifdef HAVE_SCROLLBARS 488#ifdef HAVE_SCROLLBARS
486 if (OPTION (Opt_scrollBar)) 489 if (option (Opt_scrollBar))
487 scrollBar.setIdle (); /* set existence for size calculations */ 490 scrollBar.setIdle (); /* set existence for size calculations */
488#endif 491#endif
489 492
490 pty = ptytty::create (); 493 pty = ptytty::create ();
491 494
… …
498#if 0 501#if 0
499 XSynchronize (dpy, True); 502 XSynchronize (dpy, True);
500#endif 503#endif
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 bgPixmap.set_target (this);
512
506#ifdef TRANSPARENT 513#ifdef ENABLE_TRANSPARENCY
507 if (OPTION (Opt_transparent)) 514 if (option (Opt_transparent))
508 { 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 ();
509 XSelectInput (dpy, display->root, PropertyChangeMask); 527 XSelectInput (dpy, display->root, PropertyChangeMask);
510 check_our_parents ();
511 rootwin_ev.start (display, display->root); 528 rootwin_ev.start (display, display->root);
512 } 529 }
513#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 * TODO: this does not work for some reason when transparency is disabled !!!!
550 */
551 if (!bgPixmap.window_size_sensitive ())
552 update_background ();
553#endif
554 }
555#endif
556
514#if ENABLE_PERL 557#if ENABLE_PERL
515 rootwin_ev.start (display, display->root); 558 rootwin_ev.start (display, display->root);
516#endif 559#endif
517 560
518 set_colorfgbg (); 561 set_colorfgbg ();
… …
627 return p; 670 return p;
628} 671}
629 672
630/*----------------------------------------------------------------------*/ 673/*----------------------------------------------------------------------*/
631/* 674/*
632 * window size/position calculcations for XSizeHint and other storage. 675 * window size/position calculations for XSizeHint and other storage.
633 * if width/height are non-zero then override calculated width/height 676 * if width/height are non-zero then override calculated width/height
634 */ 677 */
635void 678void
636rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 679rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
637{ 680{
… …
709 if (scrollBar.state) 752 if (scrollBar.state)
710 { 753 {
711 sb_w = scrollbar_TotalWidth (); 754 sb_w = scrollbar_TotalWidth ();
712 szHint.base_width += sb_w; 755 szHint.base_width += sb_w;
713 756
714 if (!OPTION (Opt_scrollBar_right)) 757 if (!option (Opt_scrollBar_right))
715 window_vt_x += sb_w; 758 window_vt_x += sb_w;
716 } 759 }
717 760
718 szHint.width_inc = fwidth; 761 szHint.width_inc = fwidth;
719 szHint.height_inc = fheight; 762 szHint.height_inc = fheight;
… …
740 { 783 {
741 min_it (height, max_height); 784 min_it (height, max_height);
742 szHint.height = szHint.base_height + height; 785 szHint.height = szHint.base_height + height;
743 } 786 }
744 787
745 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 788 if (scrollBar.state && option (Opt_scrollBar_right))
746 window_sb_x = szHint.width - sb_w; 789 window_sb_x = szHint.width - sb_w;
747 790
748 if (recalc_x) 791 if (recalc_x)
749 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 792 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
750 793
… …
812 delete fontset[0]; 855 delete fontset[0];
813 fontset[0] = fs; 856 fontset[0] = fs;
814 857
815 prop = (*fs)[1]->properties (); 858 prop = (*fs)[1]->properties ();
816 prop.height += lineSpace; 859 prop.height += lineSpace;
860
817 fs->set_prop (prop); 861 fs->set_prop (prop, false);
818 862
819 fwidth = prop.width; 863 fwidth = prop.width;
820 fheight = prop.height; 864 fheight = prop.height;
821 fbase = prop.ascent; 865 fbase = prop.ascent;
822 866
… …
831 { 875 {
832 fontset[style] = fs = new rxvt_fontset (this); 876 fontset[style] = fs = new rxvt_fontset (this);
833 rxvt_fontprop prop2 = prop; 877 rxvt_fontprop prop2 = prop;
834 878
835 if (res) 879 if (res)
836 prop2.weight = prop2.slant = rxvt_fontprop::unset; 880 {
881 fs->populate (res);
882 fs->set_prop (prop2, false);
883 }
837 else 884 else
838 { 885 {
839 res = fontset[0]->fontdesc; 886 fs->populate (fontset[0]->fontdesc);
840 887
841 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 888 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
842 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 889 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
890
891 fs->set_prop (prop2, true);
843 } 892 }
844 893
845 fs->populate (res);
846 fs->set_prop (prop2);
847 } 894 }
848#else 895#else
849 fontset[style] = fontset[0]; 896 fontset[style] = fontset[0];
850#endif 897#endif
851 } 898 }
… …
1101 1148
1102 XMoveResizeWindow (dpy, vt, 1149 XMoveResizeWindow (dpy, vt,
1103 window_vt_x, window_vt_y, 1150 window_vt_x, window_vt_y,
1104 width, height); 1151 width, height);
1105 1152
1153#ifdef XPM_BACKGROUND
1154 /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
1155 if (bgPixmap.window_size_sensitive ())
1156 update_background ();
1157#endif
1158
1106 scr_clear (); 1159 scr_clear ();
1107#ifdef XPM_BACKGROUND
1108 resize_pixmap ();
1109#endif
1110 } 1160 }
1111 1161
1112 if (fix_screen || old_height == 0) 1162 if (fix_screen || old_height == 0)
1113 scr_reset (); 1163 scr_reset ();
1114 1164
1115 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version 1165 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1116 //scr_touch (false); 1166 //scr_touch (false);
1117 1167
1118#ifdef XPM_BACKGROUND 1168#ifdef HAVE_BG_PIXMAP
1119 if (pixmap) 1169// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1170// if (bgPixmap.pixmap)
1120 scr_touch (false); 1171// scr_touch (false);
1121#endif 1172#endif
1122 1173
1123#ifdef USE_XIM 1174#ifdef USE_XIM
1124 IMSetPosition (); 1175 IMSetPosition ();
1125#endif 1176#endif

Diff Legend

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