1 files changed, 48 insertions, 46 deletions

diff --git a/include/grail.h b/include/grail.h
index d21d9e8..b208556 100644
--- a/include/grail.h
+++ b/include/grail.h
@@ -26,11 +26,14 @@
 #include <linux/input.h>
 #include <grail-bits.h>
 #include <grail-types.h>
+#include <utouch/frame.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#define GRAIL_VERSION           0x00011000
+
 #define DIM_GRAIL_TYPE          64
 #define DIM_GRAIL_TYPE_BYTES    ((DIM_GRAIL_TYPE + 7) >> 3)
 
@@ -41,8 +44,21 @@ extern "C" {
 #define GRAIL_STATUS_UPDATE     1
 #define GRAIL_STATUS_END        2
 
-typedef float grail_prop_t;             /* gesture properties */
-typedef __u64 grail_time_t;             /* time in milliseconds */
+typedef float grail_prop_t;                     /* gesture properties */
+typedef utouch_frame_time_t grail_time_t;       /* time in milliseconds */
+
+/**
+ * struct grail_get_version - get grail library version
+ *
+ * Report the version of the grail library, which can be different from
+ * the value of GRAIL_VERSION in this header file.
+ *
+ * This function allows for fallback options from major interface
+ * extensions within the same ABI version. For the normal cases of ABI
+ * agnostic or backwards incompatible changes, this function is not
+ * needed.
+ */
+unsigned int GRAIL_PUBLIC grail_get_version(void);
 
 /**
  * struct grail_coord - coordinate in bounding box units
@@ -54,33 +70,6 @@ struct grail_coord {
 };
 
 /**
- * struct grail_contact - MT event information in bounding box units
- * @id: Contact tracking id
- * @tool_type: Tool type (ABS_MT_TOOL_TYPE)
- * @pos: Position of contact (bbox units)
- * @touch_major: Major axis of contact shape (bbox units)
- * @touch_minor: Minor axis of contact shape (bbox units)
- * @width_major: Major axis of perimeter (bbox units)
- * @width_minor: Minor axis of perimeter (bbox units)
- * @angle: Angle of orientation (vertical: 0 horizontal: +-M_PI_2)
- * @pressure: Pressure of contact (min: 0 max: 1)
- *
- * Depending on the native support of the underlying device, some or all of
- * the listed properties may be computed.
- */
-struct grail_contact {
-        int id;
-        int tool_type;
-        struct grail_coord pos;
-        float touch_major;
-        float touch_minor;
-        float width_major;
-        float width_minor;
-        float angle;
-        float pressure;
-};
-
-/**
  * struct grail_client_id - Gesture client information
  * @client: Client id
  * @root: Root window
@@ -231,19 +220,6 @@ void GRAIL_PUBLIC grail_set_bbox(struct grail *ge,
                                  const struct grail_coord *max);
 
 /**
- * grail_filter_abs_events - filter kernel motion events
- * @ge: the grail device in use
- * @usage: When true, filter kernel motion events.
- *
- * Single-finger pointer events are treated as pointer gestures in
- * grail. When filter_motion_events is non-zero, the kernel events
- * corresponding to pointer movement are removed from the event
- * stream.
- *
- */
-void GRAIL_PUBLIC grail_filter_abs_events(struct grail *ge, int usage);
-
-/**
  * grail_get_units - get device coordinate ranges
  * @ge: the grail device in use
  * @min: minimum x and y coordinates
@@ -260,17 +236,43 @@ void GRAIL_PUBLIC grail_get_units(const struct grail *ge,
                                   struct grail_coord *max);
 
 /**
- * grail_get_contacts - get current contact state
+ * grail_get_contact_frame - get current contact frame
  * @ge: the grail device in use
- * @touch: array of contacts to be filled in
- * @max_touch: maximum number of contacts supported by the array
  *
- * Extract the contact state as currently seen by grail.
+ * Return the contact frame current being processed. If called from
+ * within a gesture callback, it is guaranteed to return the frame
+ * corresponding to the gesture.
+ *
+ * The returned pointer can be NULL if no input has yet been extracted
+ * through the grail instance.
  *
+ * The frame pointer is ABI agnostic, owned by the grail instance, and
+ * has grail scope.
  */
+const struct utouch_frame GRAIL_PUBLIC *
+grail_get_contact_frame(const struct grail *ge);
+
+#ifndef GRAIL_NO_LEGACY_API
+
+struct grail_contact {
+        int id;
+        int tool_type;
+        struct grail_coord pos;
+        float touch_major;
+        float touch_minor;
+        float width_major;
+        float width_minor;
+        float angle;
+        float pressure;
+};
+
+void GRAIL_PUBLIC grail_filter_abs_events(struct grail *ge, int usage);
+
 int GRAIL_PUBLIC grail_get_contacts(const struct grail *ge,
                                     struct grail_contact *touch, int max_touch);
 
+#endif
+
 #ifdef __cplusplus
 }
 #endif