X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finput%2Fgesturedetector.h;h=51af312720c17da85a4f49692a6116c9022ab5bf;hb=73eebea348ced3b684d356238858c00b72cf5361;hp=ccccc888d27b67bc57f1652e31f898897aee8814;hpb=9580908b4c206675f912c0639d8f450bc42c504b;p=libs%2Fgui.git diff --git a/source/input/gesturedetector.h b/source/input/gesturedetector.h index ccccc88..51af312 100644 --- a/source/input/gesturedetector.h +++ b/source/input/gesturedetector.h @@ -11,8 +11,12 @@ class Touchscreen; enum Gesture { GESTURE_NONE, + GESTURE_TAP, + GESTURE_TAP_2, + GESTURE_TAP_3, GESTURE_DRAG, GESTURE_DRAG_2, + GESTURE_DRAG_3, GESTURE_PINCH, GESTURE_ROTATE }; @@ -46,7 +50,7 @@ private: Touchscreen &touchscreen; TouchPoint points[MAX_POINTS]; Gesture current_gesture; - unsigned active_points; + Gesture pending_tap; bool invalid_gesture; float threshold_x_sq; float threshold_y_sq; @@ -62,11 +66,16 @@ private: void touch_up(unsigned); void touch_move(unsigned, float, float); void start_gesture(); + void set_gesture_location(unsigned); + void set_gesture_delta(unsigned); void update_progress(); void end_gesture(); void window_resized(unsigned, unsigned); }; + +unsigned gesture_points(Gesture); + } // namespace Input } // namespace Msp