summaryrefslogtreecommitdiff
path: root/src/modules/conf_keybindings
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2012-08-20 09:16:47 +0000
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>2012-08-20 09:16:47 +0000
commit943b953ece31ff666039b80b415fc8fd067f626e (patch)
tree6f2cd183d0fc788e613ee6336747218c64179b63 /src/modules/conf_keybindings
parent6896025d1accb0a734d58069670666b41c7e605f (diff)
whoops, broke multi-key grabs for a minute there
SVN revision: 75459
Diffstat (limited to 'src/modules/conf_keybindings')
-rw-r--r--src/modules/conf_keybindings/e_int_config_keybindings.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/modules/conf_keybindings/e_int_config_keybindings.c b/src/modules/conf_keybindings/e_int_config_keybindings.c
index 0b7528507..c9e97f6fc 100644
--- a/src/modules/conf_keybindings/e_int_config_keybindings.c
+++ b/src/modules/conf_keybindings/e_int_config_keybindings.c
@@ -1006,7 +1006,15 @@ _grab_key_down_cb(void *data,
1006 unsigned int mod = E_BINDING_MODIFIER_NONE; 1006 unsigned int mod = E_BINDING_MODIFIER_NONE;
1007 unsigned int n, found; 1007 unsigned int n, found;
1008 1008
1009 1009 if (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT)
1010 mod |= E_BINDING_MODIFIER_SHIFT;
1011 if (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL)
1012 mod |= E_BINDING_MODIFIER_CTRL;
1013 if (ev->modifiers & ECORE_EVENT_MODIFIER_ALT)
1014 mod |= E_BINDING_MODIFIER_ALT;
1015 if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN)
1016 mod |= E_BINDING_MODIFIER_WIN;
1017
1010 if (cfdata->locals.add) 1018 if (cfdata->locals.add)
1011 found = !!e_util_binding_match(cfdata->binding.key, ev, &n, NULL); 1019 found = !!e_util_binding_match(cfdata->binding.key, ev, &n, NULL);
1012 else if (cfdata->locals.cur && cfdata->locals.cur[0]) 1020 else if (cfdata->locals.cur && cfdata->locals.cur[0])