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.233 by sasha, Fri Jun 8 20:04:12 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_aprents_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
… …
198void rxvt_term::emergency_cleanup () 204void rxvt_term::emergency_cleanup ()
199{ 205{
200 if (cmd_pid) 206 if (cmd_pid)
201 kill (-cmd_pid, SIGHUP); 207 kill (-cmd_pid, SIGHUP);
202 208
209 pty_ev.stop ();
203 delete pty; pty = 0; 210 delete pty; pty = 0;
204} 211}
205 212
206rxvt_term::~rxvt_term () 213rxvt_term::~rxvt_term ()
207{ 214{
… …
264 } 271 }
265 272
266 clear (); 273 clear ();
267 } 274 }
268 275
269 delete pix_colors_focused; 276 delete [] pix_colors_focused;
270#if OFF_FOCUS_FADING 277#if OFF_FOCUS_FADING
271 delete pix_colors_unfocused; 278 delete [] pix_colors_unfocused;
272#endif 279#endif
273 280
274 displays.put (display); 281 displays.put (display);
275 282
276 scr_release (); 283 scr_release ();
… …
301{ 308{
302 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 309 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
303 310
304 cmd_pid = 0; 311 cmd_pid = 0;
305 312
306 if (!OPTION (Opt_hold)) 313 if (!option (Opt_hold))
307 destroy (); 314 destroy ();
308} 315}
309 316
310void 317void
311rxvt_term::destroy () 318rxvt_term::destroy ()
… …
325 im_ev.stop (display); 332 im_ev.stop (display);
326#endif 333#endif
327#if HAVE_SCROLLBARS 334#if HAVE_SCROLLBARS
328 scrollbar_ev.stop (display); 335 scrollbar_ev.stop (display);
329#endif 336#endif
330#if TRANSPARENT 337#if TRANSPARENT || ENABLE_PERL
331 rootwin_ev.stop (display); 338 rootwin_ev.stop (display);
332#endif 339#endif
333 incr_ev.stop (); 340 incr_ev.stop ();
334 termwin_ev.stop (display); 341 termwin_ev.stop (display);
335 vt_ev.stop (display); 342 vt_ev.stop (display);
… …
475#ifdef KEYSYM_RESOURCE 482#ifdef KEYSYM_RESOURCE
476 keyboard->register_done (); 483 keyboard->register_done ();
477#endif 484#endif
478 485
479#ifdef HAVE_SCROLLBARS 486#ifdef HAVE_SCROLLBARS
480 if (OPTION (Opt_scrollBar)) 487 if (option (Opt_scrollBar))
481 scrollBar.setIdle (); /* set existence for size calculations */ 488 scrollBar.setIdle (); /* set existence for size calculations */
482#endif 489#endif
483 490
484 pty = ptytty::create (); 491 pty = ptytty::create ();
485 492
… …
492#if 0 499#if 0
493 XSynchronize (dpy, True); 500 XSynchronize (dpy, True);
494#endif 501#endif
495 502
496#ifdef HAVE_SCROLLBARS 503#ifdef HAVE_SCROLLBARS
497 if (OPTION (Opt_scrollBar)) 504 if (option (Opt_scrollBar))
498 resize_scrollbar (); /* create and map scrollbar */ 505 resize_scrollbar (); /* create and map scrollbar */
499#endif 506#endif
500#ifdef TRANSPARENT 507#ifdef TRANSPARENT
501 if (OPTION (Opt_transparent)) 508 if (option (Opt_transparent))
502 { 509 {
503 XSelectInput (dpy, display->root, PropertyChangeMask); 510 XSelectInput (dpy, display->root, PropertyChangeMask);
504 check_our_parents (); 511 check_our_parents ();
505 rootwin_ev.start (display, display->root); 512 rootwin_ev.start (display, display->root);
506 } 513 }
514#endif
515#if ENABLE_PERL
516 rootwin_ev.start (display, display->root);
507#endif 517#endif
508 518
509 set_colorfgbg (); 519 set_colorfgbg ();
510 520
511 init_command (cmd_argv); 521 init_command (cmd_argv);
… …
700 if (scrollBar.state) 710 if (scrollBar.state)
701 { 711 {
702 sb_w = scrollbar_TotalWidth (); 712 sb_w = scrollbar_TotalWidth ();
703 szHint.base_width += sb_w; 713 szHint.base_width += sb_w;
704 714
705 if (!OPTION (Opt_scrollBar_right)) 715 if (!option (Opt_scrollBar_right))
706 window_vt_x += sb_w; 716 window_vt_x += sb_w;
707 } 717 }
708 718
709 szHint.width_inc = fwidth; 719 szHint.width_inc = fwidth;
710 szHint.height_inc = fheight; 720 szHint.height_inc = fheight;
… …
731 { 741 {
732 min_it (height, max_height); 742 min_it (height, max_height);
733 szHint.height = szHint.base_height + height; 743 szHint.height = szHint.base_height + height;
734 } 744 }
735 745
736 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 746 if (scrollBar.state && option (Opt_scrollBar_right))
737 window_sb_x = szHint.width - sb_w; 747 window_sb_x = szHint.width - sb_w;
738 748
739 if (recalc_x) 749 if (recalc_x)
740 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 750 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
741 751
… …
803 delete fontset[0]; 813 delete fontset[0];
804 fontset[0] = fs; 814 fontset[0] = fs;
805 815
806 prop = (*fs)[1]->properties (); 816 prop = (*fs)[1]->properties ();
807 prop.height += lineSpace; 817 prop.height += lineSpace;
818
808 fs->set_prop (prop); 819 fs->set_prop (prop, false);
809 820
810 fwidth = prop.width; 821 fwidth = prop.width;
811 fheight = prop.height; 822 fheight = prop.height;
812 fbase = prop.ascent; 823 fbase = prop.ascent;
813 824
… …
822 { 833 {
823 fontset[style] = fs = new rxvt_fontset (this); 834 fontset[style] = fs = new rxvt_fontset (this);
824 rxvt_fontprop prop2 = prop; 835 rxvt_fontprop prop2 = prop;
825 836
826 if (res) 837 if (res)
827 prop2.weight = prop2.slant = rxvt_fontprop::unset; 838 {
839 fs->populate (res);
840 fs->set_prop (prop2, false);
841 }
828 else 842 else
829 { 843 {
830 res = fontset[0]->fontdesc; 844 fs->populate (fontset[0]->fontdesc);
831 845
832 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;
833 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);
834 } 850 }
835 851
836 fs->populate (res);
837 fs->set_prop (prop2);
838 } 852 }
839#else 853#else
840 fontset[style] = fontset[0]; 854 fontset[style] = fontset[0];
841#endif 855#endif
842 } 856 }
… …
935 pix_colors_focused[idx] = xcol; 949 pix_colors_focused[idx] = xcol;
936 950
937 /* XSetWindowAttributes attr; */ 951 /* XSetWindowAttributes attr; */
938 /* Cursor cursor; */ 952 /* Cursor cursor; */
939done: 953done:
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. */ 954 /*TODO: handle Color_BD, scrollbar background, etc. */
951 955
956 update_fade_color (idx);
952 recolour_cursor (); 957 recolour_cursor ();
953 scr_recolour (); 958 scr_recolour ();
954} 959}
955 960
956#else 961#else
… …
1621 || !focus 1626 || !focus
1622 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1627 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1623 || !IMisRunning ()) 1628 || !IMisRunning ())
1624 return; 1629 return;
1625 1630
1626 if (input_style & XIMPreeditArea) 1631 if (input_style & XIMPreeditPosition)
1627 { 1632 {
1628 im_set_size (preedit_rect); 1633 im_set_size (preedit_rect);
1629 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1634 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1630 1635
1631 XSetICValues (Input_Context, 1636 XSetICValues (Input_Context,

Diff Legend

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