all my changes while i was offline.

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

diff --git a/plugins/keyboard/keyboard.c b/plugins/keyboard/keyboard.c
index b2c5debfb05b7126fa38d36473ceb0606066bd69..acda951a452e59e0a46a3289fb109c3a2f5d7550 100644 (file)
--- a/plugins/keyboard/keyboard.c
+++ b/plugins/keyboard/keyboard.c
@@ -19,7 +19,7 @@ void plugin_setup_config()
 KeyBindingTree *firstnode = NULL;
 
 static KeyBindingTree *curpos;
-static guint reset_key, reset_state;
+static guint reset_key, reset_state, button_return, button_escape;
 static gboolean grabbed;
 
 static void grab_keys(gboolean grab)
@@ -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);
@@ -90,17 +91,41 @@ 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);
+    if (grabbed_key) {
+        gboolean done = FALSE;
+
+        if ((e->type == Event_X_KeyRelease && 
+             !(grabbed_key->state & e->data.x.e->xkey.state)))
+            done = TRUE;
+        else if (e->type == Event_X_KeyPress) {
+            if (e->data.x.e->xkey.keycode == button_return)
+                done = TRUE;
+            else if (e->data.x.e->xkey.keycode == button_escape) {
+                GSList *it;
+                for (it = grabbed_key->actions; it; it = it->next) {
+                    Action *act = it->data;
+                    act->data.cycle.cancel = TRUE;
+                }
+                done = TRUE;
+            }
+        }
+        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 = FALSE;
+                grabbed_key = NULL;
+                reset_chains();
+                return;
             }
         }
-        return;
     }
+    if (e->type == Event_X_KeyRelease)
+        return;
+
+    g_assert(e->type == Event_X_KeyPress);
 
     if (e->data.x.e->xkey.keycode == reset_key &&
         e->data.x.e->xkey.state == reset_state) {
@@ -124,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;
-
-                        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;
+                    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;
+                            }
                         }
                     }
 
@@ -152,12 +181,16 @@ static void event(ObEvent *e, void *foo)
 
 void plugin_startup()
 {
+    guint i;
+
     curpos = NULL;
     grabbed = FALSE;
 
     dispatch_register(Event_X_KeyPress | Event_X_KeyRelease, (EventHandler)event, NULL);
 
     translate_key("C-g", &reset_state, &reset_key);
+    translate_key("Escape", &i, &button_escape);
+    translate_key("Return", &i, &button_return);
 }
 
 void plugin_shutdown()