Pass the actual input keycode to XIM, rather than the result of

Fri Sep  6 12:41:16 2002  Owen Taylor  <otaylor@redhat.com>
        * 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.
This commit is contained in:
Owen Taylor
2002-09-06 16:48:40 +00:00
committed by Owen Taylor
parent 66257c44e0
commit 7c7bcb243f
8 changed files with 64 additions and 2 deletions

View File

@ -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