X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=plugins%2Fkeyboard%2Fkeyboard.c;h=6836ca1618e36bc641b832ab4514ae63b7d20760;hb=137efd1367704aa39d139b59930c3d103ca7143f;hp=141bb5b1a1e2a706918c021e777d053caf5025c2;hpb=4bcd03b2d0904e2b5443a2383b66055422240255;p=chaz%2Fopenbox

diff --git a/plugins/keyboard/keyboard.c b/plugins/keyboard/keyboard.c
index 141bb5b1..6836ca16 100644
--- a/plugins/keyboard/keyboard.c
+++ b/plugins/keyboard/keyboard.c
@@ -7,6 +7,10 @@
 #include "keyboard.h"
 #include <glib.h>
 
+void plugin_setup_config()
+{
+}
+
 KeyBindingTree *firstnode;
 
 static KeyBindingTree *curpos;
@@ -16,13 +20,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;
 	}
     }
@@ -133,40 +135,45 @@ static void binddef()
        at call-time when then action function is used.
     */
 
-    list->data = "C-Right";
+    list->data = "A-Right";
     a = action_new(action_next_desktop);
     a->data.nextprevdesktop.wrap = TRUE;
     kbind(list, a);
 
-    list->data = "C-Left";
+    list->data = "A-Left";
     a = action_new(action_previous_desktop);
     a->data.nextprevdesktop.wrap = TRUE;
     kbind(list, a);
 
-    list->data = "C-1";
+    list->data = "A-1";
     a = action_new(action_desktop);
     a->data.desktop.desk = 0;
     kbind(list, a);
 
-    list->data = "C-2"; 
+    list->data = "A-2"; 
     a = action_new(action_desktop);
     a->data.desktop.desk = 1;
     kbind(list, a);
 
-    list->data = "C-3";
+    list->data = "A-3";
     a = action_new(action_desktop);
     a->data.desktop.desk = 2;
     kbind(list, a);
 
-    list->data = "C-4";
+    list->data = "A-4";
     a = action_new(action_desktop);
     a->data.desktop.desk = 3;
     kbind(list, a);
 
-    list->data = "C-space";
+    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()