make control keys work in menus/dialogs/etc with the new obt code, using XLookup...

[chaz/openbox] / openbox / event.c

diff --git a/openbox/event.c b/openbox/event.c
index 4b45cf69688f80e6f2774ed1bfb02aa51142289d..13fd31142cbb676defa5caa78a9ccb26c19b3858 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -1765,12 +1765,10 @@ static gboolean event_handle_menu_input(XEvent *ev)
     }
     else if (ev->type == KeyPress || ev->type == KeyRelease) {
         guint mods;
-        gunichar unikey;
         ObMenuFrame *frame;
 
         /* get the modifiers */
         mods = obt_keyboard_only_modmasks(ev->xkey.state);
-        unikey = obt_keyboard_keycode_to_unichar(ev->xkey.keycode);
 
         frame = find_active_or_last_menu();
         if (frame == NULL)
@@ -1778,14 +1776,21 @@ static gboolean event_handle_menu_input(XEvent *ev)
 
         /* Allow control while going thru the menu */
         else if (ev->type == KeyPress && (mods & ~ControlMask) == 0) {
+            gunichar unikey;
+            KeySym sym;
+
             frame->got_press = TRUE;
+            frame->press_keycode = ev->xkey.keycode;
+            frame->press_doexec = FALSE;
+
+            sym = obt_keyboard_keypress_to_keysym(ev);
 
-            if (ob_keycode_match(ev->xkey.keycode, OB_KEY_ESCAPE)) {
+            if (sym == XK_Escape) {
                 menu_frame_hide_all();
                 ret = TRUE;
             }
 
-            else if (ob_keycode_match(ev->xkey.keycode, OB_KEY_LEFT)) {
+            else if (sym == XK_Left) {
                 /* Left goes to the parent menu */
                 if (frame->parent) {
                     /* remove focus from the child */
@@ -1797,7 +1802,7 @@ static gboolean event_handle_menu_input(XEvent *ev)
                 ret = TRUE;
             }
 
-            else if (ob_keycode_match(ev->xkey.keycode, OB_KEY_RIGHT)) {
+            else if (sym == XK_Right) {
                 /* Right goes to the selected submenu */
                 if (frame->selected->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU)
                 {
@@ -1808,47 +1813,37 @@ static gboolean event_handle_menu_input(XEvent *ev)
                 ret = TRUE;
             }
 
-            else if (ob_keycode_match(ev->xkey.keycode, OB_KEY_UP)) {
+            else if (sym == XK_Up) {
                 menu_frame_select_previous(frame);
                 ret = TRUE;
             }
 
-            else if (ob_keycode_match(ev->xkey.keycode, OB_KEY_DOWN)) {
+            else if (sym == XK_Down) {
                 menu_frame_select_next(frame);
                 ret = TRUE;
             }
 
-            else if (ob_keycode_match(ev->xkey.keycode, OB_KEY_HOME)) {
+            else if (sym == XK_Home) {
                 menu_frame_select_first(frame);
                 ret = TRUE;
             }
 
-            else if (ob_keycode_match(ev->xkey.keycode, OB_KEY_END)) {
+            else if (sym == XK_End) {
                 menu_frame_select_last(frame);
                 ret = TRUE;
             }
-        }
-
-        /* Use KeyRelease events for running things so that the key release
-           doesn't get sent to the focused application.
-
-           Allow ControlMask only, and don't bother if the menu is empty */
-        else if (ev->type == KeyRelease && (mods & ~ControlMask) == 0 &&
-                 frame->entries && frame->got_press)
-        {
-            if (ob_keycode_match(ev->xkey.keycode, OB_KEY_RETURN)) {
-                /* Enter runs the active item or goes into the submenu.
-                   Control-Enter runs it without closing the menu. */
-                if (frame->child)
-                    menu_frame_select_next(frame->child);
-                else if (frame->selected)
-                    menu_entry_frame_execute(frame->selected, ev->xkey.state);
 
+            else if (sym == XK_Return) {
+                frame->press_doexec = TRUE;
                 ret = TRUE;
             }
 
             /* keyboard accelerator shortcuts. (if it was a valid key) */
-            else if (unikey != 0) {
+            else if (frame->entries &&
+                     (unikey =
+                      obt_keyboard_keypress_to_unichar(menu_frame_ic(frame),
+                                                       ev)))
+            {
                 GList *start;
                 GList *it;
                 ObMenuEntryFrame *found = NULL;
@@ -1886,23 +1881,30 @@ static gboolean event_handle_menu_input(XEvent *ev)
                 } while (it != start);
 
                 if (found) {
-                    if (found->entry->type == OB_MENU_ENTRY_TYPE_NORMAL &&
-                        num_found == 1)
-                    {
-                        menu_frame_select(frame, found, TRUE);
-                        usleep(50000); /* highlight the item for a short bit so
-                                          the user can see what happened */
-                        menu_entry_frame_execute(found, ev->xkey.state);
-                    } else {
-                        menu_frame_select(frame, found, TRUE);
-                        if (num_found == 1)
-                            menu_frame_select_next(frame->child);
-                    }
+                    menu_frame_select(frame, found, TRUE);
 
+                    if (num_found == 1)
+                        frame->press_doexec = TRUE;
                     ret = TRUE;
                 }
             }
         }
+
+        /* Use KeyRelease events for running things so that the key release
+           doesn't get sent to the focused application.
+
+           Allow ControlMask only, and don't bother if the menu is empty */
+        else if (ev->type == KeyRelease && (mods & ~ControlMask) == 0) {
+            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)
+                    menu_entry_frame_execute(frame->selected, ev->xkey.state);
+            }
+        }
     }
 
     return ret;