← Back to branch summary

~fginther/grail/grail-2.0.1.1-oneiric

« back to all changes in this revision

Viewing changes to src/grail-inserter.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-inserter.c
52
52
 
53
53
// todo: spanning tree for multi-user case
54
54
static void setup_new_gestures(struct grail *ge,
55
 
                               const struct utouch_frame *frame)
 
55
                               const struct oif_frame *frame)
56
56
{
57
57
        struct gesture_inserter *gin = ge->gin;
58
58
        grail_mask_t types[DIM_GRAIL_TYPE_BYTES];
114
114
        ge->gin = NULL;
115
115
}
116
116
 
117
 
void gin_frame_begin(struct grail *ge, const struct utouch_frame *frame)
 
117
void gin_frame_begin(struct grail *ge, const struct oif_frame *frame)
118
118
{
119
119
        struct gesture_inserter *gin = ge->gin;
120
120
        memset(gin->types, 0, sizeof(gin->types));
123
123
                gin->grab_active = 0;
124
124
}
125
125
 
126
 
void gin_frame_end(struct grail *ge, const struct utouch_frame *frame)
 
126
void gin_frame_end(struct grail *ge, const struct oif_frame *frame)
127
127
{
128
128
        struct gesture_inserter *gin = ge->gin;
129
129
        grail_mask_t keep[DIM_TOUCH_BYTES];
186
186
}
187
187
 
188
188
int gin_gid_begin(struct grail *ge, int type, int priority,
189
 
                  const struct utouch_frame *frame)
 
189
                  const struct oif_frame *frame)
190
190
{
191
191
        struct gesture_inserter *gin = ge->gin;
192
192
        struct slot_state *s;
292
292
                                 const struct grail_coord *tmin,
293
293
                                 const struct grail_coord *tmax)
294
294
{
295
 
        struct utouch_surface *s = utouch_frame_get_surface(ge->impl->fh);
 
295
        struct oif_surface *s = oif_frame_get_surface(ge->impl->fh);
296
296
 
297
297
        s->mapped_min_x = tmin->x;
298
298
        s->mapped_min_y = tmin->y;