X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=plugins%2Fkeyboard%2Fkeyboard.c;h=add2b473d665a01e887d08dab78ff33a5c2bf0f7;hb=68ff2eb3d2d7874e780000143cbee9a8e7c2e57f;hp=22ea5556bcb4b2580a2dd739ab32f54b6e667c61;hpb=1d5fa24e4b92fbd2fc16847612a6825ca08d6567;p=chaz%2Fopenbox

diff --git a/plugins/keyboard/keyboard.c b/plugins/keyboard/keyboard.c
index 22ea5556..add2b473 100644
--- a/plugins/keyboard/keyboard.c
+++ b/plugins/keyboard/keyboard.c
@@ -1,16 +1,19 @@
-#include "../../kernel/focus.h"
-#include "../../kernel/dispatch.h"
-#include "../../kernel/openbox.h"
-#include "../../kernel/grab.h"
-#include "../../kernel/action.h"
+#include "kernel/focus.h"
+#include "kernel/dispatch.h"
+#include "kernel/openbox.h"
+#include "kernel/event.h"
+#include "kernel/grab.h"
+#include "kernel/action.h"
+#include "kernel/parse.h"
 #include "tree.h"
 #include "keyboard.h"
-#include "keysrc.h"
+#include "keyparse.h"
 #include "translate.h"
 #include <glib.h>
 
 void plugin_setup_config()
 {
+    parse_reg_section("keyboard", keyparse);
 }
 
 KeyBindingTree *firstnode;
@@ -40,7 +43,7 @@ static void reset_chains()
 	grabbed = FALSE;
         grab_keyboard(FALSE);
     } else
-        XAllowEvents(ob_display, AsyncKeyboard, CurrentTime);
+        XAllowEvents(ob_display, AsyncKeyboard, event_lasttime);
 }
 
 gboolean kbind(GList *keylist, Action *action)
@@ -102,7 +105,8 @@ static void press(ObEvent *e, void *foo)
                     if (!grabbed) {
                         grab_keyboard(TRUE);
                         grabbed = TRUE;
-                        XAllowEvents(ob_display, AsyncKeyboard, CurrentTime);
+                        XAllowEvents(ob_display, AsyncKeyboard,
+                                     event_lasttime);
                     }
                     curpos = p;
                 } else {
@@ -129,8 +133,6 @@ void plugin_startup()
     dispatch_register(Event_X_KeyPress, (EventHandler)press, NULL);
 
     translate_key("C-g", &reset_state, &reset_key);
-
-    keysrc_parse();
 }
 
 void plugin_shutdown()