From: Dana Jansens <danakj@orodu.net>
Date: Fri, 26 Mar 2010 02:17:05 +0000 (-0400)
Subject: make keypad enter do the same thing as return
X-Git-Tag: release-3.5.0~148
X-Git-Url: http://git.openbox.org/?p=dana%2Fopenbox.git;a=commitdiff_plain;h=e7d5ef84180ea9dc51427ba5f3524f67b6506a67

make keypad enter do the same thing as return
---

diff --git a/openbox/actions/cyclewindows.c b/openbox/actions/cyclewindows.c
index 6d852fd..6bd9657 100644
--- a/openbox/actions/cyclewindows.c
+++ b/openbox/actions/cyclewindows.c
@@ -195,7 +195,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) {
             o->cancel = FALSE;
             o->state = e->xkey.state;
             return FALSE;
diff --git a/openbox/actions/desktop.c b/openbox/actions/desktop.c
index cc0d965..04b0bdd 100644
--- a/openbox/actions/desktop.c
+++ b/openbox/actions/desktop.c
@@ -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 */
diff --git a/openbox/actions/directionalwindows.c b/openbox/actions/directionalwindows.c
index d67c3ef..602e7ed 100644
--- a/openbox/actions/directionalwindows.c
+++ b/openbox/actions/directionalwindows.c
@@ -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;
         }
diff --git a/openbox/event.c b/openbox/event.c
index b3cdf4d..d63ae2b 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -1882,7 +1882,7 @@ static gboolean event_handle_menu_input(XEvent *ev)
                 ret = TRUE;
             }
 
-            else if (sym == XK_Return) {
+            else if (sym == XK_Return || sym == XK_KP_Enter) {
                 frame->press_doexec = TRUE;
                 ret = TRUE;
             }
diff --git a/openbox/moveresize.c b/openbox/moveresize.c
index 6dcadd6..466d866 100644
--- a/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@ -916,7 +916,7 @@ gboolean moveresize_event(XEvent *e)
         if (sym == XK_Escape) {
             moveresize_end(TRUE);
             used = TRUE;
-        } else if (sym == XK_Return) {
+        } else if (sym == XK_Return || sym == XK_KP_Enter) {
             moveresize_end(FALSE);
             used = TRUE;
         } else if (sym == XK_Right || sym == XK_Left ||
diff --git a/openbox/prompt.c b/openbox/prompt.c
index 6df991a..3c5de40 100644
--- a/openbox/prompt.c
+++ b/openbox/prompt.c
@@ -540,7 +540,7 @@ gboolean prompt_key_event(ObPrompt *self, XEvent *e)
 
     if (sym == XK_Escape)
         prompt_cancel(self);
-    else if (sym == XK_Return || sym == XK_space)
+    else if (sym == XK_Return || sym == XK_KP_Enter || sym == XK_space)
         prompt_run_callback(self, self->focus->result);
     else if (sym == XK_Tab || sym == XK_Left || sym == XK_Right) {
         gint i;