gpointer options,
gboolean *used)
{
- guint mods;
+ guint mods, initial_mods;
+ initial_mods = obt_keyboard_only_modmasks(initial_state);
mods = obt_keyboard_only_modmasks(e->xkey.state);
if (e->type == KeyRelease) {
/* remove from the state the mask of the modifier key being
released, if it is a modifier key being released that is */
- mods &= ~obt_keyboard_keycode_to_modmask(e->xkey.keycode);
+ mods &= ~obt_keyboard_keyevent_to_modmask(e);
}
if (e->type == KeyPress) {
}
/* There were no modifiers and they pressed enter */
- else if (sym == XK_Return && !initial_state) {
+ else if ((sym == XK_Return || sym == XK_KP_Enter) && !initial_mods) {
end_cycle(FALSE, e->xkey.state, options);
return FALSE;
}
}
/* They released the modifiers */
- else if (e->type == KeyRelease && initial_state && !(mods & initial_state))
- {
+ else if (e->type == KeyRelease && initial_mods && !(mods & initial_mods)) {
end_cycle(FALSE, e->xkey.state, options);
return FALSE;
}