diff --git a/ChangeLog b/ChangeLog index 95ffefc862..ac4aa00cf5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Fri Sep 6 12:41:16 2002 Owen Taylor + + * modules/input/gtkimcontextxim.c: Pass the actual input + keycode to XIM, rather than the result of backconverting + the keysym. Fixes the <> input problem! (#74922) + + * gtk/gtkimmodule.c: Fix bug where GTK_IM_MODULE environment + variable couldn't be used to force the input method to + the default input method. + 2002-09-05 jacob berkman * configure.in: fix non-solaris xinerama checks (bug #89732) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 95ffefc862..ac4aa00cf5 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,13 @@ +Fri Sep 6 12:41:16 2002 Owen Taylor + + * modules/input/gtkimcontextxim.c: Pass the actual input + keycode to XIM, rather than the result of backconverting + the keysym. Fixes the <> input problem! (#74922) + + * gtk/gtkimmodule.c: Fix bug where GTK_IM_MODULE environment + variable couldn't be used to force the input method to + the default input method. + 2002-09-05 jacob berkman * configure.in: fix non-solaris xinerama checks (bug #89732) diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 95ffefc862..ac4aa00cf5 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,13 @@ +Fri Sep 6 12:41:16 2002 Owen Taylor + + * modules/input/gtkimcontextxim.c: Pass the actual input + keycode to XIM, rather than the result of backconverting + the keysym. Fixes the <> input problem! (#74922) + + * gtk/gtkimmodule.c: Fix bug where GTK_IM_MODULE environment + variable couldn't be used to force the input method to + the default input method. + 2002-09-05 jacob berkman * configure.in: fix non-solaris xinerama checks (bug #89732) diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 95ffefc862..ac4aa00cf5 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,13 @@ +Fri Sep 6 12:41:16 2002 Owen Taylor + + * modules/input/gtkimcontextxim.c: Pass the actual input + keycode to XIM, rather than the result of backconverting + the keysym. Fixes the <> input problem! (#74922) + + * gtk/gtkimmodule.c: Fix bug where GTK_IM_MODULE environment + variable couldn't be used to force the input method to + the default input method. + 2002-09-05 jacob berkman * configure.in: fix non-solaris xinerama checks (bug #89732) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 95ffefc862..ac4aa00cf5 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,13 @@ +Fri Sep 6 12:41:16 2002 Owen Taylor + + * modules/input/gtkimcontextxim.c: Pass the actual input + keycode to XIM, rather than the result of backconverting + the keysym. Fixes the <> input problem! (#74922) + + * gtk/gtkimmodule.c: Fix bug where GTK_IM_MODULE environment + variable couldn't be used to force the input method to + the default input method. + 2002-09-05 jacob berkman * configure.in: fix non-solaris xinerama checks (bug #89732) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 95ffefc862..ac4aa00cf5 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,13 @@ +Fri Sep 6 12:41:16 2002 Owen Taylor + + * modules/input/gtkimcontextxim.c: Pass the actual input + keycode to XIM, rather than the result of backconverting + the keysym. Fixes the <> input problem! (#74922) + + * gtk/gtkimmodule.c: Fix bug where GTK_IM_MODULE environment + variable couldn't be used to force the input method to + the default input method. + 2002-09-05 jacob berkman * configure.in: fix non-solaris xinerama checks (bug #89732) diff --git a/gtk/gtkimmodule.c b/gtk/gtkimmodule.c index ff571c75bc..571ee906f8 100644 --- a/gtk/gtkimmodule.c +++ b/gtk/gtkimmodule.c @@ -532,7 +532,9 @@ _gtk_im_module_get_default_context_id (const gchar *locale) gtk_im_module_init (); envvar = g_getenv ("GTK_IM_MODULE"); - if (envvar && g_hash_table_lookup (contexts_hash, envvar)) + if (envvar && + (strcmp (envvar, SIMPLE_ID) == 0 || + g_hash_table_lookup (contexts_hash, envvar))) return g_strdup (envvar); /* Strip the locale code down to the essentials diff --git a/modules/input/gtkimcontextxim.c b/modules/input/gtkimcontextxim.c index d46501af60..c4e3439e88 100644 --- a/modules/input/gtkimcontextxim.c +++ b/modules/input/gtkimcontextxim.c @@ -375,7 +375,7 @@ gtk_im_context_xim_filter_keypress (GtkIMContext *context, xevent.x = xevent.x_root = 0; xevent.y = xevent.y_root = 0; xevent.state = event->state; - xevent.keycode = event->keyval ? XKeysymToKeycode (xevent.display, event->keyval) : 0; + xevent.keycode = event->hardware_keycode; xevent.same_screen = True; if (XFilterEvent ((XEvent *)&xevent, GDK_DRAWABLE_XID (context_xim->client_window)))