← Back to branch summary

~fginther/grail/grail-2.0.1.1-oneiric

« back to all changes in this revision

Viewing changes to include/grail.h

  • Committer: Francis Ginther
  • Date: 2012-08-22 18:35:11 UTC
  • mfrom: (20.2.19 upstream)
  • Revision ID: francis.ginther@canonical.com-20120822183511-yxwny2hixhyu2z42
https://launchpad.net/bugs/1040218
* New upstream microrelease, bug fixes only
  - Rename project to simply 'grail' (LP: #1040218)
* Updated debian/watch file for project rename

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/grail.h
25
25
#include <linux/input.h>
26
26
#include <grail-bits.h>
27
27
#include <grail-types.h>
28
 
#include <utouch/frame.h>
 
28
#include <oif/frame.h>
29
29
 
30
30
#ifdef __cplusplus
31
31
extern "C" {
50
50
#define GRAIL_EXPECT_MASK       0x000f
51
51
 
52
52
typedef float grail_prop_t;                     /* gesture properties */
53
 
typedef utouch_frame_time_t grail_time_t;       /* time in milliseconds */
 
53
typedef oif_frame_time_t grail_time_t;  /* time in milliseconds */
54
54
typedef struct grail *grail_handle;             /* the grail instance handle */
55
55
 
56
56
/**
75
75
        float x, y;
76
76
};
77
77
 
78
 
grail_handle GRAIL_PUBLIC grail_new_raw(utouch_frame_handle fh,
 
78
grail_handle GRAIL_PUBLIC grail_new_raw(oif_frame_handle fh,
79
79
                                        unsigned int num_frames,
80
80
                                        void *select,
81
81
                                        unsigned int version,
85
85
 
86
86
/**
87
87
 * grail_new - allocate and initialize a new grail instance
88
 
 * @fh: utouch frame handle to use
 
88
 * @fh: oif frame handle to use
89
89
 * @num_frames: number of frames in cyclic buffer
90
90
 * @select: client selection callback
91
91
 *
131
131
 * has grail scope.
132
132
 */
133
133
const struct grail_frame GRAIL_PUBLIC *
134
 
grail_pump_frame(grail_handle ge, const struct utouch_frame *frame);
 
134
grail_pump_frame(grail_handle ge, const struct oif_frame *frame);
135
135
 
136
136
/**
137
137
 * struct grail_client_id - Gesture client information
209
209
 */
210
210
struct grail_frame {
211
211
        const struct grail_frame *prev;
212
 
        const struct utouch_frame *touch;
 
212
        const struct oif_frame *touch;
213
213
        unsigned int num_ongoing;
214
214
        struct grail_element **ongoing;
215
215
        struct grail_element **slots;
254
254
        int slot;
255
255
        int id;
256
256
        int num_touches;
257
 
        const struct utouch_contact **touches;
 
257
        const struct oif_contact **touches;
258
258
        grail_time_t start_time;
259
259
        unsigned int expect_mask;
260
260
        unsigned int active_mask;
444
444
 * The frame pointer is ABI agnostic, owned by the grail instance, and
445
445
 * has grail scope.
446
446
 */
447
 
const struct utouch_frame GRAIL_PUBLIC *
 
447
const struct oif_frame GRAIL_PUBLIC *
448
448
grail_get_contact_frame(const struct grail *ge);
449
449
 
450
450
#ifndef GRAIL_NO_LEGACY_API