use the grab.h funcs to grab keys and buttons

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

diff --git a/plugins/keyboard/keyboard.c b/plugins/keyboard/keyboard.c
index 141bb5b1a1e2a706918c021e777d053caf5025c2..a559e3f03cef79cba6a7e2d941530e49bebd56c3 100644 (file)
--- a/plugins/keyboard/keyboard.c
+++ b/plugins/keyboard/keyboard.c
@@ -16,13 +16,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;
        }
     }