diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-02-21 17:14:10 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-02-21 17:14:10 +0000 |
| commit | 708e1a95749ad61cb0167f729a77e951a30388cf (patch) | |
| tree | 772eb9a2ff7cdfd6e94d79973a0a7645c9d41861 /gtk/gtkwidget.c | |
| parent | 3b94ae4be5e2efaae91446c365077e8f5f4ee90d (diff) | |
| download | gtk+-708e1a95749ad61cb0167f729a77e951a30388cf.tar.gz | |
Implement "fuzzy" key binding lookups; allow matches on key and level but
Wed Feb 20 14:26:47 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkkeyhash.[ch]: Implement "fuzzy" key binding lookups;
allow matches on key and level but not group. Also, implement
ignoring "consumed modifiers correctly."
* gtk/gtkaccelgroup.c gtk/gtkbindings.c: Convert to using
GtkKeyHash.
* gtk/gtkdebug.h gtk/gtkmain.c: Support GTK_DEBUG=keybindings
* gdk/x11/gdkevents-x11.c (gdk_event_translate): Fill in
the group for key release events as well as key press events.
* gdk/gdkkeys.h gdk/x11/gdkkeys-x11.c (gdk_keymap_translate_keyboard_state):
Rename unused_modifiers to consumed_modifiers, make the docs and
non-Xkb implementation match the Xkb implementation.
* gdk/linux-fb/gdkkeyboard-fb.c gdk/win32/gdkkeys-win32.c: Propagate
doc and parameter name changes.
* gdk/x11/gdkkeys-x11.c (gdk_keymap_translate_keyboard_state):
XkbTranslateKeyCode doesn't handle LockMask, we need to handle
it ourselves.
* gdk/x11/gdkkeys-x11.c (gdk_keymap_translate_keyboard_state): Force
<Shift>Tab to give GDK_ISO_Left_Tab, since we need consistency
to allow dealing with ISO_Left_Tab.
* gtk/gtkwindow.c gtk/gtktextview.c gtk/gtkscrolledwindow.c
gtk/gtkpaned.c gtk/gtkcombo.c gtk/gtknotebook.c:
Remove inappropriate uses of GDK_ISO_Left_Tab. (GDK_ISO_Left_Tab
or <Shift>Tab both are equivalent as a binding specifier.)
* gtk/gtkbutton.c (gtk_button_class_init): Make ::activate
GTK_RUN_ACTION, so you can bind an accelerator to it.
* gtk/gtklabel.c (gtk_label_set_uline_text_internal): Call
gdk_unicode_to_keyval on the mnemonic character.
* tests/testgtk.c: Add a test for the new fuzzy key binding matching.
Diffstat (limited to 'gtk/gtkwidget.c')
| -rw-r--r-- | gtk/gtkwidget.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 293cd6f625..af9719e714 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -2871,9 +2871,7 @@ gtk_widget_real_key_press_event (GtkWidget *widget, gboolean handled = FALSE; if (!handled) - handled = gtk_bindings_activate (GTK_OBJECT (widget), - event->keyval, - event->state); + handled = _gtk_bindings_activate_event (GTK_OBJECT (widget), event); return handled; } @@ -2885,9 +2883,7 @@ gtk_widget_real_key_release_event (GtkWidget *widget, gboolean handled = FALSE; if (!handled) - handled = gtk_bindings_activate (GTK_OBJECT (widget), - event->keyval, - event->state | GDK_RELEASE_MASK); + handled = _gtk_bindings_activate_event (GTK_OBJECT (widget), event); return handled; } |