Remove GDK_LOCK_MASK before calling gdk_keymap_translate_keyboard_state so

Tue Aug 12 14:27:42 2003  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkkeyhash.c (_gtk_key_hash_lookup): Remove
        GDK_LOCK_MASK before calling
        gdk_keymap_translate_keyboard_state so bindings
        and accelerators are independent of the Caps-lock
        key. (#115384, reported by Toni Willberg)

diff --git a/ChangeLog b/ChangeLog
index 9c66860f4181a7261f933b40c93d9fe47c5b54e9..60c06f08cb8f5d78b29190cf35a53d4239ccef84 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue Aug 12 14:27:42 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkkeyhash.c (_gtk_key_hash_lookup): Remove
+       GDK_LOCK_MASK before calling
+       gdk_keymap_translate_keyboard_state so bindings 
+       and accelerators are independent of the Caps-lock
+       key. (#115384, reported by Toni Willberg)
+
 Mon Aug 11 12:07:14 2003  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkevents-x11.c (get_real_window): Add missing

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9c66860f4181a7261f933b40c93d9fe47c5b54e9..60c06f08cb8f5d78b29190cf35a53d4239ccef84 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Tue Aug 12 14:27:42 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkkeyhash.c (_gtk_key_hash_lookup): Remove
+       GDK_LOCK_MASK before calling
+       gdk_keymap_translate_keyboard_state so bindings 
+       and accelerators are independent of the Caps-lock
+       key. (#115384, reported by Toni Willberg)
+
 Mon Aug 11 12:07:14 2003  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkevents-x11.c (get_real_window): Add missing

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 9c66860f4181a7261f933b40c93d9fe47c5b54e9..60c06f08cb8f5d78b29190cf35a53d4239ccef84 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+Tue Aug 12 14:27:42 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkkeyhash.c (_gtk_key_hash_lookup): Remove
+       GDK_LOCK_MASK before calling
+       gdk_keymap_translate_keyboard_state so bindings 
+       and accelerators are independent of the Caps-lock
+       key. (#115384, reported by Toni Willberg)
+
 Mon Aug 11 12:07:14 2003  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkevents-x11.c (get_real_window): Add missing

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9c66860f4181a7261f933b40c93d9fe47c5b54e9..60c06f08cb8f5d78b29190cf35a53d4239ccef84 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Tue Aug 12 14:27:42 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkkeyhash.c (_gtk_key_hash_lookup): Remove
+       GDK_LOCK_MASK before calling
+       gdk_keymap_translate_keyboard_state so bindings 
+       and accelerators are independent of the Caps-lock
+       key. (#115384, reported by Toni Willberg)
+
 Mon Aug 11 12:07:14 2003  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkevents-x11.c (get_real_window): Add missing

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9c66860f4181a7261f933b40c93d9fe47c5b54e9..60c06f08cb8f5d78b29190cf35a53d4239ccef84 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Tue Aug 12 14:27:42 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkkeyhash.c (_gtk_key_hash_lookup): Remove
+       GDK_LOCK_MASK before calling
+       gdk_keymap_translate_keyboard_state so bindings 
+       and accelerators are independent of the Caps-lock
+       key. (#115384, reported by Toni Willberg)
+
 Mon Aug 11 12:07:14 2003  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkevents-x11.c (get_real_window): Add missing

diff --git a/gtk/gtkkeyhash.c b/gtk/gtkkeyhash.c
index 604c9ccd7b2280e6a656e490e7dd9ca6602428e7..beca28d3c6954bff28a985d9a48edf345ee35286 100644 (file)
--- a/gtk/gtkkeyhash.c
+++ b/gtk/gtkkeyhash.c
@@ -336,6 +336,10 @@ _gtk_key_hash_lookup (GtkKeyHash      *key_hash,
   gint level;
   GdkModifierType consumed_modifiers;
 
+  /* We don't want Caps_Lock to affect keybinding lookups.
+   */
+  state &= ~GDK_LOCK_MASK;
+  
   gdk_keymap_translate_keyboard_state (key_hash->keymap,
                                       hardware_keycode, state, group,
                                       &keyval, &effective_group, &level, &consumed_modifiers);