diff options
| author | Michael Jennings <mej@kainx.org> | 2000-11-25 02:55:40 +0000 |
|---|---|---|
| committer | Michael Jennings <mej@kainx.org> | 2000-11-25 02:55:40 +0000 |
| commit | 30106904c3c0fa19dff5d075edf69a091242e16c (patch) | |
| tree | eef205be69278fdd548e45d578f3407b67429373 /src/command.c | |
| parent | c5a411161538ac351d164637894ad8b46031e8c0 (diff) | |
| download | eterm-30106904c3c0fa19dff5d075edf69a091242e16c.tar.gz | |
Fri Nov 24 18:53:13 PST 2000 Michael Jennings <mej@eterm.org>
At the request of Snow-Man <sfrost@snowman.net>, I added the build
date to the output of --version. While I was at it, I also added the
RCS ident strings.
I also applied a patch from Sung-Hyun Nam <namsh@lgic.co.kr> that
fixes XIM-related seg faults during clean-up.
SVN revision: 3919
Diffstat (limited to 'src/command.c')
| -rw-r--r-- | src/command.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/command.c b/src/command.c index 2125ff7..3a3f592 100644 --- a/src/command.c +++ b/src/command.c @@ -1141,6 +1141,10 @@ clean_exit(void) } #endif #ifdef USE_XIM + if (xim_input_context) { + XUnsetICFocus(xim_input_context); + XDestroyIC(xim_input_context); + } if (xim_input_method) { XCloseIM(xim_input_method); } @@ -1767,6 +1771,11 @@ init_locale(void) if (strcmp(locale, "C")) # endif { +#ifdef MULTI_CHARSET + TermWin.fontset = create_fontset(etfonts[def_font_idx], etmfonts[def_font_idx]); +#else + TermWin.fontset = create_fontset(etfonts[def_font_idx], "-misc-fixed-medium-r-semicondensed--13-*-75-*-c-*-iso10646-1"); +#endif if (xim_real_init() != -1) { return; } @@ -1776,11 +1785,6 @@ init_locale(void) # endif } #endif -#ifdef MULTI_CHARSET - TermWin.fontset = create_fontset(etfonts[def_font_idx], etmfonts[def_font_idx]); -#else - TermWin.fontset = create_fontset(etfonts[def_font_idx], "-misc-fixed-medium-r-semicondensed--13-*-75-*-c-*-iso10646-1"); -#endif /* Reset locale to NULL since the call to create_fontset() has freed that memory. */ locale = NULL; } |