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.220 by root, Sat Feb 11 10:53:37 2006 UTC vs.
Revision 1.231 by root, Sun Aug 27 10:14:47 2006 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),
150#endif 155#endif
151#ifdef HAVE_SCROLLBARS 156#ifdef HAVE_SCROLLBARS
152 scrollbar_ev (this, &rxvt_term::x_cb), 157 scrollbar_ev (this, &rxvt_term::x_cb),
153#endif 158#endif
… …
198void rxvt_term::emergency_cleanup () 203void rxvt_term::emergency_cleanup ()
199{ 204{
200 if (cmd_pid) 205 if (cmd_pid)
201 kill (-cmd_pid, SIGHUP); 206 kill (-cmd_pid, SIGHUP);
202 207
208 pty_ev.stop ();
203 delete pty; pty = 0; 209 delete pty; pty = 0;
204} 210}
205 211
206rxvt_term::~rxvt_term () 212rxvt_term::~rxvt_term ()
207{ 213{
… …
264 } 270 }
265 271
266 clear (); 272 clear ();
267 } 273 }
268 274
269 delete pix_colors_focused; 275 delete [] pix_colors_focused;
270#if OFF_FOCUS_FADING 276#if OFF_FOCUS_FADING
271 delete pix_colors_unfocused; 277 delete [] pix_colors_unfocused;
272#endif 278#endif
273 279
274 displays.put (display); 280 displays.put (display);
275 281
276 scr_release (); 282 scr_release ();
… …
325 im_ev.stop (display); 331 im_ev.stop (display);
326#endif 332#endif
327#if HAVE_SCROLLBARS 333#if HAVE_SCROLLBARS
328 scrollbar_ev.stop (display); 334 scrollbar_ev.stop (display);
329#endif 335#endif
330#if TRANSPARENT 336#if TRANSPARENT || ENABLE_PERL
331 rootwin_ev.stop (display); 337 rootwin_ev.stop (display);
332#endif 338#endif
333 incr_ev.stop (); 339 incr_ev.stop ();
334 termwin_ev.stop (display); 340 termwin_ev.stop (display);
335 vt_ev.stop (display); 341 vt_ev.stop (display);
… …
503 XSelectInput (dpy, display->root, PropertyChangeMask); 509 XSelectInput (dpy, display->root, PropertyChangeMask);
504 check_our_parents (); 510 check_our_parents ();
505 rootwin_ev.start (display, display->root); 511 rootwin_ev.start (display, display->root);
506 } 512 }
507#endif 513#endif
514#if ENABLE_PERL
515 rootwin_ev.start (display, display->root);
516#endif
508 517
509 set_colorfgbg (); 518 set_colorfgbg ();
510 519
511 init_command (cmd_argv); 520 init_command (cmd_argv);
512 521
… …
803 delete fontset[0]; 812 delete fontset[0];
804 fontset[0] = fs; 813 fontset[0] = fs;
805 814
806 prop = (*fs)[1]->properties (); 815 prop = (*fs)[1]->properties ();
807 prop.height += lineSpace; 816 prop.height += lineSpace;
817
808 fs->set_prop (prop); 818 fs->set_prop (prop, false);
809 819
810 fwidth = prop.width; 820 fwidth = prop.width;
811 fheight = prop.height; 821 fheight = prop.height;
812 fbase = prop.ascent; 822 fbase = prop.ascent;
813 823
… …
822 { 832 {
823 fontset[style] = fs = new rxvt_fontset (this); 833 fontset[style] = fs = new rxvt_fontset (this);
824 rxvt_fontprop prop2 = prop; 834 rxvt_fontprop prop2 = prop;
825 835
826 if (res) 836 if (res)
827 prop2.weight = prop2.slant = rxvt_fontprop::unset; 837 {
838 fs->populate (res);
839 fs->set_prop (prop2, false);
840 }
828 else 841 else
829 { 842 {
830 res = fontset[0]->fontdesc; 843 fs->populate (fontset[0]->fontdesc);
831 844
832 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 845 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; 846 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
847
848 fs->set_prop (prop2, true);
834 } 849 }
835 850
836 fs->populate (res);
837 fs->set_prop (prop2);
838 } 851 }
839#else 852#else
840 fontset[style] = fontset[0]; 853 fontset[style] = fontset[0];
841#endif 854#endif
842 } 855 }
… …
935 pix_colors_focused[idx] = xcol; 948 pix_colors_focused[idx] = xcol;
936 949
937 /* XSetWindowAttributes attr; */ 950 /* XSetWindowAttributes attr; */
938 /* Cursor cursor; */ 951 /* Cursor cursor; */
939done: 952done:
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. */ 953 /*TODO: handle Color_BD, scrollbar background, etc. */
951 954
955 update_fade_color (idx);
952 recolour_cursor (); 956 recolour_cursor ();
953 scr_recolour (); 957 scr_recolour ();
954} 958}
955 959
956#else 960#else
… …
1621 || !focus 1625 || !focus
1622 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1626 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1623 || !IMisRunning ()) 1627 || !IMisRunning ())
1624 return; 1628 return;
1625 1629
1630 if (input_style & XIMPreeditPosition)
1631 {
1632 im_set_size (preedit_rect);
1633 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1634
1635 XSetICValues (Input_Context,
1636 XNPreeditAttributes, preedit_attr, NULL);
1637 }
1638 else
1639 {
1626 /* Getting the necessary width of preedit area */ 1640 /* Getting the necessary width of preedit area */
1627 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1641 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1628 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1642 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1629 XFree (status_attr); 1643 XFree (status_attr);
1630 1644
1631 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1645 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1632 XFree (needed_rect); 1646 XFree (needed_rect);
1633 1647
1634 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1648 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1635 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1649 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1636 1650
1637 XSetICValues (Input_Context, 1651 XSetICValues (Input_Context,
1638 XNPreeditAttributes, preedit_attr, 1652 XNPreeditAttributes, preedit_attr,
1639 XNStatusAttributes, status_attr, 1653 XNStatusAttributes, status_attr,
1640 NULL); 1654 NULL);
1641 1655
1656 XFree (status_attr);
1657 }
1658
1642 XFree (preedit_attr); 1659 XFree (preedit_attr);
1643 XFree (status_attr);
1644} 1660}
1645#endif /* USE_XIM */ 1661#endif /* USE_XIM */
1646 1662
1647/*----------------------- end-of-file (C source) -----------------------*/ 1663/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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