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

[chaz/openbox] / openbox / prompt.c

diff --git a/openbox/prompt.c b/openbox/prompt.c
index 9fd56773a726ee3d04205f1fae0498bede663e09..b10d8a18e91844349a7a2d9e78060ea0cea957cb 100644 (file)
--- a/openbox/prompt.c
+++ b/openbox/prompt.c
@@ -525,6 +525,7 @@ gboolean prompt_key_event(ObPrompt *self, XEvent *e)
 {
     gboolean shift;
     guint shift_mask, mods;
+    KeySym sym;
 
     if (e->type != KeyPress) return FALSE;
 
@@ -536,23 +537,18 @@ gboolean prompt_key_event(ObPrompt *self, XEvent *e)
     if (mods != 0 && mods != shift_mask)
         return FALSE;
 
-    if (ob_keycode_match(e->xkey.keycode, OB_KEY_ESCAPE))
+    sym = obt_keyboard_keypress_to_keysym(e);
+
+    if (sym == XK_Escape)
         prompt_cancel(self);
-    else if (ob_keycode_match(e->xkey.keycode, OB_KEY_RETURN) ||
-             ob_keycode_match(e->xkey.keycode, OB_KEY_SPACE))
-    {
+    else if (sym == XK_Return || sym == XK_space)
         prompt_run_callback(self, self->focus->result);
-    }
-    else if (ob_keycode_match(e->xkey.keycode, OB_KEY_TAB) ||
-             ob_keycode_match(e->xkey.keycode, OB_KEY_LEFT) ||
-             ob_keycode_match(e->xkey.keycode, OB_KEY_RIGHT))
-    {
+    else if (sym == XK_Tab || sym == XK_Left || sym == XK_Right) {
         gint i;
         gboolean left;
         ObPromptElement *oldfocus;
 
-        left = ob_keycode_match(e->xkey.keycode, OB_KEY_LEFT) ||
-            (ob_keycode_match(e->xkey.keycode, OB_KEY_TAB) && shift);
+        left = (sym == XK_Left) || ((sym == XK_Tab) && shift);
         oldfocus = self->focus;
 
         for (i = 0; i < self->n_buttons; ++i)