grab the keybaord before cycling focus for reduced latency

[chaz/openbox] / plugins / keyboard / keyboard.c

diff --git a/plugins/keyboard/keyboard.c b/plugins/keyboard/keyboard.c
index d1d93241a77e5422ace3440325179aa475f3b341..3a663dfa4862f3fd1252756a36d79cf00a58f34d 100644 (file)
--- a/plugins/keyboard/keyboard.c
+++ b/plugins/keyboard/keyboard.c
@@ -5,8 +5,8 @@
 #include "kernel/grab.h"
 #include "kernel/action.h"
 #include "kernel/prop.h"
-#include "kernel/parse.h"
 #include "kernel/timer.h"
+#include "parser/parse.h"
 #include "tree.h"
 #include "keyboard.h"
 #include "translate.h"
@@ -45,7 +45,7 @@ static void parse_key(xmlDocPtr doc, xmlNodePtr node, GList *keylist)
     if (keylist) {
         nact = parse_find_node("action", node);
         while (nact) {
-            if ((action = parse_action(doc, nact))) {
+            if ((action = action_parse(doc, nact))) {
                 /* validate that its okay for a key binding */
                 if (action->func == action_moveresize &&
                     action->data.moveresize.corner !=
@@ -217,15 +217,14 @@ static void event(ObEvent *e, void *foo)
                                 act->data.cycle.cancel = FALSE;
                             }
 
-                            act->data.any.c = focus_client;
-                            act->func(&act->data);
-
                             if (act->func == action_cycle_windows &&
                                 !grabbed_key) {
                                 grabbed_key = p;
                                 grab_keyboard(TRUE);
-                                break;
                             }
+
+                            act->data.any.c = focus_client;
+                            act->func(&act->data);
                         }
                     }