From 50e52f550a14e86a689673ce898970337cc46e8b Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Wed, 19 Jan 2011 13:53:20 +0000 Subject: [PATCH] device: Use a double for translate_axis() argument While XI1 has axis data in events exposed as integers, XI2 uses double precision floating point values. --- clutter/clutter-device-manager-private.h | 2 +- clutter/clutter-input-device.c | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/clutter/clutter-device-manager-private.h b/clutter/clutter-device-manager-private.h index 67ec1a314..a316f2c68 100644 --- a/clutter/clutter-device-manager-private.h +++ b/clutter/clutter-device-manager-private.h @@ -163,7 +163,7 @@ void _clutter_input_device_select_stage_events (ClutterInputDev gboolean _clutter_input_device_translate_axis (ClutterInputDevice *device, guint index_, - gint value, + gdouble value, gdouble *axis_value); G_END_DECLS diff --git a/clutter/clutter-input-device.c b/clutter/clutter-input-device.c index 406102f79..c71bf060e 100644 --- a/clutter/clutter-input-device.c +++ b/clutter/clutter-input-device.c @@ -915,10 +915,25 @@ _clutter_input_device_add_axis (ClutterInputDevice *device, return pos; } +/*< private > + * clutter_input_translate_axis: + * @device: a #ClutterInputDevice + * @index_: the index of the axis + * @gint: the absolute value of the axis + * @axis_value: (out): the translated value of the axis + * + * Performs a conversion from the absolute value of the axis + * to a relative value. + * + * The axis at @index_ must not be %CLUTTER_INPUT_AXIS_X or + * %CLUTTER_INPUT_AXIS_Y. + * + * Return value: %TRUE if the conversion was successful + */ gboolean _clutter_input_device_translate_axis (ClutterInputDevice *device, guint index_, - gint value, + gdouble value, gdouble *axis_value) { ClutterAxisInfo *info;