Merge lp:~oif-team/libgrip/devtype_expose into lp:libgrip

[Jussi Pakkanen]

This branch adds device type information to event structures. It is added at the end so that ABI is not broken. This makes things easier for app developers, as they don't have to have different callback functions for different device types.

The most common change between device types is that dragging is usually inverted when dragging with a touchpad.

[Stephen M. Webb (bregma)]

I'm OK with this.

review: Approve

[Chase Douglas (chasedouglas)]

This has been superseded by https://code.launchpad.net/~bregma/libgrip/device-attrs/+merge/70389.

Unmerged revisions

53. By Jussi Pakkanen on 2011-07-22

Add device type at the ends of event structs.

52. By Jussi Pakkanen on 2011-07-21

Factore out device type detection.

=== modified file 'src/gripgesturemanager.c'
--- src/gripgesturemanager.c	2011-07-11 12:07:13 +0000
+++ src/gripgesturemanager.c	2011-07-22 08:27:26 +0000
@@ -148,26 +148,50 @@
   gesture_finish
 };
 
-static void device_added (void *cookie, GeisInputDeviceId id, void *attrs)
+static void get_device_flags(void *attrs, gboolean *direct, gboolean *independent)
 {
-  GripDevices *devices = (GripDevices *) cookie;
   GeisGestureAttr *a;
-  gboolean direct = FALSE;
-  gboolean independent = FALSE;
-  
+
+  *direct = FALSE;
+  *independent = FALSE;
   for (a = attrs; a->name; a++)
     {
       if (g_strcmp0(GEIS_DEVICE_ATTRIBUTE_DIRECT_TOUCH, a->name) == 0)
-          direct = a->boolean_val;
+          *direct = a->boolean_val;
       else if (g_strcmp0(GEIS_DEVICE_ATTRIBUTE_INDEPENDENT_TOUCH, a->name) == 0)
-          independent = a->boolean_val;
+          *independent = a->boolean_val;
     }
+}
+
+static GripDeviceType determine_device_type (void *attrs)
+{
+  gboolean direct = FALSE;
+  gboolean independent = FALSE;
+
+  get_device_flags(attrs, &direct, &independent);
 
   if (direct && !independent)
+    return GRIP_DEVICE_TOUCHSCREEN;
+  else if (!direct && !independent)
+    return GRIP_DEVICE_TOUCHPAD;
+  else if (!direct && independent)
+    return GRIP_DEVICE_INDEPENDENT;
+
+  g_critical("Unknown touch device type.");
+  return GRIP_DEVICE_TOUCHSCREEN;
+}
+
+
+static void device_added (void *cookie, GeisInputDeviceId id, void *attrs)
+{
+  GripDevices *devices = (GripDevices *) cookie;
+  GripDeviceType type = determine_device_type(attrs);
+
+  if (type == GRIP_DEVICE_TOUCHSCREEN)
     g_array_append_val (devices->touchscreen, id);
-  else if (!direct && !independent)
+  if (type == GRIP_DEVICE_TOUCHPAD)
     g_array_append_val (devices->touchpad, id);
-  else if (!direct && independent)
+  if (type == GRIP_DEVICE_INDEPENDENT)
     g_array_append_val (devices->independent, id);
 }
 
@@ -610,7 +634,8 @@
 
       if (binding->type == type)
         {
-	  GripGestureEvent *event = grip_gesture_event_new (type);
+          GripGestureEvent *event = grip_gesture_event_new (type);
+          GripDeviceType device_type = determine_device_type(attrs);
 
           if (type == GRIP_GESTURE_DRAG)
             {
@@ -621,6 +646,7 @@
               drag->fingers = drag_gesture_handle_properties (drag,
                   attr_count,
                   attrs);
+              drag->device_type = device_type;
 
               if (drag->fingers == binding->touches)
                 {
@@ -645,6 +671,7 @@
               pinch->fingers = pinch_gesture_handle_properties (pinch,
                   attr_count,
                   attrs);
+              pinch->device_type = device_type;
 
               if (pinch->fingers == binding->touches)
                 {
@@ -669,6 +696,7 @@
               rotate->fingers = rotate_gesture_handle_properties (rotate,
                   attr_count,
                   attrs);
+              rotate->device_type = device_type;
 
               if (rotate->fingers == binding->touches)
                 {
@@ -693,6 +721,7 @@
               tap->fingers = tap_gesture_handle_properties (tap,
                   attr_count,
                   attrs);
+              tap->device_type = device_type;
 
               if (tap->fingers == binding->touches)
                 {

=== modified file 'src/gripgesturemanager.h'
--- src/gripgesturemanager.h	2011-06-20 13:06:17 +0000
+++ src/gripgesturemanager.h	2011-07-22 08:27:26 +0000
@@ -92,6 +92,7 @@
   gdouble           velocity_y;
   gdouble           position_x;
   gdouble           position_y;
+  GripDeviceType    device_type;
 };
 
 struct _GripEventGesturePinch
@@ -110,6 +111,7 @@
   gdouble           radius;
   gfloat            position_x;
   gfloat            position_y;
+  GripDeviceType    device_type;
 };
 
 struct _GripEventGestureRotate
@@ -128,6 +130,7 @@
   gdouble           angle;
   gfloat            position_x;
   gfloat            position_y;
+  GripDeviceType    device_type;
 };
 
 struct _GripEventGestureTap
@@ -145,6 +148,7 @@
   gfloat            focus_y;
   gfloat            position_x;
   gfloat            position_y;
+  GripDeviceType    device_type;
 };
 
 union _GripGestureEvent