X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=plugins%2Fkeyboard%2Fkeyboard.c;h=b1923af3680976201d9edcb3763d9c639512f995;hb=122d55fbadea0409fbc902a1740e1c8ff3aecd88;hp=05481b53b5037b7638550a5835cf275d04645b0b;hpb=6dd06740e9934b118f83e4430a5d78adebecc1da;p=chaz%2Fopenbox

diff --git a/plugins/keyboard/keyboard.c b/plugins/keyboard/keyboard.c
index 05481b53..b1923af3 100644
--- a/plugins/keyboard/keyboard.c
+++ b/plugins/keyboard/keyboard.c
@@ -1,104 +1,215 @@
-#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/frame.h"
+#include "kernel/dispatch.h"
+#include "kernel/openbox.h"
+#include "kernel/event.h"
+#include "kernel/grab.h"
+#include "kernel/client.h"
+#include "kernel/action.h"
+#include "kernel/prop.h"
+#include "kernel/timer.h"
+#include "parser/parse.h"
 #include "tree.h"
 #include "keyboard.h"
-#include "keyaction.h"
+#include "translate.h"
 #include <glib.h>
 
-KeyBindingTree *firstnode;
+/*
+
+<keybind key="C-x">
+  <action name="ChangeDesktop">
+    <desktop>3</desktop>
+  </action>
+</keybind>
+
+*/
+
+static void parse_key(xmlDocPtr doc, xmlNodePtr node, GList *keylist)
+{
+    char *key;
+    Action *action;
+    xmlNodePtr n, nact;
+    GList *it;
+
+    n = parse_find_node("keybind", node);
+    while (n) {
+        if (parse_attr_string("key", n, &key)) {
+            keylist = g_list_append(keylist, key);
+
+            parse_key(doc, n->xmlChildrenNode, keylist);
+
+            it = g_list_last(keylist);
+            g_free(it->data);
+            keylist = g_list_delete_link(keylist, it);
+        }
+        n = parse_find_node("keybind", n->next);
+    }
+    if (keylist) {
+        nact = parse_find_node("action", node);
+        while (nact) {
+            if ((action = action_parse(doc, nact))) {
+                /* validate that its okay for a key binding */
+                if (action->func == action_moveresize &&
+                    action->data.moveresize.corner !=
+                    prop_atoms.net_wm_moveresize_move_keyboard &&
+                    action->data.moveresize.corner !=
+                    prop_atoms.net_wm_moveresize_size_keyboard) {
+                    action_free(action);
+                    action = NULL;
+                }
+
+                if (action)
+                    kbind(keylist, action);
+            }
+            nact = parse_find_node("action", nact->next);
+        }
+    }
+}
+
+static void parse_xml(xmlDocPtr doc, xmlNodePtr node, void *d)
+{
+    parse_key(doc, node, NULL);
+}
+
+void plugin_setup_config()
+{
+    parse_register("keyboard", parse_xml, NULL);
+}
+
+KeyBindingTree *firstnode = NULL;
 
 static KeyBindingTree *curpos;
 static guint reset_key, reset_state;
-static gboolean grabbed;
+static Timer *chain_timer;
 
