From dae5f06069e1944669d2c57c1889c7ce2735cfa1 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Tue, 8 Nov 2016 18:24:59 +0100 Subject: [PATCH] backends/native: Use ClutterInputDeviceEvdev::device-matrix for map-to-output The libinput calibration matrix should only be used for calibration purposes, this ClutterInputDeviceEvdev property has been added in place. https://bugzilla.gnome.org/show_bug.cgi?id=774115 --- src/backends/native/meta-input-settings-native.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/backends/native/meta-input-settings-native.c b/src/backends/native/meta-input-settings-native.c index 1701bdd98..7a896ec65 100644 --- a/src/backends/native/meta-input-settings-native.c +++ b/src/backends/native/meta-input-settings-native.c @@ -65,14 +65,11 @@ meta_input_settings_native_set_matrix (MetaInputSettings *settings, ClutterInputDevice *device, gfloat matrix[6]) { - struct libinput_device *libinput_device; + cairo_matrix_t dev_matrix; - libinput_device = clutter_evdev_input_device_get_libinput_device (device); - if (!libinput_device) - return; - - if (libinput_device_config_calibration_has_matrix (libinput_device) > 0) - libinput_device_config_calibration_set_matrix (libinput_device, matrix); + cairo_matrix_init (&dev_matrix, matrix[0], matrix[3], matrix[1], + matrix[4], matrix[2], matrix[5]); + g_object_set (device, "device-matrix", &dev_matrix, NULL); } static void