2 files changed, 11 insertions, 0 deletions

diff --git a/src/grail-inserter.c b/src/grail-inserter.c
index 6f9a034..ff4f0b6 100644
--- a/src/grail-inserter.c
+++ b/src/grail-inserter.c
@@ -69,6 +69,13 @@ static void setup_new_gestures(struct grail *ge,
                 for (j = 0; j < nclient; j++) {
                         if (!grail_mask_get(info[j].mask, s->type))
                                 continue;
+                        if (gin->grab_active &&
+                            info[j].id.client != gin->grab_client)
+                                continue;
+                        if (grail_mask_get(info[j].mask, GRAIL_TYPE_SYSFLAG1)) {
+                                gin->grab_active = 1;
+                                gin->grab_client = info[j].id.client;
+                        }
                         s->client_id[s->nclient++] = info[j].id;
                 }
         }
@@ -105,6 +112,8 @@ void gin_frame_begin(struct grail *ge, const struct utouch_frame *frame)
         struct gesture_inserter *gin = ge->gin;
         memset(gin->types, 0, sizeof(gin->types));
         gin->time = frame->time;
+        if (frame->num_active && !frame->prev->num_active)
+                gin->grab_active = 0;
 }
 
 void gin_frame_end(struct grail *ge, const struct utouch_frame *frame)
diff --git a/src/grail-inserter.h b/src/grail-inserter.h
index 3b8cd77..fb944dd 100644
--- a/src/grail-inserter.h
+++ b/src/grail-inserter.h
@@ -53,6 +53,8 @@ struct gesture_inserter {
         grail_mask_t used[DIM_INSTANCE_BYTES];
         grail_time_t time;
         int gestureid;
+        int grab_active;
+        int grab_client;
         float scale_x, scale_y, scale_r;
         float trans_x, trans_y;
 };