From: Dana Jansens Date: Tue, 25 Mar 2003 22:14:02 +0000 (+0000) Subject: move the def'n of the KeyBindingTree X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=bcdef0b226bb436c5ba5865c3d8dd2eb4bb6aed6;p=chaz%2Fopenbox move the def'n of the KeyBindingTree --- diff --git a/plugins/keyboard/keyboard.h b/plugins/keyboard/keyboard.h index e2406d93..892d4e04 100644 --- a/plugins/keyboard/keyboard.h +++ b/plugins/keyboard/keyboard.h @@ -3,19 +3,7 @@ #include -#include "../../kernel/action.h" - -typedef struct KeyBindingTree { - guint state; - guint key; - GList *keylist; - Action *action; - - /* 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; +#include "tree.h" extern KeyBindingTree *firstnode; diff --git a/plugins/keyboard/tree.h b/plugins/keyboard/tree.h index ab84643f..8750c94e 100644 --- a/plugins/keyboard/tree.h +++ b/plugins/keyboard/tree.h @@ -1,9 +1,21 @@ #ifndef __plugin_keyboard_tree_h #define __plugin_keyboard_tree_h -#include "keyboard.h" +#include "../../kernel/action.h" #include +typedef struct KeyBindingTree { + guint state; + guint key; + GList *keylist; + Action *action; + + /* 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);