X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=plugins%2Fkeyboard%2Fkeyboard.c;h=b67e738b7009a70d72d6ff859bad1f21c521a66b;hb=5ac5170decd6dcf9e86f434e55df2751a1a96e2b;hp=115c1182553c3c8947b191403d7b53be269901e9;hpb=5cf61ee02354c1c9f80c11f3796afc4b948055d6;p=chaz%2Fopenbox

diff --git a/plugins/keyboard/keyboard.c b/plugins/keyboard/keyboard.c
index 115c1182..b67e738b 100644
--- a/plugins/keyboard/keyboard.c
+++ b/plugins/keyboard/keyboard.c
@@ -5,6 +5,7 @@
 #include "kernel/grab.h"
 #include "kernel/action.h"
 #include "kernel/parse.h"
+#include "kernel/timer.h"
 #include "tree.h"
 #include "keyboard.h"
 #include "keyparse.h"
@@ -20,30 +21,38 @@ KeyBindingTree *firstnode = NULL;
 
 static KeyBindingTree *curpos;
 static guint reset_key, reset_state, button_return, button_escape;
-static gboolean grabbed;
+static Timer *chain_timer;
 
-static void grab_keys(gboolean grab)
+static void grab_keys()
 {
-    if (!grab) {
-        ungrab_all_keys();
-    } else {
-	KeyBindingTree *p = firstnode;
-	while (p) {
-            grab_key(p->key, p->state, GrabModeSync);
-	    p = p->next_sibling;
-	}
+    KeyBindingTree *p;
+
+    ungrab_all_keys();
+
+    p = curpos ? curpos->first_child : firstnode;
+    while (p) {
+        grab_key(p->key, p->state, GrabModeAsync);
+        p = p->next_sibling;
     }
+    if (curpos)
+        grab_key(reset_key, reset_state, GrabModeAsync);
 }
 
 static void reset_chains()
 {
-    /* XXX kill timer */
-    curpos = NULL;
-    if (grabbed) {
-	grabbed = FALSE;
-        grab_keyboard(FALSE);
-    } else
-        XAllowEvents(ob_display, AsyncKeyboard, event_lasttime);
+    if (chain_timer) {
+        timer_stop(chain_timer);
+        chain_timer = NULL;
+    }
+    if (curpos) {
+        curpos = NULL;
+        grab_keys();
+    }
+}
+
+static void chain_timeout(void *data)
+{
+    reset_chains();
 }
 
 gboolean kbind(GList *keylist, Action *action)
@@ -56,32 +65,26 @@ 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);
         return FALSE;
     }
 
-    /* grab the server here to make sure no key presses go missed */
-    grab_server(TRUE);
-    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);
-
-    grab_keys(TRUE); 
-    grab_server(FALSE);
+    if (tree) tree_assimilate(tree);
 
     return TRUE;
 }
@@ -100,17 +103,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);
+                grabbed_key = NULL;
+                grab_keyboard(FALSE);
+                reset_chains();
+                return;
+            }
         }
     }
     if (e->type == Event_X_KeyRelease)
@@ -131,32 +142,32 @@ static void event(ObEvent *e, void *foo)
             if (p->key == e->data.x.e->xkey.keycode &&
                 p->state == e->data.x.e->xkey.state) {
                 if (p->first_child != NULL) { /* part of a chain */
-                    /* XXX TIMER */
-                    if (!grabbed) {
-                        grab_keyboard(TRUE);
-                        grabbed = TRUE;
-                        XAllowEvents(ob_display, AsyncKeyboard,
-                                     event_lasttime);
-                    }
+                    if (chain_timer) timer_stop(chain_timer);
+                    /* 5 second timeout for chains */
+                    chain_timer = timer_start(5000*1000, chain_timeout,
+                                              NULL);
                     curpos = p;
+                    grab_keys();
                 } 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->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) {
+                                grabbed_key = p;
+                                grab_keyboard(TRUE);
+                                break;
+                            }
                         }
                     }
 
@@ -174,22 +185,24 @@ void plugin_startup()
     guint i;
 
     curpos = NULL;
-    grabbed = FALSE;
+    chain_timer = NULL;
 
-    dispatch_register(Event_X_KeyPress | Event_X_KeyRelease, (EventHandler)event, NULL);
+    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);
+
+    grab_keys();
 }
 
 void plugin_shutdown()
 {
     dispatch_register(0, (EventHandler)event, NULL);
 
-    grab_keys(FALSE);
     tree_destroy(firstnode);
     firstnode = NULL;
-    grab_keys(TRUE);
+    ungrab_all_keys();
 }