diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gestures-drag.c | 10 | ||||
| -rw-r--r-- | src/grail-inserter.c | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/gestures-drag.c b/src/gestures-drag.c index 8b57b99..2ced765 100644 --- a/src/gestures-drag.c +++ b/src/gestures-drag.c | |||
| @@ -71,10 +71,7 @@ int gru_drag(struct grail *ge, | |||
| 71 | state->prop, state->nprop); | 71 | state->prop, state->nprop); |
| 72 | state->active = 0; | 72 | state->active = 0; |
| 73 | } | 73 | } |
| 74 | return 0; | ||
| 75 | } | 74 | } |
| 76 | if (!(move->tickle & mask)) | ||
| 77 | return 0; | ||
| 78 | if (!state->active) { | 75 | if (!state->active) { |
| 79 | int type = getype[move->ntouch]; | 76 | int type = getype[move->ntouch]; |
| 80 | if (type < 0) | 77 | if (type < 0) |
| @@ -82,6 +79,8 @@ int gru_drag(struct grail *ge, | |||
| 82 | state->gid = gin_gid_begin(ge, type, PRIO_GESTURE, frame); | 79 | state->gid = gin_gid_begin(ge, type, PRIO_GESTURE, frame); |
| 83 | state->active = 1; | 80 | state->active = 1; |
| 84 | } | 81 | } |
| 82 | if (!(move->tickle & mask)) | ||
| 83 | return 0; | ||
| 85 | if (!move->single && !(move->active & fm_mask)) | 84 | if (!move->single && !(move->active & fm_mask)) |
| 86 | return 0; | 85 | return 0; |
| 87 | set_props(ge->gin, state, move, frame); | 86 | set_props(ge->gin, state, move, frame); |
| @@ -102,10 +101,7 @@ int gru_windrag(struct grail *ge, | |||
| 102 | state->prop, state->nprop); | 101 | state->prop, state->nprop); |
| 103 | state->active = 0; | 102 | state->active = 0; |
| 104 | } | 103 | } |
| 105 | return 0; | ||
| 106 | } | 104 | } |
| 107 | if (!(move->tickle & mask)) | ||
| 108 | return 0; | ||
| 109 | if (!state->active) { | 105 | if (!state->active) { |
| 110 | if (move->ntouch == 4) { | 106 | if (move->ntouch == 4) { |
| 111 | state->gid = gin_gid_begin(ge, GRAIL_TYPE_MDRAG, | 107 | state->gid = gin_gid_begin(ge, GRAIL_TYPE_MDRAG, |
| @@ -123,6 +119,8 @@ int gru_windrag(struct grail *ge, | |||
| 123 | return 0; | 119 | return 0; |
| 124 | } | 120 | } |
| 125 | } | 121 | } |
| 122 | if (!(move->tickle & mask)) | ||
| 123 | return 0; | ||
| 126 | if (!move->single && !(move->active & fm_mask)) | 124 | if (!move->single && !(move->active & fm_mask)) |
| 127 | return 0; | 125 | return 0; |
| 128 | set_props(ge->gin, state, move, frame); | 126 | set_props(ge->gin, state, move, frame); |
diff --git a/src/grail-inserter.c b/src/grail-inserter.c index d77da79..a54b73a 100644 --- a/src/grail-inserter.c +++ b/src/grail-inserter.c | |||
| @@ -125,7 +125,7 @@ void gin_frame_end(struct grail *ge, | |||
| 125 | continue; | 125 | continue; |
| 126 | if (s->priority > hold) | 126 | if (s->priority > hold) |
| 127 | hold = s->priority; | 127 | hold = s->priority; |
| 128 | if (s->status == GRAIL_STATUS_BEGIN) | 128 | if (s->status != GRAIL_STATUS_UPDATE) |
| 129 | continue; | 129 | continue; |
| 130 | if (s->priority > discard) | 130 | if (s->priority > discard) |
| 131 | discard = s->priority; | 131 | discard = s->priority; |