-static void grab_keys(gboolean grab)
+static void grab_for_window(Window win, gboolean grab)
 {
-    if (!grab) {
-	XUngrabKey(ob_display, AnyKey, AnyModifier, ob_root);
-    } else {
-	KeyBindingTree *p = firstnode;
-	while (p) {
-	    XGrabKey(ob_display, p->key, p->state, ob_root, FALSE,
-		     GrabModeAsync, GrabModeSync);
-	    p = p->next_sibling;
-	}
+    KeyBindingTree *p;
+
+    ungrab_all_keys(win);
+
+    if (grab) {
+        p = curpos ? curpos->first_child : firstnode;
+        while (p) {
+            grab_key(p->key, p->state, win, GrabModeAsync);
+            p = p->next_sibling;
+        }
+        if (curpos)
+            grab_key(reset_key, reset_state, win, GrabModeAsync);
     }
 }
 
+static void grab_keys(gboolean grab)
+{
+    GList *it;
+
+    grab_for_window(focus_backup, grab);
+    for (it = client_list; it; it = g_list_next(it))
+        grab_for_window(((ObClient*)it->data)->frame->window, grab);
+}
+
 static void reset_chains()
 {
-    /* XXX kill timer */
-    curpos = NULL;
-    if (grabbed) {
-	grabbed = FALSE;
-        grab_keyboard(FALSE);
+    if (chain_timer) {
+        timer_stop(chain_timer);
+        chain_timer = NULL;
+    }
+    if (curpos) {
+        curpos = NULL;
+        grab_keys(TRUE);
     }
 }
 
-static void clearall()
+static void chain_timeout(void *data)
 {
-    grab_keys(FALSE);
-    tree_destroy(firstnode);
-    firstnode = NULL;
-    grab_keys(TRUE);
+    reset_chains();
 }
 
-static gboolean bind(GList *keylist, KeyAction *action)
+gboolean kbind(GList *keylist, Action *action)
 {
     KeyBindingTree *tree, *t;
     gboolean conflict;
 
-    if (!(tree = tree_build(keylist))) {
-        g_warning("invalid binding");
+    g_assert(keylist != NULL);
+    g_assert(action != NULL);
+
+    if (!(tree = tree_build(keylist)))
         return FALSE;
-    }
 
-    t = tree_find(tree, &conflict);
-    if (conflict) {
-        g_warning("conflict with binding");
+    if ((t = tree_find(tree, &conflict)) != NULL) {
+	/* already bound to something, use the existing tree */
         tree_destroy(tree);
-        return FALSE;
-    }
-    if (t != NULL) {
-	/* already bound to something */
-	g_warning("keychain is already bound");
+        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 pressed go missed */
-    grab_server(TRUE);
+    /* set the action */
+    t->actions = g_slist_append(t->actions, action);
+    /* assimilate this built tree into the main tree. assimilation
+       destroys/uses the tree */
+    if (tree) tree_assimilate(tree);
 
-    grab_keys(FALSE);
+    return TRUE;
+}
 
-    /* set the function */
-    t = tree;
-    while (t->first_child) t = t->first_child;
-    t->action.action = action->action;
-    t->action.type[0] = action->type[0];
-    t->action.type[1] = action->type[1];
-    t->action.data[0] = action->data[0];
-    t->action.data[1] = action->data[1];
+static void event(ObEvent *e, void *foo)
+{
+    static KeyBindingTree *grabbed_key = NULL;
 
-    /* assimilate this built tree into the main tree */
-    tree_assimilate(tree); /* assimilation destroys/uses the tree */
+    if (e->type == Event_Client_Mapped) {
+        grab_for_window(e->data.c.client->window, TRUE);
+        return;
+    } else if (e->type == Event_Client_Destroy) {
+        grab_for_window(e->data.c.client->window, FALSE);
+        return;
+    }
 
-    grab_keys(TRUE); 
+    if (grabbed_key) {
+        gboolean done = FALSE;
 
-    grab_server(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 == ob_keycode(OB_KEY_RETURN))
+                done = TRUE;
+            else if (e->data.x.e->xkey.keycode == ob_keycode(OB_KEY_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);
+            }
+            grabbed_key = NULL;
+            grab_keyboard(FALSE);
+            reset_chains();
+            return;
+        }
+    }
+    if (e->type == Event_X_KeyRelease)
+        return;
 
-    return TRUE;
-}
+    g_assert(e->type == Event_X_KeyPress);
 
-static void press(ObEvent *e, void *foo)
-{
     if (e->data.x.e->xkey.keycode == reset_key &&
         e->data.x.e->xkey.state == reset_state) {
         reset_chains();
-        XAllowEvents(ob_display, AsyncKeyboard, CurrentTime);
     } else {
         KeyBindingTree *p;
         if (curpos == NULL)
@@ -109,17 +220,34 @@ static void press(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, CurrentTime);
-                    }
+                    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(TRUE);
                 } else {
-                    keyaction_do(&p->action, focus_client);
+                    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;
+                            }
+
+                            if (act->func == action_cycle_windows &&
+                                !grabbed_key && grab_keyboard(TRUE)) {
+                                grabbed_key = p;
+                            }
+
+                            act->data.any.c = focus_client;
+                            act->func(&act->data);
+                        }
+                    }
 
-                    XAllowEvents(ob_display, AsyncKeyboard, CurrentTime);
                     reset_chains();
                 }
                 break;
@@ -129,65 +257,26 @@ static void press(ObEvent *e, void *foo)
     }
 }
 
-static void binddef()
-{
-    GList *list = g_list_append(NULL, NULL);
-    KeyAction a;
-
-    list->data = "C-Right";
-    a.action = Action_NextDesktop;
-    keyaction_set_bool(&a, 0, TRUE);
-    keyaction_set_none(&a, 1);
-    bind(list, &a);
-
-    list->data = "C-Left";
-    a.action = Action_PreviousDesktop;
-    keyaction_set_bool(&a, 0, TRUE);
-    keyaction_set_none(&a, 1);
-    bind(list, &a);
-
-    list->data = "C-1";
-    a.action = Action_Desktop;
-    keyaction_set_uint(&a, 0, 0);
-    keyaction_set_none(&a, 1);
-    bind(list, &a);
-
-    list->data = "C-2";
-    a.action = Action_Desktop;
-    keyaction_set_uint(&a, 0, 1);
-    keyaction_set_none(&a, 1);
-    bind(list, &a);
-
-    list->data = "C-3";
-    a.action = Action_Desktop;
-    keyaction_set_uint(&a, 0, 2);
-    keyaction_set_none(&a, 1);
-    bind(list, &a);
-
-    list->data = "C-4";
-    a.action = Action_Desktop;
-    keyaction_set_uint(&a, 0, 3);
-    keyaction_set_none(&a, 1);
-    bind(list, &a);
-
-    list->data = "C-space";
-    a.action = Action_Execute;
-    keyaction_set_string(&a, 0, "xterm");
-    keyaction_set_none(&a, 1);
-    bind(list, &a);
-}
-
 void plugin_startup()
 {
-    dispatch_register(Event_X_KeyPress, (EventHandler)press, NULL);
+    curpos = NULL;
+    chain_timer = NULL;
+
+    dispatch_register(Event_Client_Mapped | Event_Client_Destroy |
+                      Event_X_KeyPress | Event_X_KeyRelease,
+                      (EventHandler)event, NULL);
 
-    /* XXX parse config file! */
-    binddef();
+    translate_key("C-g", &reset_state, &reset_key);
+
+    grab_keys(TRUE);
 }
 
 void plugin_shutdown()
 {
-    dispatch_register(0, (EventHandler)press, NULL);
-    clearall();
+    dispatch_register(0, (EventHandler)event, NULL);
+
+    tree_destroy(firstnode);
+    firstnode = NULL;
+    grab_keys(FALSE);
 }