callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
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.
2002-09-05 jacob berkman <jacob@ximian.com> 2002-09-05 jacob berkman <jacob@ximian.com>
* configure.in: fix non-solaris xinerama checks (bug #89732) * configure.in: fix non-solaris xinerama checks (bug #89732)

10
ChangeLog.pre-2-10
View File

@ -1,3 +1,13 @@
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.
2002-09-05 jacob berkman <jacob@ximian.com> 2002-09-05 jacob berkman <jacob@ximian.com>
* configure.in: fix non-solaris xinerama checks (bug #89732) * configure.in: fix non-solaris xinerama checks (bug #89732)

10
ChangeLog.pre-2-2
View File

@ -1,3 +1,13 @@
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.
2002-09-05 jacob berkman <jacob@ximian.com> 2002-09-05 jacob berkman <jacob@ximian.com>
* configure.in: fix non-solaris xinerama checks (bug #89732) * configure.in: fix non-solaris xinerama checks (bug #89732)

10
ChangeLog.pre-2-4
View File

@ -1,3 +1,13 @@
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.
2002-09-05 jacob berkman <jacob@ximian.com> 2002-09-05 jacob berkman <jacob@ximian.com>
* configure.in: fix non-solaris xinerama checks (bug #89732) * configure.in: fix non-solaris xinerama checks (bug #89732)

10
ChangeLog.pre-2-6
View File

@ -1,3 +1,13 @@
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.
2002-09-05 jacob berkman <jacob@ximian.com> 2002-09-05 jacob berkman <jacob@ximian.com>
* configure.in: fix non-solaris xinerama checks (bug #89732) * configure.in: fix non-solaris xinerama checks (bug #89732)

10
ChangeLog.pre-2-8
View File

@ -1,3 +1,13 @@
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.
2002-09-05 jacob berkman <jacob@ximian.com> 2002-09-05 jacob berkman <jacob@ximian.com>
* configure.in: fix non-solaris xinerama checks (bug #89732) * configure.in: fix non-solaris xinerama checks (bug #89732)

4
gtk/gtkimmodule.c
View File

@ -532,7 +532,9 @@ _gtk_im_module_get_default_context_id (const gchar *locale)
gtk_im_module_init (); gtk_im_module_init ();
envvar = g_getenv ("GTK_IM_MODULE"); 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); return g_strdup (envvar);
/* Strip the locale code down to the essentials /* Strip the locale code down to the essentials

2
modules/input/gtkimcontextxim.c
View File

@ -375,7 +375,7 @@ gtk_im_context_xim_filter_keypress (GtkIMContext *context,
xevent.x = xevent.x_root = 0; xevent.x = xevent.x_root = 0;
xevent.y = xevent.y_root = 0; xevent.y = xevent.y_root = 0;
xevent.state = event->state; xevent.state = event->state;
xevent.keycode = event->keyval ? XKeysymToKeycode (xevent.display, event->keyval) : 0; xevent.keycode = event->hardware_keycode;
xevent.same_screen = True; xevent.same_screen = True;
if (XFilterEvent ((XEvent *)&xevent, GDK_DRAWABLE_XID (context_xim->client_window))) if (XFilterEvent ((XEvent *)&xevent, GDK_DRAWABLE_XID (context_xim->client_window)))