summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen W. Taylor <otaylor@fishsoup.net>2010-11-22 16:10:34 -0500
committerOwen W. Taylor <otaylor@fishsoup.net>2010-11-22 16:10:34 -0500
commitb031543f5ad4fb486b2c18bf1f7d950be5182d39 (patch)
treee9c941407048a6054b0331b7286d20516d4cc230
parentc6be05f9d7bf1bdf456eb10f3a035fb443dc3764 (diff)
downloadmutter-b031543f5ad4fb486b2c18bf1f7d950be5182d39.tar.gz
Fix updating overlay key keycode when keymap changes
overlay_key_combo needs the same treatment as other keycodes on a change - we should always recompute it if we have a keysym not a keycode, and not only if the keycode hasn't already been computed.
-rw-r--r--src/core/keybindings.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/keybindings.c b/src/core/keybindings.c
index ef3583ee2..6d93e9733 100644
--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -233,9 +233,8 @@ reload_keycodes (MetaDisplay *display)
{
meta_topic (META_DEBUG_KEYBINDINGS,
"Reloading keycodes for binding tables\n");
-
- if (display->overlay_key_combo.keysym
- && display->overlay_key_combo.keycode == 0)
+
+ if (display->overlay_key_combo.keysym != 0)
{
display->overlay_key_combo.keycode = XKeysymToKeycode (
display->xdisplay, display->overlay_key_combo.keysym);