Test implementation of grail api

This patch introduces the grail API, and a program to test it (evlink).

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

1 files changed, 29 insertions, 51 deletions

diff --git a/include/grail.h b/include/grail.h
index 087cf0c..c390e22 100644
--- a/include/grail.h
+++ b/include/grail.h
@@ -25,66 +25,44 @@
 #ifndef _GRAIL_H
 #define _GRAIL_H
 
-#include <grail-touch.h>
+#include <linux/input.h>
 
-#define DIM_GESTURE_PROP 8
-typedef int gesture_prop_t;
+#define DIM_GRAIL_PROP 8
+#define DIM_GRAIL_TYPE 64
 
-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;
-};
+typedef int grail_prop_t;
+typedef __u64 grail_time_t;
+typedef unsigned long grail_clientid_t;
 
-struct gesture_event {
-        enum gesture_type type;
-        touch_time_t time;
-        gesture_prop_t prop[DIM_GESTURE_PROP];
+struct grail_event {
+        int type;
+        int id;
+        int x;
+        int y;
+        int status;
+        grail_time_t time;
+        grail_prop_t prop[DIM_GRAIL_PROP];
 };
 
-struct gesture_dev {
-        struct gedev_impl *impl;
+struct grail {
+        int (*get_clients)(int x, int y, int screen,
+                           grail_clientid_t *clients, int nclients);
+        void (*event)(struct grail *ge,
+                      const struct input_event *ev);
+        void (*gesture)(struct grail *ge,
+                        const struct grail_event *ev);
+        struct grail_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);
+int grail_open(struct grail *ge, int fd);
+int grail_idle(struct grail *ge, int fd, int ms);
+int grail_pull(struct grail *ge, int fd);
+void grail_close(struct grail *ge, int fd);
 
-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 grail_add_client(struct grail *ge, grail_clientid_t id,
+                      const int *types, const int *priority, int ntypes);
+void grail_remove_client(struct grail *ge, grail_clientid_t id);
 
-void gedev_detach_client(struct gesture_dev *dev,
-                         struct gesture_client *client);
-void gedev_destroy(struct gesture_dev *dev);
 
 #endif