Merge lp:~jpakkane/libgrip/input_type_expose into lp:libgrip

[Jussi Pakkanen]

Expose input type detector function through API.

I moved it to gripinputdevice.c/h because it seemed like a more natural place.

I would have called the function grip_input_device_get_type but that one already exists and is used by the Glib object system (I think).

[Stephen M. Webb (bregma)]

Exactly how I would have done it.

review: Approve

=== modified file 'src/gripgesturemanager.c'
--- src/gripgesturemanager.c	2011-08-08 09:44:29 +0000
+++ src/gripgesturemanager.c	2011-08-09 08:39:29 +0000
@@ -419,22 +419,6 @@
   return input_device;
 }
 
-static
-GripDeviceType
-grip_get_device_type (GripInputDevice *input_device) {
-  gboolean is_direct = grip_input_device_is_direct (input_device);
-  gboolean is_independent = grip_input_device_is_independent (input_device);
-  if (is_direct && !is_independent)
-    return GRIP_DEVICE_TOUCHSCREEN;
-  if (!is_direct && !is_independent)
-    return GRIP_DEVICE_TOUCHPAD;
-  if (!is_direct && is_independent)
-    return GRIP_DEVICE_INDEPENDENT;
-
-  g_critical("Unknown touch device type.");
-  return GRIP_DEVICE_TOUCHSCREEN;
-}
-
 /*
  * registration_for_input_device:
  * @registrations: A collection of #GripGestureRegistration

=== modified file 'src/gripgesturemanager.h'
--- src/gripgesturemanager.h	2011-08-03 22:18:13 +0000
+++ src/gripgesturemanager.h	2011-08-09 08:39:29 +0000
@@ -123,19 +123,6 @@
   GRIP_GESTURE_TAP     = 15
 } GripGestureType;
 
-/**
- * GripDeviceType:
- * @GRIP_DEVICE_TOUCHSCREEN: device is a touchscreen.
- * @GRIP_DEVICE_TOUCHPAD: device is a touchpad
- * @GRIP_DEVICE_INDEPENDENT: device is a Magic Mouse
- *
- * Describes certain properties of a gesture input device.
- */
-typedef enum {
-  GRIP_DEVICE_TOUCHSCREEN = 1,
-  GRIP_DEVICE_TOUCHPAD    = 2,
-  GRIP_DEVICE_INDEPENDENT = 4,
-} GripDeviceType;
 
 #define GRIP_DEVICE_ALL (GRIP_DEVICE_TOUCHSCREEN | GRIP_DEVICE_TOUCHPAD | GRIP_DEVICE_INDEPENDENT)
 

=== modified file 'src/gripinputdevice.c'
--- src/gripinputdevice.c	2011-08-04 00:39:00 +0000
+++ src/gripinputdevice.c	2011-08-09 08:39:29 +0000
@@ -322,5 +322,17 @@
           G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS));
 }
 
-
-
+GripDeviceType
+grip_get_device_type (GripInputDevice *input_device) {
+  gboolean is_direct = grip_input_device_is_direct (input_device);
+  gboolean is_independent = grip_input_device_is_independent (input_device);
+  if (is_direct && !is_independent)
+    return GRIP_DEVICE_TOUCHSCREEN;
+  if (!is_direct && !is_independent)
+    return GRIP_DEVICE_TOUCHPAD;
+  if (!is_direct && is_independent)
+    return GRIP_DEVICE_INDEPENDENT;
+
+  g_critical("Unknown touch device type.");
+  return GRIP_DEVICE_TOUCHSCREEN;
+}

=== modified file 'src/gripinputdevice.h'
--- src/gripinputdevice.h	2011-08-04 00:39:00 +0000
+++ src/gripinputdevice.h	2011-08-09 08:39:29 +0000
@@ -27,6 +27,20 @@
 G_BEGIN_DECLS
 
 /**
+ * GripDeviceType:
+ * @GRIP_DEVICE_TOUCHSCREEN: device is a touchscreen.
+ * @GRIP_DEVICE_TOUCHPAD: device is a touchpad
+ * @GRIP_DEVICE_INDEPENDENT: device is a Magic Mouse
+ *
+ * Describes certain properties of a gesture input device.
+ */
+typedef enum {
+  GRIP_DEVICE_TOUCHSCREEN = 1,
+  GRIP_DEVICE_TOUCHPAD    = 2,
+  GRIP_DEVICE_INDEPENDENT = 4,
+} GripDeviceType;
+
+/**
  * SECTION:GripInputDevice
  *
  * The Grip input device represents input devices known to the uTouch gesture
@@ -99,6 +113,10 @@
 AxisExtents *
 grip_input_device_get_y_extents(GripInputDevice *input_device);
 
+
+GripDeviceType
+grip_get_device_type (GripInputDevice *input_device);
+
 G_END_DECLS
 
 #endif /* GRIP_INPUT_DEVICE_H_ */

=== modified file 'src/libgrip.ver'
--- src/libgrip.ver	2011-08-04 00:39:00 +0000
+++ src/libgrip.ver	2011-08-09 08:39:29 +0000
@@ -53,3 +53,7 @@
     grip_input_device_is_independent;
 } GRIP_0.1;
 
+GRIP_0.3 {
+  global:
+    grip_get_device_type;
+} GRIP_0.2.2;