summaryrefslogtreecommitdiff
path: root/src/manage.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/manage.c')
-rw-r--r--src/manage.c17
1 files changed, 11 insertions, 6 deletions
diff --git a/src/manage.c b/src/manage.c
index 46e174e..b11dc4a 100644
--- a/src/manage.c
+++ b/src/manage.c
@@ -122,7 +122,7 @@ grab_top_level_keys (Window w)
for (i=0; i<map->actions_last; i++)
{
PRINT_DEBUG(("%d\n", i));
- grab_key (XKeysymToKeycode (dpy, map->actions[i].key), map->actions[i].state, w);
+ grab_key (map->actions[i].key, map->actions[i].state, w);
}
#endif
}
@@ -130,23 +130,28 @@ grab_top_level_keys (Window w)
void
ungrab_top_level_keys (Window w)
{
-#ifdef HIDE_MOUSE
-#else
- rp_keymap *map = find_keymap (TOP_KEYMAP);
+ KeySym keysym, upper, lower;
+ rp_keymap *map;
int i;
+ map = find_keymap (TOP_KEYMAP);
+
if (map == NULL)
{
PRINT_ERROR (("Unable to find " TOP_KEYMAP " keymap\n"));
return;
}
+ /* Make sure we ungrab the right sym. */
+
for (i=0; i<map->actions_last; i++)
{
PRINT_DEBUG(("%d\n", i));
- XUngrabKey(dpy, XKeysymToKeycode (dpy, map->actions[i].key), AnyModifier, w);
+ keysym = map->actions[i].key;
+ XConvertCase (keysym, &lower, &upper);
+ keysym = lower;
+ XUngrabKey(dpy, XKeysymToKeycode (dpy, keysym), AnyModifier, w);
}
-#endif
}
void