X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=plugins%2Fkeyboard%2Fkeyboard.c;h=7e2df47536109d826f068ccc15ddfdf16aadf86a;hb=a61cecfe3a30baa4ab001491bb1df4fdc86b66d1;hp=9b9c0882da295c6d2e1bed453299fafd889b5300;hpb=6d0b40120156a22770f704c20dde21997b1c270a;p=chaz%2Fopenbox

diff --git a/plugins/keyboard/keyboard.c b/plugins/keyboard/keyboard.c
index 9b9c0882..7e2df475 100644
--- a/plugins/keyboard/keyboard.c
+++ b/plugins/keyboard/keyboard.c
@@ -1,10 +1,13 @@
 #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 "tree.h"
 #include "keyboard.h"
+#include "keysrc.h"
+#include "translate.h"
 #include <glib.h>
 
 void plugin_setup_config()
@@ -37,10 +40,11 @@ static void reset_chains()
     if (grabbed) {
 	grabbed = FALSE;
         grab_keyboard(FALSE);
-    }
+    } else
+        XAllowEvents(ob_display, AsyncKeyboard, event_lasttime);
 }
 
-static gboolean kbind(GList *keylist, Action *action)
+gboolean kbind(GList *keylist, Action *action)
 {
     KeyBindingTree *tree, *t;
     gboolean conflict;
@@ -48,10 +52,8 @@ static gboolean kbind(GList *keylist, Action *action)
     g_assert(keylist != NULL);
     g_assert(action != NULL);
 
-    if (!(tree = tree_build(keylist))) {
-        g_warning("invalid binding");
+    if (!(tree = tree_build(keylist)))
         return FALSE;
-    }
     if ((t = tree_find(tree, &conflict)) != NULL) {
 	/* already bound to something */
 	g_warning("keychain is already bound");
@@ -101,6 +103,8 @@ static void press(ObEvent *e, void *foo)
                     if (!grabbed) {
                         grab_keyboard(TRUE);
                         grabbed = TRUE;
+                        XAllowEvents(ob_display, AsyncKeyboard,
+                                     event_lasttime);
                     }
                     curpos = p;
                 } else {
@@ -120,66 +124,15 @@ static void press(ObEvent *e, void *foo)
             p = p->next_sibling;
         }
     }
-    XAllowEvents(ob_display, AsyncKeyboard, e->data.x.e->xkey.time);
-}
-
-static void binddef()
-{
-    GList *list = g_list_append(NULL, NULL);
-    Action *a;
-
-    /* When creating an Action struct, all of the data elements in the
-       appropriate struct need to be set, except the Client*, which will be set
-       at call-time when then action function is used.
-    */
-
-    list->data = "A-Right";
-    a = action_new(action_next_desktop);
-    a->data.nextprevdesktop.wrap = TRUE;
-    kbind(list, a);
-
-    list->data = "A-Left";
-    a = action_new(action_previous_desktop);
-    a->data.nextprevdesktop.wrap = TRUE;
-    kbind(list, a);
-
-    list->data = "A-1";
-    a = action_new(action_desktop);
-    a->data.desktop.desk = 0;
-    kbind(list, a);
-
-    list->data = "A-2"; 
-    a = action_new(action_desktop);
-    a->data.desktop.desk = 1;
-    kbind(list, a);
-
-    list->data = "A-3";
-    a = action_new(action_desktop);
-    a->data.desktop.desk = 2;
-    kbind(list, a);
-
-    list->data = "A-4";
-    a = action_new(action_desktop);
-    a->data.desktop.desk = 3;
-    kbind(list, a);
-
-    list->data = "A-space";
-    a = action_new(action_execute);
-    a->data.execute.path = g_strdup("xterm");
-    kbind(list, a);
-
-    list->data = "C-A-Escape";
-    a = action_new(action_execute);
-    a->data.execute.path = g_strdup("xlock -nolock -mode puzzle");
-    kbind(list, a);
 }
 
 void plugin_startup()
 {
     dispatch_register(Event_X_KeyPress, (EventHandler)press, NULL);
 
-    /* XXX parse config file! */
-    binddef();
+    translate_key("C-g", &reset_state, &reset_key);
+
+    keysrc_parse();
 }
 
 void plugin_shutdown()