X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=plugins%2Fkeyboard%2Fkeyboard.c;h=22ea5556bcb4b2580a2dd739ab32f54b6e667c61;hb=1d5fa24e4b92fbd2fc16847612a6825ca08d6567;hp=141bb5b1a1e2a706918c021e777d053caf5025c2;hpb=4bcd03b2d0904e2b5443a2383b66055422240255;p=chaz%2Fopenbox

diff --git a/plugins/keyboard/keyboard.c b/plugins/keyboard/keyboard.c
index 141bb5b1..22ea5556 100644
--- a/plugins/keyboard/keyboard.c
+++ b/plugins/keyboard/keyboard.c
@@ -5,8 +5,14 @@
 #include "../../kernel/action.h"
 #include "tree.h"
 #include "keyboard.h"
+#include "keysrc.h"
+#include "translate.h"
 #include <glib.h>
 
+void plugin_setup_config()
+{
+}
+
 KeyBindingTree *firstnode;
 
 static KeyBindingTree *curpos;
@@ -16,13 +22,11 @@ static gboolean grabbed;
 static void grab_keys(gboolean grab)
 {
     if (!grab) {
-	XUngrabKey(ob_display, AnyKey, AnyModifier, ob_root);
+        ungrab_all_keys();
     } else {
 	KeyBindingTree *p = firstnode;
 	while (p) {
-            /* XXX grab all lock keys too */
-	    XGrabKey(ob_display, p->key, p->state, ob_root, FALSE,
-		     GrabModeAsync, GrabModeSync);
+            grab_key(p->key, p->state, GrabModeSync);
 	    p = p->next_sibling;
 	}
     }
@@ -35,10 +39,11 @@ static void reset_chains()
     if (grabbed) {
 	grabbed = FALSE;
         grab_keyboard(FALSE);
-    }
+    } else
+        XAllowEvents(ob_display, AsyncKeyboard, CurrentTime);
 }
 
-static gboolean kbind(GList *keylist, Action *action)
+gboolean kbind(GList *keylist, Action *action)
 {
     KeyBindingTree *tree, *t;
     gboolean conflict;
@@ -46,10 +51,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");
@@ -85,7 +88,6 @@ static void press(ObEvent *e, void *foo)
     if (e->data.x.e->xkey.keycode == reset_key &&
         e->data.x.e->xkey.state == reset_state) {
         reset_chains();
-        XAllowEvents(ob_display, AsyncKeyboard, CurrentTime);
     } else {
         KeyBindingTree *p;
         if (curpos == NULL)
@@ -113,7 +115,6 @@ static void press(ObEvent *e, void *foo)
                         p->action->func(&p->action->data);
                     }
 
-                    XAllowEvents(ob_display, AsyncKeyboard, CurrentTime);
                     reset_chains();
                 }
                 break;
@@ -123,58 +124,13 @@ static void press(ObEvent *e, void *foo)
     }
 }
 
-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 = "C-Right";
-    a = action_new(action_next_desktop);
-    a->data.nextprevdesktop.wrap = TRUE;
-    kbind(list, a);
-
-    list->data = "C-Left";
-    a = action_new(action_previous_desktop);
-    a->data.nextprevdesktop.wrap = TRUE;
-    kbind(list, a);
-
-    list->data = "C-1";
-    a = action_new(action_desktop);
-    a->data.desktop.desk = 0;
-    kbind(list, a);
-
-    list->data = "C-2"; 
-    a = action_new(action_desktop);
-    a->data.desktop.desk = 1;
-    kbind(list, a);
-
-    list->data = "C-3";
-    a = action_new(action_desktop);
-    a->data.desktop.desk = 2;
-    kbind(list, a);
-
-    list->data = "C-4";
-    a = action_new(action_desktop);
-    a->data.desktop.desk = 3;
-    kbind(list, a);
-
-    list->data = "C-space";
-    a = action_new(action_execute);
-    a->data.execute.path = g_strdup("xterm");
-    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()