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

diff --git a/plugins/keyboard/keyboard.c b/plugins/keyboard/keyboard.c
index add2b473..b2c5debf 100644
--- a/plugins/keyboard/keyboard.c
+++ b/plugins/keyboard/keyboard.c
@@ -13,10 +13,10 @@
 
 void plugin_setup_config()
 {
-    parse_reg_section("keyboard", keyparse);
+    parse_reg_section("keyboard", keyparse, NULL);
 }
 
-KeyBindingTree *firstnode;
+KeyBindingTree *firstnode = NULL;
 
 static KeyBindingTree *curpos;
 static guint reset_key, reset_state;
@@ -58,12 +58,12 @@ gboolean kbind(GList *keylist, Action *action)
         return FALSE;
     if ((t = tree_find(tree, &conflict)) != NULL) {
 	/* already bound to something */
-	g_warning("keychain is already bound");
+	g_message("keychain is already bound");
         tree_destroy(tree);
         return FALSE;
     }
     if (conflict) {
-        g_warning("conflict with binding");
+        g_message("conflict with binding");
         tree_destroy(tree);
         return FALSE;
     }
@@ -86,8 +86,22 @@ gboolean kbind(GList *keylist, Action *action)
     return TRUE;
 }
 
-static void press(ObEvent *e, void *foo)
+static void event(ObEvent *e, void *foo)
 {
+    static KeyBindingTree *grabbed_key = NULL;
+
+    if (e->type == Event_X_KeyRelease) {
+        if (grabbed_key) {
+            if (!(grabbed_key->state & e->data.x.e->xkey.state)) {
+                grabbed_key->action->data.cycle.final = TRUE;
+                grabbed_key->action->func(&grabbed_key->action->data);
+                grab_keyboard(FALSE);
+                grabbed_key = FALSE;
+            }
+        }
+        return;
+    }
+
     if (e->data.x.e->xkey.keycode == reset_key &&
         e->data.x.e->xkey.state == reset_state) {
         reset_chains();
@@ -116,7 +130,15 @@ static void press(ObEvent *e, void *foo)
                         g_assert(!(p->action->func == action_move ||
                                    p->action->func == action_resize));
 
+                        if (p->action->func == action_cycle_windows)
+                            p->action->data.cycle.final = FALSE;
+
                         p->action->func(&p->action->data);
+
+                        if (p->action->func == action_cycle_windows) {
+                            grab_keyboard(TRUE);
+                            grabbed_key = p;
+                        }
                     }
 
                     reset_chains();
@@ -130,14 +152,17 @@ static void press(ObEvent *e, void *foo)
 
 void plugin_startup()
 {
-    dispatch_register(Event_X_KeyPress, (EventHandler)press, NULL);
+    curpos = NULL;
+    grabbed = FALSE;
+
+    dispatch_register(Event_X_KeyPress | Event_X_KeyRelease, (EventHandler)event, NULL);
 
     translate_key("C-g", &reset_state, &reset_key);
 }
 
 void plugin_shutdown()
 {
-    dispatch_register(0, (EventHandler)press, NULL);
+    dispatch_register(0, (EventHandler)event, NULL);
 
     grab_keys(FALSE);
     tree_destroy(firstnode);