Merge lp:~bratsche/libgrope/rap-tap-tapping into lp:libgrope

[Cody Russell]

[Stephen M. Webb (bregma)]

Patch builds without including <grail-types.h> in src/gropegesturemanager.c. Are you sure you need this (and the extra build dependency)?

review: Needs Information

[Cody Russell (bratsche)]

Thanks, fixed.

[lp:~bratsche/libgrope/rap-tap-tapping]

10. By Cody Russell on 2010-11-19

Remove #include <grail-types.h>

[Stephen M. Webb (bregma)]

OK, looks great.

review: Approve

=== modified file 'examples/rectangle-mover/gesture.c'
--- examples/rectangle-mover/gesture.c	2010-11-17 13:56:49 +0000
+++ examples/rectangle-mover/gesture.c	2010-11-19 00:20:44 +0000
@@ -102,6 +102,9 @@
             rotate += e->angle_delta * 100;
           }
           break;
+
+	case GROPE_GESTURE_TAP:
+	  break;
         }
     }
 
@@ -134,6 +137,13 @@
 					 2,
 					 gesture_callback,
                                          NULL, NULL);
+
+  grope_gesture_manager_register_window (manager,
+					 window,
+					 GROPE_GESTURE_TAP,
+					 2,
+					 gesture_callback,
+					 NULL, NULL);
 }
 
 static void

=== modified file 'src/gropegesturemanager.c'
--- src/gropegesturemanager.c	2010-11-15 16:05:03 +0000
+++ src/gropegesturemanager.c	2010-11-19 00:20:44 +0000
@@ -318,6 +318,45 @@
   return touches;
 }
 
+static gint
+tap_gesture_handle_properties (GropeEventGestureTap *event,
+			       GeisSize              attr_count,
+			       GeisGestureAttr      *attrs)
+{
+  gint i;
+  gint touches = 0;
+
+  for (i = 0; i < attr_count; ++i)
+    {
+      if (g_strcmp0 (attrs[i].name, GEIS_GESTURE_ATTRIBUTE_TOUCHES) == 0 &&
+	  attrs[i].type == GEIS_ATTR_TYPE_INTEGER)
+	{
+	  touches = attrs[i].integer_val;
+	}
+      else if (g_strcmp0 (attrs[i].name, GEIS_GESTURE_ATTRIBUTE_TIMESTAMP) == 0 &&
+          attrs[i].type == GEIS_ATTR_TYPE_INTEGER)
+        {
+          event->timestamp = attrs[i].integer_val;
+        }
+      else if (g_strcmp0 (attrs[i].name, GEIS_GESTURE_ATTRIBUTE_POSITION_X) == 0 &&
+               attrs[i].type == GEIS_ATTR_TYPE_FLOAT)
+        {
+          event->position_x = attrs[i].float_val;
+        }
+      else if (g_strcmp0 (attrs[i].name, GEIS_GESTURE_ATTRIBUTE_POSITION_Y) == 0 &&
+               attrs[i].type == GEIS_ATTR_TYPE_FLOAT)
+        {
+          event->position_y = attrs[i].float_val;
+        }
+      else if (g_strcmp0 (attrs[i].name, GEIS_GESTURE_ATTRIBUTE_TAP_TIME) == 0 &&
+               attrs[i].type == GEIS_ATTR_TYPE_INTEGER)
+        {
+          event->tap_time = attrs[i].float_val;
+        }
+    }
+
+  return touches;
+}
 
 static void
 gesture_added (void              *cookie,
@@ -407,6 +446,24 @@
                                      binding->data);
                 }
             }
+	  else if (type == GROPE_GESTURE_TAP)
+	    {
+	      GropeEventGestureTap tap;
+
+	      tap.type    = type;
+	      tap.id      = id;
+	      tap.fingers = tap_gesture_handle_properties (&tap,
+							   attr_count,
+							   attrs);
+
+	      if (tap.fingers == binding->touches)
+		{
+		  binding->callback (reg->window,
+				     GROPE_TIME_START,
+				     ((GropeGestureEvent*)&tap),
+				     binding->data);
+		}
+	    }
 
           return;
         }
@@ -483,6 +540,24 @@
                                      binding->data);
                 }
             }
+	  else if (type == GROPE_GESTURE_TAP)
+	    {
+	      GropeEventGestureTap tap;
+
+	      tap.type    = type;
+	      tap.id      = id;
+	      tap.fingers = tap_gesture_handle_properties (&tap,
+							   attr_count,
+							   attrs);
+
+	      if (tap.fingers == binding->touches)
+		{
+		  binding->callback (reg->window,
+				     GROPE_TIME_UPDATE,
+				     ((GropeGestureEvent*)&tap),
+				     binding->data);
+		}
+	    }
         }
     }
 }
@@ -557,6 +632,24 @@
                                      binding->data);
                 }
             }
+	  else if (type == GROPE_GESTURE_TAP)
+	    {
+	      GropeEventGestureTap tap;
+
+	      tap.type    = type;
+	      tap.id      = id;
+	      tap.fingers = tap_gesture_handle_properties (&tap,
+							   attr_count,
+							   attrs);
+
+	      if (tap.fingers == binding->touches)
+		{
+		  binding->callback (reg->window,
+				     GROPE_TIME_END,
+				     ((GropeGestureEvent*)&tap),
+				     binding->data);
+		}
+	    }
         }
     }
 }

=== modified file 'src/gropegesturemanager.h'
--- src/gropegesturemanager.h	2010-11-12 20:27:52 +0000
+++ src/gropegesturemanager.h	2010-11-19 00:20:44 +0000
@@ -45,11 +45,13 @@
 typedef struct _GropeEventGestureDrag   GropeEventGestureDrag;
 typedef struct _GropeEventGesturePinch  GropeEventGesturePinch;
 typedef struct _GropeEventGestureRotate GropeEventGestureRotate;
+typedef struct _GropeEventGestureTap    GropeEventGestureTap;
 
 typedef enum {
-  GROPE_GESTURE_DRAG,
-  GROPE_GESTURE_PINCH,
-  GROPE_GESTURE_ROTATE
+  GROPE_GESTURE_DRAG    = 0,
+  GROPE_GESTURE_PINCH   = 1,
+  GROPE_GESTURE_ROTATE  = 2,
+  GROPE_GESTURE_TAP     = 15
 } GropeGestureType;
 
 typedef enum {
@@ -109,12 +111,28 @@
   gdouble           angle;
 };
 
+struct _GropeEventGestureTap
+{
+  GropeGestureType  type;
+  guint             id;
+  GdkWindow        *window;
+  GdkWindow        *root;
+  GdkWindow        *child;
+  guint32           timestamp;
+  guint             fingers;
+
+  guint32           tap_time;
+  gfloat            position_x;
+  gfloat            position_y;
+};
+
 union _GropeGestureEvent
 {
   GropeGestureType        type;
   GropeEventGestureDrag   drag;
   GropeEventGesturePinch  pinch;
   GropeEventGestureRotate rotate;
+  GropeEventGestureTap    tap;
 };
 
 /**