summaryrefslogtreecommitdiff
path: root/src/core/display.c
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-11-12 18:35:06 +0100
committerinfirit <[email protected]>2014-11-12 20:36:49 +0100
commit1de3cf470353049ee9974bd6d9a437f556931bea (patch)
tree66ee1e5424e65f54ecd5097869009672d2b6de2c /src/core/display.c
parentad9db61aabc2cbf743a1157ddc42ff76127f3fab (diff)
downloadmarco-1de3cf470353049ee9974bd6d9a437f556931bea.tar.bz2
marco-1de3cf470353049ee9974bd6d9a437f556931bea.tar.xz
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 <[email protected]> ] Based on metacity commit: c262e3d65a37abedc507705cddfec72c901c321f From: Derek Poon <[email protected]> Gnome bug: https://bugzilla.gnome.org/show_bug.cgi?id=565540
Diffstat (limited to 'src/core/display.c')
-rw-r--r--src/core/display.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/core/display.c b/src/core/display.c
index 68569f3a..8a81d8f4 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -2580,6 +2580,10 @@ static gboolean event_callback(XEvent* event, gpointer data)
meta_bell_notify (display, xkb_ev);
}
break;
+ case XkbNewKeyboardNotify:
+ case XkbMapNotify:
+ meta_display_process_mapping_event (display, event);
+ break;
}
}
#endif