[mutter/wip/tablet-protocol-v2: 46/48] clutter: Add clutter_input_device_[gs]et_mapping()

[Carlos Garnacho <carlosg src gnome org>]

commit b35f0af85be8f06e897094f8f65c8bb646986402
Author: Carlos Garnacho <carlosg gnome org>
Date:   Fri May 13 19:57:51 2016 +0200

    clutter: Add clutter_input_device_[gs]et_mapping()
    
    This function call only applies to tablets, and thus will error
    out unless it's called with CLUTTER_TABLET_DEVICEs. This will
    allow setting absolute/relative mapping on those on the fly, as
    this is optional.

 clutter/clutter/clutter-device-manager-private.h |    2 +
 clutter/clutter/clutter-enums.h                  |    5 ++
 clutter/clutter/clutter-input-device.c           |   44 ++++++++++++++++++++++
 clutter/clutter/clutter-input-device.h           |    7 +++
 4 files changed, 58 insertions(+), 0 deletions(-)
---
diff --git a/clutter/clutter/clutter-device-manager-private.h 
b/clutter/clutter/clutter-device-manager-private.h
index 4d0bf21..9e9eb9e 100644
--- a/clutter/clutter/clutter-device-manager-private.h
+++ b/clutter/clutter/clutter-device-manager-private.h
@@ -138,6 +138,8 @@ struct _ClutterInputDevice
   gint n_rings;
   gint n_strips;
 
+  ClutterInputDeviceMapping mapping;
+
   guint has_cursor : 1;
   guint is_enabled : 1;
 };
diff --git a/clutter/clutter/clutter-enums.h b/clutter/clutter/clutter-enums.h
index 6f779c5..03c0395 100644
--- a/clutter/clutter/clutter-enums.h
+++ b/clutter/clutter/clutter-enums.h
@@ -1531,6 +1531,11 @@ typedef enum {
   CLUTTER_INPUT_DEVICE_PAD_SOURCE_FINGER,
 } ClutterInputDevicePadSource;
 
+typedef enum {
+  CLUTTER_INPUT_DEVICE_MAPPING_ABSOLUTE,
+  CLUTTER_INPUT_DEVICE_MAPPING_RELATIVE,
+} ClutterInputDeviceMapping;
+
 G_END_DECLS
 
 #endif /* __CLUTTER_ENUMS_H__ */
diff --git a/clutter/clutter/clutter-input-device.c b/clutter/clutter/clutter-input-device.c
index a46cc67..a5497f6 100644
--- a/clutter/clutter/clutter-input-device.c
+++ b/clutter/clutter/clutter-input-device.c
@@ -73,6 +73,7 @@ enum
   PROP_N_STRIPS,
   PROP_N_RINGS,
   PROP_DEVICE_NODE,
+  PROP_MAPPING,
 
   PROP_LAST
 };
@@ -211,6 +212,10 @@ clutter_input_device_set_property (GObject      *gobject,
       self->node_path = g_value_dup_string (value);
       break;
 
+    case PROP_MAPPING:
+      self->mapping = g_value_get_enum (value);
+      break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
       break;
@@ -283,6 +288,10 @@ clutter_input_device_get_property (GObject    *gobject,
       g_value_set_string (value, self->node_path);
       break;
 
+    case PROP_MAPPING:
+      g_value_set_enum (value, self->mapping);
+      break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
       break;
@@ -481,6 +490,14 @@ clutter_input_device_class_init (ClutterInputDeviceClass *klass)
                          NULL,
                          CLUTTER_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
 
+  obj_props[PROP_MAPPING] =
+    g_param_spec_enum ("mapping",
+                       P_("Device mapping"),
+                       P_("Device mapping"),
+                       CLUTTER_TYPE_INPUT_DEVICE_MAPPING,
+                       CLUTTER_INPUT_DEVICE_MAPPING_ABSOLUTE,
+                       CLUTTER_PARAM_READWRITE);
+
   gobject_class->dispose = clutter_input_device_dispose;
   gobject_class->set_property = clutter_input_device_set_property;
   gobject_class->get_property = clutter_input_device_get_property;
@@ -2139,3 +2156,30 @@ clutter_input_device_get_device_node (ClutterInputDevice *device)
 
   return device->node_path;
 }
+
+ClutterInputDeviceMapping
+clutter_input_device_get_mapping (ClutterInputDevice *device)
+{
+  g_return_val_if_fail (CLUTTER_IS_INPUT_DEVICE (device),
+                        CLUTTER_INPUT_DEVICE_MAPPING_ABSOLUTE);
+  g_return_val_if_fail (clutter_input_device_get_device_type (device) ==
+                        CLUTTER_TABLET_DEVICE,
+                        CLUTTER_INPUT_DEVICE_MAPPING_ABSOLUTE);
+
+  return device->mapping;
+}
+
+void
+clutter_input_device_set_mapping (ClutterInputDevice        *device,
+                                  ClutterInputDeviceMapping  mapping)
+{
+  g_return_if_fail (CLUTTER_IS_INPUT_DEVICE (device));
+  g_return_if_fail (clutter_input_device_get_device_type (device) ==
+                    CLUTTER_TABLET_DEVICE);
+
+  if (device->mapping == mapping)
+    return;
+
+  device->mapping = mapping;
+  g_object_notify (G_OBJECT (device), "mapping");
+}
diff --git a/clutter/clutter/clutter-input-device.h b/clutter/clutter/clutter-input-device.h
index f56c484..51ce759 100644
--- a/clutter/clutter/clutter-input-device.h
+++ b/clutter/clutter/clutter-input-device.h
@@ -148,6 +148,13 @@ gint                    clutter_input_device_get_n_strips       (ClutterInputDev
 CLUTTER_AVAILABLE_IN_ALL
 const gchar *           clutter_input_device_get_device_node    (ClutterInputDevice *device);
 
+CLUTTER_AVAILABLE_IN_ALL
+ClutterInputDeviceMapping clutter_input_device_get_mapping      (ClutterInputDevice *device);
+
+CLUTTER_AVAILABLE_IN_ALL
+void                      clutter_input_device_set_mapping      (ClutterInputDevice        *device,
+                                                                 ClutterInputDeviceMapping  mapping);
+
 G_END_DECLS
 
 #endif /* __CLUTTER_INPUT_DEVICE_H__ */