make keypad enter do the same thing as return

[chaz/openbox] / openbox / actions / desktop.c

diff --git a/openbox/actions/desktop.c b/openbox/actions/desktop.c
index 10b31acd535c9fc6b086e106a8a007a312333b71..04b0bdd5f26687cd3703a0695e0aede722bea30c 100644 (file)
--- a/openbox/actions/desktop.c
+++ b/openbox/actions/desktop.c
@@ -316,7 +316,7 @@ static gboolean i_input_func(guint initial_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) {
@@ -327,7 +327,7 @@ static gboolean i_input_func(guint initial_state,
             return FALSE;
 
         /* 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_state)
             return FALSE;
     }
     /* They released the modifiers */