← Back to branch summary

~oif-packaging/grail/packaging.touch-gestures

« back to all changes in this revision

Viewing changes to src/grail-inserter.c

  • Committer: Chase Douglas
  • Date: 2011-03-09 17:14:22 UTC
  • mfrom: (76.1.2 packaging)
  • Revision ID: chase.douglas@ubuntu.com-20110309171422-5x0934v93cn5hbdb
https://launchpad.net/bugs/637106
* New upstream release.
* Fixes bug LP: #637106

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/grail-inserter.c
69
69
                for (j = 0; j < nclient; j++) {
70
70
                        if (!grail_mask_get(info[j].mask, s->type))
71
71
                                continue;
 
72
                        if (gin->grab_active &&
 
73
                            info[j].id.client != gin->grab_client)
 
74
                                continue;
 
75
                        if (grail_mask_get(info[j].mask, GRAIL_TYPE_SYSFLAG1)) {
 
76
                                gin->grab_active = 1;
 
77
                                gin->grab_client = info[j].id.client;
 
78
                        }
72
79
                        s->client_id[s->nclient++] = info[j].id;
73
80
                }
74
81
        }
105
112
        struct gesture_inserter *gin = ge->gin;
106
113
        memset(gin->types, 0, sizeof(gin->types));
107
114
        gin->time = frame->time;
 
115
        if (frame->num_active && !frame->prev->num_active)
 
116
                gin->grab_active = 0;
108
117
}
109
118
 
110
119
void gin_frame_end(struct grail *ge, const struct utouch_frame *frame)