fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2026-05-03 15:57:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

libinput: note if calibrating without an output

Browse source 
Print a note that calibration got skipped if the input device supports a
calibration matrix but there is no associated output to compute it from.
Helps with debugging touchscreen calibration issues.

The code is reorganized and commented a bit, but this does not change
the behaviour.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Pekka Paalanen 2017-04-18 12:14:32 +03:00
parent bb659c8e19
commit dfc9d3b847
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
libweston/libinput-device.c
View file

@ -463,21 +463,29 @@ evdev_device_set_calibration(struct evdev_device *device)
float calibration[6];
enum libinput_config_status status;
if (!device->output)
if (!libinput_device_config_calibration_has_matrix(device->device))
return;
/* If LIBINPUT_CALIBRATION_MATRIX was set to non-identity, we will not
* override it with WL_CALIBRATION. It also means we don't need an
* output to load a calibration. */
if (libinput_device_config_calibration_get_default_matrix(
device->device,
calibration) != 0)
return;
if (!device->output) {
weston_log("input device %s has no enabled output associated "
"(%s named), skipping calibration for now.\n",
sysname, device->output_name ?: "none");
return;
}
width = device->output->width;
height = device->output->height;
if (width == 0 || height == 0)
return;
/* If libinput has a pre-set calibration matrix, don't override it */
if (!libinput_device_config_calibration_has_matrix(device->device) ||
libinput_device_config_calibration_get_default_matrix(
device->device,
calibration) != 0)
return;
udev = udev_new();
if (!udev)
return;