From 2c791da70ae489c9fcbb367071bf2d4401e889bf Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Fri, 10 Jun 2011 14:45:50 +0100 Subject: [PATCH] gesture-action: Remove the multi-device entry points GestureAction supports a single device/touch point. We'll need touch events supported in Clutter before adding the ability to set required device/touch points on gestures. http://bugzilla.clutter-project.org/show_bug.cgi?id=2585 --- clutter/clutter-gesture-action.c | 63 +++++++------------------------- clutter/clutter-gesture-action.h | 4 -- 2 files changed, 14 insertions(+), 53 deletions(-) diff --git a/clutter/clutter-gesture-action.c b/clutter/clutter-gesture-action.c index 8f47d5490..d5523c17e 100644 --- a/clutter/clutter-gesture-action.c +++ b/clutter/clutter-gesture-action.c @@ -271,6 +271,9 @@ clutter_gesture_action_class_init (ClutterGestureActionClass *klass) * The ::gesture_begin signal is emitted when the #ClutterActor to which * a #ClutterGestureAction has been applied starts receiving a gesture. * + * Return value: %TRUE if the gesture should start, and %FALSE if + * the gesture should be ignored. + * * Since: 1.8 */ gesture_signals[GESTURE_BEGIN] = @@ -291,6 +294,9 @@ clutter_gesture_action_class_init (ClutterGestureActionClass *klass) * The ::gesture-progress signal is emitted for each motion event after * the #ClutterGestureAction::gesture-begin signal has been emitted. * + * Return value: %TRUE if the gesture should continue, and %FALSE if + * the gesture should be cancelled. + * * Since: 1.8 */ gesture_signals[GESTURE_PROGRESS] = @@ -332,7 +338,7 @@ clutter_gesture_action_class_init (ClutterGestureActionClass *klass) * @actor: the #ClutterActor attached to the @action * * The ::gesture-cancel signal is emitted when the ongoing gesture gets - * cancelled. + * cancelled from the #ClutterGestureAction::gesture-progress signal handler. * * This signal is emitted if and only if the #ClutterGestureAction::gesture-begin * signal has been emitted first. @@ -364,7 +370,7 @@ clutter_gesture_action_init (ClutterGestureAction *self) /** * clutter_gesture_action_new: * - * Creates a new #ClutterGestureAction instance + * Creates a new #ClutterGestureAction instance. * * Return value: the newly created #ClutterGestureAction * @@ -379,7 +385,7 @@ clutter_gesture_action_new (void) /** * clutter_gesture_action_get_press_coords: * @action: a #ClutterGestureAction - * @device: id of the device we are interested in + * @device: currently unused, set to 0 * @press_x: (out): return location for the press event's X coordinate * @press_y: (out): return location for the press event's Y coordinate * @@ -397,10 +403,7 @@ clutter_gesture_action_get_press_coords (ClutterGestureAction *action, g_return_if_fail (CLUTTER_IS_GESTURE_ACTION (action)); if (device != 0) - { - g_warning ("Multi-device support not yet implemented"); - return; - } + g_warning ("Multi-device support not yet implemented"); if (press_x) *press_x = action->priv->press_x; @@ -412,6 +415,7 @@ clutter_gesture_action_get_press_coords (ClutterGestureAction *action, /** * clutter_gesture_action_get_motion_coords: * @action: a #ClutterGestureAction + * @device: currently unused, set to 0 * @motion_x: (out): return location for the latest motion * event's X coordinate * @motion_y: (out): return location for the latest motion @@ -431,10 +435,7 @@ clutter_gesture_action_get_motion_coords (ClutterGestureAction *action, g_return_if_fail (CLUTTER_IS_GESTURE_ACTION (action)); if (device != 0) - { - g_warning ("Multi-device support not yet implemented"); - return; - } + g_warning ("Multi-device support not yet implemented"); if (motion_x) *motion_x = action->priv->last_motion_x; @@ -446,6 +447,7 @@ clutter_gesture_action_get_motion_coords (ClutterGestureAction *action, /** * clutter_gesture_action_get_release_coords: * @action: a #ClutterGestureAction + * @device: currently unused, set to 0 * @release_x: (out): return location for the X coordinate of the last release * @release_y: (out): return location for the Y coordinate of the last release * @@ -463,10 +465,7 @@ clutter_gesture_action_get_release_coords (ClutterGestureAction *action, g_return_if_fail (CLUTTER_IS_GESTURE_ACTION (action)); if (device != 0) - { - g_warning ("Multi-device support not yet implemented"); - return; - } + g_warning ("Multi-device support not yet implemented"); if (release_x) *release_x = action->priv->release_x; @@ -474,37 +473,3 @@ clutter_gesture_action_get_release_coords (ClutterGestureAction *action, if (release_y) *release_y = action->priv->release_y; } - -/** - * clutter_gesture_action_set_required_devices: - * @action: a #ClutterGestureAction - * @n_required_devices: the number of pointer devices that are to be tracked - * - * Sets the number of pointer devices that are to be tracked by this gesture. - * - * Since: 1.8 - */ -void -clutter_gesture_action_set_required_devices (ClutterGestureAction *action, - guint n_required_devices) -{ - if (n_required_devices != 1) - { - g_warning ("Multi-device support not yet implemented"); - return; - } -} - -/** - * clutter_gesture_action_get_required_devices: - * @action: a #ClutterGestureAction - * - * Returns the number of devices tracked by this gesture. - * - * Since: 1.8 - */ -guint -clutter_gesture_action_get_required_devices (ClutterGestureAction *action) -{ - return 1; -} diff --git a/clutter/clutter-gesture-action.h b/clutter/clutter-gesture-action.h index 2aea66603..65d1b8e86 100644 --- a/clutter/clutter-gesture-action.h +++ b/clutter/clutter-gesture-action.h @@ -109,10 +109,6 @@ void clutter_gesture_action_get_release_coords (ClutterGestureA gfloat *release_x, gfloat *release_y); -void clutter_gesture_action_set_required_devices (ClutterGestureAction *action, - guint n_required_devices); -guint clutter_gesture_action_get_required_devices (ClutterGestureAction *action); - G_END_DECLS #endif /* __CLUTTER_GESTURE_ACTION_H__ */