summaryrefslogtreecommitdiff
path: root/src/gestures-pan.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/gestures-pan.c')
-rw-r--r--src/gestures-pan.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/gestures-pan.c b/src/gestures-pan.c
index 6c34e5d..3094007 100644
--- a/src/gestures-pan.c
+++ b/src/gestures-pan.c
@@ -26,6 +26,15 @@
26#include <math.h> 26#include <math.h>
27#include <stdio.h> 27#include <stdio.h>
28 28
29static const int getype[DIM_TOUCH + 1] = {
30 0,
31 0,
32 GRAIL_TYPE_PAN,
33 GRAIL_TYPE_SWIPE,
34 GRAIL_TYPE_BRUSH,
35 GRAIL_TYPE_HAND,
36};
37
29int gru_pan(struct grail *ge, 38int gru_pan(struct grail *ge,
30 const struct touch_frame *frame) 39 const struct touch_frame *frame)
31{ 40{
@@ -43,8 +52,7 @@ int gru_pan(struct grail *ge,
43 if (!move->x.tickle && !move->y.tickle) 52 if (!move->x.tickle && !move->y.tickle)
44 return 0; 53 return 0;
45 if (!state->active) { 54 if (!state->active) {
46 int type = move->ntouch == 2 ? GRAIL_TYPE_PAN : 55 int type = getype[move->ntouch];
47 move->ntouch == 3 ? GRAIL_TYPE_SWIPE : 0;
48 if (!type) 56 if (!type)
49 return 0; 57 return 0;
50 state->gid = gin_gid_begin(ge, type, PRIO_GESTURE, frame); 58 state->gid = gin_gid_begin(ge, type, PRIO_GESTURE, frame);