summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--plugins/keyboard/keyboard.h14
-rw-r--r--plugins/keyboard/tree.h14
2 files changed, 14 insertions, 14 deletions
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 <glib.h>
-#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 <glib.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;
+
void tree_destroy(KeyBindingTree *tree);
KeyBindingTree *tree_build(GList *keylist);
void tree_assimilate(KeyBindingTree *node);