sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

input-settings/native: Use the libinput matrix if we don't have one ourselves

Browse source 
If our calibration matrix (the "area") is the default, use libinput's
default matrix instead. Worst case this is the unity matrix anyway, best
case it uses the matrix set in e.g. the LIBINPUT_CALIBRATION_MATRIX
property.

Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/2939
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3846>
This commit is contained in:
Peter Hutterer 2024-06-27 00:11:49 +10:00 committed by Marge Bot
parent 519ec32ac8
commit 756992c841
1 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/backends/native/meta-input-settings-native.c
View file

@ -671,25 +671,31 @@ meta_input_settings_native_set_tablet_area (MetaInputSettings *settings,
gdouble padding_bottom)
{
struct libinput_device *libinput_device;
gfloat scale_x;
gfloat scale_y;
gfloat offset_x;
gfloat offset_y;
scale_x = (float) (1.0 / (1.0 - (padding_left + padding_right)));
scale_y = (float) (1.0 / (1.0 - (padding_top + padding_bottom)));
offset_x = (float) (-padding_left * scale_x);
offset_y = (float) (-padding_top * scale_y);
gfloat matrix[6] = { scale_x, 0., offset_x,
0., scale_y, offset_y };
libinput_device = meta_input_device_native_get_libinput_device (device);
if (!libinput_device ||
!libinput_device_config_calibration_has_matrix (libinput_device))
return;
libinput_device_config_calibration_set_matrix (libinput_device, matrix);
if (padding_left == 0.0 && padding_right == 0.0 &&
padding_top == 0.0 && padding_bottom == 0.0)
{
float matrix[6];
libinput_device_config_calibration_get_default_matrix (libinput_device, matrix);
libinput_device_config_calibration_set_matrix (libinput_device, matrix);
}
else
{
float scale_x = (float) (1.0 / (1.0 - (padding_left + padding_right)));
float scale_y = (float) (1.0 / (1.0 - (padding_top + padding_bottom)));
float offset_x = (float) (-padding_left * scale_x);
float offset_y = (float) (-padding_top * scale_y);
float matrix[6] = { scale_x, 0., offset_x,
0., scale_y, offset_y };
libinput_device_config_calibration_set_matrix (libinput_device, matrix);
}
}
static void