3 files changed, 48 insertions, 32 deletions

diff --git a/plugins/keyboard/keyboard.c b/plugins/keyboard/keyboard.c
index bf670c49..acda951a 100644
--- a/plugins/keyboard/keyboard.c
+++ b/plugins/keyboard/keyboard.c
@@ -56,12 +56,15 @@ gboolean kbind(GList *keylist, Action *action)
 
     if (!(tree = tree_build(keylist)))
         return FALSE;
+
     if ((t = tree_find(tree, &conflict)) != NULL) {
-	/* already bound to something */
-	g_message("keychain is already bound");
+	/* already bound to something, use the existing tree */
         tree_destroy(tree);
-        return FALSE;
-    }
+        tree = NULL;
+    } else
+        t = tree;
+    while (t->first_child) t = t->first_child;
+
     if (conflict) {
         g_message("conflict with binding");
         tree_destroy(tree);
@@ -73,12 +76,10 @@ gboolean kbind(GList *keylist, Action *action)
     grab_keys(FALSE);
 
     /* set the action */
-    t = tree;
-    while (t->first_child) t = t->first_child;
-    t->action = action;
+    t->actions = g_slist_append(t->actions, action);
     /* assimilate this built tree into the main tree. assimilation
        destroys/uses the tree */
-    tree_assimilate(tree);
+    if (tree) tree_assimilate(tree);
 
     grab_keys(TRUE); 
     grab_server(FALSE);
@@ -100,17 +101,25 @@ static void event(ObEvent *e, void *foo)
             if (e->data.x.e->xkey.keycode == button_return)
                 done = TRUE;
             else if (e->data.x.e->xkey.keycode == button_escape) {
-                grabbed_key->action->data.cycle.cancel = TRUE;
+                GSList *it;
+                for (it = grabbed_key->actions; it; it = it->next) {
+                    Action *act = it->data;
+                    act->data.cycle.cancel = TRUE;
+                }
                 done = TRUE;
             }
         }
-        if (done) {
-            grabbed_key->action->data.cycle.final = TRUE;
-            grabbed_key->action->func(&grabbed_key->action->data);
-            grab_keyboard(FALSE);
-            grabbed_key = NULL;
-            reset_chains();
-            return; 
+        if (done) { 
+            GSList *it;
+            for (it = grabbed_key->actions; it; it = it->next) {
+                Action *act = it->data;
+                act->data.cycle.final = TRUE;
+                act->func(&act->data);
+                grab_keyboard(FALSE);
+                grabbed_key = NULL;
+                reset_chains();
+                return;
+            }
         }
     }
     if (e->type == Event_X_KeyRelease)
@@ -140,20 +149,24 @@ static void event(ObEvent *e, void *foo)
                     }
                     curpos = p;
                 } else {
-                    if (p->action->func != NULL) {
-                        p->action->data.any.c = focus_client;
-
-                        if (p->action->func == action_cycle_windows) {
-                            p->action->data.cycle.final = FALSE;
-                            p->action->data.cycle.cancel = FALSE;
-                        }
-
-                        p->action->func(&p->action->data);
-
-                        if (p->action->func == action_cycle_windows &&
-                            !grabbed_key) {
-                            grab_keyboard(TRUE);
-                            grabbed_key = p;
+                    GSList *it;
+                    for (it = p->actions; it; it = it->next) {
+                        Action *act = it->data;
+                        if (act->func != NULL) {
+                            act->data.any.c = focus_client;
+
+                            if (act->func == action_cycle_windows) {
+                                act->data.cycle.final = FALSE;
+                                act->data.cycle.cancel = FALSE;
+                            }
+
+                            act->func(&act->data);
+
+                            if (act->func == action_cycle_windows &&
+                                !grabbed_key) {
+                                grab_keyboard(TRUE);
+                                grabbed_key = p;
+                            }
                         }
                     }
 
diff --git a/plugins/keyboard/tree.c b/plugins/keyboard/tree.c
index c0ea2f49..896f77bb 100644
--- a/plugins/keyboard/tree.c
+++ b/plugins/keyboard/tree.c
@@ -11,10 +11,13 @@ void tree_destroy(KeyBindingTree *tree)
 	c = tree->first_child;
 	if (c == NULL) {
 	    GList *it;
+            GSList *sit;
 	    for (it = tree->keylist; it != NULL; it = it->next)
 		g_free(it->data);
 	    g_list_free(tree->keylist);
-            action_free(tree->action);
+	    for (it = tree->actions; it != NULL; it = it->next)
+                action_free(it->data);
+	    g_slist_free(tree->actions);
 	}
 	g_free(tree);
 	tree = c;
diff --git a/plugins/keyboard/tree.h b/plugins/keyboard/tree.h
index 8750c94e..aefb2565 100644
--- a/plugins/keyboard/tree.h
+++ b/plugins/keyboard/tree.h
@@ -8,7 +8,7 @@ typedef struct KeyBindingTree {
     guint state;
     guint key;
     GList *keylist;
-    Action *action;
+    GSList *actions; /* list of Action pointers */
 
     /* the next binding in the tree at the same level */
     struct KeyBindingTree *next_sibling;