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.234 by root, Sat Jun 9 13:04:27 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 check_our_parents_ev(this, &rxvt_term::check_our_parents_cb),
150#endif 156#endif
151#ifdef HAVE_SCROLLBARS 157#ifdef HAVE_SCROLLBARS
152 scrollbar_ev (this, &rxvt_term::x_cb), 158 scrollbar_ev (this, &rxvt_term::x_cb),
153#endif 159#endif
154#ifdef CURSOR_BLINK 160#ifdef CURSOR_BLINK
… …
265 } 271 }
266 272
267 clear (); 273 clear ();
268 } 274 }
269 275
270 delete pix_colors_focused; 276 delete [] pix_colors_focused;
271#if OFF_FOCUS_FADING 277#if OFF_FOCUS_FADING
272 delete pix_colors_unfocused; 278 delete [] pix_colors_unfocused;
273#endif 279#endif
274 280
275 displays.put (display); 281 displays.put (display);
276 282
277 scr_release (); 283 scr_release ();
… …
302{ 308{
303 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 309 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
304 310
305 cmd_pid = 0; 311 cmd_pid = 0;
306 312
307 if (!OPTION (Opt_hold)) 313 if (!option (Opt_hold))
308 destroy (); 314 destroy ();
309} 315}
310 316
311void 317void
312rxvt_term::destroy () 318rxvt_term::destroy ()
… …
476#ifdef KEYSYM_RESOURCE 482#ifdef KEYSYM_RESOURCE
477 keyboard->register_done (); 483 keyboard->register_done ();
478#endif 484#endif
479 485
480#ifdef HAVE_SCROLLBARS 486#ifdef HAVE_SCROLLBARS
481 if (OPTION (Opt_scrollBar)) 487 if (option (Opt_scrollBar))
482 scrollBar.setIdle (); /* set existence for size calculations */ 488 scrollBar.setIdle (); /* set existence for size calculations */
483#endif 489#endif
484 490
485 pty = ptytty::create (); 491 pty = ptytty::create ();
486 492
… …
493#if 0 499#if 0
494 XSynchronize (dpy, True); 500 XSynchronize (dpy, True);
495#endif 501#endif
496 502
497#ifdef HAVE_SCROLLBARS 503#ifdef HAVE_SCROLLBARS
498 if (OPTION (Opt_scrollBar)) 504 if (option (Opt_scrollBar))
499 resize_scrollbar (); /* create and map scrollbar */ 505 resize_scrollbar (); /* create and map scrollbar */
500#endif 506#endif
501#ifdef TRANSPARENT 507#ifdef TRANSPARENT
502 if (OPTION (Opt_transparent)) 508 if (option (Opt_transparent))
503 { 509 {
504 XSelectInput (dpy, display->root, PropertyChangeMask); 510 XSelectInput (dpy, display->root, PropertyChangeMask);
505 check_our_parents (); 511 check_our_parents ();
506 rootwin_ev.start (display, display->root); 512 rootwin_ev.start (display, display->root);
507 } 513 }
… …
704 if (scrollBar.state) 710 if (scrollBar.state)
705 { 711 {
706 sb_w = scrollbar_TotalWidth (); 712 sb_w = scrollbar_TotalWidth ();
707 szHint.base_width += sb_w; 713 szHint.base_width += sb_w;
708 714
709 if (!OPTION (Opt_scrollBar_right)) 715 if (!option (Opt_scrollBar_right))
710 window_vt_x += sb_w; 716 window_vt_x += sb_w;
711 } 717 }
712 718
713 szHint.width_inc = fwidth; 719 szHint.width_inc = fwidth;
714 szHint.height_inc = fheight; 720 szHint.height_inc = fheight;
… …
735 { 741 {
736 min_it (height, max_height); 742 min_it (height, max_height);
737 szHint.height = szHint.base_height + height; 743 szHint.height = szHint.base_height + height;
738 } 744 }
739 745
740 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 746 if (scrollBar.state && option (Opt_scrollBar_right))
741 window_sb_x = szHint.width - sb_w; 747 window_sb_x = szHint.width - sb_w;
742 748
743 if (recalc_x) 749 if (recalc_x)
744 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 750 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
745 751
… …
807 delete fontset[0]; 813 delete fontset[0];
808 fontset[0] = fs; 814 fontset[0] = fs;
809 815
810 prop = (*fs)[1]->properties (); 816 prop = (*fs)[1]->properties ();
811 prop.height += lineSpace; 817 prop.height += lineSpace;
818
812 fs->set_prop (prop); 819 fs->set_prop (prop, false);
813 820
814 fwidth = prop.width; 821 fwidth = prop.width;
815 fheight = prop.height; 822 fheight = prop.height;
816 fbase = prop.ascent; 823 fbase = prop.ascent;
817 824
… …
826 { 833 {
827 fontset[style] = fs = new rxvt_fontset (this); 834 fontset[style] = fs = new rxvt_fontset (this);
828 rxvt_fontprop prop2 = prop; 835 rxvt_fontprop prop2 = prop;
829 836
830 if (res) 837 if (res)
831 prop2.weight = prop2.slant = rxvt_fontprop::unset; 838 {
839 fs->populate (res);
840 fs->set_prop (prop2, false);
841 }
832 else 842 else
833 { 843 {
834 res = fontset[0]->fontdesc; 844 fs->populate (fontset[0]->fontdesc);
835 845
836 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 846 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; 847 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
848
849 fs->set_prop (prop2, true);
838 } 850 }
839 851
840 fs->populate (res);
841 fs->set_prop (prop2);
842 } 852 }
843#else 853#else
844 fontset[style] = fontset[0]; 854 fontset[style] = fontset[0];
845#endif 855#endif
846 } 856 }

Diff Legend

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