Allow sending windows on other desktops to the current desktop.

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

diff --git a/openbox/actions/directionalwindows.c b/openbox/actions/directionalwindows.c
index f8393d2d9b035ca074b95440a32a8f0e70a63e1d..602e7edc33fb1dc26b67fc5fe28fc8335b5d64cc 100644 (file)
--- a/openbox/actions/directionalwindows.c
+++ b/openbox/actions/directionalwindows.c
@@ -265,7 +265,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) {
@@ -278,7 +278,7 @@ static gboolean i_input_func(guint initial_state,
         }
 
         /* 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) {
             end_cycle(FALSE, e->xkey.state, options);
             return FALSE;
         }