[gtk+/wip/wayland-tablet: 1843/1865] device: Add gdk_device_get_axes(), and ::axes property

[Carlos Garnacho <carlosg src gnome org>]

commit bb984df5b3ccc558900cc53e286721a8c0db59be
Author: Carlos Garnacho <carlosg gnome org>
Date:   Tue Jan 27 21:35:40 2015 +0000

    device: Add gdk_device_get_axes(), and ::axes property
    
    This returns a GdkAxisFlags, holding the axes currently available
    through this device.

 docs/reference/gdk/gdk3-sections.txt |    1 +
 gdk/gdkdevice.c                      |   51 ++++++++++++++++++++++++++++++++++
 gdk/gdkdevice.h                      |   14 +++++++++
 gdk/gdkdeviceprivate.h               |    1 +
 4 files changed, 67 insertions(+), 0 deletions(-)
---
diff --git a/docs/reference/gdk/gdk3-sections.txt b/docs/reference/gdk/gdk3-sections.txt
index cfcce26..b99607b 100644
--- a/docs/reference/gdk/gdk3-sections.txt
+++ b/docs/reference/gdk/gdk3-sections.txt
@@ -739,6 +739,7 @@ gdk_device_get_display
 gdk_device_get_has_cursor
 gdk_device_get_n_axes
 gdk_device_get_n_keys
+gdk_device_get_axes
 gdk_device_warp
 gdk_device_get_seat
 
diff --git a/gdk/gdkdevice.c b/gdk/gdkdevice.c
index db36ced..641e598 100644
--- a/gdk/gdkdevice.c
+++ b/gdk/gdkdevice.c
@@ -91,6 +91,7 @@ enum {
   PROP_VENDOR_ID,
   PROP_PRODUCT_ID,
   PROP_SEAT,
+  PROP_AXES,
   LAST_PROP
 };
 
@@ -287,6 +288,20 @@ gdk_device_class_init (GdkDeviceClass *klass)
                            G_PARAM_READWRITE |
                            G_PARAM_STATIC_STRINGS);
 
+  /**
+   * GdkDevice:axes:
+   *
+   * The axes currently available for this device.
+   *
+   * Since: 3.16
+   */
+  device_props[PROP_AXES] =
+    g_param_spec_flags ("axes",
+                        P_("Axes"),
+                        P_("Axes"),
+                        GDK_TYPE_AXIS_FLAGS, 0,
+                        G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+
   g_object_class_install_properties (object_class, LAST_PROP, device_props);
 
   /**
@@ -449,8 +464,13 @@ gdk_device_get_property (GObject    *object,
     case PROP_PRODUCT_ID:
       g_value_set_string (value, device->product_id);
       break;
+<<<<<<< 676016cb4a06add2bc4cfe46f5fcb38f2a9b19af
     case PROP_SEAT:
       g_value_set_object (value, device->seat);
+=======
+    case PROP_AXES:
+      g_value_set_flags (value, device->axis_flags);
+>>>>>>> device: Add gdk_device_get_axes(), and ::axes property
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -1490,7 +1510,14 @@ _gdk_device_reset_axes (GdkDevice *device)
   for (i = device->axes->len - 1; i >= 0; i--)
     g_array_remove_index (device->axes, i);
 
+<<<<<<< 676016cb4a06add2bc4cfe46f5fcb38f2a9b19af
   g_object_notify_by_pspec (G_OBJECT (device), device_props[PROP_N_AXES]);
+=======
+  device->axis_flags = 0;
+
+  g_object_notify (G_OBJECT (device), "n-axes");
+  g_object_notify (G_OBJECT (device), "axes");
+>>>>>>> device: Add gdk_device_get_axes(), and ::axes property
 }
 
 guint
@@ -1531,7 +1558,14 @@ _gdk_device_add_axis (GdkDevice   *device,
   device->axes = g_array_append_val (device->axes, axis_info);
   pos = device->axes->len - 1;
 
+<<<<<<< 676016cb4a06add2bc4cfe46f5fcb38f2a9b19af
   g_object_notify_by_pspec (G_OBJECT (device), device_props[PROP_N_AXES]);
+=======
+  device->axis_flags |= (1 << use);
+
+  g_object_notify (G_OBJECT (device), "n-axes");
+  g_object_notify (G_OBJECT (device), "axes");
+>>>>>>> device: Add gdk_device_get_axes(), and ::axes property
 
   return pos;
 }
@@ -1907,6 +1941,7 @@ gdk_device_get_product_id (GdkDevice *device)
   return device->product_id;
 }
 
+<<<<<<< 676016cb4a06add2bc4cfe46f5fcb38f2a9b19af
 void
 gdk_device_set_seat (GdkDevice *device,
                      GdkSeat   *seat)
@@ -1938,4 +1973,20 @@ gdk_device_get_seat (GdkDevice *device)
   g_return_val_if_fail (GDK_IS_DEVICE (device), NULL);
 
   return device->seat;
+=======
+/**
+ * gdk_device_get_axes:
+ * @device: a #GdkDevice
+ *
+ * Returns the axes currently available on the device.
+ *
+ * Since: 3.16
+ **/
+GdkAxisFlags
+gdk_device_get_axes (GdkDevice *device)
+{
+  g_return_val_if_fail (GDK_IS_DEVICE (device), 0);
+
+  return device->axis_flags;
+>>>>>>> device: Add gdk_device_get_axes(), and ::axes property
 }
diff --git a/gdk/gdkdevice.h b/gdk/gdkdevice.h
index 6847d2c..d150cf9 100644
--- a/gdk/gdkdevice.h
+++ b/gdk/gdkdevice.h
@@ -109,6 +109,17 @@ typedef enum
   GDK_AXIS_LAST
 } GdkAxisUse;
 
+typedef enum
+{
+  GDK_AXIS_FLAG_X        = 1 << GDK_AXIS_X,
+  GDK_AXIS_FLAG_Y        = 1 << GDK_AXIS_Y,
+  GDK_AXIS_FLAG_PRESSURE = 1 << GDK_AXIS_PRESSURE,
+  GDK_AXIS_FLAG_XTILT    = 1 << GDK_AXIS_XTILT,
+  GDK_AXIS_FLAG_YTILT    = 1 << GDK_AXIS_YTILT,
+  GDK_AXIS_FLAG_WHEEL    = 1 << GDK_AXIS_WHEEL,
+  GDK_AXIS_FLAG_DISTANCE = 1 << GDK_AXIS_DISTANCE
+} GdkAxisFlags;
+
 /**
  * GdkDeviceType:
  * @GDK_DEVICE_TYPE_MASTER: Device is a master (or virtual) device. There will
@@ -284,6 +295,9 @@ const gchar *gdk_device_get_product_id      (GdkDevice *device);
 GDK_AVAILABLE_IN_3_20
 GdkSeat     *gdk_device_get_seat            (GdkDevice *device);
 
+GDK_AVAILABLE_IN_3_20
+GdkAxisFlags gdk_device_get_axes            (GdkDevice *device);
+
 G_END_DECLS
 
 #endif /* __GDK_DEVICE_H__ */
diff --git a/gdk/gdkdeviceprivate.h b/gdk/gdkdeviceprivate.h
index 7675895..c933f3a 100644
--- a/gdk/gdkdeviceprivate.h
+++ b/gdk/gdkdeviceprivate.h
@@ -47,6 +47,7 @@ struct _GdkDevice
   GdkInputMode mode;
   gboolean has_cursor;
   gint num_keys;
+  GdkAxisFlags axis_flags;
   GdkDeviceKey *keys;
   GdkDeviceManager *manager;
   GdkDisplay *display;