fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2026-05-08 12:28:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

evdev: move reading the calibration prop into a helper function

Browse source 
No functional changes.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
(cherry picked from commit 50e4a1fada)
This commit is contained in:
Peter Hutterer 2016-11-25 13:54:35 +10:00
parent 690dd44121
commit 84c12a8a63
3 changed files with 43 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/evdev.c
View file

@ -2975,6 +2975,45 @@ evdev_device_calibrate(struct evdev_device *device,
matrix_mult(&device->abs.calibration, &transform, &scale); matrix_mult(&device->abs.calibration, &transform, &scale);
} }
void
evdev_read_calibration_prop(struct evdev_device *device)
{
const char *calibration_values;
float calibration[6];
int nread;
calibration_values =
udev_device_get_property_value(device->udev_device,
"LIBINPUT_CALIBRATION_MATRIX");
if (calibration_values == NULL)
return;
if (!device->abs.absinfo_x || !device->abs.absinfo_y)
return;
nread = sscanf(calibration_values,
"%f %f %f %f %f %f",
&calibration[0],
&calibration[1],
&calibration[2],
&calibration[3],
&calibration[4],
&calibration[5]);
if (nread != 6)
return;
evdev_device_set_default_calibration(device, calibration);
log_info(evdev_libinput_context(device),
"Applying calibration: %f %f %f %f %f %f\n",
calibration[0],
calibration[1],
calibration[2],
calibration[3],
calibration[4],
calibration[5]);
}
bool bool
evdev_device_has_capability(struct evdev_device *device, evdev_device_has_capability(struct evdev_device *device,
enum libinput_device_capability capability) enum libinput_device_capability capability)

3
src/evdev.h
View file

@ -337,6 +337,9 @@ void
evdev_init_calibration(struct evdev_device *device, evdev_init_calibration(struct evdev_device *device,
struct libinput_device_config_calibration *calibration); struct libinput_device_config_calibration *calibration);
void
evdev_read_calibration_prop(struct evdev_device *device);
void void
evdev_device_init_pointer_acceleration(struct evdev_device *device, evdev_device_init_pointer_acceleration(struct evdev_device *device,
struct motion_filter *filter); struct motion_filter *filter);

26
src/udev-seat.c
View file

@ -51,8 +51,6 @@ device_added(struct udev_device *udev_device,
struct evdev_device *device; struct evdev_device *device;
const char *devnode; const char *devnode;
const char *device_seat, *output_name; const char *device_seat, *output_name;
const char *calibration_values;
float calibration[6];
struct udev_seat *seat; struct udev_seat *seat;
device_seat = udev_device_get_property_value(udev_device, "ID_SEAT"); device_seat = udev_device_get_property_value(udev_device, "ID_SEAT");
@ -94,29 +92,7 @@ device_added(struct udev_device *udev_device,
return 0; return 0;
} }
calibration_values = evdev_read_calibration_prop(device);
udev_device_get_property_value(udev_device,
"LIBINPUT_CALIBRATION_MATRIX");
if (device->abs.absinfo_x && device->abs.absinfo_y &&
calibration_values && sscanf(calibration_values,
"%f %f %f %f %f %f",
&calibration[0],
&calibration[1],
&calibration[2],
&calibration[3],
&calibration[4],
&calibration[5]) == 6) {
evdev_device_set_default_calibration(device, calibration);
log_info(&input->base,
"Applying calibration: %f %f %f %f %f %f\n",
calibration[0],
calibration[1],
calibration[2],
calibration[3],
calibration[4],
calibration[5]);
}
output_name = udev_device_get_property_value(udev_device, "WL_OUTPUT"); output_name = udev_device_get_property_value(udev_device, "WL_OUTPUT");
if (output_name) if (output_name)