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

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

diff --git a/openbox/actions/desktop.c b/openbox/actions/desktop.c
index 5b0282cc69f1edb87460aaba3ee61a9e0511c977..6c30d56de3fb9e28df54e36d4bc358c8083a2bb0 100644 (file)
--- a/openbox/actions/desktop.c
+++ b/openbox/actions/desktop.c
@@ -2,7 +2,7 @@
 #include "openbox/screen.h"
 #include "openbox/client.h"
 #include "openbox/openbox.h"
-#include <glib.h>
+#include "obt/keyboard.h"
 
 typedef enum {
     LAST,
@@ -43,6 +43,7 @@ static gboolean run_func(ObActionsData *data, gpointer options);
 static gboolean i_pre_func(guint state, gpointer options);
 static gboolean i_input_func(guint initial_state,
                              XEvent *e,
+                             ObtIC *ic,
                              gpointer options,
                              gboolean *used);
 static void i_post_func(gpointer options);
@@ -297,25 +298,32 @@ static gboolean run_func(ObActionsData *data, gpointer options)
 
 static gboolean i_input_func(guint initial_state,
                              XEvent *e,
+                             ObtIC *ic,
                              gpointer options,
                              gboolean *used)
 {
+    guint mods;
+
+    mods = obt_keyboard_only_modmasks(e->xkey.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);
+    }
+
     if (e->type == KeyPress) {
+        KeySym sym = obt_keyboard_keypress_to_keysym(e);
+
         /* Escape cancels no matter what */
-        if (ob_keycode_match(e->xkey.keycode, OB_KEY_ESCAPE)) {
+        if (sym == XK_Escape)
             return FALSE;
-        }
 
         /* There were no modifiers and they pressed enter */
-        else if (ob_keycode_match(e->xkey.keycode, OB_KEY_RETURN) &&
-                 !initial_state)
-        {
+        else if (sym == XK_Return && !initial_state)
             return FALSE;
-        }
     }
     /* They released the modifiers */
-    else if (e->type == KeyRelease && initial_state &&
-             (e->xkey.state & initial_state) == 0)
+    else if (e->type == KeyRelease && initial_state && !(mods & initial_state))
     {
         return FALSE;
     }