1 files changed, 22 insertions, 43 deletions

diff --git a/include/grail-touch.h b/include/grail-touch.h
index 9d96cc3..acfc779 100644
--- a/include/grail-touch.h
+++ b/include/grail-touch.h
@@ -29,27 +29,20 @@
 #define DIM_TOUCH 32
 #define DIM_TOUCH_BYTES ((DIM_TOUCH + 7) >> 3)
 
-typedef int touch_prop_t;
 typedef __u64 touch_time_t;
 
-enum touch_prop_list {
-        TP_POS_X,
-        TP_POS_Y,
-        TP_TOUCH_MAJOR,
-        TP_TOUCH_MINOR,
-        TP_WIDTH_MAJOR,
-        TP_WIDTH_MINOR,
-        TP_ORIENTATION,
-        TP_PRESSURE,
-        DIM_TOUCH_PROP
-};
-
-#define DIM_TOUCH_PROP_BYTES ((DIM_TOUCH_PROP + 7) >> 3)
-
 struct touch {
         int active;
         int slot;
-        touch_prop_t prop[DIM_TOUCH_PROP];
+        int id;
+        int tool_type;
+        int x, y;
+        int touch_major;
+        int touch_minor;
+        int width_major;
+        int width_minor;
+        int orientation;
+        int pressure;
 };
 
 struct touch_frame {
@@ -61,45 +54,31 @@ struct touch_frame {
         struct touch touch[DIM_TOUCH];
 };
 
-struct touch_dev_caps {
-        grail_mask_t mask[DIM_TOUCH_PROP_BYTES];
-        struct input_absinfo info[DIM_TOUCH_PROP];
+struct touch_caps {
+        float min_x, max_x;
+        float min_y, max_y;
+        float min_orient, max_orient;
+        float min_press, max_press;
 };
 
 struct touch_dev {
         void (*event)(struct touch_dev *dev, const struct input_event *ev);
-        void (*create)(struct touch_dev *dev, int slot,
-                       const grail_mask_t *mask, const touch_prop_t *prop);
-        void (*modify)(struct touch_dev *dev, int slot,
-                       const grail_mask_t *mask, const touch_prop_t *prop);
-        void (*destroy)(struct touch_dev *dev, int slot);
         void (*sync)(struct touch_dev *dev, const struct input_event *syn);
-        struct touch_dev_caps caps;
-        struct touch_dev_impl *impl;
         void *priv;
-};
-
-struct touch_engine {
-        void (*event)(struct touch_engine *engine,
-                      const struct input_event *ev);
-        void (*sync)(struct touch_engine *engine,
-                     const struct input_event *syn);
+        struct mtdev mtdev;
         struct touch_frame frame;
-        void *priv;
+        struct touch_caps caps;
+        int slot;
+        int state;
 };
 
+void touch_caps_init(struct touch_dev *dev);
+float touch_angle(const struct touch_dev *dev, int orientation);
+float touch_pressure(const struct touch_dev *dev, int pressure);
+
 int touch_dev_open(struct touch_dev *dev, int fd);
 int touch_dev_idle(struct touch_dev *dev, int fd, int ms);
 int touch_dev_pull(struct touch_dev *dev, int fd);
 void touch_dev_close(struct touch_dev *dev, int fd);
 
-void touch_engine_init(struct touch_engine *engine,
-                       void (*event)(struct touch_engine *engine,
-                                     const struct input_event *ev),
-                       void (*sync)(struct touch_engine *engine,
-                                    const struct input_event *ev),
-                       void *priv);
-void touch_engine_attach(struct touch_engine *engine, struct touch_dev *dev);
-void touch_engine_detach(struct touch_engine *engine, struct touch_dev *dev);
-
 #endif