change in how things are ungrabbed to avoid grabwhilenotify. don't ungrab every key...

[chaz/openbox] / openbox / keyboard.c

diff --git a/openbox/keyboard.c b/openbox/keyboard.c
index bee264f6f56f05efb71d7fc25f4bbed7cc9d09aa..218e251accebbdf69476e157246abfdf9dc73a09 100644 (file)
--- a/openbox/keyboard.c
+++ b/openbox/keyboard.c
@@ -78,6 +78,8 @@ static gboolean chain_timeout(gpointer data)
 
 static void set_curpos(KeyBindingTree *newpos)
 {
+    if (curpos == newpos) return;
+
     grab_keys(FALSE);
     curpos = newpos;
     grab_keys(TRUE);
@@ -193,16 +195,17 @@ static void keyboard_interactive_end(guint state, gboolean cancel, Time time,
 
     g_assert(istate.active);
 
-    alist = g_slist_append(NULL, istate.action);
-    action_run_interactive(alist, istate.client, state, time, cancel, TRUE);
-    g_slist_free(alist);
+    /* ungrab first so they won't be NotifyWhileGrabbed */
+    if (ungrab)
+        ungrab_keyboard();
 
+    /* set this before running the actions so they know the keyboard is not
+       grabbed */
     istate.active = FALSE;
 
-    if (ungrab) {
-        grab_keyboard(FALSE);
-        grab_pointer(FALSE, FALSE, OB_CURSOR_NONE);
-    }
+    alist = g_slist_append(NULL, istate.action);
+    action_run_interactive(alist, istate.client, state, time, cancel, TRUE);
+    g_slist_free(alist);
 }
 
 static void keyboard_interactive_end_client(ObClient *client, gpointer data)
@@ -211,19 +214,22 @@ static void keyboard_interactive_end_client(ObClient *client, gpointer data)
         istate.client = NULL;
 }
 
+
+void keyboard_interactive_cancel()
+{
+    keyboard_interactive_end(0, TRUE, event_curtime, TRUE);
+}
+
 gboolean keyboard_interactive_grab(guint state, ObClient *client,
                                    ObAction *action)
 {
     g_assert(action->data.any.interactive);
 
     if (!istate.active) {
-        grab_pointer(TRUE, FALSE, OB_CURSOR_POINTER);
-        if (!grab_keyboard(TRUE)) {
-            grab_pointer(FALSE, FALSE, OB_CURSOR_NONE);
+        if (!grab_keyboard())
             return FALSE;
-        }
     } else if (action->func != istate.action->func) {
-        keyboard_interactive_end(state, FALSE, action->data.any.time, FALSE);
+        keyboard_interactive_end(state, TRUE, action->data.any.time, FALSE);
     }
 
     istate.active = TRUE;
@@ -240,22 +246,29 @@ gboolean keyboard_process_interactive_grab(const XEvent *e, ObClient **client)
     gboolean done = FALSE;
     gboolean cancel = FALSE;
 
-    if ((e->type == KeyRelease && !(istate.state & e->xkey.state)))
-        done = TRUE;
-    else if (e->type == KeyPress) {
-        /*if (e->xkey.keycode == ob_keycode(OB_KEY_RETURN))
-          done = TRUE;
-          else */if (e->xkey.keycode == ob_keycode(OB_KEY_ESCAPE))
-              cancel = done = TRUE;
-    } else if (e->type == ButtonPress)
-        cancel = done = TRUE;
+    if (istate.active) {
+        if ((e->type == KeyRelease && !(istate.state & e->xkey.state))) {
+            done = TRUE;
+            handled = TRUE;
+        } else if (e->type == KeyPress) {
+            /*if (e->xkey.keycode == ob_keycode(OB_KEY_RETURN))
+              done = TRUE;
+              else */if (e->xkey.keycode == ob_keycode(OB_KEY_ESCAPE)) {
+                  cancel = done = TRUE;
+                  handled = TRUE;
+              }
+        } else if (e->type == ButtonPress) {
+            cancel = TRUE;
+            done = TRUE;
+            handled = FALSE;
+        }
 
-    if (done) {
-        keyboard_interactive_end(e->xkey.state, cancel, e->xkey.time, TRUE);
+        if (done)
+            keyboard_interactive_end(e->xkey.state, cancel, e->xkey.time,TRUE);
 
-        handled = TRUE;
-    } else
-        *client = istate.client;
+        if (handled)
+            *client = istate.client;
+    }
 
     return handled;
 }
@@ -319,17 +332,16 @@ void keyboard_startup(gboolean reconfig)
     popup = popup_new(FALSE);
 
     if (!reconfig)
-        client_add_destructor(keyboard_interactive_end_client, NULL);
+        client_add_destroy_notify(keyboard_interactive_end_client, NULL);
 }
 
 void keyboard_shutdown(gboolean reconfig)
 {
-    GSList *it;
-
     if (!reconfig)
-        client_remove_destructor(keyboard_interactive_end_client);
+        client_remove_destroy_notify(keyboard_interactive_end_client);
 
-    istate.active = FALSE;
+    if (istate.active)
+        keyboard_interactive_cancel();
 
     ob_main_loop_timeout_remove(ob_main_loop, chain_timeout);