summaryrefslogtreecommitdiff
path: root/src/command.c
diff options
context:
space:
mode:
authorMichael Jennings <mej@kainx.org>2000-03-25 02:18:14 +0000
committerMichael Jennings <mej@kainx.org>2000-03-25 02:18:14 +0000
commit6d3c3ff6dc9a381b89130be7214331030f7da2f0 (patch)
tree162cc68a25ff1cc61e92e155e98eea8fb28aa369 /src/command.c
parent22160247e48c38d7047440fd8eda8ac82c304e98 (diff)
downloadeterm-6d3c3ff6dc9a381b89130be7214331030f7da2f0.tar.gz
Fri Mar 24 18:16:02 PST 2000 Michael Jennings <mej@eterm.org>
Added a patch from Kimball Thurston <kimball@sgrail.com> for XIM. I also added support for two new escape sequences at the request of Cale Gibbard <gibbard@bfree.on.ca>. "\e]Pnrrggbb" can now be used to modify the color palette at runtime, and "\e]R" will restore the defaults. These are compatible with the Linux console. SVN revision: 2323
Diffstat (limited to 'src/command.c')
-rw-r--r--src/command.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/command.c b/src/command.c
index 4394003..c642213 100644
--- a/src/command.c
+++ b/src/command.c
@@ -1846,16 +1846,14 @@ xim_real_init(void)
}
/* try with XMODIFIERS env. var. */
- if (xim == NULL && (p = XSetLocaleModifiers("")) != NULL && *p) {
+ if (xim == NULL && getenv("XMODIFIERS") && (p = XSetLocaleModifiers("")) != NULL && *p) {
xim = XOpenIM(Xdisplay, NULL, NULL, NULL);
}
-#ifndef USE_X11R6_XIM
/* try with no modifiers base */
if (xim == NULL && (p = XSetLocaleModifiers("@im=none")) != NULL && *p) {
xim = XOpenIM(Xdisplay, NULL, NULL, NULL);
}
-#endif
if (xim == NULL) {
xim = XOpenIM(Xdisplay, NULL, NULL, NULL);