Merge in fix of dev package. This patch moves header files around, and does not contain any logic changes.

Signed-off-by: Henrik Rydberg <rydberg@bitmath.org>

1 files changed, 61 insertions, 2 deletions

diff --git a/include/grail.h b/include/grail.h
index b2f4a0d..087cf0c 100644
--- a/include/grail.h
+++ b/include/grail.h
@@ -25,7 +25,66 @@
 #ifndef _GRAIL_H
 #define _GRAIL_H
 
-#include <touch-engine.h>
-#include <gesture-dev.h>
+#include <grail-touch.h>
+
+#define DIM_GESTURE_PROP 8
+typedef int gesture_prop_t;
+
+enum gesture_type {
+        GE_MOVE,
+        GE_VSCROLL,
+        DIM_GESTURE_TYPE
+};
+
+enum gesture_state {
+        GS_CANCEL,
+        GS_BEGIN,
+        GS_END
+};
+
+struct gesture_flag {
+        enum gesture_type type;
+        touch_time_t time;
+        enum gesture_state state;
+};
+
+struct gesture_event {
+        enum gesture_type type;
+        touch_time_t time;
+        gesture_prop_t prop[DIM_GESTURE_PROP];
+};
+
+struct gesture_dev {
+        struct gedev_impl *impl;
+        void *priv;
+};
+
+struct gesture_client {
+        void (*gesture)(struct gesture_client *client,
+                        const struct gesture_event *ev);
+        int priority[DIM_GESTURE_TYPE];
+        struct client_impl *impl;
+        void *priv;
+};
+
+int client_init(struct gesture_client *client, void *priv);
+void client_flag(struct gesture_client *client,
+                 const struct gesture_flag *flag);
+void client_event(struct gesture_client *client,
+                  const struct gesture_event *ev);
+void client_sync(struct gesture_client *client);
+void client_destroy(struct gesture_client *client);
+
+int gedev_init(struct gesture_dev *dev, void *priv);
+int gedev_attach_client(struct gesture_dev *dev,
+                        struct gesture_client *client);
+
+void gedev_flag(struct gesture_dev *dev, const struct gesture_flag *flag);
+void gedev_event(struct gesture_dev *dev, const struct gesture_event *ev);
+void gedev_sync(struct gesture_dev *dev);
+
+void gedev_detach_client(struct gesture_dev *dev,
+                         struct gesture_client *client);
+void gedev_destroy(struct gesture_dev *dev);
 
 #endif