[mutter] ClutterVirtualInputDevice: Store the device type
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] ClutterVirtualInputDevice: Store the device type
- Date: Wed, 10 Aug 2016 09:48:06 +0000 (UTC)
commit 364b184f41210b02ddafd4a51bb276a8f40e093b
Author: Jonas Ã…dahl <jadahl gmail com>
Date: Wed Jun 22 17:38:00 2016 +0800
ClutterVirtualInputDevice: Store the device type
https://bugzilla.gnome.org/show_bug.cgi?id=765009
clutter/clutter/clutter-virtual-input-device.c | 25 ++++++++++++++++++++
clutter/clutter/clutter-virtual-input-device.h | 2 +
.../clutter/evdev/clutter-device-manager-evdev.c | 1 +
3 files changed, 28 insertions(+), 0 deletions(-)
---
diff --git a/clutter/clutter/clutter-virtual-input-device.c b/clutter/clutter/clutter-virtual-input-device.c
index f79d7c4..ab19e65 100644
--- a/clutter/clutter/clutter-virtual-input-device.c
+++ b/clutter/clutter/clutter-virtual-input-device.c
@@ -31,12 +31,14 @@
#include "clutter-device-manager.h"
#include "clutter-private.h"
+#include "clutter-enum-types.h"
enum
{
PROP_0,
PROP_DEVICE_MANAGER,
+ PROP_DEVICE_TYPE,
PROP_LAST
};
@@ -46,6 +48,7 @@ static GParamSpec *obj_props[PROP_LAST];
typedef struct _ClutterVirtualInputDevicePrivate
{
ClutterDeviceManager *manager;
+ ClutterInputDeviceType device_type;
} ClutterVirtualInputDevicePrivate;
G_DEFINE_TYPE_WITH_PRIVATE (ClutterVirtualInputDevice,
@@ -109,6 +112,15 @@ clutter_virtual_input_device_get_manager (ClutterVirtualInputDevice *virtual_dev
return priv->manager;
}
+int
+clutter_virtual_input_device_get_device_type (ClutterVirtualInputDevice *virtual_device)
+{
+ ClutterVirtualInputDevicePrivate *priv =
+ clutter_virtual_input_device_get_instance_private (virtual_device);
+
+ return priv->device_type;
+}
+
static void
clutter_virtual_input_device_get_property (GObject *object,
guint prop_id,
@@ -125,6 +137,9 @@ clutter_virtual_input_device_get_property (GObject *object,
case PROP_DEVICE_MANAGER:
g_value_set_object (value, priv->manager);
break;
+ case PROP_DEVICE_TYPE:
+ g_value_set_enum (value, priv->device_type);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -147,6 +162,9 @@ clutter_virtual_input_device_set_property (GObject *object,
case PROP_DEVICE_MANAGER:
priv->manager = g_value_get_object (value);
break;
+ case PROP_DEVICE_TYPE:
+ priv->device_type = g_value_get_enum (value);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -172,6 +190,13 @@ clutter_virtual_input_device_class_init (ClutterVirtualInputDeviceClass *klass)
P_("The device manager instance"),
CLUTTER_TYPE_DEVICE_MANAGER,
CLUTTER_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
+ obj_props[PROP_DEVICE_TYPE] =
+ g_param_spec_enum ("device-type",
+ P_("Device type"),
+ P_("Device type"),
+ CLUTTER_TYPE_INPUT_DEVICE_TYPE,
+ CLUTTER_POINTER_DEVICE,
+ CLUTTER_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
g_object_class_install_properties (object_class, PROP_LAST, obj_props);
}
diff --git a/clutter/clutter/clutter-virtual-input-device.h b/clutter/clutter/clutter-virtual-input-device.h
index d1a27d7..976c123 100644
--- a/clutter/clutter/clutter-virtual-input-device.h
+++ b/clutter/clutter/clutter-virtual-input-device.h
@@ -94,4 +94,6 @@ void clutter_virtual_input_device_notify_key (ClutterVirtualInputDevice *virtual
ClutterDeviceManager * clutter_virtual_input_device_get_manager (ClutterVirtualInputDevice *virtual_device);
+int clutter_virtual_input_device_get_device_type (ClutterVirtualInputDevice *virtual_device);
+
#endif /* __CLUTTER_VIRTUAL_INPUT_DEVICE_H__ */
diff --git a/clutter/clutter/evdev/clutter-device-manager-evdev.c
b/clutter/clutter/evdev/clutter-device-manager-evdev.c
index 096fe4c..d7d7271 100644
--- a/clutter/clutter/evdev/clutter-device-manager-evdev.c
+++ b/clutter/clutter/evdev/clutter-device-manager-evdev.c
@@ -1961,6 +1961,7 @@ clutter_device_manager_evdev_create_virtual_device (ClutterDeviceManager *manag
{
return g_object_new (CLUTTER_TYPE_VIRTUAL_INPUT_DEVICE_EVDEV,
"device-manager", manager,
+ "device-type", device_type,
NULL);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]