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.219 by root, Sat Feb 11 02:28:19 2006 UTC vs.
Revision 1.230 by root, Sun Aug 27 10:10:25 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
… …
832 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 842 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; 843 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
834 } 844 }
835 845
836 fs->populate (res); 846 fs->populate (res);
837 fs->set_prop (prop2); 847 fs->set_prop (prop2, true);
838 } 848 }
839#else 849#else
840 fontset[style] = fontset[0]; 850 fontset[style] = fontset[0];
841#endif 851#endif
842 } 852 }
… …
935 pix_colors_focused[idx] = xcol; 945 pix_colors_focused[idx] = xcol;
936 946
937 /* XSetWindowAttributes attr; */ 947 /* XSetWindowAttributes attr; */
938 /* Cursor cursor; */ 948 /* Cursor cursor; */
939done: 949done:
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. */ 950 /*TODO: handle Color_BD, scrollbar background, etc. */
951 951
952 update_fade_color (idx);
952 recolour_cursor (); 953 recolour_cursor ();
953 scr_recolour (); 954 scr_recolour ();
954} 955}
955 956
956#else 957#else
… …
1119 if (pixmap) 1120 if (pixmap)
1120 scr_touch (false); 1121 scr_touch (false);
1121#endif 1122#endif
1122 1123
1123#ifdef USE_XIM 1124#ifdef USE_XIM
1124 IMSetStatusPosition (); 1125 IMSetPosition ();
1125#endif 1126#endif
1126} 1127}
1127 1128
1128/* 1129/*
1129 * Set the width/height of the vt window in characters. Units are pixels. 1130 * Set the width/height of the vt window in characters. Units are pixels.
… …
1526 preedit_attr, 1527 preedit_attr,
1527 status_attr ? XNStatusAttributes : NULL, 1528 status_attr ? XNStatusAttributes : NULL,
1528 status_attr, NULL); 1529 status_attr, NULL);
1529 1530
1530 if (preedit_attr) XFree (preedit_attr); 1531 if (preedit_attr) XFree (preedit_attr);
1531 if (status_attr) XFree (status_attr); 1532 if (status_attr) XFree (status_attr);
1532 if (fs) XFreeFontSet (dpy, fs); 1533 if (fs) XFreeFontSet (dpy, fs);
1533 1534
1534 if (Input_Context == NULL) 1535 if (Input_Context == NULL)
1535 { 1536 {
1536 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1537 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1537 im_destroy (); 1538 im_destroy ();
… …
1542 // unfortunately, only the focus window is used by XIM, hard to fix 1543 // unfortunately, only the focus window is used by XIM, hard to fix
1543 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1544 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1544 vt_select_input (); 1545 vt_select_input ();
1545#endif 1546#endif
1546 1547
1547 if (input_style & XIMPreeditArea)
1548 IMSetStatusPosition (); 1548 IMSetPosition ();
1549 1549
1550 return true; 1550 return true;
1551} 1551}
1552 1552
1553void 1553void
… …
1611 SET_LOCALE (locale); 1611 SET_LOCALE (locale);
1612#endif 1612#endif
1613} 1613}
1614 1614
1615void 1615void
1616rxvt_term::IMSetStatusPosition () 1616rxvt_term::IMSetPosition ()
1617{ 1617{
1618 XRectangle preedit_rect, status_rect, *needed_rect; 1618 XRectangle preedit_rect, status_rect, *needed_rect;
1619 XVaNestedList preedit_attr, status_attr; 1619 XVaNestedList preedit_attr, status_attr;
1620 1620
1621 if (!Input_Context 1621 if (!Input_Context
1622 || !focus 1622 || !focus
1623 || !(input_style & XIMPreeditArea) 1623 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1624 || !IMisRunning ()) 1624 || !IMisRunning ())
1625 return; 1625 return;
1626 1626
1627 if (input_style & XIMPreeditPosition)
1628 {
1629 im_set_size (preedit_rect);
1630 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1631
1632 XSetICValues (Input_Context,
1633 XNPreeditAttributes, preedit_attr, NULL);
1634 }
1635 else
1636 {
1627 /* Getting the necessary width of preedit area */ 1637 /* Getting the necessary width of preedit area */
1628 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1638 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1629 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1639 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1630 XFree (status_attr); 1640 XFree (status_attr);
1631 1641
1632 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1642 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1633 XFree (needed_rect); 1643 XFree (needed_rect);
1634 1644
1635 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1645 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1636 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1646 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1637 1647
1638 XSetICValues (Input_Context, 1648 XSetICValues (Input_Context,
1639 XNPreeditAttributes, preedit_attr, 1649 XNPreeditAttributes, preedit_attr,
1640 XNStatusAttributes, status_attr, NULL); 1650 XNStatusAttributes, status_attr,
1651 NULL);
1641 1652
1653 XFree (status_attr);
1654 }
1655
1642 XFree (preedit_attr); 1656 XFree (preedit_attr);
1643 XFree (status_attr);
1644} 1657}
1645#endif /* USE_XIM */ 1658#endif /* USE_XIM */
1646 1659
1647/*----------------------- end-of-file (C source) -----------------------*/ 1660/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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