← Back to branch summary

~fginther/grail/grail-2.0.1.1-oneiric

« back to all changes in this revision

Viewing changes to src/grail-event.c

  • 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:
src/grail-event.c
27
27
#include <math.h>
28
28
 
29
29
static void compute_bbox(struct grail_coord *min, struct grail_coord *max,
30
 
                         const struct utouch_frame *frame)
 
30
                         const struct oif_frame *frame)
31
31
{
32
32
        float x, y;
33
33
        int i;
52
52
}
53
53
 
54
54
int gin_add_contact_props(const struct gesture_inserter *gin,
55
 
                          grail_prop_t *prop, const struct utouch_frame *frame)
 
55
                          grail_prop_t *prop, const struct oif_frame *frame)
56
56
{
57
57
        struct grail_coord min, max;
58
58
        int i, n = 0, ntouch = frame->num_active;
66
66
        prop[n++] = max.x;
67
67
        prop[n++] = max.y;
68
68
        for (i = 0; i < ntouch; i++) {
69
 
                const struct utouch_contact *ct = frame->active[i];
 
69
                const struct oif_contact *ct = frame->active[i];
70
70
                prop[n++] = ct->id;
71
71
                prop[n++] = ct->x;
72
72
                prop[n++] = ct->y;
78
78
                    struct grail_client_info *info, int maxinfo,
79
79
                    const grail_mask_t* types, int btypes,
80
80
                    const grail_mask_t* span, int bspan,
81
 
                    const struct utouch_frame *frame)
 
81
                    const struct oif_frame *frame)
82
82
{
83
83
        struct grail_coord pos[DIM_TOUCH];
84
84
        int i, npos = 0;
94
94
 
95
95
void gin_send_event(struct grail *ge, struct slot_state *s,
96
96
                    const struct gesture_event *ev,
97
 
                    const struct utouch_frame *frame)
 
97
                    const struct oif_frame *frame)
98
98
{
99
99
        struct grail_impl *impl = ge->impl;
100
100
        const struct gesture_inserter *gin = ge->gin;