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.221 by root, Sun Feb 12 05:15:43 2006 UTC vs.
Revision 1.237 by root, Tue Jun 26 00:40:18 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 ENABLE_TRANSPARENCY || ENABLE_PERL
149 rootwin_ev (this, &rxvt_term::rootwin_cb), 154 rootwin_ev (this, &rxvt_term::rootwin_cb),
155#endif
156#if ENABLE_TRANSPARENCY
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
… …
198void rxvt_term::emergency_cleanup () 206void rxvt_term::emergency_cleanup ()
199{ 207{
200 if (cmd_pid) 208 if (cmd_pid)
201 kill (-cmd_pid, SIGHUP); 209 kill (-cmd_pid, SIGHUP);
202 210
211 pty_ev.stop ();
203 delete pty; pty = 0; 212 delete pty; pty = 0;
204} 213}
205 214
206rxvt_term::~rxvt_term () 215rxvt_term::~rxvt_term ()
207{ 216{
… …
264 } 273 }
265 274
266 clear (); 275 clear ();
267 } 276 }
268 277
269 delete pix_colors_focused; 278 delete [] pix_colors_focused;
270#if OFF_FOCUS_FADING 279#if OFF_FOCUS_FADING
271 delete pix_colors_unfocused; 280 delete [] pix_colors_unfocused;
272#endif 281#endif
273 282
274 displays.put (display); 283 displays.put (display);
275 284
276 scr_release (); 285 scr_release ();
… …
301{ 310{
302 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 311 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
303 312
304 cmd_pid = 0; 313 cmd_pid = 0;
305 314
306 if (!OPTION (Opt_hold)) 315 if (!option (Opt_hold))
307 destroy (); 316 destroy ();
308} 317}
309 318
310void 319void
311rxvt_term::destroy () 320rxvt_term::destroy ()
… …
325 im_ev.stop (display); 334 im_ev.stop (display);
326#endif 335#endif
327#if HAVE_SCROLLBARS 336#if HAVE_SCROLLBARS
328 scrollbar_ev.stop (display); 337 scrollbar_ev.stop (display);
329#endif 338#endif
330#if TRANSPARENT 339#if ENABLE_TRANSPARENCY || ENABLE_PERL
331 rootwin_ev.stop (display); 340 rootwin_ev.stop (display);
332#endif 341#endif
333 incr_ev.stop (); 342 incr_ev.stop ();
334 termwin_ev.stop (display); 343 termwin_ev.stop (display);
335 vt_ev.stop (display); 344 vt_ev.stop (display);
… …
475#ifdef KEYSYM_RESOURCE 484#ifdef KEYSYM_RESOURCE
476 keyboard->register_done (); 485 keyboard->register_done ();
477#endif 486#endif
478 487
479#ifdef HAVE_SCROLLBARS 488#ifdef HAVE_SCROLLBARS
480 if (OPTION (Opt_scrollBar)) 489 if (option (Opt_scrollBar))
481 scrollBar.setIdle (); /* set existence for size calculations */ 490 scrollBar.setIdle (); /* set existence for size calculations */
482#endif 491#endif
483 492
484 pty = ptytty::create (); 493 pty = ptytty::create ();
485 494
… …
492#if 0 501#if 0
493 XSynchronize (dpy, True); 502 XSynchronize (dpy, True);
494#endif 503#endif
495 504
496#ifdef HAVE_SCROLLBARS 505#ifdef HAVE_SCROLLBARS
497 if (OPTION (Opt_scrollBar)) 506 if (option (Opt_scrollBar))
498 resize_scrollbar (); /* create and map scrollbar */ 507 resize_scrollbar (); /* create and map scrollbar */
499#endif 508#endif
500#ifdef TRANSPARENT 509#ifdef ENABLE_TRANSPARENCY
501 if (OPTION (Opt_transparent)) 510 if (option (Opt_transparent))
502 { 511 {
503 XSelectInput (dpy, display->root, PropertyChangeMask); 512 XSelectInput (dpy, display->root, PropertyChangeMask);
504 check_our_parents (); 513 check_our_parents ();
505 rootwin_ev.start (display, display->root); 514 rootwin_ev.start (display, display->root);
506 } 515 }
516#endif
517#if ENABLE_PERL
518 rootwin_ev.start (display, display->root);
507#endif 519#endif
508 520
509 set_colorfgbg (); 521 set_colorfgbg ();
510 522
511 init_command (cmd_argv); 523 init_command (cmd_argv);
… …
618 return p; 630 return p;
619} 631}
620 632
621/*----------------------------------------------------------------------*/ 633/*----------------------------------------------------------------------*/
622/* 634/*
623 * window size/position calculcations for XSizeHint and other storage. 635 * window size/position calculations for XSizeHint and other storage.
624 * if width/height are non-zero then override calculated width/height 636 * if width/height are non-zero then override calculated width/height
625 */ 637 */
626void 638void
627rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 639rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
628{ 640{
… …
700 if (scrollBar.state) 712 if (scrollBar.state)
701 { 713 {
702 sb_w = scrollbar_TotalWidth (); 714 sb_w = scrollbar_TotalWidth ();
703 szHint.base_width += sb_w; 715 szHint.base_width += sb_w;
704 716
705 if (!OPTION (Opt_scrollBar_right)) 717 if (!option (Opt_scrollBar_right))
706 window_vt_x += sb_w; 718 window_vt_x += sb_w;
707 } 719 }
708 720
709 szHint.width_inc = fwidth; 721 szHint.width_inc = fwidth;
710 szHint.height_inc = fheight; 722 szHint.height_inc = fheight;
… …
731 { 743 {
732 min_it (height, max_height); 744 min_it (height, max_height);
733 szHint.height = szHint.base_height + height; 745 szHint.height = szHint.base_height + height;
734 } 746 }
735 747
736 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 748 if (scrollBar.state && option (Opt_scrollBar_right))
737 window_sb_x = szHint.width - sb_w; 749 window_sb_x = szHint.width - sb_w;
738 750
739 if (recalc_x) 751 if (recalc_x)
740 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 752 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
741 753
… …
803 delete fontset[0]; 815 delete fontset[0];
804 fontset[0] = fs; 816 fontset[0] = fs;
805 817
806 prop = (*fs)[1]->properties (); 818 prop = (*fs)[1]->properties ();
807 prop.height += lineSpace; 819 prop.height += lineSpace;
820
808 fs->set_prop (prop); 821 fs->set_prop (prop, false);
809 822
810 fwidth = prop.width; 823 fwidth = prop.width;
811 fheight = prop.height; 824 fheight = prop.height;
812 fbase = prop.ascent; 825 fbase = prop.ascent;
813 826
… …
822 { 835 {
823 fontset[style] = fs = new rxvt_fontset (this); 836 fontset[style] = fs = new rxvt_fontset (this);
824 rxvt_fontprop prop2 = prop; 837 rxvt_fontprop prop2 = prop;
825 838
826 if (res) 839 if (res)
827 prop2.weight = prop2.slant = rxvt_fontprop::unset; 840 {
841 fs->populate (res);
842 fs->set_prop (prop2, false);
843 }
828 else 844 else
829 { 845 {
830 res = fontset[0]->fontdesc; 846 fs->populate (fontset[0]->fontdesc);
831 847
832 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;
833 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);
834 } 852 }
835 853
836 fs->populate (res);
837 fs->set_prop (prop2);
838 } 854 }
839#else 855#else
840 fontset[style] = fontset[0]; 856 fontset[style] = fontset[0];
841#endif 857#endif
842 } 858 }
… …
935 pix_colors_focused[idx] = xcol; 951 pix_colors_focused[idx] = xcol;
936 952
937 /* XSetWindowAttributes attr; */ 953 /* XSetWindowAttributes attr; */
938 /* Cursor cursor; */ 954 /* Cursor cursor; */
939done: 955done:
940
941#if OFF_FOCUS_FADING
942 if (rs[Rs_fade])
943 {
944 rgba c;
945 pix_colors [Color_fade].get (c);
946 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
947 }
948#endif
949
950 /*TODO: handle Color_BD, scrollbar background, etc. */ 956 /*TODO: handle Color_BD, scrollbar background, etc. */
951 957
958 update_fade_color (idx);
952 recolour_cursor (); 959 recolour_cursor ();
953 scr_recolour (); 960 scr_recolour ();
954} 961}
955 962
956#else 963#else
… …
1621 || !focus 1628 || !focus
1622 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1629 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1623 || !IMisRunning ()) 1630 || !IMisRunning ())
1624 return; 1631 return;
1625 1632
1626 if (input_style & XIMPreeditArea) 1633 if (input_style & XIMPreeditPosition)
1627 { 1634 {
1628 im_set_size (preedit_rect); 1635 im_set_size (preedit_rect);
1629 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1636 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1630 1637
1631 XSetICValues (Input_Context, 1638 XSetICValues (Input_Context,

Diff Legend

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