From 6d2ab8fe51b702708ea5b4bba27a839d2b74ff61 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Mon, 26 Nov 2012 13:09:23 -0500
Subject: [PATCH] swipe-action: Introduce new ::swipe signal

This deprecates the old ::swept signal, which didn't have a
handled boolean parameter.

https://bugzilla.gnome.org/show_bug.cgi?id=689392
---
 clutter/clutter-marshal.list   |  1 +
 clutter/clutter-swipe-action.c | 38 ++++++++++++++++++++++++++++++++--
 clutter/clutter-swipe-action.h |  9 ++++++--
 3 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/clutter/clutter-marshal.list b/clutter/clutter-marshal.list
index 7eff755a9..fc7680db6 100644
--- a/clutter/clutter-marshal.list
+++ b/clutter/clutter-marshal.list
@@ -4,6 +4,7 @@ BOOLEAN:OBJECT,BOOLEAN
 BOOLEAN:OBJECT,BOXED,DOUBLE
 BOOLEAN:OBJECT,DOUBLE
 BOOLEAN:OBJECT,ENUM
+BOOLEAN:OBJECT,FLAGS
 BOOLEAN:STRING,UINT,FLAGS
 BOOLEAN:OBJECT
 BOOLEAN:OBJECT,FLOAT,FLOAT
diff --git a/clutter/clutter-swipe-action.c b/clutter/clutter-swipe-action.c
index 7ccf37ab7..bfcb525aa 100644
--- a/clutter/clutter-swipe-action.c
+++ b/clutter/clutter-swipe-action.c
@@ -59,6 +59,7 @@ struct _ClutterSwipeActionPrivate
 enum
 {
   SWEPT,
+  SWIPE,
 
   LAST_SIGNAL
 };
@@ -141,6 +142,7 @@ gesture_end (ClutterGestureAction *action,
   gfloat press_x, press_y;
   gfloat release_x, release_y;
   ClutterSwipeDirection direction = 0;
+  gboolean can_emit_swipe;
 
   clutter_gesture_action_get_press_coords (action,
                                            0,
@@ -160,7 +162,11 @@ gesture_end (ClutterGestureAction *action,
   else if (press_y - release_y > priv->threshold)
     direction |= CLUTTER_SWIPE_DIRECTION_UP;
 
-  g_signal_emit (action, swipe_signals[SWEPT], 0, actor, direction);
+  /* XXX:2.0 remove */
+  g_signal_emit (action, swipe_signals[SWIPE], 0, actor, direction,
+                 &can_emit_swipe);
+  if (can_emit_swipe)
+    g_signal_emit (action, swipe_signals[SWEPT], 0, actor, direction);
 }
 
 static void
@@ -184,18 +190,46 @@ clutter_swipe_action_class_init (ClutterSwipeActionClass *klass)
    * The ::swept signal is emitted when a swipe gesture is recognized on the
    * attached actor.
    *
+   * Deprecated: 1.14: Use the ::swipe signal instead.
+   *
    * Since: 1.8
    */
   swipe_signals[SWEPT] =
     g_signal_new (I_("swept"),
                   G_TYPE_FROM_CLASS (klass),
-                  G_SIGNAL_RUN_LAST,
+                  G_SIGNAL_RUN_LAST |
+                  G_SIGNAL_DEPRECATED,
                   G_STRUCT_OFFSET (ClutterSwipeActionClass, swept),
                   NULL, NULL,
                   _clutter_marshal_VOID__OBJECT_FLAGS,
                   G_TYPE_NONE, 2,
                   CLUTTER_TYPE_ACTOR,
                   CLUTTER_TYPE_SWIPE_DIRECTION);
+
+  /**
+   * ClutterSwipeAction::swipe:
+   * @action: the #ClutterSwipeAction that emitted the signal
+   * @actor: the #ClutterActor attached to the @action
+   * @direction: the main direction of the swipe gesture
+   *
+   * The ::swipe signal is emitted when a swipe gesture is recognized on the
+   * attached actor.
+   *
+   * Return value: %TRUE if the swipe should continue, and %FALSE if
+   *   the swipe should be cancelled.
+   *
+   * Since: 1.14
+   */
+  swipe_signals[SWIPE] =
+    g_signal_new (I_("swipe"),
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (ClutterSwipeActionClass, swipe),
+                  _clutter_boolean_continue_accumulator, NULL,
+                  _clutter_marshal_BOOLEAN__OBJECT_FLAGS,
+                  G_TYPE_BOOLEAN, 2,
+                  CLUTTER_TYPE_ACTOR,
+                  CLUTTER_TYPE_SWIPE_DIRECTION);
 }
 
 static void
diff --git a/clutter/clutter-swipe-action.h b/clutter/clutter-swipe-action.h
index 4356d9182..c35b65ac7 100644
--- a/clutter/clutter-swipe-action.h
+++ b/clutter/clutter-swipe-action.h
@@ -66,7 +66,9 @@ struct _ClutterSwipeAction
 
 /**
  * ClutterSwipeActionClass:
- * @swept: class handler for the #ClutterSwipeAction::swept signal
+ * @swept: class handler for the #ClutterSwipeAction::swept signal;
+ *   deprecated since 1.14
+ * @swipe: class handler for the #ClutterSwipeAction::swipe signal
  *
  * The <structname>ClutterSwipeActionClass</structname> structure contains
  * only private data.
@@ -83,6 +85,10 @@ struct _ClutterSwipeActionClass
                    ClutterActor          *actor,
                    ClutterSwipeDirection  direction);
 
+  gboolean (* swipe) (ClutterSwipeAction    *action,
+                      ClutterActor          *actor,
+                      ClutterSwipeDirection  direction);
+
   /*< private >*/
   void (* _clutter_swipe_action1) (void);
   void (* _clutter_swipe_action2) (void);
@@ -90,7 +96,6 @@ struct _ClutterSwipeActionClass
   void (* _clutter_swipe_action4) (void);
   void (* _clutter_swipe_action5) (void);
   void (* _clutter_swipe_action6) (void);
-  void (* _clutter_swipe_action7) (void);
 };
 
 GType clutter_swipe_action_get_type (void) G_GNUC_CONST;