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.223 by root, Sat Feb 18 14:14:43 2006 UTC vs.
Revision 1.234 by root, Sat Jun 9 13:04:27 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: main.C 2 * File: main.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
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
… …
143} 148}
144#endif 149#endif
145 150
146rxvt_term::rxvt_term () 151rxvt_term::rxvt_term ()
147 : 152 :
148#if TRANSPARENT 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 ()
… …
326 im_ev.stop (display); 332 im_ev.stop (display);
327#endif 333#endif
328#if HAVE_SCROLLBARS 334#if HAVE_SCROLLBARS
329 scrollbar_ev.stop (display); 335 scrollbar_ev.stop (display);
330#endif 336#endif
331#if TRANSPARENT 337#if TRANSPARENT || ENABLE_PERL
332 rootwin_ev.stop (display); 338 rootwin_ev.stop (display);
333#endif 339#endif
334 incr_ev.stop (); 340 incr_ev.stop ();
335 termwin_ev.stop (display); 341 termwin_ev.stop (display);
336 vt_ev.stop (display); 342 vt_ev.stop (display);
… …
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 }
514#endif
515#if ENABLE_PERL
516 rootwin_ev.start (display, display->root);
508#endif 517#endif
509 518
510 set_colorfgbg (); 519 set_colorfgbg ();
511 520
512 init_command (cmd_argv); 521 init_command (cmd_argv);
… …
701 if (scrollBar.state) 710 if (scrollBar.state)
702 { 711 {
703 sb_w = scrollbar_TotalWidth (); 712 sb_w = scrollbar_TotalWidth ();
704 szHint.base_width += sb_w; 713 szHint.base_width += sb_w;
705 714
706 if (!OPTION (Opt_scrollBar_right)) 715 if (!option (Opt_scrollBar_right))
707 window_vt_x += sb_w; 716 window_vt_x += sb_w;
708 } 717 }
709 718
710 szHint.width_inc = fwidth; 719 szHint.width_inc = fwidth;
711 szHint.height_inc = fheight; 720 szHint.height_inc = fheight;
… …
732 { 741 {
733 min_it (height, max_height); 742 min_it (height, max_height);
734 szHint.height = szHint.base_height + height; 743 szHint.height = szHint.base_height + height;
735 } 744 }
736 745
737 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 746 if (scrollBar.state && option (Opt_scrollBar_right))
738 window_sb_x = szHint.width - sb_w; 747 window_sb_x = szHint.width - sb_w;
739 748
740 if (recalc_x) 749 if (recalc_x)
741 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 750 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
742 751
… …
804 delete fontset[0]; 813 delete fontset[0];
805 fontset[0] = fs; 814 fontset[0] = fs;
806 815
807 prop = (*fs)[1]->properties (); 816 prop = (*fs)[1]->properties ();
808 prop.height += lineSpace; 817 prop.height += lineSpace;
818
809 fs->set_prop (prop); 819 fs->set_prop (prop, false);
810 820
811 fwidth = prop.width; 821 fwidth = prop.width;
812 fheight = prop.height; 822 fheight = prop.height;
813 fbase = prop.ascent; 823 fbase = prop.ascent;
814 824
… …
823 { 833 {
824 fontset[style] = fs = new rxvt_fontset (this); 834 fontset[style] = fs = new rxvt_fontset (this);
825 rxvt_fontprop prop2 = prop; 835 rxvt_fontprop prop2 = prop;
826 836
827 if (res) 837 if (res)
828 prop2.weight = prop2.slant = rxvt_fontprop::unset; 838 {
839 fs->populate (res);
840 fs->set_prop (prop2, false);
841 }
829 else 842 else
830 { 843 {
831 res = fontset[0]->fontdesc; 844 fs->populate (fontset[0]->fontdesc);
832 845
833 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;
834 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);
835 } 850 }
836 851
837 fs->populate (res);
838 fs->set_prop (prop2);
839 } 852 }
840#else 853#else
841 fontset[style] = fontset[0]; 854 fontset[style] = fontset[0];
842#endif 855#endif
843 } 856 }
… …
936 pix_colors_focused[idx] = xcol; 949 pix_colors_focused[idx] = xcol;
937 950
938 /* XSetWindowAttributes attr; */ 951 /* XSetWindowAttributes attr; */
939 /* Cursor cursor; */ 952 /* Cursor cursor; */
940done: 953done:
941
942#if OFF_FOCUS_FADING
943 if (rs[Rs_fade])
944 {
945 rgba c;
946 pix_colors [Color_fade].get (c);
947 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
948 }
949#endif
950
951 /*TODO: handle Color_BD, scrollbar background, etc. */ 954 /*TODO: handle Color_BD, scrollbar background, etc. */
952 955
956 update_fade_color (idx);
953 recolour_cursor (); 957 recolour_cursor ();
954 scr_recolour (); 958 scr_recolour ();
955} 959}
956 960
957#else 961#else

Diff Legend

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