Merge lp:~oif-team/libgrip/add-position-coords into lp:libgrip

[Chase Douglas]

Add transform position coordinates to the pinch and rotate gesture events.

[Stephen M. Webb (bregma)]

One small step in the right direction.

review: Approve

=== modified file 'src/gripgesturemanager.c'
--- src/gripgesturemanager.c	2011-01-24 20:04:47 +0000
+++ src/gripgesturemanager.c	2011-03-23 15:22:48 +0000
@@ -266,6 +266,16 @@
         {
           event->radius = attrs[i].float_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;
+        }
     }
 
   return touches;
@@ -381,6 +391,16 @@
         {
           event->angle = attrs[i].float_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;
+        }
     }
 
   return touches;

=== modified file 'src/gripgesturemanager.h'
--- src/gripgesturemanager.h	2011-01-21 17:19:26 +0000
+++ src/gripgesturemanager.h	2011-03-23 15:22:48 +0000
@@ -100,6 +100,8 @@
   gdouble           radius_delta;
   gdouble           radial_velocity;
   gdouble           radius;
+  gfloat            position_x;
+  gfloat            position_y;
 };
 
 struct _GripEventGestureRotate
@@ -116,6 +118,8 @@
   gdouble           angle_delta;
   gdouble           angular_velocity;
   gdouble           angle;
+  gfloat            position_x;
+  gfloat            position_y;
 };
 
 struct _GripEventGestureTap