X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fkeyboard.c;h=218e251accebbdf69476e157246abfdf9dc73a09;hb=5074d902aa215a2a656980d31b19574a5db1f795;hp=1534e1983162d95b1b3d532a57c2181bd649d583;hpb=acfa2af3c2eacd099869cc5aebdcfa1241214e8b;p=chaz%2Fopenbox

diff --git a/openbox/keyboard.c b/openbox/keyboard.c
index 1534e198..218e251a 100644
--- a/openbox/keyboard.c
+++ b/openbox/keyboard.c
@@ -78,11 +78,11 @@ static gboolean chain_timeout(gpointer data)
 
 static void set_curpos(KeyBindingTree *newpos)
 {
-    if (curpos != newpos) {
-        grab_keys(FALSE);
-        curpos = newpos;
-        grab_keys(TRUE);
-    }
+    if (curpos == newpos) return;
+
+    grab_keys(FALSE);
+    curpos = newpos;
+    grab_keys(TRUE);
 
     if (curpos != NULL) {
         gchar *text = NULL;
@@ -197,13 +197,15 @@ static void keyboard_interactive_end(guint state, gboolean cancel, Time time,
 
     /* ungrab first so they won't be NotifyWhileGrabbed */
     if (ungrab)
-        grab_keyboard(FALSE);
+        ungrab_keyboard();
+
+    /* set this before running the actions so they know the keyboard is not
+       grabbed */
+    istate.active = 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;
 }
 
 static void keyboard_interactive_end_client(ObClient *client, gpointer data)
@@ -212,13 +214,19 @@ 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) {
-        if (!grab_keyboard(TRUE))
+        if (!grab_keyboard())
             return FALSE;
     } else if (action->func != istate.action->func) {
         keyboard_interactive_end(state, TRUE, action->data.any.time, FALSE);
@@ -333,7 +341,7 @@ void keyboard_shutdown(gboolean reconfig)
         client_remove_destroy_notify(keyboard_interactive_end_client);
 
     if (istate.active)
-        keyboard_interactive_end(0, TRUE, 0, TRUE);
+        keyboard_interactive_cancel();
 
     ob_main_loop_timeout_remove(ob_main_loop, chain_timeout);