@@ -1,7 +0,0 @@ 
-keyboard.la
-.libs
-.deps
-.dirstamp
-plugins_keyboard_keyboard_la-keyboard.lo
-plugins_keyboard_keyboard_la-translate.lo
-plugins_keyboard_keyboard_la-tree.lo

@@ -1,4 +0,0 @@ 
-all clean install:
-	$(MAKE) -C ../.. -$(MAKEFLAGS) $@
-
-.PHONY: all clean install

@@ -1,293 +0,0 @@ 
-#include "kernel/focus.h"
-#include "kernel/screen.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 "translate.h"
-#include <glib.h>
-
-/*
-
-<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->xmlChildrenNode, NULL);
-}
-
-void plugin_setup_config()
-{
-    parse_register("keyboard", parse_xml, NULL);
-}
-
-KeyBindingTree *firstnode = NULL;
-
-static KeyBindingTree *curpos;
-static guint reset_key, reset_state;
-static ObTimer *chain_timer;
-
-static void grab_for_window(Window win, gboolean grab)
-{
-    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(screen_support_win, grab);
-    for (it = client_list; it; it = g_list_next(it))
-        grab_for_window(((ObClient*)it->data)->frame->window, grab);
-}
-
-static void reset_chains()
-{
-    if (chain_timer) {
-        timer_stop(chain_timer);
-        chain_timer = NULL;
-    }
-    if (curpos) {
-        curpos = NULL;
-        grab_keys(TRUE);
-    }
-}
-
-static void chain_timeout(ObTimer *t, void *data)
-{
-    reset_chains();
-}
-
-gboolean kbind(GList *keylist, Action *action)
-{
-    KeyBindingTree *tree, *t;
-    gboolean conflict;
-
-    g_assert(keylist != NULL);
-    g_assert(action != NULL);
-
-    if (!(tree = tree_build(keylist)))
-        return FALSE;
-
-    if ((t = tree_find(tree, &conflict)) != NULL) {
-	/* already bound to something, use the existing tree */
-        tree_destroy(tree);
-        tree = NULL;
-    } else
-        t = tree;
-    while (t->first_child) t = t->first_child;
-
-    if (conflict) {
-        g_warning("conflict with binding");
-        tree_destroy(tree);
-        return FALSE;
-    }
-
-    /* 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);
-
-    return TRUE;
-}
-
-static void event(ObEvent *e, void *foo)
-{
-    static KeyBindingTree *grabbed_key = NULL;
-
-    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;
-    }
-
-    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 == 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;
-
-    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();
-    } else {
-        KeyBindingTree *p;
-        if (curpos == NULL)
-            p = firstnode;
-        else
-            p = curpos->first_child;
-        while (p) {
-            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 */
-                    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 {
-                    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_moveresize) {
-                                screen_pointer_pos(&act->data.moveresize.x,
-                                                   &act->data.moveresize.y);
-                            }
-
-                            if (act->func == action_cycle_windows &&
-                                !grabbed_key && grab_keyboard(TRUE)) {
-                                grabbed_key = p;
-                            }
-
-                            if (act->func == action_showmenu) {
-                                act->data.showmenu.x = e->data.x.e->xkey.x_root;
-                                act->data.showmenu.y = e->data.x.e->xkey.y_root;
-                            }
-
-                            act->data.any.c = focus_client;
-                            act->func(&act->data);
-                        }
-                    }
-
-                    reset_chains();
-                }
-                break;
-            }
-            p = p->next_sibling;
-        }
-    }
-}
-
-void plugin_startup()
-{
-    curpos = NULL;
-    chain_timer = NULL;
-
-    dispatch_register(Event_Client_Mapped | Event_Client_Destroy |
-                      Event_X_KeyPress | Event_X_KeyRelease,
-                      (EventHandler)event, NULL);
-
-    translate_key("C-g", &reset_state, &reset_key);
-
-    grab_keys(TRUE);
-}
-
-void plugin_shutdown()
-{
-    dispatch_register(0, (EventHandler)event, NULL);
-
-    tree_destroy(firstnode);
-    firstnode = NULL;
-    grab_keys(FALSE);
-}
-

@@ -1,12 +0,0 @@ 
-#ifndef __plugin_keyboard_keybaord_h
-#define __plugin_keyboard_keybaord_h
-
-#include <glib.h>
-
-#include "tree.h"
-
-extern KeyBindingTree *firstnode;
-
-gboolean kbind(GList *keylist, Action *action);
-
-#endif

