this fixes pypanel.. heh.

[chaz/openbox] / openbox / keyboard.c

diff --git a/openbox/keyboard.c b/openbox/keyboard.c
index f3400fca80b503b9b22a6406caa1d9eaa855dd8f..84ae2a38e2d25f7eac85b6c4f74644502b2c1641 100644 (file)
--- a/openbox/keyboard.c
+++ b/openbox/keyboard.c
@@ -78,7 +78,7 @@ static gboolean chain_timeout(gpointer data)
 
 static void set_curpos(KeyBindingTree *newpos)
 {
-    if (curpose != newpos) {
+    if (curpos != newpos) {
         grab_keys(FALSE);
         curpos = newpos;
         grab_keys(TRUE);
@@ -195,14 +195,15 @@ static void keyboard_interactive_end(guint state, gboolean cancel, Time time,
 
     g_assert(istate.active);
 
+    /* ungrab first so they won't be NotifyWhileGrabbed */
+    if (ungrab)
+        grab_keyboard(FALSE);
+
     alist = g_slist_append(NULL, istate.action);
     action_run_interactive(alist, istate.client, state, time, cancel, TRUE);
     g_slist_free(alist);
 
     istate.active = FALSE;
-
-    if (ungrab)
-        grab_keyboard(FALSE);
 }
 
 static void keyboard_interactive_end_client(ObClient *client, gpointer data)
@@ -249,7 +250,7 @@ gboolean keyboard_process_interactive_grab(const XEvent *e, ObClient **client)
                   handled = TRUE;
               }
         } else if (e->type == ButtonPress) {
-            cancel = FALSE;
+            cancel = TRUE;
             done = TRUE;
             handled = FALSE;
         }