X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=plugins%2Fkeyboard%2Fkeyboard.c;h=acda951a452e59e0a46a3289fb109c3a2f5d7550;hb=94d222f6e956253604d89a44a7fe3758e7409faa;hp=07a9bd513259ebfb0899c653b500913d468546f8;hpb=c473d5f80ac8a92ba4046365769b2b84ed72881d;p=chaz%2Fopenbox

diff --git a/plugins/keyboard/keyboard.c b/plugins/keyboard/keyboard.c
index 07a9bd51..acda951a 100644
--- a/plugins/keyboard/keyboard.c
+++ b/plugins/keyboard/keyboard.c
@@ -1,21 +1,25 @@
-#include "../../kernel/focus.h"
-#include "../../kernel/dispatch.h"
-#include "../../kernel/openbox.h"
-#include "../../kernel/grab.h"
-#include "../../kernel/action.h"
+#include "kernel/focus.h"
+#include "kernel/dispatch.h"
+#include "kernel/openbox.h"
+#include "kernel/event.h"
+#include "kernel/grab.h"
+#include "kernel/action.h"
+#include "kernel/parse.h"
 #include "tree.h"
 #include "keyboard.h"
-#include "keysrc.h"
+#include "keyparse.h"
+#include "translate.h"
 #include <glib.h>
 
 void plugin_setup_config()
 {
+    parse_reg_section("keyboard", keyparse, NULL);
 }
 
-KeyBindingTree *firstnode;
+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)
@@ -38,7 +42,8 @@ static void reset_chains()
     if (grabbed) {
 	grabbed = FALSE;
         grab_keyboard(FALSE);
-    }
+    } else
+        XAllowEvents(ob_display, AsyncKeyboard, event_lasttime);
 }
 
 gboolean kbind(GList *keylist, Action *action)
@@ -51,14 +56,17 @@ 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_warning("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_warning("conflict with binding");
+        g_message("conflict with binding");
         tree_destroy(tree);
         return FALSE;
     }
@@ -68,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);
@@ -81,8 +87,46 @@ 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 (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 = NULL;
+                reset_chains();
+                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) {
         reset_chains();
@@ -100,16 +144,30 @@ static void press(ObEvent *e, void *foo)
                     if (!grabbed) {
                         grab_keyboard(TRUE);
                         grabbed = TRUE;
+                        XAllowEvents(ob_display, AsyncKeyboard,
+                                     event_lasttime);
                     }
                     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));
-
-                        p->action->func(&p->action->data);
+                    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;
+                            }
+                        }
                     }
 
                     reset_chains();
@@ -119,19 +177,25 @@ static void press(ObEvent *e, void *foo)
             p = p->next_sibling;
         }
     }
-    XAllowEvents(ob_display, AsyncKeyboard, e->data.x.e->xkey.time);
 }
 
 void plugin_startup()
 {
-    dispatch_register(Event_X_KeyPress, (EventHandler)press, NULL);
+    guint i;
+
+    curpos = NULL;
+    grabbed = FALSE;
+
+    dispatch_register(Event_X_KeyPress | Event_X_KeyRelease, (EventHandler)event, NULL);
 
-    keysrc_parse();
+    translate_key("C-g", &reset_state, &reset_key);
+    translate_key("Escape", &i, &button_escape);
+    translate_key("Return", &i, &button_return);
 }
 
 void plugin_shutdown()
 {
-    dispatch_register(0, (EventHandler)press, NULL);
+    dispatch_register(0, (EventHandler)event, NULL);
 
     grab_keys(FALSE);
     tree_destroy(firstnode);