diff options
Diffstat (limited to 'src/multitouch.c')
| -rw-r--r-- | src/multitouch.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/multitouch.c b/src/multitouch.c index 233f6a3..ff22760 100644 --- a/src/multitouch.c +++ b/src/multitouch.c | |||
| @@ -32,6 +32,15 @@ | |||
| 32 | static const float vscroll_fraction = 0.05; | 32 | static const float vscroll_fraction = 0.05; |
| 33 | static const float hscroll_fraction = 0.2; | 33 | static const float hscroll_fraction = 0.2; |
| 34 | 34 | ||
| 35 | // flip these to enable event debugging | ||
| 36 | #if 1 | ||
| 37 | #define TRACE1(format, arg1) | ||
| 38 | #define TRACE2(format, arg1, arg2) | ||
| 39 | #else | ||
| 40 | #define TRACE1(format, arg1) xf86Msg(X_INFO, format, arg1) | ||
| 41 | #define TRACE2(format, arg1, arg2) xf86Msg(X_INFO, format, arg1, arg2) | ||
| 42 | #endif | ||
| 43 | |||
| 35 | //////////////////////////////////////////////////////////////////////////// | 44 | //////////////////////////////////////////////////////////////////////////// |
| 36 | 45 | ||
| 37 | static void pointer_control(DeviceIntPtr dev, PtrCtrl *ctrl) | 46 | static void pointer_control(DeviceIntPtr dev, PtrCtrl *ctrl) |
| @@ -227,12 +236,12 @@ static void handle_gestures(LocalDevicePtr local, | |||
| 227 | xf86PostButtonEvent(local->dev, FALSE, | 236 | xf86PostButtonEvent(local->dev, FALSE, |
| 228 | gs->btix[i], gs->btval[i], | 237 | gs->btix[i], gs->btval[i], |
| 229 | 0, 0); | 238 | 0, 0); |
| 230 | xf86Msg(X_INFO, "button: %d %d\n", gs->btix[i], gs->btval[i]); | 239 | TRACE2("button: %d %d\n", gs->btix[i], gs->btval[i]); |
| 231 | } | 240 | } |
| 232 | if (GETBIT(gs->type, GS_MOVE)) { | 241 | if (GETBIT(gs->type, GS_MOVE)) { |
| 233 | xf86PostMotionEvent(local->dev, 0, 0, 2, | 242 | xf86PostMotionEvent(local->dev, 0, 0, 2, |
| 234 | gs->dx, gs->dy); | 243 | gs->dx, gs->dy); |
| 235 | xf86Msg(X_INFO, "motion: %d %d\n", gs->dx, gs->dy); | 244 | TRACE2("motion: %d %d\n", gs->dx, gs->dy); |
| 236 | } | 245 | } |
| 237 | if (GETBIT(gs->type, GS_VSCROLL)) { | 246 | if (GETBIT(gs->type, GS_VSCROLL)) { |
| 238 | vscroll += gs->dy; | 247 | vscroll += gs->dy; |
| @@ -244,7 +253,7 @@ static void handle_gestures(LocalDevicePtr local, | |||
| 244 | tickle_button(local, 4); | 253 | tickle_button(local, 4); |
| 245 | vscroll += vstep; | 254 | vscroll += vstep; |
| 246 | } | 255 | } |
| 247 | xf86Msg(X_INFO, "vscroll: %d\n", gs->dy); | 256 | TRACE1("vscroll: %d\n", gs->dy); |
| 248 | } | 257 | } |
| 249 | if (GETBIT(gs->type, GS_HSCROLL)) { | 258 | if (GETBIT(gs->type, GS_HSCROLL)) { |
| 250 | hscroll += gs->dx; | 259 | hscroll += gs->dx; |
| @@ -256,7 +265,7 @@ static void handle_gestures(LocalDevicePtr local, | |||
| 256 | tickle_button(local, 7); | 265 | tickle_button(local, 7); |
| 257 | hscroll += hstep; | 266 | hscroll += hstep; |
| 258 | } | 267 | } |
| 259 | xf86Msg(X_INFO, "hscroll: %d\n", gs->dx); | 268 | TRACE1("hscroll: %d\n", gs->dx); |
| 260 | } | 269 | } |
| 261 | } | 270 | } |
| 262 | 271 | ||
