all repos — openbox @ 2e82715a4a53fbab6d359c76aa58581c4087ddaf

openbox fork - make it a bit more like ryudo 

Show the submenu and move focus there with the enter key when the submenu isn't shown yet.
Dana Jansens danakj@orodu.net
commit

2e82715a4a53fbab6d359c76aa58581c4087ddaf

parent

f14bf9cac2a6a98e34f81c195d4e4bece5df5f16

1 files changed, 18 insertions(+), 16 deletions(-)

jump to
M openbox/event.c → openbox/event.c 
@@ -1859,14 +1859,23 @@ }
                 ret = TRUE;
             }
 
-            else if (sym == XK_Right) {
-                /* Right goes to the selected submenu */
-                if (frame->selected &&
-                    frame->selected->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU)
-                {
-                    /* make sure it is visible */
-                    menu_frame_select(frame, frame->selected, TRUE);
-                    menu_frame_select_next(frame->child);
+            else if (sym == XK_Right || sym == XK_Return || sym == XK_KP_Enter)
+            {
+                /* Right and enter goes to the selected submenu.
+                   Enter executes instead if it's not on a submenu. */
+
+                if (frame->selected) {
+                    const ObMenuEntryType t = frame->selected->entry->type;
+
+                    if (t == OB_MENU_ENTRY_TYPE_SUBMENU) {
+                        /* make sure it is visible */
+                        menu_frame_select(frame, frame->selected, TRUE);
+                        /* move focus to the child menu */
+                        menu_frame_select_next(frame->child);
+                    }
+                    else if (sym != XK_Right) {
+                        frame->press_doexec = TRUE;
+                    }
                 }
                 ret = TRUE;
             }

@@ -1888,11 +1897,6 @@ }
 
             else if (sym == XK_End) {
                 menu_frame_select_last(frame);
-                ret = TRUE;
-            }
-
-            else if (sym == XK_Return || sym == XK_KP_Enter) {
-                frame->press_doexec = TRUE;
                 ret = TRUE;
             }
 

@@ -1957,9 +1961,7 @@ if (frame->press_keycode == ev->xkey.keycode &&
                 frame->got_press &&
                 frame->press_doexec)
             {
-                if (frame->child)
-                    menu_frame_select_next(frame->child);
-                else if (frame->selected)
+                if (frame->selected)
                     menu_entry_frame_execute(frame->selected, ev->xkey.state);
             }
         }