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.232 by root, Tue May 1 21:30:01 2007 UTC

… …
270 } 270 }
271 271
272 clear (); 272 clear ();
273 } 273 }
274 274
275 delete pix_colors_focused; 275 delete [] pix_colors_focused;
276#if OFF_FOCUS_FADING 276#if OFF_FOCUS_FADING
277 delete pix_colors_unfocused; 277 delete [] pix_colors_unfocused;
278#endif 278#endif
279 279
280 displays.put (display); 280 displays.put (display);
281 281
282 scr_release (); 282 scr_release ();
… …
307{ 307{
308 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 308 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
309 309
310 cmd_pid = 0; 310 cmd_pid = 0;
311 311
312 if (!OPTION (Opt_hold)) 312 if (!option (Opt_hold))
313 destroy (); 313 destroy ();
314} 314}
315 315
316void 316void
317rxvt_term::destroy () 317rxvt_term::destroy ()
… …
481#ifdef KEYSYM_RESOURCE 481#ifdef KEYSYM_RESOURCE
482 keyboard->register_done (); 482 keyboard->register_done ();
483#endif 483#endif
484 484
485#ifdef HAVE_SCROLLBARS 485#ifdef HAVE_SCROLLBARS
486 if (OPTION (Opt_scrollBar)) 486 if (option (Opt_scrollBar))
487 scrollBar.setIdle (); /* set existence for size calculations */ 487 scrollBar.setIdle (); /* set existence for size calculations */
488#endif 488#endif
489 489
490 pty = ptytty::create (); 490 pty = ptytty::create ();
491 491
… …
498#if 0 498#if 0
499 XSynchronize (dpy, True); 499 XSynchronize (dpy, True);
500#endif 500#endif
501 501
502#ifdef HAVE_SCROLLBARS 502#ifdef HAVE_SCROLLBARS
503 if (OPTION (Opt_scrollBar)) 503 if (option (Opt_scrollBar))
504 resize_scrollbar (); /* create and map scrollbar */ 504 resize_scrollbar (); /* create and map scrollbar */
505#endif 505#endif
506#ifdef TRANSPARENT 506#ifdef TRANSPARENT
507 if (OPTION (Opt_transparent)) 507 if (option (Opt_transparent))
508 { 508 {
509 XSelectInput (dpy, display->root, PropertyChangeMask); 509 XSelectInput (dpy, display->root, PropertyChangeMask);
510 check_our_parents (); 510 check_our_parents ();
511 rootwin_ev.start (display, display->root); 511 rootwin_ev.start (display, display->root);
512 } 512 }
… …
709 if (scrollBar.state) 709 if (scrollBar.state)
710 { 710 {
711 sb_w = scrollbar_TotalWidth (); 711 sb_w = scrollbar_TotalWidth ();
712 szHint.base_width += sb_w; 712 szHint.base_width += sb_w;
713 713
714 if (!OPTION (Opt_scrollBar_right)) 714 if (!option (Opt_scrollBar_right))
715 window_vt_x += sb_w; 715 window_vt_x += sb_w;
716 } 716 }
717 717
718 szHint.width_inc = fwidth; 718 szHint.width_inc = fwidth;
719 szHint.height_inc = fheight; 719 szHint.height_inc = fheight;
… …
740 { 740 {
741 min_it (height, max_height); 741 min_it (height, max_height);
742 szHint.height = szHint.base_height + height; 742 szHint.height = szHint.base_height + height;
743 } 743 }
744 744
745 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 745 if (scrollBar.state && option (Opt_scrollBar_right))
746 window_sb_x = szHint.width - sb_w; 746 window_sb_x = szHint.width - sb_w;
747 747
748 if (recalc_x) 748 if (recalc_x)
749 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 749 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
750 750
… …
812 delete fontset[0]; 812 delete fontset[0];
813 fontset[0] = fs; 813 fontset[0] = fs;
814 814
815 prop = (*fs)[1]->properties (); 815 prop = (*fs)[1]->properties ();
816 prop.height += lineSpace; 816 prop.height += lineSpace;
817
817 fs->set_prop (prop); 818 fs->set_prop (prop, false);
818 819
819 fwidth = prop.width; 820 fwidth = prop.width;
820 fheight = prop.height; 821 fheight = prop.height;
821 fbase = prop.ascent; 822 fbase = prop.ascent;
822 823
… …
831 { 832 {
832 fontset[style] = fs = new rxvt_fontset (this); 833 fontset[style] = fs = new rxvt_fontset (this);
833 rxvt_fontprop prop2 = prop; 834 rxvt_fontprop prop2 = prop;
834 835
835 if (res) 836 if (res)
836 prop2.weight = prop2.slant = rxvt_fontprop::unset; 837 {
838 fs->populate (res);
839 fs->set_prop (prop2, false);
840 }
837 else 841 else
838 { 842 {
839 res = fontset[0]->fontdesc; 843 fs->populate (fontset[0]->fontdesc);
840 844
841 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 845 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; 846 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
847
848 fs->set_prop (prop2, true);
843 } 849 }
844 850
845 fs->populate (res);
846 fs->set_prop (prop2);
847 } 851 }
848#else 852#else
849 fontset[style] = fontset[0]; 853 fontset[style] = fontset[0];
850#endif 854#endif
851 } 855 }

Diff Legend

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