@@ -1,64 +0,0 @@ 
-#include "kernel/openbox.h"
-#include <glib.h>
-#include <string.h>
-
-static guint translate_modifier(char *str)
-{
-    if (!g_ascii_strcasecmp("Mod1", str) ||
-        !g_ascii_strcasecmp("A", str)) return Mod1Mask;
-    else if (!g_ascii_strcasecmp("Mod2", str)) return Mod2Mask;
-    else if (!g_ascii_strcasecmp("Mod3", str)) return Mod3Mask;
-    else if (!g_ascii_strcasecmp("Mod4", str) ||
-             !g_ascii_strcasecmp("W", str)) return Mod4Mask;
-    else if (!g_ascii_strcasecmp("Mod5", str)) return Mod5Mask;
-    else if (!g_ascii_strcasecmp("Control", str) ||
-             !g_ascii_strcasecmp("C", str)) return ControlMask;
-    else if (!g_ascii_strcasecmp("Shift", str) ||
-             !g_ascii_strcasecmp("S", str)) return ShiftMask;
-    g_warning("Invalid modifier '%s' in binding.", str);
-    return 0;
-}
-
-gboolean translate_key(char *str, guint *state, guint *keycode)
-{
-    char **parsed;
-    char *l;
-    int i;
-    gboolean ret = FALSE;
-    KeySym sym;
-
-    parsed = g_strsplit(str, "-", -1);
-    
-    /* first, find the key (last token) */
-    l = NULL;
-    for (i = 0; parsed[i] != NULL; ++i)
-	l = parsed[i];
-    if (l == NULL)
-	goto translation_fail;
-
-    /* figure out the mod mask */
-    *state = 0;
-    for (i = 0; parsed[i] != l; ++i) {
-	guint m = translate_modifier(parsed[i]);
-	if (!m) goto translation_fail;
-	*state |= m;
-    }
-
-    /* figure out the keycode */
-    sym = XStringToKeysym(l);
-    if (sym == NoSymbol) {
-	g_warning("Invalid key name '%s' in key binding.", l);
-	goto translation_fail;
-    }
-    *keycode = XKeysymToKeycode(ob_display, sym);
-    if (!*keycode) {
-	g_warning("Key '%s' does not exist on the display.", l); 
-	goto translation_fail;
-    }
-
-    ret = TRUE;
-
-translation_fail:
-    g_strfreev(parsed);
-    return ret;
-}

@@ -1,8 +0,0 @@ 
-#ifndef __plugin_keyboard_translate_h
-#define __plugin_keyboard_translate_h
-
-#include <glib.h>
-
-gboolean translate_key(char *str, guint *state, guint *keycode);
-
-#endif

@@ -1,112 +0,0 @@ 
-#include "keyboard.h"
-#include "translate.h"
-#include <glib.h>
-
-void tree_destroy(KeyBindingTree *tree)
-{
-    KeyBindingTree *c;
-
-    while (tree) {
-	tree_destroy(tree->next_sibling);
-	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);
-	    for (sit = tree->actions; sit != NULL; sit = sit->next)
-                action_free(sit->data);
-	    g_slist_free(tree->actions);
-	}
-	g_free(tree);
-	tree = c;
-    }
-}
-
-KeyBindingTree *tree_build(GList *keylist)
-{
-    GList *it;
-    KeyBindingTree *ret = NULL, *p;
-
-    if (g_list_length(keylist) <= 0)
-	return NULL; /* nothing in the list.. */
-
-    for (it = g_list_last(keylist); it != NULL; it = it->prev) {
-	p = ret;
-	ret = g_new0(KeyBindingTree, 1);
-	if (p == NULL) {
-	    GList *it;
-
-	    /* this is the first built node, the bottom node of the tree */
-	    ret->keylist = g_list_copy(keylist); /* shallow copy */
-	    for (it = ret->keylist; it != NULL; it = it->next) /* deep copy */
-		it->data = g_strdup(it->data);
-	}
-	ret->first_child = p;
-	if (!translate_key(it->data, &ret->state, &ret->key)) {
-	    tree_destroy(ret);
-	    return NULL;
-	}
-    }
-    return ret;
-}
-
-void tree_assimilate(KeyBindingTree *node)
-{
-    KeyBindingTree *a, *b, *tmp, *last;
-
-    if (firstnode == NULL) {
-	/* there are no nodes at this level yet */
-	firstnode = node;
-    } else {
-	a = firstnode;
-	last = a;
-	b = node;
-	while (a) {
-	    last = a;
-	    if (!(a->state == b->state && a->key == b->key)) {
-		a = a->next_sibling;
-	    } else {
-		tmp = b;
-		b = b->first_child;
-		g_free(tmp);
-		a = a->first_child;
-	    }
-	}
-	if (!(last->state == b->state && last->key == b->key))
-	    last->next_sibling = b;
-	else {
-	    last->first_child = b->first_child;
-	    g_free(b);
-	}
-    }
-}
-
-KeyBindingTree *tree_find(KeyBindingTree *search, gboolean *conflict)
-{
-    KeyBindingTree *a, *b;
-
-    *conflict = FALSE;
-
-    a = firstnode;
-    b = search;
-    while (a && b) {
-	if (!(a->state == b->state && a->key == b->key)) {
-	    a = a->next_sibling;
-	} else {
-	    if ((a->first_child == NULL) == (b->first_child == NULL)) {
-		if (a->first_child == NULL) {
-		    /* found it! (return the actual node, not the search's) */
-		    return a;
-		}
-	    } else {
-		*conflict = TRUE;
-		return NULL; /* the chain status' don't match (conflict!) */
-	    }
-	    b = b->first_child;
-	    a = a->first_child;
-	}
-    }
-    return NULL; /* it just isn't in here */
-}

@@ -1,24 +0,0 @@ 
-#ifndef __plugin_keyboard_tree_h
-#define __plugin_keyboard_tree_h
-
-#include "../../kernel/action.h"
-#include <glib.h>
-
-typedef struct KeyBindingTree {
-    guint state;
-    guint key;
-    GList *keylist;
-    GSList *actions; /* list of Action pointers */
-
-    /* the next binding in the tree at the same level */
-    struct KeyBindingTree *next_sibling; 
-    /* the first child of this binding (next binding in a chained sequence).*/
-    struct KeyBindingTree *first_child;
-} KeyBindingTree;
-
-void tree_destroy(KeyBindingTree *tree);
-KeyBindingTree *tree_build(GList *keylist);
-void tree_assimilate(KeyBindingTree *node);
-KeyBindingTree *tree_find(KeyBindingTree *search, gboolean *conflict);
-
-#endif