diff options
| author | Havoc Pennington <hp@pobox.com> | 2002-07-14 03:16:41 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2002-07-14 03:16:41 +0000 |
| commit | 812f7830849839e0bb562968cc9406f7821f1c19 (patch) | |
| tree | 20e02998e87839c8a22ba6088b03838feb2277e0 /src/prefs.h | |
| parent | 826a0c4e10c2737ef888d3782eb84cf66747b911 (diff) | |
| download | metacity-812f7830849839e0bb562968cc9406f7821f1c19.tar.gz | |
adapt to virtual modifiers (meta_display_process_mapping_event): we need
2002-07-13 Havoc Pennington <hp@pobox.com>
* src/keybindings.c: adapt to virtual modifiers
(meta_display_process_mapping_event): we need to reload the
binding tables now when the modmap changes.
* src/prefs.c (update_binding): parse virtual modifiers, not
plain modmask
* src/common.h (MetaVirtualModifer): new enum
* src/ui.c (meta_ui_parse_accelerator): use
egg_accelerator_parse_virtual()
* src/Makefile.am: add eggaccelerators.[hc] for the virtual
accelerator parsing function
Diffstat (limited to 'src/prefs.h')
| -rw-r--r-- | src/prefs.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/prefs.h b/src/prefs.h index 2d1508e7..c6cc0d03 100644 --- a/src/prefs.h +++ b/src/prefs.h @@ -173,7 +173,7 @@ typedef struct { const char *name; unsigned int keysym; - unsigned long mask; + MetaVirtualModifier modifiers; } MetaKeyPref; void meta_prefs_get_screen_bindings (const MetaKeyPref **bindings, @@ -181,8 +181,7 @@ void meta_prefs_get_screen_bindings (const MetaKeyPref **bindings, void meta_prefs_get_window_bindings (const MetaKeyPref **bindings, int *n_bindings); -MetaKeyBindingAction meta_prefs_get_keybinding_action (unsigned int keysym, - unsigned long mask); +MetaKeyBindingAction meta_prefs_get_keybinding_action (const char *name); #endif |