From: Jonathan Blandford Date: Thu, 10 Jan 2002 02:02:59 +0000 (+0000) Subject: get the types as well as the symbols because we need them in X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=50a641ae483a09e943a508962fe345b419f0ae11;p=~andy%2Fgtk get the types as well as the symbols because we need them in Wed Jan 9 20:56:42 2002 Jonathan Blandford * gdk/x11/gdkkeys-x11.c (get_xkb): get the types as well as the symbols because we need them in MyEnhancedXkbTranslateKeyCode. --- diff --git a/ChangeLog b/ChangeLog index 5a5f0ef17..4b10e60f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Jan 9 20:56:42 2002 Jonathan Blandford + + * gdk/x11/gdkkeys-x11.c (get_xkb): get the types as well as the + symbols because we need them in MyEnhancedXkbTranslateKeyCode. + 2002-01-10 Tor Lillqvist Apply the same fixes and improvements as to the diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 5a5f0ef17..4b10e60f8 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Wed Jan 9 20:56:42 2002 Jonathan Blandford + + * gdk/x11/gdkkeys-x11.c (get_xkb): get the types as well as the + symbols because we need them in MyEnhancedXkbTranslateKeyCode. + 2002-01-10 Tor Lillqvist Apply the same fixes and improvements as to the diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 5a5f0ef17..4b10e60f8 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Wed Jan 9 20:56:42 2002 Jonathan Blandford + + * gdk/x11/gdkkeys-x11.c (get_xkb): get the types as well as the + symbols because we need them in MyEnhancedXkbTranslateKeyCode. + 2002-01-10 Tor Lillqvist Apply the same fixes and improvements as to the diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 5a5f0ef17..4b10e60f8 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Wed Jan 9 20:56:42 2002 Jonathan Blandford + + * gdk/x11/gdkkeys-x11.c (get_xkb): get the types as well as the + symbols because we need them in MyEnhancedXkbTranslateKeyCode. + 2002-01-10 Tor Lillqvist Apply the same fixes and improvements as to the diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 5a5f0ef17..4b10e60f8 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Wed Jan 9 20:56:42 2002 Jonathan Blandford + + * gdk/x11/gdkkeys-x11.c (get_xkb): get the types as well as the + symbols because we need them in MyEnhancedXkbTranslateKeyCode. + 2002-01-10 Tor Lillqvist Apply the same fixes and improvements as to the diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 5a5f0ef17..4b10e60f8 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Wed Jan 9 20:56:42 2002 Jonathan Blandford + + * gdk/x11/gdkkeys-x11.c (get_xkb): get the types as well as the + symbols because we need them in MyEnhancedXkbTranslateKeyCode. + 2002-01-10 Tor Lillqvist Apply the same fixes and improvements as to the diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 5a5f0ef17..4b10e60f8 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Wed Jan 9 20:56:42 2002 Jonathan Blandford + + * gdk/x11/gdkkeys-x11.c (get_xkb): get the types as well as the + symbols because we need them in MyEnhancedXkbTranslateKeyCode. + 2002-01-10 Tor Lillqvist Apply the same fixes and improvements as to the diff --git a/gdk/x11/gdkkeys-x11.c b/gdk/x11/gdkkeys-x11.c index db587736c..4e0a92883 100644 --- a/gdk/x11/gdkkeys-x11.c +++ b/gdk/x11/gdkkeys-x11.c @@ -68,7 +68,7 @@ get_xkb (void) if (xkb_desc == NULL) { - xkb_desc = XkbGetMap (gdk_display, XkbKeySymsMask, XkbUseCoreKbd); + xkb_desc = XkbGetMap (gdk_display, XkbKeySymsMask | XkbKeyTypesMask, XkbUseCoreKbd); if (xkb_desc == NULL) g_error ("Failed to get keymap"); @@ -76,7 +76,7 @@ get_xkb (void) } else if (current_serial != _gdk_keymap_serial) { - XkbGetUpdatedMap (gdk_display, XkbKeySymsMask, xkb_desc); + XkbGetUpdatedMap (gdk_display, XkbKeySymsMask | XkbKeyTypesMask, xkb_desc); XkbGetNames (gdk_display, XkbGroupNamesMask, xkb_desc); }