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.226 by root, Thu Jul 6 23:48:11 2006 UTC vs.
Revision 1.235 by ayin, Sun Jun 10 15:16:15 2007 UTC

… …
56static char curlocale[128], savelocale[128]; 56static char curlocale[128], savelocale[128];
57 57
58bool 58bool
59rxvt_set_locale (const char *locale) NOTHROW 59rxvt_set_locale (const char *locale) NOTHROW
60{ 60{
61 int size = strlen (locale) + 1;
62
63 if (size > sizeof (curlocale))
64 rxvt_fatal ("locale string too long, aborting.\n");
65
61 if (!locale || !strncmp (locale, curlocale, 128)) 66 if (!locale || !memcmp (locale, curlocale, size))
62 return false; 67 return false;
63 68
64 strncpy (curlocale, locale, 128); 69 memcpy (curlocale, locale, size);
65 setlocale (LC_CTYPE, curlocale); 70 setlocale (LC_CTYPE, curlocale);
66 return true; 71 return true;
67} 72}
68 73
69void 74void
… …
145 150
146rxvt_term::rxvt_term () 151rxvt_term::rxvt_term ()
147 : 152 :
148#if TRANSPARENT || ENABLE_PERL 153#if TRANSPARENT || ENABLE_PERL
149 rootwin_ev (this, &rxvt_term::rootwin_cb), 154 rootwin_ev (this, &rxvt_term::rootwin_cb),
155#endif
156#if TRANSPARENT
157 check_our_parents_ev(this, &rxvt_term::check_our_parents_cb),
150#endif 158#endif
151#ifdef HAVE_SCROLLBARS 159#ifdef HAVE_SCROLLBARS
152 scrollbar_ev (this, &rxvt_term::x_cb), 160 scrollbar_ev (this, &rxvt_term::x_cb),
153#endif 161#endif
154#ifdef CURSOR_BLINK 162#ifdef CURSOR_BLINK
… …
265 } 273 }
266 274
267 clear (); 275 clear ();
268 } 276 }
269 277
270 delete pix_colors_focused; 278 delete [] pix_colors_focused;
271#if OFF_FOCUS_FADING 279#if OFF_FOCUS_FADING
272 delete pix_colors_unfocused; 280 delete [] pix_colors_unfocused;
273#endif 281#endif
274 282
275 displays.put (display); 283 displays.put (display);
276 284
277 scr_release (); 285 scr_release ();
… …
302{ 310{
303 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 311 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
304 312
305 cmd_pid = 0; 313 cmd_pid = 0;
306 314
307 if (!OPTION (Opt_hold)) 315 if (!option (Opt_hold))
308 destroy (); 316 destroy ();
309} 317}
310 318
311void 319void
312rxvt_term::destroy () 320rxvt_term::destroy ()
… …
476#ifdef KEYSYM_RESOURCE 484#ifdef KEYSYM_RESOURCE
477 keyboard->register_done (); 485 keyboard->register_done ();
478#endif 486#endif
479 487
480#ifdef HAVE_SCROLLBARS 488#ifdef HAVE_SCROLLBARS
481 if (OPTION (Opt_scrollBar)) 489 if (option (Opt_scrollBar))
482 scrollBar.setIdle (); /* set existence for size calculations */ 490 scrollBar.setIdle (); /* set existence for size calculations */
483#endif 491#endif
484 492
485 pty = ptytty::create (); 493 pty = ptytty::create ();
486 494
… …
493#if 0 501#if 0
494 XSynchronize (dpy, True); 502 XSynchronize (dpy, True);
495#endif 503#endif
496 504
497#ifdef HAVE_SCROLLBARS 505#ifdef HAVE_SCROLLBARS
498 if (OPTION (Opt_scrollBar)) 506 if (option (Opt_scrollBar))
499 resize_scrollbar (); /* create and map scrollbar */ 507 resize_scrollbar (); /* create and map scrollbar */
500#endif 508#endif
501#ifdef TRANSPARENT 509#ifdef TRANSPARENT
502 if (OPTION (Opt_transparent)) 510 if (option (Opt_transparent))
503 { 511 {
504 XSelectInput (dpy, display->root, PropertyChangeMask); 512 XSelectInput (dpy, display->root, PropertyChangeMask);
505 check_our_parents (); 513 check_our_parents ();
506 rootwin_ev.start (display, display->root); 514 rootwin_ev.start (display, display->root);
507 } 515 }
… …
704 if (scrollBar.state) 712 if (scrollBar.state)
705 { 713 {
706 sb_w = scrollbar_TotalWidth (); 714 sb_w = scrollbar_TotalWidth ();
707 szHint.base_width += sb_w; 715 szHint.base_width += sb_w;
708 716
709 if (!OPTION (Opt_scrollBar_right)) 717 if (!option (Opt_scrollBar_right))
710 window_vt_x += sb_w; 718 window_vt_x += sb_w;
711 } 719 }
712 720
713 szHint.width_inc = fwidth; 721 szHint.width_inc = fwidth;
714 szHint.height_inc = fheight; 722 szHint.height_inc = fheight;
… …
735 { 743 {
736 min_it (height, max_height); 744 min_it (height, max_height);
737 szHint.height = szHint.base_height + height; 745 szHint.height = szHint.base_height + height;
738 } 746 }
739 747
740 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 748 if (scrollBar.state && option (Opt_scrollBar_right))
741 window_sb_x = szHint.width - sb_w; 749 window_sb_x = szHint.width - sb_w;
742 750
743 if (recalc_x) 751 if (recalc_x)
744 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 752 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
745 753
… …
807 delete fontset[0]; 815 delete fontset[0];
808 fontset[0] = fs; 816 fontset[0] = fs;
809 817
810 prop = (*fs)[1]->properties (); 818 prop = (*fs)[1]->properties ();
811 prop.height += lineSpace; 819 prop.height += lineSpace;
820
812 fs->set_prop (prop); 821 fs->set_prop (prop, false);
813 822
814 fwidth = prop.width; 823 fwidth = prop.width;
815 fheight = prop.height; 824 fheight = prop.height;
816 fbase = prop.ascent; 825 fbase = prop.ascent;
817 826
… …
826 { 835 {
827 fontset[style] = fs = new rxvt_fontset (this); 836 fontset[style] = fs = new rxvt_fontset (this);
828 rxvt_fontprop prop2 = prop; 837 rxvt_fontprop prop2 = prop;
829 838
830 if (res) 839 if (res)
831 prop2.weight = prop2.slant = rxvt_fontprop::unset; 840 {
841 fs->populate (res);
842 fs->set_prop (prop2, false);
843 }
832 else 844 else
833 { 845 {
834 res = fontset[0]->fontdesc; 846 fs->populate (fontset[0]->fontdesc);
835 847
836 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 848 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
837 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 849 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
850
851 fs->set_prop (prop2, true);
838 } 852 }
839 853
840 fs->populate (res);
841 fs->set_prop (prop2);
842 } 854 }
843#else 855#else
844 fontset[style] = fontset[0]; 856 fontset[style] = fontset[0];
845#endif 857#endif
846 } 858 }

Diff Legend

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