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.223 by root, Sat Feb 18 14:14:43 2006 UTC

… …
198void rxvt_term::emergency_cleanup () 198void rxvt_term::emergency_cleanup ()
199{ 199{
200 if (cmd_pid) 200 if (cmd_pid)
201 kill (-cmd_pid, SIGHUP); 201 kill (-cmd_pid, SIGHUP);
202 202
203 pty_ev.stop ();
203 delete pty; pty = 0; 204 delete pty; pty = 0;
204} 205}
205 206
206rxvt_term::~rxvt_term () 207rxvt_term::~rxvt_term ()
207{ 208{
… …
1621 || !focus 1622 || !focus
1622 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1623 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1623 || !IMisRunning ()) 1624 || !IMisRunning ())
1624 return; 1625 return;
1625 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 {
1626 /* Getting the necessary width of preedit area */ 1637 /* Getting the necessary width of preedit area */
1627 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1638 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1628 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1639 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1629 XFree (status_attr); 1640 XFree (status_attr);
1630 1641
1631 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1642 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1632 XFree (needed_rect); 1643 XFree (needed_rect);
1633 1644
1634 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1645 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1635 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1646 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1636 1647
1637 XSetICValues (Input_Context, 1648 XSetICValues (Input_Context,
1638 XNPreeditAttributes, preedit_attr, 1649 XNPreeditAttributes, preedit_attr,
1639 XNStatusAttributes, status_attr, 1650 XNStatusAttributes, status_attr,
1640 NULL); 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