X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finput%2Fgesturedetector.h;h=51af312720c17da85a4f49692a6116c9022ab5bf;hb=301e09d687a1217130fbb2240b7a80f1a00aacdc;hp=2b5ea3c3203219d2153b78cd22e19c65aed3d291;hpb=f9ebab54c3debe98e108790be9c21f43f4de116f;p=libs%2Fgui.git

diff --git a/source/input/gesturedetector.h b/source/input/gesturedetector.h
index 2b5ea3c..51af312 100644
--- a/source/input/gesturedetector.h
+++ b/source/input/gesturedetector.h
@@ -11,22 +11,30 @@ class Touchscreen;
 enum Gesture
 {
 	GESTURE_NONE,
-	GESTURE_SWIPE_DOWN,
-	GESTURE_SWIPE_UP,
-	GESTURE_SWIPE_LEFT,
-	GESTURE_SWIPE_RIGHT,
-	GESTURE_PINCH
+	GESTURE_TAP,
+	GESTURE_TAP_2,
+	GESTURE_TAP_3,
+	GESTURE_DRAG,
+	GESTURE_DRAG_2,
+	GESTURE_DRAG_3,
+	GESTURE_PINCH,
+	GESTURE_ROTATE
 };
 
 /**
 Interprets events from a Touchscreen as high-level gestures.  One button is
 provided for each type of gesture.  Axes 0 and 1 indicate the starting position
-of the gesture; axis 2 tracks its progress.  The progress axis may exhibit
+of the gesture; axes 2 and 3 track its progress.  The progress axis may exhibit
 absolute values greater than one.
 */
 class GestureDetector: public Device
 {
 private:
+	enum
+	{
+		MAX_POINTS = 3
+	};
+
 	struct TouchPoint
 	{
 		bool down;
@@ -34,14 +42,15 @@ private:
 		float down_y;
 		float x;
 		float y;
+		bool threshold_exceeded;
 
 		TouchPoint();
 	};
 
 	Touchscreen &touchscreen;
-	TouchPoint points[3];
+	TouchPoint points[MAX_POINTS];
 	Gesture current_gesture;
-	unsigned active_points;
+	Gesture pending_tap;
 	bool invalid_gesture;
 	float threshold_x_sq;
 	float threshold_y_sq;
@@ -57,10 +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