diff options
| author | Derek Poon <gnomebugs@acrotect.com> | 2010-05-02 11:27:25 -0400 |
|---|---|---|
| committer | Owen W. Taylor <otaylor@fishsoup.net> | 2010-11-22 15:54:22 -0500 |
| commit | c262e3d65a37abedc507705cddfec72c901c321f (patch) | |
| tree | 82e23826b25cd4e98e6a78ffa1e7fa443922a827 | |
| parent | f60b3290db468e9f9d48dee6e0a193c3fe5e93d9 (diff) | |
| download | metacity-c262e3d65a37abedc507705cddfec72c901c321f.tar.gz | |
Update keybindings when XKB keyboard layout changes
* Select for XKB keyboard notification events explicitly; since GTK+
has selected for XKB events, delivery of old-school MappingNotify
events is disabled.
* Fix a bug where once a keycode was loaded for a key binding,
it would never be reassigned; we want to laod new keycodes for
all bindings that have a key symbol rather than a fixed
keycode.
[ With fixes from Owen W. Taylor <otaylor@fishsoup.net> ]
https://bugzilla.gnome.org/show_bug.cgi?id=565540
| -rw-r--r-- | src/core/display.c | 4 | ||||
| -rw-r--r-- | src/core/keybindings.c | 28 |
2 files changed, 31 insertions, 1 deletions
diff --git a/src/core/display.c b/src/core/display.c index 4c7b4c06..b59571d5 100644 --- a/src/core/display.c +++ b/src/core/display.c @@ -2391,6 +2391,10 @@ event_callback (XEvent *event, meta_bell_notify (display, xkb_ev); } break; + case XkbNewKeyboardNotify: + case XkbMapNotify: + meta_display_process_mapping_event (display, event); + break; } } #endif diff --git a/src/core/keybindings.c b/src/core/keybindings.c index 63596bb8..f6c276ab 100644 --- a/src/core/keybindings.c +++ b/src/core/keybindings.c @@ -262,9 +262,11 @@ reload_keycodes (MetaDisplay *display) i = 0; while (i < display->n_key_bindings) { - if (display->key_bindings[i].keycode == 0) + if (display->key_bindings[i].keysym != 0) + { display->key_bindings[i].keycode = XKeysymToKeycode ( display->xdisplay, display->key_bindings[i].keysym); + } ++i; } @@ -504,6 +506,22 @@ void meta_display_process_mapping_event (MetaDisplay *display, XEvent *event) { +#ifdef HAVE_XKB + if (event->type == display->xkb_base_event_type) + { + meta_topic (META_DEBUG_KEYBINDINGS, + "XKB mapping changed, will redo keybindings\n"); + + reload_keymap (display); + reload_modmap (display); + + reload_keycodes (display); + reload_modifiers (display); + + regrab_key_bindings (display); + } + else +#endif if (event->xmapping.request == MappingModifier) { meta_topic (META_DEBUG_KEYBINDINGS, @@ -589,6 +607,14 @@ meta_display_init_keys (MetaDisplay *display) /* Keys are actually grabbed in meta_screen_grab_keys() */ meta_prefs_add_listener (bindings_changed_callback, display); + +#ifdef HAVE_XKB + /* meta_display_init_keys() should have already called XkbQueryExtension() */ + if (display->xkb_base_event_type != -1) + XkbSelectEvents (display->xdisplay, XkbUseCoreKbd, + XkbNewKeyboardNotifyMask | XkbMapNotifyMask, + XkbNewKeyboardNotifyMask | XkbMapNotifyMask); +#endif } void |